From 53b99cbf6386f449fa62a3d047b9b46ea6c8e782 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Sat, 6 Jun 2020 21:57:47 +0200
Subject: [PATCH 001/257] Fix warning with empty array

---
 include/param_sec.inc.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/param_sec.inc.php b/include/param_sec.inc.php
index 244769209..997cb2649 100644
--- a/include/param_sec.inc.php
+++ b/include/param_sec.inc.php
@@ -109,11 +109,13 @@ if ( ! isset($_REQUEST['action']))
 		echo td($l_line['use_name']);
 		echo td($l_line['use_first_name']);
 		echo td($profile);
-                // status of security on ledger and action 
-                $a_sec=$cn->get_row("select us_ledger,us_action from user_active_security where us_login =$1",
+		// status of security on ledger and action
+        $a_sec=$cn->get_row("select us_ledger,us_action from user_active_security where us_login =$1",
                         [$l_line['use_login']]);
-                echo td($a_sec['us_ledger']);
-                echo td($a_sec['us_action']);
+        if ( ! empty ($a_sec)) {
+            echo td($a_sec['us_ledger']);
+            echo td($a_sec['us_action']);
+        }
 		echo td($str);
 		echo "</TR>";
     }

From 36cb893c3a7ec976331032a892cb7249e0c28ade Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Sun, 2 Aug 2020 12:03:20 +0200
Subject: [PATCH 002/257] Bug : correct search remove ~

---
 include/class/acc_ledger_search.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/class/acc_ledger_search.class.php b/include/class/acc_ledger_search.class.php
index 198b0e7ac..d7a19155a 100644
--- a/include/class/acc_ledger_search.class.php
+++ b/include/class/acc_ledger_search.class.php
@@ -560,9 +560,9 @@ class Acc_Ledger_Search
             $desc=sql_string($desc);
             $fil_desc=$and." ( upper(jr_comment) like upper('%".$desc."%') or upper(jr_pj_number) like upper('%".$desc."%') ".
                     " or upper(jr_internal)  like upper('%".$desc."%')
-                          or jr_grpt_id in (select j_grpt from jrnx where j_text ~* '".$desc."')
-                          or jr_id in (select jr_id from jrn_info where ji_value is not null and ji_value ~* '$desc')
-                          or jr_id in (select jr_id from jrn_note where upper(n_text) ~* '$desc' )
+                          or jr_grpt_id in (select j_grpt from jrnx where j_text ilike '%".$desc."%')
+                          or jr_id in (select jr_id from jrn_info where ji_value is not null and ji_value  ilike '%$desc%')
+                          or jr_id in (select jr_id from jrn_note where upper(n_text) ilike '%$desc%' )
                           )";
             $and=" and ";
         }

From 57d3beff295bf5ce77b42585d9874d47411867b1 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Sun, 2 Aug 2020 13:40:13 +0200
Subject: [PATCH 003/257] Bug : use ilike instead of tilde

---
 html/js/scripts.js                  |  4 ++--
 include/ajax/ajax_anc_search.php    |  2 +-
 include/ajax/ajax_auto_anc_card.php | 14 ++++++++++++--
 include/class/contact.class.php     |  2 +-
 include/class/dossier.class.php     | 12 ++++++------
 include/class/fiche.class.php       |  4 ++--
 include/class/follow_up.class.php   |  4 ++--
 include/class/user.class.php        | 20 ++++++++++++--------
 8 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/html/js/scripts.js b/html/js/scripts.js
index 404e99eff..f2f6e0c9c 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -1224,7 +1224,7 @@ function fill_box(req)
  *@param dossier_id
  *@param od_id from table op_predef
  */
-function mod_predf_op(dossier_id, od_id)
+function mod_predf_op(dossier_id, od_id,p_ledger)
 {
     var target = "mod_predf_op";
     removeDiv(target);
@@ -1234,7 +1234,7 @@ function mod_predf_op(dossier_id, od_id)
 
     add_div(div);
 
-    var qs = "gDossier=" + dossier_id + '&op=mod_predf&id=' + od_id;
+    var qs = "gDossier=" + dossier_id + '&op=mod_predf&id=' + od_id+'&ledger_id='+p_ledger;
 
     var action = new Ajax.Request('ajax_misc.php',
             {
diff --git a/include/ajax/ajax_anc_search.php b/include/ajax/ajax_anc_search.php
index 00c114e5c..c9f943752 100644
--- a/include/ajax/ajax_anc_search.php
+++ b/include/ajax/ajax_anc_search.php
@@ -71,7 +71,7 @@ if ( isset($_REQUEST['go']))
     $plabel=$http->request("plabel");
     $sql="select po_name , po_description from poste_analytique ".
          "where pa_id=$1 and ".
-         " (po_name ~* $2 or po_description ~* $3) order by po_name";
+         " (po_name ilike '%'||$2||'%' or po_description ilike '%'|| $3||'%') order by po_name";
     $array=$cn->get_array($sql,array($_c2,$plabel,$plabel));
 
     if (empty($array) == true)
diff --git a/include/ajax/ajax_auto_anc_card.php b/include/ajax/ajax_auto_anc_card.php
index a04732662..aa4622cbc 100644
--- a/include/ajax/ajax_auto_anc_card.php
+++ b/include/ajax/ajax_auto_anc_card.php
@@ -13,12 +13,22 @@ $cn=Dossier::connect();
 
 if ( isset($_REQUEST['pa_id']) )
 {   
-    $res=$cn->exec_sql("select po_name,po_description from  poste_analytique where pa_id=$1  and (po_description ~* $2 or po_name ~* $3) order by po_id limit 12",
+    $res=$cn->exec_sql("select po_name,po_description 
+            from  poste_analytique 
+            where 
+                  pa_id=$1  
+              and (po_description ilike '%'|| $2||'%' or po_name ilike '%'|| $3 ||'%')
+            order by po_id limit 12",
         array($_REQUEST['pa_id'],$_POST['anccard'],$_POST['anccard']));
 }
 else
 {
-       $res=$cn->exec_sql("select po_name,po_description from  poste_analytique where po_description ~* $1 or po_name ~* $2 order by po_id limit 12 ",
+       $res=$cn->exec_sql("select po_name,po_description
+                from  poste_analytique 
+                where 
+                      po_description ilike '%'|| $1 ||'%' 
+                   or po_name ilike '%'|| $2||'%' 
+                order by po_id limit 12 ",
         array($_POST['anccard'],$_POST['anccard']));
 }
 $nb=Database::num_row($res);
diff --git a/include/class/contact.class.php b/include/class/contact.class.php
index 389074c6b..4bd785c17 100644
--- a/include/class/contact.class.php
+++ b/include/class/contact.class.php
@@ -71,7 +71,7 @@ class contact extends Fiche
             $search=" and f_id in
                     (select f_id from fiche_Detail
                     where
-                    ad_id=1 and ad_value ~* '$p_search') ";
+                    ad_id=1 and ad_value ilike '%$p_search%') ";
         }
         // Get The result Array
         $step_contact=$this->get_by_category($offset,$search.$extra_sql.$p_sql);
diff --git a/include/class/dossier.class.php b/include/class/dossier.class.php
index 1f62b042b..25e04259b 100644
--- a/include/class/dossier.class.php
+++ b/include/class/dossier.class.php
@@ -80,8 +80,8 @@ class Dossier
             $l_sql="select *, 'W' as priv_priv "
                     ."from ac_dossier "
                     ."where "
-                    ."dos_name ~* $2 "
-                    ."or dos_description ~* $2 "
+                    ."dos_name ilike '%'|| $2 ||'%'"
+                    ."or dos_description ilike '%'|| $2 || '%' "
                     ."ORDER BY dos_name $str_limit  ";
             $a_row=$cn->get_array($l_sql, $p_text);
             return $a_row;
@@ -93,7 +93,7 @@ class Dossier
                    natural join ac_users
                    where
                    use_login=$1
-                   and ( dos_name ~* $2 or dos_description ~* $2)
+                   and ( dos_name ilike '%'||  $2 || '%'  or dos_description ilike '%'|| $2|| '%' )
                    
                    order by dos_name 
                    $str_limit
@@ -104,10 +104,10 @@ class Dossier
         }
         else if ($p_type=='X')
         {
-            $l_sql=' select * from ac_dossier where dos_id not in 
+            $l_sql=" select * from ac_dossier where dos_id not in 
                   (select dos_id from jnt_use_dos where use_id=$1)
-                  and ( dos_name ~* $2 or dos_description ~* $2)
-                  order by dos_name '.$str_limit;
+                  and ( dos_name ilike '%'||  $2|| '%'  or dos_description ilike '%'||  $2 || '%')
+                  order by dos_name ".$str_limit;
             $a_row=$cn->get_array($l_sql, array($p_login, $p_text));
             return $a_row;
         }
diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index 876351e36..214b100f8 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -262,7 +262,7 @@ class Fiche
         {
             $a=sql_string($p_search);
             $sql="select * from vw_fiche_attr where frd_id=".$p_frd_id.
-                 " and vw_name ~* '$p_search'";
+                 " and vw_name ilike '%$p_search%'";
         }
 
         $Ret=$this->cn->exec_sql($sql.$p_sql);
@@ -1776,7 +1776,7 @@ class Fiche
             $search.=" and f_id in
                      (select distinct f_id from fiche_detail
                      where
-                     ad_id in (1,32,30,23,18,13) and ad_value ~* '$p_search')";
+                     ad_id in (1,32,30,23,18,13) and ad_value ilike '%$p_search%')";
         }
         // Get The result Array
         $step_tiers=$this->get_by_category($offset,$search.$filter_amount,'name');
diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 29164ce8d..6d77d833a 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -1320,9 +1320,9 @@ class Follow_Up
         if (isset($_REQUEST['action_query']))
         {
             // if a query is request build the sql stmt
-            $action_query="and (ag_title ~* '".sql_string($_REQUEST['action_query'])."' ".
+            $action_query="and (ag_title ilike '%".sql_string($_REQUEST['action_query'])."%' ".
                     "or ag_ref ='".trim(sql_string($_REQUEST['action_query'])).
-                    "' or ag_id in (select ag_id from action_gestion_comment where agc_comment ~* '".trim(sql_string($_REQUEST['action_query']))."')".
+                    "' or ag_id in (select ag_id from action_gestion_comment where agc_comment ilike '%".trim(sql_string($_REQUEST['action_query']))."%')".
                     ")";
         }
 
diff --git a/include/class/user.class.php b/include/class/user.class.php
index d2581204a..5cee77543 100644
--- a/include/class/user.class.php
+++ b/include/class/user.class.php
@@ -1050,20 +1050,24 @@ class User
 		{
 			// show only available folders
 			// if user is not an admin
-			$Res = $cn->exec_sql("select distinct dos_id,dos_name,dos_description 
+			$Res = $cn->exec_sql("select 
+    						distinct dos_id,dos_name,dos_description 
                             from ac_users
-                            natural join jnt_use_dos
-                            natural join  ac_dossier
+								natural join jnt_use_dos
+								natural join  ac_dossier
                             where
-                            use_login= $1
-                            and use_active = 1
-                            and ( dos_name ~* $2 or dos_description ~* $2 )
+								use_login= $1
+								and use_active = 1
+								and ( dos_name ilike '%' || $2 || '%' or dos_description ilike '%' || $2 || '%' )
                             order by dos_name", array($this->login, $p_filter));
 		}
 		else
 		{
-			$Res = $cn->exec_sql("select distinct dos_id,dos_name,dos_description from ac_dossier
-             where   dos_name ~* $1 or dos_description ~* $1 order by dos_name", array($p_filter));
+			$Res = $cn->exec_sql("select 
+    			distinct dos_id,dos_name,dos_description from ac_dossier
+             where   
+                   dos_name  ilike '%' || $1|| '%' or dos_description ilike '%' || $1 || '%' 
+			  order by dos_name", array($p_filter));
 		}
 		require_once NOALYSS_INCLUDE.'/class/database.class.php';
 

From bfbec6b625dc114a5c5139924f4eb9f114dd6b94 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Sun, 2 Aug 2020 13:40:30 +0200
Subject: [PATCH 004/257] Bug : syntax error

---
 include/database.item.php | 36 ++----------------------------------
 1 file changed, 2 insertions(+), 34 deletions(-)

diff --git a/include/database.item.php b/include/database.item.php
index e309c3de1..1f57311ef 100644
--- a/include/database.item.php
+++ b/include/database.item.php
@@ -1,6 +1,5 @@
 <?php 
-Timing is on.
-Autocommit is  OFF
+
 $menu[]=_('Achat');  $desc[]=_('Nouvel achat ou dépense');$desc_long[]=_('Vous permet d\'encoder des achats, dépenses, des notes de frais ou des notes de crédits, vous pouvez spécifier un bénéficiaire ou un autre moyen de paiement');
 $menu[]=_('Historique');  $desc[]=_('Historique des imputations analytiques');$desc_long[]=_('Historique des imputations analytiques');
 $menu[]=_('Balance simple');  $desc[]=_('Balance simple des imputations analytiques');$desc_long[]=_('Balance simple des imputations analytiques');
@@ -141,11 +140,8 @@ $menu[]=_('Export ANC');
 $menu[]=_('Résumé TVA');  $desc[]=_('totaux  par TVA et par journal');$desc_long[]=_('Calcul des totaux  par TVA et par journal');
 $menu[]=_('Export Résumé TVA');  
 $menu[]=_('Export Résumé TVA');  
-Time: 1,027 ms
 ?>
 <?php 
-Timing is on.
-Autocommit is  OFF
 $attr_def[]=_('Durée Amortissement');
 $attr_def[]=_('Montant initial');
 $attr_def[]=_('TVA non déductible');
@@ -181,11 +177,8 @@ $attr_def[]=_('Gestion stock');
 $attr_def[]=_('Prix vente');
 $attr_def[]=_('Prix achat');
 $attr_def[]=_('Société');
-Time: 1,164 ms
 ?>
 <?php 
-Timing is on.
-Autocommit is  OFF
 $document_type[]=_('Document Interne');
 $document_type[]=_('Bons de commande client');
 $document_type[]=_('Bon de commande Fournisseur');
@@ -199,11 +192,8 @@ $document_type[]=_('Note de frais');
 $document_type[]=_('Réception commande Fournisseur');
 $document_type[]=_('Réception commande Client');
 $document_type[]=_('Réception magazine');
-Time: 1,120 ms
 ?>
 <?php 
-Timing is on.
-Autocommit is  OFF
 $action[]=_('Ajout de fiche');
 $action[]=_('Création, modification et effacement de fiche');
 $action[]=_('création, modification et effacement de catégorie de fiche');
@@ -215,52 +205,30 @@ $action[]=_('Effacer une opération ');
 $action[]=_('Partager une note');
 $action[]=_('Créer une note publique');
 $action[]=_('Effacer une note publique');
-Time: 0,661 ms
 ?>
 <?php 
-Timing is on.
-Autocommit is  OFF
 $mdp[]=_('Caisse');
 $mdp[]=_('Paiement électronique');
 $mdp[]=_('Caisse');
 $mdp[]=_('Par gérant ou administrateur');
-Time: 1,068 ms
 ?>
 <?php 
-Timing is on.
-Autocommit is  OFF
 $jrn_def_name[]=_('Opération Diverses');
 $jrn_def_name[]=_('Financier');
 $jrn_def_name[]=_('Vente');
 $jrn_def_name[]=_('Achat');
 $jrn_def_name[]=_('Note de crédit');
-Time: 1,213 ms
 ?>
 <?php 
-Timing is on.
-Autocommit is  OFF
 $jrn_def_description[]=_('Concerne toutes les opérations comme les amortissements, les comptes TVA, ...');
 $jrn_def_description[]=_('Concerne tous les mouvements financiers (comptes en banque, caisses, visa...)');
 $jrn_def_description[]=_('Concerne toutes les ventes, notes de crédit envoyées');
 $jrn_def_description[]=_('Concerne tous les achats, factures reçues, notes de crédit reçues et notes de frais');
-
-Time: 0,806 ms
 ?>
 <?php 
-Timing is on.
-Autocommit is  OFF
 $jrn_type[]=_('Financier');
 $jrn_type[]=_('Vente');
 $jrn_type[]=_('Achat');
 $jrn_type[]=_('Opérations Diverses');
-Time: 0,523 ms
-?>
-Timing is on.
-Autocommit is  OFF
-\jrn_def_negative_warning[]=_('Attention, ce journal doit utiliser des montants négatifs');
-\jrn_def_negative_warning[]=_('Attention, ce journal doit utiliser des montants négatifs');
-\jrn_def_negative_warning[]=_('WARNING ! WARNING !');
-\jrn_def_negative_warning[]=_('Attention, ce journal doit utiliser des montants négatifs');
-\jrn_def_negative_warning[]=_('Attention, ce journal doit utiliser des montants négatifs');
-Time: 1,223 ms
+$jrn_def_negative_warning[]=_('Attention, ce journal doit utiliser des montants négatifs');
 ?>

From 23b88e2bb889991c41a5b64dbae228ddac1ff186 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Tue, 18 Aug 2020 19:11:23 +0200
Subject: [PATCH 005/257] reconcilaction : possibility to select only one
 operation

---
 html/js/scripts.js                          |  12 ++-
 include/ajax/ajax_search_operation.php      |   3 +
 include/class/acc_ledger_search.class.php   |   3 +
 include/lib/iconcerned.class.php            | 100 +++++++++++++-------
 unit-test/include/class/acc_ledger.Test.php |  65 +++++++++----
 5 files changed, 125 insertions(+), 58 deletions(-)

diff --git a/html/js/scripts.js b/html/js/scripts.js
index 404e99eff..ce350f34b 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -1304,6 +1304,7 @@ function search_reconcile(dossier, ctl_concern, amount_id, ledger, p_id_target,
     str_style += ";width:92%;overflow:auto;";
     waiting_box();
     var hide_operation = $(ctl_concern).getAttribute("hide_operation");
+    var single_operation = $(ctl_concern).getAttribute("single_operation");
 
     var param_send = {gDossier: dossier,
         ctlc: ctl_concern,
@@ -1313,7 +1314,8 @@ function search_reconcile(dossier, ctl_concern, amount_id, ledger, p_id_target,
         ledger: ledger,
         target: target,
         tiers: tiers,
-        hide_operation: hide_operation
+        hide_operation: hide_operation,
+        single_operation:single_operation
     };
 
     var qs = encodeJSON(param_send);
@@ -1381,6 +1383,7 @@ function set_reconcile(obj)
         if (!obj.elements['target'])
             return;
         var target = obj.elements['target'].value;
+        var single_operation = obj.elements['single_operation'].value;
         for (var e = 0; e < obj.elements.length; e++)
         {
 
@@ -1414,7 +1417,12 @@ function set_reconcile(obj)
                             });
                         }
                     }
-                    $(ctlc.value).value += nValue;
+                    if (single_operation==0) {
+                        $(ctlc.value).value += nValue;
+                    } else {
+                        $(ctlc.value).value = nValue;
+                        
+                    }
                 }
             }
         }
diff --git a/include/ajax/ajax_search_operation.php b/include/ajax/ajax_search_operation.php
index 0c4701187..f5a541ac4 100644
--- a/include/ajax/ajax_search_operation.php
+++ b/include/ajax/ajax_search_operation.php
@@ -109,6 +109,8 @@ if (isset($_GET['viewsearch']))
         list($array['date_start'], $array['date_end'])=$g_user->get_limit_current_exercice();
     }
     $array['hide_operation']=$hide_operation;
+    $array['single_operation']=$http->get("single_operation");
+    
     list($sql, $where)=$ledger->build_search_sql($array);
     // Count nb of line
     $max_line=$cn->count_sql($sql);
@@ -128,6 +130,7 @@ if (isset($_GET['viewsearch']))
         }
     }
     echo '<form method="get" onsubmit="set_reconcile(this);return false">';
+    echo HtmlInput::hidden("single_operation", $array['single_operation']);
     echo HtmlInput::hidden("tiers", $tiers);
     echo HtmlInput::submit("upd_rec", _("Mettre à jour"));
     echo HtmlInput::get_to_hidden(array('ctlc', 'amount_id', 'ledger'));
diff --git a/include/class/acc_ledger_search.class.php b/include/class/acc_ledger_search.class.php
index 198b0e7ac..d2e7fa76e 100644
--- a/include/class/acc_ledger_search.class.php
+++ b/include/class/acc_ledger_search.class.php
@@ -224,6 +224,9 @@ class Acc_Ledger_Search
         if (isset($_REQUEST['hide_operation']))
             $r.=HtmlInput::hidden("hide_operation", $http->request('hide_operation'));
         
+        if (isset($_REQUEST['single_operation']))
+            $r.=HtmlInput::hidden("single_operation", $http->request('single_operation'));
+        
         ob_start();
         $search_filter=$this->build_search_filter();
         require_once NOALYSS_TEMPLATE.'/ledger_search.php';
diff --git a/include/lib/iconcerned.class.php b/include/lib/iconcerned.class.php
index d43fa3e4c..2c4a4187f 100644
--- a/include/lib/iconcerned.class.php
+++ b/include/lib/iconcerned.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  *   This file is part of NOALYSS.
  *
@@ -15,78 +16,105 @@
  *   You should have received a copy of the GNU General Public License
  *   along with NOALYSS; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+ */
 
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
 
-/*!\file
+/* !\file
  * \brief Html Input
  *  - name is the name and id of the input
  *  - extra amount of the operation to reconcile
  *  - extra2 ledger paid
  */
 require_once NOALYSS_INCLUDE.'/lib/html_input.class.php';
+
 class IConcerned extends HtmlInput
 {
-    private $hideOperation; //!< string of j_id to hide, separated by comma to avoid to reconcile an operation with itself
 
-	public function __construct($p_name='',$p_value='',$p_id="")
-	{
-		$this->name=$p_name;
-		$this->value=$p_value;
-		$this->amount_id=null;
-		$this->paid='';
-		$this->id=$p_id;
-        $this->tiers=""; // id of the field for the tiers to be updated
-        $this->div=""; // Dom Element to show the search result
-        $this->hideOperation=""; // string of j_id to hide, separated by comma to avoid to reconcile an operation with itself
-	}
-    /*!\brief show the html  input of the widget*/
-    public function input($p_name=null,$p_value=null)
+    private $hideOperation; //!< string of j_id to hide, separated by comma to avoid to reconcile an operation with itself
+    private $singleOperation; //!< do not allow to select several operations
+
+    public function __construct($p_name='', $p_value='', $p_id="")
+    {
+        $this->name=$p_name;
+        $this->value=$p_value;
+        $this->amount_id=null;
+        $this->paid='';
+        $this->id=$p_id;
+        // id of the field for the tiers to be updated
+        $this->tiers="";
+        // Dom Element to show the search result
+        $this->div="";
+        // string of j_id to hide, separated by comma to avoid to reconcile an operation with itself
+        $this->hideOperation="";
+        // by default we can select several operation
+        $this->singleOperation=0; 
+    }
+
+    /* !\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();
+        if ($this->readOnly==true)
+            return $this->display();
 
         $this->id=($this->id=="")?$this->name:$this->id;
-        $javascript=sprintf("search_reconcile(".dossier::id().",'%s','%s','%s','%s','%s')",
-                    $this->name,
-                    $this->amount_id,
-                    $this->paid,
-                    $this->div,
-                    $this->tiers  );
+        $javascript=sprintf("search_reconcile(".dossier::id().",'%s','%s','%s','%s','%s')", $this->name,
+                $this->amount_id, $this->paid, $this->div, $this->tiers);
         $r=Icon_Action::icon_magnifier(uniqid(), $javascript);
         $r.=sprintf("
-                   <INPUT TYPE=\"text\"  style=\"color:black;background:lightyellow;border:solid 1px grey;\"  NAME=\"%s\" ID=\"%s\" VALUE=\"%s\" SIZE=\"8\" hide_operation=\"%s\" readonly>
+                   <INPUT TYPE=\"text\"  style=\"color:black;background:lightyellow;border:solid 1px grey;\"  NAME=\"%s\" ID=\"%s\" VALUE=\"%s\" SIZE=\"8\" hide_operation=\"%s\" readonly single_operation=\"%s\">
 				   <INPUT class=\"smallbutton\"  TYPE=\"button\" onClick=\"$('%s').value=''\" value=\"X\">
 
-                   ",
-                   $this->name,
-                   $this->id,
-                   $this->value,
-                   $this->hideOperation,
-                   $this->id
-                  );
+                   ", $this->name, $this->id, $this->value, $this->hideOperation,$this->singleOperation,
+                $this->id
+        );
         return $r;
     }
 
     /**
      * setter
-     * @param $p_string
+     * @param number $p_string  jrn.jr_id of the operation to hide
      */
     function set_hideOperation($p_string)
     {
         $this->hideOperation=strip_tags($p_string);
     }
-    /*!\brief print in html the readonly value of the widget*/
+
+    /**
+     * Set the value of single operation, limit to one operation if TRUE
+     * @param bool $p_value TRUE or false
+     */
+    function set_singleOperation($p_value){
+        if ( $p_value == TRUE  ) {
+            $this->singleOperation=1;
+            return;
+        }
+        if ( $p_value == FALSE ) {
+            $this->singleOperation=0;
+            return;
+        }
+        throw new Exception (_("setSingleOperation failed"));
+    }
+    
+    function get_singleOperation(){
+        return $this->singleOperation;
+    }
+    
+    /* !\brief print in html the readonly value of the widget */
+
     public function display()
     {
-        $r=sprintf("<span><b>%s</b></span>",$this->value);
-        $r.=sprintf('<input type="hidden" name="%s" value="%s">', $this->name,$this->value);
+        $r=sprintf("<span><b>%s</b></span>", $this->value);
+        $r.=sprintf('<input type="hidden" name="%s" value="%s">', $this->name, $this->value);
         return $r;
-
     }
+
     static public function test_me()
     {
+        
     }
+
 }
diff --git a/unit-test/include/class/acc_ledger.Test.php b/unit-test/include/class/acc_ledger.Test.php
index 93e8af5bc..8edb68d36 100644
--- a/unit-test/include/class/acc_ledger.Test.php
+++ b/unit-test/include/class/acc_ledger.Test.php
@@ -443,31 +443,56 @@ class Acc_LedgerTest extends TestCase
      */
     public function testVerify_Ledger()
     {
-        global $g_connection;
+       global $g_connection;
        $ledger=new Acc_Ledger($g_connection,4);
        $array=[
-           "p_jrn"=>"15",
-           "p_jrn_deb_max_line"=>5,
-           "p_jrn_name"=>"New ledger",
-           "p_jrn_type"=>"ODS"
-       ];
-       // Must success
-       try {
-           $ledger->verify_ledger($array);
-           $this->assertTrue(TRUE);
-       } catch (Exception $ex) {
-           var_dump($ex->getMessage());
-           var_dump($ex->getTraceAsString());
-       }
+            "p_jrn"=>"15",
+            "p_jrn_deb_max_line"=>5,
+            "p_jrn_name"=>"New ledger",
+            "p_jrn_type"=>"ODS"
+            ];
+       //-----------------------------------------------
+       // Must succeed
+       //-----------------------------------------------
+      $ledger->verify_ledger($array);
+      
        
+       // succeeds if negative amount  1
+       $array["negative_amount"]=1;
+       $ledger->verify_ledger($array);
+       
+       //-----------------------------------------------
        // Must fail
-       $a_ledger["p_jrn"]="a";
+       //-----------------------------------------------
        try {
-           $ledger->verify_ledger($array);
-           $this->assertTrue(FALSE);
-       } catch (Exception $ex) {
-           $this->assertTrue(TRUE);
-       }
+            $array["p_jrn"]="a";
+            $ledger->verify_ledger($array);
+            $this->assertTrue(FALSE,"p_jrn is invalide");
+        }catch (\Exception $e) {
+            $this->assertTrue(TRUE);
+        }
+       // reset properly ,
+       $array["p_jrn"]="15";
+       $ledger->verify_ledger($array);
+
+       
+       // fails if negative amount neither 1 nor 0
+       try {
+            $array["negative_amount"]=2;
+            $ledger->verify_ledger($array);
+            $this->assertTrue(FALSE,"negative_amount must be 1 or 0");
+        }catch (\Exception $e) {
+            $this->assertTrue(TRUE);
+        }
+       
+        // negative amount not set , so fails
+       try {
+            $array["negative_warning"]="Yes";
+            $ledger->verify_ledger($array);
+            $this->assertTrue(FALSE,"negative_warning must be a string");
+        }catch (\Exception $e) {
+            $this->assertTrue(TRUE);
+        }
     }
 
     /**

From 5779e2f33c310baed5ea1639475a1a4b27a7ee08 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Tue, 18 Aug 2020 19:11:46 +0200
Subject: [PATCH 006/257] prevent divide by zero in formula

---
 include/lib/ac_common.php     | 23 ++++++++++++++++++++---
 include/lib/impress.class.php |  4 ++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/include/lib/ac_common.php b/include/lib/ac_common.php
index 44ee884ad..ff0f1e8f2 100644
--- a/include/lib/ac_common.php
+++ b/include/lib/ac_common.php
@@ -209,13 +209,13 @@ function cmpDate($p_date, $p_date_oth)
 /***!
  * @brief check if the argument is a number
  *
- * \param $p_int number to test
+ * @param $p_int number to test
  *
- * \return
+ * @return
  *        - 1 it's a number
  *        - 0 it is not
  */
-function isNumber(&$p_int)
+function isNumber($p_int)
 {
     if (strlen(trim($p_int)) == 0)
 	return 0;
@@ -1375,3 +1375,20 @@ function convert_to_rtf($p_string)
     }
     return $result;
 }
+/**
+ * When it is needed to eval a formula , this function prevent the divide by zero.
+ * the formula is a math operation to evaluate like : 1.0+2.0/1 (...) , it is used in "report", 
+ * it removes the operation "divide by 0 "
+ * 
+ * @param string $p_formula string containing a operation to evaluate
+ * 
+ * @see Impress::parse_formula
+ */
+function remove_divide_zero($p_formula)
+{
+    $test=str_replace(" ","",$p_formula).";";
+    $p_formula=preg_replace("![0-9]+\.*[0-9]*/0\.{0,1}0*(\+|-|\*|/|;){1}!","0$1",$test);
+    $p_formula=trim($p_formula,';');
+    return $p_formula;
+}
+
diff --git a/include/lib/impress.class.php b/include/lib/impress.class.php
index 0a8beb32b..8ea617f11 100644
--- a/include/lib/impress.class.php
+++ b/include/lib/impress.class.php
@@ -153,6 +153,10 @@ class Impress
         // $p_eval is true then we eval and returns result
         if ( $p_eval == true)
         {
+            /*-------------------------------------
+             * Protect againt division by zero 
+             */
+            $p_formula=remove_divide_zero($p_formula);
             $p_formula="\$result=".$p_formula.";";
             eval("$p_formula");
 

From c91e64125a69a4ee4ee18a0119c6a69c2b48da7b Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Tue, 18 Aug 2020 19:12:29 +0200
Subject: [PATCH 007/257] remove extract

---
 include/class/acc_ledger.class.php | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/include/class/acc_ledger.class.php b/include/class/acc_ledger.class.php
index 30df01e4d..877738b9e 100644
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@ -2351,7 +2351,12 @@ class Acc_Ledger  extends jrn_def_sql
      */
     function verify_ledger($array)
     {
-        extract($array, EXTR_SKIP);
+        
+        $p_jrn=$array['p_jrn'];
+        $p_jrn_deb_max_line=$array['p_jrn_deb_max_line'];
+        $p_jrn_name=$array['p_jrn_name'];
+        $p_jrn_type=$array['p_jrn_type'];
+        
         try
         {
             if (isNumber($p_jrn)==0)
@@ -2365,8 +2370,10 @@ class Acc_Ledger  extends jrn_def_sql
                 throw new Exception(_("Un journal avec ce nom existe déjà"));
             if ($p_jrn_type=='FIN')
             {
+                $http=new \HttpInput();
                 $a=new Fiche($this->db);
-                $result=$a->get_by_qcode(trim(strtoupper($_POST['bank'])), false);
+                $bank=$http->post("bank");
+                $result=$a->get_by_qcode(trim(strtoupper($bank)), false);
                 if ($result==1)
                     throw new Exception(_("Aucun compte en banque n'est donné"));
             }
@@ -2375,11 +2382,17 @@ class Acc_Ledger  extends jrn_def_sql
                 throw new Exception(_('Choix du type de journal est obligatoire'));
             }
 
-           if (isset( $negative_warning) && $negative_amount == 1 && trim($negative_warning)=="") {
+           if ( isset( $array['negative_warning']) && 
+                isset( $array['negative_amount']) &&
+                $array['negative_amount'] == 1 
+                   && trim($array['negative_warning'])=="") {
 
                 throw new Exception(_("Avertissement ne peut être vide"));
             }
-            if ( isset( $negative_amount)  && $negative_amount <> 0 && $negative_amount <> 1 ){
+            if ( isset( $array['negative_amount'])  &&
+                 $array['negative_amount'] <> 0 &&
+                 $array['negative_amount'] <> 1 )
+             {
                   throw new Exception(_("Valeur invalide"));
             }
         }

From 7f6ae783af0fbc39fcb23147bea4e5c042944193 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Wed, 19 Aug 2020 17:24:27 +0200
Subject: [PATCH 008/257] compatibility PHP74 : join() : glue before piece

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

diff --git a/include/class/acc_ledger_history_generic.class.php b/include/class/acc_ledger_history_generic.class.php
index 54ee8312b..a50f142d8 100644
--- a/include/class/acc_ledger_history_generic.class.php
+++ b/include/class/acc_ledger_history_generic.class.php
@@ -494,7 +494,7 @@ class Acc_Ledger_History_Generic extends Acc_Ledger_History
 
         $cond_limite=($p_limit!=-1)?" limit ".$p_limit." offset ".$p_offset:"";
 
-        $ledger_list=join($this->ma_ledger, ",");
+        $ledger_list=join( ",",$this->ma_ledger);
 // Grand livre == 0
         $Res=$this->db->exec_sql("select jr_id,j_id,j_id as int_j_id,to_char(j_date,'DD.MM.YYYY') as j_date,
                                      jr_internal,

From 03ad5cd3fd76fb7f6a5830855c15cc0ca36cec90 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Thu, 27 Aug 2020 20:31:23 +0200
Subject: [PATCH 009/257] Fix bug : cannot use % when searching NEW : space can
 be used now

---
 html/js/card.js               | 2 ++
 include/ajax/ajax_card.php    | 8 +++++---
 include/class/fiche.class.php | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/html/js/card.js b/html/js/card.js
index 8c7b918ad..6212658a0 100644
--- a/html/js/card.js
+++ b/html/js/card.js
@@ -274,7 +274,9 @@ function search_get_card(obj)
     } else {
         queryString+="&accvis=0";
     }
+    queryString=encodeURI(queryString);
     $('asearch').innerHTML=loading();
+    
     var action=new Ajax.Request ( 'ajax_misc.php',
                                   {
                                   method:'get',
diff --git a/include/ajax/ajax_card.php b/include/ajax/ajax_card.php
index 9b61631ba..74a3d5b8f 100644
--- a/include/ajax/ajax_card.php
+++ b/include/ajax/ajax_card.php
@@ -441,7 +441,7 @@ case 'fs':
 	$r.='</span>';
     $r.=dossier::hidden().HtmlInput::hidden('op','fs');
     $array=array();
-    foreach (array('accvis','query','inp','jrn','label','typecard','price','tvaid') as $i)
+    foreach (array('accvis','inp','jrn','label','typecard','price','tvaid') as $i)
     {
         if  (isset(${$i}) )
         {
@@ -449,6 +449,7 @@ case 'fs':
             $sql_array[$i]=${$i};
         }
     }
+    $sql_array["query"]=$query;
     /* what is the type of the ledger */
     $type="GL";
     if (isset($jrn) && $jrn > 1)
@@ -462,12 +463,13 @@ case 'fs':
 
     if ( strpos($sql," in ()") != 0)
     {
-            $html=Icon_Action::close('search_card');
-             $html.='<div> '.h2info(_('Recherche de fiche')).'</div>';
+            $html="";
+             $html.=HtmlInput::title_box(_('Recherche de fiche'), 'search_card');
              $html.='<h3 class="notice">';
              $html.=_("Aucune catégorie de fiche ne correspond à".
             " votre demande, le journal pourrait n'avoir accès à aucune fiche");
              $html.='</h3>';
+             $html.=HtmlInput::button_close("search_card");
              break;
     }
      /* We limit the search to MAX_SEARCH_CARD records */
diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index 876351e36..565612c87 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -2131,8 +2131,9 @@ class Fiche
         {
             $query=sql_string($query);
 
-            if (strlen(trim($query))>1)
+            if (strlen(trim($query))>0)
             {
+                $query=str_replace(" ", "%", $query);
                 $filter_query=$and."(vw_name ilike '%$query%' or quick_code ilike ('%$query%') "
                         ." or vw_description ilike '%$query%' or tva_num ilike '%$query%' or accounting like upper('$query%'))";
             }

From 76b50bd50bbd5f05b4e24ed6ba8e8e09045ac772 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 21 Sep 2020 21:11:36 +0200
Subject: [PATCH 010/257] Bug : cannot export Follow Up

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

diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 29164ce8d..64f86c9cb 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -39,6 +39,8 @@ require_once NOALYSS_INCLUDE.'/lib/irelated_action.class.php';
 require_once NOALYSS_INCLUDE.'/class/tag.class.php';
 require_once NOALYSS_INCLUDE.'/class/default_menu.class.php';
 require_once NOALYSS_INCLUDE.'/lib/inplace_edit.class.php';
+require_once NOALYSS_INCLUDE.'/lib/noalyss_csv.class.php';
+
 /**
  * \file
  * \brief class_action for manipulating actions

From 6ec369bc0dabcbb3970f8bfaeb428ddffea78263 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 21 Sep 2020 21:40:30 +0200
Subject: [PATCH 011/257] Remove debug info

---
 html/js/acc_ledger.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/html/js/acc_ledger.js b/html/js/acc_ledger.js
index 8be1fa5e6..aa4fe83ce 100644
--- a/html/js/acc_ledger.js
+++ b/html/js/acc_ledger.js
@@ -1487,17 +1487,13 @@ function duplicate_operation(p_dossier,p_jr_id) {
                             },
                             onSuccess:function(req) {
                                 remove_waiting_box();
-                                console.debug("success");
                                 var xml=req.responseXML;
                                 console.debug ("received"+xml);
                                 if ( xml.getElementsByTagName("ctl").length==0) {
                                     console.log("erreur"+req.responseText);
                                 }
-                                console.debug("ok we display");
                                  add_div(duplicate_div);
-                                console.debug (getNodeText(xml.getElementsByTagName("code")[0]));
                                 
-                                console.debug("fill div");
                                 duplicate_div.setStyle({"position":"fixed","top":"15%","z-index":"999",
                                     "min-width":"30rem",
                                     "left":"30%",

From 44dbd495a6ee269b516ba2e329e82cda531d09ad Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 21 Sep 2020 21:40:50 +0200
Subject: [PATCH 012/257] Bug 1834 : duplicate , cannot confirm an duplicated
 operation because the $_GET is taken in priority

---
 include/class/acc_operation.class.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/include/class/acc_operation.class.php b/include/class/acc_operation.class.php
index 7639d9d26..e1930efc1 100644
--- a/include/class/acc_operation.class.php
+++ b/include/class/acc_operation.class.php
@@ -741,17 +741,22 @@ class Acc_Operation
         $operation = $this->get_quant();
         $array=$operation->compute_array();
         global $g_user;
-        // Prepare the form
-        $r='<form id="'.$p_id.'" method="POST">';
-        $r.=Dossier::hidden();
         $a_code=$this->db->get_array("select code from v_menu_dependency vmd  where me_code=$1 and p_id=$2",
                 array( $operation->signature,$g_user->get_profile()));
-        
-        // select the menu where the operation will be duplicated
         if ( empty ($a_code)) {
             $r.=_("Menu invalide");
             return $r;
         }
+        /** 
+         * @bug : if several menu possible , will use only the first one, because request take first the GET and after
+         * the POST
+         */
+        // Prepare the form
+        $r=sprintf('<form id="%s" method="POST" ACTION="%s">',$p_id,NOALYSS_URL."/do.php?".http_build_query([
+                "ac"=>$a_code[0]['code'],"gDossier"=>Dossier::id()
+        ]));
+        $r.=Dossier::hidden();
+        // select the menu where the operation will be duplicated
         $r.="<p>";
         $r.="<ul style=\"margin-left:2rem;padding-left:0;list-style:none;\">";
         $r.=sprintf("<li>%s</li>",$operation->det->jr_pj_number);

From 455a072e272683aaea36464885c7a4a91e95ace6 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 21 Sep 2020 22:05:02 +0200
Subject: [PATCH 013/257] Improve use of the security

---
 html/style-classic7.css                   |  5 ++
 include/ajax/ajax_get_profile.php         |  5 +-
 include/class/extension.class.php         |  6 ++
 include/param_sec.inc.php                 | 74 ++++++++++++++---------
 include/template/security_list_action.php |  3 +-
 5 files changed, 62 insertions(+), 31 deletions(-)

diff --git a/html/style-classic7.css b/html/style-classic7.css
index 866f4d34a..56db14ecb 100644
--- a/html/style-classic7.css
+++ b/html/style-classic7.css
@@ -2469,3 +2469,8 @@ span.title_tab_row {
      color : white !important;
      
 }
+p.info {
+    font-size:90%;
+    font-family: sans-serif;
+    font-style: italic;
+}
\ No newline at end of file
diff --git a/include/ajax/ajax_get_profile.php b/include/ajax/ajax_get_profile.php
index 586a92d66..9f92f8d2b 100644
--- a/include/ajax/ajax_get_profile.php
+++ b/include/ajax/ajax_get_profile.php
@@ -55,7 +55,7 @@ $a_tab[$call_tab]='tabs_selected';
     <li class="<?php echo $a_tab['profile_gen_div']?>"><a href="javascript:void(0)"  onclick="unselect_other_tab(this.parentNode.parentNode);this.parentNode.className='tabs_selected';profile_show('profile_gen_div')"><?php echo _('Nom')?></a></li>
     <li class="<?php echo $a_tab['profile_menu_div']?>"><a href="javascript:void(0)"  onclick="unselect_other_tab(this.parentNode.parentNode);this.parentNode.className='tabs_selected';profile_show('profile_menu_div')"><?php echo _('Détail Menus')?></a></li>
     <li class="<?php echo $a_tab['profile_print_div']?>"><a href="javascript:void(0)" onclick="unselect_other_tab(this.parentNode.parentNode);this.parentNode.className='tabs_selected';profile_show('profile_print_div')"><?php echo _('Détail Impressions')?></a></li>
-    <li class="<?php echo $a_tab['profile_gestion_div']?>"><a href="javascript:void(0)" style="" onclick="unselect_other_tab(this.parentNode.parentNode);this.parentNode.className='tabs_selected';profile_show('profile_gestion_div')"><?php echo _('Action Gestion')?> </a></li>
+    <li class="<?php echo $a_tab['profile_gestion_div']?>"><a href="javascript:void(0)" style="" onclick="unselect_other_tab(this.parentNode.parentNode);this.parentNode.className='tabs_selected';profile_show('profile_gestion_div')"><?php echo _('Groupe Gestion')?> </a></li>
     <li class="<?php echo $a_tab['profile_repo_div']?>"><a href="javascript:void(0)"  onclick="unselect_other_tab(this.parentNode.parentNode);this.parentNode.className='tabs_selected';profile_show('profile_repo_div')"><?php echo _('Dépôts')?></a>&nbsp;
 </ul>
 
@@ -111,7 +111,6 @@ if ($profile->p_id > 0)
         echo '</div>';
         echo '<div class="myfieldset"  style="display:none" id="profile_menu_div">';
 	//Menu / Module /plugin in this profile
-	echo "<h1 class=\"legend\">"._("Menu")."</h2>";
 	$profile_menu = new Profile_Menu($cn);
         $profile_menu->p_id=$p_id;
 	$profile_menu->display_profile_menu_detail();
@@ -122,7 +121,7 @@ if ($profile->p_id > 0)
 	echo $add_impression;
         echo '</div>';
         echo '<div class="myfieldset"  style="display:none" id="profile_gestion_div">';
-	echo "<h1 class=\"legend\">".('Groupe gestion')."</h1>";
+	
 	$profile_menu->available_profile();
         echo '</div>';
         echo '<div class="myfieldset"  style="display:none" id="profile_repo_div">';
diff --git a/include/class/extension.class.php b/include/class/extension.class.php
index 5fad200ec..1b321fe60 100644
--- a/include/class/extension.class.php
+++ b/include/class/extension.class.php
@@ -251,6 +251,12 @@ class Extension extends Menu_Ref_sql
         }
     }
 
+    /**
+     * compare the version of the plugin and the last version , propose to update it if a new version exists
+     * @todo add a mechanism to check once a day
+     * @global User $g_user
+     * @global number $version_plugin
+     */
     static function check_plugin_version()
     {
         global $g_user, $version_plugin;
diff --git a/include/param_sec.inc.php b/include/param_sec.inc.php
index 244769209..d40d08472 100644
--- a/include/param_sec.inc.php
+++ b/include/param_sec.inc.php
@@ -51,6 +51,7 @@ require_once  NOALYSS_INCLUDE.'/lib/user_menu.php';
 if ( ! isset($_REQUEST['action']))
 {
 	$base_url=$_SERVER['PHP_SELF']."?ac=".$_REQUEST['ac']."&".dossier::get();
+        $base_url=NOALYSS_URL."/do.php?".http_build_query(array("ac"=>$http->request("ac"),"gDossier"=>dossier::id()));
 
     echo '<DIV class="content" >';
 	$header=new Sort_Table();
@@ -59,7 +60,7 @@ if ( ! isset($_REQUEST['action']))
 	$header->add(_("Type d'utilisateur"),$base_url,"order by use_admin asc,use_login asc","order by use_admin desc,use_login desc",'ta','td');
 
 
-	$order=(isset($_REQUEST['ord']))?$_REQUEST['ord']:'la';
+	$order=$http->request("ord","string","la");
 
 	$ord_sql=$header->get_sql_order($order);
 
@@ -73,12 +74,13 @@ if ( ! isset($_REQUEST['action']))
                                             use_admin
                                                 from ac_users left join jnt_use_dos using (use_id)
 					where use_login != $2 and use_active=1
-					and (dos_id=$1  or (dos_id is null and use_admin=1))" . $ord_sql, array($gDossier,NOALYSS_ADMINISTRATOR));
+					and (dos_id=$1  or (dos_id is null and use_admin=1))" . $ord_sql, 
+                array($gDossier,NOALYSS_ADMINISTRATOR));
 
     $MaxUser = Database::num_row($user_sql);
 
 
-    echo '<TABLE class="result" style="width:80%;margin-left:10%">';
+    echo '<TABLE class="result" >';
 	echo "<tr>";
 	echo '<th>'.$header->get_header(0).'</th>';
 	echo '<th>'.$header->get_header(1).'</th>';
@@ -98,24 +100,28 @@ if ( ! isset($_REQUEST['action']))
         if ( $l_line['use_admin'] == 1 )
             $str=_('Administrateur');
 
-		// get profile
-		$profile=$cn->get_value("select p_name from profile
-				join profile_user using(p_id) where user_name=$1",array($l_line['use_login']));
+        // get profile
+        $profile=$cn->get_value("select p_name from profile
+                        join profile_user using(p_id) where user_name=$1",array($l_line['use_login']));
 
-		$url=$base_url."&action=view&user_id=".$l_line['use_id'];
-		echo "<td>";
-		echo HtmlInput::anchor($l_line['use_login'], $url);
-		echo "</td>";
-		echo td($l_line['use_name']);
-		echo td($l_line['use_first_name']);
-		echo td($profile);
-                // status of security on ledger and action 
-                $a_sec=$cn->get_row("select us_ledger,us_action from user_active_security where us_login =$1",
-                        [$l_line['use_login']]);
-                echo td($a_sec['us_ledger']);
-                echo td($a_sec['us_action']);
-		echo td($str);
-		echo "</TR>";
+        $url=$base_url."&action=view&user_id=".$l_line['use_id'];
+        echo "<td>";
+        echo HtmlInput::anchor($l_line['use_login'], $url);
+        echo "</td>";
+        echo td($l_line['use_name']);
+        echo td($l_line['use_first_name']);
+        echo td($profile);
+        // status of security on ledger and action 
+        $a_sec=$cn->get_row("select us_ledger,us_action from user_active_security where us_login =$1",
+                [$l_line['use_login']]);
+        if ( ! empty($a_sec )  )  {
+            echo td($a_sec['us_ledger']);
+            echo td($a_sec['us_action']);
+        } else {
+            echo td(_("Erreur sécurité"));
+        }
+        echo td($str);
+        echo "</TR>";
     }
     echo '</TABLE>';
 }
@@ -138,7 +144,7 @@ if ( isset ($_GET["action"] ))
 if ( $action == "view" )
 {
     $l_Db=sprintf("dossier%d",$gDossier);
-    $return= HtmlInput::button_anchor(_('Retour à la liste'),'?&ac='.$_REQUEST['ac'].'&'.dossier::get(),_('retour'),"",'smallbutton');
+    $return= HtmlInput::button_anchor(_('Retour à la liste'),'?&ac='.$http->request('ac').'&'.dossier::get(),_('retour'),"",'smallbutton');
 
     $repo=new Database();
     $user_id=$http->get('user_id',"number");
@@ -221,9 +227,7 @@ if ( $action == "view" )
     echo _("Profil")." ".$ie_profile->input();
     echo "</p>";
     echo '<Fieldset><legend>'._('Journaux').'</legend>';
-    echo HtmlInput::button("grant_all", _("Accès à tout"), " onclick=\" grant_ledgers ('W') \"");
-    echo HtmlInput::button("grant_readonly", _("Uniquement Lecture"), " onclick=\" grant_ledgers ('R') \"");
-    echo HtmlInput::button("revoke_all", _("Aucun accès"), " onclick=\" grant_ledgers ('X') \"");
+   
     //-------------------------------------------------------------------------
     // Enable or not the security on ledger
     //-------------------------------------------------------------------------
@@ -238,6 +242,7 @@ if ( $action == "view" )
         $status_sec_ledger=0;
         $sec_User->set_status_security_ledger(0);
     } else {
+      
         $sec_ledger=new Inplace_Switch("sec_ledger", $status_sec_ledger);
         $sec_ledger->set_callback("ajax_misc.php");
         $sec_ledger->add_json_param("gDossier", $n_dossier_id);
@@ -245,12 +250,19 @@ if ( $action == "view" )
         $sec_ledger->add_json_param("op", "user_sec_ledger");
         $sec_ledger->set_jscript(" if ( $('security_ledger_tbl').visible() ||  {$sec_User->Admin()}==1) { $('security_ledger_tbl').hide();} else { $('security_ledger_tbl').show();}");
         echo $sec_ledger->input();
+          echo "<p class='info'>";
+        echo _("La sécurité sur les journaux, permet de limiter l'accès de l'utilisateur aux journaux, si cette ".
+                " sécurité n'est pas activée , l'utilisateur a accès à tous les journaux en lecture et écriture");
+        echo "</p>";
     }
     echo "</p>";
     //------------------------------------------------------------------------
     // Access by ledgers, needed if the security on ledger is enable
     //------------------------------------------------------------------------
     echo '<div id="security_ledger_tbl">';
+    echo HtmlInput::button("grant_all", _("Accès à tout"), " onclick=\" grant_ledgers ('W') \"");
+    echo HtmlInput::button("grant_readonly", _("Uniquement Lecture"), " onclick=\" grant_ledgers ('R') \"");
+    echo HtmlInput::button("revoke_all", _("Aucun accès"), " onclick=\" grant_ledgers ('X') \"");
     echo '<table>';
     $MaxJrn=Database::num_row($Res);
     $jrn_priv=new ISelect("iledger");
@@ -285,12 +297,12 @@ if ( $action == "view" )
     echo '</div>';
     echo '</fieldset>';
 
+    echo '<hr>';
     //**********************************************************************
     // Show Priv. for actions
     //**********************************************************************
     echo '<fieldset> <legend>'._('Actions').'</legend>';
-    echo HtmlInput::button("grant_all_action", _("Toutes les actions"), " onclick=\" grant_action(1) \"");
-    echo HtmlInput::button("revoke_all_action", _("Aucune action"), " onclick=\" grant_action (0) \"");
+    
     //-------------------------------------------------------------------------
     // Enable or not the security on ledger
     //-------------------------------------------------------------------------
@@ -303,7 +315,7 @@ if ( $action == "view" )
         $status_sec_action=0;
         $sec_User->set_status_security_action(0);
     } else {
-
+        
         $status_sec_action=$sec_User->get_status_security_action();
         $sec_action=new Inplace_Switch("sec_action", $status_sec_action);
         $sec_action->set_callback("ajax_misc.php");
@@ -312,6 +324,10 @@ if ( $action == "view" )
         $sec_action->add_json_param("op", "user_sec_action");
         $sec_action->set_jscript(" if ( $('security_action_tbl').visible() ) { $('security_action_tbl').hide();} else { $('security_action_tbl').show();}");
         echo $sec_action->input();
+         echo "<p class='info'>";
+        echo _("La sécurité sur les actions permet de limiter ce que l'utilisateur peut faire, si "
+                . " elle n'est pas active l'utilisateur a donc accès à toutes ces actions");
+        echo "</p>";
     }
     echo "</p>";
     
@@ -358,7 +374,11 @@ if ( $action == "view" )
          var i=0;
         var str_id="";
         for (i = 0;i < a_select.length;i++) {
+            
           str_id = new String( a_select[i].id);
+          if ( str_id == 'sec_action')  {
+              continue;
+          }
            if ( str_id.search(/action/) > -1 ) {
              if ( p_value == 0 ) {
                  a_select[i].setStyle("color:red");
diff --git a/include/template/security_list_action.php b/include/template/security_list_action.php
index 6f1840895..c9ff9e60f 100644
--- a/include/template/security_list_action.php
+++ b/include/template/security_list_action.php
@@ -5,7 +5,8 @@
 <div id="security_action_tbl">
     
     <?php
-
+     echo HtmlInput::button("grant_all_action", _("Toutes les actions"), " onclick=\" grant_action(1) \"");
+    echo HtmlInput::button("revoke_all_action", _("Aucune action"), " onclick=\" grant_action (0) \"");
 	function display_security_fieldset($p_legend,$p_array,$sec_User) {
 
 	$gDossier=dossier::id();

From ecde330303984cf8d4052468e16867e84081b3b3 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 21 Sep 2020 21:40:50 +0200
Subject: [PATCH 014/257] Bug 1834 : duplicate , cannot confirm an duplicated
 operation because the $_GET is taken in priority

---
 include/class/acc_operation.class.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/include/class/acc_operation.class.php b/include/class/acc_operation.class.php
index 7639d9d26..e1930efc1 100644
--- a/include/class/acc_operation.class.php
+++ b/include/class/acc_operation.class.php
@@ -741,17 +741,22 @@ class Acc_Operation
         $operation = $this->get_quant();
         $array=$operation->compute_array();
         global $g_user;
-        // Prepare the form
-        $r='<form id="'.$p_id.'" method="POST">';
-        $r.=Dossier::hidden();
         $a_code=$this->db->get_array("select code from v_menu_dependency vmd  where me_code=$1 and p_id=$2",
                 array( $operation->signature,$g_user->get_profile()));
-        
-        // select the menu where the operation will be duplicated
         if ( empty ($a_code)) {
             $r.=_("Menu invalide");
             return $r;
         }
+        /** 
+         * @bug : if several menu possible , will use only the first one, because request take first the GET and after
+         * the POST
+         */
+        // Prepare the form
+        $r=sprintf('<form id="%s" method="POST" ACTION="%s">',$p_id,NOALYSS_URL."/do.php?".http_build_query([
+                "ac"=>$a_code[0]['code'],"gDossier"=>Dossier::id()
+        ]));
+        $r.=Dossier::hidden();
+        // select the menu where the operation will be duplicated
         $r.="<p>";
         $r.="<ul style=\"margin-left:2rem;padding-left:0;list-style:none;\">";
         $r.=sprintf("<li>%s</li>",$operation->det->jr_pj_number);

From 4628b10f2a3f3e5f044049bdc27629bd35bcdfff Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 21 Sep 2020 22:11:14 +0200
Subject: [PATCH 015/257] Bug 1834 : order POST over GET

---
 html/do.php                           | 6 ++++--
 include/class/acc_operation.class.php | 9 ++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/html/do.php b/html/do.php
index c957df934..49a2dccea 100644
--- a/html/do.php
+++ b/html/do.php
@@ -241,8 +241,10 @@ if (isset($_REQUEST['ac']))
         fclose($file_loginput);
     }
 
-    $_REQUEST['ac']=  trim(strtoupper($_REQUEST['ac']));
-    $AC=$http->request('ac');
+    $ac_post = trim(strtoupper($http->post("ac","string","")));
+    $ac_get  = trim(strtoupper($http->get("ac","string","")));
+    
+    $AC=($ac_post == "")?$ac_get:$ac_post;
     $user_profile=$g_user->get_profile();
     
     
diff --git a/include/class/acc_operation.class.php b/include/class/acc_operation.class.php
index e1930efc1..93f1775fd 100644
--- a/include/class/acc_operation.class.php
+++ b/include/class/acc_operation.class.php
@@ -747,14 +747,9 @@ class Acc_Operation
             $r.=_("Menu invalide");
             return $r;
         }
-        /** 
-         * @bug : if several menu possible , will use only the first one, because request take first the GET and after
-         * the POST
-         */
+       
         // Prepare the form
-        $r=sprintf('<form id="%s" method="POST" ACTION="%s">',$p_id,NOALYSS_URL."/do.php?".http_build_query([
-                "ac"=>$a_code[0]['code'],"gDossier"=>Dossier::id()
-        ]));
+        $r=sprintf('<form id="%s" method="POST" ACTION="%s">',$p_id,NOALYSS_URL."/do.php?".Dossier::get());
         $r.=Dossier::hidden();
         // select the menu where the operation will be duplicated
         $r.="<p>";

From 58403353c4bb8a350f96a96bf9a94aabe83fee4d Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Tue, 22 Sep 2020 19:44:06 +0200
Subject: [PATCH 016/257] doc

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

diff --git a/include/lib/http_input.class.php b/include/lib/http_input.class.php
index 60b03a103..bb2a8fee6 100644
--- a/include/lib/http_input.class.php
+++ b/include/lib/http_input.class.php
@@ -198,7 +198,7 @@ class HttpInput
 
     /**
      * Retrieve from $_POST
-     * @param $p_name name of the variable
+     * @param string $p_name name of the variable
      * @param $p_type type of the variable , opt. default string
      * @param $p_default default value is variable is not set
      * @throws Exception if invalid

From 79dd13273aa8a51f5d2d83044056e10544d5cacb Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Tue, 22 Sep 2020 19:44:38 +0200
Subject: [PATCH 017/257] doc

---
 include/lib/itextarea.class.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/lib/itextarea.class.php b/include/lib/itextarea.class.php
index 7d97ba00d..bbd1be052 100644
--- a/include/lib/itextarea.class.php
+++ b/include/lib/itextarea.class.php
@@ -23,6 +23,11 @@
  * \brief Html Input
  */
 require_once NOALYSS_INCLUDE.'/lib/html_input.class.php';
+
+/**
+ * @class ITextarea
+ * @brief Manage the TEXTAREA html element
+ */
 class ITextarea extends HtmlInput
 {
     /*!\brief show the html  input of the widget*/

From d67485d417de2001feeea7acf9acf15bcc09fd85 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Wed, 23 Sep 2020 19:21:51 +0200
Subject: [PATCH 018/257] Predefined Operation rewriting

---
 html/ajax_misc.php                            |   1 -
 include/ajax/ajax_mod_predf_op.php            |  17 +-
 include/ajax/ajax_save_predf_op.php           |  82 +--
 include/class/acc_ledger.class.php            |  17 +-
 include/class/acc_ledger_purchase.class.php   |   8 +-
 include/class/acc_ledger_sold.class.php       |  11 +-
 .../class/operation_predef_mtable.class.php   | 120 ++++
 include/class/pre_op_ach.class.php            | 579 +++++++++---------
 include/class/pre_op_advanced.class.php       |  93 ++-
 include/class/pre_op_ods.class.php            |  66 +-
 include/class/pre_op_ven.class.php            | 114 ++--
 include/class/pre_operation.class.php         | 449 ++++++++++----
 include/compta_ach.inc.php                    |   6 +-
 include/compta_ven.inc.php                    |  26 +-
 include/database/op_predef_sql.class.php      |  71 +++
 include/operation_ods_new.inc.php             |   5 +-
 include/preod.inc.php                         | 108 +---
 include/template/pre_operation_display.php    |  36 ++
 include/template/predf_ledger_detail.php      |   9 +-
 19 files changed, 1063 insertions(+), 755 deletions(-)
 create mode 100644 include/class/operation_predef_mtable.class.php
 create mode 100644 include/database/op_predef_sql.class.php
 create mode 100644 include/template/pre_operation_display.php

diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index ef7ac145c..12c77eb14 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -159,7 +159,6 @@ $path = array(
     "remove_submenu"=>"ajax_remove_submenu",
     "cardsearch"=>"ajax_boxcard_search",
     "saldo"=>"ajax_bank_saldo",
-    "up_predef"=>"ajax_update_predef",
     "upd_receipt"=>"ajax_get_receipt",
     "up_pay_method"=>"ajax_update_payment",
     "openancsearch"=>"ajax_anc_search",
diff --git a/include/ajax/ajax_mod_predf_op.php b/include/ajax/ajax_mod_predf_op.php
index c0eaa4cc1..539d465ba 100644
--- a/include/ajax/ajax_mod_predf_op.php
+++ b/include/ajax/ajax_mod_predf_op.php
@@ -26,8 +26,21 @@
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 ob_start();
 require_once NOALYSS_INCLUDE.'/class/pre_operation.class.php';
-$op=new Pre_Operation($cn,$_GET['id']);
-$array=$op->load();
+$id=$http->get("id","number");
+
+$op=new Pre_Operation($cn,$id);
+
+// ----------------------------------------------------------------
+// if id > 0  then we display an existing template operation
+// otherwise a blank one
+// -----------------------------------------------------------------
+if ( $id > 0) {
+    $array = $op->load();
+} else {
+    $ledger_id=$http->get("ledger_id","number");
+    $op->set_jrn($ledger_id);
+    $array=$op->blank($ledger_id);
+}
 echo HtmlInput::title_box(_('Modification du nom'),'mod_predf_op','close','','n');
 
 echo '
diff --git a/include/ajax/ajax_save_predf_op.php b/include/ajax/ajax_save_predf_op.php
index a6d985248..c84830ffe 100644
--- a/include/ajax/ajax_save_predf_op.php
+++ b/include/ajax/ajax_save_predf_op.php
@@ -23,46 +23,52 @@
  * \brief save the new predefined operation 
  * included from ajax_misc
  */
-require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
-$http=new HttpInput();
 
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-if ($g_user->check_module('PREDOP') == 0) exit();
-$name=$http->post("opd_name","string", "");
-if ( trim($name) != '')
-  {
-      try
-      {
-        $od_id=$http->post("od_id", "number");
-        $cn->exec_sql('delete from op_predef where od_id=$1',
-                      array($od_id));
+require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
+require_once NOALYSS_INCLUDE.'/class/operation_predef_mtable.class.php';
+$http=new HttpInput();
 
-        $cn->exec_sql("delete from op_predef_detail where od_id=$1",array($od_id));
 
-        $jrn_type=$http->post("jrn_type");
-        switch ($jrn_type) {
-            case 'ACH':
-            $operation=new Pre_op_ach($cn);
-            break;
-            case 'VEN':
-            $operation=new Pre_op_ven($cn);
-            break;
-            case 'ODS':
-            $operation=new Pre_Op_Advanced($cn);
-            break;
-        default :
-            throw new Exception(_('Type de journal invalide'));
-        }
-        $operation->get_post();
-        $operation->save();
-        $cn->commit();
-          
-      }
-      catch (Exception $exc)
-      {
-          error_log($exc->getTraceAsString());
-          throw $exc;
-      }
 
-  }
-?>
\ No newline at end of file
+try {
+    $table=$http->request('table');
+    $action=$http->request('action');
+    $p_id=$http->request('p_id', "number");
+    $ctl_id=$http->request('ctl');
+
+} catch(Exception $e) {
+    echo $e->getMessage();
+    return;
+}
+if  ( $g_user->check_module("PREDOP") == 0) die();
+
+$prd_op=new Op_predef_SQL($cn);
+$prd_op->set_pk_value($p_id);
+$prd_op->load();
+
+$operation_predef_mtable=new Operation_Predef_MTable($prd_op);
+
+
+$operation_predef_mtable->add_json_param("op","save_predf");
+$operation_predef_mtable->set_object_name($ctl_id);
+$operation_predef_mtable->set_callback("ajax_misc.php");
+
+if ($action=="input")
+{
+    header('Content-type: text/xml; charset=UTF-8');
+    echo $operation_predef_mtable->ajax_input()->saveXML();
+    return;
+}
+elseif ($action == "save")
+{
+    $xml=$operation_predef_mtable->ajax_save();
+    header('Content-type: text/xml; charset=UTF-8');
+    echo $xml->saveXML();
+}
+elseif ($action == "delete")
+{
+    $xml=$operation_predef_mtable->ajax_delete();
+    header('Content-type: text/xml; charset=UTF-8');
+    echo $xml->saveXML();
+}
\ No newline at end of file
diff --git a/include/class/acc_ledger.class.php b/include/class/acc_ledger.class.php
index 30df01e4d..c1e17f315 100644
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@ -788,10 +788,11 @@ class Acc_Ledger  extends jrn_def_sql
                 ob_start();
         echo '<div id="predef_form">';
         echo HtmlInput::hidden('p_jrn_predef', $this->id);
-        $op=new Pre_op_ods($this->db);
-        $op->set('ledger', $this->id);
-        $op->set('ledger_type', "ODS");
-        $op->set('direct', 't');
+        $op=new Pre_operation( $this->db);
+        $op->set_p_jrn($this->id);
+        $op->set_jrn_type("ODS");
+        $op->set_od_direct('t');
+
         $url=http_build_query(
                 array('action'=>'use_opd', 
                     'p_jrn_predef'=>$this->id,
@@ -1328,14 +1329,16 @@ class Acc_Ledger  extends jrn_def_sql
 
             $this->pj=$acc_end->set_pj();
 
-            $this->db->exec_sql("update jrn set jr_internal='".$internal."' where ".
-                    " jr_grpt_id = ".$seq);
+            $this->db->exec_sql("update jrn set jr_internal=$1 
+                        where jr_grpt_id = $2",array($internal,$seq));
+
             $this->internal=$internal;
             // Save now the predef op
             //------------------------
             if (isset($opd_name)&&trim($opd_name)!="")
             {
-                $opd=new Pre_Op_Advanced($this->db);
+                $opd=new Pre_operation($this->db);
+                $opd->set_od_direct('t');
                 $opd->get_post();
                 $opd->save();
             }
diff --git a/include/class/acc_ledger_purchase.class.php b/include/class/acc_ledger_purchase.class.php
index d47336625..241744697 100644
--- a/include/class/acc_ledger_purchase.class.php
+++ b/include/class/acc_ledger_purchase.class.php
@@ -1318,10 +1318,10 @@ class  Acc_Ledger_Purchase extends Acc_Ledger
         ob_start();
         echo '<div id="predef_form">';
         echo HtmlInput::hidden('p_jrn_predef', $this->id);
-        $op = new Pre_op_ach($this->db);
-        $op->set('ledger', $this->id);
-        $op->set('ledger_type', "ACH");
-        $op->set('direct', 'f');
+        $op = new Pre_operation($this->db);
+        $op->set_p_jrn($this->id);
+        $op->set_jrn_type("ACH");
+        $op->set_od_direct('f');
         $url=http_build_query(array('p_jrn_predef'=>$this->id,'ac'=>$_REQUEST['ac'],'gDossier'=>dossier::id()));
         echo $op->form_get('do.php?'.$url);
         echo '</div>';
diff --git a/include/class/acc_ledger_sold.class.php b/include/class/acc_ledger_sold.class.php
index 2704e47c5..9cb0668cc 100644
--- a/include/class/acc_ledger_sold.class.php
+++ b/include/class/acc_ledger_sold.class.php
@@ -1310,11 +1310,12 @@ EOF;
         ob_start();
         echo '<div id="predef_form">';
         echo HtmlInput::hidden('p_jrn_predef', $this->id);
-        $op=new Pre_op_ven($this->db);
-        $op->set('ledger', $this->id);
-        $op->set('ledger_type', "VEN");
-        $op->set('direct', 'f');
-        $url=http_build_query(array('p_jrn_predef'=>$this->id, 'ac'=>$_REQUEST['ac'],
+        $op=new Pre_operation($this->db);
+        $op->set_jrn_type("VEN");
+        $op->set_p_jrn($this->id);
+        $op->set_od_direct('f');
+        $http=new \HttpInput();
+        $url=http_build_query(array('p_jrn_predef'=>$this->id, 'ac'=>$http->request('ac'),
             'gDossier'=>dossier::id()));
         echo $op->form_get('do.php?'.$url);
         echo '</div>';
diff --git a/include/class/operation_predef_mtable.class.php b/include/class/operation_predef_mtable.class.php
new file mode 100644
index 000000000..3febada5e
--- /dev/null
+++ b/include/class/operation_predef_mtable.class.php
@@ -0,0 +1,120 @@
+<?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+// Copyright Author Dany De Bontridder danydb@aevalys.eu
+/*! \file
+ * \brief Class to manage predefined operation thanks the class Manage Table
+ */
+/*!
+ * \brief Display a table and allow to change the predefined operation, insert or delete. Used the
+ * class Manage_Table_SQL and the SQL Object for the tables op_predef and op_predef_detail.
+ */
+require_once NOALYSS_INCLUDE."/lib/manage_table_sql.class.php";
+require_once NOALYSS_INCLUDE."/database/op_predef_sql.class.php";
+require_once NOALYSS_INCLUDE."/class/pre_operation.class.php";
+
+class Operation_Predef_MTable extends Manage_Table_SQL
+{
+    private $pre_operation;
+    function __construct(Op_predef_SQL $p_table)
+    {
+        parent::__construct($p_table);
+
+        $this->set_property_visible("od_id",false);
+        $this->set_property_visible("od_direct",false);
+        $this->set_property_visible("od_item",false);
+        $this->set_col_label("jrn_def_id",_("Journal"));
+        $this->set_col_label("od_name",_("Nom"));
+        $this->set_col_label("od_jrn_type",_("Type de journal"));
+        $this->set_col_label("od_description",_("Description"));
+
+        $aLedger=$p_table->cn->make_array("select jrn_def_id,jrn_def_name from jrn_def order by jrn_def_name asc");
+
+        $this->set_sort_column("jrn_def_id");
+        $this->set_order(array("jrn_def_id","od_name","od_description","od_jrn_type"));
+        $this->set_col_type("jrn_def_id","select",$aLedger);
+
+        $this->set_callback("ajax_misc.php");
+        $this->set_property_updatable("jrn_def_id",false);
+        $this->set_property_updatable("od_jrn_type",false);
+        $this->pre_operation=null;
+
+    }
+
+    /**
+     * Display the form
+     * @throws Exception
+     */
+    function input()
+    {
+        $obj=$this->get_table();
+        $this->pre_operation = new Pre_operation($obj->cn);
+        $this->pre_operation->set_od_id($obj->get("od_id"));
+        $this->pre_operation->display();
+    }
+
+    /**
+     * Get values from the request
+     *  - table is the sql table
+     *  - ctl_id is the dialog box id
+     *  - p_id = predef_op.od_id
+     *
+     * @code
+     * json = {"table":"public.op_predef",
+                "ctl_id":"dtr",
+                "ac":"COMPTA/ADV/PREDOP",
+                "op":"save_predf",
+                "gDossier":["28", "28"],
+                "p_id":"15",
+                "action":"save",
+                "ctl":"tbl5f6a1d09035f2",
+                "nb_item":"10",
+                "e_client":"",
+                "p_jrn":"2",
+                "e_march0":"MARCHA",
+                "e_march0_price":"102.0000",
+                "e_quant0":"1.0000",
+                "htva_march0":"0",
+                "e_march0_tva_id":"4",
+                "bt_e_march0_tva_id":"+TVA+",
+                "e_march0_tva_amount":"0.0000",
+                "tva_march0":"0","tvac_march0":"0",
+                "jrn_type":"VEN",
+                "5f6a1d0b23242_ledger":"O","
+                5f6a1d0b23242":"1",
+                "update":"OK",
+                "5f6a1d5b70997_ledger":"O",
+                "5f6a1d5b70997":"1"}
+     * @endcode
+     */
+    function from_request()
+    {
+        $http=new HttpInput();
+        $obj=$this->get_table();
+        $this->pre_operation=new Pre_operation($obj->cn);
+        $this->pre_operation->get_post();
+        $this->pre_operation->set_od_id($http->post("p_id","number"));
+    }
+
+    function save()
+    {
+       $this->pre_operation->save();
+
+
+    }
+}
\ No newline at end of file
diff --git a/include/class/pre_op_ach.class.php b/include/class/pre_op_ach.class.php
index 722c9deed..5b5198abc 100644
--- a/include/class/pre_op_ach.class.php
+++ b/include/class/pre_op_ach.class.php
@@ -29,97 +29,86 @@ require_once  NOALYSS_INCLUDE.'/class/pre_operation.class.php';
  */
 class Pre_op_ach extends Pre_operation_detail
 {
-    var $op;
-    function __construct($cn,$p_id=0)
+    function __construct($cn)
     {
-        parent::__construct($cn,$p_id);
-
-        $this->operation->od_direct='f';
+        parent::__construct($cn);
     }
 
     function get_post()
     {
-        parent::get_post();
-        $http=new HttpInput();
-        $this->operation->od_direct='f';
+        $http = new \HttpInput();
+        $nb = $http->post("nb_item", "number");
         $this->e_client=$http->post('e_client');
-        for ($i=0;$i<$this->operation->nb_item;$i++)
-        {
-            $march="e_march".$i;
-            $this->$march=$http->post('e_march'.$i);
-            $this->{"e_march".$i."_price"}=$http->post('e_march'.$i."_price","string",0);
-            $this->{"e_march".$i."_price"}=$http->post('e_march'.$i."_price","string",0);
-            $this->{"e_march".$i."_tva_id"}=$http->post('e_march'.$i."_tva_id","string",0);
-            $this->{"e_march".$i."_tva_amount"}=$http->post('e_march'.$i."_tva_amount","string",0);
-            $this->{"e_march".$i."_label"}=$http->post('e_march'.$i."_label","string",NULL);
-            $this->{"e_quant".$i}=$http->post('e_quant'.$i);
-
+        for ($i = 0; $i < $nb; $i++) {
+            $march = "e_march" . $i;
+            $http->set_empty("");
+            $this->$march = $http->post('e_march' . $i);
+            $this->{"e_march" . $i . "_tva_id"} = $http->post('e_march' . $i . "_tva_id", "string", 0);
+            $this->{"e_march" . $i . "_tva_id"} = $http->post('e_march' . $i . "_tva_id", "string", "0");
+            $this->{"e_march" . $i . "_label"} = $http->post('e_march' . $i . "_label", "string", "");
+            $http->set_empty(0);
+            $this->{"e_march" . $i . "_price"} = $http->post('e_march' . $i . "_price","number");
+            $this->{"e_march" . $i . "_tva_amount"} = $http->post('e_march' . $i . "_tva_amount", "string", "0");
+            $this->{"e_quant" . $i} = $http->post('e_quant' . $i, "number");
         }
     }
-
     /*!
      * \brief save the detail and op in the database
      *
      */
-    function save()
+    function save($p_od_id,$p_nb_item)
     {
         try
         {
-            $this->db->start();
-            if ($this->operation->save() == false )
-                return;
             // save the client
             $sql=sprintf('insert into op_predef_detail (od_id,opd_poste,opd_debit)'.
-                         ' values '.
-                         "(%d,'%s','%s')",
-                         $this->operation->od_id,
-                         $this->e_client,
-                         "f");
+                ' values '.
+                "(%d,'%s','%s')",
+                $p_od_id,
+                $this->e_client,
+                "f");
             $this->db->exec_sql($sql);
-            // save the selling
-            for ($i=0;$i<$this->operation->nb_item;$i++)
+
+            for ($i=0;$i<$p_nb_item;$i++)
             {
                 if ( strlen(trim($this->{"e_march".$i}))=="") continue;
                 $sql= 'insert into op_predef_detail (opd_poste,'
-                        . 'opd_amount,'
-                        . 'opd_tva_id,'
-                        . 'opd_quantity,'
-                        . 'opd_debit,'
-                        . 'od_id ,'
-                        . 'opd_tva_amount,'
-                        . 'opd_comment'.
-                        ')'.
-                             ' values ($1,$2,$3,$4,$5,$6,$7,$8)';
+                    . 'opd_amount,'
+                    . 'opd_tva_id,'
+                    . 'opd_quantity,'
+                    . 'opd_debit,'
+                    . 'od_id ,'
+                    . 'opd_tva_amount,'
+                    . 'opd_comment'.
+                    ')'.
+                    ' values ($1,$2,$3,$4,$5,$6,$7,$8)';
                 $this->db->exec_sql($sql,
-                        array($this->{"e_march".$i},
-                             $this->{"e_march".$i."_price"},
-                             $this->{"e_march".$i."_tva_id"},
-                             $this->{"e_quant".$i},
-                             't',
-                             $this->operation->od_id,
-                             $this->{"e_march".$i."_tva_amount"},
-                             $this->{"e_march".$i."_label"},
-                            ));
+                    array($this->{"e_march".$i},
+                        $this->{"e_march".$i."_price"},
+                        $this->{"e_march".$i."_tva_id"},
+                        $this->{"e_quant".$i},
+                        't',
+                        $p_od_id,
+                        $this->{"e_march".$i."_tva_amount"},
+                        $this->{"e_march".$i."_label"},
+                    ));
             }
         }
         catch (Exception $e)
         {
-              record_log($e);
-            echo ($e->getMessage());
-            $this->db->rollback();
+            record_log("PREOPACH01".$e->getMessage().$e->getTraceAsString());
+            throw $e;
         }
-        $this->db->commit();
     }
     /*!\brief compute an array accordingly with the FormVenView function
 	 * @return an array for filling the form
      */
-    function compute_array()
+    function compute_array($p_od_id)
     {
         $count=0;
-        $a_op=$this->operation->load();
-        $array=$this->operation->compute_array($a_op);
-        $p_array=$this->load();
-	if ( empty ($p_array)) return array();
+        $array=array();
+        $p_array=$this->load($p_od_id);
+        if (empty($p_array)) return array();
         foreach ($p_array as $row)
         {
             if ( $row['opd_debit']=='f')
@@ -128,19 +117,20 @@ class Pre_op_ach extends Pre_operation_detail
             }
             else
             {
-                if ( trim($row['opd_poste']) !="" )
+                if ( trim($row['opd_poste']) != "")
                 {
                     $array+=array("e_march".$count=>$row['opd_poste'],
-                              "e_march".$count."_price"=>$row['opd_amount'],
-                              "e_march".$count."_tva_id"=>$row['opd_tva_id'],
-                              "e_march".$count."_tva_amount"=>$row['opd_tva_amount'],
-                              "e_quant".$count=>$row['opd_quantity']
-                             );
+                        "e_march".$count."_price"=>$row['opd_amount'],
+                        "e_march".$count."_tva_id"=>$row['opd_tva_id'],
+                        "e_quant".$count=>$row['opd_quantity'],
+                        "e_march".$count."_label"=>$row['opd_comment'],
+                        "e_march".$count."_tva_amount"=>$row['opd_tva_amount'],
+                    );
                     $count++;
                 }
             }
-            $array['nb_item']=$count;
         }
+
         return $array;
     }
     /**
@@ -148,263 +138,260 @@ class Pre_op_ach extends Pre_operation_detail
      * load the data from the database and return an array
      * \return an array
      */
-    function load()
+    function load($p_od_id)
     {
         $sql="select opd_id,opd_poste,opd_amount,opd_tva_id,opd_debit,".
-             " opd_quantity,opd_tva_amount from op_predef_detail where od_id=".$this->operation->od_id.
-             " order by opd_id";
-        $res=$this->db->exec_sql($sql);
+            " opd_quantity , opd_comment,opd_tva_amount from op_predef_detail where od_id= $1 ".
+            " order by opd_id";
+        $res=$this->db->exec_sql($sql,[$p_od_id]);
         $array=Database::fetch_all($res);
         return $array;
     }
-    function set_od_id($p_id)
-    {
-        $this->operation->od_id=$p_id;
-    }
+
    function display($p_array)
    {
         require_once NOALYSS_INCLUDE.'/class/acc_ledger_purchase.class.php';
        global $g_parameter,$g_user;
-       extract($p_array, EXTR_SKIP);
-       $ledger=new Acc_Ledger_Purchase($this->db,$this->jrn_def_id);
-        if ( $p_array != null ) extract($p_array, EXTR_SKIP);
+       $ledger=new Acc_Ledger_Purchase($this->db,$p_array['p_jrn']);
 
-        $flag_tva=$g_parameter->MY_TVA_USE;
-        /* Add button */
-        $f_add_button=new IButton('add_card');
-        $f_add_button->label=_('Créer une nouvelle fiche');
-		$f_add_button->tabindex=-1;
-        $f_add_button->set_attribute('ipopup','ipop_newcard');
-        $f_add_button->set_attribute('jrn',$this->jrn_def_id);
-        $f_add_button->javascript=" this.jrn=\$('p_jrn').value;select_card_type(this);";
+       $flag_tva=$g_parameter->MY_TVA_USE;
+       /* Add button */
+       $f_add_button=new IButton('add_card');
+       $f_add_button->tabindex=-1;
+       $f_add_button->label=_('Créer une nouvelle fiche');
+       $f_add_button->set_attribute('ipopup','ipop_newcard');
+       $f_add_button->set_attribute('jrn',$p_array['p_jrn']);
+       $f_add_button->javascript="this.jrn=\$('p_jrn').value; select_card_type(this);";
 
-        $f_add_button2=new IButton('add_card2');
-		$f_add_button2->tabindex=-1;
-        $f_add_button2->label=_('Créer une nouvelle fiche');
-        $f_add_button2->set_attribute('ipopup','ipop_newcard');
-        $f_add_button2->set_attribute('filter',$ledger->get_all_fiche_def ());
-        //    $f_add_button2->set_attribute('jrn',$ledger->id);
-        $f_add_button2->javascript="  this.jrn=\$('p_jrn').value;select_card_type(this);";
-        $str_add_button="";
-        $str_add_button2="";
-        if ($g_user->check_action(FICADD)==1)
-        {
-                $str_add_button=$f_add_button->input();
-                $str_add_button2=$f_add_button2->input();
-        }
+       $f_add_button2=new IButton('add_card2');
+       $f_add_button2->tabindex=-1;
+       $f_add_button2->label=_('Créer une nouvelle fiche');
+       $f_add_button2->set_attribute('ipopup','ipop_newcard');
+       $f_add_button2->set_attribute('filter',$ledger->get_all_fiche_def ());
+       //    $f_add_button2->set_attribute('jrn',$ledger->id);
+       $f_add_button2->javascript=" this.jrn=\$('p_jrn').value;select_card_type(this);";
 
-        $r="";
-        $r.=dossier::hidden();
-        $f_legend=_("En-tête facture fournisseur");
-        $f_legend_detail=_("Détail articles acheté");
+       $str_add_button="";
+       $str_add_button2="";
+       if ($g_user->check_action(FICADD)==1)
+       {
+           $str_add_button=$f_add_button->input();
+           $str_add_button2=$f_add_button2->input();
+       }
 
-        // Ledger (p_jrn)
-        //--
-        /* if we suggest the next pj, then we need a javascript */
-        $add_js="";
-
-        // Display the customer
-        //--
-        $fiche='cred';
-
-        // Save old value and set a new one
-        //--
-        $e_client=( isset ($e_client) )?$e_client:"";
-        $e_client_label="&nbsp;";//str_pad("",100,".");
+       $r='';
+       $r.=dossier::hidden();
+       $f_legend=_('En-tête facture fournisseur');
 
 
-        // retrieve e_client_label
-        //--
+       /* if we suggest the next pj, then we need a javascript */
 
-        if ( strlen(trim($e_client)) !=  0)
-        {
-            $fClient=new Fiche($ledger->db);
-            $fClient->get_by_qcode($e_client);
-            $e_client_label=$fClient->strAttribut(ATTR_DEF_NAME).' '.
-                            ' Adresse : '.$fClient->strAttribut(ATTR_DEF_ADRESS).' '.
-                            $fClient->strAttribut(ATTR_DEF_CP).' '.
-                            $fClient->strAttribut(ATTR_DEF_CITY).' ';
+       // Display the customer
+       //--
+       $fiche='deb';
+
+       // Save old value and set a new one
+       //--
+       $e_client=( isset ($p_array["e_client"]) )?$p_array["e_client"]:"";
+       $e_client_label="&nbsp;";//str_pad("",100,".");
 
 
-        }
+       // retrieve e_client_label
+       //--
 
-        $W1=new ICard();
-        $W1->label=_("Fournisseur ").Icon_Action::infobulle(0) ;
-        $W1->name="e_client";
-        $W1->tabindex=3;
-        $W1->value=$e_client;
-        $W1->table=0;
-        $W1->set_dblclick("fill_ipopcard(this);");
-        $W1->set_attribute('ipopup','ipopcard');
-
-        // name of the field to update with the name of the card
-        $W1->set_attribute('label','e_client_label');
-        // name of the field to update with the name of the card
-        $W1->set_attribute('typecard','cred');
-
-        // Add the callback function to filter the card on the jrn
-        $W1->set_callback('filter_card');
-        $W1->set_function('fill_data');
-        $W1->javascript=sprintf(' onchange="fill_data_onchange(\'%s\');" ',
-                                $W1->name);
-        $f_client_qcode=$W1->input();
-        $client_label=new ISpan();
-        $client_label->table=0;
-        $f_client=$client_label->input("e_client_label",$e_client_label);
-        $f_client_bt=$W1->search();
+       if ( strlen(trim($e_client)) !=  0)
+       {
+           $fClient=new Fiche($ledger->db);
+           $fClient->get_by_qcode($e_client);
+           $e_client_label=$fClient->strAttribut(ATTR_DEF_NAME).' '.
+               ' Adresse : '.$fClient->strAttribut(ATTR_DEF_ADRESS).' '.
+               $fClient->strAttribut(ATTR_DEF_CP).' '.
+               $fClient->strAttribut(ATTR_DEF_CITY).' ';
 
 
-        // Record the current number of article
-		$min=$ledger->get_min_row();
-        $p_article= ( isset ($nb_item))?$nb_item:$min;
-        $max=($p_article < $min)?$min:$p_article;
+       }
 
-        $e_comment=(isset($e_comment))?$e_comment:"";
-        $Hid=new IHidden();
-        $r.=$Hid->input("nb_item",$p_article);
-        // For each article
-        //--
-        for ($i=0;$i< $max ;$i++)
-        {
-            // Code id, price & vat code
-            //--
-            $march=(isset(${"e_march$i"}))?${"e_march$i"}:""                   ;
-            $march_price=(isset(${"e_march".$i."_price"}))?${"e_march".$i."_price"}:""
-                         ;
-            /* use vat */
-            if ( $g_parameter->MY_TVA_USE=='Y')
-            {
-                $march_tva_id=(isset(${"e_march$i"."_tva_id"}))?${"e_march$i"."_tva_id"}:"";
-                $march_tva_amount=(isset(${"e_march$i"."_tva_amount"}))?${"e_march$i"."_tva_amount"}:"";
-            }
+       $W1=new ICard();
+       $W1->label="Client ".Icon_Action::infobulle(0) ;
+       $W1->name="e_client";
+       $W1->tabindex=3;
+       $W1->value=$e_client;
+       $W1->table=0;
+       $W1->set_dblclick("fill_ipopcard(this);");
+       $W1->set_attribute('ipopup','ipopcard');
+
+       // name of the field to update with the name of the card
+       $W1->set_attribute('label','e_client_label');
+       // name of the field to update with the name of the card
+       $W1->set_attribute('typecard','cred');
+
+       // Add the callback function to filter the card on the jrn
+       $W1->set_callback('filter_card');
+       $W1->set_function('fill_data');
+       $W1->javascript=sprintf(' onchange="fill_data_onchange(\'%s\');" ',
+           $W1->name);
+       $f_client_qcode=$W1->input();
+       $client_label=new ISpan();
+       $client_label->table=0;
+       $f_client=$client_label->input("e_client_label",$e_client_label);
+       $f_client_bt=$W1->search();
+
+
+       // Record the current number of article
+       $min=$ledger->get_min_row();
+       $p_article= ( isset ($p_array["nb_item"]))?$p_array["nb_item"]:$min;
+       $max=($p_article < $min)?$min:$p_article;
+
+       $e_comment=(isset($p_array["e_comment"]))?$p_array["e_comment"]:"";
+       $Hid=new IHidden();
+       $r.=$Hid->input("nb_item",$p_article);
+
+       $f_legend_detail=_("Détail articles achetés");
+
+       // For each article
+       //--
+       for ($i=0;$i< $max;$i++)
+       {
+           // Code id, price & vat code
+           //--
+           $march=(isset($p_array["e_march$i"]))?$p_array["e_march$i"]:""
+           ;
+           $march_price=(isset($p_array["e_march".$i."_price"]))?$p_array["e_march".$i."_price"]:""
+           ;
+           if ( $flag_tva=='Y')
+           {
+               $march_tva_id=(isset($p_array["e_march$i"."_tva_id"]))?$p_array["e_march$i"."_tva_id"]:"";
+               $march_tva_amount=(isset($p_array["e_march$i"."_tva_amount"]))?$p_array["e_march$i"."_tva_amount"]:"";
+           }
+           $march_label=(isset($p_array["e_march".$i."_label"]))?$p_array["e_march".$i."_label"]:"";
+
+           // retrieve the tva label and name
+           //--
+           if ( strlen(trim($march))!=0 && strlen(trim($march_label))==0)
+           {
+               $fMarch=new Fiche($ledger->db);
+               $fMarch->get_by_qcode($march);
+               $march_label=$fMarch->strAttribut(ATTR_DEF_NAME);
+               if ( $flag_tva=='Y')
+               {
+                   if ( ! (isset($p_array["e_march$i"."_tva_id"])))
+                       $march_tva_id=$fMarch->strAttribut(ATTR_DEF_TVA);
+               }
+           }
+           // Show input
+           //--
+           $W1=new ICard();
+           $W1->label="";
+           $W1->name="e_march".$i;
+           $W1->value=$march;
+           $W1->table=1;
+           $W1->set_attribute('typecard','deb');
+           $W1->set_dblclick("fill_ipopcard(this);");
+           $W1->set_attribute('ipopup','ipopcard');
+
+           // name of the field to update with the name of the card
+           $W1->set_attribute('label','e_march'.$i.'_label');
+           // name of the field with the price
+           $W1->set_attribute('price','e_march'.$i.'_price');
+           // name of the field with the TVA_ID
+           $W1->set_attribute('tvaid','e_march'.$i.'_tva_id');
+           // Add the callback function to filter the card on the jrn
+           $W1->set_callback('filter_card');
+           $W1->set_function('fill_data');
+           $W1->javascript=sprintf(' onchange="fill_data_onchange(\'%s\');" ',
+               $W1->name);
+
+           $W1->readonly=false;
+
+           $array[$i]['quick_code']=$W1->input();
+           $array[$i]['bt']=$W1->search();
+           // For computing we need some hidden field for holding the value
+           $array[$i]['hidden']='';
+           if ( $flag_tva=='Y') $array[$i]['hidden'].=HtmlInput::hidden('tva_march'.$i,0);
+
+           $htva=new INum('htva_march'.$i);
+           $htva->readOnly=1;
+           $htva->value=0;
+           $array[$i]['htva']=$htva->input();
+
+           if ( $g_parameter->MY_TVA_USE=='Y')
+               $tvac=new INum('tvac_march'.$i);
+           else
+               $tvac=new IHidden('tvac_march'.$i);
+
+           $tvac->readOnly=1;
+           $tvac->value=0;
+           $array[$i]['tvac']=$tvac->input();
+
+           if ( $g_parameter->MY_UPDLAB == 'Y')
+           {
+               $Span=new IText("e_march".$i."_label");
+
+               $Span->css_size="100%";
+           } else
+           {
+               $Span=new ISpan("e_march".$i."_label");
+           }
+           $Span->value=$march_label;
+           $Span->setReadOnly(false);
+           // card's name, price
+           //--
+           $array[$i]['denom']=$Span->input("e_march".$i."_label",$march_label);
+           // price
+           $Price=new INum();
+           $Price->setReadOnly(false);
+           $Price->prec=4;
+           $Price->size=9;
+           $Price->javascript="onBlur='format_number(this);clean_tva($i);compute_ledger($i)'";
+           $array[$i]['pu']=$Price->input("e_march".$i."_price",$march_price);
+           $array[$i]['tva']='';
+           $array[$i]['amount_tva']='';
+           // if tva is not needed then no tva field
+           if ( $flag_tva == 'Y' )
+           {
+               // vat label
+               //--
+               $Tva=new ITva_Popup($ledger->db);
+               $Tva->in_table=true;
+               $Tva->set_attribute('compute',$i);
+
+               $Tva->js='onblur="format_number(this);clean_tva('.$i.');compute_ledger('.$i.')"';
+               $Tva->value=$march_tva_id;
+               $array[$i]['tva']=$Tva->input("e_march$i"."_tva_id");
+               // vat amount
+               //--
+               $wTva_amount=new INum();
+               $wTva_amount->readOnly=false;
+               $wTva_amount->size=6;
+               $wTva_amount->javascript="onBlur='format_number(this);compute_ledger($i)'";
+               $array[$i]['amount_tva']=$wTva_amount->input("e_march".$i."_tva_amount",$march_tva_amount);
+           }
+           // quantity
+           //--
+           $quant=(isset($p_array["e_quant$i"]))?$p_array["e_quant$i"]:"1"
+           ;
+           $Quantity=new INum();
+           $Quantity->setReadOnly(false);
+           $Quantity->size=8;
+           $Quantity->javascript="onChange='format_number(this);clean_tva($i);compute_ledger($i)'";
+           $array[$i]['quantity']=$Quantity->input("e_quant".$i,$quant);
+
+       }// foreach article
+       $f_type=_('Client');
+
+
+       ob_start();
+       require_once NOALYSS_TEMPLATE.'/predf_ledger_detail.php';
+       $r.=ob_get_contents();
+       ob_end_clean();
 
 
 
-            $march_label=(isset(${"e_march".$i."_label"}))?${"e_march".$i."_label"}:"";
-            // retrieve the tva label and name
-            //--
-            if ( strlen(trim($march))!=0  && strlen(trim($march_label))==0 )
-            {
-                $fMarch=new Fiche($ledger->db);
-                $fMarch->get_by_qcode($march);
-                $march_label=$fMarch->strAttribut(ATTR_DEF_NAME);
-                /* vat use */
-                if ( ! isset($march_tva_id) && $g_parameter->MY_TVA_USE=='Y' )
-                    $march_tva_id=$fMarch->strAttribut(ATTR_DEF_TVA);
-            }
-            // Show input
-            //--
-            $W1=new ICard();
-            $W1->label="";
-            $W1->name="e_march".$i;
-            $W1->value=$march;
-            $W1->table=1;
-            $W1->set_dblclick("fill_ipopcard(this);");
-            $W1->set_attribute('ipopup','ipopcard');
+       // Set correctly the REQUEST param for jrn_type
+       $r.=HtmlInput::hidden('jrn_type','ACH');
+       $r.= Html_Input_Noalyss::ledger_add_item("O");
 
-            $W1->set_attribute('typecard','deb');
-
-            // name of the field to update with the name of the card
-            $W1->set_attribute('label','e_march'.$i.'_label');
-            // name of the field with the price
-            $W1->set_attribute('purchase','e_march'.$i.'_price'); /* autocomplete */
-            $W1->set_attribute('price','e_march'.$i.'_price');    /* via search */
-
-            // name of the field with the TVA_ID
-            $W1->set_attribute('tvaid','e_march'.$i.'_tva_id');
-            // Add the callback function to filter the card on the jrn
-            $W1->set_callback('filter_card');
-            $W1->set_function('fill_data');
-            $W1->javascript=sprintf(' onchange="fill_data_onchange(\'%s\');" ',
-                                    $W1->name);
-            $W1->readonly=false;
-            $array[$i]['quick_code']=$W1->input();
-            $array[$i]['bt']=$W1->search();
-
-            $array[$i]['hidden']='';
-            // For computing we need some hidden field for holding the value
-            if ( $g_parameter->MY_TVA_USE=='Y')
-            {
-                $array[$i]['hidden'].=HtmlInput::hidden('tva_march'.$i,0);
-            }
-
-            if ( $g_parameter->MY_TVA_USE=='Y')
-                $tvac=new INum('tvac_march'.$i);
-            else
-                $tvac=new IHidden('tvac_march'.$i);
-
-            $tvac->readOnly=1;
-            $tvac->value=0;
-            $array[$i]['tvac']=$tvac->input();
-
-            $htva=new INum('htva_march'.$i);
-            $htva->readOnly=1;
-
-            $htva->value=0;
-            $array[$i]['htva']=$htva->input();
-
-            if ( $g_parameter->MY_UPDLAB == 'Y')
-            {
-                $Span=new IText("e_march".$i."_label");
-                $Span->css_size="100%";
-            } else
-            {
-                $Span=new ISpan("e_march".$i."_label");
-            }
-            $Span->value=$march_label;
-            $Span->setReadOnly(false);
-            // card's name, price
-            //--
-            $array[$i]['denom']=$Span->input("e_march".$i."_label",$march_label);
-            // price
-            $Price=new INum();
-            $Price->prec=4;
-            $Price->setReadOnly(false);
-            $Price->size=9;
-            $Price->javascript="onBlur='format_number(this);clean_tva($i);compute_ledger($i)'";
-            $array[$i]['pu']=$Price->input("e_march".$i."_price",$march_price);
-            if ( $g_parameter->MY_TVA_USE=='Y')
-            {
-
-                // vat label
-                //--
-                $Tva=new ITva_Popup($ledger->db);
-                $Tva->js="onblur=\"format_number(this);onChange=clean_tva($i);compute_ledger($i)\"";
-                $Tva->in_table=true;
-                $Tva->set_attribute('compute',$i);
-                $Tva->value=$march_tva_id;
-                $array[$i]['tva']=$Tva->input("e_march$i"."_tva_id");
-
-                // Tva_amount
-
-                // price
-                $Tva_amount=new INum();
-                $Tva_amount->setReadOnly(false);
-                $Tva_amount->size=9;
-                $Tva_amount->javascript="onBlur='format_number(this);compute_ledger($i)'";
-                $array[$i]['amount_tva']=$Tva_amount->input("e_march".$i."_tva_amount",$march_tva_amount);
-            }
-            // quantity
-            //--
-            $quant=(isset(${"e_quant$i"}))?${"e_quant$i"}:"1"
-                   ;
-            $Quantity=new INum();
-            $Quantity->setReadOnly(false);
-            $Quantity->size=9;
-            $Quantity->javascript="onChange=format_number(this);clean_tva($i);compute_ledger($i)";
-            $array[$i]['quantity']=$Quantity->input("e_quant".$i,$quant);
-
-        }
-        $f_type=_('Fournisseur');
-
-        ob_start();
-        require_once NOALYSS_TEMPLATE.'/predf_ledger_detail.php';
-        $r.=ob_get_contents();
-        ob_end_clean();
-
-        // Set correctly the REQUEST param for jrn_type
-        $r.= HtmlInput::hidden('jrn_type','ACH');
-        $r.= Html_Input_Noalyss::ledger_add_item("O");
+       return $r;
 
         return $r;
    }
diff --git a/include/class/pre_op_advanced.class.php b/include/class/pre_op_advanced.class.php
index 3d78bc9e7..8c08e7094 100644
--- a/include/class/pre_op_advanced.class.php
+++ b/include/class/pre_op_advanced.class.php
@@ -29,18 +29,16 @@ require_once  NOALYSS_INCLUDE.'/class/pre_operation.class.php';
  */
 class Pre_Op_Advanced extends Pre_operation_detail
 {
-    var $op;
     function __construct($cn)
     {
         parent::__construct($cn);
-        $this->operation->od_direct='t';
     }
     function get_post()
     {
-        parent::get_post();
-        $http=new HttpInput();
+        $http = new \HttpInput();
+        $nb = $http->post("nb_item", "number");
 
-        for ($i=0;$i<$this->operation->nb_item;$i++)
+        for ($i=0;$i<$nb;$i++)
         {
             $poste=$http->post("poste".$i,"string", null);
             $qcode=$http->post("qc_".$i,"string", null);
@@ -54,10 +52,14 @@ class Pre_Op_Advanced extends Pre_operation_detail
             }
             
             if ( $qcode != null && trim ($qcode) != "") {
-                $this->{'isqc'.$i}=(trim($_POST['qc_'.$i]) != "")?'t':'f';
+                $this->{'isqc'.$i}=(trim($http->post('qc_'.$i)) != "")?'t':'f';
                 $this->{'poste'.$i}=trim ($qcode);
-            }   
-            $this->{"amount".$i}=$_POST['amount'.$i];
+            }
+            $http->set_empty(0);
+            $this->{"amount".$i}=$http->post('amount'.$i);
+            $http->set_empty("");
+            $this->{"ld".$i}=$http->post("ld".$i);
+
             $this->{"ck".$i}=(isset($_POST['ck'.$i]))?'t':'f';
 
         }
@@ -66,60 +68,53 @@ class Pre_Op_Advanced extends Pre_operation_detail
      * \brief save the detail and op in the database
      *
      */
-    function save()
+    function save($p_od_id,$p_nb_item)
     {
         try
         {
-            if ($this->operation->save() == false )
-                return;
-            $this->db->start();
             // save the selling
-            for ($i=0;$i<$this->operation->nb_item;$i++)
+            for ($i=0;$i<$p_nb_item;$i++)
             {
                 if ( ! isset ($this->{"poste".$i}))
                     continue;
 
                 $sql=sprintf('insert into op_predef_detail (opd_poste,opd_amount,'.
-                             'opd_debit,od_id,opd_qc)'.
-                             ' values '.
-                             "('%s',%.2f,'%s',%d,'%s')",
-                             $this->{"poste".$i},
-                             $this->{"amount".$i},
-                             $this->{"ck".$i},
-                             $this->operation->od_id,
-                             $this->{'isqc'.$i}
+                             'opd_debit,od_id,opd_qc,opd_comment)'.
+                             ' values($1,$2,$3,$4,$5,$6) '
                             );
 
-                $this->db->exec_sql($sql);
+                $this->db->exec_sql($sql,[$this->{"poste".$i},
+                                        $this->{"amount".$i},
+                                        $this->{"ck".$i},
+                                        $p_od_id,
+                                        $this->{'isqc'.$i},
+                                        $this->{"ld".$i}]);
 
             }
-             $this->db->commit();
-            
+
         }
         catch (Exception $e)
         {
-              record_log($e);
-            echo ($e->getMessage());
-            $this->db->rollback();
+            record_log($e->getMessage().$e->getTraceAsString());
+            throw $e;
         }
 
     }
     /*!\brief compute an array accordingly with the FormVenView function
      */
-    function compute_array()
+    function compute_array($p_od_id)
     {
         $count=0;
-        $a_op=$this->operation->load();
-        $array=$this->operation->compute_array($a_op);
-        $array['desc']=$array['e_comm'];
-        $p_array=$this->load();
+        $array=array();
+        $p_array=$this->load($p_od_id);
 		if (empty($p_array)) return array();
         foreach ($p_array as $row)
         {
             $tmp_array=array("qc_".$count=>'',
                              "poste".$count=>'',
                              "amount".$count=>$row['opd_amount'],
-                             'ck'.$count=>$row['opd_debit']
+                             'ck'.$count=>$row['opd_debit'],
+                              "ld".$count=>$row['opd_comment']
                             );
 
             if ( $row['opd_qc'] == 't' )
@@ -141,28 +136,22 @@ class Pre_Op_Advanced extends Pre_operation_detail
     /*!\brief load the data from the database and return an array
      * \return an array
      */
-    function load()
+    function load($p_od_id)
     {
-        $sql="select opd_id,opd_poste,opd_amount,opd_debit,".
-             " opd_qc from op_predef_detail where od_id=".$this->operation->od_id.
+        $sql="select opd_id,opd_poste,opd_amount,opd_debit,opd_comment,".
+             " opd_qc from op_predef_detail where od_id=$1 ".
              " order by opd_id";
-        $res=$this->db->exec_sql($sql);
+        $res=$this->db->exec_sql($sql,[$p_od_id]);
         $array=Database::fetch_all($res);
         return $array;
     }
-    function set_od_id($p_id)
-    {
-        $this->operation->od_id=$p_id;
-    }
-       function display($p_array)
+   function display($p_array)
     {
         global $g_parameter, $g_user;
         require_once NOALYSS_INCLUDE.'/class/acc_ledger.class.php';
-        $legder=new Acc_Ledger($this->db,$this->jrn_def_id);
+        $legder=new Acc_Ledger($this->db,$p_array['p_jrn']);
         $legder->nb=$legder->get_min_row();
 
-        if ($p_array != null)
-                extract($p_array, EXTR_SKIP);
         $add_js = "";
        
         $ret = "";
@@ -177,10 +166,10 @@ class Pre_Op_Advanced extends Pre_operation_detail
                 $f_add_button->input();
         }
        
-        $nb_row = (isset($nb_item) ) ? $nb_item : $legder->nb;
+        $nb_row = (isset($p_array['nb_item']) ) ? $p_array['nb_item' ]: $legder->nb;
 
         $ret.=HtmlInput::hidden('nb_item', $nb_row);
-        $ret.=HtmlInput::hidden('p_jrn', $this->jrn_def_id);
+        $ret.=HtmlInput::hidden('p_jrn', $p_array['p_jrn']);
         $ret.=dossier::hidden();
         
         $ret.=dossier::hidden();
@@ -220,7 +209,7 @@ class Pre_Op_Advanced extends Pre_operation_detail
                 $quick_code->javascript = sprintf(' onchange="fill_data_onchange(\'%s\');" ', $quick_code->name);
 
                 $quick_code->jrn = $legder->id;
-                $quick_code->value = (isset(${'qc_' . $i})) ? ${'qc_' . $i} : "";
+                $quick_code->value = (isset($p_array['qc_' . $i])) ? $p_array['qc_' . $i]: "";
 
                 $label = '';
                 if ($quick_code->value != '')
@@ -240,7 +229,7 @@ class Pre_Op_Advanced extends Pre_operation_detail
                 $poste->set_attribute('account', 'poste' . $i);
                 $poste->set_attribute('dossier', Dossier::id());
 
-                $poste->value = (isset(${'poste' . $i})) ? ${"poste" . $i} : ''
+                $poste->value = (isset($p_array['poste' . $i])) ?$p_array['poste' . $i]: ''
                 ;
                 $poste->dbl_click_history();
 
@@ -256,20 +245,20 @@ class Pre_Op_Advanced extends Pre_operation_detail
                 $line_desc = new IText();
                 $line_desc->name = 'ld' . $i;
                 $line_desc->size = 30;
-                $line_desc->value = (isset(${"ld" . $i})) ? ${"ld" . $i} :
+                $line_desc->value = (isset($p_array["ld" . $i])) ? $p_array["ld" . $i] :
                                 $label;
 
                 // Amount
                 $amount = new INum();
                 $amount->size = 10;
                 $amount->name = 'amount' . $i;
-                $amount->value = (isset(${'amount' . $i})) ? ${"amount" . $i} : ''
+                $amount->value = (isset($p_array['amount' . $i])) ?$p_array['amount' . $i] : ''
                 ;
                 $amount->javascript = ' onChange="format_number(this);checkTotalDirect()"';
                 // D/C
                 $deb = new ICheckBox();
                 $deb->name = 'ck' . $i;
-                $deb->selected = (isset(${'ck' . $i})) ? true : false;
+                $deb->selected = (isset($p_array['ck' . $i])) ? true : false;
                 $deb->javascript = ' onChange="checkTotalDirect()"';
 
                 $ret.='<tr>';
diff --git a/include/class/pre_op_ods.class.php b/include/class/pre_op_ods.class.php
index 1130e6208..9b1d8696f 100644
--- a/include/class/pre_op_ods.class.php
+++ b/include/class/pre_op_ods.class.php
@@ -30,22 +30,23 @@ require_once  NOALYSS_INCLUDE.'/class/pre_operation.class.php';
 class Pre_op_ods extends Pre_operation_detail
 {
     var $op;
-    function __construct($cn,$p_id=0)
+    function __construct($cn)
     {
-        parent::__construct($cn,$p_id);
-        $this->operation->od_direct='f';
+        parent::__construct($cn);
     }
 
+    /***
+     * @brief retrieve data from $_POST
+     */
     function get_post()
     {
-        parent::get_post();
-        $this->operation->od_direct='f';
-        for ($i=0;$i<$this->operation->nb_item;$i++)
+        $http=new \HttpInput();
+        $nb=$http->post("nb_item","number");
+        for ($i=0;$i< $nb ;$i++)
         {
-
-            $this->{"e_account".$i}=$_POST['e_account'.$i];
-            $this->{"e_account".$i."_amount"}=$_POST['e_account'.$i."_amount"];
-            $this->{"e_account".$i."_type"}=$_POST['e_account'.$i."_type"];
+            $this->{"e_account".$i}=$http->post("e_account'.$i");
+            $this->{"e_account".$i."_amount"}=$http->post("e_account".$i."_amount","number",0);
+            $this->{"e_account".$i."_type"}=$http->post('e_account'.$i."_type");
 
         }
     }
@@ -53,45 +54,38 @@ class Pre_op_ods extends Pre_operation_detail
      * \brief save the detail and op in the database
      *
      */
-    function save()
+    function save($p_od_id,$p_nbitem)
     {
         try
         {
-            $this->db->start();
-            if ($this->operation->save() == false )
-                return;
-
             // save the selling
-            for ($i=0;$i<$this->operation->nb_item;$i++)
+            for ($i=0;$i< $p_nbitem ;$i++)
             {
-                $sql=sprintf('insert into op_predef_detail (opd_poste,opd_amount,'.
+                $sql='insert into op_predef_detail (opd_poste,opd_amount,'.
                              'opd_debit,od_id)'.
-                             ' values '.
-                             "('%s',%.2f,'%s',%d)",
-                             $this->{"e_account".$i},
-                             $this->{"e_account".$i."_amount"},
-                             ($this->{"e_account".$i."_type"}=='d')?'t':'f',
-                             $this->operation->od_id
-                            );
-                $this->db->exec_sql($sql);
+                             ' values ($1,$2,$3,$4)';
+
+                $this->db->exec_sql($sql,array($this->{"e_account".$i},
+                                                $this->{"e_account".$i."_amount"},
+                                                ($this->{"e_account".$i."_type"}=='d')?'t':'f',
+                                                $p_od_id)
+                                    );
             }
         }
         catch (Exception $e)
         {
-              record_log($e);
+            record_log($e);
             echo ($e->getMessage());
-            $this->db->rollback();
+            throw $e;
         }
 
     }
     /*!\brief compute an array accordingly with the FormVenView function
      */
-    function compute_array()
+    function compute_array($p_od_id)
     {
         $count=0;
-        $a_op=$this->operation->load();
-        $array=$this->operation->compute_array($a_op);
-        $p_array=$this->load();
+        $p_array=$this->load($p_od_id);
         foreach ($p_array as $row)
         {
             $c=($row['opd_debit']=='t')?'d':'c';
@@ -107,17 +101,13 @@ class Pre_op_ods extends Pre_operation_detail
     /*!\brief load the data from the database and return an array
      * \return an array 
      */
-    function load()
+    function load($p_od_id)
     {
         $sql="select opd_id,opd_poste,opd_amount,opd_debit".
-             "  from op_predef_detail where od_id=".$this->operation->od_id.
+             "  from op_predef_detail where od_id= $1 ".
              " order by opd_debit, opd_id,opd_amount";
-        $res=$this->db->exec_sql($sql);
+        $res=$this->db->exec_sql($sql,array($p_od_id));
         $array=Database::fetch_all($res);
         return $array;
     }
-    function set_od_id($p_id)
-    {
-        $this->operation->od_id=$p_id;
-    }
 }
diff --git a/include/class/pre_op_ven.class.php b/include/class/pre_op_ven.class.php
index 3d97c0687..fbb0cbc97 100644
--- a/include/class/pre_op_ven.class.php
+++ b/include/class/pre_op_ven.class.php
@@ -29,53 +29,49 @@ require_once  NOALYSS_INCLUDE.'/class/pre_operation.class.php';
 */
 class Pre_op_ven extends Pre_operation_detail
 {
-    var $op;
     //< Pre_operation
-    function __construct($cn,$p_id=0)
+    function __construct($cn)
     {
-        parent::__construct($cn,$p_id);
-        $this->operation->od_direct='f'; //< Pre_operation
+        parent::__construct($cn);
     }
 
     function get_post()
     {
-        parent::get_post();
-        $this->operation->od_direct='f';
-        $this->e_client=$_POST['e_client'];
-        for ($i=0;$i<$this->operation->nb_item;$i++)
+        $http=new \HttpInput();
+        $nb=$http->post("nb_item","number");
+        $this->e_client=$http->post("e_client");
+        for ($i=0;$i< $nb;$i++)
         {
             $march="e_march".$i;
-            $this->$march=$_POST['e_march'.$i];
-            $this->{"e_march".$i."_price"}=$_POST['e_march'.$i."_price"];
-            $this->{"e_march".$i."_tva_id"}=(isset($_POST['e_march'.$i."_tva_id"]))?$_POST['e_march'.$i."_tva_id"]:0;
-            $this->{"e_march".$i."_tva_amount"}=(isset($_POST['e_march'.$i."_tva_amount"]))?$_POST['e_march'.$i."_tva_amount"]:0;
-            $this->{"e_march".$i."_tva_id"}=(isset($_POST['e_march'.$i."_tva_id"]))?$_POST['e_march'.$i."_tva_id"]:0;
-            $this->{"e_march".$i."_label"}=(isset($_POST['e_march'.$i."_label"]))?$_POST['e_march'.$i."_label"]:null;
-            $this->{"e_quant".$i}=$_POST['e_quant'.$i];
+            $http->set_empty("");
+            $this->$march=$http->post('e_march'.$i);
+            $this->{"e_march".$i."_tva_id"}=$http->post('e_march'.$i."_tva_id","string",0);
+            $this->{"e_march".$i."_tva_id"}=$http->post('e_march'.$i."_tva_id","string","0");
+            $this->{"e_march".$i."_label"}=$http->post('e_march'.$i."_label","string","");
 
+            $http->set_empty(0);
+            $this->{"e_march".$i."_price"}=$http->post('e_march'.$i."_price","number");
+            $this->{"e_march".$i."_tva_amount"}=$http->post('e_march'.$i."_tva_amount","number","0");
+            $this->{"e_quant".$i}=$http->post('e_quant'.$i,"number");
         }
     }
     /*!
      * \brief save the detail and op in the database
      *
      */
-    function save()
+    function save($p_od_id,$p_nb_item)
     {
         try
         {
-            $this->db->start();
-            if ($this->operation->save() == false )
-                return;
             // save the client
             $sql=sprintf('insert into op_predef_detail (od_id,opd_poste,opd_debit)'.
-                         ' values '.
-                         "(%d,'%s','%s')",
-                         $this->operation->od_id,
-                         $this->e_client,
-                         "t");
+                ' values '.
+                "(%d,'%s','%s')",
+                $p_od_id,
+                $this->e_client,
+                "t");
             $this->db->exec_sql($sql);
-            // save the selling
-            for ($i=0;$i<$this->operation->nb_item;$i++)
+            for ($i=0;$i<$p_nb_item;$i++)
             {
                 if ( strlen(trim($this->{"e_march".$i}))=="") continue;
                 $sql= 'insert into op_predef_detail (opd_poste,'
@@ -94,7 +90,7 @@ class Pre_op_ven extends Pre_operation_detail
                              $this->{"e_march".$i."_tva_id"},
                              $this->{"e_quant".$i},
                              'f',
-                             $this->operation->od_id,
+                             $p_od_id,
                              $this->{"e_march".$i."_tva_amount"},
                              $this->{"e_march".$i."_label"},
                             ));
@@ -102,21 +98,17 @@ class Pre_op_ven extends Pre_operation_detail
         }
         catch (Exception $e)
         {
-              record_log($e);
-            echo ($e->getMessage());
-            $this->db->rollback();
+            record_log("PREOPVEN01".$e->getMessage().$e->getTraceAsString());
+              throw $e;
         }
-        $this->db->commit();
-
     }
     /*!\brief compute an array accordingly with the FormVenView function
      */
-    function compute_array()
+    function compute_array($p_od_id)
     {
         $count=0;
-        $a_op=$this->operation->load();
-        $array=$this->operation->compute_array($a_op);
-        $p_array=$this->load();
+        $array=array();
+        $p_array=$this->load($p_od_id);
 		if (empty($p_array)) return array();
         foreach ($p_array as $row)
         {
@@ -139,37 +131,33 @@ class Pre_op_ven extends Pre_operation_detail
                 }
             }
         }
-        // Find the ledger
-        $ledger=new Acc_Ledger($this->db,$this->operation->jrn_def_id);
-        // Find the max line of the ledger
-        $max_row=$ledger->get_min_row();
-        
-        // compute nb_item
-        $array['nb_item']=($max_row > $count)?$max_row:$count;
+
         return $array;
     }
     /*!\brief load the data from the database and return an array
      * \return an array
      */
-    function load()
+    function load($p_od_id)
     {
         $sql="select opd_id,opd_poste,opd_amount,opd_tva_id,opd_debit,".
-             " opd_quantity , opd_comment,opd_tva_amount from op_predef_detail where od_id=".$this->operation->od_id.
+             " opd_quantity , opd_comment,opd_tva_amount from op_predef_detail where od_id= $1 ".
              " order by opd_id";
-        $res=$this->db->exec_sql($sql);
+        $res=$this->db->exec_sql($sql,[$p_od_id]);
         $array=Database::fetch_all($res);
         return $array;
     }
-    function set_od_id($p_id)
-    {
-        $this->operation->od_id=$p_id;
-    }
+
+    /**
+     * @param array $p_array
+     * @return string
+     * @throws Exception
+     */
     function display($p_array)
     {
         global $g_parameter,$g_user;
-        if ( $p_array != null ) extract($p_array, EXTR_SKIP);
+
         require_once NOALYSS_INCLUDE.'/class/acc_ledger_sold.class.php';
-        $ledger=new Acc_Ledger_Sold($this->db,$this->jrn_def_id);
+        $ledger=new Acc_Ledger_Sold($this->db,$p_array['p_jrn']);
 
         $flag_tva=$g_parameter->MY_TVA_USE;
         /* Add button */
@@ -177,7 +165,7 @@ class Pre_op_ven extends Pre_operation_detail
 		$f_add_button->tabindex=-1;
         $f_add_button->label=_('Créer une nouvelle fiche');
         $f_add_button->set_attribute('ipopup','ipop_newcard');
-        $f_add_button->set_attribute('jrn',$ledger->id);
+        $f_add_button->set_attribute('jrn',$p_array['p_jrn']);
         $f_add_button->javascript="this.jrn=\$('p_jrn').value; select_card_type(this);";
 
         $f_add_button2=new IButton('add_card2');
@@ -209,7 +197,7 @@ class Pre_op_ven extends Pre_operation_detail
 
         // Save old value and set a new one
         //--
-        $e_client=( isset ($e_client) )?$e_client:"";
+        $e_client=( isset ($p_array["e_client"]) )?$p_array["e_client"]:"";
         $e_client_label="&nbsp;";//str_pad("",100,".");
 
 
@@ -256,10 +244,10 @@ class Pre_op_ven extends Pre_operation_detail
 
         // Record the current number of article
 		$min=$ledger->get_min_row();
-        $p_article= ( isset ($nb_item))?$nb_item:$min;
+        $p_article= ( isset ($p_array["nb_item"]))?$p_array["nb_item"]:$min;
         $max=($p_article < $min)?$min:$p_article;
 
-        $e_comment=(isset($e_comment))?$e_comment:"";
+        $e_comment=(isset($p_array["e_comment"]))?$p_array["e_comment"]:"";
         $Hid=new IHidden();
         $r.=$Hid->input("nb_item",$p_article);
 
@@ -271,16 +259,16 @@ class Pre_op_ven extends Pre_operation_detail
         {
             // Code id, price & vat code
             //--
-            $march=(isset(${"e_march$i"}))?${"e_march$i"}:""
+            $march=(isset($p_array["e_march$i"]))?$p_array["e_march$i"]:""
                    ;
-            $march_price=(isset(${"e_march".$i."_price"}))?${"e_march".$i."_price"}:""
+            $march_price=(isset($p_array["e_march".$i."_price"]))?$p_array["e_march".$i."_price"]:""
                          ;
             if ( $flag_tva=='Y')
             {
-                $march_tva_id=(isset(${"e_march$i"."_tva_id"}))?${"e_march$i"."_tva_id"}:"";
-                $march_tva_amount=(isset(${"e_march$i"."_tva_amount"}))?${"e_march$i"."_tva_amount"}:"";
+                $march_tva_id=(isset($p_array["e_march$i"."_tva_id"]))?$p_array["e_march$i"."_tva_id"]:"";
+                $march_tva_amount=(isset($p_array["e_march$i"."_tva_amount"]))?$p_array["e_march$i"."_tva_amount"]:"";
             }
-            $march_label=(isset(${"e_march".$i."_label"}))?${"e_march".$i."_label"}:"";
+            $march_label=(isset($p_array["e_march".$i."_label"]))?$p_array["e_march".$i."_label"]:"";
 
             // retrieve the tva label and name
             //--
@@ -291,7 +279,7 @@ class Pre_op_ven extends Pre_operation_detail
                 $march_label=$fMarch->strAttribut(ATTR_DEF_NAME);
                 if ( $flag_tva=='Y')
                 {
-                    if ( ! (isset(${"e_march$i"."_tva_id"})))
+                    if ( ! (isset($p_array["e_march$i"."_tva_id"])))
                         $march_tva_id=$fMarch->strAttribut(ATTR_DEF_TVA);
                 }
             }
@@ -385,7 +373,7 @@ class Pre_op_ven extends Pre_operation_detail
             }
             // quantity
             //--
-            $quant=(isset(${"e_quant$i"}))?${"e_quant$i"}:"1"
+            $quant=(isset($p_array["e_quant$i"]))?$p_array["e_quant$i"]:"1"
                    ;
             $Quantity=new INum();
             $Quantity->setReadOnly(false);
diff --git a/include/class/pre_operation.class.php b/include/class/pre_operation.class.php
index 8243b58bb..28a35f40e 100644
--- a/include/class/pre_operation.class.php
+++ b/include/class/pre_operation.class.php
@@ -34,19 +34,29 @@ require_once NOALYSS_INCLUDE.'/class/pre_op_ven.class.php';
 require_once NOALYSS_INCLUDE.'/class/pre_op_advanced.class.php';
 class Pre_operation
 {
-    var $db;						/*!< $db database connection */
-    var $nb_item;					/*!< $nb_item nb of item */
-    var $p_jrn;					/*!< $p_jrn jrn_def_id */
-    var $jrn_type;					/*!< $jrn_type */
-    var $name;						/*!< $name name of the predef. operation */
-    var $detail;                /*!< Pre_operation_detail */
-
+    private $db;						/*!< $db database connection */
+    private  $nb_item;					/*!< $nb_item nb of item */
+    private  $p_jrn;					/*!< $p_jrn jrn_def_id */
+    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 */
+    private  $od_id;         /*!< id of the Predefined Operation */
+    private $isloaded;
+    private $description; /*!< description of the predefined operation */
     function __construct($cn,$p_id=0)
     {
         $this->db=$cn;
-        $this->od_direct='false';
+        $this->od_direct='f';
         $this->od_id=$p_id;
+        $this->p_jrn=0;
+        $this->jrn_type='x';
+        $this->name='';
+        $this->isloaded=false;
+        $this->description="";
+
     }
+
     /**
      * @brief Propose to save the operation into a predefined operation
      * @return HTML  string
@@ -56,7 +66,7 @@ class Pre_operation
         $r.= '<p class="decale">';
         $r.= _("Donnez un nom pour sauver cette opération comme modèle")." <br>";
         $opd_name = new IText('opd_name');
-        $r.= "Nom du modèle " . $opd_name->input();
+        $r.=_( "Nom du modèle " ) . $opd_name->input();
         $opd_description=new ITextarea('od_description');
         $opd_description->style=' class="itextarea" style="width:30em;height:4em;vertical-align:top"';
         $r.='</p>';
@@ -67,6 +77,21 @@ class Pre_operation
         $r.='</p>';
         return $r;
     }
+    /**
+     * @return string
+     */
+    public function get_description()
+    {
+        return $this->description;
+    }/**
+     * @param string $description
+     */
+    public function set_description($description)
+    {
+        $this->description = $description;
+        return $this;
+    }
+
 
     /*!\brief fill the object with the $_POST variable */
     function get_post()
@@ -77,29 +102,55 @@ class Pre_operation
         $this->jrn_type=$http->post('jrn_type');
 	    $this->name=$http->post('opd_name');
 
-        $this->name=(trim($this->name)=='')?$http->post('e_comm'):$this->name;
         $this->description= $http->post('od_description');
         if ( $this->name=="")
         {
             $n=$this->db->get_next_seq('op_def_op_seq');
             $this->name=$this->jrn_type.$n;
-            // common value
+
         }
+
+        // get also info for the details
+        // common value
+        $this->detail=Pre_operation_detail::build_detail($this->jrn_type,$this->db);
+        $this->detail->get_post();
     }
+
+    /**
+     * delete a template operation and children
+     */
     function delete ()
     {
         $sql="delete from op_predef where od_id=$1";
         $this->db->exec_sql($sql,array($this->od_id));
     }
+    function save()
+    {
+        if ($this->od_id  < 1) {
+            $this->save_insert();
+        } else {
+            $this->save_update();
+        }
+
+    }
+    function save_update()
+    {
+        $sql = "update op_predef set jrn_def_id = $1 , od_name = $2 , 
+                        od_item =$3, od_description = $4 where od_id=$5";
+        $this->db->exec_sql($sql,array($this->p_jrn,$this->name,$this->nb_item,$this->description,$this->od_id));
+        // delete detail&
+        $this->db->exec_sql("delete from op_predef_detail where od_id = $1",array($this->od_id));
+        $this->detail->save($this->od_id,$this->nb_item);
+    }
     /*!\brief save the predef check first is the name is unique
      * \return true op.success otherwise false
      */
-    function save()
+    function save_insert()
     {
 
         if (	$this->db->count_sql("select * from op_predef ".
                                   "where upper(od_name)=upper('".Database::escape_string($this->name)."')".
-                                  "and jrn_def_id=".$this->p_jrn)
+                                  "and jrn_def_id=".$this->p_jrn." and od_id <> ".$this->od_id)
                 != 0 )
         {
             $this->name="copy_".$this->name."_".microtime(true);
@@ -109,24 +160,44 @@ class Pre_operation
             echo '<span class="notice">'.("Vous avez atteint le max. d'opération prédéfinie, désolé").'</span>';
             return false;
         }
-        $sql='insert into op_predef (jrn_def_id,od_name,od_item,od_jrn_type,od_direct,od_description)'.
-                     'values'.
-                     "($1,$2,$3,$4,$5  ,$6               )";
-        $this->db->exec_sql($sql,array($this->p_jrn,
-                     $this->name,
-                     $this->nb_item,
-                     $this->jrn_type,
-                     $this->od_direct,
-                     $this->description,
+        try {
+            $this->db->start();
+            $sql='insert into op_predef (jrn_def_id,od_name,od_item,od_jrn_type,od_direct,od_description)'.
+                'values'.
+                "($1,$2,$3,$4,$5  ,$6               )";
+            $this->db->exec_sql($sql,array($this->p_jrn,
+                $this->name,
+                $this->nb_item,
+                $this->jrn_type,
+                $this->od_direct,
+                $this->description,
             ));
-        $this->od_id=$this->db->get_current_seq('op_def_op_seq');
+            $this->od_id=$this->db->get_current_seq('op_def_op_seq');
+
+
+           // $this->detail=Pre_operation_detail::build_detail($this->jrn_type,$this->db);
+            $this->detail->save($this->od_id,$this->nb_item);
+            $this->db->commit();
+        } catch (Exception $e) {
+            record_log("PROP139.Failed save predefined operation ");
+            $this->db->rollback();
+        }
+
         return true;
     }
     /*!\brief load the data from the database and return an array
-     * \return an array
+     * \return an double array containing all the data from database
      */
     function load()
     {
+        $this->isloaded=true;
+        //------------------------------------------
+        // if new , then od_id == 0 and we need to use blank()
+        //------------------------------------------
+        if ($this->od_id == -1 ) {
+            $array=$this->blank($this->p_jrn);
+            return  $array;
+        }
         $sql="select od_id,jrn_def_id,od_name,od_item,od_jrn_type,od_description".
              " from op_predef where od_id=$1 ".
              " order by od_name";
@@ -135,27 +206,41 @@ class Pre_operation
         foreach (array('jrn_def_id','od_name','od_item','od_jrn_type','od_description') as $field) {
             $this->$field=$array[0][$field];
         }
-        switch ($this->od_jrn_type) {
-            case 'ACH':
-                $this->detail=new Pre_op_ach($this->db);
-                break;
-            case 'VEN':
-                $this->detail=new Pre_Op_ven($this->db);
-                break;
-            case 'ODS':
-                $this->detail=new Pre_op_advanced($this->db);
-                break;
-            default:
-                throw new Exception(sprintf(_('Echec PreOperatoin chargement %s'),$this->od_jrn_type));
-          }
-        $this->detail->set_od_id($this->od_id);
-        $this->detail->jrn_def_id=$this->jrn_def_id;
-        
+        $this->detail = Pre_operation_detail::build_detail($this->od_jrn_type, $this->db);
+        $array+=$this->detail->load($this->od_id);
         return $array;
     }
+    /**
+     * create a blank object to insert it later
+     * @param $p_ledger_id
+     * @throws Exception
+     */
+    function blank($p_ledger_id) {
+        $array["od_id"]=-1;
+        $array['jrn_def_id']=$p_ledger_id;
+        $array['od_name']="";
+        $array['od_item']=2;
+        $array['od_jrn_type']=$this->db->get_value("select jrn_def_type from jrn_def where jrn_def_id=$1",[$p_ledger_id]);
+        $array['od_description']="";
+        foreach (array('jrn_def_id','od_name','od_item','od_jrn_type','od_description') as $field) {
+            $this->$field=$array[$field];
+        }
+        $this->od_jrn_type=$array['od_jrn_type'];
+
+        $this->detail = Pre_operation_detail::build_detail($this->od_jrn_type, $this->db);
+        $this->detail->set_od_id(0);
+        $this->detail->set_jrn($p_ledger_id);
+
+        return $array;
+    }
+
     function compute_array()
     {
-        $p_array=$this->load();
+        if ($this->od_id > 0) {
+            $p_array = $this->load();
+        } else {
+            $p_array=$this->blank($this->p_jrn);
+        }
         $array=array(
                    "e_comm"=>$p_array[0]["od_name"],
                    "nb_item"=>(($p_array[0]["od_item"]<10)?10:$p_array[0]["od_item"])   ,
@@ -163,6 +248,8 @@ class Pre_operation
                    "jrn_type"=>$p_array[0]["od_jrn_type"],
                    "od_description"=>$p_array['0']['od_description']
                );
+        $this->detail = Pre_operation_detail::build_detail($this->od_jrn_type, $this->db);
+        $array += $this->detail->compute_array($this->od_id);
         return $array;
 
     }
@@ -187,9 +274,9 @@ class Pre_operation
     function count()
     {
         $a=$this->db->count_sql("select od_id,od_name from op_predef ".
-                                " where jrn_def_id=".$this->p_jrn.
-                                " and od_direct ='".$this->od_direct."'".
-                                " order by od_name");
+                                " where jrn_def_id= $1 ".
+                                " and od_direct = $2 ".
+                                " order by od_name",array($this->p_jrn,$this->od_direct));
         return $a;
     }
     /*!\brief get the list of the predef. operation of a ledger
@@ -198,21 +285,14 @@ class Pre_operation
     function get_list_ledger()
     {
         $sql="select od_id,od_name,od_description from op_predef ".
-             " where jrn_def_id=".$this->p_jrn.
-             " and od_direct ='".$this->od_direct."'".
+             " where jrn_def_id= $1 ".
+             " and od_direct = $2 ".
              " order by od_name";
-        $res=$this->db->exec_sql($sql);
+        $res=$this->db->exec_sql($sql,array($this->p_jrn,$this->od_direct));
         $all=Database::fetch_all($res);
         return $all;
     }
-    /*!\brief set the ledger
-     * \param $p_jrn is the ledger (jrn_id)
-     */
-    function set_jrn($p_jrn)
-    {
-        $this->p_jrn=$p_jrn;
-    }
-   
+
     /**
      * 
      * @brief display the detail of predefined operation, normally everything 
@@ -220,67 +300,43 @@ class Pre_operation
      */
     function display() 
     {
-        $array=$this->detail->compute_array();
+        $array=$this->compute_array();
+        require NOALYSS_TEMPLATE."/pre_operation_display.php";
         echo $this->detail->display($array);
     }
-}
-
-/*!\brief mother of the pre_op_XXX, it contains only one data : an
- * object Pre_Operation. The child class contains an array of
- * Pre_Operation object
- */
-class Pre_operation_detail
-{
-    var $operation;
-    function __construct($p_cn,$p_id=0)
-    {
-        $this->db=$p_cn;
-        $this->operation=new Pre_operation($this->db);
-        $this->valid=array('ledger'=>'jrn_def_id','ledger_type'=>'jrn_type','direct'=>'od_direct');
-		$this->jrn_def_id=-1;
-    }
-
-
     /*!\brief show a form to use pre_op
-     */
+  */
     function form_get ($p_url)
     {
-        $r=HtmlInput::button_action(_("Modèle d'opérations"), ' $(\'modele_op_div\').style.display=\'block\';if ( $(\'lk_modele_op_tab\')) { $(\'lk_modele_op_tab\').focus();}');
+        $r=HtmlInput::button_action(_("Modèle d'opérations"),
+            ' $(\'modele_op_div\').style.display=\'block\';if ( $(\'lk_modele_op_tab\')) { $(\'lk_modele_op_tab\').focus();}');
         $r.='<div id="modele_op_div" class="noprint">';
         $r.=HtmlInput::title_box(_("Modèle d'opérations"), 'modele_op_div', 'hide',"","n");
         $hid=new IHidden();
         $r.=$hid->input("action","use_opd");
-        $r.=$hid->input("jrn_type",$this->get("ledger_type"));
-        $r.= $this->show_button($p_url);
+        $r.=$hid->input("jrn_type",$this->jrn_type);
+        $r.= $this->display_list_operation($p_url);
         $r.=' <p style="text-align: center">'.
-        HtmlInput::button_hide('modele_op_div').
-        '</p>';
+            HtmlInput::button_hide('modele_op_div').
+            '</p>';
         $r.='</div>';
         return $r;
 
     }
-    /*!\brief count the number of pred operation for a ledger */
-    function count()
-    {
-        $a=$this->db->count_sql("select od_id,od_name from op_predef ".
-                                " where jrn_def_id=".$this->jrn_def_id.
-                                " and od_direct ='".$this->od_direct."'".
-                                " order by od_name");
-        return $a;
-    }
+
     /*!\brief show the button for selecting a predefined operation */
-    function show_button($p_url)
+    function display_list_operation($p_url)
     {
-        
-        
+
+
         $value=$this->db->get_array("select od_id,od_name,od_description from op_predef ".
-                                     " where jrn_def_id=$1".
-                                     " and od_direct =$2".
-                                     " order by od_name",
-                            array($this->jrn_def_id,$this->od_direct ));
-        
-        if ( $this->jrn_def_id=='') $value=array();
-        
+            " where jrn_def_id=$1".
+            " and od_direct =$2".
+            " order by od_name",
+            array($this->p_jrn,$this->od_direct ));
+
+        if ( $this->p_jrn=='') $value=array();
+
         $r="";
         if (count($value)==0) {
             $r.=_("Vous n'avez encore sauvé aucun modèle");
@@ -292,7 +348,7 @@ class Pre_operation_detail
             $r.='<tr class="'.(($i%2==0)?"even":"odd").'">';
             $r.='<td style="font-weight:bold;vertical-align:top;text-decoration:underline">';
             $r.=sprintf('<a href="%s&pre_def=%s" onclick="waiting_box()">%s</a> ',
-                    $p_url,$value[$i]['od_id'],$value[$i]['od_name']);
+                $p_url,$value[$i]['od_id'],$value[$i]['od_name']);
             $r.='</td>';
             $r.='<td>'.h($value[$i]['od_description']).'</td>';
             $r.='</tr>';
@@ -302,38 +358,181 @@ class Pre_operation_detail
     }
     public function   get_operation()
     {
-		if ( $this->jrn_def_id=='') return array();
+        if ( $this->jrn_def_id=='') return array();
         $value=$this->db->make_array("select od_id,od_name from op_predef ".
-                                     " where jrn_def_id=".sql_string($this->jrn_def_id).
-                                     " and od_direct ='".sql_string($this->od_direct)."'".
-                                     " order by od_name",1);
+            " where jrn_def_id=".sql_string($this->jrn_def_id).
+            " and od_direct ='".sql_string($this->od_direct)."'".
+            " order by od_name",1);
         return $value;
     }
-    function set($p_param,$value)
-    {
-        if ( ! isset ($this->valid[$p_param] ) )
-        {
-            $msg=_(" le parametre $p_param n'existe pas ".__FILE__.':'.__LINE__);
-            throw new Exception($msg);
-        }
-        $attr=$this->valid[$p_param];
-        $this->$attr=$value;
-    }
-    function get($p_param)
-    {
 
-        if ( ! isset ($this->valid[$p_param] ) )
-        {
-            $msg=_(" le parametre $p_param n'existe pas ".__FILE__.':'.__LINE__);
-            throw new Exception($msg);
-        }
-        $attr=$this->valid[$p_param];
-        return $this->$attr;
+    /**
+     * @return mixed
+     */
+    public function get_db()
+    {
+        return $this->db;
+        return $this;
     }
 
-    function get_post()
+    /**
+     * @param mixed $db
+     */
+    public function set_db($db)
     {
-        $this->operation->get_post();
+        $this->db = $db;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function get_nb_item()
+    {
+        return $this->nb_item;
+        return $this;
+    }
+
+    /**
+     * @param mixed $nb_item
+     */
+    public function set_nb_item($nb_item)
+    {
+        $this->nb_item = $nb_item;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function get_jrn_type()
+    {
+        return $this->jrn_type;
+        return $this;
+    }
+
+    /**
+     * @param string $jrn_type
+     */
+    public function set_jrn_type($jrn_type)
+    {
+        if ( ! in_array ($jrn_type,['ACH','FIN','VEN','ODS'] )) throw new Exception('prop03.invalid ledger type');
+        $this->jrn_type = $jrn_type;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function get_name()
+    {
+        return $this->name;
+        return $this;
+    }
+
+    /**
+     * @param string $name
+     */
+    public function set_name($name)
+    {
+        $this->name = $name;
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function get_detail()
+    {
+        return $this->detail;
+        return $this;
+    }
+
+    /**
+     * @param array $detail
+     */
+    public function set_detail(Pre_operation_detail $detail)
+    {
+        $this->detail = $detail;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function get_od_direct()
+    {
+        return $this->od_direct;
+        return $this;
+    }
+
+    /**
+     * @param string $od_direct
+     */
+    public function set_od_direct($od_direct)
+    {
+        if ( !   in_array($od_direct,['f','t']))  throw new Exception('prop02.invalid od_direct');
+        $this->od_direct = $od_direct;
+        return $this;
+    }
+
+    /**
+     * @return int|mixed
+     */
+    public function get_od_id()
+    {
+        return $this->od_id;
+    }
+
+    /**
+     * @param int|mixed $od_id
+     */
+    public function set_od_id($od_id)
+    {
+        $this->od_id = $od_id;
+        return $this;
+    }
+
+
+    /*!\brief set the ledger
+     * \param $p_jrn is the ledger (jrn_id)
+     */
+    function set_p_jrn($p_jrn)
+    {
+        $this->p_jrn=$p_jrn;
+        $this->jrn_type=$this->db->get_value("select jrn_def_type from jrn_def where jrn_def_id=$1",[$p_jrn]);
+        return $this;
+    }
+}
+
+/*!\brief mother of the pre_op_XXX, it contains only one data : an
+ * object Pre_Operation. The child class contains an array of
+ * Pre_Operation object
+ */
+class Pre_operation_detail
+{
+    function __construct($p_cn)
+    {
+        $this->db=$p_cn;
+
+    }
+
+    static function build_detail($p_jrn_type,Database $database)
+    {
+        switch ($p_jrn_type) {
+            case 'ACH':
+                $detail=new Pre_op_ach($database);
+                break;
+            case 'VEN':
+                $detail=new Pre_Op_ven($database);
+                break;
+            case 'ODS':
+                $detail=new Pre_op_advanced($database);
+                break;
+            default:
+                throw new Exception(sprintf(_('Echec PreOperatoin chargement %s'),$p_jrn_type));
+        }
+        return $detail;
     }
 
 }
diff --git a/include/compta_ach.inc.php b/include/compta_ach.inc.php
index 65f3d3fa5..2059cf74c 100644
--- a/include/compta_ach.inc.php
+++ b/include/compta_ach.inc.php
@@ -27,7 +27,7 @@
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 require_once NOALYSS_INCLUDE.'/lib/icheckbox.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_ledger_purchase.class.php';
-require_once  NOALYSS_INCLUDE.'/class/pre_op_ach.class.php';
+require_once  NOALYSS_INCLUDE.'/class/pre_operation.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ipopup.class.php';
 $gDossier = dossier::id();
 global $g_parameter;
@@ -153,7 +153,7 @@ if (isset($_POST['record']))
 		/* Save the predefined operation */
                 if ( isset($_POST['opd_name']) && trim($_POST['opd_name']) != "" )
 		{
-			$opd = new Pre_op_ach($cn);
+			$opd = new Pre_operation($cn);
 			$opd->get_post();
 			$opd->save();
 		}
@@ -265,7 +265,7 @@ try
         // used a predefined operation
         $predef=$http->request("pre_def","string", "0");
         $p_jrn_predef=$http->request("p_jrn_predef","string", "0");
-        $op=new Pre_op_ach($cn);
+        $op=new Pre_operation($cn);
         $op->set_od_id($predef);
         $p_post=$op->compute_array();
         $Ledger->id=$p_jrn_predef;
diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php
index bd3f9c1a1..bbb76ed45 100644
--- a/include/compta_ven.inc.php
+++ b/include/compta_ven.inc.php
@@ -25,7 +25,7 @@
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 require_once NOALYSS_INCLUDE.'/lib/icheckbox.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_ledger_sold.class.php';
-require_once  NOALYSS_INCLUDE.'/class/pre_op_ven.class.php';
+require_once  NOALYSS_INCLUDE.'/class/pre_operation.class.php';
 require_once  NOALYSS_INCLUDE.'/class/document.class.php';
 require_once  NOALYSS_INCLUDE.'/class/acc_ledger_info.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ipopup.class.php';
@@ -171,7 +171,7 @@ show_tabs(a_tab,'facturation_div_id');
             /* Save the predefined operation */
             if ( isset($_POST['opd_name']) && trim($_POST['opd_name']) != "" )
             {
-                $opd=new Pre_op_ven($cn);
+                $opd=new Pre_operation($cn);
                 $opd->get_post();
                 $opd->save();
             }
@@ -253,22 +253,14 @@ if (!isset($_REQUEST ['p_jrn']))
     $Ledger->id=$def_ledger['jrn_def_id'];
 }
 else
-    $Ledger->id=$_REQUEST ['p_jrn'];
+    $Ledger->id=$http->request('p_jrn');
+
 if (isset($_REQUEST['p_jrn_predef']))
 {
-    $Ledger->id=$_REQUEST['p_jrn_predef'];
+    $Ledger->id=$http->request('p_jrn_predef');
 }
 
-/* echo '<div id="predef_form">';
-echo HtmlInput::hidden('p_jrn_predef', $Ledger->id);
-$op=new Pre_op_ven($cn);
-$op->set('ledger',$Ledger->id);
-$op->set('ledger_type',"VEN");
-$op->set('direct','f');
-$url=http_build_query(array('p_jrn_predef'=>$Ledger->id,'ac'=>$_REQUEST['ac'],'gDossier'=>dossier::id()));
-echo $op->form_get('do.php?'.$url);
-echo '</div>';
-*/
+
 echo '<div class="content">';
 if ( $p_msg !="" ) echo '<span class="warning">'.$p_msg.'</span>';
 try
@@ -284,10 +276,10 @@ try
     {
         // used a predefined operation
         //
-       $op=new Pre_op_ven($cn);
-        $op->set_od_id($_REQUEST['pre_def']);
+       $op=new Pre_operation($cn);
+        $op->set_od_id($http->request('pre_def'));
         $p_post=$op->compute_array();
-        $Ledger->id=$_REQUEST ['p_jrn_predef'];
+        $Ledger->id=$http->request('p_jrn_predef');
 
         echo $Ledger->input($p_post);
         echo '<div class="content">';
diff --git a/include/database/op_predef_sql.class.php b/include/database/op_predef_sql.class.php
new file mode 100644
index 000000000..8ae979c52
--- /dev/null
+++ b/include/database/op_predef_sql.class.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Autogenerated file
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
+
+
+/**
+ * class_op_predef_sql.php
+ *
+ *@file
+ *@brief abstract of the table public.op_predef */
+class Op_predef_SQL extends Noalyss_SQL
+{
+
+    function __construct(Database $p_cn,$p_id=-1)
+    {
+        $this->table = "public.op_predef";
+        $this->primary_key = "od_id";
+        /*
+         * List of columns
+         */
+        $this->name=array(
+            "od_id"=>"od_id"
+        ,"jrn_def_id"=>"jrn_def_id"
+        ,"od_name"=>"od_name"
+        ,"od_item"=>"od_item"
+        ,"od_jrn_type"=>"od_jrn_type"
+        ,"od_direct"=>"od_direct"
+        ,"od_description"=>"od_description"
+        );
+        /*
+         * Type of columns
+         */
+        $this->type = array(
+            "od_id"=>"numeric"
+        ,"jrn_def_id"=>"numeric"
+        ,"od_name"=>"text"
+        ,"od_item"=>"numeric"
+        ,"od_jrn_type"=>"text"
+        ,"od_direct"=>"boolean"
+        ,"od_description"=>"text"
+        );
+
+
+        $this->default = array(
+            "od_id" => "auto"
+        );
+
+        $this->date_format = "DD.MM.YYYY";
+        parent::__construct($p_cn,$p_id);
+    }
+
+
+}
\ No newline at end of file
diff --git a/include/operation_ods_new.inc.php b/include/operation_ods_new.inc.php
index bad4da0bc..c1067321c 100644
--- a/include/operation_ods_new.inc.php
+++ b/include/operation_ods_new.inc.php
@@ -25,7 +25,8 @@
  * \brief to write into the ledgers ODS a new operation
  */
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-require_once NOALYSS_INCLUDE.'/class/pre_op_ods.class.php';
+require_once  NOALYSS_INCLUDE.'/class/pre_operation.class.php';
+
 require_once NOALYSS_INCLUDE.'/lib/iconcerned.class.php';
 
 global $g_user,$g_parameter;
@@ -59,7 +60,7 @@ if ( isset ($_GET['action']) && ! isset($_POST['correct']) && ! isset($correct)
 	if ( $_GET['action']=='use_opd')
 	{
             // get data from predef. operation
-            $op=new Pre_op_advanced($cn);
+            $op=new Pre_operation($cn);
             $p_post=null;
             if ( isset($_REQUEST['pre_def']) && $_REQUEST['pre_def'] != '')
             {
diff --git a/include/preod.inc.php b/include/preod.inc.php
index f0bff977f..d12041cf0 100644
--- a/include/preod.inc.php
+++ b/include/preod.inc.php
@@ -22,105 +22,17 @@
 /*!\file
  * \brief included file for managing the predefined operation
  */
+require_once NOALYSS_INCLUDE.'/class/operation_predef_mtable.class.php';
+
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-require_once NOALYSS_INCLUDE.'/lib/iselect.class.php';
-require_once NOALYSS_INCLUDE.'/lib/icheckbox.class.php';
-require_once NOALYSS_INCLUDE.'/lib/ihidden.class.php';
-require_once NOALYSS_INCLUDE.'/class/database.class.php';
-require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
-require_once NOALYSS_INCLUDE.'/class/pre_operation.class.php';
 global $http;
-/*
- * Value from $_GET or $_REQUEST
- */
-$request_jrn=$http->request("jrn","string", -1);
-$request_ac=$http->request("ac","string", "");
-$request_sa=$http->request("sa","string", "");
-$get_jrn=$http->get('jrn',"string",-1);
 
-echo '<div class="content">';
-echo '<form method="GET">';
-$sel=new ISelect();
-$sel->name="jrn";
-$sel->value=$cn->make_array("select jrn_def_id,jrn_def_name from ".
-                            " jrn_def where jrn_def_type in ('VEN','ACH','ODS') order by jrn_def_name");
-// Show a list of ledger
-$sel->selected=$request_jrn;
-echo 'Choisissez un journal '.$sel->input();
+$prd_op=new Op_predef_SQL($cn);
 
-echo dossier::hidden();
-$hid=new IHidden();
-echo $hid->input("sa","jrn");
-echo $hid->input("ac",$request_ac);
-echo '<hr>';
-echo HtmlInput::submit('Accepter','Accepter');
-echo '</form>';
-
-// if $_REQUEST[sa] == del delete the predefined operation
-if ( $request_sa == 'del')
-{
-    $op=new Pre_operation($cn);
-    $http=new HttpInput();
-    $op->od_id=$http->request('od_id',"string",-1);
-    if (isNumber($op->od_id)==1 && $op->od_id != -1 )
-    {
-        $op->delete();
-    }
-    $request_sa='jrn';
-}
-
-// if $_REQUEST[sa] == jrn show the  predefined operation for this
-// ledger
-if ( $request_sa== 'jrn' )
-{
-    $op=new Pre_operation($cn);
-    $op->set_jrn($get_jrn);
-   $is_ods = $cn->get_value("select count(*)
-		from jrn_def where
-			jrn_def_id=$1
-			and jrn_def_type='ODS'", array($get_jrn));
-	$op->od_direct = ($is_ods > 0) ? 't' : 'f';
-	$array = $op->get_list_ledger();
-	if (empty($array) == true)
-    {
-        echo _("Aucun enregistrement");
-        return;
-    }
-    echo HtmlInput::filter_table('preod_table', '0', 0);
-    echo '<table id="preod_table">';
-    $count=0;
-    foreach ($array as $row )
-    {
-
-      if ( $count %2 == 0 )
-            echo '<tr class="odd">';
-        else
-            echo '<tr class="even">';
-      $count++;
-
-        echo '<td>'.h($row['od_name']).'</td>';
-        echo '<td>'.h($row['od_description']).'</td>';
-        echo '<td>';
-	echo '<form method="POST" id="preod_frm'.$row['od_id'].'" class="print" style="margin:0px;padding:0px;">';
-        echo dossier::hidden();
-        echo HtmlInput::hidden("sa","del");
-        echo HtmlInput::hidden("ac",$request_ac);
-        echo HtmlInput::hidden("del","");
-        echo HtmlInput::hidden("od_id",$row['od_id']);
-        echo HtmlInput::hidden("jrn",$get_jrn);
-
-	$b='<input type="submit" class="smallbutton" value="'._("Effacer").'"'.
-	  ' onClick="return confirm_box(\'preod_frm'.$row['od_id'].'\',\''._("Voulez-vous vraiment effacer cette operation ?").'\');" >';
-	   echo $b;
-	   echo '</form>';
-
-        echo '</td>';
-	$b=HtmlInput::button('mod'.$row['od_id'],"Modifier","onclick=\"mod_predf_op('".dossier::id()."','".$row['od_id']."');\"");
-	echo td($b);
-        echo '</tr>';
-
-    }
-    echo '</table>';
-}
-echo '</div>';
-?>
+$operation_predef_mtable=new Operation_Predef_MTable($prd_op);
+$operation_predef_mtable->set_json(json_encode(array(   "ac"=>$http->request("ac"),
+                                                        "op"=>"save_predf",
+                                                        "gDossier"=>Dossier::id()
+                                                     )));
+$operation_predef_mtable->create_js_script();
+$operation_predef_mtable->display_table();
\ No newline at end of file
diff --git a/include/template/pre_operation_display.php b/include/template/pre_operation_display.php
new file mode 100644
index 000000000..8de218bd2
--- /dev/null
+++ b/include/template/pre_operation_display.php
@@ -0,0 +1,36 @@
+<?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+// Copyright Author Dany De Bontridder danydb@aevalys.eu
+
+/**
+ * @file
+ * display pre_operation value
+ */
+
+$name=new IText("opd_name",$array["e_comm"]);
+$description=new IText("od_description",$array["od_description"]);
+$description->style=' class="itextarea" style="width:30em;height:4em;vertical-align:top"';
+
+?>
+<?php echo _("Nom du modèle"),$name->input();?>
+<p>
+    <?php echo  _('Description (max 50 car.)'); ?>
+    <?php echo $description->input();?>
+</p>
diff --git a/include/template/predf_ledger_detail.php b/include/template/predf_ledger_detail.php
index a3cdd8f8a..dfcfbb197 100644
--- a/include/template/predf_ledger_detail.php
+++ b/include/template/predf_ledger_detail.php
@@ -5,12 +5,13 @@
 <legend><?php echo $f_legend ?>
 </legend>
 <?php echo $f_type?><?php echo $f_client_qcode?><?php echo $f_client_bt?> <?php echo $f_client?><br>
-<input type="hidden" id="p_jrn" name="p_jrn" value="<?php echo $this->jrn_def_id; ?>">    
+<input type="hidden" id="p_jrn" name="p_jrn" value="<?php echo $p_array["p_jrn"]; ?>">
 <?php echo $str_add_button?>
 </fieldset>
 
-<fieldset>
-<legend><?php echo $f_legend_detail?></legend>
+<div class="fieldset" style="overflow:auto;max-height:300px">
+<h1 class="fiedset"><?php echo $f_legend_detail?></h1>
+    <div style="">
 <table id="sold_item" width="100%" border="0">
 <tr>
 <th style="width:auto"colspan="2">Code <?php echo Icon_Action::infobulle(0)?></th>
@@ -79,6 +80,6 @@ echo '</tr>';
 <?php endif; ?>
 </div>
 
-</fieldset>
+</div>
 
 

From 18bf9951e7c5cbd470cc75e4849dba1c0959bafe Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Sun, 27 Sep 2020 10:55:59 +0200
Subject: [PATCH 019/257] javascript : add function to concat 2 json objects

---
 html/js/managetable.js |  5 +++--
 html/js/scripts.js     | 21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/html/js/managetable.js b/html/js/managetable.js
index d67e77402..3d5d15f81 100644
--- a/html/js/managetable.js
+++ b/html/js/managetable.js
@@ -189,18 +189,19 @@ var ManageTable = function (p_table_name)
      * set
      */
     this.save = function (form_id) {
+        var param_form={};
         waiting_box();
         try {
             this.param['action'] = 'save';
             var form = $(form_id).serialize(true);
-            this.param_add(form);
+            param_form = json_concat(this.param,form);
             var here=this; 
           } catch (e) {
             alert(e.message);
             return false;
           }
         new Ajax.Request(this.callback, {
-            parameters: this.param,
+            parameters: param_form,
             method: "post",
             onSuccess: function (req) {
                 try {
diff --git a/html/js/scripts.js b/html/js/scripts.js
index f2f6e0c9c..9d9318669 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -3665,3 +3665,24 @@ function toggle_row_warning_enable(p_enable, p_row)
         $(p_row).hide();
     }
 }
+
+/**
+ * return a json object which is the merge of the 2 json objects
+ *
+ * @param p_json1 object 1 to merge
+ * @param p_json2 object 2 to merge
+ * @returns new json object
+ */
+function json_concat(p_json1,p_json2)
+{
+
+        var result = {};
+        for (var key in p_json1) {
+            result[key] = p_json1[key];
+        }
+        for (var key in p_json2) {
+            result[key] = p_json2[key];
+        }
+        return result;
+
+}
\ No newline at end of file

From c54aa0a01ca54eb74aca4fea5fb1c79d20ae7909 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Sun, 27 Sep 2020 11:08:33 +0200
Subject: [PATCH 020/257] javascript: remove hardcoding of dialog box for 
 manage_table

---
 html/js/managetable.js                 |  8 +++++--
 html/js/scripts.js                     |  2 +-
 include/ajax/ajax_save_predf_op.php    | 10 +++++++--
 include/lib/manage_table_sql.class.php | 31 ++++++++++++++++++++++----
 4 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/html/js/managetable.js b/html/js/managetable.js
index 3d5d15f81..916ba0e98 100644
--- a/html/js/managetable.js
+++ b/html/js/managetable.js
@@ -87,6 +87,10 @@ var ManageTable = function (p_table_name)
       
       this.sort_column=p_column;
     };
+
+    this.set_dialog_box=function (p_dialog_box){
+        this.control=p_dialog_box;
+    }
     /**
      * Insert the row a the right location
      * @param {type} p_element_row DOMElement TR
@@ -225,12 +229,12 @@ var ManageTable = function (p_table_name)
                     new Effect.Highlight(answer['ctl_row'] ,{startcolor: '#FAD4D4',endcolor: '#F78082' });
                     alternate_row_color("tb"+answer['ctl']);
                     remove_waiting_box();
-                    $("dtr").hide();
+                    $(here.control).hide();
                     
                 } else {
                     remove_waiting_box();
                     smoke.alert(content[48]);
-                    $("dtr").update(answer['html']);
+                    $(here.control).update(answer['html']);
                    
                 }
             }
diff --git a/html/js/scripts.js b/html/js/scripts.js
index 9d9318669..7a469d632 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -3668,7 +3668,7 @@ function toggle_row_warning_enable(p_enable, p_row)
 
 /**
  * return a json object which is the merge of the 2 json objects
- *
+ * from 2015 : Object.assign(obj1, obj2);
  * @param p_json1 object 1 to merge
  * @param p_json2 object 2 to merge
  * @returns new json object
diff --git a/include/ajax/ajax_save_predf_op.php b/include/ajax/ajax_save_predf_op.php
index c84830ffe..4286d1db7 100644
--- a/include/ajax/ajax_save_predf_op.php
+++ b/include/ajax/ajax_save_predf_op.php
@@ -56,8 +56,14 @@ $operation_predef_mtable->set_callback("ajax_misc.php");
 
 if ($action=="input")
 {
-    header('Content-type: text/xml; charset=UTF-8');
-    echo $operation_predef_mtable->ajax_input()->saveXML();
+    if ($p_id == -1 ) {
+        // new operation to insert
+
+    } else {
+        // display existing operation for updating
+        header('Content-type: text/xml; charset=UTF-8');
+        echo $operation_predef_mtable->ajax_input()->saveXML();
+    }
     return;
 }
 elseif ($action == "save")
diff --git a/include/lib/manage_table_sql.class.php b/include/lib/manage_table_sql.class.php
index cd364686b..20479426a 100644
--- a/include/lib/manage_table_sql.class.php
+++ b/include/lib/manage_table_sql.class.php
@@ -71,15 +71,16 @@ class Manage_Table_SQL
     protected $a_prop; //!< property for each col.
     protected $a_type; //!< Type of the column : date , select ... Only in input
     protected $a_select; //!< Possible value if a_type is a SELECT
-    protected $object_name; //!< Object_name is used for the javascript
+    protected $object_name; //!< Object_name is used for the javascript , it is the row id to update or delete
     protected $row_delete; //!< Flag to indicate if rows can be deleted
     protected $row_update; //!< Flag to indicate if rows can be updated
     protected $row_append; //!< Flag to indicate if rows can be added
-    protected $json_parameter; //!< Default parameter to add (gDossier...)
+    protected $json_parameter; //!< Default parameter to add (gDossier...), sent to the ajax callback
     protected $aerror; //!< Array containing the error of the input data
     protected $col_sort; //!< when inserting, it is the column to sort,-1 to disable it and append only
     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
     const UPDATABLE=1;
     const VISIBLE=2;
 
@@ -121,6 +122,7 @@ class Manage_Table_SQL
         $this->col_sort=0;
         // By default no js sort
         $this->sort_column="";
+        $this->dialog_box="dtr";
     }
     /**
      * send the XML headers for the ajax call 
@@ -129,6 +131,25 @@ class Manage_Table_SQL
     {
         header('Content-type:text/xml;charset="UTF-8"');
     }
+
+    /**
+     * @return mixed
+     */
+    public function get_dialog_box()
+    {
+        return $this->dialog_box;
+        return $this;
+    }
+
+    /**
+     * @param mixed $dialog_box
+     */
+    public function set_dialog_box($dialog_box)
+    {
+        $this->dialog_box = $dialog_box;
+        return $this;
+    }
+
     /**
      * When adding an element , it is column we checked to insert before,
      * @return none
@@ -363,6 +384,7 @@ function check()
 		{$this->object_name}.set_callback(\"{$this->callback}\");
 		{$this->object_name}.param_add({$this->json_parameter});
 		{$this->object_name}.set_sort({$this->get_col_sort()});
+		{$this->object_name}.set_control(\"{$this->get_dialog_box()}\");
 		</script>
 
 	";
@@ -1046,9 +1068,10 @@ function check()
         try
         {
             $status=$p_status;
+
             ob_start();
 
-            echo HtmlInput::title_box("Donnée", "dtr","close","","y");
+            echo HtmlInput::title_box("Donnée", $this->dialog_box,"close","","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,
@@ -1058,7 +1081,7 @@ function check()
             echo HtmlInput::json_to_hidden($this->json_parameter);
             echo HtmlInput::hidden("p_id", $this->table->get_pk_value());
             // button Submit and cancel
-            $close=sprintf("\$('%s').remove()", "dtr");
+            $close=sprintf("\$('%s').remove()", $this->dialog_box);
             // display error if any
             $this->display_error();
             echo '<ul class="aligned-block">',

From a9dd9ebdddc6829f896e8737a2c3b13b6ebe1441 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 28 Sep 2020 13:43:47 +0200
Subject: [PATCH 021/257] fix type

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

diff --git a/include/adm.inc.php b/include/adm.inc.php
index 7d0a478dc..5c571f66d 100644
--- a/include/adm.inc.php
+++ b/include/adm.inc.php
@@ -52,7 +52,7 @@ if ( isset($_POST['action_fiche'] ) )
             return;
         }
 
-        $f_id=$hi->request('f_id',"number");
+        $f_id=$http->request('f_id',"number");
 
         $fiche=new Admin($cn,$f_id);
         $fiche->remove();

From 54b265c03a1cff2c1e569c18c58df63c6c07d791 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Tue, 29 Sep 2020 17:06:57 +0200
Subject: [PATCH 022/257] documentation

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

diff --git a/include/lib/database_core.class.php b/include/lib/database_core.class.php
index 2bcba2307..2f7bc3246 100644
--- a/include/lib/database_core.class.php
+++ b/include/lib/database_core.class.php
@@ -611,7 +611,7 @@ class DatabaseCore
      *
      * \param $p_sql  sql statement, only the first two column will be returned in
      *  an array. The first col. is the label and the second the value
-     *  \param $p_null if the array start with a null value
+     *  \param $p_null if the array start with a null value Yes = 1 , No=0
      *  \param $p_array is the array with the bind value
      * \note this function is used with ISelect when it is needed to have a list of
      * options.

From e6a9d8ff482f569baea5f29dfe5527e4c04d4795 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Tue, 29 Sep 2020 18:04:25 +0200
Subject: [PATCH 023/257] Bug : remove file by error

---
 html/ajax_misc.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index 12c77eb14..2e2e258f3 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -255,7 +255,9 @@ $path = array(
     // Display all cards using an accounting
     "display_all_card"=>"ajax_display_all_card",
     // payment_method
-    "payment_method"=>"ajax_payment_method"
+    "payment_method"=>"ajax_payment_method",
+    // update list of predefined operation if ledger changes
+    "up_predef"=>"ajax_update_predef"
 )    ;
 
 if (array_key_exists($op, $path)) {

From 298121f99956f2fbf9e1db1790dfd2566967ddfd Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Tue, 29 Sep 2020 18:04:56 +0200
Subject: [PATCH 024/257] ManageTable  : you can set the style of the dialog
 box

---
 html/js/managetable.js                 |  7 +++++--
 include/lib/manage_table_sql.class.php | 25 ++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/html/js/managetable.js b/html/js/managetable.js
index 916ba0e98..b6f2795de 100644
--- a/html/js/managetable.js
+++ b/html/js/managetable.js
@@ -74,9 +74,12 @@ 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.sort_column=0;
     this.param = {"table": p_table_name, "ctl_id": this.control}; //<! default value to pass
+    this.set_style=function(p_json) {
+        this.mt_style=p_json;
+    };
     /**
      * Set the sort , 
      * @param {string} p_column  column number start from 0
@@ -308,7 +311,7 @@ var ManageTable = function (p_table_name)
                     var obj = {id: control, "cssclass": "inner_box", "html": loading()};
                     add_div(obj);
                     var pos = calcy(250);
-                    $(obj.id).setStyle({position: "fixed", top:  '15%', width: "auto", "margin-left": "20%"});
+                    $(obj.id).setStyle(here.mt_style);
                     $(obj.id).update(x['html']);
                 } catch (e) {
                     smoke.alert(content[48] + e.message);
diff --git a/include/lib/manage_table_sql.class.php b/include/lib/manage_table_sql.class.php
index 20479426a..20784304a 100644
--- a/include/lib/manage_table_sql.class.php
+++ b/include/lib/manage_table_sql.class.php
@@ -86,7 +86,7 @@ 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;
     /**
      * @brief Constructor : set the label to the column name,
      * the order of the column , set the properties and the
@@ -123,6 +123,7 @@ 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%");
     }
     /**
      * send the XML headers for the ajax call 
@@ -132,6 +133,26 @@ class Manage_Table_SQL
         header('Content-type:text/xml;charset="UTF-8"');
     }
 
+    /**
+     * return the db_style
+     * @return array
+     */
+    public function get_dialogbox_style()
+    {
+        return $this->dialogbox_style;
+    }
+
+    /**
+     * Dialog box style , by default {position: "fixed", top:  '15%', width: "auto", "margin-left": "20%"}
+     *
+     * @param array $db_style , will be transformed into a json object
+     */
+    public function set_dialogbox_style($db_style)
+    {
+        $this->dialogbox_style = $db_style;
+        return $this;
+    }
+
     /**
      * @return mixed
      */
@@ -378,6 +399,7 @@ function check()
      */
     function create_js_script()
     {
+        $style=json_encode($this->dialogbox_style);
         echo "
 		<script>
 		var {$this->object_name}=new ManageTable(\"{$this->table->table}\");
@@ -385,6 +407,7 @@ function check()
 		{$this->object_name}.param_add({$this->json_parameter});
 		{$this->object_name}.set_sort({$this->get_col_sort()});
 		{$this->object_name}.set_control(\"{$this->get_dialog_box()}\");
+		{$this->object_name}.set_style($style);
 		</script>
 
 	";

From dee33b561f839e10e82da50cb0f66d717ec2426a Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Tue, 29 Sep 2020 18:08:26 +0200
Subject: [PATCH 025/257] Rewriting of Predefined Operation. You can add new
 Predefined Operation

---
 html/style-classic.css                        |  9 ++-
 html/style-classic7.css                       |  6 ++
 html/style-light.css                          | 17 +++--
 include/ajax/ajax_save_predf_op.php           | 11 ++--
 include/ajax/ajax_update_predef.php           | 10 +--
 .../class/operation_predef_mtable.class.php   | 66 +++++++++++++++++--
 include/class/pre_op_ach.class.php            | 23 +++++--
 include/class/pre_op_advanced.class.php       | 18 ++++-
 include/class/pre_op_ven.class.php            | 15 +++--
 include/class/pre_operation.class.php         | 53 ++++++++++-----
 include/preod.inc.php                         |  8 ++-
 include/template/pre_operation_display.php    |  4 ++
 include/template/predf_ledger_detail.php      |  8 +--
 13 files changed, 194 insertions(+), 54 deletions(-)

diff --git a/html/style-classic.css b/html/style-classic.css
index 0dd8480a1..6874bcbc2 100644
--- a/html/style-classic.css
+++ b/html/style-classic.css
@@ -2433,4 +2433,11 @@ span.title_tab_row {
      background-color: #000066 !important;
      color : white !important;
      
-}
\ No newline at end of file
+}
+
+ /**
+  * dialog box for adding, modifying predefined operation
+  */
+ #prdfop {
+
+ }
\ No newline at end of file
diff --git a/html/style-classic7.css b/html/style-classic7.css
index 866f4d34a..46fd2eba9 100644
--- a/html/style-classic7.css
+++ b/html/style-classic7.css
@@ -2469,3 +2469,9 @@ span.title_tab_row {
      color : white !important;
      
 }
+/**
+ * dialog box for adding, modifying predefined operation
+ */
+#prdfop {
+
+}
\ No newline at end of file
diff --git a/html/style-light.css b/html/style-light.css
index c2b7c88da..6474f1d2d 100644
--- a/html/style-light.css
+++ b/html/style-light.css
@@ -177,7 +177,9 @@ td.tool a.mtitle:hover {
     width: 100%;
 }
 @media only screen and (max-width:955px) {
-    margin-bottom: 70px;
+    body {
+        margin-bottom: 70px;
+    }
 }
 
 #module {
@@ -953,7 +955,7 @@ background: -webkit-linear-gradient(top, rgba(109,179,242,1) 0%,rgba(84,163,238,
 background: -o-linear-gradient(top, rgba(109,179,242,1) 0%,rgba(84,163,238,1) 50%,rgba(54,144,240,1) 51%,rgba(30,105,222,1) 100%); /* Opera 11.10+ */
 background: -ms-linear-gradient(top, rgba(109,179,242,1) 0%,rgba(84,163,238,1) 50%,rgba(54,144,240,1) 51%,rgba(30,105,222,1) 100%); /* IE10+ */
 background: linear-gradient(to bottom, rgba(109,179,242,1) 0%,rgba(84,163,238,1) 50%,rgba(54,144,240,1) 51%,rgba(30,105,222,1) 100%); /* W3C */
-filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#6db3f2', endColorstr='#1e69de',GradientType=0 ); /* IE6-9 */ilter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#001e5799', endColorstr='#001e5799',GradientType=0 ); /* IE6-9 */
+filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#6db3f2', endColorstr='#1e69de',GradientType=0 ); /* IE6-9 */filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#001e5799', endColorstr='#001e5799',GradientType=0 ); /* IE6-9 */
 
 }
 td.tool {
@@ -2141,7 +2143,7 @@ td.selectedmenu {
  */
 #summary_op1,#summary_op2 
 {
-    position:float;
+
     float:left;
 }
 /*
@@ -2365,4 +2367,11 @@ span.title_tab_row {
      background-color: #000066 !important;
      color : white !important;
      
-}
\ No newline at end of file
+}
+
+ /**
+  * dialog box for adding, modifying predefined operation
+  */
+ #prdfop {
+
+ }
\ No newline at end of file
diff --git a/include/ajax/ajax_save_predf_op.php b/include/ajax/ajax_save_predf_op.php
index 4286d1db7..8e463b02e 100644
--- a/include/ajax/ajax_save_predf_op.php
+++ b/include/ajax/ajax_save_predf_op.php
@@ -56,14 +56,13 @@ $operation_predef_mtable->set_callback("ajax_misc.php");
 
 if ($action=="input")
 {
-    if ($p_id == -1 ) {
-        // new operation to insert
+    if ($p_id  < 0 ) {
 
-    } else {
-        // display existing operation for updating
-        header('Content-type: text/xml; charset=UTF-8');
-        echo $operation_predef_mtable->ajax_input()->saveXML();
+        $operation_predef_mtable->set_force_ledger_type($p_id);
     }
+    // display existing operation for updating
+    header('Content-type: text/xml; charset=UTF-8');
+    echo $operation_predef_mtable->ajax_input()->saveXML();
     return;
 }
 elseif ($action == "save")
diff --git a/include/ajax/ajax_update_predef.php b/include/ajax/ajax_update_predef.php
index 335afb350..89b8e9834 100644
--- a/include/ajax/ajax_update_predef.php
+++ b/include/ajax/ajax_update_predef.php
@@ -45,15 +45,15 @@ foreach (array('l','t','d','gDossier') as $a)
 
 }
 $cn=Dossier::connect();
-$op=new Pre_operation_detail($cn);
-$op->set('ledger',$l);
-$op->set('ledger_type',$t);
-$op->set('direct',$d);
+$op=new Pre_operation($cn);
+$op->set_p_jrn($l);
+$op->set_jrn_type($t);
+$op->set_od_direct($d);
 $url=http_build_query(array('action'=>'use_opd','p_jrn_predef'=>$l,'ac'=>$_GET['ac'],'gDossier'=>dossier::id()));
 $html="";
 
 $html.=HtmlInput::title_box(_("Modèle d'opérations"), 'modele_op_div', 'hide',"","n");
-$html.=$op->show_button('do.php?'.$url);
+$html.=$op->display_list_operation('do.php?'.$url);
 $html.=' <p style="text-align: center">'.
         HtmlInput::button_hide('modele_op_div').
         '</p>';
diff --git a/include/class/operation_predef_mtable.class.php b/include/class/operation_predef_mtable.class.php
index 3febada5e..2ac3634b5 100644
--- a/include/class/operation_predef_mtable.class.php
+++ b/include/class/operation_predef_mtable.class.php
@@ -27,10 +27,13 @@
 require_once NOALYSS_INCLUDE."/lib/manage_table_sql.class.php";
 require_once NOALYSS_INCLUDE."/database/op_predef_sql.class.php";
 require_once NOALYSS_INCLUDE."/class/pre_operation.class.php";
+require_once NOALYSS_INCLUDE."/lib/select_box.class.php";
+
 
 class Operation_Predef_MTable extends Manage_Table_SQL
 {
     private $pre_operation;
+    private $force_ledger_type; //!< When adding , the ledger must be set
     function __construct(Op_predef_SQL $p_table)
     {
         parent::__construct($p_table);
@@ -45,7 +48,8 @@ class Operation_Predef_MTable extends Manage_Table_SQL
 
         $aLedger=$p_table->cn->make_array("select jrn_def_id,jrn_def_name from jrn_def order by jrn_def_name asc");
 
-        $this->set_sort_column("jrn_def_id");
+        $this->set_sort_column("od_name");
+        $this->set_col_sort(1);
         $this->set_order(array("jrn_def_id","od_name","od_description","od_jrn_type"));
         $this->set_col_type("jrn_def_id","select",$aLedger);
 
@@ -53,7 +57,30 @@ class Operation_Predef_MTable extends Manage_Table_SQL
         $this->set_property_updatable("jrn_def_id",false);
         $this->set_property_updatable("od_jrn_type",false);
         $this->pre_operation=null;
+        // create our own "Append button"
+        $this->set_append_row(false);
+        $this->set_dialog_box("prdfop");
+        $this->set_dialogbox_style(["position"=>"absolute","top"=>"5%","width:auto","min-width"=>"80%"]);
+    }
 
+    /**
+     * @return mixed
+     */
+    public function get_force_ledger_type()
+    {
+        return $this->force_ledger_type;
+    }
+
+    /**
+     * When adding the ledger_type must be set
+     *  if p_id == -2 then type ACH , 3 for VEN and 4 for ODS
+     * @param mixed $force_ledger_type
+     */
+    public function set_force_ledger_type($force_ledger_type)
+    {
+        $aLedger=array(-2=>'ACH',-3=>'VEN',-4=>'ODS');
+        $this->force_ledger_type = $aLedger[$force_ledger_type];
+        return $this;
     }
 
     /**
@@ -63,9 +90,20 @@ class Operation_Predef_MTable extends Manage_Table_SQL
     function input()
     {
         $obj=$this->get_table();
-        $this->pre_operation = new Pre_operation($obj->cn);
-        $this->pre_operation->set_od_id($obj->get("od_id"));
-        $this->pre_operation->display();
+        $od_id=$obj->get("od_id");
+        if ($od_id > 0 ) {
+            $this->pre_operation = new Pre_operation($obj->cn);
+            $this->pre_operation->set_od_id($obj->get("od_id"));
+            $this->pre_operation->display();
+        } else  {
+            // display blanck operation type ledger = ACH
+            $this->pre_operation = new Pre_operation($obj->cn);
+            // new operation od_id = -1
+            $this->pre_operation->set_od_id(-1);
+            $this->pre_operation->set_jrn_type($this->get_force_ledger_type());
+            $this->pre_operation->display();
+
+        }
     }
 
     /**
@@ -114,7 +152,27 @@ class Operation_Predef_MTable extends Manage_Table_SQL
     function save()
     {
        $this->pre_operation->save();
+       $this->set_pk($this->pre_operation->get_od_id());
+    }
 
+    /**
+     * Display a button to choose a type of operation and call a dialog box for adding
+     */
+    function display_button_add()
+    {
+        $select=new Select_Box(uniqid(),_("Ajout"));
+        $select->set_position('in-absolute');
+        $select->add_javascript(_("Achat"),sprintf("%s.input('-2','%s')",
+            $this->get_object_name(),
+            $this->get_object_name(), "xx", "smallbutton", BUTTONADD));
 
+        $select->add_javascript(_("Vente"),sprintf("%s.input('-3','%s')",
+            $this->get_object_name(),
+            $this->get_object_name(), "xx", "smallbutton", BUTTONADD));
+
+          $select->add_javascript(_("Opérations Diverses"),sprintf("%s.input('-4','%s')",
+              $this->get_object_name(),
+              $this->get_object_name(), "xx", "smallbutton", BUTTONADD));
+        echo $select->input();
     }
 }
\ No newline at end of file
diff --git a/include/class/pre_op_ach.class.php b/include/class/pre_op_ach.class.php
index 5b5198abc..6fe902821 100644
--- a/include/class/pre_op_ach.class.php
+++ b/include/class/pre_op_ach.class.php
@@ -33,7 +33,10 @@ class Pre_op_ach extends Pre_operation_detail
     {
         parent::__construct($cn);
     }
-
+    /**
+     * @brief get the post and stove them into data member , before saving them in the db
+     * @see save
+     */
     function get_post()
     {
         $http = new \HttpInput();
@@ -100,8 +103,11 @@ class Pre_op_ach extends Pre_operation_detail
             throw $e;
         }
     }
-    /*!\brief compute an array accordingly with the FormVenView function
+    /**
+     * @brief compute an array accordingly with the FormVenView function, first the data is fetched (via load)
+     * to the database and turns into an array to be use with Pre_Op_Ach::display
 	 * @return an array for filling the form
+     * @see load
      */
     function compute_array($p_od_id)
     {
@@ -144,10 +150,20 @@ class Pre_op_ach extends Pre_operation_detail
             " opd_quantity , opd_comment,opd_tva_amount from op_predef_detail where od_id= $1 ".
             " order by opd_id";
         $res=$this->db->exec_sql($sql,[$p_od_id]);
+        if ($res == false) return array();
         $array=Database::fetch_all($res);
         return $array;
     }
 
+    /**
+     * Display the form for modifying or adding new predefined operation
+     * @param array  $p_array is the result of compute_array or blank
+     * @return string containing HTML code of the form
+     * @throws Exception
+     * @see compute_array
+     * @see load
+     *
+     */
    function display($p_array)
    {
         require_once NOALYSS_INCLUDE.'/class/acc_ledger_purchase.class.php';
@@ -184,8 +200,6 @@ class Pre_op_ach extends Pre_operation_detail
        $f_legend=_('En-tête facture fournisseur');
 
 
-       /* if we suggest the next pj, then we need a javascript */
-
        // Display the customer
        //--
        $fiche='deb';
@@ -393,6 +407,5 @@ class Pre_op_ach extends Pre_operation_detail
 
        return $r;
 
-        return $r;
    }
 }
\ No newline at end of file
diff --git a/include/class/pre_op_advanced.class.php b/include/class/pre_op_advanced.class.php
index 8c08e7094..b870ef17a 100644
--- a/include/class/pre_op_advanced.class.php
+++ b/include/class/pre_op_advanced.class.php
@@ -33,6 +33,10 @@ class Pre_Op_Advanced extends Pre_operation_detail
     {
         parent::__construct($cn);
     }
+    /**
+     * @brief get the post and stove them into data member , before saving them in the db
+     * @see save
+     */
     function get_post()
     {
         $http = new \HttpInput();
@@ -143,13 +147,24 @@ class Pre_Op_Advanced extends Pre_operation_detail
              " order by opd_id";
         $res=$this->db->exec_sql($sql,[$p_od_id]);
         $array=Database::fetch_all($res);
+        if ($array == false ) return array();
         return $array;
     }
+    /**
+     * Display the form for modifying or adding new predefined operation
+     * @param array  $p_array is the result of compute_array or blank
+     * @return string containing HTML code of the form
+     * @throws Exception
+     * @see compute_array
+     * @see load
+     *
+     */
    function display($p_array)
     {
         global $g_parameter, $g_user;
         require_once NOALYSS_INCLUDE.'/class/acc_ledger.class.php';
         $legder=new Acc_Ledger($this->db,$p_array['p_jrn']);
+
         $legder->nb=$legder->get_min_row();
 
         $add_js = "";
@@ -169,12 +184,11 @@ class Pre_Op_Advanced extends Pre_operation_detail
         $nb_row = (isset($p_array['nb_item']) ) ? $p_array['nb_item' ]: $legder->nb;
 
         $ret.=HtmlInput::hidden('nb_item', $nb_row);
-        $ret.=HtmlInput::hidden('p_jrn', $p_array['p_jrn']);
         $ret.=dossier::hidden();
         
         $ret.=dossier::hidden();
 
-        $ret.=HtmlInput::hidden('jrn_type', $legder->get_type());
+        $ret.=HtmlInput::hidden('jrn_type', "ODS");
         $info = Icon_Action::infobulle(0);
         $info_poste = Icon_Action::infobulle(9);
         if ($g_user->check_action(FICADD) == 1)
diff --git a/include/class/pre_op_ven.class.php b/include/class/pre_op_ven.class.php
index fbb0cbc97..c73f5e908 100644
--- a/include/class/pre_op_ven.class.php
+++ b/include/class/pre_op_ven.class.php
@@ -34,7 +34,10 @@ class Pre_op_ven extends Pre_operation_detail
     {
         parent::__construct($cn);
     }
-
+    /**
+     * @brief get the post and stove them into data member , before saving them in the db
+     * @see save
+     */
     function get_post()
     {
         $http=new \HttpInput();
@@ -144,13 +147,18 @@ class Pre_op_ven extends Pre_operation_detail
              " order by opd_id";
         $res=$this->db->exec_sql($sql,[$p_od_id]);
         $array=Database::fetch_all($res);
+        if ($res == false) return array();
         return $array;
     }
 
     /**
-     * @param array $p_array
-     * @return string
+     * Display the form for modifying or adding new predefined operation
+     * @param array  $p_array is the result of compute_array or blank
+     * @return string containing HTML code of the form
      * @throws Exception
+     * @see compute_array
+     * @see load
+     *
      */
     function display($p_array)
     {
@@ -158,7 +166,6 @@ class Pre_op_ven extends Pre_operation_detail
 
         require_once NOALYSS_INCLUDE.'/class/acc_ledger_sold.class.php';
         $ledger=new Acc_Ledger_Sold($this->db,$p_array['p_jrn']);
-
         $flag_tva=$g_parameter->MY_TVA_USE;
         /* Add button */
         $f_add_button=new IButton('add_card');
diff --git a/include/class/pre_operation.class.php b/include/class/pre_operation.class.php
index 28a35f40e..cfadc0ec8 100644
--- a/include/class/pre_operation.class.php
+++ b/include/class/pre_operation.class.php
@@ -162,20 +162,19 @@ class Pre_operation
         }
         try {
             $this->db->start();
-            $sql='insert into op_predef (jrn_def_id,od_name,od_item,od_jrn_type,od_direct,od_description)'.
-                'values'.
-                "($1,$2,$3,$4,$5  ,$6               )";
-            $this->db->exec_sql($sql,array($this->p_jrn,
+            $sql='insert into op_predef (jrn_def_id,od_name,od_item,od_jrn_type,od_direct,od_description) '.
+                ' values '.
+                "($1,$2,$3,$4,$5  ,$6)".
+                'returning od_id';
+            $this->od_id= $this->db->get_value($sql,array($this->p_jrn,
                 $this->name,
                 $this->nb_item,
                 $this->jrn_type,
                 $this->od_direct,
                 $this->description,
             ));
-            $this->od_id=$this->db->get_current_seq('op_def_op_seq');
 
 
-           // $this->detail=Pre_operation_detail::build_detail($this->jrn_type,$this->db);
             $this->detail->save($this->od_id,$this->nb_item);
             $this->db->commit();
         } catch (Exception $e) {
@@ -215,23 +214,21 @@ class Pre_operation
      * @param $p_ledger_id
      * @throws Exception
      */
-    function blank($p_ledger_id) {
+    function blank() {
         $array["od_id"]=-1;
-        $array['jrn_def_id']=$p_ledger_id;
+        $array['jrn_def_id']=0;
         $array['od_name']="";
         $array['od_item']=2;
-        $array['od_jrn_type']=$this->db->get_value("select jrn_def_type from jrn_def where jrn_def_id=$1",[$p_ledger_id]);
+        $array['od_jrn_type']=$this->get_jrn_type();
         $array['od_description']="";
         foreach (array('jrn_def_id','od_name','od_item','od_jrn_type','od_description') as $field) {
             $this->$field=$array[$field];
         }
         $this->od_jrn_type=$array['od_jrn_type'];
 
-        $this->detail = Pre_operation_detail::build_detail($this->od_jrn_type, $this->db);
-        $this->detail->set_od_id(0);
-        $this->detail->set_jrn($p_ledger_id);
-
-        return $array;
+        $this->detail = Pre_operation_detail::build_detail($array['od_jrn_type'], $this->db);
+        $darray[0]=$array;
+        return $darray;
     }
 
     function compute_array()
@@ -239,7 +236,7 @@ class Pre_operation
         if ($this->od_id > 0) {
             $p_array = $this->load();
         } else {
-            $p_array=$this->blank($this->p_jrn);
+            $p_array=$this->blank();
         }
         $array=array(
                    "e_comm"=>$p_array[0]["od_name"],
@@ -254,8 +251,10 @@ class Pre_operation
 
     }
 
-    /*!\brief show the button for selecting a predefined operation */
-    function show_button()
+    /*!\brief show the button for selecting a predefined operation
+    @deprecated
+     */
+    function show_button_deprecated()
     {
 
         $select=new ISelect();
@@ -301,6 +300,8 @@ class Pre_operation
     function display() 
     {
         $array=$this->compute_array();
+        $select_ledger=$this->choose_ledger($array['jrn_type'],$array['p_jrn']);
+
         require NOALYSS_TEMPLATE."/pre_operation_display.php";
         echo $this->detail->display($array);
     }
@@ -408,7 +409,6 @@ class Pre_operation
     public function get_jrn_type()
     {
         return $this->jrn_type;
-        return $this;
     }
 
     /**
@@ -416,6 +416,7 @@ class Pre_operation
      */
     public function set_jrn_type($jrn_type)
     {
+        $jrn_type=strtoupper($jrn_type);
         if ( ! in_array ($jrn_type,['ACH','FIN','VEN','ODS'] )) throw new Exception('prop03.invalid ledger type');
         $this->jrn_type = $jrn_type;
         return $this;
@@ -503,6 +504,22 @@ class Pre_operation
         $this->jrn_type=$this->db->get_value("select jrn_def_type from jrn_def where jrn_def_id=$1",[$p_jrn]);
         return $this;
     }
+
+    /**
+     * Build the select list for choosing the ledger
+     * @param string $p_string ledger type ACH VEN or ODS
+     * @param $p_default  selected ledger , -1 if none
+     * @return ISelect
+     */
+    function choose_ledger($p_ledger_type,$p_default) {
+        $select_ledger=new ISelect("p_jrn");
+        $select_ledger->value=$this->db->make_array("select jrn_def_id,jrn_def_name 
+                                                    from jrn_def where jrn_def_type=$1 order by 2",
+            0,
+            [$p_ledger_type]);
+        $select_ledger->selected=$p_default;
+        return $select_ledger;
+    }
 }
 
 /*!\brief mother of the pre_op_XXX, it contains only one data : an
diff --git a/include/preod.inc.php b/include/preod.inc.php
index d12041cf0..bea0caa58 100644
--- a/include/preod.inc.php
+++ b/include/preod.inc.php
@@ -35,4 +35,10 @@ $operation_predef_mtable->set_json(json_encode(array(   "ac"=>$http->request("ac
                                                         "gDossier"=>Dossier::id()
                                                      )));
 $operation_predef_mtable->create_js_script();
-$operation_predef_mtable->display_table();
\ No newline at end of file
+echo '<p>';
+ $operation_predef_mtable->display_button_add();
+echo '</p>';
+$operation_predef_mtable->display_table();
+echo '<p>';
+$operation_predef_mtable->display_button_add();
+echo '</p>';
\ No newline at end of file
diff --git a/include/template/pre_operation_display.php b/include/template/pre_operation_display.php
index 8de218bd2..c881358fb 100644
--- a/include/template/pre_operation_display.php
+++ b/include/template/pre_operation_display.php
@@ -34,3 +34,7 @@ $description->style=' class="itextarea" style="width:30em;height:4em;vertical-al
     <?php echo  _('Description (max 50 car.)'); ?>
     <?php echo $description->input();?>
 </p>
+<p>
+    <?php echo _("Journal") ?>
+    <?php echo $select_ledger->input(); ?>
+</p>
\ No newline at end of file
diff --git a/include/template/predf_ledger_detail.php b/include/template/predf_ledger_detail.php
index dfcfbb197..d46eff899 100644
--- a/include/template/predf_ledger_detail.php
+++ b/include/template/predf_ledger_detail.php
@@ -5,13 +5,12 @@
 <legend><?php echo $f_legend ?>
 </legend>
 <?php echo $f_type?><?php echo $f_client_qcode?><?php echo $f_client_bt?> <?php echo $f_client?><br>
-<input type="hidden" id="p_jrn" name="p_jrn" value="<?php echo $p_array["p_jrn"]; ?>">
 <?php echo $str_add_button?>
 </fieldset>
 
-<div class="fieldset" style="overflow:auto;max-height:300px">
+<div class="fieldset">
 <h1 class="fiedset"><?php echo $f_legend_detail?></h1>
-    <div style="">
+
 <table id="sold_item" width="100%" border="0">
 <tr>
 <th style="width:auto"colspan="2">Code <?php echo Icon_Action::infobulle(0)?></th>
@@ -54,6 +53,7 @@ echo '</tr>';
 ?>
 </table>
 
+
 <div style="position:float;float:right;text-align:right;padding-right:5px;font-size:1.2em;font-weight:bold;color:blue">
       <?php echo HtmlInput::button('act',_('Actualiser'),'onClick="compute_all_ledger();"'); ?>
  </div>
@@ -79,7 +79,7 @@ echo '</tr>';
      <br><?php echo _('Total')?>
 <?php endif; ?>
 </div>
-
 </div>
 
 
+

From 096e16cf2f317e04f4624c86484c4b37e78fc8e1 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Tue, 29 Sep 2020 18:10:00 +0200
Subject: [PATCH 026/257] FollowUp : new right : delete action

---
 include/action.common.inc.php        | 43 ++++++++++++++++------------
 include/action.inc.php               |  9 ++++--
 include/ajax/ajax_anc_search.php     |  2 +-
 include/class/profile_menu.class.php |  3 +-
 include/class/user.class.php         | 16 +++++++++++
 sql/upgrade.sql                      | 11 +++++--
 6 files changed, 59 insertions(+), 25 deletions(-)

diff --git a/include/action.common.inc.php b/include/action.common.inc.php
index 59d9041f3..976fcbef3 100644
--- a/include/action.common.inc.php
+++ b/include/action.common.inc.php
@@ -30,18 +30,20 @@
  *
  */
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
+$http=new HttpInput();
 $supl_hidden = '';
 if (isset($_REQUEST['sc']))
-	$supl_hidden.=HtmlInput::hidden('sc', $_REQUEST['sc']);
+	$supl_hidden.=HtmlInput::hidden('sc', $http->request("sc"));
 if (isset($_REQUEST['f_id']))
-	$supl_hidden.=HtmlInput::hidden('f_id', $_REQUEST['f_id']);
+	$supl_hidden.=HtmlInput::hidden('f_id', $http->request("f_id","number"));
 if (isset($_REQUEST['sb']))
-	$supl_hidden.=HtmlInput::hidden('sb', $_REQUEST['sb']);
-$supl_hidden.=HtmlInput::hidden('ac', $_REQUEST['ac']);
+	$supl_hidden.=HtmlInput::hidden('sb', $http->request("sb"));
+$supl_hidden.=HtmlInput::hidden('ac', $http->request("ac"));
+
 
 $correction = 0;
 $error_id=0;
-$http=new HttpInput();
+
 /*-----------------------------------------------------------------------------*/
 /* For other action
 /*-----------------------------------------------------------------------------*/
@@ -210,18 +212,23 @@ 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"   >';
-		echo $supl_hidden;
-		echo HtmlInput::hidden('ac', $_REQUEST['ac']);
-		echo dossier::hidden();
-		echo $act->Display('UPD', false, $base, $retour);
-		echo '<input type="hidden" name="sa" value="update">';
-		echo '<input type="hidden" id="delete" name="delete" value="0">';
-		echo HtmlInput::submit("save", "Sauve",' onclick="$(\'delete\').value=0"');
-		echo HtmlInput::submit("add_action_here", _("Ajoute un événement à celui-ci"),' onclick="$(\'delete\').value=0"');
-		echo HtmlInput::submit("delete_bt", _("Efface cet événement "), ' onclick="$(\'delete\').value=1;return confirm_box(\'action_common_frm\',\''. _("Vous confirmez l\'effacement") . '\')" ');
-		echo $retour;
-		echo '</form>';
+            echo '<form  enctype="multipart/form-data"  id="action_common_frm" class="print" action="do.php"  method="post"   >';
+            echo $supl_hidden;
+            echo HtmlInput::hidden('ac', $http->request('ac'));
+            echo dossier::hidden();
+            echo $act->Display('UPD', false, $base, $retour);
+            echo '<input type="hidden" name="sa" value="update">';
+            echo '<input type="hidden" id="delete" name="delete" value="0">';
+            echo HtmlInput::submit("save", "Sauve",' onclick="$(\'delete\').value=0"');
+            echo HtmlInput::submit("add_action_here", _("Ajoute un événement à celui-ci"),' onclick="$(\'delete\').value=0"');
+            // 
+            if ($g_user->can_delete_action($ag_id))
+            {
+                echo HtmlInput::submit("delete_bt", _("Efface cet événement "), 
+                        ' onclick="$(\'delete\').value=1;return confirm_box(\'action_common_frm\',\''. _("Vous confirmez l\'effacement") . '\')" ');
+            }
+            echo $retour;
+            echo '</form>';
 	}
 	else if ($g_user->can_read_action($ag_id) == true || $act->ag_dest == -1)
 	{
@@ -245,7 +252,7 @@ if ($sub_action == 'delete')
 	$act = new Follow_Up($cn);
 	$act->ag_id =$http->request("ag_id","number") ;
 	$act->get();
-	if ($g_user->can_write_action($act->ag_id)==true)	$act->remove();
+	if ($g_user->can_delete_action($act->ag_id)==true)	$act->remove();
 	$sub_action = "list";
 	$cn->commit();
 	Follow_Up::show_action_list($cn, $base);
diff --git a/include/action.inc.php b/include/action.inc.php
index 57098451f..9f61297b2 100644
--- a/include/action.inc.php
+++ b/include/action.inc.php
@@ -22,6 +22,8 @@
  */
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 global $g_user;
+$http=new HttpInput();
+
 $retour=HtmlInput::button_anchor(_('Retour liste'),
 	HtmlInput::request_to_string(array("closed_action","remind_date_end","remind_date","sag_ref","only_internal","state","ac","gDossier","qcode","ag_dest_query","action_query","tdoc","date_start","date_end","hsstate","searchtag")),
         "","","smallbutton");
@@ -47,12 +49,13 @@ require_once NOALYSS_INCLUDE.'/class/follow_up.class.php';
 // propose to add one
 // permit also a search
 // show detail
-$sub_action=(isset($_REQUEST['sa']))?$_REQUEST['sa']:"";
+$sub_action=$http->request("sa","string","");
 /* if ag_id is set then we give it otherwise we have problem
  * with the generation of document
  */
-$ag_id=(isset($_REQUEST['ag_id']))?$_REQUEST['ag_id']:0;
-$ac=$_REQUEST['ac'];
+$ag_id=$http->request("ag_id","string","0");
+
+$ac=$http->request("ac");
 $base=HtmlInput::request_to_string(array('ac','gDossier'),"");
 
 require_once NOALYSS_INCLUDE.'/action.common.inc.php';
diff --git a/include/ajax/ajax_anc_search.php b/include/ajax/ajax_anc_search.php
index 00c114e5c..c8364d740 100644
--- a/include/ajax/ajax_anc_search.php
+++ b/include/ajax/ajax_anc_search.php
@@ -72,7 +72,7 @@ if ( isset($_REQUEST['go']))
     $sql="select po_name , po_description from poste_analytique ".
          "where pa_id=$1 and ".
          " (po_name ~* $2 or po_description ~* $3) order by po_name";
-    $array=$cn->get_array($sql,array($_c2,$plabel,$plabel));
+    $array=$cn->get_array($sql,array($c2,$plabel,$plabel));
 
     if (empty($array) == true)
     {
diff --git a/include/class/profile_menu.class.php b/include/class/profile_menu.class.php
index 145f5fd4f..96b06ca58 100644
--- a/include/class/profile_menu.class.php
+++ b/include/class/profile_menu.class.php
@@ -244,7 +244,8 @@ class Profile_Menu extends Profile_Menu_sql
 				", array($this->p_id));
             $aright_value=array(
                 array('value'=>'R', 'label'=>_('Lecture')),
-                array('value'=>'W', 'label'=>_('Ecriture')),
+                array('value'=>'W', 'label'=>_('Ecriture et suppression')),
+                array('value'=>'O', 'label'=>_('Ecriture')),
                 array('value'=>'X', 'label'=>_('Aucun accès'))
             );
             require_once NOALYSS_TEMPLATE.'/user_sec_profile.php';
diff --git a/include/class/user.class.php b/include/class/user.class.php
index d2581204a..f48f79405 100644
--- a/include/class/user.class.php
+++ b/include/class/user.class.php
@@ -1187,6 +1187,22 @@ class User
          * @return true if he can write otherwise false
          */
 	function can_write_action($dtoc)
+	{
+            if ( $this->Admin() == 1 ) return TRUE;
+            if ( $this->get_status_security_action()==0)                return TRUE;
+            $profile = $this->get_profile();
+                    $r = $this->db->get_value(" select count(*) from action_gestion where ag_id=$1 and ag_dest in
+				(select p_granted from user_sec_action_profile where ua_right in ('W','O') and p_id=$2) ", array($dtoc, $profile));
+		if ($r == 0)
+			return FALSE;
+		return true;
+	}
+         /**
+         *Check if the profile of the user can write AND delete for this profile
+         * @param  $dtoc action_gestion.ag_id
+         * @return true if he can write otherwise false
+         */
+	function can_delete_action($dtoc)
 	{
             if ( $this->Admin() == 1 ) return TRUE;
             if ( $this->get_status_security_action()==0)                return TRUE;
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index fb36c0d2a..8dac2066e 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -1,3 +1,4 @@
+
 CREATE OR REPLACE FUNCTION comptaproc.jrn_check_periode()
  RETURNS trigger
  LANGUAGE plpgsql
@@ -40,5 +41,11 @@ if comptaproc.is_closed (ljr_tech_per,ljr_def_id) = true then
 end if;
 
 return lreturn;
-end;$function$
-;
\ No newline at end of file
+end;
+$function$;
+LANGUAGE plpgsql;
+
+-- New right for action : delete
+ALTER TABLE public.user_sec_action_profile drop CONSTRAINT user_sec_action_profile_ua_right_check;
+ALTER TABLE public.user_sec_action_profile ADD CONSTRAINT user_sec_action_profile_ua_right_check check (ua_right in ('R','W','X','O'));
+

From 466514677c13dd6b796629d70683a48324971541 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Sun, 2 Aug 2020 12:03:20 +0200
Subject: [PATCH 027/257] Bug : correct search remove ~

---
 include/class/acc_ledger_search.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/class/acc_ledger_search.class.php b/include/class/acc_ledger_search.class.php
index d2e7fa76e..b7ed71b3e 100644
--- a/include/class/acc_ledger_search.class.php
+++ b/include/class/acc_ledger_search.class.php
@@ -563,9 +563,9 @@ class Acc_Ledger_Search
             $desc=sql_string($desc);
             $fil_desc=$and." ( upper(jr_comment) like upper('%".$desc."%') or upper(jr_pj_number) like upper('%".$desc."%') ".
                     " or upper(jr_internal)  like upper('%".$desc."%')
-                          or jr_grpt_id in (select j_grpt from jrnx where j_text ~* '".$desc."')
-                          or jr_id in (select jr_id from jrn_info where ji_value is not null and ji_value ~* '$desc')
-                          or jr_id in (select jr_id from jrn_note where upper(n_text) ~* '$desc' )
+                          or jr_grpt_id in (select j_grpt from jrnx where j_text ilike '%".$desc."%')
+                          or jr_id in (select jr_id from jrn_info where ji_value is not null and ji_value  ilike '%$desc%')
+                          or jr_id in (select jr_id from jrn_note where upper(n_text) ilike '%$desc%' )
                           )";
             $and=" and ";
         }

From 065ab819c611b56a5f42a44c47d6961a1bed74c2 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 21 Sep 2020 21:11:36 +0200
Subject: [PATCH 028/257] Bug : cannot export Follow Up

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

diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 29164ce8d..64f86c9cb 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -39,6 +39,8 @@ require_once NOALYSS_INCLUDE.'/lib/irelated_action.class.php';
 require_once NOALYSS_INCLUDE.'/class/tag.class.php';
 require_once NOALYSS_INCLUDE.'/class/default_menu.class.php';
 require_once NOALYSS_INCLUDE.'/lib/inplace_edit.class.php';
+require_once NOALYSS_INCLUDE.'/lib/noalyss_csv.class.php';
+
 /**
  * \file
  * \brief class_action for manipulating actions

From 1fac8168bdb0eecf64d84de6c4d1c41494a6642f Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 21 Sep 2020 21:40:30 +0200
Subject: [PATCH 029/257] Remove debug info

---
 html/js/acc_ledger.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/html/js/acc_ledger.js b/html/js/acc_ledger.js
index 8be1fa5e6..aa4fe83ce 100644
--- a/html/js/acc_ledger.js
+++ b/html/js/acc_ledger.js
@@ -1487,17 +1487,13 @@ function duplicate_operation(p_dossier,p_jr_id) {
                             },
                             onSuccess:function(req) {
                                 remove_waiting_box();
-                                console.debug("success");
                                 var xml=req.responseXML;
                                 console.debug ("received"+xml);
                                 if ( xml.getElementsByTagName("ctl").length==0) {
                                     console.log("erreur"+req.responseText);
                                 }
-                                console.debug("ok we display");
                                  add_div(duplicate_div);
-                                console.debug (getNodeText(xml.getElementsByTagName("code")[0]));
                                 
-                                console.debug("fill div");
                                 duplicate_div.setStyle({"position":"fixed","top":"15%","z-index":"999",
                                     "min-width":"30rem",
                                     "left":"30%",

From 42aa751b17b3cf2df749397d530dc85b58b315c8 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 21 Sep 2020 21:40:50 +0200
Subject: [PATCH 030/257] Bug 1834 : duplicate , cannot confirm an duplicated
 operation because the $_GET is taken in priority

---
 include/class/acc_operation.class.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/class/acc_operation.class.php b/include/class/acc_operation.class.php
index 93f1775fd..06946c760 100644
--- a/include/class/acc_operation.class.php
+++ b/include/class/acc_operation.class.php
@@ -752,6 +752,11 @@ class Acc_Operation
         $r=sprintf('<form id="%s" method="POST" ACTION="%s">',$p_id,NOALYSS_URL."/do.php?".Dossier::get());
         $r.=Dossier::hidden();
         // select the menu where the operation will be duplicated
+        $r=sprintf('<form id="%s" method="POST" ACTION="%s">',$p_id,NOALYSS_URL."/do.php?".http_build_query([
+                "ac"=>$a_code[0]['code'],"gDossier"=>Dossier::id()
+        ]));
+        $r.=Dossier::hidden();
+        // select the menu where the operation will be duplicated
         $r.="<p>";
         $r.="<ul style=\"margin-left:2rem;padding-left:0;list-style:none;\">";
         $r.=sprintf("<li>%s</li>",$operation->det->jr_pj_number);

From 86777bec6afe06ff7bb3abab5c622722af2e4d0b Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Sun, 2 Aug 2020 13:40:13 +0200
Subject: [PATCH 031/257] Bug : use ilike instead of tilde

---
 html/js/scripts.js                  |  4 ++--
 include/ajax/ajax_anc_search.php    |  2 +-
 include/ajax/ajax_auto_anc_card.php | 14 ++++++++++++--
 include/class/contact.class.php     |  2 +-
 include/class/dossier.class.php     | 12 ++++++------
 include/class/fiche.class.php       |  4 ++--
 include/class/follow_up.class.php   |  4 ++--
 include/class/user.class.php        | 20 ++++++++++++--------
 8 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/html/js/scripts.js b/html/js/scripts.js
index ce350f34b..959788c22 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -1224,7 +1224,7 @@ function fill_box(req)
  *@param dossier_id
  *@param od_id from table op_predef
  */
-function mod_predf_op(dossier_id, od_id)
+function mod_predf_op(dossier_id, od_id,p_ledger)
 {
     var target = "mod_predf_op";
     removeDiv(target);
@@ -1234,7 +1234,7 @@ function mod_predf_op(dossier_id, od_id)
 
     add_div(div);
 
-    var qs = "gDossier=" + dossier_id + '&op=mod_predf&id=' + od_id;
+    var qs = "gDossier=" + dossier_id + '&op=mod_predf&id=' + od_id+'&ledger_id='+p_ledger;
 
     var action = new Ajax.Request('ajax_misc.php',
             {
diff --git a/include/ajax/ajax_anc_search.php b/include/ajax/ajax_anc_search.php
index c8364d740..85d46b58b 100644
--- a/include/ajax/ajax_anc_search.php
+++ b/include/ajax/ajax_anc_search.php
@@ -71,7 +71,7 @@ if ( isset($_REQUEST['go']))
     $plabel=$http->request("plabel");
     $sql="select po_name , po_description from poste_analytique ".
          "where pa_id=$1 and ".
-         " (po_name ~* $2 or po_description ~* $3) order by po_name";
+         " (po_name ilike '%'||$2||'%' or po_description ilike '%'|| $3||'%') order by po_name";
     $array=$cn->get_array($sql,array($c2,$plabel,$plabel));
 
     if (empty($array) == true)
diff --git a/include/ajax/ajax_auto_anc_card.php b/include/ajax/ajax_auto_anc_card.php
index a04732662..aa4622cbc 100644
--- a/include/ajax/ajax_auto_anc_card.php
+++ b/include/ajax/ajax_auto_anc_card.php
@@ -13,12 +13,22 @@ $cn=Dossier::connect();
 
 if ( isset($_REQUEST['pa_id']) )
 {   
-    $res=$cn->exec_sql("select po_name,po_description from  poste_analytique where pa_id=$1  and (po_description ~* $2 or po_name ~* $3) order by po_id limit 12",
+    $res=$cn->exec_sql("select po_name,po_description 
+            from  poste_analytique 
+            where 
+                  pa_id=$1  
+              and (po_description ilike '%'|| $2||'%' or po_name ilike '%'|| $3 ||'%')
+            order by po_id limit 12",
         array($_REQUEST['pa_id'],$_POST['anccard'],$_POST['anccard']));
 }
 else
 {
-       $res=$cn->exec_sql("select po_name,po_description from  poste_analytique where po_description ~* $1 or po_name ~* $2 order by po_id limit 12 ",
+       $res=$cn->exec_sql("select po_name,po_description
+                from  poste_analytique 
+                where 
+                      po_description ilike '%'|| $1 ||'%' 
+                   or po_name ilike '%'|| $2||'%' 
+                order by po_id limit 12 ",
         array($_POST['anccard'],$_POST['anccard']));
 }
 $nb=Database::num_row($res);
diff --git a/include/class/contact.class.php b/include/class/contact.class.php
index 389074c6b..4bd785c17 100644
--- a/include/class/contact.class.php
+++ b/include/class/contact.class.php
@@ -71,7 +71,7 @@ class contact extends Fiche
             $search=" and f_id in
                     (select f_id from fiche_Detail
                     where
-                    ad_id=1 and ad_value ~* '$p_search') ";
+                    ad_id=1 and ad_value ilike '%$p_search%') ";
         }
         // Get The result Array
         $step_contact=$this->get_by_category($offset,$search.$extra_sql.$p_sql);
diff --git a/include/class/dossier.class.php b/include/class/dossier.class.php
index 1f62b042b..25e04259b 100644
--- a/include/class/dossier.class.php
+++ b/include/class/dossier.class.php
@@ -80,8 +80,8 @@ class Dossier
             $l_sql="select *, 'W' as priv_priv "
                     ."from ac_dossier "
                     ."where "
-                    ."dos_name ~* $2 "
-                    ."or dos_description ~* $2 "
+                    ."dos_name ilike '%'|| $2 ||'%'"
+                    ."or dos_description ilike '%'|| $2 || '%' "
                     ."ORDER BY dos_name $str_limit  ";
             $a_row=$cn->get_array($l_sql, $p_text);
             return $a_row;
@@ -93,7 +93,7 @@ class Dossier
                    natural join ac_users
                    where
                    use_login=$1
-                   and ( dos_name ~* $2 or dos_description ~* $2)
+                   and ( dos_name ilike '%'||  $2 || '%'  or dos_description ilike '%'|| $2|| '%' )
                    
                    order by dos_name 
                    $str_limit
@@ -104,10 +104,10 @@ class Dossier
         }
         else if ($p_type=='X')
         {
-            $l_sql=' select * from ac_dossier where dos_id not in 
+            $l_sql=" select * from ac_dossier where dos_id not in 
                   (select dos_id from jnt_use_dos where use_id=$1)
-                  and ( dos_name ~* $2 or dos_description ~* $2)
-                  order by dos_name '.$str_limit;
+                  and ( dos_name ilike '%'||  $2|| '%'  or dos_description ilike '%'||  $2 || '%')
+                  order by dos_name ".$str_limit;
             $a_row=$cn->get_array($l_sql, array($p_login, $p_text));
             return $a_row;
         }
diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index 565612c87..a6a8e214a 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -262,7 +262,7 @@ class Fiche
         {
             $a=sql_string($p_search);
             $sql="select * from vw_fiche_attr where frd_id=".$p_frd_id.
-                 " and vw_name ~* '$p_search'";
+                 " and vw_name ilike '%$p_search%'";
         }
 
         $Ret=$this->cn->exec_sql($sql.$p_sql);
@@ -1776,7 +1776,7 @@ class Fiche
             $search.=" and f_id in
                      (select distinct f_id from fiche_detail
                      where
-                     ad_id in (1,32,30,23,18,13) and ad_value ~* '$p_search')";
+                     ad_id in (1,32,30,23,18,13) and ad_value ilike '%$p_search%')";
         }
         // Get The result Array
         $step_tiers=$this->get_by_category($offset,$search.$filter_amount,'name');
diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 64f86c9cb..48ad1e2ea 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -1322,9 +1322,9 @@ class Follow_Up
         if (isset($_REQUEST['action_query']))
         {
             // if a query is request build the sql stmt
-            $action_query="and (ag_title ~* '".sql_string($_REQUEST['action_query'])."' ".
+            $action_query="and (ag_title ilike '%".sql_string($_REQUEST['action_query'])."%' ".
                     "or ag_ref ='".trim(sql_string($_REQUEST['action_query'])).
-                    "' or ag_id in (select ag_id from action_gestion_comment where agc_comment ~* '".trim(sql_string($_REQUEST['action_query']))."')".
+                    "' or ag_id in (select ag_id from action_gestion_comment where agc_comment ilike '%".trim(sql_string($_REQUEST['action_query']))."%')".
                     ")";
         }
 
diff --git a/include/class/user.class.php b/include/class/user.class.php
index f48f79405..23051d0f7 100644
--- a/include/class/user.class.php
+++ b/include/class/user.class.php
@@ -1050,20 +1050,24 @@ class User
 		{
 			// show only available folders
 			// if user is not an admin
-			$Res = $cn->exec_sql("select distinct dos_id,dos_name,dos_description 
+			$Res = $cn->exec_sql("select 
+    						distinct dos_id,dos_name,dos_description 
                             from ac_users
-                            natural join jnt_use_dos
-                            natural join  ac_dossier
+								natural join jnt_use_dos
+								natural join  ac_dossier
                             where
-                            use_login= $1
-                            and use_active = 1
-                            and ( dos_name ~* $2 or dos_description ~* $2 )
+								use_login= $1
+								and use_active = 1
+								and ( dos_name ilike '%' || $2 || '%' or dos_description ilike '%' || $2 || '%' )
                             order by dos_name", array($this->login, $p_filter));
 		}
 		else
 		{
-			$Res = $cn->exec_sql("select distinct dos_id,dos_name,dos_description from ac_dossier
-             where   dos_name ~* $1 or dos_description ~* $1 order by dos_name", array($p_filter));
+			$Res = $cn->exec_sql("select 
+    			distinct dos_id,dos_name,dos_description from ac_dossier
+             where   
+                   dos_name  ilike '%' || $1|| '%' or dos_description ilike '%' || $1 || '%' 
+			  order by dos_name", array($p_filter));
 		}
 		require_once NOALYSS_INCLUDE.'/class/database.class.php';
 

From 968000b3a9873bb608574570282e55e82ca1d8bd Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Sun, 2 Aug 2020 13:40:30 +0200
Subject: [PATCH 032/257] Bug : syntax error

---
 include/database.item.php | 36 ++----------------------------------
 1 file changed, 2 insertions(+), 34 deletions(-)

diff --git a/include/database.item.php b/include/database.item.php
index e309c3de1..1f57311ef 100644
--- a/include/database.item.php
+++ b/include/database.item.php
@@ -1,6 +1,5 @@
 <?php 
-Timing is on.
-Autocommit is  OFF
+
 $menu[]=_('Achat');  $desc[]=_('Nouvel achat ou dépense');$desc_long[]=_('Vous permet d\'encoder des achats, dépenses, des notes de frais ou des notes de crédits, vous pouvez spécifier un bénéficiaire ou un autre moyen de paiement');
 $menu[]=_('Historique');  $desc[]=_('Historique des imputations analytiques');$desc_long[]=_('Historique des imputations analytiques');
 $menu[]=_('Balance simple');  $desc[]=_('Balance simple des imputations analytiques');$desc_long[]=_('Balance simple des imputations analytiques');
@@ -141,11 +140,8 @@ $menu[]=_('Export ANC');
 $menu[]=_('Résumé TVA');  $desc[]=_('totaux  par TVA et par journal');$desc_long[]=_('Calcul des totaux  par TVA et par journal');
 $menu[]=_('Export Résumé TVA');  
 $menu[]=_('Export Résumé TVA');  
-Time: 1,027 ms
 ?>
 <?php 
-Timing is on.
-Autocommit is  OFF
 $attr_def[]=_('Durée Amortissement');
 $attr_def[]=_('Montant initial');
 $attr_def[]=_('TVA non déductible');
@@ -181,11 +177,8 @@ $attr_def[]=_('Gestion stock');
 $attr_def[]=_('Prix vente');
 $attr_def[]=_('Prix achat');
 $attr_def[]=_('Société');
-Time: 1,164 ms
 ?>
 <?php 
-Timing is on.
-Autocommit is  OFF
 $document_type[]=_('Document Interne');
 $document_type[]=_('Bons de commande client');
 $document_type[]=_('Bon de commande Fournisseur');
@@ -199,11 +192,8 @@ $document_type[]=_('Note de frais');
 $document_type[]=_('Réception commande Fournisseur');
 $document_type[]=_('Réception commande Client');
 $document_type[]=_('Réception magazine');
-Time: 1,120 ms
 ?>
 <?php 
-Timing is on.
-Autocommit is  OFF
 $action[]=_('Ajout de fiche');
 $action[]=_('Création, modification et effacement de fiche');
 $action[]=_('création, modification et effacement de catégorie de fiche');
@@ -215,52 +205,30 @@ $action[]=_('Effacer une opération ');
 $action[]=_('Partager une note');
 $action[]=_('Créer une note publique');
 $action[]=_('Effacer une note publique');
-Time: 0,661 ms
 ?>
 <?php 
-Timing is on.
-Autocommit is  OFF
 $mdp[]=_('Caisse');
 $mdp[]=_('Paiement électronique');
 $mdp[]=_('Caisse');
 $mdp[]=_('Par gérant ou administrateur');
-Time: 1,068 ms
 ?>
 <?php 
-Timing is on.
-Autocommit is  OFF
 $jrn_def_name[]=_('Opération Diverses');
 $jrn_def_name[]=_('Financier');
 $jrn_def_name[]=_('Vente');
 $jrn_def_name[]=_('Achat');
 $jrn_def_name[]=_('Note de crédit');
-Time: 1,213 ms
 ?>
 <?php 
-Timing is on.
-Autocommit is  OFF
 $jrn_def_description[]=_('Concerne toutes les opérations comme les amortissements, les comptes TVA, ...');
 $jrn_def_description[]=_('Concerne tous les mouvements financiers (comptes en banque, caisses, visa...)');
 $jrn_def_description[]=_('Concerne toutes les ventes, notes de crédit envoyées');
 $jrn_def_description[]=_('Concerne tous les achats, factures reçues, notes de crédit reçues et notes de frais');
-
-Time: 0,806 ms
 ?>
 <?php 
-Timing is on.
-Autocommit is  OFF
 $jrn_type[]=_('Financier');
 $jrn_type[]=_('Vente');
 $jrn_type[]=_('Achat');
 $jrn_type[]=_('Opérations Diverses');
-Time: 0,523 ms
-?>
-Timing is on.
-Autocommit is  OFF
-\jrn_def_negative_warning[]=_('Attention, ce journal doit utiliser des montants négatifs');
-\jrn_def_negative_warning[]=_('Attention, ce journal doit utiliser des montants négatifs');
-\jrn_def_negative_warning[]=_('WARNING ! WARNING !');
-\jrn_def_negative_warning[]=_('Attention, ce journal doit utiliser des montants négatifs');
-\jrn_def_negative_warning[]=_('Attention, ce journal doit utiliser des montants négatifs');
-Time: 1,223 ms
+$jrn_def_negative_warning[]=_('Attention, ce journal doit utiliser des montants négatifs');
 ?>

From ffc70d72ccd9bd93aa6e57fd8e52b5dd559e97b0 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Tue, 22 Sep 2020 19:44:06 +0200
Subject: [PATCH 033/257] doc

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

diff --git a/include/lib/http_input.class.php b/include/lib/http_input.class.php
index 60b03a103..bb2a8fee6 100644
--- a/include/lib/http_input.class.php
+++ b/include/lib/http_input.class.php
@@ -198,7 +198,7 @@ class HttpInput
 
     /**
      * Retrieve from $_POST
-     * @param $p_name name of the variable
+     * @param string $p_name name of the variable
      * @param $p_type type of the variable , opt. default string
      * @param $p_default default value is variable is not set
      * @throws Exception if invalid

From 4a2e3d0b8f6db1f1cb4ca64cc08439cce45c6003 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Tue, 22 Sep 2020 19:44:38 +0200
Subject: [PATCH 034/257] doc

---
 include/lib/itextarea.class.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/lib/itextarea.class.php b/include/lib/itextarea.class.php
index 7d97ba00d..bbd1be052 100644
--- a/include/lib/itextarea.class.php
+++ b/include/lib/itextarea.class.php
@@ -23,6 +23,11 @@
  * \brief Html Input
  */
 require_once NOALYSS_INCLUDE.'/lib/html_input.class.php';
+
+/**
+ * @class ITextarea
+ * @brief Manage the TEXTAREA html element
+ */
 class ITextarea extends HtmlInput
 {
     /*!\brief show the html  input of the widget*/

From b941d77688ba2e9a19cba9fb70d36a060424cec4 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Wed, 23 Sep 2020 19:21:51 +0200
Subject: [PATCH 035/257] Predefined Operation rewriting

---
 html/ajax_misc.php                            |   1 -
 include/ajax/ajax_mod_predf_op.php            |  17 +-
 include/ajax/ajax_save_predf_op.php           |  82 +--
 include/class/acc_ledger.class.php            |  17 +-
 include/class/acc_ledger_purchase.class.php   |   8 +-
 include/class/acc_ledger_sold.class.php       |  11 +-
 .../class/operation_predef_mtable.class.php   | 120 ++++
 include/class/pre_op_ach.class.php            | 579 +++++++++---------
 include/class/pre_op_advanced.class.php       |  93 ++-
 include/class/pre_op_ods.class.php            |  66 +-
 include/class/pre_op_ven.class.php            | 114 ++--
 include/class/pre_operation.class.php         | 449 ++++++++++----
 include/compta_ach.inc.php                    |   6 +-
 include/compta_ven.inc.php                    |  26 +-
 include/database/op_predef_sql.class.php      |  71 +++
 include/operation_ods_new.inc.php             |   5 +-
 include/preod.inc.php                         | 108 +---
 include/template/pre_operation_display.php    |  36 ++
 include/template/predf_ledger_detail.php      |   9 +-
 19 files changed, 1063 insertions(+), 755 deletions(-)
 create mode 100644 include/class/operation_predef_mtable.class.php
 create mode 100644 include/database/op_predef_sql.class.php
 create mode 100644 include/template/pre_operation_display.php

diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index ef7ac145c..12c77eb14 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -159,7 +159,6 @@ $path = array(
     "remove_submenu"=>"ajax_remove_submenu",
     "cardsearch"=>"ajax_boxcard_search",
     "saldo"=>"ajax_bank_saldo",
-    "up_predef"=>"ajax_update_predef",
     "upd_receipt"=>"ajax_get_receipt",
     "up_pay_method"=>"ajax_update_payment",
     "openancsearch"=>"ajax_anc_search",
diff --git a/include/ajax/ajax_mod_predf_op.php b/include/ajax/ajax_mod_predf_op.php
index c0eaa4cc1..539d465ba 100644
--- a/include/ajax/ajax_mod_predf_op.php
+++ b/include/ajax/ajax_mod_predf_op.php
@@ -26,8 +26,21 @@
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 ob_start();
 require_once NOALYSS_INCLUDE.'/class/pre_operation.class.php';
-$op=new Pre_Operation($cn,$_GET['id']);
-$array=$op->load();
+$id=$http->get("id","number");
+
+$op=new Pre_Operation($cn,$id);
+
+// ----------------------------------------------------------------
+// if id > 0  then we display an existing template operation
+// otherwise a blank one
+// -----------------------------------------------------------------
+if ( $id > 0) {
+    $array = $op->load();
+} else {
+    $ledger_id=$http->get("ledger_id","number");
+    $op->set_jrn($ledger_id);
+    $array=$op->blank($ledger_id);
+}
 echo HtmlInput::title_box(_('Modification du nom'),'mod_predf_op','close','','n');
 
 echo '
diff --git a/include/ajax/ajax_save_predf_op.php b/include/ajax/ajax_save_predf_op.php
index a6d985248..c84830ffe 100644
--- a/include/ajax/ajax_save_predf_op.php
+++ b/include/ajax/ajax_save_predf_op.php
@@ -23,46 +23,52 @@
  * \brief save the new predefined operation 
  * included from ajax_misc
  */
-require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
-$http=new HttpInput();
 
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-if ($g_user->check_module('PREDOP') == 0) exit();
-$name=$http->post("opd_name","string", "");
-if ( trim($name) != '')
-  {
-      try
-      {
-        $od_id=$http->post("od_id", "number");
-        $cn->exec_sql('delete from op_predef where od_id=$1',
-                      array($od_id));
+require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
+require_once NOALYSS_INCLUDE.'/class/operation_predef_mtable.class.php';
+$http=new HttpInput();
 
-        $cn->exec_sql("delete from op_predef_detail where od_id=$1",array($od_id));
 
-        $jrn_type=$http->post("jrn_type");
-        switch ($jrn_type) {
-            case 'ACH':
-            $operation=new Pre_op_ach($cn);
-            break;
-            case 'VEN':
-            $operation=new Pre_op_ven($cn);
-            break;
-            case 'ODS':
-            $operation=new Pre_Op_Advanced($cn);
-            break;
-        default :
-            throw new Exception(_('Type de journal invalide'));
-        }
-        $operation->get_post();
-        $operation->save();
-        $cn->commit();
-          
-      }
-      catch (Exception $exc)
-      {
-          error_log($exc->getTraceAsString());
-          throw $exc;
-      }
 
-  }
-?>
\ No newline at end of file
+try {
+    $table=$http->request('table');
+    $action=$http->request('action');
+    $p_id=$http->request('p_id', "number");
+    $ctl_id=$http->request('ctl');
+
+} catch(Exception $e) {
+    echo $e->getMessage();
+    return;
+}
+if  ( $g_user->check_module("PREDOP") == 0) die();
+
+$prd_op=new Op_predef_SQL($cn);
+$prd_op->set_pk_value($p_id);
+$prd_op->load();
+
+$operation_predef_mtable=new Operation_Predef_MTable($prd_op);
+
+
+$operation_predef_mtable->add_json_param("op","save_predf");
+$operation_predef_mtable->set_object_name($ctl_id);
+$operation_predef_mtable->set_callback("ajax_misc.php");
+
+if ($action=="input")
+{
+    header('Content-type: text/xml; charset=UTF-8');
+    echo $operation_predef_mtable->ajax_input()->saveXML();
+    return;
+}
+elseif ($action == "save")
+{
+    $xml=$operation_predef_mtable->ajax_save();
+    header('Content-type: text/xml; charset=UTF-8');
+    echo $xml->saveXML();
+}
+elseif ($action == "delete")
+{
+    $xml=$operation_predef_mtable->ajax_delete();
+    header('Content-type: text/xml; charset=UTF-8');
+    echo $xml->saveXML();
+}
\ No newline at end of file
diff --git a/include/class/acc_ledger.class.php b/include/class/acc_ledger.class.php
index 877738b9e..003513bc2 100644
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@ -788,10 +788,11 @@ class Acc_Ledger  extends jrn_def_sql
                 ob_start();
         echo '<div id="predef_form">';
         echo HtmlInput::hidden('p_jrn_predef', $this->id);
-        $op=new Pre_op_ods($this->db);
-        $op->set('ledger', $this->id);
-        $op->set('ledger_type', "ODS");
-        $op->set('direct', 't');
+        $op=new Pre_operation( $this->db);
+        $op->set_p_jrn($this->id);
+        $op->set_jrn_type("ODS");
+        $op->set_od_direct('t');
+
         $url=http_build_query(
                 array('action'=>'use_opd', 
                     'p_jrn_predef'=>$this->id,
@@ -1328,14 +1329,16 @@ class Acc_Ledger  extends jrn_def_sql
 
             $this->pj=$acc_end->set_pj();
 
-            $this->db->exec_sql("update jrn set jr_internal='".$internal."' where ".
-                    " jr_grpt_id = ".$seq);
+            $this->db->exec_sql("update jrn set jr_internal=$1 
+                        where jr_grpt_id = $2",array($internal,$seq));
+
             $this->internal=$internal;
             // Save now the predef op
             //------------------------
             if (isset($opd_name)&&trim($opd_name)!="")
             {
-                $opd=new Pre_Op_Advanced($this->db);
+                $opd=new Pre_operation($this->db);
+                $opd->set_od_direct('t');
                 $opd->get_post();
                 $opd->save();
             }
diff --git a/include/class/acc_ledger_purchase.class.php b/include/class/acc_ledger_purchase.class.php
index d47336625..241744697 100644
--- a/include/class/acc_ledger_purchase.class.php
+++ b/include/class/acc_ledger_purchase.class.php
@@ -1318,10 +1318,10 @@ class  Acc_Ledger_Purchase extends Acc_Ledger
         ob_start();
         echo '<div id="predef_form">';
         echo HtmlInput::hidden('p_jrn_predef', $this->id);
-        $op = new Pre_op_ach($this->db);
-        $op->set('ledger', $this->id);
-        $op->set('ledger_type', "ACH");
-        $op->set('direct', 'f');
+        $op = new Pre_operation($this->db);
+        $op->set_p_jrn($this->id);
+        $op->set_jrn_type("ACH");
+        $op->set_od_direct('f');
         $url=http_build_query(array('p_jrn_predef'=>$this->id,'ac'=>$_REQUEST['ac'],'gDossier'=>dossier::id()));
         echo $op->form_get('do.php?'.$url);
         echo '</div>';
diff --git a/include/class/acc_ledger_sold.class.php b/include/class/acc_ledger_sold.class.php
index 2704e47c5..9cb0668cc 100644
--- a/include/class/acc_ledger_sold.class.php
+++ b/include/class/acc_ledger_sold.class.php
@@ -1310,11 +1310,12 @@ EOF;
         ob_start();
         echo '<div id="predef_form">';
         echo HtmlInput::hidden('p_jrn_predef', $this->id);
-        $op=new Pre_op_ven($this->db);
-        $op->set('ledger', $this->id);
-        $op->set('ledger_type', "VEN");
-        $op->set('direct', 'f');
-        $url=http_build_query(array('p_jrn_predef'=>$this->id, 'ac'=>$_REQUEST['ac'],
+        $op=new Pre_operation($this->db);
+        $op->set_jrn_type("VEN");
+        $op->set_p_jrn($this->id);
+        $op->set_od_direct('f');
+        $http=new \HttpInput();
+        $url=http_build_query(array('p_jrn_predef'=>$this->id, 'ac'=>$http->request('ac'),
             'gDossier'=>dossier::id()));
         echo $op->form_get('do.php?'.$url);
         echo '</div>';
diff --git a/include/class/operation_predef_mtable.class.php b/include/class/operation_predef_mtable.class.php
new file mode 100644
index 000000000..3febada5e
--- /dev/null
+++ b/include/class/operation_predef_mtable.class.php
@@ -0,0 +1,120 @@
+<?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+// Copyright Author Dany De Bontridder danydb@aevalys.eu
+/*! \file
+ * \brief Class to manage predefined operation thanks the class Manage Table
+ */
+/*!
+ * \brief Display a table and allow to change the predefined operation, insert or delete. Used the
+ * class Manage_Table_SQL and the SQL Object for the tables op_predef and op_predef_detail.
+ */
+require_once NOALYSS_INCLUDE."/lib/manage_table_sql.class.php";
+require_once NOALYSS_INCLUDE."/database/op_predef_sql.class.php";
+require_once NOALYSS_INCLUDE."/class/pre_operation.class.php";
+
+class Operation_Predef_MTable extends Manage_Table_SQL
+{
+    private $pre_operation;
+    function __construct(Op_predef_SQL $p_table)
+    {
+        parent::__construct($p_table);
+
+        $this->set_property_visible("od_id",false);
+        $this->set_property_visible("od_direct",false);
+        $this->set_property_visible("od_item",false);
+        $this->set_col_label("jrn_def_id",_("Journal"));
+        $this->set_col_label("od_name",_("Nom"));
+        $this->set_col_label("od_jrn_type",_("Type de journal"));
+        $this->set_col_label("od_description",_("Description"));
+
+        $aLedger=$p_table->cn->make_array("select jrn_def_id,jrn_def_name from jrn_def order by jrn_def_name asc");
+
+        $this->set_sort_column("jrn_def_id");
+        $this->set_order(array("jrn_def_id","od_name","od_description","od_jrn_type"));
+        $this->set_col_type("jrn_def_id","select",$aLedger);
+
+        $this->set_callback("ajax_misc.php");
+        $this->set_property_updatable("jrn_def_id",false);
+        $this->set_property_updatable("od_jrn_type",false);
+        $this->pre_operation=null;
+
+    }
+
+    /**
+     * Display the form
+     * @throws Exception
+     */
+    function input()
+    {
+        $obj=$this->get_table();
+        $this->pre_operation = new Pre_operation($obj->cn);
+        $this->pre_operation->set_od_id($obj->get("od_id"));
+        $this->pre_operation->display();
+    }
+
+    /**
+     * Get values from the request
+     *  - table is the sql table
+     *  - ctl_id is the dialog box id
+     *  - p_id = predef_op.od_id
+     *
+     * @code
+     * json = {"table":"public.op_predef",
+                "ctl_id":"dtr",
+                "ac":"COMPTA/ADV/PREDOP",
+                "op":"save_predf",
+                "gDossier":["28", "28"],
+                "p_id":"15",
+                "action":"save",
+                "ctl":"tbl5f6a1d09035f2",
+                "nb_item":"10",
+                "e_client":"",
+                "p_jrn":"2",
+                "e_march0":"MARCHA",
+                "e_march0_price":"102.0000",
+                "e_quant0":"1.0000",
+                "htva_march0":"0",
+                "e_march0_tva_id":"4",
+                "bt_e_march0_tva_id":"+TVA+",
+                "e_march0_tva_amount":"0.0000",
+                "tva_march0":"0","tvac_march0":"0",
+                "jrn_type":"VEN",
+                "5f6a1d0b23242_ledger":"O","
+                5f6a1d0b23242":"1",
+                "update":"OK",
+                "5f6a1d5b70997_ledger":"O",
+                "5f6a1d5b70997":"1"}
+     * @endcode
+     */
+    function from_request()
+    {
+        $http=new HttpInput();
+        $obj=$this->get_table();
+        $this->pre_operation=new Pre_operation($obj->cn);
+        $this->pre_operation->get_post();
+        $this->pre_operation->set_od_id($http->post("p_id","number"));
+    }
+
+    function save()
+    {
+       $this->pre_operation->save();
+
+
+    }
+}
\ No newline at end of file
diff --git a/include/class/pre_op_ach.class.php b/include/class/pre_op_ach.class.php
index 722c9deed..5b5198abc 100644
--- a/include/class/pre_op_ach.class.php
+++ b/include/class/pre_op_ach.class.php
@@ -29,97 +29,86 @@ require_once  NOALYSS_INCLUDE.'/class/pre_operation.class.php';
  */
 class Pre_op_ach extends Pre_operation_detail
 {
-    var $op;
-    function __construct($cn,$p_id=0)
+    function __construct($cn)
     {
-        parent::__construct($cn,$p_id);
-
-        $this->operation->od_direct='f';
+        parent::__construct($cn);
     }
 
     function get_post()
     {
-        parent::get_post();
-        $http=new HttpInput();
-        $this->operation->od_direct='f';
+        $http = new \HttpInput();
+        $nb = $http->post("nb_item", "number");
         $this->e_client=$http->post('e_client');
-        for ($i=0;$i<$this->operation->nb_item;$i++)
-        {
-            $march="e_march".$i;
-            $this->$march=$http->post('e_march'.$i);
-            $this->{"e_march".$i."_price"}=$http->post('e_march'.$i."_price","string",0);
-            $this->{"e_march".$i."_price"}=$http->post('e_march'.$i."_price","string",0);
-            $this->{"e_march".$i."_tva_id"}=$http->post('e_march'.$i."_tva_id","string",0);
-            $this->{"e_march".$i."_tva_amount"}=$http->post('e_march'.$i."_tva_amount","string",0);
-            $this->{"e_march".$i."_label"}=$http->post('e_march'.$i."_label","string",NULL);
-            $this->{"e_quant".$i}=$http->post('e_quant'.$i);
-
+        for ($i = 0; $i < $nb; $i++) {
+            $march = "e_march" . $i;
+            $http->set_empty("");
+            $this->$march = $http->post('e_march' . $i);
+            $this->{"e_march" . $i . "_tva_id"} = $http->post('e_march' . $i . "_tva_id", "string", 0);
+            $this->{"e_march" . $i . "_tva_id"} = $http->post('e_march' . $i . "_tva_id", "string", "0");
+            $this->{"e_march" . $i . "_label"} = $http->post('e_march' . $i . "_label", "string", "");
+            $http->set_empty(0);
+            $this->{"e_march" . $i . "_price"} = $http->post('e_march' . $i . "_price","number");
+            $this->{"e_march" . $i . "_tva_amount"} = $http->post('e_march' . $i . "_tva_amount", "string", "0");
+            $this->{"e_quant" . $i} = $http->post('e_quant' . $i, "number");
         }
     }
-
     /*!
      * \brief save the detail and op in the database
      *
      */
-    function save()
+    function save($p_od_id,$p_nb_item)
     {
         try
         {
-            $this->db->start();
-            if ($this->operation->save() == false )
-                return;
             // save the client
             $sql=sprintf('insert into op_predef_detail (od_id,opd_poste,opd_debit)'.
-                         ' values '.
-                         "(%d,'%s','%s')",
-                         $this->operation->od_id,
-                         $this->e_client,
-                         "f");
+                ' values '.
+                "(%d,'%s','%s')",
+                $p_od_id,
+                $this->e_client,
+                "f");
             $this->db->exec_sql($sql);
-            // save the selling
-            for ($i=0;$i<$this->operation->nb_item;$i++)
+
+            for ($i=0;$i<$p_nb_item;$i++)
             {
                 if ( strlen(trim($this->{"e_march".$i}))=="") continue;
                 $sql= 'insert into op_predef_detail (opd_poste,'
-                        . 'opd_amount,'
-                        . 'opd_tva_id,'
-                        . 'opd_quantity,'
-                        . 'opd_debit,'
-                        . 'od_id ,'
-                        . 'opd_tva_amount,'
-                        . 'opd_comment'.
-                        ')'.
-                             ' values ($1,$2,$3,$4,$5,$6,$7,$8)';
+                    . 'opd_amount,'
+                    . 'opd_tva_id,'
+                    . 'opd_quantity,'
+                    . 'opd_debit,'
+                    . 'od_id ,'
+                    . 'opd_tva_amount,'
+                    . 'opd_comment'.
+                    ')'.
+                    ' values ($1,$2,$3,$4,$5,$6,$7,$8)';
                 $this->db->exec_sql($sql,
-                        array($this->{"e_march".$i},
-                             $this->{"e_march".$i."_price"},
-                             $this->{"e_march".$i."_tva_id"},
-                             $this->{"e_quant".$i},
-                             't',
-                             $this->operation->od_id,
-                             $this->{"e_march".$i."_tva_amount"},
-                             $this->{"e_march".$i."_label"},
-                            ));
+                    array($this->{"e_march".$i},
+                        $this->{"e_march".$i."_price"},
+                        $this->{"e_march".$i."_tva_id"},
+                        $this->{"e_quant".$i},
+                        't',
+                        $p_od_id,
+                        $this->{"e_march".$i."_tva_amount"},
+                        $this->{"e_march".$i."_label"},
+                    ));
             }
         }
         catch (Exception $e)
         {
-              record_log($e);
-            echo ($e->getMessage());
-            $this->db->rollback();
+            record_log("PREOPACH01".$e->getMessage().$e->getTraceAsString());
+            throw $e;
         }
-        $this->db->commit();
     }
     /*!\brief compute an array accordingly with the FormVenView function
 	 * @return an array for filling the form
      */
-    function compute_array()
+    function compute_array($p_od_id)
     {
         $count=0;
-        $a_op=$this->operation->load();
-        $array=$this->operation->compute_array($a_op);
-        $p_array=$this->load();
-	if ( empty ($p_array)) return array();
+        $array=array();
+        $p_array=$this->load($p_od_id);
+        if (empty($p_array)) return array();
         foreach ($p_array as $row)
         {
             if ( $row['opd_debit']=='f')
@@ -128,19 +117,20 @@ class Pre_op_ach extends Pre_operation_detail
             }
             else
             {
-                if ( trim($row['opd_poste']) !="" )
+                if ( trim($row['opd_poste']) != "")
                 {
                     $array+=array("e_march".$count=>$row['opd_poste'],
-                              "e_march".$count."_price"=>$row['opd_amount'],
-                              "e_march".$count."_tva_id"=>$row['opd_tva_id'],
-                              "e_march".$count."_tva_amount"=>$row['opd_tva_amount'],
-                              "e_quant".$count=>$row['opd_quantity']
-                             );
+                        "e_march".$count."_price"=>$row['opd_amount'],
+                        "e_march".$count."_tva_id"=>$row['opd_tva_id'],
+                        "e_quant".$count=>$row['opd_quantity'],
+                        "e_march".$count."_label"=>$row['opd_comment'],
+                        "e_march".$count."_tva_amount"=>$row['opd_tva_amount'],
+                    );
                     $count++;
                 }
             }
-            $array['nb_item']=$count;
         }
+
         return $array;
     }
     /**
@@ -148,263 +138,260 @@ class Pre_op_ach extends Pre_operation_detail
      * load the data from the database and return an array
      * \return an array
      */
-    function load()
+    function load($p_od_id)
     {
         $sql="select opd_id,opd_poste,opd_amount,opd_tva_id,opd_debit,".
-             " opd_quantity,opd_tva_amount from op_predef_detail where od_id=".$this->operation->od_id.
-             " order by opd_id";
-        $res=$this->db->exec_sql($sql);
+            " opd_quantity , opd_comment,opd_tva_amount from op_predef_detail where od_id= $1 ".
+            " order by opd_id";
+        $res=$this->db->exec_sql($sql,[$p_od_id]);
         $array=Database::fetch_all($res);
         return $array;
     }
-    function set_od_id($p_id)
-    {
-        $this->operation->od_id=$p_id;
-    }
+
    function display($p_array)
    {
         require_once NOALYSS_INCLUDE.'/class/acc_ledger_purchase.class.php';
        global $g_parameter,$g_user;
-       extract($p_array, EXTR_SKIP);
-       $ledger=new Acc_Ledger_Purchase($this->db,$this->jrn_def_id);
-        if ( $p_array != null ) extract($p_array, EXTR_SKIP);
+       $ledger=new Acc_Ledger_Purchase($this->db,$p_array['p_jrn']);
 
-        $flag_tva=$g_parameter->MY_TVA_USE;
-        /* Add button */
-        $f_add_button=new IButton('add_card');
-        $f_add_button->label=_('Créer une nouvelle fiche');
-		$f_add_button->tabindex=-1;
-        $f_add_button->set_attribute('ipopup','ipop_newcard');
-        $f_add_button->set_attribute('jrn',$this->jrn_def_id);
-        $f_add_button->javascript=" this.jrn=\$('p_jrn').value;select_card_type(this);";
+       $flag_tva=$g_parameter->MY_TVA_USE;
+       /* Add button */
+       $f_add_button=new IButton('add_card');
+       $f_add_button->tabindex=-1;
+       $f_add_button->label=_('Créer une nouvelle fiche');
+       $f_add_button->set_attribute('ipopup','ipop_newcard');
+       $f_add_button->set_attribute('jrn',$p_array['p_jrn']);
+       $f_add_button->javascript="this.jrn=\$('p_jrn').value; select_card_type(this);";
 
-        $f_add_button2=new IButton('add_card2');
-		$f_add_button2->tabindex=-1;
-        $f_add_button2->label=_('Créer une nouvelle fiche');
-        $f_add_button2->set_attribute('ipopup','ipop_newcard');
-        $f_add_button2->set_attribute('filter',$ledger->get_all_fiche_def ());
-        //    $f_add_button2->set_attribute('jrn',$ledger->id);
-        $f_add_button2->javascript="  this.jrn=\$('p_jrn').value;select_card_type(this);";
-        $str_add_button="";
-        $str_add_button2="";
-        if ($g_user->check_action(FICADD)==1)
-        {
-                $str_add_button=$f_add_button->input();
-                $str_add_button2=$f_add_button2->input();
-        }
+       $f_add_button2=new IButton('add_card2');
+       $f_add_button2->tabindex=-1;
+       $f_add_button2->label=_('Créer une nouvelle fiche');
+       $f_add_button2->set_attribute('ipopup','ipop_newcard');
+       $f_add_button2->set_attribute('filter',$ledger->get_all_fiche_def ());
+       //    $f_add_button2->set_attribute('jrn',$ledger->id);
+       $f_add_button2->javascript=" this.jrn=\$('p_jrn').value;select_card_type(this);";
 
-        $r="";
-        $r.=dossier::hidden();
-        $f_legend=_("En-tête facture fournisseur");
-        $f_legend_detail=_("Détail articles acheté");
+       $str_add_button="";
+       $str_add_button2="";
+       if ($g_user->check_action(FICADD)==1)
+       {
+           $str_add_button=$f_add_button->input();
+           $str_add_button2=$f_add_button2->input();
+       }
 
-        // Ledger (p_jrn)
-        //--
-        /* if we suggest the next pj, then we need a javascript */
-        $add_js="";
-
-        // Display the customer
-        //--
-        $fiche='cred';
-
-        // Save old value and set a new one
-        //--
-        $e_client=( isset ($e_client) )?$e_client:"";
-        $e_client_label="&nbsp;";//str_pad("",100,".");
+       $r='';
+       $r.=dossier::hidden();
+       $f_legend=_('En-tête facture fournisseur');
 
 
-        // retrieve e_client_label
-        //--
+       /* if we suggest the next pj, then we need a javascript */
 
-        if ( strlen(trim($e_client)) !=  0)
-        {
-            $fClient=new Fiche($ledger->db);
-            $fClient->get_by_qcode($e_client);
-            $e_client_label=$fClient->strAttribut(ATTR_DEF_NAME).' '.
-                            ' Adresse : '.$fClient->strAttribut(ATTR_DEF_ADRESS).' '.
-                            $fClient->strAttribut(ATTR_DEF_CP).' '.
-                            $fClient->strAttribut(ATTR_DEF_CITY).' ';
+       // Display the customer
+       //--
+       $fiche='deb';
+
+       // Save old value and set a new one
+       //--
+       $e_client=( isset ($p_array["e_client"]) )?$p_array["e_client"]:"";
+       $e_client_label="&nbsp;";//str_pad("",100,".");
 
 
-        }
+       // retrieve e_client_label
+       //--
 
-        $W1=new ICard();
-        $W1->label=_("Fournisseur ").Icon_Action::infobulle(0) ;
-        $W1->name="e_client";
-        $W1->tabindex=3;
-        $W1->value=$e_client;
-        $W1->table=0;
-        $W1->set_dblclick("fill_ipopcard(this);");
-        $W1->set_attribute('ipopup','ipopcard');
-
-        // name of the field to update with the name of the card
-        $W1->set_attribute('label','e_client_label');
-        // name of the field to update with the name of the card
-        $W1->set_attribute('typecard','cred');
-
-        // Add the callback function to filter the card on the jrn
-        $W1->set_callback('filter_card');
-        $W1->set_function('fill_data');
-        $W1->javascript=sprintf(' onchange="fill_data_onchange(\'%s\');" ',
-                                $W1->name);
-        $f_client_qcode=$W1->input();
-        $client_label=new ISpan();
-        $client_label->table=0;
-        $f_client=$client_label->input("e_client_label",$e_client_label);
-        $f_client_bt=$W1->search();
+       if ( strlen(trim($e_client)) !=  0)
+       {
+           $fClient=new Fiche($ledger->db);
+           $fClient->get_by_qcode($e_client);
+           $e_client_label=$fClient->strAttribut(ATTR_DEF_NAME).' '.
+               ' Adresse : '.$fClient->strAttribut(ATTR_DEF_ADRESS).' '.
+               $fClient->strAttribut(ATTR_DEF_CP).' '.
+               $fClient->strAttribut(ATTR_DEF_CITY).' ';
 
 
-        // Record the current number of article
-		$min=$ledger->get_min_row();
-        $p_article= ( isset ($nb_item))?$nb_item:$min;
-        $max=($p_article < $min)?$min:$p_article;
+       }
 
-        $e_comment=(isset($e_comment))?$e_comment:"";
-        $Hid=new IHidden();
-        $r.=$Hid->input("nb_item",$p_article);
-        // For each article
-        //--
-        for ($i=0;$i< $max ;$i++)
-        {
-            // Code id, price & vat code
-            //--
-            $march=(isset(${"e_march$i"}))?${"e_march$i"}:""                   ;
-            $march_price=(isset(${"e_march".$i."_price"}))?${"e_march".$i."_price"}:""
-                         ;
-            /* use vat */
-            if ( $g_parameter->MY_TVA_USE=='Y')
-            {
-                $march_tva_id=(isset(${"e_march$i"."_tva_id"}))?${"e_march$i"."_tva_id"}:"";
-                $march_tva_amount=(isset(${"e_march$i"."_tva_amount"}))?${"e_march$i"."_tva_amount"}:"";
-            }
+       $W1=new ICard();
+       $W1->label="Client ".Icon_Action::infobulle(0) ;
+       $W1->name="e_client";
+       $W1->tabindex=3;
+       $W1->value=$e_client;
+       $W1->table=0;
+       $W1->set_dblclick("fill_ipopcard(this);");
+       $W1->set_attribute('ipopup','ipopcard');
+
+       // name of the field to update with the name of the card
+       $W1->set_attribute('label','e_client_label');
+       // name of the field to update with the name of the card
+       $W1->set_attribute('typecard','cred');
+
+       // Add the callback function to filter the card on the jrn
+       $W1->set_callback('filter_card');
+       $W1->set_function('fill_data');
+       $W1->javascript=sprintf(' onchange="fill_data_onchange(\'%s\');" ',
+           $W1->name);
+       $f_client_qcode=$W1->input();
+       $client_label=new ISpan();
+       $client_label->table=0;
+       $f_client=$client_label->input("e_client_label",$e_client_label);
+       $f_client_bt=$W1->search();
+
+
+       // Record the current number of article
+       $min=$ledger->get_min_row();
+       $p_article= ( isset ($p_array["nb_item"]))?$p_array["nb_item"]:$min;
+       $max=($p_article < $min)?$min:$p_article;
+
+       $e_comment=(isset($p_array["e_comment"]))?$p_array["e_comment"]:"";
+       $Hid=new IHidden();
+       $r.=$Hid->input("nb_item",$p_article);
+
+       $f_legend_detail=_("Détail articles achetés");
+
+       // For each article
+       //--
+       for ($i=0;$i< $max;$i++)
+       {
+           // Code id, price & vat code
+           //--
+           $march=(isset($p_array["e_march$i"]))?$p_array["e_march$i"]:""
+           ;
+           $march_price=(isset($p_array["e_march".$i."_price"]))?$p_array["e_march".$i."_price"]:""
+           ;
+           if ( $flag_tva=='Y')
+           {
+               $march_tva_id=(isset($p_array["e_march$i"."_tva_id"]))?$p_array["e_march$i"."_tva_id"]:"";
+               $march_tva_amount=(isset($p_array["e_march$i"."_tva_amount"]))?$p_array["e_march$i"."_tva_amount"]:"";
+           }
+           $march_label=(isset($p_array["e_march".$i."_label"]))?$p_array["e_march".$i."_label"]:"";
+
+           // retrieve the tva label and name
+           //--
+           if ( strlen(trim($march))!=0 && strlen(trim($march_label))==0)
+           {
+               $fMarch=new Fiche($ledger->db);
+               $fMarch->get_by_qcode($march);
+               $march_label=$fMarch->strAttribut(ATTR_DEF_NAME);
+               if ( $flag_tva=='Y')
+               {
+                   if ( ! (isset($p_array["e_march$i"."_tva_id"])))
+                       $march_tva_id=$fMarch->strAttribut(ATTR_DEF_TVA);
+               }
+           }
+           // Show input
+           //--
+           $W1=new ICard();
+           $W1->label="";
+           $W1->name="e_march".$i;
+           $W1->value=$march;
+           $W1->table=1;
+           $W1->set_attribute('typecard','deb');
+           $W1->set_dblclick("fill_ipopcard(this);");
+           $W1->set_attribute('ipopup','ipopcard');
+
+           // name of the field to update with the name of the card
+           $W1->set_attribute('label','e_march'.$i.'_label');
+           // name of the field with the price
+           $W1->set_attribute('price','e_march'.$i.'_price');
+           // name of the field with the TVA_ID
+           $W1->set_attribute('tvaid','e_march'.$i.'_tva_id');
+           // Add the callback function to filter the card on the jrn
+           $W1->set_callback('filter_card');
+           $W1->set_function('fill_data');
+           $W1->javascript=sprintf(' onchange="fill_data_onchange(\'%s\');" ',
+               $W1->name);
+
+           $W1->readonly=false;
+
+           $array[$i]['quick_code']=$W1->input();
+           $array[$i]['bt']=$W1->search();
+           // For computing we need some hidden field for holding the value
+           $array[$i]['hidden']='';
+           if ( $flag_tva=='Y') $array[$i]['hidden'].=HtmlInput::hidden('tva_march'.$i,0);
+
+           $htva=new INum('htva_march'.$i);
+           $htva->readOnly=1;
+           $htva->value=0;
+           $array[$i]['htva']=$htva->input();
+
+           if ( $g_parameter->MY_TVA_USE=='Y')
+               $tvac=new INum('tvac_march'.$i);
+           else
+               $tvac=new IHidden('tvac_march'.$i);
+
+           $tvac->readOnly=1;
+           $tvac->value=0;
+           $array[$i]['tvac']=$tvac->input();
+
+           if ( $g_parameter->MY_UPDLAB == 'Y')
+           {
+               $Span=new IText("e_march".$i."_label");
+
+               $Span->css_size="100%";
+           } else
+           {
+               $Span=new ISpan("e_march".$i."_label");
+           }
+           $Span->value=$march_label;
+           $Span->setReadOnly(false);
+           // card's name, price
+           //--
+           $array[$i]['denom']=$Span->input("e_march".$i."_label",$march_label);
+           // price
+           $Price=new INum();
+           $Price->setReadOnly(false);
+           $Price->prec=4;
+           $Price->size=9;
+           $Price->javascript="onBlur='format_number(this);clean_tva($i);compute_ledger($i)'";
+           $array[$i]['pu']=$Price->input("e_march".$i."_price",$march_price);
+           $array[$i]['tva']='';
+           $array[$i]['amount_tva']='';
+           // if tva is not needed then no tva field
+           if ( $flag_tva == 'Y' )
+           {
+               // vat label
+               //--
+               $Tva=new ITva_Popup($ledger->db);
+               $Tva->in_table=true;
+               $Tva->set_attribute('compute',$i);
+
+               $Tva->js='onblur="format_number(this);clean_tva('.$i.');compute_ledger('.$i.')"';
+               $Tva->value=$march_tva_id;
+               $array[$i]['tva']=$Tva->input("e_march$i"."_tva_id");
+               // vat amount
+               //--
+               $wTva_amount=new INum();
+               $wTva_amount->readOnly=false;
+               $wTva_amount->size=6;
+               $wTva_amount->javascript="onBlur='format_number(this);compute_ledger($i)'";
+               $array[$i]['amount_tva']=$wTva_amount->input("e_march".$i."_tva_amount",$march_tva_amount);
+           }
+           // quantity
+           //--
+           $quant=(isset($p_array["e_quant$i"]))?$p_array["e_quant$i"]:"1"
+           ;
+           $Quantity=new INum();
+           $Quantity->setReadOnly(false);
+           $Quantity->size=8;
+           $Quantity->javascript="onChange='format_number(this);clean_tva($i);compute_ledger($i)'";
+           $array[$i]['quantity']=$Quantity->input("e_quant".$i,$quant);
+
+       }// foreach article
+       $f_type=_('Client');
+
+
+       ob_start();
+       require_once NOALYSS_TEMPLATE.'/predf_ledger_detail.php';
+       $r.=ob_get_contents();
+       ob_end_clean();
 
 
 
-            $march_label=(isset(${"e_march".$i."_label"}))?${"e_march".$i."_label"}:"";
-            // retrieve the tva label and name
-            //--
-            if ( strlen(trim($march))!=0  && strlen(trim($march_label))==0 )
-            {
-                $fMarch=new Fiche($ledger->db);
-                $fMarch->get_by_qcode($march);
-                $march_label=$fMarch->strAttribut(ATTR_DEF_NAME);
-                /* vat use */
-                if ( ! isset($march_tva_id) && $g_parameter->MY_TVA_USE=='Y' )
-                    $march_tva_id=$fMarch->strAttribut(ATTR_DEF_TVA);
-            }
-            // Show input
-            //--
-            $W1=new ICard();
-            $W1->label="";
-            $W1->name="e_march".$i;
-            $W1->value=$march;
-            $W1->table=1;
-            $W1->set_dblclick("fill_ipopcard(this);");
-            $W1->set_attribute('ipopup','ipopcard');
+       // Set correctly the REQUEST param for jrn_type
+       $r.=HtmlInput::hidden('jrn_type','ACH');
+       $r.= Html_Input_Noalyss::ledger_add_item("O");
 
-            $W1->set_attribute('typecard','deb');
-
-            // name of the field to update with the name of the card
-            $W1->set_attribute('label','e_march'.$i.'_label');
-            // name of the field with the price
-            $W1->set_attribute('purchase','e_march'.$i.'_price'); /* autocomplete */
-            $W1->set_attribute('price','e_march'.$i.'_price');    /* via search */
-
-            // name of the field with the TVA_ID
-            $W1->set_attribute('tvaid','e_march'.$i.'_tva_id');
-            // Add the callback function to filter the card on the jrn
-            $W1->set_callback('filter_card');
-            $W1->set_function('fill_data');
-            $W1->javascript=sprintf(' onchange="fill_data_onchange(\'%s\');" ',
-                                    $W1->name);
-            $W1->readonly=false;
-            $array[$i]['quick_code']=$W1->input();
-            $array[$i]['bt']=$W1->search();
-
-            $array[$i]['hidden']='';
-            // For computing we need some hidden field for holding the value
-            if ( $g_parameter->MY_TVA_USE=='Y')
-            {
-                $array[$i]['hidden'].=HtmlInput::hidden('tva_march'.$i,0);
-            }
-
-            if ( $g_parameter->MY_TVA_USE=='Y')
-                $tvac=new INum('tvac_march'.$i);
-            else
-                $tvac=new IHidden('tvac_march'.$i);
-
-            $tvac->readOnly=1;
-            $tvac->value=0;
-            $array[$i]['tvac']=$tvac->input();
-
-            $htva=new INum('htva_march'.$i);
-            $htva->readOnly=1;
-
-            $htva->value=0;
-            $array[$i]['htva']=$htva->input();
-
-            if ( $g_parameter->MY_UPDLAB == 'Y')
-            {
-                $Span=new IText("e_march".$i."_label");
-                $Span->css_size="100%";
-            } else
-            {
-                $Span=new ISpan("e_march".$i."_label");
-            }
-            $Span->value=$march_label;
-            $Span->setReadOnly(false);
-            // card's name, price
-            //--
-            $array[$i]['denom']=$Span->input("e_march".$i."_label",$march_label);
-            // price
-            $Price=new INum();
-            $Price->prec=4;
-            $Price->setReadOnly(false);
-            $Price->size=9;
-            $Price->javascript="onBlur='format_number(this);clean_tva($i);compute_ledger($i)'";
-            $array[$i]['pu']=$Price->input("e_march".$i."_price",$march_price);
-            if ( $g_parameter->MY_TVA_USE=='Y')
-            {
-
-                // vat label
-                //--
-                $Tva=new ITva_Popup($ledger->db);
-                $Tva->js="onblur=\"format_number(this);onChange=clean_tva($i);compute_ledger($i)\"";
-                $Tva->in_table=true;
-                $Tva->set_attribute('compute',$i);
-                $Tva->value=$march_tva_id;
-                $array[$i]['tva']=$Tva->input("e_march$i"."_tva_id");
-
-                // Tva_amount
-
-                // price
-                $Tva_amount=new INum();
-                $Tva_amount->setReadOnly(false);
-                $Tva_amount->size=9;
-                $Tva_amount->javascript="onBlur='format_number(this);compute_ledger($i)'";
-                $array[$i]['amount_tva']=$Tva_amount->input("e_march".$i."_tva_amount",$march_tva_amount);
-            }
-            // quantity
-            //--
-            $quant=(isset(${"e_quant$i"}))?${"e_quant$i"}:"1"
-                   ;
-            $Quantity=new INum();
-            $Quantity->setReadOnly(false);
-            $Quantity->size=9;
-            $Quantity->javascript="onChange=format_number(this);clean_tva($i);compute_ledger($i)";
-            $array[$i]['quantity']=$Quantity->input("e_quant".$i,$quant);
-
-        }
-        $f_type=_('Fournisseur');
-
-        ob_start();
-        require_once NOALYSS_TEMPLATE.'/predf_ledger_detail.php';
-        $r.=ob_get_contents();
-        ob_end_clean();
-
-        // Set correctly the REQUEST param for jrn_type
-        $r.= HtmlInput::hidden('jrn_type','ACH');
-        $r.= Html_Input_Noalyss::ledger_add_item("O");
+       return $r;
 
         return $r;
    }
diff --git a/include/class/pre_op_advanced.class.php b/include/class/pre_op_advanced.class.php
index 3d78bc9e7..8c08e7094 100644
--- a/include/class/pre_op_advanced.class.php
+++ b/include/class/pre_op_advanced.class.php
@@ -29,18 +29,16 @@ require_once  NOALYSS_INCLUDE.'/class/pre_operation.class.php';
  */
 class Pre_Op_Advanced extends Pre_operation_detail
 {
-    var $op;
     function __construct($cn)
     {
         parent::__construct($cn);
-        $this->operation->od_direct='t';
     }
     function get_post()
     {
-        parent::get_post();
-        $http=new HttpInput();
+        $http = new \HttpInput();
+        $nb = $http->post("nb_item", "number");
 
-        for ($i=0;$i<$this->operation->nb_item;$i++)
+        for ($i=0;$i<$nb;$i++)
         {
             $poste=$http->post("poste".$i,"string", null);
             $qcode=$http->post("qc_".$i,"string", null);
@@ -54,10 +52,14 @@ class Pre_Op_Advanced extends Pre_operation_detail
             }
             
             if ( $qcode != null && trim ($qcode) != "") {
-                $this->{'isqc'.$i}=(trim($_POST['qc_'.$i]) != "")?'t':'f';
+                $this->{'isqc'.$i}=(trim($http->post('qc_'.$i)) != "")?'t':'f';
                 $this->{'poste'.$i}=trim ($qcode);
-            }   
-            $this->{"amount".$i}=$_POST['amount'.$i];
+            }
+            $http->set_empty(0);
+            $this->{"amount".$i}=$http->post('amount'.$i);
+            $http->set_empty("");
+            $this->{"ld".$i}=$http->post("ld".$i);
+
             $this->{"ck".$i}=(isset($_POST['ck'.$i]))?'t':'f';
 
         }
@@ -66,60 +68,53 @@ class Pre_Op_Advanced extends Pre_operation_detail
      * \brief save the detail and op in the database
      *
      */
-    function save()
+    function save($p_od_id,$p_nb_item)
     {
         try
         {
-            if ($this->operation->save() == false )
-                return;
-            $this->db->start();
             // save the selling
-            for ($i=0;$i<$this->operation->nb_item;$i++)
+            for ($i=0;$i<$p_nb_item;$i++)
             {
                 if ( ! isset ($this->{"poste".$i}))
                     continue;
 
                 $sql=sprintf('insert into op_predef_detail (opd_poste,opd_amount,'.
-                             'opd_debit,od_id,opd_qc)'.
-                             ' values '.
-                             "('%s',%.2f,'%s',%d,'%s')",
-                             $this->{"poste".$i},
-                             $this->{"amount".$i},
-                             $this->{"ck".$i},
-                             $this->operation->od_id,
-                             $this->{'isqc'.$i}
+                             'opd_debit,od_id,opd_qc,opd_comment)'.
+                             ' values($1,$2,$3,$4,$5,$6) '
                             );
 
-                $this->db->exec_sql($sql);
+                $this->db->exec_sql($sql,[$this->{"poste".$i},
+                                        $this->{"amount".$i},
+                                        $this->{"ck".$i},
+                                        $p_od_id,
+                                        $this->{'isqc'.$i},
+                                        $this->{"ld".$i}]);
 
             }
-             $this->db->commit();
-            
+
         }
         catch (Exception $e)
         {
-              record_log($e);
-            echo ($e->getMessage());
-            $this->db->rollback();
+            record_log($e->getMessage().$e->getTraceAsString());
+            throw $e;
         }
 
     }
     /*!\brief compute an array accordingly with the FormVenView function
      */
-    function compute_array()
+    function compute_array($p_od_id)
     {
         $count=0;
-        $a_op=$this->operation->load();
-        $array=$this->operation->compute_array($a_op);
-        $array['desc']=$array['e_comm'];
-        $p_array=$this->load();
+        $array=array();
+        $p_array=$this->load($p_od_id);
 		if (empty($p_array)) return array();
         foreach ($p_array as $row)
         {
             $tmp_array=array("qc_".$count=>'',
                              "poste".$count=>'',
                              "amount".$count=>$row['opd_amount'],
-                             'ck'.$count=>$row['opd_debit']
+                             'ck'.$count=>$row['opd_debit'],
+                              "ld".$count=>$row['opd_comment']
                             );
 
             if ( $row['opd_qc'] == 't' )
@@ -141,28 +136,22 @@ class Pre_Op_Advanced extends Pre_operation_detail
     /*!\brief load the data from the database and return an array
      * \return an array
      */
-    function load()
+    function load($p_od_id)
     {
-        $sql="select opd_id,opd_poste,opd_amount,opd_debit,".
-             " opd_qc from op_predef_detail where od_id=".$this->operation->od_id.
+        $sql="select opd_id,opd_poste,opd_amount,opd_debit,opd_comment,".
+             " opd_qc from op_predef_detail where od_id=$1 ".
              " order by opd_id";
-        $res=$this->db->exec_sql($sql);
+        $res=$this->db->exec_sql($sql,[$p_od_id]);
         $array=Database::fetch_all($res);
         return $array;
     }
-    function set_od_id($p_id)
-    {
-        $this->operation->od_id=$p_id;
-    }
-       function display($p_array)
+   function display($p_array)
     {
         global $g_parameter, $g_user;
         require_once NOALYSS_INCLUDE.'/class/acc_ledger.class.php';
-        $legder=new Acc_Ledger($this->db,$this->jrn_def_id);
+        $legder=new Acc_Ledger($this->db,$p_array['p_jrn']);
         $legder->nb=$legder->get_min_row();
 
-        if ($p_array != null)
-                extract($p_array, EXTR_SKIP);
         $add_js = "";
        
         $ret = "";
@@ -177,10 +166,10 @@ class Pre_Op_Advanced extends Pre_operation_detail
                 $f_add_button->input();
         }
        
-        $nb_row = (isset($nb_item) ) ? $nb_item : $legder->nb;
+        $nb_row = (isset($p_array['nb_item']) ) ? $p_array['nb_item' ]: $legder->nb;
 
         $ret.=HtmlInput::hidden('nb_item', $nb_row);
-        $ret.=HtmlInput::hidden('p_jrn', $this->jrn_def_id);
+        $ret.=HtmlInput::hidden('p_jrn', $p_array['p_jrn']);
         $ret.=dossier::hidden();
         
         $ret.=dossier::hidden();
@@ -220,7 +209,7 @@ class Pre_Op_Advanced extends Pre_operation_detail
                 $quick_code->javascript = sprintf(' onchange="fill_data_onchange(\'%s\');" ', $quick_code->name);
 
                 $quick_code->jrn = $legder->id;
-                $quick_code->value = (isset(${'qc_' . $i})) ? ${'qc_' . $i} : "";
+                $quick_code->value = (isset($p_array['qc_' . $i])) ? $p_array['qc_' . $i]: "";
 
                 $label = '';
                 if ($quick_code->value != '')
@@ -240,7 +229,7 @@ class Pre_Op_Advanced extends Pre_operation_detail
                 $poste->set_attribute('account', 'poste' . $i);
                 $poste->set_attribute('dossier', Dossier::id());
 
-                $poste->value = (isset(${'poste' . $i})) ? ${"poste" . $i} : ''
+                $poste->value = (isset($p_array['poste' . $i])) ?$p_array['poste' . $i]: ''
                 ;
                 $poste->dbl_click_history();
 
@@ -256,20 +245,20 @@ class Pre_Op_Advanced extends Pre_operation_detail
                 $line_desc = new IText();
                 $line_desc->name = 'ld' . $i;
                 $line_desc->size = 30;
-                $line_desc->value = (isset(${"ld" . $i})) ? ${"ld" . $i} :
+                $line_desc->value = (isset($p_array["ld" . $i])) ? $p_array["ld" . $i] :
                                 $label;
 
                 // Amount
                 $amount = new INum();
                 $amount->size = 10;
                 $amount->name = 'amount' . $i;
-                $amount->value = (isset(${'amount' . $i})) ? ${"amount" . $i} : ''
+                $amount->value = (isset($p_array['amount' . $i])) ?$p_array['amount' . $i] : ''
                 ;
                 $amount->javascript = ' onChange="format_number(this);checkTotalDirect()"';
                 // D/C
                 $deb = new ICheckBox();
                 $deb->name = 'ck' . $i;
-                $deb->selected = (isset(${'ck' . $i})) ? true : false;
+                $deb->selected = (isset($p_array['ck' . $i])) ? true : false;
                 $deb->javascript = ' onChange="checkTotalDirect()"';
 
                 $ret.='<tr>';
diff --git a/include/class/pre_op_ods.class.php b/include/class/pre_op_ods.class.php
index 1130e6208..9b1d8696f 100644
--- a/include/class/pre_op_ods.class.php
+++ b/include/class/pre_op_ods.class.php
@@ -30,22 +30,23 @@ require_once  NOALYSS_INCLUDE.'/class/pre_operation.class.php';
 class Pre_op_ods extends Pre_operation_detail
 {
     var $op;
-    function __construct($cn,$p_id=0)
+    function __construct($cn)
     {
-        parent::__construct($cn,$p_id);
-        $this->operation->od_direct='f';
+        parent::__construct($cn);
     }
 
+    /***
+     * @brief retrieve data from $_POST
+     */
     function get_post()
     {
-        parent::get_post();
-        $this->operation->od_direct='f';
-        for ($i=0;$i<$this->operation->nb_item;$i++)
+        $http=new \HttpInput();
+        $nb=$http->post("nb_item","number");
+        for ($i=0;$i< $nb ;$i++)
         {
-
-            $this->{"e_account".$i}=$_POST['e_account'.$i];
-            $this->{"e_account".$i."_amount"}=$_POST['e_account'.$i."_amount"];
-            $this->{"e_account".$i."_type"}=$_POST['e_account'.$i."_type"];
+            $this->{"e_account".$i}=$http->post("e_account'.$i");
+            $this->{"e_account".$i."_amount"}=$http->post("e_account".$i."_amount","number",0);
+            $this->{"e_account".$i."_type"}=$http->post('e_account'.$i."_type");
 
         }
     }
@@ -53,45 +54,38 @@ class Pre_op_ods extends Pre_operation_detail
      * \brief save the detail and op in the database
      *
      */
-    function save()
+    function save($p_od_id,$p_nbitem)
     {
         try
         {
-            $this->db->start();
-            if ($this->operation->save() == false )
-                return;
-
             // save the selling
-            for ($i=0;$i<$this->operation->nb_item;$i++)
+            for ($i=0;$i< $p_nbitem ;$i++)
             {
-                $sql=sprintf('insert into op_predef_detail (opd_poste,opd_amount,'.
+                $sql='insert into op_predef_detail (opd_poste,opd_amount,'.
                              'opd_debit,od_id)'.
-                             ' values '.
-                             "('%s',%.2f,'%s',%d)",
-                             $this->{"e_account".$i},
-                             $this->{"e_account".$i."_amount"},
-                             ($this->{"e_account".$i."_type"}=='d')?'t':'f',
-                             $this->operation->od_id
-                            );
-                $this->db->exec_sql($sql);
+                             ' values ($1,$2,$3,$4)';
+
+                $this->db->exec_sql($sql,array($this->{"e_account".$i},
+                                                $this->{"e_account".$i."_amount"},
+                                                ($this->{"e_account".$i."_type"}=='d')?'t':'f',
+                                                $p_od_id)
+                                    );
             }
         }
         catch (Exception $e)
         {
-              record_log($e);
+            record_log($e);
             echo ($e->getMessage());
-            $this->db->rollback();
+            throw $e;
         }
 
     }
     /*!\brief compute an array accordingly with the FormVenView function
      */
-    function compute_array()
+    function compute_array($p_od_id)
     {
         $count=0;
-        $a_op=$this->operation->load();
-        $array=$this->operation->compute_array($a_op);
-        $p_array=$this->load();
+        $p_array=$this->load($p_od_id);
         foreach ($p_array as $row)
         {
             $c=($row['opd_debit']=='t')?'d':'c';
@@ -107,17 +101,13 @@ class Pre_op_ods extends Pre_operation_detail
     /*!\brief load the data from the database and return an array
      * \return an array 
      */
-    function load()
+    function load($p_od_id)
     {
         $sql="select opd_id,opd_poste,opd_amount,opd_debit".
-             "  from op_predef_detail where od_id=".$this->operation->od_id.
+             "  from op_predef_detail where od_id= $1 ".
              " order by opd_debit, opd_id,opd_amount";
-        $res=$this->db->exec_sql($sql);
+        $res=$this->db->exec_sql($sql,array($p_od_id));
         $array=Database::fetch_all($res);
         return $array;
     }
-    function set_od_id($p_id)
-    {
-        $this->operation->od_id=$p_id;
-    }
 }
diff --git a/include/class/pre_op_ven.class.php b/include/class/pre_op_ven.class.php
index 3d97c0687..fbb0cbc97 100644
--- a/include/class/pre_op_ven.class.php
+++ b/include/class/pre_op_ven.class.php
@@ -29,53 +29,49 @@ require_once  NOALYSS_INCLUDE.'/class/pre_operation.class.php';
 */
 class Pre_op_ven extends Pre_operation_detail
 {
-    var $op;
     //< Pre_operation
-    function __construct($cn,$p_id=0)
+    function __construct($cn)
     {
-        parent::__construct($cn,$p_id);
-        $this->operation->od_direct='f'; //< Pre_operation
+        parent::__construct($cn);
     }
 
     function get_post()
     {
-        parent::get_post();
-        $this->operation->od_direct='f';
-        $this->e_client=$_POST['e_client'];
-        for ($i=0;$i<$this->operation->nb_item;$i++)
+        $http=new \HttpInput();
+        $nb=$http->post("nb_item","number");
+        $this->e_client=$http->post("e_client");
+        for ($i=0;$i< $nb;$i++)
         {
             $march="e_march".$i;
-            $this->$march=$_POST['e_march'.$i];
-            $this->{"e_march".$i."_price"}=$_POST['e_march'.$i."_price"];
-            $this->{"e_march".$i."_tva_id"}=(isset($_POST['e_march'.$i."_tva_id"]))?$_POST['e_march'.$i."_tva_id"]:0;
-            $this->{"e_march".$i."_tva_amount"}=(isset($_POST['e_march'.$i."_tva_amount"]))?$_POST['e_march'.$i."_tva_amount"]:0;
-            $this->{"e_march".$i."_tva_id"}=(isset($_POST['e_march'.$i."_tva_id"]))?$_POST['e_march'.$i."_tva_id"]:0;
-            $this->{"e_march".$i."_label"}=(isset($_POST['e_march'.$i."_label"]))?$_POST['e_march'.$i."_label"]:null;
-            $this->{"e_quant".$i}=$_POST['e_quant'.$i];
+            $http->set_empty("");
+            $this->$march=$http->post('e_march'.$i);
+            $this->{"e_march".$i."_tva_id"}=$http->post('e_march'.$i."_tva_id","string",0);
+            $this->{"e_march".$i."_tva_id"}=$http->post('e_march'.$i."_tva_id","string","0");
+            $this->{"e_march".$i."_label"}=$http->post('e_march'.$i."_label","string","");
 
+            $http->set_empty(0);
+            $this->{"e_march".$i."_price"}=$http->post('e_march'.$i."_price","number");
+            $this->{"e_march".$i."_tva_amount"}=$http->post('e_march'.$i."_tva_amount","number","0");
+            $this->{"e_quant".$i}=$http->post('e_quant'.$i,"number");
         }
     }
     /*!
      * \brief save the detail and op in the database
      *
      */
-    function save()
+    function save($p_od_id,$p_nb_item)
     {
         try
         {
-            $this->db->start();
-            if ($this->operation->save() == false )
-                return;
             // save the client
             $sql=sprintf('insert into op_predef_detail (od_id,opd_poste,opd_debit)'.
-                         ' values '.
-                         "(%d,'%s','%s')",
-                         $this->operation->od_id,
-                         $this->e_client,
-                         "t");
+                ' values '.
+                "(%d,'%s','%s')",
+                $p_od_id,
+                $this->e_client,
+                "t");
             $this->db->exec_sql($sql);
-            // save the selling
-            for ($i=0;$i<$this->operation->nb_item;$i++)
+            for ($i=0;$i<$p_nb_item;$i++)
             {
                 if ( strlen(trim($this->{"e_march".$i}))=="") continue;
                 $sql= 'insert into op_predef_detail (opd_poste,'
@@ -94,7 +90,7 @@ class Pre_op_ven extends Pre_operation_detail
                              $this->{"e_march".$i."_tva_id"},
                              $this->{"e_quant".$i},
                              'f',
-                             $this->operation->od_id,
+                             $p_od_id,
                              $this->{"e_march".$i."_tva_amount"},
                              $this->{"e_march".$i."_label"},
                             ));
@@ -102,21 +98,17 @@ class Pre_op_ven extends Pre_operation_detail
         }
         catch (Exception $e)
         {
-              record_log($e);
-            echo ($e->getMessage());
-            $this->db->rollback();
+            record_log("PREOPVEN01".$e->getMessage().$e->getTraceAsString());
+              throw $e;
         }
-        $this->db->commit();
-
     }
     /*!\brief compute an array accordingly with the FormVenView function
      */
-    function compute_array()
+    function compute_array($p_od_id)
     {
         $count=0;
-        $a_op=$this->operation->load();
-        $array=$this->operation->compute_array($a_op);
-        $p_array=$this->load();
+        $array=array();
+        $p_array=$this->load($p_od_id);
 		if (empty($p_array)) return array();
         foreach ($p_array as $row)
         {
@@ -139,37 +131,33 @@ class Pre_op_ven extends Pre_operation_detail
                 }
             }
         }
-        // Find the ledger
-        $ledger=new Acc_Ledger($this->db,$this->operation->jrn_def_id);
-        // Find the max line of the ledger
-        $max_row=$ledger->get_min_row();
-        
-        // compute nb_item
-        $array['nb_item']=($max_row > $count)?$max_row:$count;
+
         return $array;
     }
     /*!\brief load the data from the database and return an array
      * \return an array
      */
-    function load()
+    function load($p_od_id)
     {
         $sql="select opd_id,opd_poste,opd_amount,opd_tva_id,opd_debit,".
-             " opd_quantity , opd_comment,opd_tva_amount from op_predef_detail where od_id=".$this->operation->od_id.
+             " opd_quantity , opd_comment,opd_tva_amount from op_predef_detail where od_id= $1 ".
              " order by opd_id";
-        $res=$this->db->exec_sql($sql);
+        $res=$this->db->exec_sql($sql,[$p_od_id]);
         $array=Database::fetch_all($res);
         return $array;
     }
-    function set_od_id($p_id)
-    {
-        $this->operation->od_id=$p_id;
-    }
+
+    /**
+     * @param array $p_array
+     * @return string
+     * @throws Exception
+     */
     function display($p_array)
     {
         global $g_parameter,$g_user;
-        if ( $p_array != null ) extract($p_array, EXTR_SKIP);
+
         require_once NOALYSS_INCLUDE.'/class/acc_ledger_sold.class.php';
-        $ledger=new Acc_Ledger_Sold($this->db,$this->jrn_def_id);
+        $ledger=new Acc_Ledger_Sold($this->db,$p_array['p_jrn']);
 
         $flag_tva=$g_parameter->MY_TVA_USE;
         /* Add button */
@@ -177,7 +165,7 @@ class Pre_op_ven extends Pre_operation_detail
 		$f_add_button->tabindex=-1;
         $f_add_button->label=_('Créer une nouvelle fiche');
         $f_add_button->set_attribute('ipopup','ipop_newcard');
-        $f_add_button->set_attribute('jrn',$ledger->id);
+        $f_add_button->set_attribute('jrn',$p_array['p_jrn']);
         $f_add_button->javascript="this.jrn=\$('p_jrn').value; select_card_type(this);";
 
         $f_add_button2=new IButton('add_card2');
@@ -209,7 +197,7 @@ class Pre_op_ven extends Pre_operation_detail
 
         // Save old value and set a new one
         //--
-        $e_client=( isset ($e_client) )?$e_client:"";
+        $e_client=( isset ($p_array["e_client"]) )?$p_array["e_client"]:"";
         $e_client_label="&nbsp;";//str_pad("",100,".");
 
 
@@ -256,10 +244,10 @@ class Pre_op_ven extends Pre_operation_detail
 
         // Record the current number of article
 		$min=$ledger->get_min_row();
-        $p_article= ( isset ($nb_item))?$nb_item:$min;
+        $p_article= ( isset ($p_array["nb_item"]))?$p_array["nb_item"]:$min;
         $max=($p_article < $min)?$min:$p_article;
 
-        $e_comment=(isset($e_comment))?$e_comment:"";
+        $e_comment=(isset($p_array["e_comment"]))?$p_array["e_comment"]:"";
         $Hid=new IHidden();
         $r.=$Hid->input("nb_item",$p_article);
 
@@ -271,16 +259,16 @@ class Pre_op_ven extends Pre_operation_detail
         {
             // Code id, price & vat code
             //--
-            $march=(isset(${"e_march$i"}))?${"e_march$i"}:""
+            $march=(isset($p_array["e_march$i"]))?$p_array["e_march$i"]:""
                    ;
-            $march_price=(isset(${"e_march".$i."_price"}))?${"e_march".$i."_price"}:""
+            $march_price=(isset($p_array["e_march".$i."_price"]))?$p_array["e_march".$i."_price"]:""
                          ;
             if ( $flag_tva=='Y')
             {
-                $march_tva_id=(isset(${"e_march$i"."_tva_id"}))?${"e_march$i"."_tva_id"}:"";
-                $march_tva_amount=(isset(${"e_march$i"."_tva_amount"}))?${"e_march$i"."_tva_amount"}:"";
+                $march_tva_id=(isset($p_array["e_march$i"."_tva_id"]))?$p_array["e_march$i"."_tva_id"]:"";
+                $march_tva_amount=(isset($p_array["e_march$i"."_tva_amount"]))?$p_array["e_march$i"."_tva_amount"]:"";
             }
-            $march_label=(isset(${"e_march".$i."_label"}))?${"e_march".$i."_label"}:"";
+            $march_label=(isset($p_array["e_march".$i."_label"]))?$p_array["e_march".$i."_label"]:"";
 
             // retrieve the tva label and name
             //--
@@ -291,7 +279,7 @@ class Pre_op_ven extends Pre_operation_detail
                 $march_label=$fMarch->strAttribut(ATTR_DEF_NAME);
                 if ( $flag_tva=='Y')
                 {
-                    if ( ! (isset(${"e_march$i"."_tva_id"})))
+                    if ( ! (isset($p_array["e_march$i"."_tva_id"])))
                         $march_tva_id=$fMarch->strAttribut(ATTR_DEF_TVA);
                 }
             }
@@ -385,7 +373,7 @@ class Pre_op_ven extends Pre_operation_detail
             }
             // quantity
             //--
-            $quant=(isset(${"e_quant$i"}))?${"e_quant$i"}:"1"
+            $quant=(isset($p_array["e_quant$i"]))?$p_array["e_quant$i"]:"1"
                    ;
             $Quantity=new INum();
             $Quantity->setReadOnly(false);
diff --git a/include/class/pre_operation.class.php b/include/class/pre_operation.class.php
index 8243b58bb..28a35f40e 100644
--- a/include/class/pre_operation.class.php
+++ b/include/class/pre_operation.class.php
@@ -34,19 +34,29 @@ require_once NOALYSS_INCLUDE.'/class/pre_op_ven.class.php';
 require_once NOALYSS_INCLUDE.'/class/pre_op_advanced.class.php';
 class Pre_operation
 {
-    var $db;						/*!< $db database connection */
-    var $nb_item;					/*!< $nb_item nb of item */
-    var $p_jrn;					/*!< $p_jrn jrn_def_id */
-    var $jrn_type;					/*!< $jrn_type */
-    var $name;						/*!< $name name of the predef. operation */
-    var $detail;                /*!< Pre_operation_detail */
-
+    private $db;						/*!< $db database connection */
+    private  $nb_item;					/*!< $nb_item nb of item */
+    private  $p_jrn;					/*!< $p_jrn jrn_def_id */
+    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 */
+    private  $od_id;         /*!< id of the Predefined Operation */
+    private $isloaded;
+    private $description; /*!< description of the predefined operation */
     function __construct($cn,$p_id=0)
     {
         $this->db=$cn;
-        $this->od_direct='false';
+        $this->od_direct='f';
         $this->od_id=$p_id;
+        $this->p_jrn=0;
+        $this->jrn_type='x';
+        $this->name='';
+        $this->isloaded=false;
+        $this->description="";
+
     }
+
     /**
      * @brief Propose to save the operation into a predefined operation
      * @return HTML  string
@@ -56,7 +66,7 @@ class Pre_operation
         $r.= '<p class="decale">';
         $r.= _("Donnez un nom pour sauver cette opération comme modèle")." <br>";
         $opd_name = new IText('opd_name');
-        $r.= "Nom du modèle " . $opd_name->input();
+        $r.=_( "Nom du modèle " ) . $opd_name->input();
         $opd_description=new ITextarea('od_description');
         $opd_description->style=' class="itextarea" style="width:30em;height:4em;vertical-align:top"';
         $r.='</p>';
@@ -67,6 +77,21 @@ class Pre_operation
         $r.='</p>';
         return $r;
     }
+    /**
+     * @return string
+     */
+    public function get_description()
+    {
+        return $this->description;
+    }/**
+     * @param string $description
+     */
+    public function set_description($description)
+    {
+        $this->description = $description;
+        return $this;
+    }
+
 
     /*!\brief fill the object with the $_POST variable */
     function get_post()
@@ -77,29 +102,55 @@ class Pre_operation
         $this->jrn_type=$http->post('jrn_type');
 	    $this->name=$http->post('opd_name');
 
-        $this->name=(trim($this->name)=='')?$http->post('e_comm'):$this->name;
         $this->description= $http->post('od_description');
         if ( $this->name=="")
         {
             $n=$this->db->get_next_seq('op_def_op_seq');
             $this->name=$this->jrn_type.$n;
-            // common value
+
         }
+
+        // get also info for the details
+        // common value
+        $this->detail=Pre_operation_detail::build_detail($this->jrn_type,$this->db);
+        $this->detail->get_post();
     }
+
+    /**
+     * delete a template operation and children
+     */
     function delete ()
     {
         $sql="delete from op_predef where od_id=$1";
         $this->db->exec_sql($sql,array($this->od_id));
     }
+    function save()
+    {
+        if ($this->od_id  < 1) {
+            $this->save_insert();
+        } else {
+            $this->save_update();
+        }
+
+    }
+    function save_update()
+    {
+        $sql = "update op_predef set jrn_def_id = $1 , od_name = $2 , 
+                        od_item =$3, od_description = $4 where od_id=$5";
+        $this->db->exec_sql($sql,array($this->p_jrn,$this->name,$this->nb_item,$this->description,$this->od_id));
+        // delete detail&
+        $this->db->exec_sql("delete from op_predef_detail where od_id = $1",array($this->od_id));
+        $this->detail->save($this->od_id,$this->nb_item);
+    }
     /*!\brief save the predef check first is the name is unique
      * \return true op.success otherwise false
      */
-    function save()
+    function save_insert()
     {
 
         if (	$this->db->count_sql("select * from op_predef ".
                                   "where upper(od_name)=upper('".Database::escape_string($this->name)."')".
-                                  "and jrn_def_id=".$this->p_jrn)
+                                  "and jrn_def_id=".$this->p_jrn." and od_id <> ".$this->od_id)
                 != 0 )
         {
             $this->name="copy_".$this->name."_".microtime(true);
@@ -109,24 +160,44 @@ class Pre_operation
             echo '<span class="notice">'.("Vous avez atteint le max. d'opération prédéfinie, désolé").'</span>';
             return false;
         }
-        $sql='insert into op_predef (jrn_def_id,od_name,od_item,od_jrn_type,od_direct,od_description)'.
-                     'values'.
-                     "($1,$2,$3,$4,$5  ,$6               )";
-        $this->db->exec_sql($sql,array($this->p_jrn,
-                     $this->name,
-                     $this->nb_item,
-                     $this->jrn_type,
-                     $this->od_direct,
-                     $this->description,
+        try {
+            $this->db->start();
+            $sql='insert into op_predef (jrn_def_id,od_name,od_item,od_jrn_type,od_direct,od_description)'.
+                'values'.
+                "($1,$2,$3,$4,$5  ,$6               )";
+            $this->db->exec_sql($sql,array($this->p_jrn,
+                $this->name,
+                $this->nb_item,
+                $this->jrn_type,
+                $this->od_direct,
+                $this->description,
             ));
-        $this->od_id=$this->db->get_current_seq('op_def_op_seq');
+            $this->od_id=$this->db->get_current_seq('op_def_op_seq');
+
+
+           // $this->detail=Pre_operation_detail::build_detail($this->jrn_type,$this->db);
+            $this->detail->save($this->od_id,$this->nb_item);
+            $this->db->commit();
+        } catch (Exception $e) {
+            record_log("PROP139.Failed save predefined operation ");
+            $this->db->rollback();
+        }
+
         return true;
     }
     /*!\brief load the data from the database and return an array
-     * \return an array
+     * \return an double array containing all the data from database
      */
     function load()
     {
+        $this->isloaded=true;
+        //------------------------------------------
+        // if new , then od_id == 0 and we need to use blank()
+        //------------------------------------------
+        if ($this->od_id == -1 ) {
+            $array=$this->blank($this->p_jrn);
+            return  $array;
+        }
         $sql="select od_id,jrn_def_id,od_name,od_item,od_jrn_type,od_description".
              " from op_predef where od_id=$1 ".
              " order by od_name";
@@ -135,27 +206,41 @@ class Pre_operation
         foreach (array('jrn_def_id','od_name','od_item','od_jrn_type','od_description') as $field) {
             $this->$field=$array[0][$field];
         }
-        switch ($this->od_jrn_type) {
-            case 'ACH':
-                $this->detail=new Pre_op_ach($this->db);
-                break;
-            case 'VEN':
-                $this->detail=new Pre_Op_ven($this->db);
-                break;
-            case 'ODS':
-                $this->detail=new Pre_op_advanced($this->db);
-                break;
-            default:
-                throw new Exception(sprintf(_('Echec PreOperatoin chargement %s'),$this->od_jrn_type));
-          }
-        $this->detail->set_od_id($this->od_id);
-        $this->detail->jrn_def_id=$this->jrn_def_id;
-        
+        $this->detail = Pre_operation_detail::build_detail($this->od_jrn_type, $this->db);
+        $array+=$this->detail->load($this->od_id);
         return $array;
     }
+    /**
+     * create a blank object to insert it later
+     * @param $p_ledger_id
+     * @throws Exception
+     */
+    function blank($p_ledger_id) {
+        $array["od_id"]=-1;
+        $array['jrn_def_id']=$p_ledger_id;
+        $array['od_name']="";
+        $array['od_item']=2;
+        $array['od_jrn_type']=$this->db->get_value("select jrn_def_type from jrn_def where jrn_def_id=$1",[$p_ledger_id]);
+        $array['od_description']="";
+        foreach (array('jrn_def_id','od_name','od_item','od_jrn_type','od_description') as $field) {
+            $this->$field=$array[$field];
+        }
+        $this->od_jrn_type=$array['od_jrn_type'];
+
+        $this->detail = Pre_operation_detail::build_detail($this->od_jrn_type, $this->db);
+        $this->detail->set_od_id(0);
+        $this->detail->set_jrn($p_ledger_id);
+
+        return $array;
+    }
+
     function compute_array()
     {
-        $p_array=$this->load();
+        if ($this->od_id > 0) {
+            $p_array = $this->load();
+        } else {
+            $p_array=$this->blank($this->p_jrn);
+        }
         $array=array(
                    "e_comm"=>$p_array[0]["od_name"],
                    "nb_item"=>(($p_array[0]["od_item"]<10)?10:$p_array[0]["od_item"])   ,
@@ -163,6 +248,8 @@ class Pre_operation
                    "jrn_type"=>$p_array[0]["od_jrn_type"],
                    "od_description"=>$p_array['0']['od_description']
                );
+        $this->detail = Pre_operation_detail::build_detail($this->od_jrn_type, $this->db);
+        $array += $this->detail->compute_array($this->od_id);
         return $array;
 
     }
@@ -187,9 +274,9 @@ class Pre_operation
     function count()
     {
         $a=$this->db->count_sql("select od_id,od_name from op_predef ".
-                                " where jrn_def_id=".$this->p_jrn.
-                                " and od_direct ='".$this->od_direct."'".
-                                " order by od_name");
+                                " where jrn_def_id= $1 ".
+                                " and od_direct = $2 ".
+                                " order by od_name",array($this->p_jrn,$this->od_direct));
         return $a;
     }
     /*!\brief get the list of the predef. operation of a ledger
@@ -198,21 +285,14 @@ class Pre_operation
     function get_list_ledger()
     {
         $sql="select od_id,od_name,od_description from op_predef ".
-             " where jrn_def_id=".$this->p_jrn.
-             " and od_direct ='".$this->od_direct."'".
+             " where jrn_def_id= $1 ".
+             " and od_direct = $2 ".
              " order by od_name";
-        $res=$this->db->exec_sql($sql);
+        $res=$this->db->exec_sql($sql,array($this->p_jrn,$this->od_direct));
         $all=Database::fetch_all($res);
         return $all;
     }
-    /*!\brief set the ledger
-     * \param $p_jrn is the ledger (jrn_id)
-     */
-    function set_jrn($p_jrn)
-    {
-        $this->p_jrn=$p_jrn;
-    }
-   
+
     /**
      * 
      * @brief display the detail of predefined operation, normally everything 
@@ -220,67 +300,43 @@ class Pre_operation
      */
     function display() 
     {
-        $array=$this->detail->compute_array();
+        $array=$this->compute_array();
+        require NOALYSS_TEMPLATE."/pre_operation_display.php";
         echo $this->detail->display($array);
     }
-}
-
-/*!\brief mother of the pre_op_XXX, it contains only one data : an
- * object Pre_Operation. The child class contains an array of
- * Pre_Operation object
- */
-class Pre_operation_detail
-{
-    var $operation;
-    function __construct($p_cn,$p_id=0)
-    {
-        $this->db=$p_cn;
-        $this->operation=new Pre_operation($this->db);
-        $this->valid=array('ledger'=>'jrn_def_id','ledger_type'=>'jrn_type','direct'=>'od_direct');
-		$this->jrn_def_id=-1;
-    }
-
-
     /*!\brief show a form to use pre_op
-     */
+  */
     function form_get ($p_url)
     {
-        $r=HtmlInput::button_action(_("Modèle d'opérations"), ' $(\'modele_op_div\').style.display=\'block\';if ( $(\'lk_modele_op_tab\')) { $(\'lk_modele_op_tab\').focus();}');
+        $r=HtmlInput::button_action(_("Modèle d'opérations"),
+            ' $(\'modele_op_div\').style.display=\'block\';if ( $(\'lk_modele_op_tab\')) { $(\'lk_modele_op_tab\').focus();}');
         $r.='<div id="modele_op_div" class="noprint">';
         $r.=HtmlInput::title_box(_("Modèle d'opérations"), 'modele_op_div', 'hide',"","n");
         $hid=new IHidden();
         $r.=$hid->input("action","use_opd");
-        $r.=$hid->input("jrn_type",$this->get("ledger_type"));
-        $r.= $this->show_button($p_url);
+        $r.=$hid->input("jrn_type",$this->jrn_type);
+        $r.= $this->display_list_operation($p_url);
         $r.=' <p style="text-align: center">'.
-        HtmlInput::button_hide('modele_op_div').
-        '</p>';
+            HtmlInput::button_hide('modele_op_div').
+            '</p>';
         $r.='</div>';
         return $r;
 
     }
-    /*!\brief count the number of pred operation for a ledger */
-    function count()
-    {
-        $a=$this->db->count_sql("select od_id,od_name from op_predef ".
-                                " where jrn_def_id=".$this->jrn_def_id.
-                                " and od_direct ='".$this->od_direct."'".
-                                " order by od_name");
-        return $a;
-    }
+
     /*!\brief show the button for selecting a predefined operation */
-    function show_button($p_url)
+    function display_list_operation($p_url)
     {
-        
-        
+
+
         $value=$this->db->get_array("select od_id,od_name,od_description from op_predef ".
-                                     " where jrn_def_id=$1".
-                                     " and od_direct =$2".
-                                     " order by od_name",
-                            array($this->jrn_def_id,$this->od_direct ));
-        
-        if ( $this->jrn_def_id=='') $value=array();
-        
+            " where jrn_def_id=$1".
+            " and od_direct =$2".
+            " order by od_name",
+            array($this->p_jrn,$this->od_direct ));
+
+        if ( $this->p_jrn=='') $value=array();
+
         $r="";
         if (count($value)==0) {
             $r.=_("Vous n'avez encore sauvé aucun modèle");
@@ -292,7 +348,7 @@ class Pre_operation_detail
             $r.='<tr class="'.(($i%2==0)?"even":"odd").'">';
             $r.='<td style="font-weight:bold;vertical-align:top;text-decoration:underline">';
             $r.=sprintf('<a href="%s&pre_def=%s" onclick="waiting_box()">%s</a> ',
-                    $p_url,$value[$i]['od_id'],$value[$i]['od_name']);
+                $p_url,$value[$i]['od_id'],$value[$i]['od_name']);
             $r.='</td>';
             $r.='<td>'.h($value[$i]['od_description']).'</td>';
             $r.='</tr>';
@@ -302,38 +358,181 @@ class Pre_operation_detail
     }
     public function   get_operation()
     {
-		if ( $this->jrn_def_id=='') return array();
+        if ( $this->jrn_def_id=='') return array();
         $value=$this->db->make_array("select od_id,od_name from op_predef ".
-                                     " where jrn_def_id=".sql_string($this->jrn_def_id).
-                                     " and od_direct ='".sql_string($this->od_direct)."'".
-                                     " order by od_name",1);
+            " where jrn_def_id=".sql_string($this->jrn_def_id).
+            " and od_direct ='".sql_string($this->od_direct)."'".
+            " order by od_name",1);
         return $value;
     }
-    function set($p_param,$value)
-    {
-        if ( ! isset ($this->valid[$p_param] ) )
-        {
-            $msg=_(" le parametre $p_param n'existe pas ".__FILE__.':'.__LINE__);
-            throw new Exception($msg);
-        }
-        $attr=$this->valid[$p_param];
-        $this->$attr=$value;
-    }
-    function get($p_param)
-    {
 
-        if ( ! isset ($this->valid[$p_param] ) )
-        {
-            $msg=_(" le parametre $p_param n'existe pas ".__FILE__.':'.__LINE__);
-            throw new Exception($msg);
-        }
-        $attr=$this->valid[$p_param];
-        return $this->$attr;
+    /**
+     * @return mixed
+     */
+    public function get_db()
+    {
+        return $this->db;
+        return $this;
     }
 
-    function get_post()
+    /**
+     * @param mixed $db
+     */
+    public function set_db($db)
     {
-        $this->operation->get_post();
+        $this->db = $db;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function get_nb_item()
+    {
+        return $this->nb_item;
+        return $this;
+    }
+
+    /**
+     * @param mixed $nb_item
+     */
+    public function set_nb_item($nb_item)
+    {
+        $this->nb_item = $nb_item;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function get_jrn_type()
+    {
+        return $this->jrn_type;
+        return $this;
+    }
+
+    /**
+     * @param string $jrn_type
+     */
+    public function set_jrn_type($jrn_type)
+    {
+        if ( ! in_array ($jrn_type,['ACH','FIN','VEN','ODS'] )) throw new Exception('prop03.invalid ledger type');
+        $this->jrn_type = $jrn_type;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function get_name()
+    {
+        return $this->name;
+        return $this;
+    }
+
+    /**
+     * @param string $name
+     */
+    public function set_name($name)
+    {
+        $this->name = $name;
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function get_detail()
+    {
+        return $this->detail;
+        return $this;
+    }
+
+    /**
+     * @param array $detail
+     */
+    public function set_detail(Pre_operation_detail $detail)
+    {
+        $this->detail = $detail;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function get_od_direct()
+    {
+        return $this->od_direct;
+        return $this;
+    }
+
+    /**
+     * @param string $od_direct
+     */
+    public function set_od_direct($od_direct)
+    {
+        if ( !   in_array($od_direct,['f','t']))  throw new Exception('prop02.invalid od_direct');
+        $this->od_direct = $od_direct;
+        return $this;
+    }
+
+    /**
+     * @return int|mixed
+     */
+    public function get_od_id()
+    {
+        return $this->od_id;
+    }
+
+    /**
+     * @param int|mixed $od_id
+     */
+    public function set_od_id($od_id)
+    {
+        $this->od_id = $od_id;
+        return $this;
+    }
+
+
+    /*!\brief set the ledger
+     * \param $p_jrn is the ledger (jrn_id)
+     */
+    function set_p_jrn($p_jrn)
+    {
+        $this->p_jrn=$p_jrn;
+        $this->jrn_type=$this->db->get_value("select jrn_def_type from jrn_def where jrn_def_id=$1",[$p_jrn]);
+        return $this;
+    }
+}
+
+/*!\brief mother of the pre_op_XXX, it contains only one data : an
+ * object Pre_Operation. The child class contains an array of
+ * Pre_Operation object
+ */
+class Pre_operation_detail
+{
+    function __construct($p_cn)
+    {
+        $this->db=$p_cn;
+
+    }
+
+    static function build_detail($p_jrn_type,Database $database)
+    {
+        switch ($p_jrn_type) {
+            case 'ACH':
+                $detail=new Pre_op_ach($database);
+                break;
+            case 'VEN':
+                $detail=new Pre_Op_ven($database);
+                break;
+            case 'ODS':
+                $detail=new Pre_op_advanced($database);
+                break;
+            default:
+                throw new Exception(sprintf(_('Echec PreOperatoin chargement %s'),$p_jrn_type));
+        }
+        return $detail;
     }
 
 }
diff --git a/include/compta_ach.inc.php b/include/compta_ach.inc.php
index 65f3d3fa5..2059cf74c 100644
--- a/include/compta_ach.inc.php
+++ b/include/compta_ach.inc.php
@@ -27,7 +27,7 @@
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 require_once NOALYSS_INCLUDE.'/lib/icheckbox.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_ledger_purchase.class.php';
-require_once  NOALYSS_INCLUDE.'/class/pre_op_ach.class.php';
+require_once  NOALYSS_INCLUDE.'/class/pre_operation.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ipopup.class.php';
 $gDossier = dossier::id();
 global $g_parameter;
@@ -153,7 +153,7 @@ if (isset($_POST['record']))
 		/* Save the predefined operation */
                 if ( isset($_POST['opd_name']) && trim($_POST['opd_name']) != "" )
 		{
-			$opd = new Pre_op_ach($cn);
+			$opd = new Pre_operation($cn);
 			$opd->get_post();
 			$opd->save();
 		}
@@ -265,7 +265,7 @@ try
         // used a predefined operation
         $predef=$http->request("pre_def","string", "0");
         $p_jrn_predef=$http->request("p_jrn_predef","string", "0");
-        $op=new Pre_op_ach($cn);
+        $op=new Pre_operation($cn);
         $op->set_od_id($predef);
         $p_post=$op->compute_array();
         $Ledger->id=$p_jrn_predef;
diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php
index bd3f9c1a1..bbb76ed45 100644
--- a/include/compta_ven.inc.php
+++ b/include/compta_ven.inc.php
@@ -25,7 +25,7 @@
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 require_once NOALYSS_INCLUDE.'/lib/icheckbox.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_ledger_sold.class.php';
-require_once  NOALYSS_INCLUDE.'/class/pre_op_ven.class.php';
+require_once  NOALYSS_INCLUDE.'/class/pre_operation.class.php';
 require_once  NOALYSS_INCLUDE.'/class/document.class.php';
 require_once  NOALYSS_INCLUDE.'/class/acc_ledger_info.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ipopup.class.php';
@@ -171,7 +171,7 @@ show_tabs(a_tab,'facturation_div_id');
             /* Save the predefined operation */
             if ( isset($_POST['opd_name']) && trim($_POST['opd_name']) != "" )
             {
-                $opd=new Pre_op_ven($cn);
+                $opd=new Pre_operation($cn);
                 $opd->get_post();
                 $opd->save();
             }
@@ -253,22 +253,14 @@ if (!isset($_REQUEST ['p_jrn']))
     $Ledger->id=$def_ledger['jrn_def_id'];
 }
 else
-    $Ledger->id=$_REQUEST ['p_jrn'];
+    $Ledger->id=$http->request('p_jrn');
+
 if (isset($_REQUEST['p_jrn_predef']))
 {
-    $Ledger->id=$_REQUEST['p_jrn_predef'];
+    $Ledger->id=$http->request('p_jrn_predef');
 }
 
-/* echo '<div id="predef_form">';
-echo HtmlInput::hidden('p_jrn_predef', $Ledger->id);
-$op=new Pre_op_ven($cn);
-$op->set('ledger',$Ledger->id);
-$op->set('ledger_type',"VEN");
-$op->set('direct','f');
-$url=http_build_query(array('p_jrn_predef'=>$Ledger->id,'ac'=>$_REQUEST['ac'],'gDossier'=>dossier::id()));
-echo $op->form_get('do.php?'.$url);
-echo '</div>';
-*/
+
 echo '<div class="content">';
 if ( $p_msg !="" ) echo '<span class="warning">'.$p_msg.'</span>';
 try
@@ -284,10 +276,10 @@ try
     {
         // used a predefined operation
         //
-       $op=new Pre_op_ven($cn);
-        $op->set_od_id($_REQUEST['pre_def']);
+       $op=new Pre_operation($cn);
+        $op->set_od_id($http->request('pre_def'));
         $p_post=$op->compute_array();
-        $Ledger->id=$_REQUEST ['p_jrn_predef'];
+        $Ledger->id=$http->request('p_jrn_predef');
 
         echo $Ledger->input($p_post);
         echo '<div class="content">';
diff --git a/include/database/op_predef_sql.class.php b/include/database/op_predef_sql.class.php
new file mode 100644
index 000000000..8ae979c52
--- /dev/null
+++ b/include/database/op_predef_sql.class.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Autogenerated file
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
+
+
+/**
+ * class_op_predef_sql.php
+ *
+ *@file
+ *@brief abstract of the table public.op_predef */
+class Op_predef_SQL extends Noalyss_SQL
+{
+
+    function __construct(Database $p_cn,$p_id=-1)
+    {
+        $this->table = "public.op_predef";
+        $this->primary_key = "od_id";
+        /*
+         * List of columns
+         */
+        $this->name=array(
+            "od_id"=>"od_id"
+        ,"jrn_def_id"=>"jrn_def_id"
+        ,"od_name"=>"od_name"
+        ,"od_item"=>"od_item"
+        ,"od_jrn_type"=>"od_jrn_type"
+        ,"od_direct"=>"od_direct"
+        ,"od_description"=>"od_description"
+        );
+        /*
+         * Type of columns
+         */
+        $this->type = array(
+            "od_id"=>"numeric"
+        ,"jrn_def_id"=>"numeric"
+        ,"od_name"=>"text"
+        ,"od_item"=>"numeric"
+        ,"od_jrn_type"=>"text"
+        ,"od_direct"=>"boolean"
+        ,"od_description"=>"text"
+        );
+
+
+        $this->default = array(
+            "od_id" => "auto"
+        );
+
+        $this->date_format = "DD.MM.YYYY";
+        parent::__construct($p_cn,$p_id);
+    }
+
+
+}
\ No newline at end of file
diff --git a/include/operation_ods_new.inc.php b/include/operation_ods_new.inc.php
index bad4da0bc..c1067321c 100644
--- a/include/operation_ods_new.inc.php
+++ b/include/operation_ods_new.inc.php
@@ -25,7 +25,8 @@
  * \brief to write into the ledgers ODS a new operation
  */
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-require_once NOALYSS_INCLUDE.'/class/pre_op_ods.class.php';
+require_once  NOALYSS_INCLUDE.'/class/pre_operation.class.php';
+
 require_once NOALYSS_INCLUDE.'/lib/iconcerned.class.php';
 
 global $g_user,$g_parameter;
@@ -59,7 +60,7 @@ if ( isset ($_GET['action']) && ! isset($_POST['correct']) && ! isset($correct)
 	if ( $_GET['action']=='use_opd')
 	{
             // get data from predef. operation
-            $op=new Pre_op_advanced($cn);
+            $op=new Pre_operation($cn);
             $p_post=null;
             if ( isset($_REQUEST['pre_def']) && $_REQUEST['pre_def'] != '')
             {
diff --git a/include/preod.inc.php b/include/preod.inc.php
index f0bff977f..d12041cf0 100644
--- a/include/preod.inc.php
+++ b/include/preod.inc.php
@@ -22,105 +22,17 @@
 /*!\file
  * \brief included file for managing the predefined operation
  */
+require_once NOALYSS_INCLUDE.'/class/operation_predef_mtable.class.php';
+
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-require_once NOALYSS_INCLUDE.'/lib/iselect.class.php';
-require_once NOALYSS_INCLUDE.'/lib/icheckbox.class.php';
-require_once NOALYSS_INCLUDE.'/lib/ihidden.class.php';
-require_once NOALYSS_INCLUDE.'/class/database.class.php';
-require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
-require_once NOALYSS_INCLUDE.'/class/pre_operation.class.php';
 global $http;
-/*
- * Value from $_GET or $_REQUEST
- */
-$request_jrn=$http->request("jrn","string", -1);
-$request_ac=$http->request("ac","string", "");
-$request_sa=$http->request("sa","string", "");
-$get_jrn=$http->get('jrn',"string",-1);
 
-echo '<div class="content">';
-echo '<form method="GET">';
-$sel=new ISelect();
-$sel->name="jrn";
-$sel->value=$cn->make_array("select jrn_def_id,jrn_def_name from ".
-                            " jrn_def where jrn_def_type in ('VEN','ACH','ODS') order by jrn_def_name");
-// Show a list of ledger
-$sel->selected=$request_jrn;
-echo 'Choisissez un journal '.$sel->input();
+$prd_op=new Op_predef_SQL($cn);
 
-echo dossier::hidden();
-$hid=new IHidden();
-echo $hid->input("sa","jrn");
-echo $hid->input("ac",$request_ac);
-echo '<hr>';
-echo HtmlInput::submit('Accepter','Accepter');
-echo '</form>';
-
-// if $_REQUEST[sa] == del delete the predefined operation
-if ( $request_sa == 'del')
-{
-    $op=new Pre_operation($cn);
-    $http=new HttpInput();
-    $op->od_id=$http->request('od_id',"string",-1);
-    if (isNumber($op->od_id)==1 && $op->od_id != -1 )
-    {
-        $op->delete();
-    }
-    $request_sa='jrn';
-}
-
-// if $_REQUEST[sa] == jrn show the  predefined operation for this
-// ledger
-if ( $request_sa== 'jrn' )
-{
-    $op=new Pre_operation($cn);
-    $op->set_jrn($get_jrn);
-   $is_ods = $cn->get_value("select count(*)
-		from jrn_def where
-			jrn_def_id=$1
-			and jrn_def_type='ODS'", array($get_jrn));
-	$op->od_direct = ($is_ods > 0) ? 't' : 'f';
-	$array = $op->get_list_ledger();
-	if (empty($array) == true)
-    {
-        echo _("Aucun enregistrement");
-        return;
-    }
-    echo HtmlInput::filter_table('preod_table', '0', 0);
-    echo '<table id="preod_table">';
-    $count=0;
-    foreach ($array as $row )
-    {
-
-      if ( $count %2 == 0 )
-            echo '<tr class="odd">';
-        else
-            echo '<tr class="even">';
-      $count++;
-
-        echo '<td>'.h($row['od_name']).'</td>';
-        echo '<td>'.h($row['od_description']).'</td>';
-        echo '<td>';
-	echo '<form method="POST" id="preod_frm'.$row['od_id'].'" class="print" style="margin:0px;padding:0px;">';
-        echo dossier::hidden();
-        echo HtmlInput::hidden("sa","del");
-        echo HtmlInput::hidden("ac",$request_ac);
-        echo HtmlInput::hidden("del","");
-        echo HtmlInput::hidden("od_id",$row['od_id']);
-        echo HtmlInput::hidden("jrn",$get_jrn);
-
-	$b='<input type="submit" class="smallbutton" value="'._("Effacer").'"'.
-	  ' onClick="return confirm_box(\'preod_frm'.$row['od_id'].'\',\''._("Voulez-vous vraiment effacer cette operation ?").'\');" >';
-	   echo $b;
-	   echo '</form>';
-
-        echo '</td>';
-	$b=HtmlInput::button('mod'.$row['od_id'],"Modifier","onclick=\"mod_predf_op('".dossier::id()."','".$row['od_id']."');\"");
-	echo td($b);
-        echo '</tr>';
-
-    }
-    echo '</table>';
-}
-echo '</div>';
-?>
+$operation_predef_mtable=new Operation_Predef_MTable($prd_op);
+$operation_predef_mtable->set_json(json_encode(array(   "ac"=>$http->request("ac"),
+                                                        "op"=>"save_predf",
+                                                        "gDossier"=>Dossier::id()
+                                                     )));
+$operation_predef_mtable->create_js_script();
+$operation_predef_mtable->display_table();
\ No newline at end of file
diff --git a/include/template/pre_operation_display.php b/include/template/pre_operation_display.php
new file mode 100644
index 000000000..8de218bd2
--- /dev/null
+++ b/include/template/pre_operation_display.php
@@ -0,0 +1,36 @@
+<?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+// Copyright Author Dany De Bontridder danydb@aevalys.eu
+
+/**
+ * @file
+ * display pre_operation value
+ */
+
+$name=new IText("opd_name",$array["e_comm"]);
+$description=new IText("od_description",$array["od_description"]);
+$description->style=' class="itextarea" style="width:30em;height:4em;vertical-align:top"';
+
+?>
+<?php echo _("Nom du modèle"),$name->input();?>
+<p>
+    <?php echo  _('Description (max 50 car.)'); ?>
+    <?php echo $description->input();?>
+</p>
diff --git a/include/template/predf_ledger_detail.php b/include/template/predf_ledger_detail.php
index a3cdd8f8a..dfcfbb197 100644
--- a/include/template/predf_ledger_detail.php
+++ b/include/template/predf_ledger_detail.php
@@ -5,12 +5,13 @@
 <legend><?php echo $f_legend ?>
 </legend>
 <?php echo $f_type?><?php echo $f_client_qcode?><?php echo $f_client_bt?> <?php echo $f_client?><br>
-<input type="hidden" id="p_jrn" name="p_jrn" value="<?php echo $this->jrn_def_id; ?>">    
+<input type="hidden" id="p_jrn" name="p_jrn" value="<?php echo $p_array["p_jrn"]; ?>">
 <?php echo $str_add_button?>
 </fieldset>
 
-<fieldset>
-<legend><?php echo $f_legend_detail?></legend>
+<div class="fieldset" style="overflow:auto;max-height:300px">
+<h1 class="fiedset"><?php echo $f_legend_detail?></h1>
+    <div style="">
 <table id="sold_item" width="100%" border="0">
 <tr>
 <th style="width:auto"colspan="2">Code <?php echo Icon_Action::infobulle(0)?></th>
@@ -79,6 +80,6 @@ echo '</tr>';
 <?php endif; ?>
 </div>
 
-</fieldset>
+</div>
 
 

From 0982ee1c4abcca2cb235fef754c966eb93ab637f Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Sun, 27 Sep 2020 10:55:59 +0200
Subject: [PATCH 036/257] javascript : add function to concat 2 json objects

---
 html/js/managetable.js |  5 +++--
 html/js/scripts.js     | 21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/html/js/managetable.js b/html/js/managetable.js
index d67e77402..3d5d15f81 100644
--- a/html/js/managetable.js
+++ b/html/js/managetable.js
@@ -189,18 +189,19 @@ var ManageTable = function (p_table_name)
      * set
      */
     this.save = function (form_id) {
+        var param_form={};
         waiting_box();
         try {
             this.param['action'] = 'save';
             var form = $(form_id).serialize(true);
-            this.param_add(form);
+            param_form = json_concat(this.param,form);
             var here=this; 
           } catch (e) {
             alert(e.message);
             return false;
           }
         new Ajax.Request(this.callback, {
-            parameters: this.param,
+            parameters: param_form,
             method: "post",
             onSuccess: function (req) {
                 try {
diff --git a/html/js/scripts.js b/html/js/scripts.js
index 959788c22..4451f8349 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -3673,3 +3673,24 @@ function toggle_row_warning_enable(p_enable, p_row)
         $(p_row).hide();
     }
 }
+
+/**
+ * return a json object which is the merge of the 2 json objects
+ *
+ * @param p_json1 object 1 to merge
+ * @param p_json2 object 2 to merge
+ * @returns new json object
+ */
+function json_concat(p_json1,p_json2)
+{
+
+        var result = {};
+        for (var key in p_json1) {
+            result[key] = p_json1[key];
+        }
+        for (var key in p_json2) {
+            result[key] = p_json2[key];
+        }
+        return result;
+
+}
\ No newline at end of file

From 232fd902fe9edfc4d608422b70166dffc6a8f188 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Sun, 27 Sep 2020 11:08:33 +0200
Subject: [PATCH 037/257] javascript: remove hardcoding of dialog box for 
 manage_table

---
 html/js/managetable.js                 |  8 +++++--
 html/js/scripts.js                     |  2 +-
 include/ajax/ajax_save_predf_op.php    | 10 +++++++--
 include/lib/manage_table_sql.class.php | 31 ++++++++++++++++++++++----
 4 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/html/js/managetable.js b/html/js/managetable.js
index 3d5d15f81..916ba0e98 100644
--- a/html/js/managetable.js
+++ b/html/js/managetable.js
@@ -87,6 +87,10 @@ var ManageTable = function (p_table_name)
       
       this.sort_column=p_column;
     };
+
+    this.set_dialog_box=function (p_dialog_box){
+        this.control=p_dialog_box;
+    }
     /**
      * Insert the row a the right location
      * @param {type} p_element_row DOMElement TR
@@ -225,12 +229,12 @@ var ManageTable = function (p_table_name)
                     new Effect.Highlight(answer['ctl_row'] ,{startcolor: '#FAD4D4',endcolor: '#F78082' });
                     alternate_row_color("tb"+answer['ctl']);
                     remove_waiting_box();
-                    $("dtr").hide();
+                    $(here.control).hide();
                     
                 } else {
                     remove_waiting_box();
                     smoke.alert(content[48]);
-                    $("dtr").update(answer['html']);
+                    $(here.control).update(answer['html']);
                    
                 }
             }
diff --git a/html/js/scripts.js b/html/js/scripts.js
index 4451f8349..3bd5e758e 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -3676,7 +3676,7 @@ function toggle_row_warning_enable(p_enable, p_row)
 
 /**
  * return a json object which is the merge of the 2 json objects
- *
+ * from 2015 : Object.assign(obj1, obj2);
  * @param p_json1 object 1 to merge
  * @param p_json2 object 2 to merge
  * @returns new json object
diff --git a/include/ajax/ajax_save_predf_op.php b/include/ajax/ajax_save_predf_op.php
index c84830ffe..4286d1db7 100644
--- a/include/ajax/ajax_save_predf_op.php
+++ b/include/ajax/ajax_save_predf_op.php
@@ -56,8 +56,14 @@ $operation_predef_mtable->set_callback("ajax_misc.php");
 
 if ($action=="input")
 {
-    header('Content-type: text/xml; charset=UTF-8');
-    echo $operation_predef_mtable->ajax_input()->saveXML();
+    if ($p_id == -1 ) {
+        // new operation to insert
+
+    } else {
+        // display existing operation for updating
+        header('Content-type: text/xml; charset=UTF-8');
+        echo $operation_predef_mtable->ajax_input()->saveXML();
+    }
     return;
 }
 elseif ($action == "save")
diff --git a/include/lib/manage_table_sql.class.php b/include/lib/manage_table_sql.class.php
index cd364686b..20479426a 100644
--- a/include/lib/manage_table_sql.class.php
+++ b/include/lib/manage_table_sql.class.php
@@ -71,15 +71,16 @@ class Manage_Table_SQL
     protected $a_prop; //!< property for each col.
     protected $a_type; //!< Type of the column : date , select ... Only in input
     protected $a_select; //!< Possible value if a_type is a SELECT
-    protected $object_name; //!< Object_name is used for the javascript
+    protected $object_name; //!< Object_name is used for the javascript , it is the row id to update or delete
     protected $row_delete; //!< Flag to indicate if rows can be deleted
     protected $row_update; //!< Flag to indicate if rows can be updated
     protected $row_append; //!< Flag to indicate if rows can be added
-    protected $json_parameter; //!< Default parameter to add (gDossier...)
+    protected $json_parameter; //!< Default parameter to add (gDossier...), sent to the ajax callback
     protected $aerror; //!< Array containing the error of the input data
     protected $col_sort; //!< when inserting, it is the column to sort,-1 to disable it and append only
     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
     const UPDATABLE=1;
     const VISIBLE=2;
 
@@ -121,6 +122,7 @@ class Manage_Table_SQL
         $this->col_sort=0;
         // By default no js sort
         $this->sort_column="";
+        $this->dialog_box="dtr";
     }
     /**
      * send the XML headers for the ajax call 
@@ -129,6 +131,25 @@ class Manage_Table_SQL
     {
         header('Content-type:text/xml;charset="UTF-8"');
     }
+
+    /**
+     * @return mixed
+     */
+    public function get_dialog_box()
+    {
+        return $this->dialog_box;
+        return $this;
+    }
+
+    /**
+     * @param mixed $dialog_box
+     */
+    public function set_dialog_box($dialog_box)
+    {
+        $this->dialog_box = $dialog_box;
+        return $this;
+    }
+
     /**
      * When adding an element , it is column we checked to insert before,
      * @return none
@@ -363,6 +384,7 @@ function check()
 		{$this->object_name}.set_callback(\"{$this->callback}\");
 		{$this->object_name}.param_add({$this->json_parameter});
 		{$this->object_name}.set_sort({$this->get_col_sort()});
+		{$this->object_name}.set_control(\"{$this->get_dialog_box()}\");
 		</script>
 
 	";
@@ -1046,9 +1068,10 @@ function check()
         try
         {
             $status=$p_status;
+
             ob_start();
 
-            echo HtmlInput::title_box("Donnée", "dtr","close","","y");
+            echo HtmlInput::title_box("Donnée", $this->dialog_box,"close","","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,
@@ -1058,7 +1081,7 @@ function check()
             echo HtmlInput::json_to_hidden($this->json_parameter);
             echo HtmlInput::hidden("p_id", $this->table->get_pk_value());
             // button Submit and cancel
-            $close=sprintf("\$('%s').remove()", "dtr");
+            $close=sprintf("\$('%s').remove()", $this->dialog_box);
             // display error if any
             $this->display_error();
             echo '<ul class="aligned-block">',

From 6995829b389dc26ef175bc0dc00922b1540071f4 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Tue, 29 Sep 2020 17:06:57 +0200
Subject: [PATCH 038/257] documentation

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

diff --git a/include/lib/database_core.class.php b/include/lib/database_core.class.php
index 2bcba2307..2f7bc3246 100644
--- a/include/lib/database_core.class.php
+++ b/include/lib/database_core.class.php
@@ -611,7 +611,7 @@ class DatabaseCore
      *
      * \param $p_sql  sql statement, only the first two column will be returned in
      *  an array. The first col. is the label and the second the value
-     *  \param $p_null if the array start with a null value
+     *  \param $p_null if the array start with a null value Yes = 1 , No=0
      *  \param $p_array is the array with the bind value
      * \note this function is used with ISelect when it is needed to have a list of
      * options.

From 948f62809de12ecc00b112bcc3a602d8ee8e6fc3 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Tue, 29 Sep 2020 18:04:25 +0200
Subject: [PATCH 039/257] Bug : remove file by error

---
 html/ajax_misc.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index 12c77eb14..2e2e258f3 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -255,7 +255,9 @@ $path = array(
     // Display all cards using an accounting
     "display_all_card"=>"ajax_display_all_card",
     // payment_method
-    "payment_method"=>"ajax_payment_method"
+    "payment_method"=>"ajax_payment_method",
+    // update list of predefined operation if ledger changes
+    "up_predef"=>"ajax_update_predef"
 )    ;
 
 if (array_key_exists($op, $path)) {

From fa3ef8a59cfd0a4e72f6364f37ccc5ba8f9180ee Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Tue, 29 Sep 2020 18:04:56 +0200
Subject: [PATCH 040/257] ManageTable  : you can set the style of the dialog
 box

---
 html/js/managetable.js                 |  7 +++++--
 include/lib/manage_table_sql.class.php | 25 ++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/html/js/managetable.js b/html/js/managetable.js
index 916ba0e98..b6f2795de 100644
--- a/html/js/managetable.js
+++ b/html/js/managetable.js
@@ -74,9 +74,12 @@ 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.sort_column=0;
     this.param = {"table": p_table_name, "ctl_id": this.control}; //<! default value to pass
+    this.set_style=function(p_json) {
+        this.mt_style=p_json;
+    };
     /**
      * Set the sort , 
      * @param {string} p_column  column number start from 0
@@ -308,7 +311,7 @@ var ManageTable = function (p_table_name)
                     var obj = {id: control, "cssclass": "inner_box", "html": loading()};
                     add_div(obj);
                     var pos = calcy(250);
-                    $(obj.id).setStyle({position: "fixed", top:  '15%', width: "auto", "margin-left": "20%"});
+                    $(obj.id).setStyle(here.mt_style);
                     $(obj.id).update(x['html']);
                 } catch (e) {
                     smoke.alert(content[48] + e.message);
diff --git a/include/lib/manage_table_sql.class.php b/include/lib/manage_table_sql.class.php
index 20479426a..20784304a 100644
--- a/include/lib/manage_table_sql.class.php
+++ b/include/lib/manage_table_sql.class.php
@@ -86,7 +86,7 @@ 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;
     /**
      * @brief Constructor : set the label to the column name,
      * the order of the column , set the properties and the
@@ -123,6 +123,7 @@ 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%");
     }
     /**
      * send the XML headers for the ajax call 
@@ -132,6 +133,26 @@ class Manage_Table_SQL
         header('Content-type:text/xml;charset="UTF-8"');
     }
 
+    /**
+     * return the db_style
+     * @return array
+     */
+    public function get_dialogbox_style()
+    {
+        return $this->dialogbox_style;
+    }
+
+    /**
+     * Dialog box style , by default {position: "fixed", top:  '15%', width: "auto", "margin-left": "20%"}
+     *
+     * @param array $db_style , will be transformed into a json object
+     */
+    public function set_dialogbox_style($db_style)
+    {
+        $this->dialogbox_style = $db_style;
+        return $this;
+    }
+
     /**
      * @return mixed
      */
@@ -378,6 +399,7 @@ function check()
      */
     function create_js_script()
     {
+        $style=json_encode($this->dialogbox_style);
         echo "
 		<script>
 		var {$this->object_name}=new ManageTable(\"{$this->table->table}\");
@@ -385,6 +407,7 @@ function check()
 		{$this->object_name}.param_add({$this->json_parameter});
 		{$this->object_name}.set_sort({$this->get_col_sort()});
 		{$this->object_name}.set_control(\"{$this->get_dialog_box()}\");
+		{$this->object_name}.set_style($style);
 		</script>
 
 	";

From 41ade5b70086537c9a905c4748aab9bced28fa49 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Tue, 29 Sep 2020 18:08:26 +0200
Subject: [PATCH 041/257] Rewriting of Predefined Operation. You can add new
 Predefined Operation

---
 html/style-classic.css                        |  9 ++-
 html/style-classic7.css                       |  1 +
 html/style-light.css                          | 17 +++--
 include/ajax/ajax_save_predf_op.php           | 11 ++--
 include/ajax/ajax_update_predef.php           | 10 +--
 .../class/operation_predef_mtable.class.php   | 66 +++++++++++++++++--
 include/class/pre_op_ach.class.php            | 23 +++++--
 include/class/pre_op_advanced.class.php       | 18 ++++-
 include/class/pre_op_ven.class.php            | 15 +++--
 include/class/pre_operation.class.php         | 53 ++++++++++-----
 include/preod.inc.php                         |  8 ++-
 include/template/pre_operation_display.php    |  4 ++
 include/template/predf_ledger_detail.php      |  8 +--
 13 files changed, 189 insertions(+), 54 deletions(-)

diff --git a/html/style-classic.css b/html/style-classic.css
index 0dd8480a1..6874bcbc2 100644
--- a/html/style-classic.css
+++ b/html/style-classic.css
@@ -2433,4 +2433,11 @@ span.title_tab_row {
      background-color: #000066 !important;
      color : white !important;
      
-}
\ No newline at end of file
+}
+
+ /**
+  * dialog box for adding, modifying predefined operation
+  */
+ #prdfop {
+
+ }
\ No newline at end of file
diff --git a/html/style-classic7.css b/html/style-classic7.css
index 56db14ecb..2f2cda926 100644
--- a/html/style-classic7.css
+++ b/html/style-classic7.css
@@ -2473,4 +2473,5 @@ p.info {
     font-size:90%;
     font-family: sans-serif;
     font-style: italic;
+}
 }
\ No newline at end of file
diff --git a/html/style-light.css b/html/style-light.css
index c2b7c88da..6474f1d2d 100644
--- a/html/style-light.css
+++ b/html/style-light.css
@@ -177,7 +177,9 @@ td.tool a.mtitle:hover {
     width: 100%;
 }
 @media only screen and (max-width:955px) {
-    margin-bottom: 70px;
+    body {
+        margin-bottom: 70px;
+    }
 }
 
 #module {
@@ -953,7 +955,7 @@ background: -webkit-linear-gradient(top, rgba(109,179,242,1) 0%,rgba(84,163,238,
 background: -o-linear-gradient(top, rgba(109,179,242,1) 0%,rgba(84,163,238,1) 50%,rgba(54,144,240,1) 51%,rgba(30,105,222,1) 100%); /* Opera 11.10+ */
 background: -ms-linear-gradient(top, rgba(109,179,242,1) 0%,rgba(84,163,238,1) 50%,rgba(54,144,240,1) 51%,rgba(30,105,222,1) 100%); /* IE10+ */
 background: linear-gradient(to bottom, rgba(109,179,242,1) 0%,rgba(84,163,238,1) 50%,rgba(54,144,240,1) 51%,rgba(30,105,222,1) 100%); /* W3C */
-filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#6db3f2', endColorstr='#1e69de',GradientType=0 ); /* IE6-9 */ilter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#001e5799', endColorstr='#001e5799',GradientType=0 ); /* IE6-9 */
+filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#6db3f2', endColorstr='#1e69de',GradientType=0 ); /* IE6-9 */filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#001e5799', endColorstr='#001e5799',GradientType=0 ); /* IE6-9 */
 
 }
 td.tool {
@@ -2141,7 +2143,7 @@ td.selectedmenu {
  */
 #summary_op1,#summary_op2 
 {
-    position:float;
+
     float:left;
 }
 /*
@@ -2365,4 +2367,11 @@ span.title_tab_row {
      background-color: #000066 !important;
      color : white !important;
      
-}
\ No newline at end of file
+}
+
+ /**
+  * dialog box for adding, modifying predefined operation
+  */
+ #prdfop {
+
+ }
\ No newline at end of file
diff --git a/include/ajax/ajax_save_predf_op.php b/include/ajax/ajax_save_predf_op.php
index 4286d1db7..8e463b02e 100644
--- a/include/ajax/ajax_save_predf_op.php
+++ b/include/ajax/ajax_save_predf_op.php
@@ -56,14 +56,13 @@ $operation_predef_mtable->set_callback("ajax_misc.php");
 
 if ($action=="input")
 {
-    if ($p_id == -1 ) {
-        // new operation to insert
+    if ($p_id  < 0 ) {
 
-    } else {
-        // display existing operation for updating
-        header('Content-type: text/xml; charset=UTF-8');
-        echo $operation_predef_mtable->ajax_input()->saveXML();
+        $operation_predef_mtable->set_force_ledger_type($p_id);
     }
+    // display existing operation for updating
+    header('Content-type: text/xml; charset=UTF-8');
+    echo $operation_predef_mtable->ajax_input()->saveXML();
     return;
 }
 elseif ($action == "save")
diff --git a/include/ajax/ajax_update_predef.php b/include/ajax/ajax_update_predef.php
index 335afb350..89b8e9834 100644
--- a/include/ajax/ajax_update_predef.php
+++ b/include/ajax/ajax_update_predef.php
@@ -45,15 +45,15 @@ foreach (array('l','t','d','gDossier') as $a)
 
 }
 $cn=Dossier::connect();
-$op=new Pre_operation_detail($cn);
-$op->set('ledger',$l);
-$op->set('ledger_type',$t);
-$op->set('direct',$d);
+$op=new Pre_operation($cn);
+$op->set_p_jrn($l);
+$op->set_jrn_type($t);
+$op->set_od_direct($d);
 $url=http_build_query(array('action'=>'use_opd','p_jrn_predef'=>$l,'ac'=>$_GET['ac'],'gDossier'=>dossier::id()));
 $html="";
 
 $html.=HtmlInput::title_box(_("Modèle d'opérations"), 'modele_op_div', 'hide',"","n");
-$html.=$op->show_button('do.php?'.$url);
+$html.=$op->display_list_operation('do.php?'.$url);
 $html.=' <p style="text-align: center">'.
         HtmlInput::button_hide('modele_op_div').
         '</p>';
diff --git a/include/class/operation_predef_mtable.class.php b/include/class/operation_predef_mtable.class.php
index 3febada5e..2ac3634b5 100644
--- a/include/class/operation_predef_mtable.class.php
+++ b/include/class/operation_predef_mtable.class.php
@@ -27,10 +27,13 @@
 require_once NOALYSS_INCLUDE."/lib/manage_table_sql.class.php";
 require_once NOALYSS_INCLUDE."/database/op_predef_sql.class.php";
 require_once NOALYSS_INCLUDE."/class/pre_operation.class.php";
+require_once NOALYSS_INCLUDE."/lib/select_box.class.php";
+
 
 class Operation_Predef_MTable extends Manage_Table_SQL
 {
     private $pre_operation;
+    private $force_ledger_type; //!< When adding , the ledger must be set
     function __construct(Op_predef_SQL $p_table)
     {
         parent::__construct($p_table);
@@ -45,7 +48,8 @@ class Operation_Predef_MTable extends Manage_Table_SQL
 
         $aLedger=$p_table->cn->make_array("select jrn_def_id,jrn_def_name from jrn_def order by jrn_def_name asc");
 
-        $this->set_sort_column("jrn_def_id");
+        $this->set_sort_column("od_name");
+        $this->set_col_sort(1);
         $this->set_order(array("jrn_def_id","od_name","od_description","od_jrn_type"));
         $this->set_col_type("jrn_def_id","select",$aLedger);
 
@@ -53,7 +57,30 @@ class Operation_Predef_MTable extends Manage_Table_SQL
         $this->set_property_updatable("jrn_def_id",false);
         $this->set_property_updatable("od_jrn_type",false);
         $this->pre_operation=null;
+        // create our own "Append button"
+        $this->set_append_row(false);
+        $this->set_dialog_box("prdfop");
+        $this->set_dialogbox_style(["position"=>"absolute","top"=>"5%","width:auto","min-width"=>"80%"]);
+    }
 
+    /**
+     * @return mixed
+     */
+    public function get_force_ledger_type()
+    {
+        return $this->force_ledger_type;
+    }
+
+    /**
+     * When adding the ledger_type must be set
+     *  if p_id == -2 then type ACH , 3 for VEN and 4 for ODS
+     * @param mixed $force_ledger_type
+     */
+    public function set_force_ledger_type($force_ledger_type)
+    {
+        $aLedger=array(-2=>'ACH',-3=>'VEN',-4=>'ODS');
+        $this->force_ledger_type = $aLedger[$force_ledger_type];
+        return $this;
     }
 
     /**
@@ -63,9 +90,20 @@ class Operation_Predef_MTable extends Manage_Table_SQL
     function input()
     {
         $obj=$this->get_table();
-        $this->pre_operation = new Pre_operation($obj->cn);
-        $this->pre_operation->set_od_id($obj->get("od_id"));
-        $this->pre_operation->display();
+        $od_id=$obj->get("od_id");
+        if ($od_id > 0 ) {
+            $this->pre_operation = new Pre_operation($obj->cn);
+            $this->pre_operation->set_od_id($obj->get("od_id"));
+            $this->pre_operation->display();
+        } else  {
+            // display blanck operation type ledger = ACH
+            $this->pre_operation = new Pre_operation($obj->cn);
+            // new operation od_id = -1
+            $this->pre_operation->set_od_id(-1);
+            $this->pre_operation->set_jrn_type($this->get_force_ledger_type());
+            $this->pre_operation->display();
+
+        }
     }
 
     /**
@@ -114,7 +152,27 @@ class Operation_Predef_MTable extends Manage_Table_SQL
     function save()
     {
        $this->pre_operation->save();
+       $this->set_pk($this->pre_operation->get_od_id());
+    }
 
+    /**
+     * Display a button to choose a type of operation and call a dialog box for adding
+     */
+    function display_button_add()
+    {
+        $select=new Select_Box(uniqid(),_("Ajout"));
+        $select->set_position('in-absolute');
+        $select->add_javascript(_("Achat"),sprintf("%s.input('-2','%s')",
+            $this->get_object_name(),
+            $this->get_object_name(), "xx", "smallbutton", BUTTONADD));
 
+        $select->add_javascript(_("Vente"),sprintf("%s.input('-3','%s')",
+            $this->get_object_name(),
+            $this->get_object_name(), "xx", "smallbutton", BUTTONADD));
+
+          $select->add_javascript(_("Opérations Diverses"),sprintf("%s.input('-4','%s')",
+              $this->get_object_name(),
+              $this->get_object_name(), "xx", "smallbutton", BUTTONADD));
+        echo $select->input();
     }
 }
\ No newline at end of file
diff --git a/include/class/pre_op_ach.class.php b/include/class/pre_op_ach.class.php
index 5b5198abc..6fe902821 100644
--- a/include/class/pre_op_ach.class.php
+++ b/include/class/pre_op_ach.class.php
@@ -33,7 +33,10 @@ class Pre_op_ach extends Pre_operation_detail
     {
         parent::__construct($cn);
     }
-
+    /**
+     * @brief get the post and stove them into data member , before saving them in the db
+     * @see save
+     */
     function get_post()
     {
         $http = new \HttpInput();
@@ -100,8 +103,11 @@ class Pre_op_ach extends Pre_operation_detail
             throw $e;
         }
     }
-    /*!\brief compute an array accordingly with the FormVenView function
+    /**
+     * @brief compute an array accordingly with the FormVenView function, first the data is fetched (via load)
+     * to the database and turns into an array to be use with Pre_Op_Ach::display
 	 * @return an array for filling the form
+     * @see load
      */
     function compute_array($p_od_id)
     {
@@ -144,10 +150,20 @@ class Pre_op_ach extends Pre_operation_detail
             " opd_quantity , opd_comment,opd_tva_amount from op_predef_detail where od_id= $1 ".
             " order by opd_id";
         $res=$this->db->exec_sql($sql,[$p_od_id]);
+        if ($res == false) return array();
         $array=Database::fetch_all($res);
         return $array;
     }
 
+    /**
+     * Display the form for modifying or adding new predefined operation
+     * @param array  $p_array is the result of compute_array or blank
+     * @return string containing HTML code of the form
+     * @throws Exception
+     * @see compute_array
+     * @see load
+     *
+     */
    function display($p_array)
    {
         require_once NOALYSS_INCLUDE.'/class/acc_ledger_purchase.class.php';
@@ -184,8 +200,6 @@ class Pre_op_ach extends Pre_operation_detail
        $f_legend=_('En-tête facture fournisseur');
 
 
-       /* if we suggest the next pj, then we need a javascript */
-
        // Display the customer
        //--
        $fiche='deb';
@@ -393,6 +407,5 @@ class Pre_op_ach extends Pre_operation_detail
 
        return $r;
 
-        return $r;
    }
 }
\ No newline at end of file
diff --git a/include/class/pre_op_advanced.class.php b/include/class/pre_op_advanced.class.php
index 8c08e7094..b870ef17a 100644
--- a/include/class/pre_op_advanced.class.php
+++ b/include/class/pre_op_advanced.class.php
@@ -33,6 +33,10 @@ class Pre_Op_Advanced extends Pre_operation_detail
     {
         parent::__construct($cn);
     }
+    /**
+     * @brief get the post and stove them into data member , before saving them in the db
+     * @see save
+     */
     function get_post()
     {
         $http = new \HttpInput();
@@ -143,13 +147,24 @@ class Pre_Op_Advanced extends Pre_operation_detail
              " order by opd_id";
         $res=$this->db->exec_sql($sql,[$p_od_id]);
         $array=Database::fetch_all($res);
+        if ($array == false ) return array();
         return $array;
     }
+    /**
+     * Display the form for modifying or adding new predefined operation
+     * @param array  $p_array is the result of compute_array or blank
+     * @return string containing HTML code of the form
+     * @throws Exception
+     * @see compute_array
+     * @see load
+     *
+     */
    function display($p_array)
     {
         global $g_parameter, $g_user;
         require_once NOALYSS_INCLUDE.'/class/acc_ledger.class.php';
         $legder=new Acc_Ledger($this->db,$p_array['p_jrn']);
+
         $legder->nb=$legder->get_min_row();
 
         $add_js = "";
@@ -169,12 +184,11 @@ class Pre_Op_Advanced extends Pre_operation_detail
         $nb_row = (isset($p_array['nb_item']) ) ? $p_array['nb_item' ]: $legder->nb;
 
         $ret.=HtmlInput::hidden('nb_item', $nb_row);
-        $ret.=HtmlInput::hidden('p_jrn', $p_array['p_jrn']);
         $ret.=dossier::hidden();
         
         $ret.=dossier::hidden();
 
-        $ret.=HtmlInput::hidden('jrn_type', $legder->get_type());
+        $ret.=HtmlInput::hidden('jrn_type', "ODS");
         $info = Icon_Action::infobulle(0);
         $info_poste = Icon_Action::infobulle(9);
         if ($g_user->check_action(FICADD) == 1)
diff --git a/include/class/pre_op_ven.class.php b/include/class/pre_op_ven.class.php
index fbb0cbc97..c73f5e908 100644
--- a/include/class/pre_op_ven.class.php
+++ b/include/class/pre_op_ven.class.php
@@ -34,7 +34,10 @@ class Pre_op_ven extends Pre_operation_detail
     {
         parent::__construct($cn);
     }
-
+    /**
+     * @brief get the post and stove them into data member , before saving them in the db
+     * @see save
+     */
     function get_post()
     {
         $http=new \HttpInput();
@@ -144,13 +147,18 @@ class Pre_op_ven extends Pre_operation_detail
              " order by opd_id";
         $res=$this->db->exec_sql($sql,[$p_od_id]);
         $array=Database::fetch_all($res);
+        if ($res == false) return array();
         return $array;
     }
 
     /**
-     * @param array $p_array
-     * @return string
+     * Display the form for modifying or adding new predefined operation
+     * @param array  $p_array is the result of compute_array or blank
+     * @return string containing HTML code of the form
      * @throws Exception
+     * @see compute_array
+     * @see load
+     *
      */
     function display($p_array)
     {
@@ -158,7 +166,6 @@ class Pre_op_ven extends Pre_operation_detail
 
         require_once NOALYSS_INCLUDE.'/class/acc_ledger_sold.class.php';
         $ledger=new Acc_Ledger_Sold($this->db,$p_array['p_jrn']);
-
         $flag_tva=$g_parameter->MY_TVA_USE;
         /* Add button */
         $f_add_button=new IButton('add_card');
diff --git a/include/class/pre_operation.class.php b/include/class/pre_operation.class.php
index 28a35f40e..cfadc0ec8 100644
--- a/include/class/pre_operation.class.php
+++ b/include/class/pre_operation.class.php
@@ -162,20 +162,19 @@ class Pre_operation
         }
         try {
             $this->db->start();
-            $sql='insert into op_predef (jrn_def_id,od_name,od_item,od_jrn_type,od_direct,od_description)'.
-                'values'.
-                "($1,$2,$3,$4,$5  ,$6               )";
-            $this->db->exec_sql($sql,array($this->p_jrn,
+            $sql='insert into op_predef (jrn_def_id,od_name,od_item,od_jrn_type,od_direct,od_description) '.
+                ' values '.
+                "($1,$2,$3,$4,$5  ,$6)".
+                'returning od_id';
+            $this->od_id= $this->db->get_value($sql,array($this->p_jrn,
                 $this->name,
                 $this->nb_item,
                 $this->jrn_type,
                 $this->od_direct,
                 $this->description,
             ));
-            $this->od_id=$this->db->get_current_seq('op_def_op_seq');
 
 
-           // $this->detail=Pre_operation_detail::build_detail($this->jrn_type,$this->db);
             $this->detail->save($this->od_id,$this->nb_item);
             $this->db->commit();
         } catch (Exception $e) {
@@ -215,23 +214,21 @@ class Pre_operation
      * @param $p_ledger_id
      * @throws Exception
      */
-    function blank($p_ledger_id) {
+    function blank() {
         $array["od_id"]=-1;
-        $array['jrn_def_id']=$p_ledger_id;
+        $array['jrn_def_id']=0;
         $array['od_name']="";
         $array['od_item']=2;
-        $array['od_jrn_type']=$this->db->get_value("select jrn_def_type from jrn_def where jrn_def_id=$1",[$p_ledger_id]);
+        $array['od_jrn_type']=$this->get_jrn_type();
         $array['od_description']="";
         foreach (array('jrn_def_id','od_name','od_item','od_jrn_type','od_description') as $field) {
             $this->$field=$array[$field];
         }
         $this->od_jrn_type=$array['od_jrn_type'];
 
-        $this->detail = Pre_operation_detail::build_detail($this->od_jrn_type, $this->db);
-        $this->detail->set_od_id(0);
-        $this->detail->set_jrn($p_ledger_id);
-
-        return $array;
+        $this->detail = Pre_operation_detail::build_detail($array['od_jrn_type'], $this->db);
+        $darray[0]=$array;
+        return $darray;
     }
 
     function compute_array()
@@ -239,7 +236,7 @@ class Pre_operation
         if ($this->od_id > 0) {
             $p_array = $this->load();
         } else {
-            $p_array=$this->blank($this->p_jrn);
+            $p_array=$this->blank();
         }
         $array=array(
                    "e_comm"=>$p_array[0]["od_name"],
@@ -254,8 +251,10 @@ class Pre_operation
 
     }
 
-    /*!\brief show the button for selecting a predefined operation */
-    function show_button()
+    /*!\brief show the button for selecting a predefined operation
+    @deprecated
+     */
+    function show_button_deprecated()
     {
 
         $select=new ISelect();
@@ -301,6 +300,8 @@ class Pre_operation
     function display() 
     {
         $array=$this->compute_array();
+        $select_ledger=$this->choose_ledger($array['jrn_type'],$array['p_jrn']);
+
         require NOALYSS_TEMPLATE."/pre_operation_display.php";
         echo $this->detail->display($array);
     }
@@ -408,7 +409,6 @@ class Pre_operation
     public function get_jrn_type()
     {
         return $this->jrn_type;
-        return $this;
     }
 
     /**
@@ -416,6 +416,7 @@ class Pre_operation
      */
     public function set_jrn_type($jrn_type)
     {
+        $jrn_type=strtoupper($jrn_type);
         if ( ! in_array ($jrn_type,['ACH','FIN','VEN','ODS'] )) throw new Exception('prop03.invalid ledger type');
         $this->jrn_type = $jrn_type;
         return $this;
@@ -503,6 +504,22 @@ class Pre_operation
         $this->jrn_type=$this->db->get_value("select jrn_def_type from jrn_def where jrn_def_id=$1",[$p_jrn]);
         return $this;
     }
+
+    /**
+     * Build the select list for choosing the ledger
+     * @param string $p_string ledger type ACH VEN or ODS
+     * @param $p_default  selected ledger , -1 if none
+     * @return ISelect
+     */
+    function choose_ledger($p_ledger_type,$p_default) {
+        $select_ledger=new ISelect("p_jrn");
+        $select_ledger->value=$this->db->make_array("select jrn_def_id,jrn_def_name 
+                                                    from jrn_def where jrn_def_type=$1 order by 2",
+            0,
+            [$p_ledger_type]);
+        $select_ledger->selected=$p_default;
+        return $select_ledger;
+    }
 }
 
 /*!\brief mother of the pre_op_XXX, it contains only one data : an
diff --git a/include/preod.inc.php b/include/preod.inc.php
index d12041cf0..bea0caa58 100644
--- a/include/preod.inc.php
+++ b/include/preod.inc.php
@@ -35,4 +35,10 @@ $operation_predef_mtable->set_json(json_encode(array(   "ac"=>$http->request("ac
                                                         "gDossier"=>Dossier::id()
                                                      )));
 $operation_predef_mtable->create_js_script();
-$operation_predef_mtable->display_table();
\ No newline at end of file
+echo '<p>';
+ $operation_predef_mtable->display_button_add();
+echo '</p>';
+$operation_predef_mtable->display_table();
+echo '<p>';
+$operation_predef_mtable->display_button_add();
+echo '</p>';
\ No newline at end of file
diff --git a/include/template/pre_operation_display.php b/include/template/pre_operation_display.php
index 8de218bd2..c881358fb 100644
--- a/include/template/pre_operation_display.php
+++ b/include/template/pre_operation_display.php
@@ -34,3 +34,7 @@ $description->style=' class="itextarea" style="width:30em;height:4em;vertical-al
     <?php echo  _('Description (max 50 car.)'); ?>
     <?php echo $description->input();?>
 </p>
+<p>
+    <?php echo _("Journal") ?>
+    <?php echo $select_ledger->input(); ?>
+</p>
\ No newline at end of file
diff --git a/include/template/predf_ledger_detail.php b/include/template/predf_ledger_detail.php
index dfcfbb197..d46eff899 100644
--- a/include/template/predf_ledger_detail.php
+++ b/include/template/predf_ledger_detail.php
@@ -5,13 +5,12 @@
 <legend><?php echo $f_legend ?>
 </legend>
 <?php echo $f_type?><?php echo $f_client_qcode?><?php echo $f_client_bt?> <?php echo $f_client?><br>
-<input type="hidden" id="p_jrn" name="p_jrn" value="<?php echo $p_array["p_jrn"]; ?>">
 <?php echo $str_add_button?>
 </fieldset>
 
-<div class="fieldset" style="overflow:auto;max-height:300px">
+<div class="fieldset">
 <h1 class="fiedset"><?php echo $f_legend_detail?></h1>
-    <div style="">
+
 <table id="sold_item" width="100%" border="0">
 <tr>
 <th style="width:auto"colspan="2">Code <?php echo Icon_Action::infobulle(0)?></th>
@@ -54,6 +53,7 @@ echo '</tr>';
 ?>
 </table>
 
+
 <div style="position:float;float:right;text-align:right;padding-right:5px;font-size:1.2em;font-weight:bold;color:blue">
       <?php echo HtmlInput::button('act',_('Actualiser'),'onClick="compute_all_ledger();"'); ?>
  </div>
@@ -79,7 +79,7 @@ echo '</tr>';
      <br><?php echo _('Total')?>
 <?php endif; ?>
 </div>
-
 </div>
 
 
+

From 6ea60012450d89c1bb605a6db4a2bdcb53a974a4 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Tue, 29 Sep 2020 23:34:37 +0200
Subject: [PATCH 042/257] Bug : cannot duplicate ACH

---
 include/compta_ach.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/compta_ach.inc.php b/include/compta_ach.inc.php
index 2059cf74c..d02c09736 100644
--- a/include/compta_ach.inc.php
+++ b/include/compta_ach.inc.php
@@ -240,7 +240,7 @@ else
 	$Ledger->id = $request_jrn;
 
 if (isset ($_REQUEST['p_jrn_predef'])){
-	$Ledger->id=$_REQUEST['p_jrn_predef'];
+	$Ledger->id=$http->request('p_jrn_predef');
 }
 // pre defined operation
 //
@@ -259,6 +259,7 @@ try
     $acompte=$http->request("acompte", "string",0);
 
     echo "<FORM class=\"print\"NAME=\"form_detail\" METHOD=\"POST\" >";
+    echo HtmlInput::hidden("ac", $ac);
     /* request for a predefined operation */
     if (isset($_REQUEST['pre_def'])&&!isset($_POST['correct']) && ! isset($correct) )
     {

From c5127f64c39753b5ae75a53f5128a27a9ec92cc2 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Fri, 2 Oct 2020 17:59:44 +0200
Subject: [PATCH 043/257] Documentation

---
 include/class/operation_predef_mtable.class.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/include/class/operation_predef_mtable.class.php b/include/class/operation_predef_mtable.class.php
index 2ac3634b5..ceae85b6b 100644
--- a/include/class/operation_predef_mtable.class.php
+++ b/include/class/operation_predef_mtable.class.php
@@ -29,6 +29,13 @@ require_once NOALYSS_INCLUDE."/database/op_predef_sql.class.php";
 require_once NOALYSS_INCLUDE."/class/pre_operation.class.php";
 require_once NOALYSS_INCLUDE."/lib/select_box.class.php";
 
+/*!
+ * \brief Display a table and allow to change the predefined operation, insert or delete. Used the
+ * class Manage_Table_SQL and the SQL Object for the tables op_predef and op_predef_detail.
+ * 
+ * @see include/preod.inc.php
+ * @see include/ajax/ajax_save_predf_op.php
+ */
 
 class Operation_Predef_MTable extends Manage_Table_SQL
 {

From 47cb4285d9eef2791e0ebb0c2d492dc35616a16a Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Fri, 2 Oct 2020 18:23:37 +0200
Subject: [PATCH 044/257] Fix: predefined operation with overflow for details

Follow Up : operation detail moved from Follow_up to Follow_Up_Detail
Add Option for Follow Up
Add option for contact in follow up
rename cfgcat to  cfgaction
rewriting of cfgcatdoc
---
 html/ajax_misc.php                            |  58 +-----
 html/js/scripts.js                            |  28 ++-
 include/cat_document.inc.php                  |  90 ---------
 include/cfg_action.inc.php                    |  44 ++++
 .../action_document_type_mtable.class.php     | 190 +++++++++++++++++
 include/class/document_option.class.php       |  88 ++++++++
 include/class/document_type.class.php         |  42 +---
 include/class/follow_up.class.php             | 111 +---------
 include/class/follow_up_detail.class.php      |   5 +
 .../class/operation_predef_mtable.class.php   |   2 +-
 include/class/pre_op_advanced.class.php       |   5 +-
 .../database/contact_option_ref_sql.class.php |  66 ++++++
 include/lib/manage_table_sql.class.php        |  13 +-
 include/template/detail-action.php            | 151 ++++----------
 include/template/document_mod_change.php      |  87 --------
 include/template/follow_up_detail_display.php | 191 ++++++++++++++++++
 include/template/predf_ledger_detail.php      |   2 +-
 sql/upgrade.sql                               |  91 +++++++++
 18 files changed, 771 insertions(+), 493 deletions(-)
 delete mode 100644 include/cat_document.inc.php
 create mode 100644 include/cfg_action.inc.php
 create mode 100644 include/class/action_document_type_mtable.class.php
 create mode 100644 include/class/document_option.class.php
 create mode 100644 include/database/contact_option_ref_sql.class.php
 delete mode 100644 include/template/document_mod_change.php
 create mode 100644 include/template/follow_up_detail_display.php

diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index 2e2e258f3..3ac6686d7 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -257,7 +257,11 @@ $path = array(
     // payment_method
     "payment_method"=>"ajax_payment_method",
     // update list of predefined operation if ledger changes
-    "up_predef"=>"ajax_update_predef"
+    "up_predef"=>"ajax_update_predef",
+    // cfgaction type of document
+    "cfgaction"=>'ajax_cfgaction',
+    // list options for multiple contact
+    "contact_option_list"=>'ajax_contact_option_list'
 )    ;
 
 if (array_key_exists($op, $path)) {
@@ -388,58 +392,8 @@ EOF;
 </data>
 EOF;
 		break;
-	/* rem a cat of document */
-	case 'rem_cat_doc':
-		require_once NOALYSS_INCLUDE.'/class/document_type.class.php';
-		// if user can not return error message
-                $message="";
-		if ($g_user->check_action(PARCATDOC) == 0)
-		{
-			$html = "nok";
-                        $message=_('Action non autorisée');
-			header('Content-type: text/xml; charset=UTF-8');
-			echo <<<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<data>
-<dtid>$html</dtid>
-<message>$message</message>                                
-</data>
-EOF;
-			return;
-		}
-		// remove the cat if no action
-		$count_md = $cn->get_value('select count(*) from document_modele where md_type=$1', array($dt_id));
-		$count_a = $cn->get_value('select count(*) from action_gestion where ag_type=$1', array($dt_id));
+	
 
-		if ($count_md != 0 || $count_a != 0)
-		{
-                    $message=_('Des actions dépendent de cette catégorie');
-			$html = "nok";
-			header('Content-type: text/xml; charset=UTF-8');
-			echo <<<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<data>
-<dtid>$html</dtid>
-<message>$message</message>                                
-</data>
-EOF;
-			exit;
-		}
-		$cn->exec_sql('delete from document_type where dt_id=$1', array($dt_id));
-		$html = $dt_id;
-		header('Content-type: text/xml; charset=UTF-8');
-		echo <<<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<data>
-<dtid>$html</dtid>
-<message>$message</message>                                
-</data>
-EOF;
-		return;
-		break;
-	case 'mod_cat_doc':
-		require_once NOALYSS_TEMPLATE.'/document_mod_change.php';
-		break;
 	case 'dsp_tva':
 		$cn = Dossier::connect();
             // Filter the VAT 
diff --git a/html/js/scripts.js b/html/js/scripts.js
index 3bd5e758e..f5907020f 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -26,7 +26,25 @@
 var ask_reload = 0;
 var tag_choose = '';
 var aDraggableElement = new Array();
-
+/**
+ * return undefined if nothing is found , otherwise return the DOM elemnt
+ * @param {type} p_name_dom
+ * @param {type} name_child
+ * @returns {undefined}
+ */
+function in_child(p_element,name_child) {
+    var element=p_element
+    if ( typeof p_element !== "object" ) {
+      element=document.getElementById(p_element);
+        
+    }
+    if ( ! element ) return undefined;
+    for ( var e=0; e < element.childElementCount;e++) {
+        if ( element.childNodes[e].id == name_child) {
+            return element.childNodes[e];
+        }
+    }
+}
 /**
  * callback function when we just need to update a hidden div with an info
  * message
@@ -2115,7 +2133,13 @@ function view_action(ag_id, dossier, modify)
                         });
                         $(id).innerHTML = code_html;
                         if (ctl_txt == 'ok') {
-                            compute_all_ledger();
+                            // compute detail
+                            var detail=in_child(id,"follow_up_detail");
+                            if (detail) {   
+                              compute_all_ledger();
+                            }
+                                             
+                            
                         }
                         code_html.evalScripts();
                     } catch (e) {
diff --git a/include/cat_document.inc.php b/include/cat_document.inc.php
deleted file mode 100644
index fe3a7b31c..000000000
--- a/include/cat_document.inc.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/*
- *   This file is part of NOALYSS.
- *
- *   NOALYSS is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   NOALYSS is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with NOALYSS; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-// Copyright Author Dany De Bontridder danydb@aevalys.eu
-
-/*!\file
- * \brief this file is included to perform modification on category of document
- * table document_type
- */
-
-// show list of document
-if (!defined('ALLOWED'))
-    die('Appel direct ne sont pas permis');
-require_once NOALYSS_INCLUDE.'/class/document_type.class.php';
-
-global $http;
-
-if (isset($_POST['add']))
-{
-    $catDoc=new Document_Type($cn);
-    try
-    {
-        $cat=$http->post('cat');
-        $prefix=$http->post('prefix');
-        $catDoc->insert($cat, $prefix);
-    }
-    catch (Exception $exc)
-    {
-        echo $exc->getMessage();
-        error_log($exc->getTraceAsString());
-    }
-}
-if (isset($_POST['save']))
-{
-    try
-    {
-        $dt_id=$http->post("dt_id", "number");
-        $name=
-        $prefix=
-        $catDoc=new Document_Type($cn, $dt_id);
-        $catDoc->get();
-        $catDoc->dt_value=trim($http->post("dt_name"));;
-        $catDoc->dt_prefix=trim($http->post("dt_prefix"));
-        if ($catDoc->dt_value=="")
-        {
-            alert(_("Le nom ne peut pas être vide"));
-        }
-        else
-        {
-            $catDoc->update();
-        }
-        if ($_POST['seq']!=0&&isNumber($_POST['seq'])==1)
-        {
-            $catDoc->set_number($_POST['seq']);
-        }
-    }
-    catch (Exception $exc)
-    {
-        alert ($exc->getMessage());
-        error_log($exc->getTraceAsString());
-    }
-}
-$aList=Document_Type::get_list($cn);
-$addCat=new IText('cat');
-$addPrefix=new IText('prefix');
-$str_addCat=$addCat->input();
-$str_addPrefix=$addPrefix->input();
-$str_submit=HtmlInput::submit('add', _('Ajout'));
-echo '<div class="content">';
-require_once NOALYSS_TEMPLATE.'/list_category_document.php';
-
-echo '</div>';
-?>
diff --git a/include/cfg_action.inc.php b/include/cfg_action.inc.php
new file mode 100644
index 000000000..77a29baef
--- /dev/null
+++ b/include/cfg_action.inc.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+// Copyright Author Dany De Bontridder danydb@aevalys.eu
+
+/*!\file
+ * \brief this file is included to perform modification on category of document (= action)
+ * table document_type
+ */
+
+// show list of document
+if (!defined('ALLOWED'))     die('Appel direct ne sont pas permis');
+require_once NOALYSS_INCLUDE."/class/action_document_type_mtable.class.php";
+echo '<div class="content">';
+$doc_type=new Document_type_SQL($cn);
+$action_document_type=new Action_Document_Type_MTable($doc_type);
+
+$action_document_type->set_callback("ajax_misc.php");
+$action_document_type->add_json_param("op", "cfgaction");
+
+$action_document_type->create_js_script();
+$action_document_type->display_table("order by dt_value");
+?>
+</div>
+
+
+ 
\ No newline at end of file
diff --git a/include/class/action_document_type_mtable.class.php b/include/class/action_document_type_mtable.class.php
new file mode 100644
index 000000000..b6fb26376
--- /dev/null
+++ b/include/class/action_document_type_mtable.class.php
@@ -0,0 +1,190 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2019) Author Dany De Bontridder <danydb@noalyss.eu>
+
+/* @file
+ * @brief  display and allow to update , add , delete document_type for the follow up
+ * 
+ */
+require_once NOALYSS_INCLUDE."/lib/manage_table_sql.class.php";
+require_once NOALYSS_INCLUDE."/database/document_type_sql.class.php";
+
+/**
+ * @class 
+ * @brief display , modify and add document_type for follow up
+ * @see include/ajax/ajax_cfgaction.php
+ * @see include/cfg_action.inc.php
+ */
+class Action_Document_Type_MTable extends Manage_Table_SQL
+{
+
+    private $other; //!< Other value 
+
+    public function __construct(Document_type_SQL $doc_type)
+    {
+        parent::__construct($doc_type);
+        $this->set_order(["dt_id", "dt_prefix", "dt_value",]);
+        $this->set_property_updatable("dt_id", false);
+        $this->set_property_visible("dt_id", false);
+        $this->set_property_updatable("dt_value", true);
+        $this->set_property_updatable("dt_prefix", true);
+        $this->set_col_label("dt_value", _("Nom"));
+        $this->set_col_label("dt_prefix", _("Préfixe document"));
+        $this->other=array();
+    }
+
+    /**
+     * 
+      @code
+      table	"public.document_type"
+      ctl_id	"dtr"
+      gDossier	"74"
+      op	"cfgaction"
+      p_id	"28"
+      action	"save"
+      ctl	"tbl5f785d403b123"
+      dt_prefix	"ABO.HEB"
+      dt_value	"Abonnements+PhpCompta"
+      seq	"0"
+      det_op	"1"
+      det_contact_mul	"1"
+      update	"OK"
+      @endcode
+     * 
+     * 
+     *       
+     */
+    public function from_request()
+    {
+        $http=new HttpInput();
+        $this->table->dt_value=$http->request('dt_value');
+        $this->table->dt_prefix=$http->request('dt_prefix');
+        $this->other['detail_operation']=$http->request("detail_operation", "string", 0);
+        $this->other['contact_multiple']=$http->request("det_contact_mul", "string", 0);
+        $this->other['make_invoice']=$http->request("make_invoice", "string", 0);
+        $this->other['seq']=$http->request("seq", "string", 0);
+    }
+
+    /**
+     * 
+     */
+    public function check()
+    {
+        $table=$this->get_table();
+        $error=0;
+        if (empty(trim($table->dt_value)))
+        {
+            $this->set_error("dt_value", _("Nom ne peut être vide"));
+            $error++;
+        }
+        if (empty(trim($table->dt_prefix)))
+        {
+            $this->set_error("dt_prefix", _("Préfixe ne peut être vide"));
+            $error++;
+        }
+        // Check doublon
+        if ($table->cn->get_value('select count(*) from document_type where upper(dt_value)=upper($1) and dt_id <> $2',
+                        [$table->dt_value, $table->dt_id])>0)
+        {
+            $this->set_error("dt_value", _("Doublon, ce nom existe déjà "));
+            $error++;
+        }
+        // Check doublon
+        if ($table->cn->get_value('select count(*) from document_type where upper(dt_prefix)=upper($1) and dt_id <> $2',
+                        [$table->dt_prefix, $table->dt_id])>0)
+        {
+            $this->set_error("dt_value", _("Doublon, ce préfixe existe déjà "));
+            $error++;
+        }
+        if ($error>0)
+            return false;
+        return true;
+    }
+
+    /**
+     * 
+     * @throws Exception
+     */
+    function delete()
+    {
+        $table=$this->get_table();
+        try
+        {
+            // remove the cat if no action
+            $count_md=$table->cn->get_value('select count(*) from document_modele where md_type=$1',
+                    array($table->dt_id));
+            $count_a=$table->cn->get_value('select count(*) from action_gestion where ag_type=$1', array($table->dt_id));
+
+            if ($count_md!=0||$count_a!=0)
+            {
+                throw new Exception(_('Des actions dépendent de cette catégorie'), 1300);
+            }
+            $table->delete();
+        }
+        catch (Exception $exc)
+        {
+            if ($exc->getCode()!=1300)
+            {
+                record_log("ADTM01".$exc->getTrace());
+            }
+            throw new Exception($exc->getMessage());
+        }
+    }
+
+    /**
+     * @brief display the box for adding, the name for p_id , are in the form 
+     */
+    function input()
+    {
+        parent::input();
+        require NOALYSS_TEMPLATE."/action_document_type_mtable_input.php";
+    }
+
+    /**
+     * save
+     */
+    function save()
+    {
+        parent::save();
+        $cn=Dossier::connect();
+        $object_sql=$this->get_table();
+        // restart sequence
+        if ($this->other['seq']!=0)
+        {
+            $doc_type=new Document_type($cn, $object_sql->dt_id);
+            $doc_type->set_number($this->other['seq']);
+        }
+        // Save detail operation
+        $cn->exec_sql("insert into document_option (do_code,document_type_id,do_enable) values ($1,$2,$3) 
+            on conflict on constraint document_option_un
+            do update set do_enable=$3", ["detail_operation", $object_sql->dt_id, $this->other['detail_operation']]);
+
+        // Save contact_multiple
+        $cn->exec_sql("insert into document_option (do_code,document_type_id,do_enable) values ($1,$2,$3) 
+            on conflict on constraint document_option_un
+            do update set do_enable=$3 ", ["contact_multiple", $object_sql->dt_id, $this->other['contact_multiple']]);
+        
+        // Save make invoice
+        $cn->exec_sql("insert into document_option (do_code,document_type_id,do_enable) values ($1,$2,$3) 
+            on conflict on constraint document_option_un
+            do update set do_enable=$3 ", ["make_invoice", $object_sql->dt_id, $this->other['make_invoice']]);
+    }
+
+}
diff --git a/include/class/document_option.class.php b/include/class/document_option.class.php
new file mode 100644
index 000000000..5d68874bd
--- /dev/null
+++ b/include/class/document_option.class.php
@@ -0,0 +1,88 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+/**
+ * @file
+ * @brief 
+ */
+
+/**
+ * @class
+ * @brief
+ */
+class Document_Option
+{
+
+    /**
+     * returns true if the operation_detail is enable, otherwise false
+     * 
+     * @param int $p_document_type Document_Type.dt_id
+     * @return boolean
+     */
+    static function is_enable_operation_detail($p_document_type)
+    {
+        $display_operation=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, 'detail_operation'])=='1')
+        {
+            $display_operation=true;
+        }
+        return $display_operation;
+    }
+
+    /**
+     * returns true if the operation_detail is enable, otherwise false
+     * 
+     * @param int $p_document_type Document_Type.dt_id
+     * @return boolean
+     */
+    static function is_enable_contact_multiple($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, 'contact_multiple'])=='1')
+        {
+            $return=true;
+        }
+        return $return;
+    }
+
+    /**
+     * returns true if the operation_detail is enable, otherwise false
+     * 
+     * @param int $p_document_type Document_Type.dt_id
+     * @return boolean
+     */
+    static function is_enable_make_invoice($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, 'make_invoice'])=='1')
+        {
+            $return=true;
+        }
+        return $return;
+    }
+
+}
diff --git a/include/class/document_type.class.php b/include/class/document_type.class.php
index 8f0d2fbf1..946202604 100644
--- a/include/class/document_type.class.php
+++ b/include/class/document_type.class.php
@@ -23,7 +23,9 @@
  * \brief  class for the table document_type
  */
 
-/** \brief class for the table document_type
+/** \
+ *@brief class for the table document_type , a document_type is a kind of action in the follow up
+ * 
  * < dt_id pk document_type
  * < dt_value value
  */
@@ -91,40 +93,10 @@ class Document_type
 		return $array;
 	}
 
-	function insert($p_value, $p_prefix)
-	{
-		$sql = "insert into document_type(dt_value,dt_prefix) values ($1,$2)";
-		try
-		{
-			if ($this->db->count_sql('select * from document_type where upper(dt_value)=upper(trim($1))', array($p_value)) > 0)
-				throw new Exception('Nom en double');
-			if (strlen(trim($p_value)) > 0)
-				$this->db->exec_sql($sql, array($p_value, $p_prefix));
-		}
-		catch (Exception $e)
-		{
-                      record_log($e);
-			alert(j(_("Impossible d'ajouter [$p_value] ") . $e->getMessage()));
-		}
-	}
-
-	/**
-	 * Update
-	 */
-	function update()
-	{
-		try
-		{
-			$this->db->exec_sql("update document_type set dt_value=$1,dt_prefix=$2 where dt_id=$3", array($this->dt_value,
-				$this->dt_prefix, $this->dt_id));
-		}
-		catch (Exception $e)
-		{
-                      record_log($e);
-			alert(" Erreur " . $e->getMessage());
-		}
-	}
-
+        /**
+         * Restart the increment of the document
+         * @param type $p_int
+         */
 	function set_number($p_int)
 	{
 		try
diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 48ad1e2ea..3aa0b6dde 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -31,6 +31,7 @@ require_once NOALYSS_INCLUDE.'/class/fiche.class.php';
 require_once NOALYSS_INCLUDE.'/class/document.class.php';
 require_once NOALYSS_INCLUDE.'/class/document_type.class.php';
 require_once NOALYSS_INCLUDE.'/class/document_modele.class.php';
+require_once NOALYSS_INCLUDE.'/class/document_option.class.php';
 require_once NOALYSS_INCLUDE.'/lib/user_common.php';
 require_once NOALYSS_INCLUDE.'/class/follow_up_detail.class.php';
 require_once NOALYSS_INCLUDE.'/lib/inum.class.php';
@@ -152,7 +153,7 @@ class Follow_Up
      *
      * \return string containing the html code
      */
-    function Display($p_view, $p_gen, $p_base, $retour="")
+    function display($p_view, $p_gen, $p_base, $retour="")
     {
         global $g_user;
         if ($p_view=='UPD')
@@ -175,6 +176,8 @@ class Follow_Up
         {
             throw new Exception('class_action'.__LINE__.'Follow_Up::Display error unknown parameter'.$p_view);
         }
+        
+       
         // Compute the widget
         // Date
         $date=new IDate();
@@ -428,108 +431,9 @@ class Follow_Up
         $text=new IText();
         $num=new INum();
 
-        /* TVA */
-        $itva=new ITva_Popup($this->db);
-        $itva->in_table=true;
-        $aCard=array();
-        /* create aArticle for the detail section */
-        $article_count=(count($this->aAction_detail)==0)?MAX_ARTICLE:count($this->aAction_detail);
-        /* Compute total */
-        $tot_item=0;
-        $tot_vat=0;
-        for ($i=0; $i<$article_count; $i++)
-        {
-            /* fid = Icard  */
-            $icard=new ICard();
-            $icard->jrn=0;
-            $icard->table=0;
-            $icard->noadd="no";
-            $icard->extra='all';
-            $icard->name="e_march".$i;
-            $tmp_ad=(isset($this->aAction_detail[$i]))?$this->aAction_detail[$i]:false;
-            $icard->readOnly=$readonly;
-            $icard->value='';
-            $aCard[$i]=0;
-            if ($tmp_ad)
-            {
-                $march=new Fiche($this->db);
-                $f=$tmp_ad->get_parameter('qcode');
-                if ($f!=0)
-                {
-                    $march->id=$f;
-                    $icard->value=$march->get_quick_code();
-                    $aCard[$i]=$f;
-                }
-            }
-            $icard->set_dblclick("fill_ipopcard(this);");
-            // name of the field to update with the name of the card
-            $icard->set_attribute('label', "e_march".$i."_label");
-            // name of the field to update with the name of the card
-            $icard->set_attribute('typecard', $icard->extra);
-            $icard->set_attribute('ipopup', 'ipopcard');
-            $icard->set_function('fill_data');
-            $icard->javascript=sprintf(' onchange="fill_data_onchange(\'%s\');" ', $icard->name);
-
-            $aArticle[$i]['fid']=$icard->search().$icard->input();
-
-            $text->javascript=' onchange="clean_tva('.$i.');compute_ledger('.$i.')"';
-            $text->css_size="100%";
-            $text->name="e_march".$i."_label";
-            $text->id="e_march".$i."_label";
-            $text->size=40;
-            $text->value=($tmp_ad)?$tmp_ad->get_parameter('text'):"";
-            $text->readOnly=$readonly;
-            $aArticle[$i]['desc']=$text->input();
-
-            $num->javascript=' onchange="format_number(this,4);clean_tva('.$i.');compute_ledger('.$i.')"';
-            $num->name="e_march".$i."_price";
-            $num->id="e_march".$i."_price";
-            $num->size=8;
-            $num->readOnly=$readonly;
-            $num->value=($tmp_ad)?$tmp_ad->get_parameter('price_unit'):0;
-            $aArticle[$i]['pu']=$num->input();
-
-            $num->name="e_quant".$i;
-            $num->id="e_quant".$i;
-            $num->size=8;
-            $num->value=($tmp_ad)?$tmp_ad->get_parameter('quantity'):0;
-            $aArticle[$i]['quant']=$num->input();
-
-            $itva->name='e_march'.$i.'_tva_id';
-            $itva->id='e_march'.$i.'_tva_id';
-            $itva->value=($tmp_ad)?$tmp_ad->get_parameter('tva_id'):0;
-            $itva->readOnly=$readonly;
-            $itva->js=' onchange="format_number(this);clean_tva('.$i.');compute_ledger('.$i.')"';
-            $itva->set_attribute('compute', $i);
-
-            $aArticle[$i]['tvaid']=$itva->input();
-
-            $num->name="e_march".$i."_tva_amount";
-            $num->id="e_march".$i."_tva_amount";
-            $num->value=($tmp_ad)?$tmp_ad->get_parameter('tva_amount'):0;
-            $num->javascript=" onchange=\"compute_ledger('".$i." ')\"";
-            $num->size=8;
-            $aArticle[$i]['tva']=$num->input();
-            $tot_vat=bcadd($tot_vat,$num->value);
-
-            $num->name="tvac_march".$i;
-            $num->id="tvac_march".$i;
-            $num->value=($tmp_ad)?$tmp_ad->get_parameter('total'):0;
-            $num->size=8;
-            $aArticle[$i]['tvac']=$num->input();
-            $tot_item=bcadd($tot_item,$num->value);
-
-            $aArticle[$i]['hidden_htva']=HtmlInput::hidden('htva_march'.$i, 0);
-            $aArticle[$i]['hidden_tva']=HtmlInput::hidden('tva_march'.$i, 0);
-            $aArticle[$i]['ad_id']=($tmp_ad)?HtmlInput::hidden('ad_id'.$i, $tmp_ad->get_parameter('id')):HtmlInput::hidden('ad_id'.$i, 0);
-        }
-
         /* Add the needed hidden values */
         $r.=dossier::hidden();
 
-        /* add the number of item */
-        $Hid=new IHidden();
-        $r.=$Hid->input("nb_item", $article_count);
         $r.=HtmlInput::request_to_hidden(array("closed_action", "remind_date_end", "remind_date", "sag_ref", "only_internal", "state", "qcode", "ag_dest_query", "action_query", "tdoc", "date_start", "date_end", "hsstate", "searchtag"));
         $a_tag=$this->tag_get();
         $menu=new Default_Menu();
@@ -671,9 +575,10 @@ class Follow_Up
             $this->ag_remind_date /* 13 */
                 )
         );
-
+        $http=new HttpInput();
+        $nb_item=$http->post("nb_item","number",0);
         /* insert also the details */
-        for ($i=0; $i<$_POST['nb_item']; $i++)
+        for ($i=0; $i<$nb_item; $i++)
         {
             $act=new Follow_Up_Detail($this->db);
             $act->from_array($_POST, $i);
@@ -861,7 +766,7 @@ class Follow_Up
      *
      * \return true on success otherwise false
      */
-    function Update()
+    function update()
     {
 
         // if ag_id == 0 nothing to do
diff --git a/include/class/follow_up_detail.class.php b/include/class/follow_up_detail.class.php
index fdb39abfd..0967d99ea 100644
--- a/include/class/follow_up_detail.class.php
+++ b/include/class/follow_up_detail.class.php
@@ -233,6 +233,11 @@ class Follow_Up_Detail
         if (trim($this->ad_total_amount)==""||isNumber($this->ad_total_amount)==0) $this->ad_total_amount=0;
         if (trim($this->ad_tva_id)=="" || isNumber($this->ad_tva_id)==0) $this->ad_tva_id=0;
     }
+    
+    public static function display(Follow_Up $p_follow_up,$p_view)
+    {
+         require NOALYSS_TEMPLATE."/follow_up_detail_display.php";
+    }
     /*!\brief
      *\param
      *\return
diff --git a/include/class/operation_predef_mtable.class.php b/include/class/operation_predef_mtable.class.php
index ceae85b6b..a425c3e46 100644
--- a/include/class/operation_predef_mtable.class.php
+++ b/include/class/operation_predef_mtable.class.php
@@ -67,7 +67,7 @@ class Operation_Predef_MTable extends Manage_Table_SQL
         // create our own "Append button"
         $this->set_append_row(false);
         $this->set_dialog_box("prdfop");
-        $this->set_dialogbox_style(["position"=>"absolute","top"=>"5%","width:auto","min-width"=>"80%"]);
+        $this->set_dialogbox_style(["position"=>"fixed","top"=>"5%","width:auto","min-width"=>"80%"]);
     }
 
     /**
diff --git a/include/class/pre_op_advanced.class.php b/include/class/pre_op_advanced.class.php
index b870ef17a..e1e45ec14 100644
--- a/include/class/pre_op_advanced.class.php
+++ b/include/class/pre_op_advanced.class.php
@@ -191,8 +191,8 @@ class Pre_Op_Advanced extends Pre_operation_detail
         $ret.=HtmlInput::hidden('jrn_type', "ODS");
         $info = Icon_Action::infobulle(0);
         $info_poste = Icon_Action::infobulle(9);
-        if ($g_user->check_action(FICADD) == 1)
-                $ret.=$f_add_button->input();
+        if ($g_user->check_action(FICADD) == 1)                 $ret.=$f_add_button->input();
+        $ret.='<div class="fieldset" style="overflow:auto;height:400px">';
         $ret.='<table id="quick_item" style="width:100%">';
         $ret.='<tr>' .
                         '<th style="text-align:left">Quickcode' . $info . '</th>' .
@@ -287,6 +287,7 @@ class Pre_Op_Advanced extends Pre_operation_detail
                 // If readonly == 1 then show CA
         }
         $ret.='</table>';
+        $ret.="</div>";
         $ret.=Html_Input_Noalyss::ledger_add_item("M");
         return $ret;
     }
diff --git a/include/database/contact_option_ref_sql.class.php b/include/database/contact_option_ref_sql.class.php
new file mode 100644
index 000000000..5e3906094
--- /dev/null
+++ b/include/database/contact_option_ref_sql.class.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * Autogenerated file 
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
+
+/**
+ * class_contact_option_ref_sql.php
+ *
+ * @file
+ * @brief abstract of the table public.contact_option_ref */
+class Contact_option_ref_SQL extends Noalyss_SQL
+{
+
+    function __construct(Database $p_cn, $p_id=-1)
+    {
+        $this->table="public.contact_option_ref";
+        $this->primary_key="cor_id";
+        /*
+         * List of columns
+         */
+        $this->name=array(
+            "cor_id"=>"cor_id"
+            , "cor_label"=>"cor_label"
+            , "cor_type"=>"cor_type"
+            , "cor_value_select"=>"cor_value_select"
+        );
+        /*
+         * Type of columns
+         */
+        $this->type=array(
+            "cor_id"=>"numeric"
+            , "cor_label"=>"text"
+            , "cor_type"=>"numeric"
+            , "cor_value_select"=>"text"
+        );
+
+
+        $this->default=array(
+            "cor_id"=>"auto"
+        );
+
+        $this->date_format="DD.MM.YYYY";
+        parent::__construct($p_cn, $p_id);
+    }
+
+}
diff --git a/include/lib/manage_table_sql.class.php b/include/lib/manage_table_sql.class.php
index 20784304a..0c7d3e636 100644
--- a/include/lib/manage_table_sql.class.php
+++ b/include/lib/manage_table_sql.class.php
@@ -61,6 +61,7 @@
  * @see sorttable.js
  * 
  */
+require_once NOALYSS_INCLUDE."/lib/http_input.class.php";
 
 class Manage_Table_SQL
 {
@@ -258,7 +259,7 @@ class Manage_Table_SQL
     }
 
     /**
-     * This function can be overrided to check the data before 
+     * @brief This function can be overrided to check the data before 
      * inserting , updating or removing, above an example of an overidden check.
      * 
      * Usually , you get the row of the table (get_table) , you check the conditions
@@ -268,7 +269,8 @@ class Manage_Table_SQL
      * 
      * @see set_error get_error count_error
      * @return boolean
-     * @code 
+     * 
+@code 
 function check()
     {
         global $cn;
@@ -292,7 +294,7 @@ function check()
         if ( $is_error > 0 ) return false;
         return true;
     }    
-     * @endcode
+@endcode
      */
     function check()
     {
@@ -776,6 +778,7 @@ function check()
     function from_request()
     {
         $nb=count($this->a_order);
+        $http=new HttpInput();
         for ($i=0; $i<$nb; $i++)
         {
             
@@ -783,7 +786,7 @@ function check()
             if ($this->get_property_visible($key)==TRUE&&$this->get_property_updatable($key)
                     ==TRUE)
             {
-                $v=HtmlInput::default_value_request($this->a_order[$i], "");
+                $v=$http->request($this->a_order[$i],"string","");
                 $this->table->$key=strip_tags($v);
             }
         }
@@ -1094,7 +1097,7 @@ function check()
 
             ob_start();
 
-            echo HtmlInput::title_box("Donnée", $this->dialog_box,"close","","y");
+            echo HtmlInput::title_box(_("Donnée"), $this->dialog_box,"close","","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,
diff --git a/include/template/detail-action.php b/include/template/detail-action.php
index 0ecc3bd3f..515559014 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -7,7 +7,7 @@ $uniq=uniqid("tab",TRUE);
 
 
     <table>
-			<tr class="highlight">
+        <tr class="highlight">
             <TD>
 	    <?php echo _('N° document')?>
             </TD>
@@ -57,6 +57,7 @@ $uniq=uniqid("tab",TRUE);
           echo _('Pas de catégorie de contact');
       endif;
   endif;
+  
             ?>
           </td>
           </Tr>
@@ -65,7 +66,7 @@ $uniq=uniqid("tab",TRUE);
              <?php echo $spcontact->input(); ?>
           </td>
           </Tr>
-          <?php if ($this->ag_id > 0 ): ?>
+          <?php if ($this->ag_id > 0 && Document_Option::is_enable_contact_multiple($this->dt_id)): ?>
           <tr>
               <td>
                   <?php echo _('Autres concernés')?>
@@ -280,132 +281,52 @@ echo '</span>';
 <?php endif; ?>
   </div>
 </div>
-<?php if ( $p_view !='READ'  ) :?>
-<input type='button' class="button" class="noprint" value="<?php echo _('Montrer articles');?>" id="toggleButton" onclick='toggleShowDetail()'>
-<?php endif; ?>
-<?php
-/**
- * check if there card to show,
- */
-$show_row=0;
-for ($i=0;$i<count($aArticle);$i++) :
-	if ( ($aCard[$i] != 0 && $p_view == 'READ') || $p_view != 'READ'){ $show_row=1;break;}
-endfor;
+<?php 
+/**********************************************************************************************************************
+ * START BLOCK Display Detail of follow up
+ *
+ **********************************************************************************************************************/
 ?>
 <?php
-/*
- * display detail if there card or if we are in UPDATE or NEW mode
- */
-if ($show_row !=0 ) :
+// Display detail if detail_operation is set
+if ( $this->ag_id > 0 && Document_Option::is_enable_operation_detail($this->dt_id)) Follow_Up_Detail::display($this,$p_view);
 
-	?>
-<div id="fldDetail" class="myfieldset" style='padding-bottom:  100px;display:block;top:2px'>
-   <LEGEND> <?php echo _('Détail')?>
-</LEGEND>
-<?php // hidden fields
-$show_row=0;
-for ($i=0;$i<count($aArticle);$i++) :
-	echo $aArticle[$i]['ad_id'];
-	echo $aArticle[$i]['hidden_tva'];
-	echo $aArticle[$i]['hidden_htva'];
-	if ( ($aCard[$i] != 0 && $p_view == 'READ') || $p_view != 'READ'){ $show_row=1;}
-endfor;
 ?>
-    <div>
-<table style="width:100%" id="art" >
-<tr>
-  <th><?php echo _('Fiche')?></th>
-  <th><?php echo _('Description')?></th>
-  <th><?php echo _('prix unitaire')?></th>
-<th><?php echo _('quantité')?></th>
-<th><?php echo _('Code TVA')?></th>
-<th><?php echo _('Montant TVA')?></th>
-<th><?php echo _('Montant TVAC')?></th>
+<?php 
+/**********************************************************************************************************************
+ * END BLOCK Display Detail of follow up
+ **********************************************************************************************************************/
+?>
+
+<div style="clear:both"></div>    
 
-</tr>
-<?php for ($i=0;$i<count($aArticle);$i++): ?>
-<?php
-if ( ($aCard[$i] != 0 && $p_view == 'READ') || $p_view != 'READ'):
-	$show_row++;
-	?>
-<TR>
-<TD><?php echo $aArticle[$i]['fid'] ?></TD>
-<TD><?php echo $aArticle[$i]['desc'] ?></TD>
-<TD class="num"><?php echo $aArticle[$i]['pu'] ?></TD>
-<TD class="num"><?php echo $aArticle[$i]['quant'] ?></TD>
-<TD class="num"><?php echo $aArticle[$i]['tvaid'] ?></TD>
-<TD class="num"><?php echo $aArticle[$i]['tva'] ?></TD>
-<TD class="num"><?php echo $aArticle[$i]['tvac'] ?></TD>
-</TR>
-<?php endif; ?>
-<?php endfor; ?>
-</table>
-    </div>
-    <?php if ($p_view != "READ" ): ?>
-<script language="JavaScript">
-if ( $('e_march0') && $('e_march0').value =='') { toggleShowDetail();}
-function toggleShowDetail() {
-	try {var detail=g('fldDetail');
-	var but=g('toggleButton');
-	if (detail.style.display=='block' ) { but.value="<?php echo _("Montrer les détails")?>";detail.style.display='none';}
-	else { but.value="<?php echo _("Cacher les détails")?>";detail.style.display='block';} }
-	catch (error)  {alert(error);}
-	}
-</script>    
-<?php endif; ?>
-<?php if ( $show_row != 0 ): ?>
-<div>
   
-    <div style=" float:right;margin-right: 2px" id="sum">
-    <br><span style="text-align: right;" class="highlight" id="htva"><?php echo bcsub($tot_item,$tot_vat) ?></span>
-     <br><span style="text-align: right" class="highlight" id="tva"><?php echo $tot_vat?></span>
-    <br><span style="text-align: right" class="highlight" id="tvac"><?php echo $tot_item?></span>
- </div>
 
-    <div  style="float:right;margin-right: 230px" >
-    <br>Total HTVA
-    <br>Total TVA
-    <br>Total TVAC
- </div>
+<div class="myfieldset" id="div_action_attached_doc">
+  <legend>
+     <?php echo _('Pièces attachées')?>
+  </legend>
+    <div class="noprint">
+        <?php 
+/**********************************************************************************************************************
+ * start BLOCK generate document
+ **********************************************************************************************************************/
+?>
 
- <?php if ( ! $readonly ) :  ?>
-    <div style="float:right" >
-    <input name="act" id="act_bt" class="smallbutton" value="<?php echo _('Actualiser')?>" onclick="compute_all_ledger();" type="button">
-     <input type="button" class="smallbutton" onclick="gestion_add_row()" value="<?php echo _("Ajouter une ligne")?>">
-     </div>
-     
-<?php endif; ?> 
-    <?php if ($p_view != 'READ' && $str_select_doc != '') : ?>
+ <?php if ($p_view != 'READ' && $str_select_doc != '') : ?>
          <?php echo _('Document à générer')?>
   </legend>
   <?php echo $str_select_doc;
  echo $str_submit_generate;
 
 endif; ?>
-    <legend>
-</div>
-<?php if ( $this->ag_id != 0 && ! $readonly) : ?>
-     <div >
-         <p>
-         <?php
-            $query=  http_build_query(array('gDossier'=>Dossier::id(),'ag_id'=>$this->ag_id,'create_invoice'=>1,'ac'=>$menu->get('code_invoice')));
-            echo HtmlInput::button_anchor(_("Transformer en facture"),"do.php?".$query,"create_invoice", '  target="_blank" ',"button");
-         ?>
-         </p>
-      </div>
-     <?php endif; ?>
-<?php endif; ?>
-</div>
-<?php endif; ?>
-
-<div style="clear:both"></div>    
-
-
-
-<div class="myfieldset" id="div_action_attached_doc">
-  <legend>
-     <?php echo _('Pièces attachées')?>
-  </legend>
+  
+<?php 
+/**********************************************************************************************************************
+ * end BLOCK generate document
+ **********************************************************************************************************************/
+?>
+    </div>
   <div class="print">
       <table>
   <?php
@@ -483,7 +404,7 @@ Document créé le <?php echo $this->ag_timestamp ?> par <?php echo $this->ag_ow
 <?php endif; ?>
 
 </div>
-<script>compute_all_ledger()</script>
+
 <script>
   $('related_action_tab<?php echo $uniq?>').onclick=function() {
       $('related_action_tab<?php echo $uniq?>').className='tabs_selected';
diff --git a/include/template/document_mod_change.php b/include/template/document_mod_change.php
deleted file mode 100644
index ba492c9ae..000000000
--- a/include/template/document_mod_change.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/*
- *   This file is part of NOALYSS.
- *
- *   NOALYSS is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   NOALYSS is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with NOALYSS; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-// Copyright Author Dany De Bontridder danydb@aevalys.eu
-
-/**\file
- * \brief this file respond to an ajax request to modify a type of document
- */
-require_once NOALYSS_INCLUDE.'/class/document_type.class.php';
-echo HtmlInput::title_box(_('Type de document'),'change_doc_div');
-
-$doc_type=new Document_type($cn,$dt_id);
-$doc_type->get();
-?>
-<form method="POST" id="cat_doc_f" onsubmit="cat_doc_change_record('cat_doc_f');">
-	<?php echo HtmlInput::request_to_hidden(array("ac","gDossier","dt_id"))?>
-<table>
-<tr>
-  <td> <?php echo _('Nom')?>
-  </td>
-  <td>
-	  <?php 
-	  $name=new IText('dt_name',$doc_type->dt_value);
-	  echo $name->input();
-	  ?>
-  </td>
-</tr>
-
-<tr>
-  <td><?php echo _('Préfixe')?>
-  </td>
-  <td>
-	  <?php 
-	  $prefix=new IText('dt_prefix',$doc_type->dt_prefix);
-	  echo $prefix->input();
-	  ?>
-  </td>
-</tr>
-
-<tr>
-  <td><?php echo _('numéro actuel')?>
-  </td>
-  <td>
-	<?php 
-	$ret= $cn->get_array("select last_value,is_called from seq_doc_type_".$doc_type->dt_id) ;
-
-    $last=$ret[0]['last_value'];
-             /*!
-                  *\note  With PSQL sequence , the last_value column is 1 when before   AND after the first call, to make the difference between them
-                  * I have to check whether the sequence has been already called or not */
-    if ($ret[0]['is_called']=='f' ) $last--;
-	echo $last;
-	?>
-  </td>
-  <tr>
-  <td><?php echo _('Prochain numéro')?>
-	  <?php echo 
-		Icon_Action::infobulle(15);
-	?>
-  </td>
-   <td>
-	  <?php 
-	  $seq=new INum('seq',0);
-	  echo $seq->input();
-	  ?>
-  </td>
-</tr>
-
-</table>
-
-  <?php echo HtmlInput::submit("save",_('Sauver'));?>
-</form>
\ No newline at end of file
diff --git a/include/template/follow_up_detail_display.php b/include/template/follow_up_detail_display.php
new file mode 100644
index 000000000..27322909f
--- /dev/null
+++ b/include/template/follow_up_detail_display.php
@@ -0,0 +1,191 @@
+<?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+/**
+ * @file
+ * @brief Called from Follow_Up_Detail for displaying detail
+ * @see Follow_Up_Detail::display
+ */
+// Number of articles
+$article_count=(count($p_follow_up->aAction_detail)==0)?MAX_ARTICLE:count($p_follow_up->aAction_detail);
+// total item and vat
+$tot_item=0;
+$tot_vat=0;
+$text=new IText();
+$num=new INum();
+$itva=new ITva_Popup();
+$readonly=$p_view;
+
+// default menu for invoice
+$menu=new Default_Menu();
+?>
+<div id="follow_up_detail">
+    <?php echo HtmlInput::hidden("nb_item", $article_count); ?>
+
+    <table style="width:100%"  id="sold_item">
+        <tr>
+            <th><?php echo _('Fiche') ?></th>
+            <th><?php echo _('Description') ?></th>
+            <th><?php echo _('prix unitaire') ?></th>
+            <th><?php echo _('quantité') ?></th>
+            <th><?php echo _('Code TVA') ?></th>
+            <th><?php echo _('Montant TVA') ?></th>
+            <th><?php echo _('Montant TVAC') ?></th>
+
+        </tr>
+        <?php
+        for ($i=0; $i<$article_count; $i++):
+            /* fid = Icard  */
+            $icard=new ICard();
+            $icard->jrn=0;
+            $icard->table=0;
+            $icard->noadd="no";
+            $icard->extra='all';
+            $icard->name="e_march".$i;
+            $tmp_ad=(isset($p_follow_up->aAction_detail[$i]))?$p_follow_up->aAction_detail[$i]:$readonly;
+            $icard->readOnly=$readonly;
+            $icard->value='';
+            $aCard[$i]=0;
+            if ($tmp_ad)
+            {
+                $march=new Fiche($p_follow_up->db);
+                $f=$tmp_ad->get_parameter('qcode');
+                if ($f!=0)
+                {
+                    $march->id=$f;
+                    $icard->value=$march->get_quick_code();
+                    $aCard[$i]=$f;
+                }
+            }
+            $icard->set_dblclick("fill_ipopcard(this);");
+            // name of the field to update with the name of the card
+            $icard->set_attribute('label', "e_march".$i."_label");
+            // name of the field to update with the name of the card
+            $icard->set_attribute('typecard', $icard->extra);
+            $icard->set_attribute('ipopup', 'ipopcard');
+            $icard->set_function('fill_data');
+            $icard->javascript=sprintf(' onchange="fill_data_onchange(\'%s\');" ', $icard->name);
+
+            $aArticle[$i]['fid']=$icard->search().$icard->input();
+
+            $text->javascript=' onchange="clean_tva('.$i.');compute_ledger('.$i.')"';
+            $text->css_size="100%";
+            $text->name="e_march".$i."_label";
+            $text->id="e_march".$i."_label";
+            $text->size=40;
+            $text->value=($tmp_ad)?$tmp_ad->get_parameter('text'):"";
+            $text->readOnly=$readonly;
+            $aArticle[$i]['desc']=$text->input();
+
+            $num->javascript=' onchange="format_number(this,4);clean_tva('.$i.');compute_ledger('.$i.')"';
+            $num->name="e_march".$i."_price";
+            $num->id="e_march".$i."_price";
+            $num->size=8;
+            $num->readOnly=$readonly;
+            $num->value=($tmp_ad)?$tmp_ad->get_parameter('price_unit'):0;
+            $aArticle[$i]['pu']=$num->input();
+
+            $num->name="e_quant".$i;
+            $num->id="e_quant".$i;
+            $num->size=8;
+            $num->value=($tmp_ad)?$tmp_ad->get_parameter('quantity'):0;
+            $aArticle[$i]['quant']=$num->input();
+
+            $itva->name='e_march'.$i.'_tva_id';
+            $itva->id='e_march'.$i.'_tva_id';
+            $itva->value=($tmp_ad)?$tmp_ad->get_parameter('tva_id'):0;
+            $itva->readOnly=$readonly;
+            $itva->js=' onchange="format_number(this);clean_tva('.$i.');compute_ledger('.$i.')"';
+            $itva->set_attribute('compute', $i);
+
+            $aArticle[$i]['tvaid']=$itva->input();
+
+            $num->name="e_march".$i."_tva_amount";
+            $num->id="e_march".$i."_tva_amount";
+            $num->value=($tmp_ad)?$tmp_ad->get_parameter('tva_amount'):0;
+            $num->javascript=" onchange=\"compute_ledger('".$i." ')\"";
+            $num->size=8;
+            $aArticle[$i]['tva']=$num->input();
+            $tot_vat=bcadd($tot_vat, $num->value);
+
+            $num->name="tvac_march".$i;
+            $num->id="tvac_march".$i;
+            $num->value=($tmp_ad)?$tmp_ad->get_parameter('total'):0;
+            $num->size=8;
+            $aArticle[$i]['tvac']=$num->input();
+            $tot_item=bcadd($tot_item, $num->value);
+
+            $aArticle[$i]['hidden_htva']=HtmlInput::hidden('htva_march'.$i, 0);
+            $aArticle[$i]['hidden_tva']=HtmlInput::hidden('tva_march'.$i, 0);
+            $aArticle[$i]['ad_id']=($tmp_ad)?HtmlInput::hidden('ad_id'.$i, $tmp_ad->get_parameter('id')):HtmlInput::hidden('ad_id'.$i,
+                            0);
+            ?>
+
+            <TR>
+                <TD><?php echo $aArticle[$i]['fid'] ?></TD>
+                <TD><?php echo $aArticle[$i]['desc'] ?></TD>
+                <TD class="num"><?php echo $aArticle[$i]['pu'] ?></TD>
+                <TD class="num"><?php echo $aArticle[$i]['quant'] ?></TD>
+                <TD class="num"><?php echo $aArticle[$i]['tvaid'] ?></TD>
+                <TD class="num"><?php echo $aArticle[$i]['tva'] ?></TD>
+                <TD class="num"><?php echo $aArticle[$i]['tvac'] ?>
+                    <?php echo $aArticle[$i]['hidden_tva']; ?>
+                    <?php echo $aArticle[$i]['hidden_htva']; ?>
+                    <?php echo $aArticle[$i]['ad_id']; ?>
+                </TD>
+            </TR>
+            <?php
+        endfor;
+        ?>
+    </table>
+    <div>
+
+        <div style=" float:right;margin-right: 2px" id="sum">
+            <br><span style="text-align: right;" class="highlight" id="htva"><?php echo bcsub($tot_item, $tot_vat) ?></span>
+            <br><span style="text-align: right" class="highlight" id="tva"><?php echo $tot_vat ?></span>
+            <br><span style="text-align: right" class="highlight" id="tvac"><?php echo $tot_item ?></span>
+        </div>
+
+        <div  style="float:right;margin-right: 230px" >
+            <br>Total HTVA
+            <br>Total TVA
+            <br>Total TVAC
+        </div>
+
+    </div>
+    <div id="d_add_rows">
+    <?php echo Html_Input_Noalyss::ledger_add_item("O"); ?>
+        
+    <?php echo HtmlInput::button('actualiser', _('Recalculer'), ' onClick="compute_all_ledger();"'); ?>
+    </div>
+    <script>compute_all_ledger()</script>    
+    <?php
+    if (Document_Option::is_enable_make_invoice($p_follow_up->dt_id)):
+        ?>
+        <p id="follow_up_detail_invoice">
+            <?php
+            $query=http_build_query(array('gDossier'=>Dossier::id(), 'ag_id'=>$p_follow_up->ag_id, 'create_invoice'=>1, 'ac'=>$menu->get('code_invoice')));
+            echo HtmlInput::button_anchor(_("Transformer en facture"), "do.php?".$query, "create_invoice",
+                    '  target="_blank" ', "button");
+            ?>
+        </p>
+        <?php
+    endif;
+    ?>
\ No newline at end of file
diff --git a/include/template/predf_ledger_detail.php b/include/template/predf_ledger_detail.php
index d46eff899..2174ea1d1 100644
--- a/include/template/predf_ledger_detail.php
+++ b/include/template/predf_ledger_detail.php
@@ -8,7 +8,7 @@
 <?php echo $str_add_button?>
 </fieldset>
 
-<div class="fieldset">
+<div class="fieldset" style="overflow:auto;height:400px">
 <h1 class="fiedset"><?php echo $f_legend_detail?></h1>
 
 <table id="sold_item" width="100%" border="0">
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index 8dac2066e..1dae36d28 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -49,3 +49,94 @@ LANGUAGE plpgsql;
 ALTER TABLE public.user_sec_action_profile drop CONSTRAINT user_sec_action_profile_ua_right_check;
 ALTER TABLE public.user_sec_action_profile ADD CONSTRAINT user_sec_action_profile_ua_right_check check (ua_right in ('R','W','X','O'));
 
+-- extension CRM : definition des options qu'on peut ajouter
+-- public.document_option_ref definition
+
+-- Drop table
+
+-- DROP TABLE public.document_option_ref;
+
+CREATE TABLE public.document_option_ref (
+	do_id bigserial NOT NULL,
+	do_code varchar(20) NOT NULL, -- Code of the option to add
+	document_type_id int8 NULL, -- FK to document_type
+	CONSTRAINT document_option_ref_pk PRIMARY KEY (do_id)
+);
+COMMENT ON TABLE public.document_option_ref IS 'Reference of option of document_type';
+
+-- Column comments
+
+COMMENT ON COLUMN public.document_option_ref.do_code IS 'Code of the option to add';
+COMMENT ON COLUMN public.document_option_ref.document_type_id IS 'FK to document_type';
+
+
+-- public.document_option_ref foreign keys
+
+ALTER TABLE public.document_option_ref ADD CONSTRAINT document_option_ref_fk FOREIGN KEY (document_type_id) REFERENCES document_type(dt_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+-- Drop table
+
+CREATE TABLE public.contact_option_ref (
+	cor_id bigserial NOT NULL,
+	cor_label varchar NOT NULL, -- Label de l'option
+	cor_type int4 NOT NULL DEFAULT 0, -- 0 text , 1 select ,2 nombre , 3 date
+	cor_value_json json NULL, -- json object if cor_type is a select
+	document_option_id int8 NOT NULL, -- FK to document_option
+	CONSTRAINT contact_option_ref_pk PRIMARY KEY (cor_id),
+	CONSTRAINT contact_option_ref_fk FOREIGN KEY (document_option_id) REFERENCES document_option(do_id) ON UPDATE CASCADE ON DELETE CASCADE
+);
+COMMENT ON TABLE public.contact_option_ref IS 'Option for the contact';
+
+-- Column comments
+
+COMMENT ON COLUMN public.contact_option_ref.cor_label IS 'Label de l''option';
+COMMENT ON COLUMN public.contact_option_ref.cor_type IS '0 text , 1 select ,2 nombre , 3 date';
+COMMENT ON COLUMN public.contact_option_ref.cor_value_json IS 'json object if cor_type is a select';
+COMMENT ON COLUMN public.contact_option_ref.document_option_id IS 'FK to document_option';
+
+
+CREATE TABLE public.action_person_option (
+	ap_id bigserial NOT NULL,
+	ap_value varchar NULL, -- Value of the option
+	contact_option_ref_id int8 NOT NULL,
+	action_person_id int8 NOT NULL,
+	CONSTRAINT action_person_option_pk PRIMARY KEY (ap_id),
+	CONSTRAINT action_person_option_fk FOREIGN KEY (action_person_id) REFERENCES action_person(ap_id) ON UPDATE CASCADE ON DELETE CASCADE,
+	CONSTRAINT contact_option_ref_fk FOREIGN KEY (contact_option_ref_id) REFERENCES contact_option_ref(cor_id) ON UPDATE CASCADE ON DELETE CASCADE
+);
+COMMENT ON TABLE public.action_person_option IS 'option for each contact';
+
+-- Column comments
+
+COMMENT ON COLUMN public.action_person_option.ap_value IS 'Value of the option';
+
+-- renomme le menu
+update menu_ref set me_description = 'Configuration des documents dans le suivi' ,me_file='cfg_action.inc.php' ,
+me_description_etendue ='Vous permet d''ajouter de nouveaux type de documents pour le suivi (bordereau de livraison, devis..)',me_code='CFGACTION',
+me_menu='Document Suivi'
+where me_code='CFGCATDOC';
+
+
+ALTER TABLE public.document_option ADD do_activate int NOT NULL DEFAULT 1;
+COMMENT ON COLUMN public.document_option.do_activate IS '1 the option is activated, 0 is inativated';
+
+ALTER TABLE public.document_option ADD CONSTRAINT document_option_un UNIQUE (do_code,document_type_id);
+ALTER TABLE public.document_option RENAME COLUMN do_activate TO do_enable;
+
+-- ajoute un menu pour les options de contacts
+INSERT INTO public.menu_ref (me_code,me_menu,me_file,me_url,me_description,me_parameter,me_javascript,me_type,me_description_etendue) VALUES 
+('CFGCONTACT','Contact','contact_option_ref.inc.php',NULL,'Configure les options pours les contacts multiples',NULL,NULL,'ME',NULL)
+;
+
+INSERT INTO public.profile_menu (me_code,me_code_dep,p_id,p_order,p_type_display,pm_default,pm_id_dep) VALUES 
+('CFGCONTACT','DIVPARM',1,85,'E',0,56)
+;
+
+-- contact option globale pour toutes les actions
+ALTER TABLE public.contact_option_ref DROP COLUMN document_option_id;
+
+-- on utilise un varchar pour stocker les possibilités
+ALTER TABLE public.contact_option_ref DROP COLUMN cor_value_json;
+ALTER TABLE public.contact_option_ref ADD cor_value_select varchar NULL;
+COMMENT ON COLUMN public.contact_option_ref.cor_value_select IS 'Select values';
\ No newline at end of file

From e2b76d52c47b9975219925b9ccef73c890b345f0 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sun, 4 Oct 2020 13:33:15 +0200
Subject: [PATCH 045/257] ManageTable : add tbody and thead , fix javascript
 error

---
 html/js/scripts.js                     | 4 +++-
 include/lib/manage_table_sql.class.php | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/html/js/scripts.js b/html/js/scripts.js
index f5907020f..0961481b5 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -3081,6 +3081,8 @@ function alert_box(p_message)
 function alternate_row_color(p_table)
 {
     var table_colored=$(p_table);
+    if (! table_colored.tBodies[0] ) return;
+
     var len = table_colored.tBodies[0].rows.length;
     var i = 0;
     var localClass = "";
@@ -3717,4 +3719,4 @@ function json_concat(p_json1,p_json2)
         }
         return result;
 
-}
\ No newline at end of file
+}
diff --git a/include/lib/manage_table_sql.class.php b/include/lib/manage_table_sql.class.php
index 0c7d3e636..116d61ff3 100644
--- a/include/lib/manage_table_sql.class.php
+++ b/include/lib/manage_table_sql.class.php
@@ -692,10 +692,12 @@ function check()
             if ($i==0)
             {
                 $this->display_table_header();
+                echo '<tbody>';
             }
             $row=Database::fetch_array($ret, $i);
             $this->display_row($row);
         }
+        echo '</tbody>';
         echo "</table>";
         if ($this->can_append_row()==TRUE)
         {
@@ -715,6 +717,7 @@ function check()
     function display_table_header()
     {
         $nb=count($this->a_order);
+        echo '<thead>';
         echo "<tr>";
 
         if ($this->can_update_row() && $this->icon_mod=="left")
@@ -745,6 +748,7 @@ function check()
             echo th(" ", 'style="width:40px"  class="sorttable_nosort" ');
         }
         echo "</tr>";
+        echo '</thead>';
     }
     /**
      * set the column to sort by default

From dbea6cee68fdbe438031ee5ebf0992e64fc0ace6 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sun, 4 Oct 2020 15:02:34 +0200
Subject: [PATCH 046/257] Follow-up : tag enable when create doc

---
 include/action.common.inc.php                 |  6 ++--
 include/action.inc.php                        |  2 +-
 include/class/follow_up.class.php             |  7 +++--
 include/template/action_button.php            | 30 +++++++++++++++----
 include/template/follow_up_detail_display.php |  5 ++--
 5 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/include/action.common.inc.php b/include/action.common.inc.php
index 976fcbef3..33904ec76 100644
--- a/include/action.common.inc.php
+++ b/include/action.common.inc.php
@@ -284,12 +284,13 @@ if ($sub_action == "save_action_st2")
 	$act->fromArray($_POST);
     try {
 	$act->d_id = 0;
+        $act->ag_id=$http->request("ag_id","number");
 	$act->md_id = (isset($_POST['gen_doc'])) ? $_POST['gen_doc'] : 0;
 
         $act->verify();
         
 	// insert into action_gestion
-	echo $act->save();
+	echo $act->update();
 	$url = "?$base&sa=detail&ag_id=" . $act->ag_id . '&' . dossier::get();
 	echo '<p><a class="mtitle" href="' . $url . '">' . hb(_('Evènement Sauvée').'  : ' . $act->ag_ref) . '</a></p>';
 
@@ -312,8 +313,9 @@ if ($sub_action == "add_action")
 {
 	$act = new Follow_Up($cn);
 	$act->fromArray($_POST);
-	$act->ag_id = 0;
+	$act->dt_id = $http->request("action_type","number");
 	$act->d_id = 0;
+	$act->save();
 	echo '<div class="content">';
 	// Add hidden tag
 	echo '<form method="post" action="do.php" name="form_add" id="form_add" enctype="multipart/form-data" >';
diff --git a/include/action.inc.php b/include/action.inc.php
index 9f61297b2..70406bb75 100644
--- a/include/action.inc.php
+++ b/include/action.inc.php
@@ -57,7 +57,7 @@ $ag_id=$http->request("ag_id","string","0");
 
 $ac=$http->request("ac");
 $base=HtmlInput::request_to_string(array('ac','gDossier'),"");
-
+echo '<div class="content">';
 require_once NOALYSS_INCLUDE.'/action.common.inc.php';
 echo "</div>";
 
diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 3aa0b6dde..e38f4a74e 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -165,7 +165,6 @@ class Follow_Up
         {
             $upd=false;
             $readonly=false;
-            $this->ag_ref=_("Nouveau");
         }
         elseif ($p_view=='READ')
         {
@@ -390,7 +389,7 @@ class Follow_Up
         $h_agrefid=new IHidden();
         $iag_ref=new IText("ag_ref");
         $iag_ref->value=$this->ag_ref;
-        $iag_ref->readOnly=($p_view=="NEW"||$p_view=='READ')?true:false;
+        $iag_ref->readOnly=false;
         $str_ag_ref=$iag_ref->input();
         // Preparing the return string
         $r="";
@@ -871,7 +870,9 @@ class Follow_Up
         $doc->Upload($this->ag_id);
 
         /* save action details */
-        for ($i=0; $i<$_POST['nb_item']; $i++)
+        $http=new HttpInput();
+        $nb_item=$http->post("nb_item","number",0);        
+        for ($i=0; $i< $nb_item ; $i++)
         {
             $act=new Follow_Up_Detail($this->db);
             $act->from_array($_POST, $i);
diff --git a/include/template/action_button.php b/include/template/action_button.php
index 0d7287910..04a621d3c 100644
--- a/include/template/action_button.php
+++ b/include/template/action_button.php
@@ -26,19 +26,39 @@
  * @brief show button in the list of actions
  *
  */
+$http=new HttpInput();
 ?>
 <div class="content" style="display:inline" >
 	<div style="display:inline">
+            <input id="bt_search" type="button" class="smallbutton" onclick="$('search_action').style.display='block'" value="<?php echo _('Recherche') ?>">
+            <input id="bt_add" type="button" class="smallbutton" onclick="$('b_add_action').style.display='block';document.getElementById('action_type').focus()" value="<?php echo _('Ajout') ?>">
+            <div id="b_add_action" style="display:none" class="inner_box">
+                <?php echo HtmlInput::title_box(_("Ajout d'une action"), "b_add_action","hide");?>
 		<form  method="get" style="display:inline" action="do.php">
 			<?php echo dossier::hidden();
+                        $a_typeAction=new ISelect("action_type");
+                        $a_typeAction->rowsize=10;
+                        $a_typeAction->value=$cn->make_array("select dt_id,dt_value from document_type order by 2");
+                        echo _("Type action ");
+                        echo $a_typeAction->input();
 			?>
-			<input type="submit" class="smallbutton" name="submit_query" value="<?php echo  _("Ajout Action")?>">
-			<input type="hidden" name="ac" value="<?php echo  $_REQUEST['ac']?>">
+                        
+			<input type="hidden" name="ac" value="<?php echo  $http->request('ac')?>">
 			<input type="hidden" name="sa" value="add_action">
 			<?php echo  $supl_hidden?>
-			<input id="bt_search" type="button" class="smallbutton" onclick="$('search_action').style.display='block'" value="<?php echo  _('Recherche')?>">
-
+                    <ul class="aligned-block">
+                        <li>
+                            
+			<input type="submit" class="smallbutton" name="submit_query" value="<?php echo  _("Ajout Action")?>">
+                        </li>
+                        <li>
+                            <?php echo HtmlInput::button_hide("b_add_action");?>
+                        </li>
+                    </ul>
 
+                        
 
 		</form>
-	</div>
\ No newline at end of file
+            </div>
+	</div>
+</div>    
\ No newline at end of file
diff --git a/include/template/follow_up_detail_display.php b/include/template/follow_up_detail_display.php
index 27322909f..0ce27e905 100644
--- a/include/template/follow_up_detail_display.php
+++ b/include/template/follow_up_detail_display.php
@@ -31,8 +31,7 @@ $tot_vat=0;
 $text=new IText();
 $num=new INum();
 $itva=new ITva_Popup();
-$readonly=$p_view;
-
+$readonly=($p_view == "READ")?true:false;
 // default menu for invoice
 $menu=new Default_Menu();
 ?>
@@ -59,7 +58,7 @@ $menu=new Default_Menu();
             $icard->noadd="no";
             $icard->extra='all';
             $icard->name="e_march".$i;
-            $tmp_ad=(isset($p_follow_up->aAction_detail[$i]))?$p_follow_up->aAction_detail[$i]:$readonly;
+            $tmp_ad=(isset($p_follow_up->aAction_detail[$i]))?$p_follow_up->aAction_detail[$i]:false;
             $icard->readOnly=$readonly;
             $icard->value='';
             $aCard[$i]=0;

From 037a423a3ba4746bfc71262ba0d02f55cabac8b3 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sun, 4 Oct 2020 20:34:09 +0200
Subject: [PATCH 047/257] Tag and Group Tag

new : Tag and Group : available in search
new : all tags or only one,
---
 html/ajax_misc.php                       |  6 +-
 html/js/scripts.js                       | 11 +--
 html/js/taggroup.js                      | 70 ++++++++++++++++++
 include/ajax/ajax_search_add_tag.php     | 40 ++++++++---
 include/ajax/ajax_search_display_tag.php |  5 +-
 include/ajax/ajax_tag_detail.php         |  2 +-
 include/ajax/ajax_tag_group.php          | 64 +++++++++++++++++
 include/ajax/ajax_tag_set_group.php      | 77 ++++++++++++++++++++
 include/cfgtags.inc.php                  | 81 ++++++++++++++++-----
 include/class/follow_up.class.php        | 25 +++++--
 include/class/tag.class.php              |  6 +-
 include/class/tag_group_mtable.class.php | 91 ++++++++++++++++++++++++
 include/database/tag_group_sql.class.php | 62 ++++++++++++++++
 include/lib/function_javascript.php      |  1 +
 include/lib/html_input.class.php         | 14 ++--
 include/template/action_search.php       | 12 ++++
 include/template/tag_list.php            | 14 +++-
 include/template/tag_search_select.php   | 61 ++++++++++++++--
 sql/upgrade.sql                          | 35 ++++++++-
 19 files changed, 617 insertions(+), 60 deletions(-)
 create mode 100644 html/js/taggroup.js
 create mode 100644 include/ajax/ajax_tag_group.php
 create mode 100644 include/ajax/ajax_tag_set_group.php
 create mode 100644 include/class/tag_group_mtable.class.php
 create mode 100644 include/database/tag_group_sql.class.php

diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index 3ac6686d7..9a74ce07c 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -261,7 +261,11 @@ $path = array(
     // cfgaction type of document
     "cfgaction"=>'ajax_cfgaction',
     // list options for multiple contact
-    "contact_option_list"=>'ajax_contact_option_list'
+    "contact_option_list"=>'ajax_contact_option_list',
+    // Add group of tags
+   'tag_group'=>'ajax_tag_group',
+    // set the group for a tag
+    'tag_set_group'=>"ajax_tag_set_group"
 )    ;
 
 if (array_key_exists($op, $path)) {
diff --git a/html/js/scripts.js b/html/js/scripts.js
index 0961481b5..b29f05653 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -24,7 +24,8 @@
  *
  */
 var ask_reload = 0;
-var tag_choose = '';
+// tag_choose Element  which contains all the selected tags 
+var tag_choose = ''; 
 var aDraggableElement = new Array();
 /**
  * return undefined if nothing is found , otherwise return the DOM elemnt
@@ -2487,7 +2488,7 @@ function show_tag(p_dossier, p_ac, p_tag_id, p_post)
                         code_html = unescape_xml(code_html);
                         remove_waiting_box();
                         var posy = calcy(250);
-                        add_div({id: 'tag_div', cssclass: 'inner_box', drag: 0, style: "position:fixed;top:" + posy + "px"});
+                        add_div({id: 'tag_div', cssclass: 'inner_box', drag: 0, style: "position:fixed;top:15%;"});
                         $('tag_div').innerHTML = code_html;
                         try
                         {
@@ -2711,8 +2712,10 @@ function search_display_tag(p_dossier, p_prefix)
  * in the search screen
  * @param {type} p_dossier
  * @param {type} p_tag_id
+ * @param p_prefix is the prefix of the widget 
+ * @param p_obj is either g for group of tag or t for a single tag
  */
-function search_add_tag(p_dossier, p_tag_id, p_prefix)
+function search_add_tag(p_dossier, p_tag_id, p_prefix,p_obj)
 {
     try {
         var clear_button = 0;
@@ -2721,7 +2724,7 @@ function search_add_tag(p_dossier, p_tag_id, p_prefix)
             clear_button = 1;
         }
         waiting_box();
-        var queryString = "op=search_add_tag&gDossier=" + p_dossier + "&id=" + p_tag_id + "&clear=" + clear_button + '&pref=' + p_prefix;
+        var queryString = "op=search_add_tag&gDossier=" + p_dossier + "&id=" + p_tag_id + "&clear=" + clear_button + '&pref=' + p_prefix+"&obj="+p_obj;
         var action = new Ajax.Request(
                 "ajax_misc.php",
                 {
diff --git a/html/js/taggroup.js b/html/js/taggroup.js
new file mode 100644
index 000000000..b159a0f6c
--- /dev/null
+++ b/html/js/taggroup.js
@@ -0,0 +1,70 @@
+/* 
+ * Copyright (C) 2020 Dany De Bontridder <dany@alchimerys.be>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+
+var TagGroup = function ()
+{
+    this.callback = "ajax_misc.php";
+    this.param_operation = "tag_set_group";
+    this.list_tag = "ol_tag_group";
+    this.div_tag_add = "d_tag_group_add";
+    /**
+     * Add a tag to group and redraw the div "div_tag_add"
+     * @param {int} p_tag_group_id
+     * @param {int} p_tag_id
+     * @param {int} p_dossier
+     */
+    this.add_tag = function (p_tag_group_id, p_select, p_dossier) {
+        waiting_box();
+         // retrieve value from p_select
+        var p_tag_id = $(p_select).value;
+        new Ajax.Request(this.callback, {
+            method: "get",
+            parameters: {op: this.param_operation, gDossier: p_dossier, act: "add", tag_group: p_tag_group_id, tag: p_tag_id},
+            onSuccess: function (req) {
+                remove_waiting_box();
+                // redraw div_tag_add
+                $("d_tag_group_add").update(req.responseText);
+            }
+        });
+    };
+    /**
+     * removing a tag from a group and redraw the div "div_tag_add"
+     * @param {int} p_tag_group_id
+     * @param {int} p_tag_id
+     * @param {int} p_dossier
+     */
+    this.remove = function (p_jt_tag, p_dossier) {
+        waiting_box();
+       
+        new Ajax.Request(this.callback, {
+            method: "get",
+            parameters: {op: this.param_operation, 
+                gDossier: p_dossier, 
+                act: "remove", 
+                jt_tag: p_jt_tag
+                },
+            onSuccess: function (req) {
+                remove_waiting_box();
+                // redraw div_tag_add
+                $("d_tag_group_add").update(req.responseText);
+            }
+        });
+    };
+};
\ No newline at end of file
diff --git a/include/ajax/ajax_search_add_tag.php b/include/ajax/ajax_search_add_tag.php
index 339b45cec..2e5b2d2a8 100644
--- a/include/ajax/ajax_search_add_tag.php
+++ b/include/ajax/ajax_search_add_tag.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  *   This file is part of NOALYSS.
  *
@@ -17,23 +18,42 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
-if ( !defined ('ALLOWED') )  die('Appel direct ne sont pas permis');
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
 /**
- *@file
- *@brief add tag , used for follow up
- *@see Tag
+ * @file
+ * @brief add tag , used for follow up
+ * @see Tag
  */
-
 require_once NOALYSS_INCLUDE.'/class/tag.class.php';
+//Single Tag
 ob_start();
-if ($_GET['clear']==1) {
+if ($_GET['clear']==1)
+{
     /* Add a clear button */
     echo Tag::add_clear_button($_GET['pref']);
 }
-$tag=new Tag($cn,$_GET['id']);
-$tag->update_search_cell($_GET['pref']);
+if ($http->request("obj")=='t')
+{
 
-$response=  ob_get_clean();
+    $tag=new Tag($cn, $http->get("id", "number"));
+    $tag->update_search_cell($http->get("pref"));
+}
+elseif ($http->request("obj")=="g")
+{
+    // Add all the tag from the group 
+    $aTag=$cn->get_array("select t_id,t_tag from jnt_tag_group_tag jtgt  join tags on (tag_id=t_id) where tag_group_id=1 order by 2 ");
+    $nb_atag=count($aTag);
+    $pref=$http->get("pref");
+    if ( $nb_atag > 0) {
+        for ($i=0;$i<$nb_atag;$i++){
+            $tag=new Tag($cn,$aTag[$i]['t_id']);
+            $tag->update_search_cell($pref);
+        }
+    }
+    
+}
+$response=ob_get_clean();
 $html=escape_xml($response);
 header('Content-type: text/xml; charset=UTF-8');
 echo <<<EOF
@@ -44,7 +64,5 @@ echo <<<EOF
 </data>
 EOF;
 exit();
-
-
 ?>
 
diff --git a/include/ajax/ajax_search_display_tag.php b/include/ajax/ajax_search_display_tag.php
index 59d962739..b4295cc38 100644
--- a/include/ajax/ajax_search_display_tag.php
+++ b/include/ajax/ajax_search_display_tag.php
@@ -25,11 +25,10 @@ if ( !defined ('ALLOWED') )  die('Appel direct ne sont pas permis');
  */
 
 require_once NOALYSS_INCLUDE.'/class/tag.class.php';
-ob_start();
 $tag=new Tag($cn);
-$tag->select_search($_GET['pref']);
 
-$response=  ob_get_clean();
+$response=  $tag->select_search($_GET['pref']);
+
 $html=escape_xml($response);
 header('Content-type: text/xml; charset=UTF-8');
 echo <<<EOF
diff --git a/include/ajax/ajax_tag_detail.php b/include/ajax/ajax_tag_detail.php
index 6e86e5f5b..cf6bec6a8 100644
--- a/include/ajax/ajax_tag_detail.php
+++ b/include/ajax/ajax_tag_detail.php
@@ -13,7 +13,7 @@ ob_start();
 $tag=new Tag($cn);
 $tag->data->t_id=$_GET['tag'];
 $tag->data->load();
-echo HtmlInput::title_box(_("Détail du dossier ou étiquette"), "tag_div");
+echo HtmlInput::title_box(_("Détail du dossier ou étiquette"), "tag_div","close","","y");
 
 ?>
 <?php
diff --git a/include/ajax/ajax_tag_group.php b/include/ajax/ajax_tag_group.php
new file mode 100644
index 000000000..dc1357619
--- /dev/null
+++ b/include/ajax/ajax_tag_group.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
+require_once NOALYSS_INCLUDE."/class/tag_group_mtable.class.php";
+/**
+ * @file
+ * @brief Manage the group of tags
+ */
+try {
+    $table=$http->request('table');
+    $action=$http->request('action');
+    $p_id=$http->request('p_id', "number");
+    $ctl_id=$http->request('ctl');
+
+} catch(Exception $e) {
+    echo $e->getMessage();
+    return;
+}
+$obj=new Tag_Group_SQL($cn,$p_id);
+$obj_manage=new Tag_Group_MTable($obj);
+$obj_manage->set_callback("ajax_misc.php");
+$obj_manage->add_json_param("op", "tag_group");
+$obj_manage->set_object_name($ctl_id);
+
+
+if ($action=="input")
+{
+   
+    header('Content-type: text/xml; charset=UTF-8');
+    echo $obj_manage->ajax_input()->saveXML();
+    return;
+}
+elseif ($action=="save")
+{
+    $xml=$obj_manage->ajax_save();
+    header('Content-type: text/xml; charset=UTF-8');
+    echo $xml->saveXML();
+}
+elseif ($action=="delete")
+{
+    $xml=$obj_manage->ajax_delete();
+    header('Content-type: text/xml; charset=UTF-8');
+    echo $xml->saveXML();
+}
\ No newline at end of file
diff --git a/include/ajax/ajax_tag_set_group.php b/include/ajax/ajax_tag_set_group.php
new file mode 100644
index 000000000..4d3634830
--- /dev/null
+++ b/include/ajax/ajax_tag_set_group.php
@@ -0,0 +1,77 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
+
+require_once NOALYSS_INCLUDE."/class/tag_group_mtable.class.php";
+
+/**
+ * @file
+ * @brief 
+ */
+global $g_user;
+$g_user->can_request('CFGTAG');
+
+/*
+ * Received parameter
+ * gDossier
+ * act : action to perform
+ * tag_group : tag_group.tg_id
+ * tag=tags.t_id
+ * 
+ */
+try
+{
+    $act=$http->request("act");
+}
+catch (Exception $e)
+{
+
+    record_log(__FILE__.$e->getMessage()." ".$e->getTraceAsString());
+    echo $e->getMessage()." ".$e->getTraceAsString();
+}
+$obj=new Tag_Group_SQL($cn);
+$obj_manage=new Tag_Group_MTable($obj);
+$obj_manage->set_callback("ajax_misc.php");
+$obj_manage->add_json_param("op", "tag_group");
+if ($act=="add")
+{
+    $tag_group_id=$http->request("tag_group");
+    $tag=$http->request("tag");
+    $obj_manage->set_pk($tag_group_id);
+    // add tag to group tag
+    // protect against duplicate
+    if ($cn->get_value("select count (*) from  jnt_tag_group_tag where tag_id = $1 and tag_group_id = $2",
+                    [$tag, $tag_group_id])==0)
+    {
+        $cn->exec_sql("insert into jnt_tag_group_tag(tag_id,tag_group_id) values ($1,$2)", [$tag, $tag_group_id]);
+    }
+}
+elseif ($act=="remove")
+{
+    $tag=$http->request("jt_tag");
+    $tag_group_id=$cn->get_value("select tag_group_id from jnt_tag_group_tag where jt_id = $1",[$tag]);
+    $obj_manage->set_pk($tag_group_id);
+    // remove tag from tag_group
+    $cn->exec_sql("delete from jnt_tag_group_tag where jt_id=$1", [$tag]);
+}
+$obj_manage->input_tag();
diff --git a/include/cfgtags.inc.php b/include/cfgtags.inc.php
index e9aef771f..9a6188597 100644
--- a/include/cfgtags.inc.php
+++ b/include/cfgtags.inc.php
@@ -17,7 +17,8 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
-if ( !defined ('ALLOWED') )  die('Appel direct ne sont pas permis');
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
 
 /**
  * @file
@@ -26,34 +27,82 @@ if ( !defined ('ALLOWED') )  die('Appel direct ne sont pas permis');
  */
 require_once NOALYSS_INCLUDE.'/class/tag.class.php';
 require_once NOALYSS_INCLUDE.'/lib/single_record.class.php';
+require_once NOALYSS_INCLUDE."/lib/html_tab.class.php";
+require_once NOALYSS_INCLUDE."/lib/output_html_tab.class.php";
+require_once NOALYSS_INCLUDE."/class/tag_group_mtable.class.php";
 
+/* * *****************************************************************************
+ *  Tags
+ *
+ * ***************************************************************************** */
+$tabs=new Html_Tab("tg", _("Etiquette"));
+
+ob_start();
 $tag=new Tag($cn);
 $uos=new Single_Record('tag');
-if ( isset ($_POST['save_tag_sb']))
+if (isset($_POST['save_tag_sb']))
 {
-    if ( ! isset ($_POST['remove']))
+    if (!isset($_POST['remove']))
     {
-        try {
+        try
+        {
             $uos->check();
             $tag->save($_POST);
             $uos->save();
-        } catch (Exception $e)
+        }
+        catch (Exception $e)
         {
             alert("déjà sauvé");
         }
-    } else {
+    }
+    else
+    {
         $tag->remove($_POST);
     }
 }
 ?>
-<div style="margin-left:10%;width:80%">
-     <p class="notice">
-        <?php echo _("Vous pouvez utiliser ceci comme des étiquettes pour marquer des documents ou 
+<div style="margin-left:5%;width:90%">
+    <p class="info">
+    <?php echo _("Vous pouvez utiliser ceci comme des étiquettes pour marquer des documents ou 
          comme des dossiers pour rassembler des documents. Un document peut appartenir
-         à plusieurs dossiers ou avoir plusieurs étiquettes.");?>
-     </p>
-    <?php
-        $tag->show_list();
-         $js=sprintf("onclick=\"show_tag('%s','%s','%s','p')\"",Dossier::id(),$_REQUEST['ac'],'-1');
-        echo HtmlInput::button("tag_add", "Ajout d'un tag", $js);
-    ?>
\ No newline at end of file
+         à plusieurs dossiers ou avoir plusieurs étiquettes."); ?>
+    </p>
+<?php
+$tag->show_list();
+$js=sprintf("onclick=\"show_tag('%s','%s','%s','p')\"", Dossier::id(), $_REQUEST['ac'], '-1');
+echo HtmlInput::button("tag_add", "Ajout d'un tag", $js);
+?>
+</div>
+<?php
+$tabs->set_content(ob_get_contents());
+ob_end_clean();
+/* * *****************************************************************************
+ *  Group of Tags
+ *
+ * ***************************************************************************** */
+$tag_group=new Html_Tab("grp_tg", _("Groupe étiquettes"));
+
+$obj=new Tag_Group_SQL($cn);
+$obj_manage=new Tag_Group_MTable($obj);
+$obj_manage->set_callback("ajax_misc.php");
+$obj_manage->add_json_param("op", "tag_group");
+ob_start();
+$obj_manage->display_table();
+$r=ob_get_contents();
+$tag_group->set_content($r);
+ob_end_clean();
+
+
+$out=new Output_Html_Tab();
+$out->add($tabs);
+$out->add($tag_group);
+$out->output();
+$obj_manage->create_js_script();
+?>
+<script>
+    $('divtg').show();
+    $('tabtg').className = 'tabs_selected';
+    $('divgrp_tg').hide();
+    $('tabgrp_tg').className = 'tabs';
+    var o_tagGroup=new TagGroup();
+</script>
\ No newline at end of file
diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index e38f4a74e..4ff340d6a 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -1202,15 +1202,26 @@ class Follow_Up
         if ($p_array==null)
             $p_array=$_GET;
 
-        $query="";
         if (count($p_array['searchtag'])==0)
             return "";
+        $query="";
+        $operand = "1 = 0 ";
+        if ($p_array['tag_option'] == 0 )
+        {
+            $operand=" and ";
+        } elseif ($p_array['tag_option']==1)
+        {
+            $operand=" or ";
+        }
+        $and=" ";
         for ($i=0; $i<count($p_array['searchtag']); $i++)
         {
-            if (isNumber($p_array['searchtag'][$i])==1)
-                $query .= ' and ag_id in (select ag_id from action_tags where t_id= '.sql_string($p_array['searchtag'][$i]).')';
+            if (isNumber($p_array['searchtag'][$i])==1) {
+                $query .= $and .' ag_id in (select ag_id from action_tags where t_id= '.sql_string($p_array['searchtag'][$i]).')';
+                $and = $operand;
+            }
         }
-        return $query;
+        return "and (".$query.")";
     }
 
     /**
@@ -1479,12 +1490,12 @@ class Follow_Up
         $c=count($a_tag);
         for ($e=0; $e<$c; $e++)
         {
-            echo '<span style="border:1px solid black;margin-right:5px;">';
+            echo '<span style="border-radius:3px;border:1px solid;padding:5px;margin:1px">';
             echo $a_tag[$e]['t_tag'];
             if ($g_user->can_write_action($this->ag_id)==true)
             {
-                $js_remove=sprintf("onclick=\"action_tag_remove('%s','%s','%s')\"", dossier::id(), $this->ag_id, $a_tag[$e]['t_id']);
-                echo HtmlInput::anchor(SMALLX, "javascript:void(0)", $js_remove, ' class="smallbutton" style="padding:0px;display:inline" ');
+                $js_remove=sprintf("action_tag_remove('%s','%s','%s')", dossier::id(), $this->ag_id, $a_tag[$e]['t_id']);
+                echo Icon_Action::trash(uniqid(), $js_remove);
             }
             echo '</span>';
             echo '&nbsp;';
diff --git a/include/class/tag.class.php b/include/class/tag.class.php
index a6a6855f0..d35799b88 100644
--- a/include/class/tag.class.php
+++ b/include/class/tag.class.php
@@ -90,18 +90,20 @@ class Tag
      */
     function select_search($p_prefix)
     {
+        $res="";
         $ret=$this->data->seek(' order by t_tag');
         require_once NOALYSS_TEMPLATE.'/tag_search_select.php';
+        return HtmlInput::title_box('Tag', $p_prefix.'tag_div').$res;
     }
     /**
      * In the screen search add this data to the cell
      */
     function update_search_cell($p_prefix) {
-        echo '<span id="sp_'.$p_prefix.$this->data->t_id.'" style="border:1px solid black;margin-right:5px;">';
+        echo '<span id="sp_'.$p_prefix.$this->data->t_id.'" style="border-radius:3px;border:1px solid;padding:5px;margin:1px">';
         echo h($this->data->t_tag);
         echo HtmlInput::hidden($p_prefix.'tag[]', $this->data->t_id);
         $js=sprintf("$('sp_".$p_prefix.$this->data->t_id."').remove();");
-        echo HtmlInput::anchor( SMALLX, "javascript:void(0)", "onclick=\"$js\"", ' class="smallbutton " style="padding:0px;display:inline" ');
+        echo Icon_Action::trash(uniqid(), $js);
         echo '</span>';
     }
     /**
diff --git a/include/class/tag_group_mtable.class.php b/include/class/tag_group_mtable.class.php
new file mode 100644
index 000000000..e225d6243
--- /dev/null
+++ b/include/class/tag_group_mtable.class.php
@@ -0,0 +1,91 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+
+/**
+ * @file
+ * @brief manage tag_group table
+ * 
+ * 
+ */
+require_once NOALYSS_INCLUDE.'/lib/manage_table_sql.class.php';
+require_once NOALYSS_INCLUDE.'/database/tag_group_sql.class.php';
+
+class Tag_Group_MTable extends Manage_Table_SQL
+{
+
+    function __construct(Tag_Group_SQL $p_obj)
+    {
+        parent::__construct($p_obj);
+        $this->set_property_visible("tg_id", false);
+        $this->set_property_updatable("tg_id", false);
+        $this->set_col_label("tg_name", _('Nom'));
+    }
+
+    function input()
+    {
+
+
+        parent::input();
+
+
+        echo '<div id="d_tag_group_add">';
+        $this->input_tag();
+        echo '</div>';
+    }
+
+    /**
+     * Display a select widget for adding new tag 
+     */
+    function input_tag()
+    {
+        $cn=Dossier::connect();
+        $data_sql=$this->get_table();
+        
+        // Display containing tag_id 
+        $aTag=$cn->get_array("select jt_id,t_tag 
+                               from tags join jnt_tag_group_tag on (tag_id=t_id) 
+                               where tag_group_id=$1 order by 2", [$data_sql->tg_id]);
+        echo '<ol id="ol_tag_group">';
+        $nb=count($aTag);
+        $dossier_id=Dossier::id();
+        for ($i=0; $i<$nb; $i++)
+        {
+            // js to remove id
+            $js=Icon_Action::trash(uniqid(), sprintf("o_tagGroup.remove('%s','%s')", $aTag[$i]['jt_id'], $dossier_id));
+            printf('<li id="t%s"> %s %s %s</li>', $aTag[$i]['jt_id'],$aTag[$i]['t_tag'],$dossier_id,$js);
+        }
+        echo '</ol>';
+
+
+        // Add new tag
+        $select=new ISelect("is_tag", [], "s_tag_group");
+        $select->value=$cn->make_array("select t_id,t_tag 
+                               from tags 
+                               where 
+                                t_id not in (select tag_id from jnt_tag_group_tag 
+                               where tag_group_id=$1 ) order by 2", 0,[$data_sql->tg_id]);
+        echo $select->input();
+        echo HtmlInput::button('b_add_group', _("Ajout"),
+                sprintf("onclick=\"o_tagGroup.add_tag('%s','%s','%s'); \"", $data_sql->tg_id, $select->id, $dossier_id));
+    }
+
+}
diff --git a/include/database/tag_group_sql.class.php b/include/database/tag_group_sql.class.php
new file mode 100644
index 000000000..279232377
--- /dev/null
+++ b/include/database/tag_group_sql.class.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Autogenerated file 
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
+
+
+/**
+ * class_tag_group_sql.php
+ *
+ *@file
+ *@brief abstract of the table public.tag_group */
+class Tag_group_SQL extends Noalyss_SQL
+{
+
+function __construct(Database $p_cn,$p_id=-1)
+  {
+  $this->table = "public.tag_group";
+  $this->primary_key = "tg_id";
+/*
+ * List of columns
+ */
+  $this->name=array(
+  	"tg_id"=>"tg_id"
+	,"tg_name"=>"tg_name"
+        );
+/*
+ * Type of columns
+ */
+  $this->type = array(
+   	"tg_id"=>"numeric"
+	,"tg_name"=>"text"
+          );
+ 
+
+  $this->default = array(
+  "tg_id" => "auto"
+  );
+
+  $this->date_format = "DD.MM.YYYY";
+  parent::__construct($p_cn,$p_id);
+  }
+  
+
+}
\ No newline at end of file
diff --git a/include/lib/function_javascript.php b/include/lib/function_javascript.php
index 10079acf5..b34b68cb0 100644
--- a/include/lib/function_javascript.php
+++ b/include/lib/function_javascript.php
@@ -2782,6 +2782,7 @@ function load_all_script()
     echo js_include('sorttable.js');
     echo js_include('nicEdit.js');
     echo js_include('managetable.js');
+    echo js_include('taggroup.js');
 
 
 }
diff --git a/include/lib/html_input.class.php b/include/lib/html_input.class.php
index 7dd1ccdf3..e7e22bf96 100755
--- a/include/lib/html_input.class.php
+++ b/include/lib/html_input.class.php
@@ -828,12 +828,12 @@ class HtmlInput
     /**
      * Title for boxes, you can customize the symbol thanks symbol with
      * the mode "custom"
-     * @param type $name Title
-     * @param type $div element id, except for mode none or custom
-     * @param type $mod hide , close , zoom , custom or none, with
+     * @param string $p_name Title
+     * @param string $div element id, except for mode none or custom
+     * @param string $p_mod hide , close , zoom , custom or none, with
      * custom , the $name contains all the code
-     * @param type $p_js contains the javascript if mod = "custom" or "zoom" contains button + code 
-     * @param type $p_draggable , if set to yes the box will be draggable
+     * @param string $p_js contains the javascript if mod = "custom" or "zoom" contains button + code 
+     * @param char $p_draggable , y = yes n = no ,if set to yes the box will be draggable
      * @return type
      */
     static function title_box($p_name, $p_div, $p_mod="close", $p_js="",
@@ -868,7 +868,9 @@ class HtmlInput
             $r.="";
         }
         else
-            die(__FILE__.":".__LINE__._('Paramètre invaide'));
+        {
+            throw new Exception(__FILE__.":".__LINE__._("Paramètre invalide p_mod = '$p_mod'"));
+        }
 
 
         $r.='</div>';
diff --git a/include/template/action_search.php b/include/template/action_search.php
index e7bb169e9..657f5d940 100644
--- a/include/template/action_search.php
+++ b/include/template/action_search.php
@@ -140,6 +140,18 @@
                    ?>
                </span>
             </p>
+            <p>
+                <?php 
+                echo _("Option étiquettes");
+                $iselect= new ISelect("tag_option");
+                $iselect->value=array(
+                    array("value"=>0,"label"=>_("Toutes les étiquettes")),
+                    array("value"=>1,"label"=>_("Au moins une étiquette"))
+                    );
+                $iselect->set_value($http->request("tag_option","number",0));
+                echo $iselect->input(); 
+                       ?>
+            </p>
                         
 		<input type="hidden" name="sa" value="list">
 		<?php echo  $supl_hidden?>
diff --git a/include/template/tag_list.php b/include/template/tag_list.php
index 962e3ab28..fb4802a95 100644
--- a/include/template/tag_list.php
+++ b/include/template/tag_list.php
@@ -2,6 +2,7 @@
 //This file is part of NOALYSS and is under GPL 
 //see licence.txt
 ?><?php
+$http=new HttpInput();
 $max=$this->cn->count($ret);
 echo HtmlInput::filter_table("tag_tb", '0,1', '1');
 $nDossier=Dossier::id();
@@ -14,13 +15,19 @@ $nDossier=Dossier::id();
         <th>
             <?php echo _("Description")?>
         </th>
+            
+        <th>
+            <?php echo _("Actif")?>
+        </th>
+     
     </tr>
 <?php
 $gDossier=Dossier::id();
-$ac=$_REQUEST['ac'];
+$ac=$http->request('ac');
+    
     for ($i=0;$i<$max;$i++):
-        $row=Database::fetch_array($ret, $i);
-?>
+                $row=Database::fetch_array($ret, $i);
+        ?>
     <tr class="<?php echo (($i%2==0)?'even':'odd');?>">
         <td>
             <?php
@@ -33,6 +40,7 @@ $ac=$_REQUEST['ac'];
             echo $row['t_description'];
             ?>
         </td>
+        
         <td>
             <?php
             $id=sprintf("tag_onoff%d",$row['t_id']);
diff --git a/include/template/tag_search_select.php b/include/template/tag_search_select.php
index 5b50aaa19..bfa67d5c3 100644
--- a/include/template/tag_search_select.php
+++ b/include/template/tag_search_select.php
@@ -2,12 +2,15 @@
 //This file is part of NOALYSS and is under GPL 
 //see licence.txt
 ?><?php
-echo HtmlInput::title_box('Tag', $p_prefix.'tag_div');
+
 $max=$this->cn->count($ret);
 if ( $max == 0 ) {
     echo h2(_("Aucune étiquette disponible"),' class="notice"');
     return;
 }
+require_once NOALYSS_INCLUDE."/lib/output_html_tab.class.php";
+$tab_tag=new Html_Tab($p_prefix."tab_tag",_("Etiquettes"));
+ob_start();
 ?>
 <?php echo _("Cherche")." ".HtmlInput::filter_table($p_prefix.'tag_tb_id', '0,1', 1); ?>
 <?php echo HtmlInput::button_action(_('Uniquement actif'), 'show_only_row(\''.$p_prefix.'tag_tb_id'.'\',\'tag_status\',\'Y\')');?>
@@ -30,13 +33,13 @@ $gDossier=Dossier::id();
     <tr <?=$attr?> class="<?php echo (($i%2==0)?'even':'odd');?>">
         <td>
             <?php
-            $js=sprintf("search_add_tag('%s','%s','%s')",$gDossier,$row['t_id'],$p_prefix);
+            $js=sprintf("search_add_tag('%s','%s','%s','t')",$gDossier,$row['t_id'],$p_prefix);
             echo HtmlInput::anchor($row['t_tag'], "", "onclick=\"$js\"");
             ?>
         </td>
         <td>
             <?php
-            echo $row['t_description'];
+            echo h($row['t_description']);
             ?>
         </td>
          <td>
@@ -51,7 +54,55 @@ $gDossier=Dossier::id();
  endfor;
  ?>
 </table>
+ 
+<?php 
+    $tab_tag->set_content(ob_get_contents());
+    ob_end_clean();
+// Tab for the groups 
+//
+$tab_tag_group=new Html_Tab($p_prefix."tab_tag_group",_("Groupe"));
+$aGroup=$this->cn->get_array("select tg_id, tg_name from tag_group order by 2 desc");
+$nb_agroup=count($aGroup);
+?>
+<table class="result">
+    <tr>
+        <th><?=_("Groupe")?></th>
+    </tr>
+    <?php for ($i=0;$i<$nb_agroup;$i++):?>
+    <tr>
+        <td>
+            <?php
+            $js=sprintf("search_add_tag('%s','%s','%s','g')",$gDossier,$aGroup[$i]['tg_id'],$p_prefix);
+            echo HtmlInput::anchor($aGroup[$i]['tg_name'], "", "onclick=\"$js\"");
+            ?>
+        </td>
+            
+    </tr>
+   <?php endfor;?>
+</table>
+<?php
+
+
+$tab_tag_group->set_content(ob_get_contents());
+ob_end_clean();
+
+// Both tab
+$output=new Output_Html_Tab();
+$output->add($tab_tag);
+$output->add($tab_tag_group);
+ob_start();
+$output->output();
+
+?>
+
+<?=HtmlInput::button_close($p_prefix.'tag_div')?>
+
 <script>
     show_only_row('<?=$p_prefix?>tag_tb_id','tag_status','Y');
-</script>    
-<?=HtmlInput::button_close($p_prefix.'tag_div')?>
\ No newline at end of file
+    <?=$output->build_js($p_prefix."tab_tag");?>
+</script>   
+<?php 
+$res =ob_get_contents();
+ob_end_clean();
+return $res;
+?>
\ No newline at end of file
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index 1dae36d28..f311690f7 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -139,4 +139,37 @@ ALTER TABLE public.contact_option_ref DROP COLUMN document_option_id;
 -- on utilise un varchar pour stocker les possibilités
 ALTER TABLE public.contact_option_ref DROP COLUMN cor_value_json;
 ALTER TABLE public.contact_option_ref ADD cor_value_select varchar NULL;
-COMMENT ON COLUMN public.contact_option_ref.cor_value_select IS 'Select values';
\ No newline at end of file
+COMMENT ON COLUMN public.contact_option_ref.cor_value_select IS 'Select values';
+
+
+CREATE TABLE public.tag_group (
+	tg_id bigserial NOT NULL,
+	tg_name varchar NOT NULL
+);
+COMMENT ON TABLE public.tag_group IS 'Group of tags';
+
+-- Column comments
+
+COMMENT ON COLUMN public.tag_group.tg_name IS 'Nom du groupe';
+ALTER TABLE public.tag_group ADD CONSTRAINT tag_group_pk PRIMARY KEY (tg_id);
+
+-- public.jnt_tag_group_tag definition
+
+-- Drop table
+
+-- DROP TABLE public.jnt_tag_group_tag;
+
+CREATE TABLE public.jnt_tag_group_tag (
+	tag_group_id int8 NOT NULL,
+	tag_id int8 NOT NULL,
+	jt_id serial NOT NULL,
+	CONSTRAINT jnt_tag_group_tag_pkey PRIMARY KEY (jt_id),
+	CONSTRAINT jnt_tag_group_tag_un UNIQUE (tag_id, tag_group_id)
+);
+COMMENT ON TABLE public.jnt_tag_group_tag IS 'Many to Many table betwwen tag and tag group';
+
+
+-- public.jnt_tag_group_tag foreign keys
+
+ALTER TABLE public.jnt_tag_group_tag ADD CONSTRAINT jnt_tag_group_tag_fk FOREIGN KEY (tag_id) REFERENCES tags(t_id) ON UPDATE CASCADE ON DELETE CASCADE;
+ALTER TABLE public.jnt_tag_group_tag ADD CONSTRAINT jnt_tag_group_tag_fk_1 FOREIGN KEY (tag_group_id) REFERENCES tag_group(tg_id) ON UPDATE CASCADE ON DELETE CASCADE;
\ No newline at end of file

From 4bab05f76b53238d466b40dda3d75f9d2dc20421 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 5 Oct 2020 13:50:06 +0200
Subject: [PATCH 048/257] Action and Document Add missing files

---
 include/ajax/ajax_cfgaction.php               | 82 ++++++++++++++++
 include/ajax/ajax_contact_option_list.php     | 67 +++++++++++++
 .../class/contact_option_ref_mtable.class.php | 49 ++++++++++
 include/contact_option_ref.inc.php            | 58 ++++++++++++
 include/database/document_type_sql.class.php  | 68 ++++++++++++++
 .../action_document_type_mtable_input.php     | 93 +++++++++++++++++++
 6 files changed, 417 insertions(+)
 create mode 100644 include/ajax/ajax_cfgaction.php
 create mode 100644 include/ajax/ajax_contact_option_list.php
 create mode 100644 include/class/contact_option_ref_mtable.class.php
 create mode 100644 include/contact_option_ref.inc.php
 create mode 100644 include/database/document_type_sql.class.php
 create mode 100644 include/template/action_document_type_mtable_input.php

diff --git a/include/ajax/ajax_cfgaction.php b/include/ajax/ajax_cfgaction.php
new file mode 100644
index 000000000..656253194
--- /dev/null
+++ b/include/ajax/ajax_cfgaction.php
@@ -0,0 +1,82 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
+
+// check right
+if ($g_user->check_action(PARCATDOC)==0)
+{
+
+    record_log("cfgaction01 security ");
+    return;
+}
+
+require_once NOALYSS_INCLUDE."/class/action_document_type_mtable.class.php";
+
+$http=new HttpInput();
+
+
+/**
+ * @file
+ * @brief call for document_type in follow up
+ */
+try
+{
+    $table=$http->request('table');
+    $ctl_id=$http->request('ctl');
+    $action=$http->request('action');
+    $p_id=$http->request('p_id', "number");
+}
+catch (Exception $ex)
+{
+    echo $e->getMessage();
+    return;
+}
+
+$doc_type=new Document_type_SQL($cn,$p_id);
+$action_document_type=new Action_Document_Type_MTable($doc_type);
+
+$action_document_type->set_callback("ajax_misc.php");
+$action_document_type->add_json_param("op", "cfgaction");
+$action_document_type->set_object_name($ctl_id);
+
+
+
+if ($action=="input")
+{
+   
+    header('Content-type: text/xml; charset=UTF-8');
+    echo $action_document_type->ajax_input()->saveXML();
+    return;
+}
+elseif ($action=="save")
+{
+    $xml=$action_document_type->ajax_save();
+    header('Content-type: text/xml; charset=UTF-8');
+    echo $xml->saveXML();
+}
+elseif ($action=="delete")
+{
+    $xml=$action_document_type->ajax_delete();
+    header('Content-type: text/xml; charset=UTF-8');
+    echo $xml->saveXML();
+}
diff --git a/include/ajax/ajax_contact_option_list.php b/include/ajax/ajax_contact_option_list.php
new file mode 100644
index 000000000..1622d1ab8
--- /dev/null
+++ b/include/ajax/ajax_contact_option_list.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
+require_once NOALYSS_INCLUDE."/class/contact_option_ref_mtable.class.php";
+
+/**
+ * @file
+ * @brief add option for contact
+ * @see contact_option_list
+ * @see action_document_type_mtable::input()
+ */
+try
+{
+    $contact_option_id=$http->request("p_id");
+    $ctl_id=$http->request("ctl");
+    $action=$http->request("action");
+}
+catch (Exception $ex)
+{
+    record_log(__FILE__." no p_id");
+    return;
+}
+$cn=Dossier::connect();
+
+// document_option id from document_option where do_code='contact_multiple' and document_type_id=p_id
+$obj=new Contact_option_ref_SQL($cn);
+
+$contact_mtable=new Contact_Option_Ref_MTable($obj);
+
+$contact_mtable->set_callback("ajax_misc.php");
+$contact_mtable->set_object_name("s_contact_option");
+$contact_mtable->set_dialog_box("db_contact_option");
+$contact_mtable->add_json_param("op", "contact_option_list");
+$contact_mtable->set_object_name($ctl);
+$contact_mtable->set_pk($contact_option_id);
+
+if ($action == "input") {
+    $contact_mtable->send_header();
+    echo $contact_mtable->ajax_input()->saveXML();
+} elseif($action == "save") {
+    $contact_mtable->send_header();
+    
+    echo $contact_mtable->ajax_save()->saveXML();
+} elseif ($action == "delete") {
+    $contact_mtable->send_header();
+    $contact_mtable->ajax_delete();
+}
\ No newline at end of file
diff --git a/include/class/contact_option_ref_mtable.class.php b/include/class/contact_option_ref_mtable.class.php
new file mode 100644
index 000000000..bb8c21f9a
--- /dev/null
+++ b/include/class/contact_option_ref_mtable.class.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * Copyright (C) 2020 Dany De Bontridder <dany@alchimerys.be>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+
+/**
+ * @file 
+ * @brief
+ * @todo to be implemented
+ */
+require_once NOALYSS_INCLUDE."/database/contact_option_ref_sql.class.php";
+require_once NOALYSS_INCLUDE."/lib/manage_table_sql.class.php";
+
+class Contact_Option_Ref_MTable extends Manage_Table_SQL{
+    
+     function __construct(Contact_Option_Ref_SQL $obj)
+     {
+         parent::__construct($obj);
+         $this->set_col_label("cor_label", _("Nom"));
+         $this->set_col_label("cor_type", _("Type "));
+         $this->set_col_label("document_option_id", _("Action"));
+         $this->set_col_label("core_value_select",_("Options"));
+         $this->set_property_visible("cor_id", false);
+         $this->set_col_type("cor_type","select",[
+             ["label"=>_("Texte"),"value"=>0],
+             ["label"=>_("Nombre"),"value"=>1],
+             ["label"=>_("Choix"),"value"=>3],
+             ["label"=>_("Date"),"value"=>2]
+         ]);
+     }
+
+}
diff --git a/include/contact_option_ref.inc.php b/include/contact_option_ref.inc.php
new file mode 100644
index 000000000..a78cc4d57
--- /dev/null
+++ b/include/contact_option_ref.inc.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
+require_once NOALYSS_INCLUDE."/class/contact_option_ref_mtable.class.php";
+echo '<div class="content">';
+/**
+ * @file
+ * @brief add option for contact
+ * @see contact_option_list
+ * @see action_document_type_mtable::input()
+ */
+$http=new HttpInput();
+try
+{
+    $action=$http->request("sa", "string", "list");
+}
+catch (Exception $ex)
+{
+    record_log(__FILE__." no p_id");
+    return;
+}
+$cn=Dossier::connect();
+
+// document_option id from document_option where do_code='contact_multiple' and document_type_id=p_id
+$obj=new Contact_option_ref_SQL($cn);
+
+$contact_mtable=new Contact_Option_Ref_MTable($obj);
+
+$contact_mtable->set_callback("ajax_misc.php");
+$contact_mtable->set_object_name("s_contact_option");
+$contact_mtable->set_dialog_box("db_contact_option");
+$contact_mtable->add_json_param("op", "contact_option_list");
+
+$contact_mtable->create_js_script();
+$contact_mtable->display_table();
+
+
+echo '</div>';
\ No newline at end of file
diff --git a/include/database/document_type_sql.class.php b/include/database/document_type_sql.class.php
new file mode 100644
index 000000000..cd493e3aa
--- /dev/null
+++ b/include/database/document_type_sql.class.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * Autogenerated file 
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
+
+/**
+ * class_document_type_sql.php
+ *
+ * @file
+ * @brief abstract of the table public.document_type 
+ */
+
+/**
+ * @class
+ * @brief abstract of the table public.document_type 
+ */
+class Document_type_SQL extends Noalyss_SQL
+{
+
+    function __construct(Database $p_cn, $p_id=-1)
+    {
+        $this->table="public.document_type";
+        $this->primary_key="dt_id";
+        /*
+         * List of columns
+         */
+        $this->name=array(
+            "dt_id"=>"dt_id"
+            , "dt_value"=>"dt_value"
+            , "dt_prefix"=>"dt_prefix"
+        );
+        /*
+         * Type of columns
+         */
+        $this->type=array(
+            "dt_id"=>"numeric"
+            , "dt_value"=>"text"
+            , "dt_prefix"=>"text"
+        );
+
+
+        $this->default=array(
+            "dt_id"=>"auto"
+        );
+
+        $this->date_format="DD.MM.YYYY";
+        parent::__construct($p_cn, $p_id);
+    }
+
+}
diff --git a/include/template/action_document_type_mtable_input.php b/include/template/action_document_type_mtable_input.php
new file mode 100644
index 000000000..eee3f0117
--- /dev/null
+++ b/include/template/action_document_type_mtable_input.php
@@ -0,0 +1,93 @@
+<?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2019) Author Dany De Bontridder <danydb@noalyss.eu>
+
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
+
+/**
+ * @file
+ * @brief called from p_id already set, 
+ * @see action_document_type_mtable::input
+ */
+// SQL Object Document_Type
+$table=$this->get_table();
+// db connx
+$cn=$table->cn;
+?>
+
+<?php echo _('Prochain numéro') ?>
+<p class="info" style="display:inline">
+    (
+<?php echo _('numéro actuel') ?>
+<?php
+$last=0;
+if ( $table->dt_id > 0) {
+    $ret=$cn->get_array("select last_value,is_called from seq_doc_type_".$table->dt_id);
+
+    $last=$ret[0]['last_value'];
+    /* !
+     * \note  With PSQL sequence , the last_value column is 1 when before   AND after the first call, to make the difference between them
+     * I have to check whether the sequence has been already called or not */
+    if ($ret[0]['is_called']=='f')
+        $last--;
+}
+echo $last;
+?>
+    )
+</p>
+
+<?php
+echo
+Icon_Action::infobulle(15);
+?>
+<?php
+$seq=new INum('seq', 0);
+echo $seq->input();
+?>
+<div>
+    <h3 class="info" sytle="margin-block: 4px"><?php echo _("Détail") ?></h3>
+    <ul class="tab_row" style="padding-top: 0px">
+        <li>
+<?php
+$i=new ICheckBox("detail_operation",1);
+if ( Document_Option::is_enable_operation_detail($table->dt_id)) $i->set_check(1);else $i->set_check(0);
+echo $i->input();
+echo _("Détail opération");
+?>
+        </li> 
+        <li>
+<?php
+$i=new ICheckBox("det_contact_mul",1);
+if ( Document_Option::is_enable_contact_multiple($table->dt_id)) $i->set_check(1); else $i->set_check(0);
+echo $i->input();
+echo _("Contacts multiples");
+?>
+        </li> 
+        <li>
+<?php
+$i=new ICheckBox("make_invoice",1);
+if ( Document_Option::is_enable_make_invoice($table->dt_id)) $i->set_check(1); else $i->set_check(0);
+echo $i->input();
+echo _("Création de facture");
+?>
+        </li> 
+    </ul>
+
+</div>
\ No newline at end of file

From 27302b98317afef1c2204027b3d8d3e74102bbd2 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 5 Oct 2020 15:02:40 +0200
Subject: [PATCH 049/257] tag - cosmetic

---
 include/class/follow_up.class.php | 2 +-
 include/class/tag.class.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 4ff340d6a..1637c3953 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -1490,7 +1490,7 @@ class Follow_Up
         $c=count($a_tag);
         for ($e=0; $e<$c; $e++)
         {
-            echo '<span style="border-radius:3px;border:1px solid;padding:5px;margin:1px">';
+            echo '<span style="border-radius:3px;border:1px solid;padding:3px;margin:1px">';
             echo $a_tag[$e]['t_tag'];
             if ($g_user->can_write_action($this->ag_id)==true)
             {
diff --git a/include/class/tag.class.php b/include/class/tag.class.php
index d35799b88..27e8b00ba 100644
--- a/include/class/tag.class.php
+++ b/include/class/tag.class.php
@@ -99,7 +99,7 @@ class Tag
      * In the screen search add this data to the cell
      */
     function update_search_cell($p_prefix) {
-        echo '<span id="sp_'.$p_prefix.$this->data->t_id.'" style="border-radius:3px;border:1px solid;padding:5px;margin:1px">';
+        echo '<span id="sp_'.$p_prefix.$this->data->t_id.'" style="border-radius:3px;border:1px solid;padding:3px;margin:1px">';
         echo h($this->data->t_tag);
         echo HtmlInput::hidden($p_prefix.'tag[]', $this->data->t_id);
         $js=sprintf("$('sp_".$p_prefix.$this->data->t_id."').remove();");

From 3effa4bb848e0daef8e89b7ba4295272bf3f6254 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 5 Oct 2020 15:43:39 +0200
Subject: [PATCH 050/257] Follow-up search : show the closing status

---
 include/class/follow_up.class.php  | 9 ++++++---
 include/template/action_search.php | 9 +++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 1637c3953..26a8927eb 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -1117,7 +1117,7 @@ class Follow_Up
         /* State of documents */
         $type_state=new ISelect('state');
         $aState=$cn->make_array('select s_id,s_value from document_state order by s_value');
-        $aState[]=array('value'=>'-1', 'label'=>_('Tous les Etats'));
+        $aState[]=array('value'=>'-1', 'label'=>_('Tous les actions ouvertes'));
         $type_state->value=$aState;
         $type_state->selected=(isset($_GET['state']))?$_GET['state']:-1;
 
@@ -1235,7 +1235,7 @@ class Follow_Up
         if ($p_array==null)             $p_array=$_GET;
         
         $action_query="";
-
+        $ag_state=""; //<! selected status of the event , if not set or equal to -1 , it is all of them
         if (isset($_REQUEST['action_query']))
         {
             // if a query is request build the sql stmt
@@ -1268,6 +1268,8 @@ class Follow_Up
         if (isset($p_array['state'])&&$p_array['state'] !=-1)
         {
             $action_query .= ' and ag_state= '.sql_string($p_array['state']);
+            // a status is selected
+            $ag_state=$p_array['state'];
         }
         if (isset($p_array['hsstate'])&&$p_array['hsstate']!=-1)
         {
@@ -1313,7 +1315,8 @@ class Follow_Up
         {
             $action_query .= " and to_date('".sql_string($p_array['remind_date_end'])."','DD.MM.YYYY')>= ag_remind_date";
         }
-        if (!isset($p_array['closed_action']))
+        // only for open action or a closing status is selected
+        if (!isset($p_array['closed_action']) && $ag_state == "")
         {
             $action_query.=" and s_status is null ";
         }
diff --git a/include/template/action_search.php b/include/template/action_search.php
index 657f5d940..58cab5517 100644
--- a/include/template/action_search.php
+++ b/include/template/action_search.php
@@ -56,6 +56,10 @@
 				<td style="text-align:right" ><?php echo  _("Etat")?></td>
 				<td><?php echo  $type_state->input()?></td>
 			</tr>
+                        <tr>
+				<td style="text-align:right"> <?php echo _("Affiche aussi les actions fermées");?></td>
+				<td><?php echo $closed_action->input();?></td>
+			</tr>
 			<tr>
 				<td style="text-align:right" ><?php echo  _("Exclure Etat")?></td>
 				<td><?php echo  $hsExcptype_state->input()?></td>
@@ -103,10 +107,7 @@
 					<?php echo $remind_date_end->input();?>
 				</td>
 			</tr>
-			<tr>
-				<td style="text-align:right"> <?php echo _("Affiche aussi les actions fermées");?></td>
-				<td><?php echo $closed_action->input();?></td>
-			</tr>
+        	
                        
                         </table>
 

From a5b27d92538f9531cc452c1e45a67478142132ef Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 5 Oct 2020 16:25:42 +0200
Subject: [PATCH 051/257] Add group of tag to an action

---
 html/js/scripts.js                   |  5 +++--
 include/ajax/ajax_search_add_tag.php |  2 +-
 include/ajax/ajax_tag_add_action.php | 21 ++++++++++++++++++---
 include/class/follow_up.class.php    |  3 ++-
 include/class/tag.class.php          |  5 +++++
 include/template/tag_select.php      |  7 +++++--
 6 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/html/js/scripts.js b/html/js/scripts.js
index b29f05653..f1658da90 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -2575,13 +2575,14 @@ function action_tag_select(p_dossier, ag_id)
  * @brief Add the current tag to the current ag_id
  * @param {type} p_dossier
  * @param {type} ag_id
+ * @param p_isgroup g it is a group , t is a single tag
  * @returns {undefined}
  */
-function action_tag_add(p_dossier, ag_id, t_id)
+function action_tag_add(p_dossier, ag_id, t_id,p_isgroup)
 {
     try {
         waiting_box();
-        var queryString = "t_id=" + t_id + "&ag_id=" + ag_id + "&op=tag_add&gDossier=" + p_dossier;
+        var queryString = "t_id=" + t_id + "&ag_id=" + ag_id + "&op=tag_add&gDossier=" + p_dossier+"&isgroup="+p_isgroup;
         var action = new Ajax.Request(
                 "ajax_misc.php",
                 {
diff --git a/include/ajax/ajax_search_add_tag.php b/include/ajax/ajax_search_add_tag.php
index 2e5b2d2a8..d1e3b853c 100644
--- a/include/ajax/ajax_search_add_tag.php
+++ b/include/ajax/ajax_search_add_tag.php
@@ -42,7 +42,7 @@ if ($http->request("obj")=='t')
 elseif ($http->request("obj")=="g")
 {
     // Add all the tag from the group 
-    $aTag=$cn->get_array("select t_id,t_tag from jnt_tag_group_tag jtgt  join tags on (tag_id=t_id) where tag_group_id=1 order by 2 ");
+    $aTag=$cn->get_array("select t_id,t_tag from jnt_tag_group_tag jtgt  join tags on (tag_id=t_id) where tag_group_id=$1 order by 2 ",[$http->get("id", "number")]);
     $nb_atag=count($aTag);
     $pref=$http->get("pref");
     if ( $nb_atag > 0) {
diff --git a/include/ajax/ajax_tag_add_action.php b/include/ajax/ajax_tag_add_action.php
index cdb4c4ad5..890966c0a 100644
--- a/include/ajax/ajax_tag_add_action.php
+++ b/include/ajax/ajax_tag_add_action.php
@@ -24,11 +24,26 @@ if ( !defined ('ALLOWED') )  die('Appel direct ne sont pas permis');
  *@see Follow_Up
  *@see Tag
  */
+$http=new HttpInput();
 
 $fl=new Follow_Up($cn);
-$fl->ag_id=$_REQUEST['ag_id'];
-if ( $g_user->can_write_action($fl->ag_id) == TRUE ) 
-            $fl->tag_add($_REQUEST['t_id']);
+
+$fl->ag_id=$http->request("ag_id","number");
+
+if ( $g_user->can_write_action($fl->ag_id) != TRUE )  return;
+
+if ( $http->request("isgroup") == 't') {
+    $fl->tag_add($http->request('t_id',"number"));
+} else {
+        // Add all the tag from the group 
+    $aTag=$cn->get_array("select t_id,t_tag from jnt_tag_group_tag jtgt  join tags on (tag_id=t_id) where tag_group_id=$1 order by 2 ",[$http->request("t_id","number")]);
+    $nb_atag=count($aTag);
+    if ( $nb_atag > 0) {
+        for ($i=0;$i<$nb_atag;$i++){
+             $fl->tag_add($aTag[$i]['t_id']);
+        }
+    }
+}
 
 ob_start();
 
diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 26a8927eb..6734dd238 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -1504,9 +1504,10 @@ class Follow_Up
             echo '&nbsp;';
             echo '&nbsp;';
         }
-        $js=sprintf("onclick=\"action_tag_select('%s','%s')\"", dossier::id(), $this->ag_id);
+        
         if ($g_user->can_write_action($this->ag_id)==true)
         {
+            $js=sprintf("onclick=\"action_tag_select('%s','%s')\"", dossier::id(), $this->ag_id);
             echo HtmlInput::button('tag_bt', 'Ajout tag', $js, 'smallbutton');
         }
     }
diff --git a/include/class/tag.class.php b/include/class/tag.class.php
index 27e8b00ba..792e8cd26 100644
--- a/include/class/tag.class.php
+++ b/include/class/tag.class.php
@@ -42,6 +42,11 @@ class Tag
     function select()
     {
         $ret=$this->data->seek("where t_actif='Y' order by t_tag");
+        $ret=$this->cn->exec_sql(" select t_id,t_tag,t_description,'t' as tag_type 
+                    from tags 
+                    where t_actif='Y' 
+                union all 
+                select tg_id,tg_name ,'G','g' from tag_group order by 2");
         require_once NOALYSS_TEMPLATE.'/tag_select.php';
     }
     /**
diff --git a/include/template/tag_select.php b/include/template/tag_select.php
index ea6d4bb12..709c9ff89 100644
--- a/include/template/tag_select.php
+++ b/include/template/tag_select.php
@@ -5,7 +5,9 @@
  * @file
  * @brief list of tags
  */
-?><?php
+$http=new HttpInput();
+?>
+<?php
 echo HtmlInput::title_box('Tag', 'tag_div');
 $max=$this->cn->count($ret);
 if ( $max == 0 ) {
@@ -26,13 +28,14 @@ if ( $max == 0 ) {
 <?php
 $gDossier=Dossier::id();
 if (isNumber($_REQUEST['ag_id']) == 0 ) die ('ERROR : parameters invalid');
+$ag_id=$http->request("ag_id","number");
     for ($i=0;$i<$max;$i++):
         $row=Database::fetch_array($ret, $i);
 ?>
     <tr class="<?php echo (($i%2==0)?'even':'odd');?>">
         <td>
             <?php
-            $js=sprintf("action_tag_add('%s','%s','%s')",$gDossier,$_REQUEST['ag_id'],$row['t_id']);
+            $js=sprintf("action_tag_add('%s','%s','%s','%s')",$gDossier,$ag_id,$row['t_id'],$row['tag_type']);
             echo HtmlInput::anchor($row['t_tag'], "", "onclick=\"$js\"");
             ?>
         </td>

From 5aba53e25f19a5b58cb0ce25bc12cdaa902c5311 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 5 Oct 2020 16:58:26 +0200
Subject: [PATCH 052/257] NEW Security : add tag

---
 include/ajax/ajax_tag_detail.php | 4 +++-
 include/ajax/ajax_tag_list.php   | 2 +-
 include/ajax/ajax_tag_save.php   | 2 +-
 include/constant.security.php    | 1 +
 include/template/tag_select.php  | 2 +-
 sql/upgrade.sql                  | 5 ++++-
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/include/ajax/ajax_tag_detail.php b/include/ajax/ajax_tag_detail.php
index cf6bec6a8..20043000b 100644
--- a/include/ajax/ajax_tag_detail.php
+++ b/include/ajax/ajax_tag_detail.php
@@ -11,7 +11,9 @@ require_once NOALYSS_INCLUDE.'/lib/single_record.class.php';
 require_once NOALYSS_INCLUDE.'/class/tag.class.php';
 ob_start();
 $tag=new Tag($cn);
-$tag->data->t_id=$_GET['tag'];
+$http=new HttpInput();
+$tag->data->t_id=$http->get("tag","number");
+if ($tag->data->t_id == -1 &&  $g_user->check_action(TAGADD) == 0 ) return;
 $tag->data->load();
 echo HtmlInput::title_box(_("Détail du dossier ou étiquette"), "tag_div","close","","y");
 
diff --git a/include/ajax/ajax_tag_list.php b/include/ajax/ajax_tag_list.php
index 342a44b92..5ce78c43f 100644
--- a/include/ajax/ajax_tag_list.php
+++ b/include/ajax/ajax_tag_list.php
@@ -31,7 +31,7 @@ $tag->select();
 //------------------- Propose to add a tag
 
 $js=sprintf("onclick=\"show_tag('%s','%s','%s','j')\"",Dossier::id(),'','-1');
-echo HtmlInput::button("tag_add", _("Ajout d'un tag"), $js);
+if ( $g_user->check_action(TAGADD) == 1) { echo HtmlInput::button("tag_add", _("Ajout d'un tag"), $js);}
 echo HtmlInput::button_close("tag_div");
 
 $response=  ob_get_clean();
diff --git a/include/ajax/ajax_tag_save.php b/include/ajax/ajax_tag_save.php
index 59df25eda..ade69812e 100644
--- a/include/ajax/ajax_tag_save.php
+++ b/include/ajax/ajax_tag_save.php
@@ -12,7 +12,7 @@ $op=$http->request("op");
 global $g_user;
 $nDossier=Dossier::id();
 ///check security
-if ( $g_user->check_module('CFGTAG')==0)
+if ( $g_user->check_module('CFGTAG')==0  &&  $g_user->check_action(TAGADD) == 0)
 {
     die(_("non permis"));
 }
diff --git a/include/constant.security.php b/include/constant.security.php
index baf161e46..c395bed64 100644
--- a/include/constant.security.php
+++ b/include/constant.security.php
@@ -22,6 +22,7 @@ define ('FICADD',800);	 /* Ajout de fiche */
 define ("FIC",805);  //Création, modification et effacement de fiche
 define ("FICCAT",910);  //création, modification et effacement de catégorie de fiche
 define ('RMDOC',1020);   // Effacement de document pour follow up & comptabilité
+define ('TAGADD',1025);   // Ajout de tag
 define ('VIEWDOC',1010);   // Voir document pour follow up
 define ('PARCATDOC',1050);   // modifier type document pour follow up
 define ('RMRECEIPT',1110);   // Effacer un document d'une pièce comptable
diff --git a/include/template/tag_select.php b/include/template/tag_select.php
index 709c9ff89..475e9594a 100644
--- a/include/template/tag_select.php
+++ b/include/template/tag_select.php
@@ -27,8 +27,8 @@ if ( $max == 0 ) {
     </tr>
 <?php
 $gDossier=Dossier::id();
-if (isNumber($_REQUEST['ag_id']) == 0 ) die ('ERROR : parameters invalid');
 $ag_id=$http->request("ag_id","number");
+if (isNumber($ag_id) == 0 ) die ('ERROR : parameters invalid');
     for ($i=0;$i<$max;$i++):
         $row=Database::fetch_array($ret, $i);
 ?>
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index f311690f7..1b20b7743 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -172,4 +172,7 @@ COMMENT ON TABLE public.jnt_tag_group_tag IS 'Many to Many table betwwen tag and
 -- public.jnt_tag_group_tag foreign keys
 
 ALTER TABLE public.jnt_tag_group_tag ADD CONSTRAINT jnt_tag_group_tag_fk FOREIGN KEY (tag_id) REFERENCES tags(t_id) ON UPDATE CASCADE ON DELETE CASCADE;
-ALTER TABLE public.jnt_tag_group_tag ADD CONSTRAINT jnt_tag_group_tag_fk_1 FOREIGN KEY (tag_group_id) REFERENCES tag_group(tg_id) ON UPDATE CASCADE ON DELETE CASCADE;
\ No newline at end of file
+ALTER TABLE public.jnt_tag_group_tag ADD CONSTRAINT jnt_tag_group_tag_fk_1 FOREIGN KEY (tag_group_id) REFERENCES tag_group(tg_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+insert into action values (1025,'Ajout d''étiquette','followup','TAGADD');
\ No newline at end of file

From 46520c65286bed76bbd53b726915592f5122e200 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 5 Oct 2020 20:58:26 +0200
Subject: [PATCH 053/257] NEW Security : add tag

---
 include/param_sec.inc.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/param_sec.inc.php b/include/param_sec.inc.php
index d40d08472..0b5436ca8 100644
--- a/include/param_sec.inc.php
+++ b/include/param_sec.inc.php
@@ -50,7 +50,6 @@ require_once  NOALYSS_INCLUDE.'/lib/user_menu.php';
 /////////////////////////////////////////////////////////////////////////
 if ( ! isset($_REQUEST['action']))
 {
-	$base_url=$_SERVER['PHP_SELF']."?ac=".$_REQUEST['ac']."&".dossier::get();
         $base_url=NOALYSS_URL."/do.php?".http_build_query(array("ac"=>$http->request("ac"),"gDossier"=>dossier::id()));
 
     echo '<DIV class="content" >';

From 4e363895e6a1b048ef401923c869f36353510333 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Tue, 6 Oct 2020 19:02:57 +0200
Subject: [PATCH 054/257] Contact option , allow to use option for contact

---
 html/js/card.js                               | 120 ++++++++++++++++--
 include/ajax/ajax_action_remove_concerned.php |   9 +-
 include/ajax/ajax_action_save_concerned.php   |  29 ++++-
 include/ajax/ajax_add_concerned_card.php      |  56 ++++++--
 include/ajax/ajax_card.php                    |  21 ++-
 include/ajax/ajax_display_card_option.php     |  44 +++++++
 include/class/card_multiple.class.php         | 102 +++++++++++++++
 include/class/follow_up.class.php             |  12 +-
 include/template/card_multiple_result.php     |  46 +++++++
 sql/upgrade.sql                               |  42 ++++--
 10 files changed, 435 insertions(+), 46 deletions(-)
 create mode 100644 include/ajax/ajax_display_card_option.php
 create mode 100644 include/class/card_multiple.class.php
 create mode 100644 include/template/card_multiple_result.php

diff --git a/html/js/card.js b/html/js/card.js
index 6212658a0..1eeedfda6 100644
--- a/html/js/card.js
+++ b/html/js/card.js
@@ -33,7 +33,7 @@ function boxsearch_card(p_dossier)
 	{
 	waiting_box();
 	removeDiv('boxsearch_card_div');
-	var queryString="gDossier="+p_dossier+"&op=cardsearch"+"&card="+encodeURI($(card_search).value);
+	var queryString="gDossier="+p_dossier+"&op=cardsearch"+"&card="+encodeURI($("card_search").value);
 	var action = new Ajax.Request(
 				  "ajax_misc.php" ,
 				  {
@@ -57,14 +57,15 @@ function boxsearch_card(p_dossier)
 /**
  * show the ipopup with the form to search a card
  * the properties
- *  - jrn for the ledger
- *  - fs for the action
- *  - price for the price of the card (field to update)
- *  - tvaid for the tvaid of the card (field to update)
- *  - inp input text to update with the quickcode
- *  - label field to update with the name
- *  - ctl the id to fill with the HTML answer (ending with _content)
- *  - acc 1 if accounting are visible
+ * @param obj
+ * @param {int} obj.jrn for the ledger
+ * @param {int} obj.fs route to the action
+ * @param {string} obj.price for the price of the card (field to update)
+ * @param {string} obj.tvaid for the tvaid of the card (field to update)
+ * @param {string} obj.inp input text to update with the quickcode
+ * @param {string} obj.label field to update with the name
+ * @param {string} obj.ctl the id to fill with the HTML answer (ending with _content)
+ * @param {int} obj.acc 1 if accounting are visible
  */
 function search_card(obj)
 {
@@ -122,10 +123,54 @@ function search_card(obj)
     }
 }
 /**
- * Display form for select card to add to action : other_concerned
- *action_add_concerned_card
+ * Display found card and let you select several to link them to an action-followup
+ * @param {obj} obj form object
+ * @param {obj} obj form object
  */
-function action_add_concerned_card(obj)
+function action_concerned_save_card(obj)
+{
+    try {
+        waiting_box();
+        // get all data from FORM
+        var query = obj.serialize();
+        new Ajax.Request("ajax_misc.php", {
+            method: "POST",
+            parameters: query,
+            onSuccess: function (req) {
+                remove_waiting_box();
+                var answer = req.responseXML;
+                var a = answer.getElementsByTagName('ctl');
+                if (a.length == 0)
+                {
+                    var rec = req.responseText;
+                    alert_box('erreur :' + rec);
+                }
+                var html = answer.getElementsByTagName('code');
+                var namectl = a[0].firstChild.nodeValue;
+                var nodeXml = html[0];
+                var code_html = getNodeText(nodeXml);
+                code_html = unescape_xml(code_html);
+                $(namectl).update(code_html);
+                removeDiv('search_card');
+            }
+        });
+    } catch (e)
+    {
+
+        alert_box('action_concerned_save_card' + e.message);
+        return false;
+    }
+    return false;
+}
+/**
+ * Display form for searching cards to add to action-follow-up
+ *@see ajax_add_concerned_card.php
+ *@param {object} obj form object 
+ *@param obj.elements.ag_id id of the action (elements)
+ *@param obj.elements.gDossier folder id
+ *@param obj.elements.query
+ */
+function action_concerned_search_card(obj)
 {
     try
     {
@@ -204,7 +249,7 @@ function action_add_concerned_card(obj)
                         {
                             sx = document.body.scrollTop + 60;
                         }
-                        var div_style = "top:" + sx + "px;height:80%";
+                        var div_style = "top:" + sx + "px;height:52rem";
                         if ( ! $('search_card')) { add_div({id: 'search_card', cssclass: 'inner_box', html: "", style: div_style, drag: true}); }
                         $('search_card').innerHTML = code_html;
                         $('query').focus();
@@ -951,7 +996,7 @@ try {
  * @param {type} p_action_id action_gestion.ag_id
  * @returns {undefined} nothing
  */
-function action_save_concerned(p_dossier, p_fiche_id, p_action_id) {
+function action_save_concerned(p_form_id) {
     var query = encodeJSON({'gDossier': p_dossier, 'f_id': p_fiche_id, 'ag_id': p_action_id,'op':'card','op2':'action_save_concerned','ctl':'unused'});
     var a=new Ajax.Request('ajax_misc.php',
             {
@@ -1220,4 +1265,51 @@ function card_update_row(obj)
         alert_box(e.message);
         return false;
     }
+}
+/**
+ * Display the option of a contact linked in a action-followup
+ * @param {int} p_action_person_id action_person.ap_id
+ * @param {int} p_dossier current folder
+ */
+function linked_card_option(p_action_person_id,p_dossier) {
+    try {
+        waiting_box();
+        new Ajax.Request("ajax_misc.php",{
+            method:"get",
+            parameters: {
+                ap_id:p_action_person_id,
+                gDossier:p_dossier,
+                op:"card",
+                op2:"display_card_option",
+                ctl:"notused"
+            },
+            onSuccess:function(req) {
+                remove_waiting_box();
+                add_div({ "id":"d_linked_card_option",cssclass:"inner_box",style:"position:fixed;top:30%;min-width:20rem;width:auto;",drag:0});
+                $("d_linked_card_option").update(req.responseText);
+                
+            }
+        });
+    } catch (e) {
+        console.error(e.message);
+    }
+}
+/**
+ * Save option for the contact 
+ * @param {object} obj form 
+ * @see card_multiple_display_option.php
+ * @returns {undefined}
+ */
+function save_linked_card_option(obj)
+{
+    waiting_box();
+    new Ajax.Request("ajax_misc.php",{
+        method:"post",
+        parameters:obj.serialize(),
+        onSuccess:function(req) {
+            remove_waiting_box();
+            removeDiv("d_linked_card_option");
+        }
+    });
+    return false;
 }
\ No newline at end of file
diff --git a/include/ajax/ajax_action_remove_concerned.php b/include/ajax/ajax_action_remove_concerned.php
index 31112dff6..00d389490 100644
--- a/include/ajax/ajax_action_remove_concerned.php
+++ b/include/ajax/ajax_action_remove_concerned.php
@@ -37,6 +37,13 @@ catch (Exception $exc)
     error_log($exc->getTraceAsString());
     return;
 }
+/*
+ * security Who can do it ?
+ */
+if ( ! $g_user->can_read_action($ag_id)  ) {
+    record_log(__FILE__."security : access refused");
+    return;
+}
 
 require_once 'class/follow_up.class.php';
 $follow=new Follow_Up($cn,$ag_id);
@@ -44,7 +51,7 @@ $follow=new Follow_Up($cn,$ag_id);
 ob_start();
 $follow->remove_linked_card($f_id);
 echo $follow->display_linked();
-HtmlInput::button_action_add_concerned_card( $follow->ag_id);
+echo HtmlInput::button_action_add_concerned_card( $follow->ag_id);
 
 $response = ob_get_clean();
 
diff --git a/include/ajax/ajax_action_save_concerned.php b/include/ajax/ajax_action_save_concerned.php
index e799b09f1..25baf3008 100644
--- a/include/ajax/ajax_action_save_concerned.php
+++ b/include/ajax/ajax_action_save_concerned.php
@@ -28,9 +28,34 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 /**
  * Insert into follow-up the card (f_id) for the action_gestion (ag_id)
  */
+$http=new HttpInput();
+try {
+    // follow_up id
+    $ag_id=$http->request("ag_id","number");
+    $ctl=$http->request("ctl");
+    $selected_card=$http->request("selected_card","array",[]);
+} catch (Exception $ex) {
+     record_log(__FILE__.$ex->getMessage().$ex->getTraceAsString());
+     return;
+}
+/*
+ * security Who can do it ?
+ */
+if ( ! $g_user->can_write_action($ag_id)  ) {
+    record_log(__FILE__."security : access refused");
+    return;
+}
+
 require_once 'class/follow_up.class.php';
 $follow=new Follow_Up($cn,$ag_id);
-$follow->insert_linked_card($f_id);
+$nb_card=count($selected_card);
+for ($i=0;$i< $nb_card;$i++)
+{
+    $elt=$selected_card[$i];
+    if (isNumber($elt)) {
+        $follow->insert_linked_card($elt); 
+    }
+}
 /**
  * Display all the linked card
  */
@@ -44,7 +69,7 @@ header('Content-type: text/xml; charset=UTF-8');
 echo <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <data>
-<ctl>unused</ctl>
+<ctl>$ctl</ctl>
 <code>$html</code>
 </data>
 EOF;
diff --git a/include/ajax/ajax_add_concerned_card.php b/include/ajax/ajax_add_concerned_card.php
index 4322b13a5..90f3281b4 100644
--- a/include/ajax/ajax_add_concerned_card.php
+++ b/include/ajax/ajax_add_concerned_card.php
@@ -29,6 +29,7 @@ if (!defined('ALLOWED'))
     die('Appel direct ne sont pas permis');
 
 require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
+require_once NOALYSS_INCLUDE.'/class/card_multiple.class.php';
 $http=new HttpInput();
 
 ob_start();
@@ -42,49 +43,86 @@ catch (Exception $exc)
     error_log($exc->getTraceAsString());
     return;
 }
+/*
+ * security Who can do it ?
+ */
+if ( ! $g_user->can_write_action($ag_id)  ) {
+    record_log(__FILE__."security : access refused");
+    return;
+}
 
 require_once NOALYSS_INCLUDE.'/class/acc_ledger.class.php';
 
 $r=HtmlInput::title_box(_("Détail fiche"), 'search_card');
-
-$r.='<form id="search_card1_frm" method="GET" onsubmit="action_add_concerned_card(this);return false;">';
+//--------------------------------------------------------------------------------------------------------------------
+// Form search
+//--------------------------------------------------------------------------------------------------------------------
+$r.='<form id="search_card1_frm" method="GET" onsubmit="action_concerned_search_card(this);return false;">';
 $q=new IText('query');
 $q->value=(isset($query))?$query:'';
 $r.='<span style="margin-left:50px">';
 $r.=_('Fiche contenant').Icon_Action::infobulle(19);
 $r.=$q->input();
+// where to search
+$select=new ISelect("search_in");
+$select->value=$cn->make_array("select ad_id, ad_text from attr_def order by 2 ",1);
+$select->selected=$http->get("search_in","string","");
+$r.=_("limité aux champs ").$select->input();
 $r.=HtmlInput::submit('fs', _('Recherche'), "", "smallbutton");
 $r.='</span>';
-$r.=dossier::hidden().HtmlInput::hidden('op', 'add_concerned_card');
+$r.=dossier::hidden().HtmlInput::hidden('op2', 'add_concerned_card');
 $r.=HtmlInput::request_to_hidden(array('ag_id'));
 $r.='</form>';
+
+
 $query=$http->get("query", "string","");
 $sql_array['query']=$query;
 $sql_array['typecard']='all';
 
-$fiche=new Fiche($cn);
+$fiche=new Card_Multiple($cn);
 /* Build the SQL and show result */
 $sql=$fiche->build_sql($sql_array);
+$count_card=$fiche->count_sql($sql_array);
 
+//--------------------------------------------------------------------------------------------------------------------
+// Result
+//--------------------------------------------------------------------------------------------------------------------
 
 /* We limit the search to MAX_SEARCH_CARD records */
-$sql=$sql.' order by vw_name limit '.MAX_SEARCH_CARD;
 $a=$cn->get_array($sql);
+$r.='<form id="search_card2_frm" method="POST" onsubmit="action_concerned_save_card(this);return false;" '
+        . ' style="height:45rem">';
+$r.=HtmlInput::request_to_hidden(array('ag_id'));
+$r.=dossier::hidden().HtmlInput::hidden('op2', 'link_concerned_card').HtmlInput::hidden("op","card");
+// element to update with the answer
+$r.=HtmlInput::hidden("ctl","concerned_card_td");
 for ($i=0; $i<count($a); $i++)
 {
+    $ic=new ICheckBox("selected_card[]");
+    $ic->value=$a[$i]['f_id'];
+    $array[$i]['checkbox']=$ic->input();
     $array[$i]['quick_code']=$a[$i]['quick_code'];
     $array[$i]['name']=h($a[$i]['vw_name']);
     $array[$i]['accounting']=$a[$i]['accounting'];
     $array[$i]['first_name']=h($a[$i]['vw_first_name']);
     $array[$i]['description']=h($a[$i]['vw_description']);
-    $array[$i]['javascript']=sprintf("action_save_concerned(%d,'%s','%s')",$gDossier,$a[$i]['f_id'],$ag_id);
 }//foreach
 
-
-echo $r;
 // No accountancy history
 $accvis=0; 
-require_once(NOALYSS_TEMPLATE.'/card_result.php');
+echo $r;
+require_once(NOALYSS_TEMPLATE.'/card_multiple_result.php');
+echo '<ul class="aligned-block">';
+echo '<li>';
+echo HtmlInput::submit("add_concerned_card",_("Ajouter"));
+echo '</li>';
+echo '<li>';
+echo HtmlInput::button_close("search_card");
+echo '</li>';
+echo '</ul>';
+echo '</form>';
+
+
 $response=ob_get_contents();
 ob_end_clean();
 
diff --git a/include/ajax/ajax_card.php b/include/ajax/ajax_card.php
index 74a3d5b8f..e493da288 100644
--- a/include/ajax/ajax_card.php
+++ b/include/ajax/ajax_card.php
@@ -518,9 +518,11 @@ case 'fs':
         require_once NOALYSS_INCLUDE.'/ajax/ajax_add_concerned_card.php';
         return;
     break;
-    case 'action_save_concerned':
+// add several card to an action follow⁻up
+    case 'link_concerned_card':
         require NOALYSS_INCLUDE.'/ajax/ajax_action_save_concerned.php';
         return;
+// remove card from an action follow⁻up
     case 'action_remove_concerned':
         require NOALYSS_INCLUDE.'/ajax/ajax_action_remove_concerned.php';
         return;
@@ -744,6 +746,23 @@ case 'upr':
 	}
       }
       break;
+ //---------------------------------------------------------------------------------------------------------------
+ // Display option of a contact in an action-followup       
+ //---------------------------------------------------------------------------------------------------------------       
+        case 'display_card_option':
+            
+            require_once NOALYSS_INCLUDE.'/ajax/ajax_display_card_option.php';
+            return;
+            break;
+            
+ //---------------------------------------------------------------------------------------------------------------
+ // Save option of a contact in an action-followup       
+ //---------------------------------------------------------------------------------------------------------------       
+        case 'save_card_option':
+            require_once NOALYSS_INCLUDE.'/ajax/ajax_save_card_option.php';
+            return;
+
+            break;
             
 } // switch
 $xml=escape_xml($html);
diff --git a/include/ajax/ajax_display_card_option.php b/include/ajax/ajax_display_card_option.php
new file mode 100644
index 000000000..464c2b574
--- /dev/null
+++ b/include/ajax/ajax_display_card_option.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
+
+/**
+ * @file
+ * @brief  display the options of a card
+ */
+require_once NOALYSS_INCLUDE."/class/card_multiple.class.php";
+
+$card_multiple=new Card_Multiple();
+try
+{
+    $ap_id=$http->get("ap_id");
+}
+catch (Exception $exc)
+{
+    echo $exc->getMessage();
+    record_log($exc->getMessage().$exc->getTraceAsString());
+}
+
+echo HtmlInput::title_box(_("Options contact"), "d_linked_card_option","close","","y");
+// display existing option
+$card_multiple->display_option($ap_id);
diff --git a/include/class/card_multiple.class.php b/include/class/card_multiple.class.php
new file mode 100644
index 000000000..2296d8046
--- /dev/null
+++ b/include/class/card_multiple.class.php
@@ -0,0 +1,102 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+/**
+ * @file
+ * @brief in follow-up , add multiple cards to an event, an action
+ */
+class Card_Multiple
+{
+
+    function __construct()
+    {
+        
+    }
+
+    function build_sql($sql_array)
+    {
+        $cn=Dossier::connect();
+        $query=sql_string($sql_array['query']);
+
+        $string_sql="select * 
+              from vw_fiche_attr  
+              where 
+              vw_name ilike '%$query%' 
+              or quick_code ilike '%$query%'
+              order by vw_name 
+              limit 
+              ".MAX_CARD_SEARCH;
+        return $string_sql;
+    }
+
+    function count_sql($sql_array)
+    {
+        $cn=Dossier::connect();
+        $query=sql_string($sql_array['query']);
+
+        $string_sql="select count(*) 
+              from vw_fiche_attr  
+              where 
+              vw_name ilike '%$query%' 
+              or quick_code ilike '%$query%'";
+
+
+        return $cn->get_value($string_sql); ;
+    }
+    /**
+     * 
+     * @global type $g_user
+     * @param type $ap_id
+     * @return type
+     */
+    function display_option($p_action_person_id)
+    {
+        global $g_user;
+        $cn=Dossier::connect();
+        // retrieve card id (fiche.f_id) and the ag_id (action_gestion.ag_id)
+        $tmp=$cn->get_row("select f_id,ag_id from action_person where ap_id=$1 ", [$p_action_person_id]);
+        if ($tmp==NULL)
+        {
+            record_log("CMDO.01nothing found ".var_export($_REQUEST, true));
+            return;
+        }
+        $fiche_id=$tmp['f_id'];
+        $ag_id=$tmp['ag_id'];
+        if ( ! $g_user->can_read_action($ag_id)) {
+            throw new Exception (_("CMCDO01"."Security"));
+        }
+        $sql="select
+	cor.cor_id,
+	cor.cor_label,
+	cor.cor_type,
+	coalesce (apo.ap_id,-1) as ap_id,
+        ap_value,
+        cor_value_select
+from
+contact_option_ref cor
+left join action_person_option apo on (cor.cor_id=apo.contact_option_ref_id)
+where action_person_id is null or action_person_id=$1";
+        $a_option=$cn->get_array($sql,[$p_action_person_id]);
+        require NOALYSS_TEMPLATE."/card_multiple_display_option.php";
+        
+    }
+
+}
diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 6734dd238..11b5f3ca6 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -1493,7 +1493,7 @@ class Follow_Up
         $c=count($a_tag);
         for ($e=0; $e<$c; $e++)
         {
-            echo '<span style="border-radius:3px;border:1px solid;padding:3px;margin:1px">';
+            echo '<span class="tagcell">';
             echo $a_tag[$e]['t_tag'];
             if ($g_user->can_write_action($this->ag_id)==true)
             {
@@ -1670,14 +1670,16 @@ class Follow_Up
         $a_linked=$this->db->get_array('select ap_id,f_id from action_person where ag_id=$1', array($this->ag_id));
         if (count($a_linked)==0)
             return "";
+        $dossier_id=Dossier::id();
         for ($i=0; $i<count($a_linked); $i++)
         {
             $fiche=new Fiche($this->db, $a_linked[$i]['f_id']);
             $qc=$fiche->get_quick_code();
-            $js_remove=sprintf("onclick=\"action_remove_concerned('%s','%s','%s')\"", dossier::id(), $a_linked[$i]['f_id'], $this->ag_id);
-            echo '<span style="border:1px solid black;margin-right:5px;">';
-            echo $qc;
-            echo HtmlInput::anchor(SMALLX, "javascript:void(0)", $js_remove, ' class="smallbutton" style="padding:0px;display:inline" ');
+            $js_remove=sprintf("action_remove_concerned('%s','%s','%s')", dossier::id(), $a_linked[$i]['f_id'], $this->ag_id);
+            echo '<span class="tagcell">';
+            echo HtmlInput::anchor($qc,"", sprintf("onclick=\"linked_card_option('%s','%s')\"",
+                    $a_linked[$i]['ap_id'],$dossier_id));
+            echo Icon_Action::trash(uniqid(), $js_remove);
             echo '</span>';
             echo '&nbsp;';
             echo '&nbsp;';
diff --git a/include/template/card_multiple_result.php b/include/template/card_multiple_result.php
new file mode 100644
index 000000000..cef4de134
--- /dev/null
+++ b/include/template/card_multiple_result.php
@@ -0,0 +1,46 @@
+<?php
+//This file is part of NOALYSS and is under GPL 
+//see licence.txt
+$nb_array=count($array);
+?>
+<fieldset id="asearch" style="height:41rem">
+    <legend><?php echo _('Résultats'); ?></legend>
+    <div style="height:100%;overflow:auto;">
+        <?php if ($nb_array > 10) :
+                echo _("recherche rapide");
+                echo HtmlInput::filter_table("card_list", '1,2,3', 0);
+             endif;
+             ?>
+        <?php printf (_("Nombre de fiches trouvées %d montrées %d"),$count_card,$nb_array);?>
+        <table id="card_list" class="result" >
+            <?php for ($i=0; $i<$nb_array; $i++) : ?>
+                <?php $class=($i%2==0)?'odd':'even'; ?>
+                <tr class="<?php echo $class; ?>">
+                    <td style="padding-right:55px">
+                        <?php echo $array[$i]['checkbox'] ?>
+                    </td>
+                    <td style="padding-right:55px">
+                        <?php echo $array[$i]['quick_code'] ?>
+                    </td>
+
+                    <td>
+                        <?php echo $array[$i]['name'] ?>
+                    </td>
+                    <td>
+                        <?php echo $array[$i]['first_name'] ?>
+                    </td>
+                    <td>
+                        <?php echo $array[$i]['description'] ?>
+                    </td>
+
+                </tr>
+
+
+            <?php endfor; ?>
+        </table>
+        <span style="font-style: italic;">
+            <?php echo _("Nombre d'enregistrements:$i"); ?>
+        </span>
+        <br>
+    </div>
+</fieldset>
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index 1b20b7743..e664d79dc 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -96,20 +96,7 @@ COMMENT ON COLUMN public.contact_option_ref.cor_value_json IS 'json object if co
 COMMENT ON COLUMN public.contact_option_ref.document_option_id IS 'FK to document_option';
 
 
-CREATE TABLE public.action_person_option (
-	ap_id bigserial NOT NULL,
-	ap_value varchar NULL, -- Value of the option
-	contact_option_ref_id int8 NOT NULL,
-	action_person_id int8 NOT NULL,
-	CONSTRAINT action_person_option_pk PRIMARY KEY (ap_id),
-	CONSTRAINT action_person_option_fk FOREIGN KEY (action_person_id) REFERENCES action_person(ap_id) ON UPDATE CASCADE ON DELETE CASCADE,
-	CONSTRAINT contact_option_ref_fk FOREIGN KEY (contact_option_ref_id) REFERENCES contact_option_ref(cor_id) ON UPDATE CASCADE ON DELETE CASCADE
-);
-COMMENT ON TABLE public.action_person_option IS 'option for each contact';
 
--- Column comments
-
-COMMENT ON COLUMN public.action_person_option.ap_value IS 'Value of the option';
 
 -- renomme le menu
 update menu_ref set me_description = 'Configuration des documents dans le suivi' ,me_file='cfg_action.inc.php' ,
@@ -175,4 +162,31 @@ ALTER TABLE public.jnt_tag_group_tag ADD CONSTRAINT jnt_tag_group_tag_fk FOREIGN
 ALTER TABLE public.jnt_tag_group_tag ADD CONSTRAINT jnt_tag_group_tag_fk_1 FOREIGN KEY (tag_group_id) REFERENCES tag_group(tg_id) ON UPDATE CASCADE ON DELETE CASCADE;
 
 
-insert into action values (1025,'Ajout d''étiquette','followup','TAGADD');
\ No newline at end of file
+insert into action values (1025,'Ajout d''étiquette','followup','TAGADD');
+
+-- public.action_person_option definition
+
+-- Drop table
+
+-- DROP TABLE public.action_person_option;
+
+CREATE TABLE public.action_person_option (
+	ap_id bigserial NOT NULL,
+	ap_value varchar NULL, -- Value of the option
+	contact_option_ref_id int8 NOT NULL, -- FK to contact_option
+	action_person_id int8 NOT NULL, -- FK to action_person
+	CONSTRAINT action_person_option_pk PRIMARY KEY (ap_id)
+);
+COMMENT ON TABLE public.action_person_option IS 'option for each contact';
+
+-- Column comments
+
+COMMENT ON COLUMN public.action_person_option.ap_value IS 'Value of the option';
+COMMENT ON COLUMN public.action_person_option.contact_option_ref_id IS 'FK to contact_option';
+COMMENT ON COLUMN public.action_person_option.action_person_id IS 'FK to action_person';
+
+
+-- public.action_person_option foreign keys
+
+ALTER TABLE public.action_person_option ADD CONSTRAINT action_person_option_fk FOREIGN KEY (action_person_id) REFERENCES action_person(ap_id) ON UPDATE CASCADE ON DELETE CASCADE;
+ALTER TABLE public.action_person_option ADD CONSTRAINT contact_option_ref_fk FOREIGN KEY (contact_option_ref_id) REFERENCES contact_option_ref(cor_id) ON UPDATE CASCADE ON DELETE CASCADE;

From 099223f6fa0b92f41cd05c9ad6a8e8359a1090db Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Tue, 6 Oct 2020 19:03:27 +0200
Subject: [PATCH 055/257] not used anymore javascript:void(0)

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

diff --git a/include/lib/html_input.class.php b/include/lib/html_input.class.php
index e7e22bf96..7ca7c5516 100755
--- a/include/lib/html_input.class.php
+++ b/include/lib/html_input.class.php
@@ -914,7 +914,7 @@ class HtmlInput
     {
         if ($p_js!="")
         {
-            $p_url="javascript:void(0)";
+            $p_url='href="#"';
           } else {
               $p_url=sprintf('href="%s"',$p_url);
         }
@@ -1140,7 +1140,7 @@ class HtmlInput
     {
         $dossier=Dossier::id();
         $javascript=<<<EOF
-                    obj={dossier:$dossier,ag_id:$p_agid};action_add_concerned_card(obj);
+                    obj={dossier:$dossier,ag_id:$p_agid};action_concerned_search_card(obj);
 EOF;
         $js=HtmlInput::button_action(_('Ajout autres'), $javascript, 'xx',
                         'smallbutton');

From 09506c523a45cbb46770679828787517277a58dc Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Tue, 6 Oct 2020 19:03:49 +0200
Subject: [PATCH 056/257] Cosmetic for cells for tag and contact

---
 html/style-classic.css      | 15 ++++++++-------
 html/style-classic7.css     |  9 ++++++++-
 html/style-light.css        | 13 +++++++------
 include/class/tag.class.php |  2 +-
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/html/style-classic.css b/html/style-classic.css
index 6874bcbc2..f4ac0d335 100644
--- a/html/style-classic.css
+++ b/html/style-classic.css
@@ -2434,10 +2434,11 @@ span.title_tab_row {
      color : white !important;
      
 }
-
- /**
-  * dialog box for adding, modifying predefined operation
-  */
- #prdfop {
-
- }
\ No newline at end of file
+/* Cell with tag */
+span.tagcell {
+    border:1px solid darkgray;
+    padding:2px;margin:1px;
+    display: inline-block;
+    color:black;
+        
+}    
\ No newline at end of file
diff --git a/html/style-classic7.css b/html/style-classic7.css
index 2f2cda926..abbbcc316 100644
--- a/html/style-classic7.css
+++ b/html/style-classic7.css
@@ -2474,4 +2474,11 @@ p.info {
     font-family: sans-serif;
     font-style: italic;
 }
-}
\ No newline at end of file
+
+/* Cell with tag */
+span.tagcell {
+    border-radius:3px;
+    border:1px solid darkblue;
+    padding:3px;margin:1px;
+    display: inline-block;
+}    
\ No newline at end of file
diff --git a/html/style-light.css b/html/style-light.css
index 6474f1d2d..7fc388377 100644
--- a/html/style-light.css
+++ b/html/style-light.css
@@ -2369,9 +2369,10 @@ span.title_tab_row {
      
 }
 
- /**
-  * dialog box for adding, modifying predefined operation
-  */
- #prdfop {
-
- }
\ No newline at end of file
+ /* Cell with tag */
+span.tagcell {
+    border:1px solid blue;
+    padding:1px;margin:1px;
+    display: inline-block;
+    color:black;
+}    
\ No newline at end of file
diff --git a/include/class/tag.class.php b/include/class/tag.class.php
index 792e8cd26..2f3b0a1c0 100644
--- a/include/class/tag.class.php
+++ b/include/class/tag.class.php
@@ -104,7 +104,7 @@ class Tag
      * In the screen search add this data to the cell
      */
     function update_search_cell($p_prefix) {
-        echo '<span id="sp_'.$p_prefix.$this->data->t_id.'" style="border-radius:3px;border:1px solid;padding:3px;margin:1px">';
+        echo '<span id="sp_'.$p_prefix.$this->data->t_id.'" class="tagcell">';
         echo h($this->data->t_tag);
         echo HtmlInput::hidden($p_prefix.'tag[]', $this->data->t_id);
         $js=sprintf("$('sp_".$p_prefix.$this->data->t_id."').remove();");

From 4474640ef42ca975f88a73255c82055595e41a5d Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Tue, 6 Oct 2020 19:45:32 +0200
Subject: [PATCH 057/257] Upgrade DB to 145

---
 include/class/tag_group_mtable.class.php      |   4 +
 include/constant.php                          |   2 +-
 include/sql/patch/upgrade144.sql              | 188 ++++++++++++++++++
 .../template/card_multiple_display_option.php | 110 ++++++++++
 sql/upgrade.sql                               |   1 -
 5 files changed, 303 insertions(+), 2 deletions(-)
 create mode 100644 include/sql/patch/upgrade144.sql
 create mode 100644 include/template/card_multiple_display_option.php

diff --git a/include/class/tag_group_mtable.class.php b/include/class/tag_group_mtable.class.php
index e225d6243..b99350118 100644
--- a/include/class/tag_group_mtable.class.php
+++ b/include/class/tag_group_mtable.class.php
@@ -64,6 +64,10 @@ class Tag_Group_MTable extends Manage_Table_SQL
         $aTag=$cn->get_array("select jt_id,t_tag 
                                from tags join jnt_tag_group_tag on (tag_id=t_id) 
                                where tag_group_id=$1 order by 2", [$data_sql->tg_id]);
+        // not possible to add tag to inexisting group
+        if ( $data_sql->tg_id == -1){
+            return;
+        }
         echo '<ol id="ol_tag_group">';
         $nb=count($aTag);
         $dossier_id=Dossier::id();
diff --git a/include/constant.php b/include/constant.php
index 966ef5dcb..c6c0d23ca 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -107,7 +107,7 @@ if ( !defined ("NOALYSS_PACKAGE_REPOSITORY")) {
 if ( ! defined ("SYSINFO_DISPLAY")) {
     define ("SYSINFO_DISPLAY",TRUE);
 }
-define ("DBVERSION",144);
+define ("DBVERSION",145);
 define ("MONO_DATABASE",25);
 define ("DBVERSIONREPO",18);
 define ('NOTFOUND','--not found--');
diff --git a/include/sql/patch/upgrade144.sql b/include/sql/patch/upgrade144.sql
new file mode 100644
index 000000000..700f2e44a
--- /dev/null
+++ b/include/sql/patch/upgrade144.sql
@@ -0,0 +1,188 @@
+begin;
+
+
+CREATE OR REPLACE FUNCTION comptaproc.jrn_check_periode()
+ RETURNS trigger
+AS $function$
+declare
+bClosed bool;
+str_status text;
+ljr_tech_per jrn.jr_tech_per%TYPE;
+ljr_def_id jrn.jr_def_id%TYPE;
+lreturn jrn%ROWTYPE;
+begin
+if TG_OP='UPDATE' then
+    ljr_tech_per :=OLD.jr_tech_per ;
+    NEW.jr_tech_per := comptaproc.find_periode(to_char(NEW.jr_date,'DD.MM.YYYY'));
+    ljr_def_id :=OLD.jr_def_id;
+    lreturn :=NEW;
+    if NEW.jr_date = OLD.jr_date then
+        return NEW;
+    end if;
+    if comptaproc.is_closed(NEW.jr_tech_per,NEW.jr_def_id) = true then
+              raise exception 'Periode fermee';
+    end if;
+end if;
+
+if TG_OP='INSERT' then
+    NEW.jr_tech_per := comptaproc.find_periode(to_char(NEW.jr_date,'DD.MM.YYYY'));
+    ljr_tech_per :=NEW.jr_tech_per ;
+    ljr_def_id :=NEW.jr_def_id;
+    lreturn :=NEW;
+end if;
+
+if TG_OP='DELETE' then
+    ljr_tech_per :=OLD.jr_tech_per;
+    ljr_def_id :=OLD.jr_def_id;
+    lreturn :=OLD;
+end if;
+
+if comptaproc.is_closed (ljr_tech_per,ljr_def_id) = true then
+       raise exception 'Periode fermee';
+end if;
+
+return lreturn;
+end;
+$function$
+LANGUAGE plpgsql;
+
+
+-- New right for action : delete
+ALTER TABLE public.user_sec_action_profile drop CONSTRAINT user_sec_action_profile_ua_right_check;
+ALTER TABLE public.user_sec_action_profile ADD CONSTRAINT user_sec_action_profile_ua_right_check check (ua_right in ('R','W','X','O'));
+
+-- extension CRM : definition des options qu'on peut ajouter
+-- public.document_option_ref definition
+
+-- Drop table
+
+-- DROP TABLE public.document_option_ref;
+
+
+CREATE TABLE public.contact_option_ref (
+	cor_id bigserial NOT NULL,
+	cor_label varchar NOT NULL, -- Label de l'option
+	cor_type int4 NOT NULL DEFAULT 0, -- 0 text , 1 select ,2 nombre , 3 date
+	cor_value_select varchar NULL, -- Select values
+	CONSTRAINT contact_option_ref_pk PRIMARY KEY (cor_id)
+);
+COMMENT ON TABLE public.contact_option_ref IS 'Option for the contact';
+
+-- Column comments
+
+COMMENT ON COLUMN public.contact_option_ref.cor_label IS 'Label de l''option';
+COMMENT ON COLUMN public.contact_option_ref.cor_type IS '0 text , 1 select ,2 nombre , 3 date';
+COMMENT ON COLUMN public.contact_option_ref.cor_value_select IS 'Select values';
+
+
+
+
+-- renomme le menu
+update menu_ref set me_description = 'Configuration des documents dans le suivi' ,me_file='cfg_action.inc.php' ,
+me_description_etendue ='Vous permet d''ajouter de nouveaux type de documents pour le suivi (bordereau de livraison, devis..)',me_code='CFGACTION',
+me_menu='Document Suivi'
+where me_code='CFGCATDOC';
+
+
+-- ajoute un menu pour les options de contacts
+INSERT INTO public.menu_ref (me_code,me_menu,me_file,me_url,me_description,me_parameter,me_javascript,me_type,me_description_etendue) VALUES 
+('CFGCONTACT','Contact','contact_option_ref.inc.php',NULL,'Configure les options pours les contacts multiples',NULL,NULL,'ME',NULL)
+;
+
+INSERT INTO public.profile_menu (me_code,me_code_dep,p_id,p_order,p_type_display,pm_default,pm_id_dep) VALUES 
+('CFGCONTACT','DIVPARM',1,85,'E',0,56)
+;
+
+
+
+CREATE TABLE public.tag_group (
+	tg_id bigserial NOT NULL,
+	tg_name varchar NOT NULL
+);
+COMMENT ON TABLE public.tag_group IS 'Group of tags';
+
+-- Column comments
+
+COMMENT ON COLUMN public.tag_group.tg_name IS 'Nom du groupe';
+ALTER TABLE public.tag_group ADD CONSTRAINT tag_group_pk PRIMARY KEY (tg_id);
+
+-- public.jnt_tag_group_tag definition
+
+-- Drop table
+
+-- DROP TABLE public.jnt_tag_group_tag;
+
+CREATE TABLE public.jnt_tag_group_tag (
+	tag_group_id int8 NOT NULL,
+	tag_id int8 NOT NULL,
+	jt_id serial NOT NULL,
+	CONSTRAINT jnt_tag_group_tag_pkey PRIMARY KEY (jt_id),
+	CONSTRAINT jnt_tag_group_tag_un UNIQUE (tag_id, tag_group_id)
+);
+COMMENT ON TABLE public.jnt_tag_group_tag IS 'Many to Many table betwwen tag and tag group';
+
+
+-- public.jnt_tag_group_tag foreign keys
+
+ALTER TABLE public.jnt_tag_group_tag ADD CONSTRAINT jnt_tag_group_tag_fk FOREIGN KEY (tag_id) REFERENCES tags(t_id) ON UPDATE CASCADE ON DELETE CASCADE;
+ALTER TABLE public.jnt_tag_group_tag ADD CONSTRAINT jnt_tag_group_tag_fk_1 FOREIGN KEY (tag_group_id) REFERENCES tag_group(tg_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+insert into action values (1025,'Ajout d''étiquette','followup','TAGADD');
+
+-- public.action_person_option definition
+
+-- Drop table
+
+-- DROP TABLE public.action_person_option;
+
+CREATE TABLE public.action_person_option (
+	ap_id bigserial NOT NULL,
+	ap_value varchar NULL, -- Value of the option
+	contact_option_ref_id int8 NOT NULL, -- FK to contact_option
+	action_person_id int8 NOT NULL, -- FK to action_person
+	CONSTRAINT action_person_option_pk PRIMARY KEY (ap_id)
+);
+COMMENT ON TABLE public.action_person_option IS 'option for each contact';
+
+-- Column comments
+
+COMMENT ON COLUMN public.action_person_option.ap_value IS 'Value of the option';
+COMMENT ON COLUMN public.action_person_option.contact_option_ref_id IS 'FK to contact_option';
+COMMENT ON COLUMN public.action_person_option.action_person_id IS 'FK to action_person';
+
+
+-- public.action_person_option foreign keys
+
+ALTER TABLE public.action_person_option ADD CONSTRAINT action_person_option_fk FOREIGN KEY (action_person_id) REFERENCES action_person(ap_id) ON UPDATE CASCADE ON DELETE CASCADE;
+ALTER TABLE public.action_person_option ADD CONSTRAINT contact_option_ref_fk FOREIGN KEY (contact_option_ref_id) REFERENCES contact_option_ref(cor_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+-- public.document_option definition
+
+-- Drop table
+
+-- DROP TABLE public.document_option;
+
+CREATE TABLE public.document_option (
+	do_id bigserial NOT NULL,
+	do_code varchar(20) NOT NULL, -- Code of the option to add
+	document_type_id int8 NULL, -- FK to document_type
+	do_enable int4 NOT NULL DEFAULT 1, -- 1 the option is activated, 0 is inativated
+	CONSTRAINT document_option_ref_pk PRIMARY KEY (do_id),
+	CONSTRAINT document_option_un UNIQUE (do_code, document_type_id)
+);
+COMMENT ON TABLE public.document_option IS 'Reference of option addable to document_type';
+
+-- Column comments
+
+COMMENT ON COLUMN public.document_option.do_code IS 'Code of the option to add';
+COMMENT ON COLUMN public.document_option.document_type_id IS 'FK to document_type';
+COMMENT ON COLUMN public.document_option.do_enable IS '1 the option is activated, 0 is inativated';
+
+
+-- public.document_option foreign keys
+
+ALTER TABLE public.document_option ADD CONSTRAINT document_option_ref_fk FOREIGN KEY (document_type_id) REFERENCES document_type(dt_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+insert into version (val,v_description) values (145,'Improve tags , add multiple contacts with options');
+commit;
diff --git a/include/template/card_multiple_display_option.php b/include/template/card_multiple_display_option.php
new file mode 100644
index 000000000..2b07f9e3b
--- /dev/null
+++ b/include/template/card_multiple_display_option.php
@@ -0,0 +1,110 @@
+<?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
+
+/**
+ * @file
+ * @brief Show the option of a contact, 
+ * parameters received 
+ *      - $fiche_id 
+ *      - $ag_id 
+ *      - $a_option array
+ *               - $a_option.cor_id
+ *               - $a_option.cor_label
+ *               - $a_option.cor_type
+ *               - $a_option.ap_id (-1 if option for this contact doesn't exist)
+ * @see Card_Multiple
+ */
+?>
+<form method="POST" onsubmit="save_linked_card_option(this);return false">
+    <input type="hidden" name="op" value="card">
+    <input type="hidden" name="op2" value="save_card_option">
+    <input type="hidden" name="ctl" value="notused">
+    <input type="hidden" name="ag_id" value="<?=$ag_id?>">
+    <input type="hidden" name="f_id" value="<?=$fiche_id?>">
+    <input type="hidden" name="action_person_id" value="<?=$p_action_person_id?>">
+    <?= Dossier::hidden() ?>
+    <?php
+    $nb_option=count($a_option);
+    for ($i=0; $i<$nb_option; $i++):
+        switch ($a_option[$i]['cor_type'])
+        {
+            case 0:
+                $input=new IText("ap_value[]");
+                break;
+            case 2:
+                $input=new IDate("ap_value[]");
+                break;
+            case 1:
+                $input=new INum("ap_value[]");
+                break;
+            case 3:
+                $input=new ISelect("ap_value[]");
+                $input->value=array();
+                // for select , we need to take the list
+                if (!empty($a_option[$i]['cor_value_select']))
+                {
+                    $a_select=explode("|", $a_option[$i]['cor_value_select']);
+                    if (is_array($a_select))
+                    {
+                        $nb=count($a_select);
+                        $array=[];
+                        for ($e=0; $e<$nb; $e++)
+                        {
+                            $a["label"]=$a_select[$e];
+                            $a["value"]=$a_select[$e];
+                            $array[$e]=$a;
+                        }
+                        $input->value=$array;
+                        $input->selected = $a_option[$i]['ap_value']  ;
+                    }
+                }
+                break;
+        }
+       $input->set_value ($a_option[$i]['ap_value']);
+        echo '<span style="display:table-row">';
+        echo '<span style="display:table-cell">';
+        echo $a_option[$i]['cor_label'];
+        echo HtmlInput::hidden("f_id",$fiche_id);
+        echo HtmlInput::hidden("ap_id[]",$a_option[$i]['ap_id']);
+        echo HtmlInput::hidden("cor_id[]",$a_option[$i]['cor_id']);
+        echo '</span>';
+        echo '<span style="display:table-cell">';
+        echo $input->input();
+        echo '</span>';
+        echo '</span>';
+        
+    endfor;
+    
+    ?>
+    <ul class="aligned-block">
+        <li>
+            <?=HtmlInput::button_close("d_linked_card_option")?>
+        </li>
+        <li>
+            <?=HtmlInput::submit("save",_("Sauver"))?>
+        </li>
+        
+    </ul>
+        
+        
+</form>
\ No newline at end of file
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index e664d79dc..daa9ad83f 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -1,7 +1,6 @@
 
 CREATE OR REPLACE FUNCTION comptaproc.jrn_check_periode()
  RETURNS trigger
- LANGUAGE plpgsql
 AS $function$
 declare
 bClosed bool;

From 0b5ea0c2cef93b277df421d444b4750fbe1bac42 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Wed, 7 Oct 2020 11:45:34 +0200
Subject: [PATCH 058/257] Missing file

---
 include/ajax/ajax_save_card_option.php | 60 ++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 include/ajax/ajax_save_card_option.php

diff --git a/include/ajax/ajax_save_card_option.php b/include/ajax/ajax_save_card_option.php
new file mode 100644
index 000000000..6a6b36c8e
--- /dev/null
+++ b/include/ajax/ajax_save_card_option.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
+
+/**
+ * @file
+ * @brief save option of card into action_person_option
+ */
+
+try {
+    $ap_value=$http->post("ap_value","array",[]);
+    $ap_id=$http->post("ap_id","array",[]);
+    $cor_id=$http->post("cor_id","array",[]);
+    $fiche_id=$http->post("f_id");
+    $ag_id=$http->post("ag_id");
+    $action_person_id=$http->post("action_person_id");
+} catch (Exception $ex) {
+     record_log("ASCO01".$ex->getMessage().$ex->getTraceAsString());
+     return;
+}
+
+/// If cannot write we stop it
+if ( ! $g_user->can_write_action($ag_id)) {
+    record_log("ASCO02 Security ");
+}
+
+$nb=count($ap_value);
+// nothing to save
+if ($nb == 0) return;
+
+for ($i=0;$i<$nb; $i++) {
+    if ( $ap_id[$i] == -1 ) {
+        $cn->exec_sql("INSERT INTO public.action_person_option (ap_value, contact_option_ref_id, action_person_id) 
+                        VALUES($1, $2, $3) ",
+                  [$ap_value[$i],$cor_id[$i],$action_person_id]);
+    } else {
+        $cn->exec_sql("UPDATE public.action_person_option SET ap_value=$1 WHERE ap_id=$2)",
+                [$ap_value[$i],$action_person_id]);
+    }
+}
\ No newline at end of file

From 73c1887effb36e7a1d67db04cc893ae5c3eda9ca Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Tue, 18 Aug 2020 19:11:46 +0200
Subject: [PATCH 059/257] prevent divide by zero in formula

---
 include/lib/ac_common.php     | 23 ++++++++++++++++++++---
 include/lib/impress.class.php |  4 ++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/include/lib/ac_common.php b/include/lib/ac_common.php
index 44ee884ad..ff0f1e8f2 100644
--- a/include/lib/ac_common.php
+++ b/include/lib/ac_common.php
@@ -209,13 +209,13 @@ function cmpDate($p_date, $p_date_oth)
 /***!
  * @brief check if the argument is a number
  *
- * \param $p_int number to test
+ * @param $p_int number to test
  *
- * \return
+ * @return
  *        - 1 it's a number
  *        - 0 it is not
  */
-function isNumber(&$p_int)
+function isNumber($p_int)
 {
     if (strlen(trim($p_int)) == 0)
 	return 0;
@@ -1375,3 +1375,20 @@ function convert_to_rtf($p_string)
     }
     return $result;
 }
+/**
+ * When it is needed to eval a formula , this function prevent the divide by zero.
+ * the formula is a math operation to evaluate like : 1.0+2.0/1 (...) , it is used in "report", 
+ * it removes the operation "divide by 0 "
+ * 
+ * @param string $p_formula string containing a operation to evaluate
+ * 
+ * @see Impress::parse_formula
+ */
+function remove_divide_zero($p_formula)
+{
+    $test=str_replace(" ","",$p_formula).";";
+    $p_formula=preg_replace("![0-9]+\.*[0-9]*/0\.{0,1}0*(\+|-|\*|/|;){1}!","0$1",$test);
+    $p_formula=trim($p_formula,';');
+    return $p_formula;
+}
+
diff --git a/include/lib/impress.class.php b/include/lib/impress.class.php
index 0a8beb32b..8ea617f11 100644
--- a/include/lib/impress.class.php
+++ b/include/lib/impress.class.php
@@ -153,6 +153,10 @@ class Impress
         // $p_eval is true then we eval and returns result
         if ( $p_eval == true)
         {
+            /*-------------------------------------
+             * Protect againt division by zero 
+             */
+            $p_formula=remove_divide_zero($p_formula);
             $p_formula="\$result=".$p_formula.";";
             eval("$p_formula");
 

From 9513a3a6055d51a34f93e178a31f0ed6dc72d7a4 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Wed, 7 Oct 2020 17:10:48 +0200
Subject: [PATCH 060/257] FollowUp Deatil : add the amount + tva from card

---
 html/js/card.js                               |  11 +-
 include/ajax/ajax_add_concerned_card.php      |   2 +-
 include/ajax/ajax_card.php                    |   6 +-
 .../action_document_type_mtable.class.php     |  11 +-
 include/class/document_option.class.php       |  14 ++
 include/lib/icard.class.php                   |   3 +-
 .../action_document_type_mtable_input.php     |   5 +
 include/template/follow_up_detail_display.php |  14 +-
 sql/upgrade.sql                               | 193 +-----------------
 9 files changed, 60 insertions(+), 199 deletions(-)

diff --git a/html/js/card.js b/html/js/card.js
index 1eeedfda6..ef115ce38 100644
--- a/html/js/card.js
+++ b/html/js/card.js
@@ -79,6 +79,11 @@ function search_card(obj)
         var price=obj.price;
         var tvaid=obj.tvaid;
         var jrn=obj.jrn;
+        var amount_from_type=0;
+        if ( obj.amount_from_type) {
+            amount_from_type=obj.amount_from_type;
+       
+        }
         if ( jrn==undefined)
         {
             if ( g('p_jrn'))   {
@@ -98,7 +103,8 @@ function search_card(obj)
                       'inp':inp,'label':label,'price':price,'tvaid':tvaid,
                       'ctl':'search_card','op2':'fs','jrn':jrn,
                       'typecard':typecard,'query':string_to_search,'op':'card',
-                      'accvis':accvis
+                      'accvis':accvis,
+                      'amount_from_type':amount_from_type
                              });
 	if (  $('search_card') ) {
 	    removeDiv('search_card');
@@ -318,7 +324,8 @@ function search_get_card(obj)
         queryString+="&accvis="+$F(accvis);
     } else {
         queryString+="&accvis=0";
-    }
+    } 
+
     queryString=encodeURI(queryString);
     $('asearch').innerHTML=loading();
     
diff --git a/include/ajax/ajax_add_concerned_card.php b/include/ajax/ajax_add_concerned_card.php
index 90f3281b4..a30f1cce5 100644
--- a/include/ajax/ajax_add_concerned_card.php
+++ b/include/ajax/ajax_add_concerned_card.php
@@ -1,4 +1,4 @@
-<?php
+<?php,
 
 /*
  *   This file is part of NOALYSS.
diff --git a/include/ajax/ajax_card.php b/include/ajax/ajax_card.php
index e493da288..199ca0460 100644
--- a/include/ajax/ajax_card.php
+++ b/include/ajax/ajax_card.php
@@ -457,6 +457,10 @@ case 'fs':
         $ledger=new Acc_Ledger($cn,$jrn);
         $type=$ledger->get_type();
     }
+    // if jrn == -10 , the search is called from the detail operation from an action follow-up
+    if ( isset($jrn) && $jrn == -10){
+        $type=$http->request("amount_from_type","string","VEN");
+    }
     $fiche=new Fiche($cn);
     /* Build the SQL and show result */
     $sql=$fiche->build_sql($sql_array);
@@ -496,7 +500,7 @@ case 'fs':
                                               $price,$amount);
         }
         if ( $type=="VEN" ){
-            $amount=(isNumber($a[$i]['vw_buy']) == 1 )?$a[$i]['vw_sell']:0;
+            $amount=(isNumber($aFound[$i]['vw_buy']) == 1 )?$aFound[$i]['vw_sell']:0;
             $array[$i]['javascript'].=sprintf("set_value('%s','%s');",
                                               $price,$amount);
         }
diff --git a/include/class/action_document_type_mtable.class.php b/include/class/action_document_type_mtable.class.php
index b6fb26376..bd41af234 100644
--- a/include/class/action_document_type_mtable.class.php
+++ b/include/class/action_document_type_mtable.class.php
@@ -80,6 +80,7 @@ class Action_Document_Type_MTable extends Manage_Table_SQL
         $this->other['contact_multiple']=$http->request("det_contact_mul", "string", 0);
         $this->other['make_invoice']=$http->request("make_invoice", "string", 0);
         $this->other['seq']=$http->request("seq", "string", 0);
+        $this->other['select_option_operation']=$http->request("select_option_operation", "string", null);
     }
 
     /**
@@ -172,9 +173,13 @@ class Action_Document_Type_MTable extends Manage_Table_SQL
             $doc_type->set_number($this->other['seq']);
         }
         // Save detail operation
-        $cn->exec_sql("insert into document_option (do_code,document_type_id,do_enable) values ($1,$2,$3) 
+        $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", ["detail_operation", $object_sql->dt_id, $this->other['detail_operation']]);
+            do update set do_enable=$3,do_option=$4", ["detail_operation", 
+                                            $object_sql->dt_id,
+                                            $this->other['detail_operation'],
+                                            $this->other['select_option_operation']
+                    ]);
 
         // Save contact_multiple
         $cn->exec_sql("insert into document_option (do_code,document_type_id,do_enable) values ($1,$2,$3) 
@@ -185,6 +190,8 @@ class Action_Document_Type_MTable extends Manage_Table_SQL
         $cn->exec_sql("insert into document_option (do_code,document_type_id,do_enable) values ($1,$2,$3) 
             on conflict on constraint document_option_un
             do update set do_enable=$3 ", ["make_invoice", $object_sql->dt_id, $this->other['make_invoice']]);
+        
+        
     }
 
 }
diff --git a/include/class/document_option.class.php b/include/class/document_option.class.php
index 5d68874bd..cc5553356 100644
--- a/include/class/document_option.class.php
+++ b/include/class/document_option.class.php
@@ -48,6 +48,20 @@ class Document_Option
         }
         return $display_operation;
     }
+    /**
+     * returns option from  the operation_detail 
+     * 
+     * @param int $p_document_type Document_Type.dt_id
+     * @return string
+     */
+    static function option_operation_detail($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, 'detail_operation']);
+        return $option_operation;
+    }
 
     /**
      * returns true if the operation_detail is enable, otherwise false
diff --git a/include/lib/icard.class.php b/include/lib/icard.class.php
index d0bfa419a..9fbb74153 100644
--- a/include/lib/icard.class.php
+++ b/include/lib/icard.class.php
@@ -136,6 +136,7 @@ class ICard extends HtmlInput
         $this->style='  ';
         $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 
     }
    
     /**
@@ -322,7 +323,7 @@ class ICard extends HtmlInput
         if (!isset($this->id))
             $this->id=$this->name;
         $a="";
-        foreach (array('typecard', 'jrn', 'label', 'price', 'tvaid', 'accvis') as
+        foreach (array('typecard', 'jrn', 'label', 'price', 'tvaid', 'accvis','amount_from_type') as
                     $att)
         {
             if (isset($this->$att))
diff --git a/include/template/action_document_type_mtable_input.php b/include/template/action_document_type_mtable_input.php
index eee3f0117..eee56aac4 100644
--- a/include/template/action_document_type_mtable_input.php
+++ b/include/template/action_document_type_mtable_input.php
@@ -70,6 +70,11 @@ $i=new ICheckBox("detail_operation",1);
 if ( Document_Option::is_enable_operation_detail($table->dt_id)) $i->set_check(1);else $i->set_check(0);
 echo $i->input();
 echo _("Détail opération");
+$select_detail_operation=new ISelect("select_option_operation");
+$select_detail_operation->value=array(["value"=>"VEN","label"=>_("Prix vente")],
+                                      ["value"=>"ACH","label"=>_("Prix achat")]);
+$select_detail_operation->set_value(Document_Option::option_operation_detail($table->dt_id));
+echo $select_detail_operation->input();
 ?>
         </li> 
         <li>
diff --git a/include/template/follow_up_detail_display.php b/include/template/follow_up_detail_display.php
index 0ce27e905..a86a2e844 100644
--- a/include/template/follow_up_detail_display.php
+++ b/include/template/follow_up_detail_display.php
@@ -32,6 +32,11 @@ $text=new IText();
 $num=new INum();
 $itva=new ITva_Popup();
 $readonly=($p_view == "READ")?true:false;
+// Check for the Price on ACH or VEN
+$cn=Dossier::connect();
+$document_type=$p_follow_up->db->get_value("select ag_type from action_gestion where ag_id = $1",[$p_follow_up->ag_id]);
+$option_detail= Document_Option::option_operation_detail($document_type);
+
 // default menu for invoice
 $menu=new Default_Menu();
 ?>
@@ -53,7 +58,7 @@ $menu=new Default_Menu();
         for ($i=0; $i<$article_count; $i++):
             /* fid = Icard  */
             $icard=new ICard();
-            $icard->jrn=0;
+            $icard->jrn=-10;
             $icard->table=0;
             $icard->noadd="no";
             $icard->extra='all';
@@ -81,6 +86,13 @@ $menu=new Default_Menu();
             $icard->set_attribute('ipopup', 'ipopcard');
             $icard->set_function('fill_data');
             $icard->javascript=sprintf(' onchange="fill_data_onchange(\'%s\');" ', $icard->name);
+            // name of the field to update with the name of the card
+            $icard->set_attribute('label', 'e_march' . $i . '_label');
+            // name of the field with the price
+            $icard->set_attribute('price', 'e_march' . $i . '_price');
+            // name of the field with the TVA_ID
+            $icard->set_attribute('tvaid', 'e_march' . $i . '_tva_id');
+           $icard->amount_from_type=$option_detail;
 
             $aArticle[$i]['fid']=$icard->search().$icard->input();
 
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index daa9ad83f..54c62c600 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -1,191 +1,2 @@
-
-CREATE OR REPLACE FUNCTION comptaproc.jrn_check_periode()
- RETURNS trigger
-AS $function$
-declare
-bClosed bool;
-str_status text;
-ljr_tech_per jrn.jr_tech_per%TYPE;
-ljr_def_id jrn.jr_def_id%TYPE;
-lreturn jrn%ROWTYPE;
-begin
-if TG_OP='UPDATE' then
-    ljr_tech_per :=OLD.jr_tech_per ;
-    NEW.jr_tech_per := comptaproc.find_periode(to_char(NEW.jr_date,'DD.MM.YYYY'));
-    ljr_def_id :=OLD.jr_def_id;
-    lreturn :=NEW;
-    if NEW.jr_date = OLD.jr_date then
-        return NEW;
-    end if;
-    if comptaproc.is_closed(NEW.jr_tech_per,NEW.jr_def_id) = true then
-              raise exception 'Periode fermee';
-    end if;
-end if;
-
-if TG_OP='INSERT' then
-    NEW.jr_tech_per := comptaproc.find_periode(to_char(NEW.jr_date,'DD.MM.YYYY'));
-    ljr_tech_per :=NEW.jr_tech_per ;
-    ljr_def_id :=NEW.jr_def_id;
-    lreturn :=NEW;
-end if;
-
-if TG_OP='DELETE' then
-    ljr_tech_per :=OLD.jr_tech_per;
-    ljr_def_id :=OLD.jr_def_id;
-    lreturn :=OLD;
-end if;
-
-if comptaproc.is_closed (ljr_tech_per,ljr_def_id) = true then
-       raise exception 'Periode fermee';
-end if;
-
-return lreturn;
-end;
-$function$;
-LANGUAGE plpgsql;
-
--- New right for action : delete
-ALTER TABLE public.user_sec_action_profile drop CONSTRAINT user_sec_action_profile_ua_right_check;
-ALTER TABLE public.user_sec_action_profile ADD CONSTRAINT user_sec_action_profile_ua_right_check check (ua_right in ('R','W','X','O'));
-
--- extension CRM : definition des options qu'on peut ajouter
--- public.document_option_ref definition
-
--- Drop table
-
--- DROP TABLE public.document_option_ref;
-
-CREATE TABLE public.document_option_ref (
-	do_id bigserial NOT NULL,
-	do_code varchar(20) NOT NULL, -- Code of the option to add
-	document_type_id int8 NULL, -- FK to document_type
-	CONSTRAINT document_option_ref_pk PRIMARY KEY (do_id)
-);
-COMMENT ON TABLE public.document_option_ref IS 'Reference of option of document_type';
-
--- Column comments
-
-COMMENT ON COLUMN public.document_option_ref.do_code IS 'Code of the option to add';
-COMMENT ON COLUMN public.document_option_ref.document_type_id IS 'FK to document_type';
-
-
--- public.document_option_ref foreign keys
-
-ALTER TABLE public.document_option_ref ADD CONSTRAINT document_option_ref_fk FOREIGN KEY (document_type_id) REFERENCES document_type(dt_id) ON UPDATE CASCADE ON DELETE CASCADE;
-
-
--- Drop table
-
-CREATE TABLE public.contact_option_ref (
-	cor_id bigserial NOT NULL,
-	cor_label varchar NOT NULL, -- Label de l'option
-	cor_type int4 NOT NULL DEFAULT 0, -- 0 text , 1 select ,2 nombre , 3 date
-	cor_value_json json NULL, -- json object if cor_type is a select
-	document_option_id int8 NOT NULL, -- FK to document_option
-	CONSTRAINT contact_option_ref_pk PRIMARY KEY (cor_id),
-	CONSTRAINT contact_option_ref_fk FOREIGN KEY (document_option_id) REFERENCES document_option(do_id) ON UPDATE CASCADE ON DELETE CASCADE
-);
-COMMENT ON TABLE public.contact_option_ref IS 'Option for the contact';
-
--- Column comments
-
-COMMENT ON COLUMN public.contact_option_ref.cor_label IS 'Label de l''option';
-COMMENT ON COLUMN public.contact_option_ref.cor_type IS '0 text , 1 select ,2 nombre , 3 date';
-COMMENT ON COLUMN public.contact_option_ref.cor_value_json IS 'json object if cor_type is a select';
-COMMENT ON COLUMN public.contact_option_ref.document_option_id IS 'FK to document_option';
-
-
-
-
--- renomme le menu
-update menu_ref set me_description = 'Configuration des documents dans le suivi' ,me_file='cfg_action.inc.php' ,
-me_description_etendue ='Vous permet d''ajouter de nouveaux type de documents pour le suivi (bordereau de livraison, devis..)',me_code='CFGACTION',
-me_menu='Document Suivi'
-where me_code='CFGCATDOC';
-
-
-ALTER TABLE public.document_option ADD do_activate int NOT NULL DEFAULT 1;
-COMMENT ON COLUMN public.document_option.do_activate IS '1 the option is activated, 0 is inativated';
-
-ALTER TABLE public.document_option ADD CONSTRAINT document_option_un UNIQUE (do_code,document_type_id);
-ALTER TABLE public.document_option RENAME COLUMN do_activate TO do_enable;
-
--- ajoute un menu pour les options de contacts
-INSERT INTO public.menu_ref (me_code,me_menu,me_file,me_url,me_description,me_parameter,me_javascript,me_type,me_description_etendue) VALUES 
-('CFGCONTACT','Contact','contact_option_ref.inc.php',NULL,'Configure les options pours les contacts multiples',NULL,NULL,'ME',NULL)
-;
-
-INSERT INTO public.profile_menu (me_code,me_code_dep,p_id,p_order,p_type_display,pm_default,pm_id_dep) VALUES 
-('CFGCONTACT','DIVPARM',1,85,'E',0,56)
-;
-
--- contact option globale pour toutes les actions
-ALTER TABLE public.contact_option_ref DROP COLUMN document_option_id;
-
--- on utilise un varchar pour stocker les possibilités
-ALTER TABLE public.contact_option_ref DROP COLUMN cor_value_json;
-ALTER TABLE public.contact_option_ref ADD cor_value_select varchar NULL;
-COMMENT ON COLUMN public.contact_option_ref.cor_value_select IS 'Select values';
-
-
-CREATE TABLE public.tag_group (
-	tg_id bigserial NOT NULL,
-	tg_name varchar NOT NULL
-);
-COMMENT ON TABLE public.tag_group IS 'Group of tags';
-
--- Column comments
-
-COMMENT ON COLUMN public.tag_group.tg_name IS 'Nom du groupe';
-ALTER TABLE public.tag_group ADD CONSTRAINT tag_group_pk PRIMARY KEY (tg_id);
-
--- public.jnt_tag_group_tag definition
-
--- Drop table
-
--- DROP TABLE public.jnt_tag_group_tag;
-
-CREATE TABLE public.jnt_tag_group_tag (
-	tag_group_id int8 NOT NULL,
-	tag_id int8 NOT NULL,
-	jt_id serial NOT NULL,
-	CONSTRAINT jnt_tag_group_tag_pkey PRIMARY KEY (jt_id),
-	CONSTRAINT jnt_tag_group_tag_un UNIQUE (tag_id, tag_group_id)
-);
-COMMENT ON TABLE public.jnt_tag_group_tag IS 'Many to Many table betwwen tag and tag group';
-
-
--- public.jnt_tag_group_tag foreign keys
-
-ALTER TABLE public.jnt_tag_group_tag ADD CONSTRAINT jnt_tag_group_tag_fk FOREIGN KEY (tag_id) REFERENCES tags(t_id) ON UPDATE CASCADE ON DELETE CASCADE;
-ALTER TABLE public.jnt_tag_group_tag ADD CONSTRAINT jnt_tag_group_tag_fk_1 FOREIGN KEY (tag_group_id) REFERENCES tag_group(tg_id) ON UPDATE CASCADE ON DELETE CASCADE;
-
-
-insert into action values (1025,'Ajout d''étiquette','followup','TAGADD');
-
--- public.action_person_option definition
-
--- Drop table
-
--- DROP TABLE public.action_person_option;
-
-CREATE TABLE public.action_person_option (
-	ap_id bigserial NOT NULL,
-	ap_value varchar NULL, -- Value of the option
-	contact_option_ref_id int8 NOT NULL, -- FK to contact_option
-	action_person_id int8 NOT NULL, -- FK to action_person
-	CONSTRAINT action_person_option_pk PRIMARY KEY (ap_id)
-);
-COMMENT ON TABLE public.action_person_option IS 'option for each contact';
-
--- Column comments
-
-COMMENT ON COLUMN public.action_person_option.ap_value IS 'Value of the option';
-COMMENT ON COLUMN public.action_person_option.contact_option_ref_id IS 'FK to contact_option';
-COMMENT ON COLUMN public.action_person_option.action_person_id IS 'FK to action_person';
-
-
--- public.action_person_option foreign keys
-
-ALTER TABLE public.action_person_option ADD CONSTRAINT action_person_option_fk FOREIGN KEY (action_person_id) REFERENCES action_person(ap_id) ON UPDATE CASCADE ON DELETE CASCADE;
-ALTER TABLE public.action_person_option ADD CONSTRAINT contact_option_ref_fk FOREIGN KEY (contact_option_ref_id) REFERENCES contact_option_ref(cor_id) ON UPDATE CASCADE ON DELETE CASCADE;
+ALTER TABLE public.document_option ADD do_option varchar NULL;
+COMMENT ON COLUMN public.document_option.do_option IS 'Option for the detail';

From 13d44d5bdd3798bfe69aee2eebc382d91177112b Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Thu, 8 Oct 2020 18:12:22 +0200
Subject: [PATCH 061/257] Search Card Paginate

---
 html/js/card.js                  |  6 +++++
 include/ajax/ajax_card.php       | 43 ++++++++++++++++++++++----------
 include/template/card_result.php | 30 +++++++++++++++++++++-
 3 files changed, 65 insertions(+), 14 deletions(-)

diff --git a/html/js/card.js b/html/js/card.js
index ef115ce38..aed90e9fd 100644
--- a/html/js/card.js
+++ b/html/js/card.js
@@ -325,6 +325,12 @@ function search_get_card(obj)
     } else {
         queryString+="&accvis=0";
     } 
+   if ( obj.elements['amount_from_type']) {
+        queryString+="&amount_from_type="+obj.elements['amount_from_type'].value;
+    }
+    if (obj.elements['page_card']) {
+        queryString+="&page_card="+obj.elements["page_card"].value;
+    }
 
     queryString=encodeURI(queryString);
     $('asearch').innerHTML=loading();
diff --git a/include/ajax/ajax_card.php b/include/ajax/ajax_card.php
index 199ca0460..aa73b65a3 100644
--- a/include/ajax/ajax_card.php
+++ b/include/ajax/ajax_card.php
@@ -441,14 +441,24 @@ case 'fs':
 	$r.='</span>';
     $r.=dossier::hidden().HtmlInput::hidden('op','fs');
     $array=array();
-    foreach (array('accvis','inp','jrn','label','typecard','price','tvaid') as $i)
+ 
+    // to navigate
+    $page_card=$http->get("page_card","number",0);
+    
+    // save previous info
+    $hidden="";
+    foreach (array('accvis','inp','jrn','label','typecard','price','tvaid','amount_from_type') as $i)
     {
         if  (isset(${$i}) )
         {
             $r.=HtmlInput::hidden($i,${$i});
+            $hidden.=HtmlInput::hidden($i,${$i});
             $sql_array[$i]=${$i};
         }
     }
+    $r.=$hidden;
+    $r.="</form>";
+
     $sql_array["query"]=$query;
     /* what is the type of the ledger */
     $type="GL";
@@ -477,25 +487,32 @@ case 'fs':
              break;
     }
      /* We limit the search to MAX_SEARCH_CARD records */
-    $sql=$sql.' order by vw_name limit '.MAX_SEARCH_CARD;
-    $a=$cn->get_array($sql);
-    for($i=0;$i<count($a);$i++)
-    {
-        $array[$i]['quick_code']=$a[$i]['quick_code'];
-        $array[$i]['name']=h($a[$i]['vw_name']);
-        $array[$i]['accounting']=$a[$i]['accounting'];
-        $array[$i]['first_name']=h($a[$i]['vw_first_name']);
-        $array[$i]['description']=h($a[$i]['vw_description']);
+   $sql=$sql.' order by vw_name ';
+   $total_card=$cn->get_value("select count(*) from ($sql) as c");
+    
+    $record_start=$page_card*MAX_SEARCH_CARD;
+    $sql.=' limit '.MAX_SEARCH_CARD.' offset '.$record_start;
+    
+    $aFound=$cn->get_array($sql);
+    $nb_found=count($aFound);
+    for($i=0;$i<$nb_found;$i++)
+     {
+        $array[$i]['quick_code']=$aFound[$i]['quick_code'];
+        $array[$i]['name']=h($aFound[$i]['vw_name']);
+        $array[$i]['accounting']=$aFound[$i]['accounting'];
+        $array[$i]['first_name']=h($aFound[$i]['vw_first_name']);
+        $array[$i]['description']=h($aFound[$i]['vw_description']);
         $array[$i]['javascript']=sprintf("set_value('%s','%s');",
                                          $inp,$array[$i]['quick_code']);
         $array[$i]['javascript'].=sprintf("set_value('%s','%s');",
-                                          $label,j(h(strip_tags($a[$i]['vw_name']))));
+                       $label,j(h(strip_tags($aFound[$i]['vw_name']))));
+
 
         /* if it is a ledger of sales we use vw_buy
            if it is a ledger of purchase we use vw_sell*/
         
         if ( $type=="ACH" ){
-            $amount=(isNumber($a[$i]['vw_buy']) == 1 )?$a[$i]['vw_buy']:0;
+            $amount=(isNumber($aFound[$i]['vw_buy']) == 1 )?$aFound[$i]['vw_buy']:0;
             $array[$i]['javascript'].=sprintf("set_value('%s','%s');",
                                               $price,$amount);
         }
@@ -505,7 +522,7 @@ case 'fs':
                                               $price,$amount);
         }
         $array[$i]['javascript'].=sprintf("set_value('%s','%s');",
-                                          $tvaid,$a[$i]['tva_id']);
+                                          $tvaid,$aFound[$i]['tva_id']);
         $array[$i]['javascript'].="removeDiv('search_card');";
 
     }//foreach
diff --git a/include/template/card_result.php b/include/template/card_result.php
index 6c38fad65..466e7d735 100644
--- a/include/template/card_result.php
+++ b/include/template/card_result.php
@@ -5,6 +5,34 @@
 <fieldset id="asearch" style="height:88%">
    <legend><?php echo _('Résultats'); ?></legend>
 <div style="height:88%;overflow:auto;">
+    <?php
+    // compute the url, $sql_array is defined in ajax_card.php
+    echo '<ul  class="aligned-block" style="padding:1px;margin-top: 0px;margin-bottom: 0px;">';
+    if ( $page_card != 0 ) {
+        // show previous arrow to left
+        echo '<li style="padding:1px">';
+        echo '<form method="GET" onsubmit="this.ctl=\'ipop_card\';search_get_card(this);return false;">';           
+        $url=$sql_array;
+        $url["page_card"]=$page_card-1;
+        echo HtmlInput::array_to_hidden(array('accvis','inp','jrn','label','typecard','price','tvaid','amount_from_type','page_card','query'), $url);
+        echo HtmlInput::submit("previous","<");
+        echo '</form>';
+        echo '</li>';
+    }
+    if ( $record_start < $total_card && $nb_found >= MAX_SEARCH_CARD) {
+        echo '<li style="padding:1px">';
+         echo '<form method="GET" onsubmit="this.ctl=\'ipop_card\';search_get_card(this);return false;">';           
+         $url=$sql_array;
+        $url["page_card"]=$page_card+1;
+        echo HtmlInput::array_to_hidden(array('accvis','inp','jrn','label','typecard','price','tvaid','amount_from_type','page_card','query'), $url);
+        
+        echo HtmlInput::submit("next",">");
+        echo '</form>';
+        echo '</li>';
+    }
+    echo '</ul>';
+ ?>
+
 <table class="result" >
 <?php for ($i=0;$i<sizeof($array);$i++) : ?>
     <?php $class=($i%2==0)?'odd':'even';?>
@@ -40,7 +68,7 @@ if ( $accvis == 1 ) :
 <?php endfor; ?>
 </table>
 <span style="font-style: italic;">
-   <?php echo _("Nombre d'enregistrements:$i"); ?>
+    <?php echo _("Nombre d'enregistrements trouvé:$total_card"); ?>
 </span>
 <br>
 </div>

From c7c480b34c826ddb6788f317a75368709124a6cc Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Thu, 8 Oct 2020 18:14:21 +0200
Subject: [PATCH 062/257] FOLLOWUP : generate doc. add new tag,
 DOCUMENT_ID,TITLE,DESCRIPTION,LABELOP,COMMENT

---
 include/ajax/ajax_add_concerned_card.php |  1 +
 include/class/document.class.php         | 62 +++++++++++++++++++-----
 2 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/include/ajax/ajax_add_concerned_card.php b/include/ajax/ajax_add_concerned_card.php
index a30f1cce5..c8e709118 100644
--- a/include/ajax/ajax_add_concerned_card.php
+++ b/include/ajax/ajax_add_concerned_card.php
@@ -96,6 +96,7 @@ $r.=HtmlInput::request_to_hidden(array('ag_id'));
 $r.=dossier::hidden().HtmlInput::hidden('op2', 'link_concerned_card').HtmlInput::hidden("op","card");
 // element to update with the answer
 $r.=HtmlInput::hidden("ctl","concerned_card_td");
+$array=[];
 for ($i=0; $i<count($a); $i++)
 {
     $ic=new ICheckBox("selected_card[]");
diff --git a/include/class/document.class.php b/include/class/document.class.php
index a58f1de64..2752d8827 100644
--- a/include/class/document.class.php
+++ b/include/class/document.class.php
@@ -533,6 +533,10 @@ class Document
      *  - [TITLE]
      *  - [DESCRIPTION]
      *  - [COMM_PAYMENT]
+     *  - [LABELOP]
+     *  - [COMMENT]
+     *  - [DESCRIPTION]
+     *  - [DOCUMENT_ID]
      *
      * \param $p_tag TAG
      * \param $p_array data from $_POST
@@ -789,6 +793,10 @@ class Document
         case 'NUMBER':
             $r=$this->d_number;
             break;
+        case "DOCUMENT_ID":
+            if (isset($p_array['ag_id'])) return $p_array['ag_id'];
+            return "";
+            break;
 
         case 'USER' :
             return $_SESSION['use_name'].', '.$_SESSION['use_first_name'];
@@ -814,16 +822,17 @@ class Document
              *  - [DATE_LIMIT]
              */
         case 'DATE_LIMIT_CALC':
-            extract ($p_array, EXTR_SKIP);
-            $id='e_ech' ;
-            if ( !isset (${$id}) ) return "";
-            $r=format_date(${$id},'DD.MM.YYYY','YYYY-MM-DD');
-            break;
+            if ( isset ($p_array["e_ech"] )) 
+                    return format_date($p_array["ech"],'DD.MM.YYYY','YYYY-MM-DD');
+            if ( isset ($p_array["ag_remind_date"] )) 
+                    return format_date($p_array["ag_remind_date"],'DD.MM.YYYY','YYYY-MM-DD');
+            
+                break;
       case 'DATE_LIMIT':
-            extract ($p_array, EXTR_SKIP);
-            $id='e_ech' ;
-            if ( !isset (${$id}) ) return "";
-            $r=${$id};
+         if ( isset ($p_array["e_ech"] )) 
+                    return $p_array["ech"];
+            if ( isset ($p_array["ag_remind_date"] )) 
+                    return $p_array["ag_remind_date"];
             break;
         case 'MARCH_NEXT':
             $this->counter++;
@@ -1130,7 +1139,7 @@ class Document
             else
                 return "";
             break;
-        case 'COMMENT':
+        case 'LABELOP':
             if ( isset($p_array['e_comm']))
                 return $p_array['e_comm'];
             break;
@@ -1160,9 +1169,36 @@ class Document
                 $ret=$this->db->get_value('select r_phone from public.stock_repository where r_id=$1',array($p_array['repo']));
                 return $ret;
         case 'TITLE':
-            $http=new HttpInput();
-            $title=$http->request("ag_title","string", "");
-            return $title;
+            if ( isset($p_array['ag_title']))                 return $p_array['ag_title'];
+            return "";
+            break;
+        case 'DESCRIPTION':
+            if ( isset($p_array['ag_id'])) {
+                // retrieve first comment
+                $description=$this->db->get_value("select agc_comment "
+                        . "  from action_gestion_comment "
+                        . "where ag_id=$1 order by 1 asc limit 1"
+                        ,[$p_array['ag_id']]);
+                return $description;
+            }
+            return "";
+            break;
+        case 'COMMENT':
+            if ( isset($p_array['ag_id'])) {
+                // retrieve first comment
+                $aComment=$this->db->get_array("select agc_comment "
+                        . "  from action_gestion_comment "
+                        . "where ag_id=$1 order by 1"
+                        ,[$p_array['ag_id']]);
+                $nb_comment=count($aComment);
+                $description="";
+                for ($i=0;$i< $nb_comment;$i++) {
+                    $description.=$aComment[$i]['agc_comment']."\n";
+                }
+                return $description;
+            }
+            return "";
+            break;
         case 'COMM_PAYMENT':
             if ( isset($p_array["e_comm_paiement"])) {
             return $p_array["e_comm_paiement"];

From e5833259e8d513a8827cbcec54c74f1d8502fb8b Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Thu, 8 Oct 2020 18:15:30 +0200
Subject: [PATCH 063/257] Bug #1839 : : accentuated character broken

---
 html/js/acc_ledger.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/html/js/acc_ledger.js b/html/js/acc_ledger.js
index aa4fe83ce..33e959fc2 100644
--- a/html/js/acc_ledger.js
+++ b/html/js/acc_ledger.js
@@ -1106,16 +1106,16 @@ function search_letter(obj)
 function op_save(obj)
 {
     try {
-        var queryString = $(obj).serialize();
-        queryString += "&gDossier=" + obj.gDossier.value;
+        var queryString = $(obj).serialize(true);
+        queryString ["gDossier"]= obj.gDossier.value;
         var rapt2 = "rapt" + obj.whatdiv.value;
-        queryString += "&rapt=" + g(rapt2).value;
-        queryString += '&jr_id=' + obj.jr_id.value;
+        queryString ["rapt"] =   g(rapt2).value;
+        queryString  ["jr_id"] = obj.jr_id.value;
         var jr_id=obj.jr_id.value;
-        queryString += '&div=' + obj.whatdiv.value;
+        queryString ["div"]= obj.whatdiv.value;
         var divid=obj.whatdiv.value;
-        queryString += '&act=save';
-        queryString += '&op=ledger';
+        queryString ["act"]="save";
+        queryString ["op"]="ledger";
         
         waiting_box();
         /*
@@ -1126,7 +1126,7 @@ function op_save(obj)
             var action = new Ajax.Request('ajax_misc.php',
                     {
                         method: 'post',
-                        parameters: encodeURI(queryString),
+                        parameters: queryString,
                         onFailure: null,
                         onSuccess: infodiv
                     }

From b6607f89d7f91c8704e631f6fc95bf7b5b814b99 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Thu, 8 Oct 2020 20:07:59 +0200
Subject: [PATCH 064/257] InPlace_Switch : do not echo , return a string
 instead

---
 include/lib/inplace_switch.class.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/lib/inplace_switch.class.php b/include/lib/inplace_switch.class.php
index 77d395331..914ca0fe2 100644
--- a/include/lib/inplace_switch.class.php
+++ b/include/lib/inplace_switch.class.php
@@ -70,16 +70,17 @@ class Inplace_Switch
             throw new Exception(_("Invalide value"));
         }
         
-        printf('<span style="text-decoration: none;color:%s" class="inplace_edit icon" id="%s">', $color,$this->name);
-        echo $icon;
-        echo '</span>';
-        echo <<<EOF
+        $r=sprintf('<span style="text-decoration: none;color:%s" class="inplace_edit icon" id="%s">', $color,$this->name);
+        $r.=$icon;
+        $r.= '</span>';
+        $r.=<<<EOF
         <script>
 {$this->name}.onclick=function() {new Ajax.Updater({$this->name},'{$this->callback}',{method:"get",parameters:{$this->json},evalScripts:true} );
    {$this->jscript} 
    }
 </script>
 EOF;
+    return $r;
     }
     public function get_jscript()
     {

From 5f61996d4af7627cab12f919c3d205fe631352da Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sat, 10 Oct 2020 13:31:19 +0200
Subject: [PATCH 065/257] Rewriting of card attributes

---
 include/ajax/ajax_card.php                   |  28 +-
 include/ajax/ajax_card_attribute.php         | 102 ++++++
 include/card_attr.inc.php                    | 148 +--------
 include/class/card_attribut_mtable.class.php | 201 ++++++++++++
 include/class/fiche_attr.class.php           | 319 ++++++-------------
 include/lib/manage_table_sql.class.php       |  17 +-
 include/lib/message_javascript.php           |   1 +
 sql/upgrade.sql                              |   5 +
 8 files changed, 431 insertions(+), 390 deletions(-)
 create mode 100644 include/ajax/ajax_card_attribute.php
 create mode 100644 include/class/card_attribut_mtable.class.php

diff --git a/include/ajax/ajax_card.php b/include/ajax/ajax_card.php
index aa73b65a3..fe8834f2e 100644
--- a/include/ajax/ajax_card.php
+++ b/include/ajax/ajax_card.php
@@ -99,31 +99,9 @@ $extra="";
 $http=new \HttpInput();
 switch($op2)
 {
-    /* ------------------------------------------------------------ */
-    /* Remove a attribut */
-    /* ------------------------------------------------------------ */
-case 'rmfa':
-    if ($g_user->check_action(FICCAT)==0)exit();
-
-    ob_start();
-    try
-    {
-        $ad_id= $http->get("ad_id","number");
-        $cn->start();
-        $fa=new Fiche_Attr($cn,$ad_id);
-        $fa->delete();
-        $cn->commit();
-    }
-    catch (Exception $e)
-    {
-        $cn->rollback();
-        record_log($e->getMessage());
-          record_log($e);
-        echo $e->getMessage();
-    }
-    $html=ob_get_contents();
-    ob_end_clean();
-    break;
+    case 'attribute':
+        require_once "ajax/ajax_card_attribute.php";
+        return ;
     /* ------------------------------------------------------------ */
     /* Display card detail */
     /* ------------------------------------------------------------ */
diff --git a/include/ajax/ajax_card_attribute.php b/include/ajax/ajax_card_attribute.php
new file mode 100644
index 000000000..feedef07b
--- /dev/null
+++ b/include/ajax/ajax_card_attribute.php
@@ -0,0 +1,102 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+/**
+ * @file
+ * @brief answer to card_attr_inc.php
+ */
+global $g_user;
+// security
+$g_user->can_request("CFGATCARD");
+require_once NOALYSS_INCLUDE."/lib/inplace_switch.class.php";
+require_once NOALYSS_INCLUDE.'/class/card_attribut_mtable.class.php';
+
+$http=new HttpInput();
+
+try
+{
+    $action=$http->request("action", "string");
+}
+catch (Exception $ex)
+{
+    record_log("ACA01".$ex->getMessage().$ex->getTraceAsString());
+}
+
+if ($action=="enable_search")
+{
+    $value=$http->request("value");
+    $ad_id=$http->request("ad_id");
+    $name=$http->request("name");
+    if ($value==1)
+    {
+        $cn->exec_sql("update attr_def set ad_search_followup=0 where ad_id=$1", [$ad_id]);
+        $value=0;
+    }
+    else
+    {
+        $cn->exec_sql("update attr_def set ad_search_followup=1 where ad_id=$1", [$ad_id]);
+        $value=1;
+    }
+    $ic=new Inplace_Switch($name, $value);
+    $ic->set_callback("ajax_misc.php");
+    $ic->add_json_param("op", "card");
+    $ic->add_json_param("gDossier", Dossier::id());
+    $ic->add_json_param("op2", "attribute");
+    $ic->add_json_param("action", "enable_search");
+    $ic->add_json_param("ad_id", $ad_id);
+    $ic->add_json_param("ctl", $ad_id);
+    echo $ic->input();
+}
+else
+{
+    $obj=new Fiche_Attr($cn);
+    $mtable=new Card_Attribut_MTable($obj);
+    $mtable->add_json_param("op", "card");
+    $mtable->add_json_param("op2", "attribute");
+    $mtable->set_callback("ajax_misc.php");
+    $mtable->set_object_name($http->request("ctl"));
+    $ad_id=$http->request("p_id");
+    $mtable->get_table()->set_parameter("id", $ad_id);
+    switch ($action)
+    {
+        case "input":
+            $mtable->set_pk($ad_id);
+            $mtable->send_header();
+            echo $mtable->ajax_input()->saveXML();
+
+            break;
+        case "save":
+            $mtable->set_pk($http->request("p_id"));
+            $mtable->send_header();
+            echo $mtable->ajax_save()->saveXML();
+
+
+            break;
+        case "delete":
+            $mtable->set_pk($http->request("p_id"));
+            $mtable->send_header();
+            echo $mtable->ajax_delete()->saveXML();
+            break;
+        default:
+            break;
+    }
+}
+?>
diff --git a/include/card_attr.inc.php b/include/card_attr.inc.php
index fa8bcae8d..c098f7b0b 100644
--- a/include/card_attr.inc.php
+++ b/include/card_attr.inc.php
@@ -20,146 +20,18 @@
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
 
 /*!\file
- * \brief Manage the attributs
+ * \brief Manage the attributs ,CFGATCARD
  */
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-require_once NOALYSS_INCLUDE.'/class/fiche_attr.class.php';
-global $http;
-
-
-$fa=new Fiche_Attr($cn);
-
-/////////////////////////////////////////////////////////////////////////////
-// If data are post we save them first
-/////////////////////////////////////////////////////////////////////////////
-if ( isset($_POST['save']))
-{
-    try
-    {
-        $ad_id=$http->post('ad_id');
-        $ad_text=$http->post('desc');
-        $ad_type=$http->post('type');
-        $ad_size=$http->post('size');
-        $ad_extra=$http->post('extra');
-        $cn->start();
-        for ($e=0;$e<count($ad_id);$e++)
-        {
-            $fa->set_parameter('id',$ad_id[$e]);
-            $fa->set_parameter('desc',$ad_text[$e]);
-            $fa->set_parameter('type',$ad_type[$e]);
-            $fa->set_parameter('size',$ad_size[$e]);
-            $fa->set_parameter('extra',$ad_extra[$e]);
-            if ( trim($ad_text[$e])!='' && trim($ad_type[$e])!='')
-                $fa->save();
-        }
-        $cn->commit();
-    }
-    catch (Exception $e)
-    {
-          record_log($e);
-      alert($e->getMessage());
-        $cn->rollback();
-    }
-
-}
-/* show list of existing */
-$gDossier=dossier::id();
-$array=$fa->seek();
-
-$select_type=new ISelect('type[]');
-$select_type->table=0;
-$desc=new IText('desc[]');
-$desc->size=50;
-$size=new INum('size[]');
-$size->size=5;
-$extra=new IText('extra[]');
-
-$select_type->value=array(
-                        array('value'=>'text','label'=>_('Texte')),
-                        array('value'=>'numeric','label'=>_('Nombre')),
-                        array('value'=>'date','label'=>_('Date')),
-                        array('value'=>'zone','label'=>_('Zone de texte')),
-                        array('value'=>'poste','label'=>_('Poste Comptable')),
-                        array('value'=>'card','label'=>_('Fiche')),
-                        array('value'=>'select','label'=>_('Selection'))
-                    );
+require_once NOALYSS_INCLUDE.'/class/card_attribut_mtable.class.php';
 
+$obj=new Fiche_Attr($cn);
+$mtable=new Card_Attribut_MTable($obj);
+$mtable->add_json_param("op", "card");
+$mtable->add_json_param("op2", "attribute");
+$mtable->set_callback("ajax_misc.php");
+$mtable->create_js_script();
 echo '<div class="content">';
-echo '<form method="post">';
-
-echo HtmlInput::hidden('sa','fat');
-echo HtmlInput::hidden('p_action','divers');
-echo '<table id="tb_rmfa">';
-echo '<tr>';
-echo th(_("id"));
-echo th(_("Description"));
-echo th(_("Type"));
-echo th(_("Taille"));
-echo th(_("Paramètre"));
-echo '</tr>';
-for ($e=0;$e<count($array);$e++)
-{
-    $row=$array[$e];
-    $r='';
-    $r.=td(HtmlInput::hidden('ad_id[]',$row->get_parameter('id')).$row->get_parameter('id'));
-    $select_type->selected=$row->get_parameter('type');
-    $desc->value=$row->get_parameter('desc');
-    $size->value=$row->get_parameter('size');
-    $extra->value=$row->get_parameter('extra');
-    $remove=new IButton('rmfa'.$e);
-    $remove->label=_('Effacer');
-    if ( $row->get_parameter('id')>= 9000)
-    {
-        $select_type->readOnly=false;
-        $desc->readOnly=false;
-        $size->readOnly=false;
-        $extra->readOnly=false;
-
-        $desc->style=' class="input_text" ';
-        $r.=td($desc->input());
-        $r.=td($select_type->input());
-        $r.=td($size->input());
-        $r.=td($extra->input());
-
-        $remove->javascript=sprintf('confirm_box(\'tb_rmfa\',\'Vous  confirmez ?\',function() { removeCardAttribut(%d,%d,\'tb_rmfa\',$(\'rmfa%d\') );})',
-                                    $row->get_parameter('id'),$gDossier,$e);
-        $msg='<span class="notice">'._("Attention : effacera les données qui y sont liées").' </span>';
-        $r.=td($remove->input().$msg);
-    }
-    else
-    {
-        $select_type->readOnly=true;
-        $desc->readOnly=true;
-        $size->readOnly=true;
-        $extra->readOnly=true;
-
-        $r.=td($desc->input().HtmlInput::hidden('type[]',''));
-        $r.=td($select_type->input());
-        $r.=td($size->input());
-        $r.=td($extra->input());
-        $r.=td("");
-    }
-
-
-
-
-    echo tr($r);
-
-}
-$desc->readOnly=false;
-$select_type->readOnly=false;
-$size->readOnly=false;
-$extra->readOnly=false;
-$desc->value='';
-$select_type->selected=-1;
-$r=td(_("Nouvel attribut").HtmlInput::hidden('ad_id[]','0'),'class="highlight"');
-$r.=td($desc->input());
-$r.=td($select_type->input());
-$r.=td($size->input());
-$r.=td($extra->input());
-echo tr($r);
-
-echo '</table>';
-echo HtmlInput::submit('save',_('Sauver'));
-echo '</form>';
+echo $mtable->display_table("order by ad_text");
 echo '</div>';
+
diff --git a/include/class/card_attribut_mtable.class.php b/include/class/card_attribut_mtable.class.php
new file mode 100644
index 000000000..563838499
--- /dev/null
+++ b/include/class/card_attribut_mtable.class.php
@@ -0,0 +1,201 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+/**
+ * @file
+ * @brief manage the table attr_def 
+ * @see card_attr.inc.php
+ */
+require_once NOALYSS_INCLUDE."/class/fiche_attr.class.php";
+require_once NOALYSS_INCLUDE."/lib/manage_table_sql.class.php";
+require_once NOALYSS_INCLUDE."/lib/inplace_switch.class.php";
+
+class Card_Attribut_MTable extends Manage_Table_SQL
+{
+
+    function __construct(\Data_SQL $p_table)
+    {
+        parent::__construct($p_table);
+        $this->set_property_visible("ad_id", FALSE);
+        $this->set_property_updatable("ad_id", FALSE);
+        $this->set_col_label("ad_text", _("Nom"));
+        $this->set_col_label("ad_type", _("Type"));
+        $this->set_col_label('ad_size', _("Taille"));
+        $this->set_col_label("ad_extra", _("Option sup."));
+        $this->set_col_label("ad_search_followup", _("Recherche suivi"));
+
+        $this->set_col_type("ad_search_followup", "custom");
+        $this->set_col_type("ad_text", "custom");
+        $this->set_col_type("ad_size", "numeric");
+        $this->set_col_type("ad_extra", "text");
+        $this->set_col_type("ad_type", "select",
+                array(
+                    ["value"=>"text", "label"=>_("Texte")],
+                    ["value"=>"date", "label"=>_("Date")],
+                    ["value"=>"numeric", "label"=>_("Nombre")],
+                    ["value"=>"select", "label"=>_("Choix")],
+                    ["value"=>"card", "label"=>_("Fiche")],
+                    ["value"=>"zone", "label"=>_("Zone de texte")],
+                    ["value"=>"poste", "label"=>_("Poste comptable")]
+        ));
+        $this->set_col_tips("ad_search_followup", 77);
+        // to prevent a call to this function for each row
+        $this->dossier_id=Dossier::id();
+    }
+
+    /**
+     * Display row of table attr_def
+     * @param array $row 
+     */
+    function display_row($row)
+    {
+        tracedebug("card_attribute.log", $row);
+        if ($row['ad_id']>=9000)
+        {
+            $this->set_delete_row(TRUE);
+            $this->set_update_row(TRUE);
+        }
+        else
+        {
+            $this->set_delete_row(FALSE);
+            $this->set_update_row(FALSE);
+        }
+
+        parent::display_row($row);
+    }
+
+    /**
+     * For the type custom , we can call a function to display properly the value
+     * @param $p_key string key name
+     * @param $p_value string value
+     * @see input_custom
+     * @see set_type
+     * @note must return a string which will be in surrounded by td in the function display_row
+     * @return string
+     */
+    function display_row_custom($p_key, $p_value, $p_id=0)
+    {
+        if ($p_key=="ad_search_followup")
+        {
+            $ic=new Inplace_Switch(uniqid("search_follow_up"), $p_value);
+            $ic->set_callback("ajax_misc.php");
+            $ic->add_json_param("op", "card");
+            $ic->add_json_param("gDossier", $this->dossier_id);
+            $ic->add_json_param("op2", "attribute");
+            $ic->add_json_param("action", "enable_search");
+            $ic->add_json_param("ad_id", $p_id);
+            $ic->add_json_param("ctl", $p_id);
+            $ret=$ic->input();
+
+            return $ret;
+        }
+        if ($p_key == "ad_text"){
+            return $p_value;
+        }
+        return;
+    }
+
+    /**
+     * For the type custom , we can call a function to display properly the value
+     * @param $p_key string key name
+     * @param $p_value string value
+     * @see input_custom
+     * @see set_type
+     * @note must return a string which will be in surrounded by td in the function display_row
+     * @return string
+     */
+    function input_custom($p_key, $p_value)
+    {
+        if ($p_key=="ad_search_followup")
+        {
+            $p_id=$this->get_table()->get("ad_id");
+            $ic=new ISelect("ad_search_followup", $p_value);
+            $ic->value=array(["value"=>0, "label"=>_("Non")],
+                ["value"=>0, "label"=>_("Oui")]
+            );
+            $ic->set_value($p_value);
+            echo $ic->input();
+        }
+        /**
+         * Bug in firefox if id=ad_text , the widget is not displaid 
+         */
+        if ( $p_key == "ad_text") 
+        {
+            $text=new IText("ad_text",$p_value);
+            $text->id=uniqid();
+            echo $text->input();
+        }
+        echo "";
+        return;
+    }
+    
+    function check()
+    {
+        $nb_error=0;
+        $object_sql=$this->get_table();
+
+        if ($object_sql->get("ad_id")<9000 && $object_sql->get("ad_id")!=-1)
+        {
+            $this->set_error("ad_id",_("Bloqué"));
+            return false;
+        }
+        
+        // Duplicate
+        $count="select count(*) 
+                from attr_def as ad1 
+                where 
+                upper(trim(ad1.ad_text)) = upper(trim($1))
+                and ad1.ad_id != $2
+                ";
+        $count_duplicate=$object_sql->cn->get_value($count, [$object_sql->ad_text, $object_sql->ad_id]);
+        if ($count_duplicate>0)
+        {
+            $this->set_error("ad_text", _("Doublon"));
+            $nb_error++;
+        }
+
+        // Name empty
+        if (trim($object_sql->ad_text)=="")
+        {
+            $this->set_error("ad_text", _("Description ne peut pas être vide"));
+            $nb_error++;
+        }
+        // select protect 
+
+
+        if ($nb_error>0)
+            return false;
+        return true;
+    }
+
+    function delete() {
+         $object_sql=$this->get_table();
+         $db=$object_sql->cn;
+         try {
+             $db->start();
+              $object_sql=$this->get_table()->delete();
+             $db->commit();
+         } catch (Exception $ex) {
+             $db->rollback();
+            throw new Exception (_("Effacement bloqué : attribut utilisé"));
+         }
+    }
+}
diff --git a/include/class/fiche_attr.class.php b/include/class/fiche_attr.class.php
index c764731e5..7133a0a05 100644
--- a/include/class/fiche_attr.class.php
+++ b/include/class/fiche_attr.class.php
@@ -1,286 +1,165 @@
 <?php
+
 //This file is part of NOALYSS and is under GPL 
 //see licence.txt
 /**
- *@brief Manage the table attr_def
+ * @brief Manage the table attr_def
  *
  *
  */
 require_once NOALYSS_INCLUDE.'/class/database.class.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
+require_once NOALYSS_INCLUDE."/database/attr_def_sql.class.php";
 
-class Fiche_Attr
+class Fiche_Attr extends Attr_def_SQL
 {
     /* example private $variable=array("easy_name"=>column_name,"email"=>"column_name_email","val3"=>0); */
 
-    protected $variable=array("id"=>"ad_id","desc"=>"ad_text","type"=>"ad_type","size"=>"ad_size","extra"=>"ad_extra");
-    function __construct ($p_cn,$p_id=0)
+    function __construct($p_cn, $p_id=0)
     {
-        $this->cn=$p_cn;
-        if ( $p_id == 0 )
-        {
-            /* Initialize an empty object */
-            foreach ($this->variable as $key=>$value) $this->$value='';
-        }
-        else
-        {
-            /* load it */
-            $this->ad_id=$p_id;
-            $this->load();
-        }
+        parent::__construct($p_cn, $p_id);
     }
+
     public function get_parameter($p_string)
     {
-        if ( array_key_exists($p_string,$this->variable) )
-        {
-            $idx=$this->variable[$p_string];
-            return $this->$idx;
-        }
-        else
-            throw new Exception (__FILE__.":".__LINE__.$p_string.'Erreur attribut inexistant');
+        return $this->getp($p_string);
     }
-    public function set_parameter($p_string,$p_value)
+
+    public function set_parameter($p_string, $p_value)
     {
-        if ( array_key_exists($p_string,$this->variable) )
-        {
-            $idx=$this->variable[$p_string];
-            $this->$idx=$p_value;
-        }
-        else
-            throw new Exception (__FILE__.":".__LINE__.$p_string.'Erreur attribut inexistant');
-    }
-    public function get_info()
-    {
-        return var_export($this,true);
+        $this->setp($p_string, $p_value);
     }
+
     public function verify()
     {
         // Verify that the elt we want to add is correct
         /* verify only the datatype */
-        if ( strlen(trim($this->ad_text))==0)
-            throw new Exception('La description ne peut pas être vide',1);
-        if ( strlen(trim($this->ad_type))==0)
-            throw new Exception('Le type ne peut pas être vide',1);
+        if (strlen(trim($this->ad_text))==0)
+            throw new Exception('La description ne peut pas être vide', 1);
+        if (strlen(trim($this->ad_type))==0)
+            throw new Exception('Le type ne peut pas être vide', 1);
         $this->ad_type=strtolower($this->ad_type);
-        if ( in_array($this->ad_type,array('date','text','numeric','zone','poste','card','select'))==false)
-            throw new Exception('Le type doit être text, numeric,poste, card, select ou date',1);
-        if ( trim($this->ad_size)=='' || isNumber($this->ad_size)==0||$this->ad_size>22)
+        if (in_array($this->ad_type, array('date', 'text', 'numeric', 'zone', 'poste', 'card', 'select'))==false)
+            throw new Exception('Le type doit être text, numeric,poste, card, select ou date', 1);
+        if (trim($this->ad_size)==''||isNumber($this->ad_size)==0||$this->ad_size>22)
         {
             switch ($this->ad_type)
             {
-            case 'text':
+                case 'text':
                     $this->ad_size=22;
-                break;
-            case 'numeric':
-                $this->ad_size=9;
-                break;
-            case 'date':
-                $this->ad_size=8;
-                break;
-            case 'zone':
-                $this->ad_size=22;
-                break;
+                    break;
+                case 'numeric':
+                    $this->ad_size=9;
+                    break;
+                case 'date':
+                    $this->ad_size=8;
+                    break;
+                case 'zone':
+                    $this->ad_size=22;
+                    break;
 
-            default:
-                $this->ad_size=22;
+                default:
+                    $this->ad_size=22;
             }
         }
-		if ( $this->ad_type == 'numeric' ) {
-			$this->ad_extra=(trim($this->ad_extra)=='')?'2':$this->ad_extra;
-			if (isNumber($this->ad_extra) == 0) throw new Exception ("La précision doit être un chiffre");
-
-		}
-		if ( $this->ad_type == 'select')
+        if ($this->ad_type=='numeric')
         {
-                if (trim($this->ad_extra)=="") throw new Exception ("La requête SQL est vide ");
-		if ( preg_match('/^\h*select/i',$this->ad_extra)  == 0) throw new Exception ("La requête SQL doit commencer par SELECT ");
-                try{
-
-                        $this->cn->exec_sql($this->ad_extra);
-                }catch (Exception $e)
-                {
-                      record_log($e);
-                    throw new Exception ("La requête SQL ".h($this->ad_extra)." est invalide ");
-                }
+            $this->ad_extra=(trim($this->ad_extra)=='')?'2':$this->ad_extra;
+            if (isNumber($this->ad_extra)==0)
+                throw new Exception("La précision doit être un chiffre");
         }
-    }
-    public function save()
-    {
-
-        /* please adapt */
-        if (  $this->ad_id == 0 )
-            $this->insert();
-        else
-            $this->update();
-    }
-    /**
-     *@brief retrieve array of object thanks a condition
-     *@param $cond condition (where clause)
-     *@param $p_array array for the SQL stmt
-     *@see Database::get_array
-     *@return an empty array if nothing is found
-     */
-    public function seek($cond='',$p_array=null)
-    {
-        if ( $cond != '')
-            $sql="select * from attr_def where $cond order by ad_text";
-        else
-            $sql="select * from attr_def order by ad_text";
-
-        $aobj=array();
-        $array= $this->cn->get_array($sql,$p_array);
-        // map each row in a object
-        $size=$this->cn->count();
-        if ( $size == 0 ) return $aobj;
-        for ($i=0;$i<$size;$i++)
+        if ($this->ad_type=='select')
         {
-            $oobj=new Fiche_Attr ($this->cn);
-            foreach ($array[$i] as $idx=>$value)
+            if (trim($this->ad_extra)=="")
+                throw new Exception("La requête SQL est vide ");
+            if (preg_match('/^\h*select/i', $this->ad_extra)==0)
+                throw new Exception("La requête SQL doit commencer par SELECT ");
+            try
             {
-                $oobj->$idx=$value;
+
+                $this->cn->exec_sql($this->ad_extra);
+            }
+            catch (Exception $e)
+            {
+                record_log($e);
+                throw new Exception("La requête SQL ".h($this->ad_extra)." est invalide ");
             }
-            $aobj[]=clone $oobj;
         }
-        return $aobj;
     }
-    public function insert()
-    {
-        try{
-        $this->verify();
-        /*  please adapt */
-        $sql="insert into attr_def(ad_text
-             ,ad_type,ad_size,ad_extra
-             ) values ($1
-             ,$2,$3,$4
-             ) returning ad_id";
 
-        $this->ad_id=$this->cn->get_value(
-                         $sql,
-                         array( $this->ad_text,$this->ad_type,$this->ad_size,$this->ad_extra
-                              )
-                     );
-        } catch (Exception $e)
-        {
-              record_log($e);
-            throw $e;
-        }
-
-    }
 
     public function update()
     {
         try
         {
-         $this->verify();
-        if ( $this->ad_id < 9000) return;
-        /*   please adapt */
-        $sql=" update attr_def set ad_text = $1
-             ,ad_type = $2,ad_size=$4,ad_extra=$5
-             where ad_id= $3";
-        $res=$this->cn->exec_sql(
-                 $sql,
-                 array($this->ad_text
-                       ,$this->ad_type
-                       ,$this->ad_id,$this->ad_size,$this->ad_extra)
-             );
-        }catch (Exception $e)
+            $this->verify();
+            if ($this->ad_id<9000)
+                return;
+            /*   please adapt */
+            parent::update();
+        }
+        catch (Exception $e)
         {
-              record_log($e);
+            record_log($e);
             throw $e;
         }
-
-
-    }
-    /**
-     *@brief load a object
-     *@return 0 on success -1 the object is not found
-     */
-    public function load()
-    {
-
-        $sql="select ad_text
-             ,ad_type,ad_size,ad_extra
-             from attr_def where ad_id=$1";
-        /* please adapt */
-        $res=$this->cn->get_array(
-                 $sql,
-                 array($this->ad_id)
-             );
-
-        if ( count($res) == 0 )
-        {
-            /* Initialize an empty object */
-            foreach ($this->variable as $key=>$value) $this->$key='';
-
-            return -1;
-        }
-        foreach ($res[0] as $idx=>$value)
-        {
-            $this->$idx=$value;
-        }
-        return 0;
     }
 
     public function delete()
     {
-        if ($this->ad_id < 9000)  return;
-        $sql=$this->cn->exec_sql("delete from fiche_detail  where ad_id=$1 ",
-                                 array($this->ad_id));
+        if ($this->ad_id<9000)
+            return;
+        $sql=$this->cn->exec_sql("delete from fiche_detail  where ad_id=$1 ", array($this->ad_id));
 
-	$sql="delete from jnt_fic_attr where ad_id=$1";
-        $res=$this->cn->exec_sql($sql,array($this->ad_id));
+        $sql="delete from jnt_fic_attr where ad_id=$1";
+        $res=$this->cn->exec_sql($sql, array($this->ad_id));
 
         $sql="delete from attr_def where ad_id=$1";
-        $res=$this->cn->exec_sql($sql,array($this->ad_id));
-
+        $res=$this->cn->exec_sql($sql, array($this->ad_id));
     }
-    /**
-     * Unit test for the class
+
+    /* !
+     * @brief used with a usort function, to sort an array of Attribut on the attribut_id (ad_id)
      */
-    static function test_me()
+
+    static function sort_by_id($o1, $o2)
     {
-        $cn=new Database(25);
-        $cn->start();
-        echo h2info('Test object vide');
-        $obj=new Fiche_Attr($cn);
-        var_dump($obj);
-
-        echo h2info('Test object NON vide');
-        $obj->set_parameter('j_id',3);
-        $obj->load();
-        var_dump($obj);
-
-        echo h2info('Update');
-        $obj->set_parameter('j_qcode','NOUVEAU CODE');
-        $obj->save();
-        $obj->load();
-        var_dump($obj);
-
-        echo h2info('Insert');
-        $obj->set_parameter('j_id',0);
-        $obj->save();
-        $obj->load();
-        var_dump($obj);
-
-        echo h2info('Delete');
-        $obj->delete();
-        echo (($obj->load()==0)?'Trouve':'non trouve');
-        var_dump($obj);
-        $cn->rollback();
-
-    }
-    /*!
-     *@brief used with a usort function, to sort an array of Attribut on the attribut_id (ad_id)
-     */
-    static function sort_by_id($o1,$o2)
-    {
-        if ( $o1->ad_id > $o2->ad_id ) return 1;
-        if ( $o1->ad_id == $o2->ad_id ) return 0;
+        if ($o1->ad_id>$o2->ad_id)
+            return 1;
+        if ($o1->ad_id==$o2->ad_id)
+            return 0;
         return -1;
     }
 
+    public function save()
+    {
 
+        /* please adapt */
+        if ($this->ad_id < 1)
+        {
+            $this->ad_id=-1;
+            $this->insert();
+        }
+        else
+            $this->update();
+    }
+    public function to_array($prefix="")
+    {
+        
+        $array=array();
+        foreach ($this->name as $key=> $value)
+        {
+            $nkey=$prefix.$value;
+            $array[$nkey]=$this->$value;
+//            $nkey=$prefix.$key;
+//            $array[$nkey]=$this->$value;
+//            
+        }
+        tracedebug("card_attribute.log",$array);
+        return $array;
+    }
 }
+
 //Fiche_Attr::test_me();
 
 
diff --git a/include/lib/manage_table_sql.class.php b/include/lib/manage_table_sql.class.php
index 116d61ff3..b0e8cfa1f 100644
--- a/include/lib/manage_table_sql.class.php
+++ b/include/lib/manage_table_sql.class.php
@@ -103,7 +103,7 @@ class Manage_Table_SQL
         foreach ($this->table->name as $key=> $value)
         {
 
-            $this->a_label_displaid[$value]=$value;
+            $this->a_label_displaid[$value]=$key;
             $this->a_order[$order]=$value;
             $this->a_prop[$value]=self::UPDATABLE|self::VISIBLE;
             $this->a_type[$value]=$this->table->type[$value];
@@ -833,9 +833,10 @@ function check()
      */
     function display_row($p_row)
     {
-
+        
+        $pk_id=$p_row[$this->table->primary_key];
         printf('<tr id="%s_%s">', $this->object_name,
-                $p_row[$this->table->primary_key])
+                $pk_id)
         ;
         
         if ($this->icon_mod=="left")
@@ -847,10 +848,11 @@ function check()
         for ($i=0; $i<$nb_order; $i++)
         {
             $v=$this->a_order[$i];
+            
             if ($i==0&&$this->icon_mod=="first"&&$this->can_update_row())
             {
                 $js=sprintf("onclick=\"%s.input('%s','%s');\"", $this->object_name,
-                        $p_row[$this->table->primary_key], $this->object_name);
+                        $pk_id, $this->object_name);
                 $td=($i == $this->col_sort ) ? sprintf('<td sort_value="X%s" >',$p_row[$v]):"<td>";
                 echo $td.HtmlInput::anchor($p_row[$v], "", $js).'</td>';
             }
@@ -878,7 +880,7 @@ function check()
                     $nb_search=(is_array($array_to_search))?count($array_to_search):0;
                     $found=FALSE;
                     for ( $e=0;$e< $nb_search;$e++) {
-                        if (isset ($array_to_search[$e]['value']) && $array_to_search[$e]['value']==$value ) {
+                        if (isset ($array_to_search[$e]['value']) && $array_to_search[$e]['value']==$value )                          {
                             $found=TRUE;
                             echo td($array_to_search[$e]['label']);
                         }
@@ -891,7 +893,7 @@ function check()
                     
                 } elseif ($this->get_col_type($v)=="custom") {
                     // For custom col
-                    echo td($this->display_row_custom($v,$p_row[$v]));
+                    echo td($this->display_row_custom($v,$p_row[$v],$pk_id));
                 }
                 else {
                     echo td($p_row[$v]);
@@ -911,12 +913,13 @@ function check()
      * For the type custom , we can call a function to display properly the value
      * @param $p_key string key name
      * @param $p_value string value
+     * @param int $p_id id of the row (optional default 0)
      * @see input_custom
      * @see set_type
      * @note must return a string which will be in surrounded by td in the function display_row
      * @return string
      */
-    function display_row_custom($p_key,$p_value) {
+    function display_row_custom($p_key,$p_value,$p_id=0) {
         return $p_value;
     }
     /**
diff --git a/include/lib/message_javascript.php b/include/lib/message_javascript.php
index e9b9d1ebf..cebdf2245 100644
--- a/include/lib/message_javascript.php
+++ b/include/lib/message_javascript.php
@@ -107,4 +107,5 @@ content[73]="<?php echo _("Mettre à oui pour un journal dédié uniquement aux
 content[74]="<?php echo _('TVA due ou récupérable quand l\'opération est payée ou exécutée')?>";
 content[75]="<?php echo _('Journaux Achat ou vente en mode simple, TVA ou détaillé')?>";
 content[76]="<?php echo _('Il est conseillé d\'avoir un quickcode de moins de 9 car.')?>";
+content[77]="<?php echo _("Permet de chercher dans le suivi pour les contacts multiques")?>";
 </script>
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index 54c62c600..6ee0d7ed2 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -1,2 +1,7 @@
 ALTER TABLE public.document_option ADD do_option varchar NULL;
 COMMENT ON COLUMN public.document_option.do_option IS 'Option for the detail';
+
+alter table attr_def add column ad_search_followup int;
+alter table attr_def alter column ad_search_followup set default 1;
+update attr_def set ad_search_followup=1;
+comment on column attr_def.ad_search_followup is '1 : search  available  from followup , 0  : search not available in followup'

From 7aadc12a6d8de949848c142fa9c5bb0b3135e42e Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sat, 10 Oct 2020 14:01:48 +0200
Subject: [PATCH 066/257] Multiple contact Search on selected attribute

---
 html/js/card.js                              |  7 ++++-
 include/ajax/ajax_add_concerned_card.php     |  5 ++--
 include/class/card_attribut_mtable.class.php |  2 +-
 include/class/card_multiple.class.php        | 29 ++++++++++++--------
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/html/js/card.js b/html/js/card.js
index aed90e9fd..253d213b5 100644
--- a/html/js/card.js
+++ b/html/js/card.js
@@ -183,6 +183,7 @@ function action_concerned_search_card(obj)
         var dossier = 0;
         var inp="";
         var ag_id=0;
+        var search_in=-1;
         
         if (obj.dossier) {
             dossier = obj.dossier; /* From the button */
@@ -204,6 +205,9 @@ function action_concerned_search_card(obj)
             if (obj.elements['ag_id']) {
                 ag_id = obj.elements['ag_id'].value;
             }
+            if (obj.elements['search_in']) {
+                search_in = obj.elements['search_in'].value;
+            }
         }
         if (dossier == 0) {
             throw "obj.dossier not found";
@@ -218,7 +222,8 @@ function action_concerned_search_card(obj)
             'ctl' : 'unused',
             'ag_id' : ag_id,
             'op':'card',
-            'accvis':0
+            'accvis':0,
+            'search_in':search_in
         });
 
         waiting_box();
diff --git a/include/ajax/ajax_add_concerned_card.php b/include/ajax/ajax_add_concerned_card.php
index c8e709118..6b0d61d15 100644
--- a/include/ajax/ajax_add_concerned_card.php
+++ b/include/ajax/ajax_add_concerned_card.php
@@ -1,4 +1,4 @@
-<?php,
+<?php
 
 /*
  *   This file is part of NOALYSS.
@@ -65,7 +65,7 @@ $r.=_('Fiche contenant').Icon_Action::infobulle(19);
 $r.=$q->input();
 // where to search
 $select=new ISelect("search_in");
-$select->value=$cn->make_array("select ad_id, ad_text from attr_def order by 2 ",1);
+$select->value=$cn->make_array("select ad_id, ad_text from attr_def  where ad_search_followup = 1 order by 2 ",1);
 $select->selected=$http->get("search_in","string","");
 $r.=_("limité aux champs ").$select->input();
 $r.=HtmlInput::submit('fs', _('Recherche'), "", "smallbutton");
@@ -78,6 +78,7 @@ $r.='</form>';
 $query=$http->get("query", "string","");
 $sql_array['query']=$query;
 $sql_array['typecard']='all';
+$sql_array['search_in']=$select->selected;
 
 $fiche=new Card_Multiple($cn);
 /* Build the SQL and show result */
diff --git a/include/class/card_attribut_mtable.class.php b/include/class/card_attribut_mtable.class.php
index 563838499..3ba7d9b68 100644
--- a/include/class/card_attribut_mtable.class.php
+++ b/include/class/card_attribut_mtable.class.php
@@ -34,7 +34,7 @@ class Card_Attribut_MTable extends Manage_Table_SQL
     function __construct(\Data_SQL $p_table)
     {
         parent::__construct($p_table);
-        $this->set_property_visible("ad_id", FALSE);
+        $this->set_property_visible("ad_id", TRUE);
         $this->set_property_updatable("ad_id", FALSE);
         $this->set_col_label("ad_text", _("Nom"));
         $this->set_col_label("ad_type", _("Type"));
diff --git a/include/class/card_multiple.class.php b/include/class/card_multiple.class.php
index 2296d8046..270a700a7 100644
--- a/include/class/card_multiple.class.php
+++ b/include/class/card_multiple.class.php
@@ -25,25 +25,31 @@
  */
 class Card_Multiple
 {
-
+    private $sql ; //!< SQL with the right column name
     function __construct()
     {
-        
+        $this->sql="select f_id,quick_code,vw_name,accounting,vw_first_name,vw_description
+                  from vw_fiche_attr  ";
     }
 
     function build_sql($sql_array)
     {
         $cn=Dossier::connect();
         $query=sql_string($sql_array['query']);
-
-        $string_sql="select * 
-              from vw_fiche_attr  
-              where 
-              vw_name ilike '%$query%' 
-              or quick_code ilike '%$query%'
-              order by vw_name 
-              limit 
-              ".MAX_CARD_SEARCH;
+        if ( $sql_array['search_in'] == "-1")
+        {
+            $string_sql=$this->sql."
+                  where 
+                  vw_name ilike '%$query%' 
+                  or quick_code ilike '%$query%'
+                  order by vw_name 
+                  limit 
+                  ".MAX_CARD_SEARCH;
+        } else {
+            $string_sql=sprintf($this->sql." where f_id in (select f_id from fiche_detail where 
+                    ad_id = '%s' and ad_value ilike '%%%s%%') "
+                    , sql_string($sql_array["search_in"]),$query);
+        }
         return $string_sql;
     }
 
@@ -83,6 +89,7 @@ class Card_Multiple
         if ( ! $g_user->can_read_action($ag_id)) {
             throw new Exception (_("CMCDO01"."Security"));
         }
+        // First select the option
         $sql="select
 	cor.cor_id,
 	cor.cor_label,

From c23d824fe7ee59eef2c6f982998c73611bb78030 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sat, 10 Oct 2020 17:37:13 +0200
Subject: [PATCH 067/257] Link between contact option and document

---
 include/ajax/ajax_card.php                    |  1 +
 include/ajax/ajax_card_attribute.php          |  1 +
 include/ajax/ajax_save_card_option.php        | 11 ++----
 .../action_document_type_mtable.class.php     | 37 +++++++++++++++++++
 include/class/card_attribut_mtable.class.php  |  6 +--
 include/class/card_multiple.class.php         | 34 +++++++++++------
 .../class/contact_option_ref_mtable.class.php |  5 ++-
 .../action_document_type_mtable_input.php     | 21 ++++++++++-
 .../template/card_multiple_display_option.php |  7 ++++
 sql/upgrade.sql                               | 11 ++++++
 10 files changed, 107 insertions(+), 27 deletions(-)

diff --git a/include/ajax/ajax_card.php b/include/ajax/ajax_card.php
index fe8834f2e..b3103e471 100644
--- a/include/ajax/ajax_card.php
+++ b/include/ajax/ajax_card.php
@@ -63,6 +63,7 @@ require_once NOALYSS_INCLUDE.'/lib/function_javascript.php';
 require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 require_once NOALYSS_INCLUDE.'/class/user.class.php';
 require_once NOALYSS_INCLUDE.'/class/fiche_attr.class.php';
+require_once NOALYSS_INCLUDE.'/lib/input_switch.class.php';
 
 mb_internal_encoding("UTF-8");
 
diff --git a/include/ajax/ajax_card_attribute.php b/include/ajax/ajax_card_attribute.php
index feedef07b..418b103df 100644
--- a/include/ajax/ajax_card_attribute.php
+++ b/include/ajax/ajax_card_attribute.php
@@ -79,6 +79,7 @@ else
     {
         case "input":
             $mtable->set_pk($ad_id);
+            if ( $ad_id < 0 ) $mtable->get_table()->set("ad_search_followup",0);
             $mtable->send_header();
             echo $mtable->ajax_input()->saveXML();
 
diff --git a/include/ajax/ajax_save_card_option.php b/include/ajax/ajax_save_card_option.php
index 6a6b36c8e..931f07ed3 100644
--- a/include/ajax/ajax_save_card_option.php
+++ b/include/ajax/ajax_save_card_option.php
@@ -49,12 +49,7 @@ $nb=count($ap_value);
 if ($nb == 0) return;
 
 for ($i=0;$i<$nb; $i++) {
-    if ( $ap_id[$i] == -1 ) {
-        $cn->exec_sql("INSERT INTO public.action_person_option (ap_value, contact_option_ref_id, action_person_id) 
-                        VALUES($1, $2, $3) ",
-                  [$ap_value[$i],$cor_id[$i],$action_person_id]);
-    } else {
-        $cn->exec_sql("UPDATE public.action_person_option SET ap_value=$1 WHERE ap_id=$2)",
-                [$ap_value[$i],$action_person_id]);
-    }
+
+        $cn->exec_sql("UPDATE public.action_person_option SET ap_value=$1 WHERE ap_id=$2",
+                [$ap_value[$i],$ap_id[$i]]);
 }
\ No newline at end of file
diff --git a/include/class/action_document_type_mtable.class.php b/include/class/action_document_type_mtable.class.php
index bd41af234..d3cc70b14 100644
--- a/include/class/action_document_type_mtable.class.php
+++ b/include/class/action_document_type_mtable.class.php
@@ -81,6 +81,13 @@ class Action_Document_Type_MTable extends Manage_Table_SQL
         $this->other['make_invoice']=$http->request("make_invoice", "string", 0);
         $this->other['seq']=$http->request("seq", "string", 0);
         $this->other['select_option_operation']=$http->request("select_option_operation", "string", null);
+        $this->other["cor_id"]=$http->request("cor_id","array",[]);
+        $nb_corid=count($this->other["cor_id"]);
+        $http->set_empty(0);
+        for ($i=0;$i<$nb_corid;$i++) {
+            $this->other["contact_option$i"]=$http->request("contact_option".$i,"number",0);
+        }
+                 
     }
 
     /**
@@ -155,6 +162,22 @@ class Action_Document_Type_MTable extends Manage_Table_SQL
     function input()
     {
         parent::input();
+        
+        
+        
+        // Detail option contact
+        $table=$this->get_table();
+        $cn=$table->cn;
+        $aOption=$cn->get_array("select cor_id,cor_label,cor_type,document_type_id ,coalesce(jdoc_enable,0) jdoc_enable
+                from 
+                contact_option_ref cor  
+                left join jnt_document_option_contact jdoc on (cor_id=contact_option_ref_id) 
+                where 
+                document_type_id is null
+                or document_type_id = $1
+                order by cor_label",[$this->table->dt_id]);
+        
+        // Detail option
         require NOALYSS_TEMPLATE."/action_document_type_mtable_input.php";
     }
 
@@ -191,6 +214,20 @@ class Action_Document_Type_MTable extends Manage_Table_SQL
             on conflict on constraint document_option_un
             do update set do_enable=$3 ", ["make_invoice", $object_sql->dt_id, $this->other['make_invoice']]);
         
+        // Option contact to save
+        $cn->exec_sql("delete from jnt_document_option_contact where document_type_id=$1",[$object_sql->dt_id]);
+        $nb_contact_option=count($this->other["cor_id"]);
+        $aOption=$this->other["cor_id"];
+        for ( $e=0;$e<$nb_contact_option;$e++) {
+            $option_id=$aOption[$e];
+            if ( isset($this->other["contact_option".$e])  ) {
+                $cn->exec_sql("insert into jnt_document_option_contact
+                    (jdoc_enable,document_type_id,contact_option_ref_id)
+                    values ($1,$2,$3)",[$this->other["contact_option".$e],$object_sql->dt_id,$option_id]);
+                tracedebug("insert-into-contact.log", $cn->sql);
+                tracedebug("insert-into-contact.log", $cn->array);
+            }
+        }
         
     }
 
diff --git a/include/class/card_attribut_mtable.class.php b/include/class/card_attribut_mtable.class.php
index 3ba7d9b68..2933dae01 100644
--- a/include/class/card_attribut_mtable.class.php
+++ b/include/class/card_attribut_mtable.class.php
@@ -127,11 +127,7 @@ class Card_Attribut_MTable extends Manage_Table_SQL
         if ($p_key=="ad_search_followup")
         {
             $p_id=$this->get_table()->get("ad_id");
-            $ic=new ISelect("ad_search_followup", $p_value);
-            $ic->value=array(["value"=>0, "label"=>_("Non")],
-                ["value"=>0, "label"=>_("Oui")]
-            );
-            $ic->set_value($p_value);
+            $ic=new InputSwitch("ad_search_followup", $p_value);
             echo $ic->input();
         }
         /**
diff --git a/include/class/card_multiple.class.php b/include/class/card_multiple.class.php
index 270a700a7..e03a185a0 100644
--- a/include/class/card_multiple.class.php
+++ b/include/class/card_multiple.class.php
@@ -89,18 +89,30 @@ class Card_Multiple
         if ( ! $g_user->can_read_action($ag_id)) {
             throw new Exception (_("CMCDO01"."Security"));
         }
+        // insert new , synchronized
+        $cn->exec_sql("insert into action_person_option (ap_value,contact_option_ref_id ,action_person_id ) 
+            select null,cor_id,$1
+            from contact_option_ref 
+            where 
+            cor_id not in (
+                select contact_option_ref_id 
+                from action_person_option 
+                join action_person a on (a.ap_id=action_person_id) 
+                where f_id=$2)",[$p_action_person_id,$fiche_id]);
+
+        // delete disable
+        $cn->exec_sql("delete 
+                from action_person_option apo 
+                where contact_option_ref_id  in 
+               (select contact_option_ref_id from jnt_document_option_contact jdoc join action_gestion on                       (ag_type=document_type_id) 
+                    where ag_id=$1 and jdoc_enable=0)",[$ag_id]);
+        
         // First select the option
-        $sql="select
-	cor.cor_id,
-	cor.cor_label,
-	cor.cor_type,
-	coalesce (apo.ap_id,-1) as ap_id,
-        ap_value,
-        cor_value_select
-from
-contact_option_ref cor
-left join action_person_option apo on (cor.cor_id=apo.contact_option_ref_id)
-where action_person_id is null or action_person_id=$1";
+        $sql="select ap_id,cor_id,ap_value,cor_type ,cor_label,cor_value_select
+              from contact_option_ref cor 
+              join action_person_option apo on (cor.cor_id=apo.contact_option_ref_id) 
+              where action_person_id=$1 order by cor_label  ";
+        
         $a_option=$cn->get_array($sql,[$p_action_person_id]);
         require NOALYSS_TEMPLATE."/card_multiple_display_option.php";
         
diff --git a/include/class/contact_option_ref_mtable.class.php b/include/class/contact_option_ref_mtable.class.php
index bb8c21f9a..b6a62f9da 100644
--- a/include/class/contact_option_ref_mtable.class.php
+++ b/include/class/contact_option_ref_mtable.class.php
@@ -36,13 +36,14 @@ class Contact_Option_Ref_MTable extends Manage_Table_SQL{
          $this->set_col_label("cor_label", _("Nom"));
          $this->set_col_label("cor_type", _("Type "));
          $this->set_col_label("document_option_id", _("Action"));
-         $this->set_col_label("core_value_select",_("Options"));
+         $this->set_col_label("cor_value_select",_("Options"));
          $this->set_property_visible("cor_id", false);
          $this->set_col_type("cor_type","select",[
              ["label"=>_("Texte"),"value"=>0],
              ["label"=>_("Nombre"),"value"=>1],
              ["label"=>_("Choix"),"value"=>3],
-             ["label"=>_("Date"),"value"=>2]
+             ["label"=>_("Date"),"value"=>2],
+             ["label"=>_("Coche"),"value"=>4]
          ]);
      }
 
diff --git a/include/template/action_document_type_mtable_input.php b/include/template/action_document_type_mtable_input.php
index eee56aac4..9328c4c80 100644
--- a/include/template/action_document_type_mtable_input.php
+++ b/include/template/action_document_type_mtable_input.php
@@ -95,4 +95,23 @@ echo _("Création de facture");
         </li> 
     </ul>
 
-</div>
\ No newline at end of file
+</div>
+<div>
+     <h3 class="info" sytle="margin-block: 4px"><?php echo _("Options contact") ?></h3>
+    <ul class="tab_row" style="padding-top: 0px">
+<?php        
+            
+$nb_option=count($aOption);
+for ($i=0;$i<$nb_option;$i++)
+{
+    echo '<li>';
+    
+    echo HtmlInput::hidden("cor_id[]", $aOption[$i]["cor_id"]);
+    $is=new InputSwitch("contact_option$i",$aOption[$i]["jdoc_enable"]);
+    echo $is->input();
+    echo "&nbsp;&nbsp;&nbsp;"._($aOption[$i]['cor_label']);
+    echo '</li>';
+}
+?>
+</ul>
+</div>
diff --git a/include/template/card_multiple_display_option.php b/include/template/card_multiple_display_option.php
index 2b07f9e3b..309aa3754 100644
--- a/include/template/card_multiple_display_option.php
+++ b/include/template/card_multiple_display_option.php
@@ -79,6 +79,13 @@ if (!defined('ALLOWED'))
                     }
                 }
                 break;
+            case 4:
+                $input=new InputSwitch("ap_value[]");
+                if ( $a_option[$i]['ap_value'] =="") {
+                    $a_option[$i]['ap_value']=0;
+                }
+                break;
+                
         }
        $input->set_value ($a_option[$i]['ap_value']);
         echo '<span style="display:table-row">';
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index 6ee0d7ed2..50e61a794 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -5,3 +5,14 @@ alter table attr_def add column ad_search_followup int;
 alter table attr_def alter column ad_search_followup set default 1;
 update attr_def set ad_search_followup=1;
 comment on column attr_def.ad_search_followup is '1 : search  available  from followup , 0  : search not available in followup'
+
+
+create table jnt_document_option_contact
+(
+jdoc_id bigserial primary key,
+jdoc_enable int not null, 
+document_type_id bigint references document_type (dt_id) on delete cascade on update cascade,
+contact_option_ref_id bigint references contact_option_ref(cor_id) on delete cascade  on update  cascade
+);
+ALTER TABLE public.jnt_document_option_contact ADD CONSTRAINT jnt_document_option_contact_un UNIQUE (document_type_id,contact_option_ref_id);
+ALTER TABLE public.jnt_document_option_contact ADD CONSTRAINT jnt_document_option_contact_check CHECK (jdoc_enable in (0,1));

From 1b041e65de5d508c1af1619e11f316b94701d809 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sat, 10 Oct 2020 19:34:30 +0200
Subject: [PATCH 068/257] Add new type of attribute : check

---
 include/class/card_attribut_mtable.class.php |  2 ++
 include/class/fiche.class.php                | 16 ++++++++++++++++
 include/class/fiche_attr.class.php           |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/include/class/card_attribut_mtable.class.php b/include/class/card_attribut_mtable.class.php
index 2933dae01..7b468f41f 100644
--- a/include/class/card_attribut_mtable.class.php
+++ b/include/class/card_attribut_mtable.class.php
@@ -54,11 +54,13 @@ class Card_Attribut_MTable extends Manage_Table_SQL
                     ["value"=>"select", "label"=>_("Choix")],
                     ["value"=>"card", "label"=>_("Fiche")],
                     ["value"=>"zone", "label"=>_("Zone de texte")],
+                    ["value"=>"check", "label"=>_("Coche")],
                     ["value"=>"poste", "label"=>_("Poste comptable")]
         ));
         $this->set_col_tips("ad_search_followup", 77);
         // to prevent a call to this function for each row
         $this->dossier_id=Dossier::id();
+        $this->set_col_sort(1);
     }
 
     /**
diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index a6a8e214a..98aee882c 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -29,6 +29,7 @@ require_once NOALYSS_INCLUDE.'/class/fiche_def.class.php';
 require_once NOALYSS_INCLUDE.'/lib/iposte.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_operation.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_account.class.php';
+require_once NOALYSS_INCLUDE."/lib/input_switch.class.php";
 
 /*! \file
  * \brief define Class fiche, this class are using
@@ -502,6 +503,11 @@ class Fiche
                             $w->table = 1;
                             $bulle = Icon_Action::infobulle(14);
                             break;
+                    case 'check':
+                            $w=new InputSwitch("av_text".$r->ad_id);
+                            $w->value=$r->av_text;
+                            $w->value=(trim($w->value)=="")?1:$w->value;
+                            break;
                     case 'select':
                             $w = new ISelect("av_text" . $attr->ad_id);
                             $w->value = $this->cn->make_array($attr->ad_extra);
@@ -641,6 +647,11 @@ class Fiche
                             $w->style=' class="itextarea" style="margin:0px;width:100%"';
                             $w->value=$r->av_text;
                             break;
+                        case 'check':
+                            $w=new InputSwitch("av_text".$r->ad_id);
+                             $w->value=$r->av_text;
+                            $w->value=(trim($w->value)=="")?1:$w->value;
+                            break;
                         case 'poste':
                             $w=new IPoste("av_text".$r->ad_id);
                             $w->set_attribute('ipopup', 'ipop_account');
@@ -711,6 +722,11 @@ class Fiche
                         $value=$x->display();
                         $w->value=$value;
                         break;
+                    case 'check':
+                       $w=new InputSwitch("av_text".$r->ad_id);
+                       $w->value=$r->av_text;
+                       $w->value=(trim($w->value)=="")?1:$w->value;
+                       break;
                     default:
                         $w->value=$r->av_text;
                 }
diff --git a/include/class/fiche_attr.class.php b/include/class/fiche_attr.class.php
index 7133a0a05..ee7184195 100644
--- a/include/class/fiche_attr.class.php
+++ b/include/class/fiche_attr.class.php
@@ -39,7 +39,7 @@ class Fiche_Attr extends Attr_def_SQL
         if (strlen(trim($this->ad_type))==0)
             throw new Exception('Le type ne peut pas être vide', 1);
         $this->ad_type=strtolower($this->ad_type);
-        if (in_array($this->ad_type, array('date', 'text', 'numeric', 'zone', 'poste', 'card', 'select'))==false)
+        if (in_array($this->ad_type, array('date', 'text', 'numeric', 'zone', 'poste', 'card', 'select','check'))==false)
             throw new Exception('Le type doit être text, numeric,poste, card, select ou date', 1);
         if (trim($this->ad_size)==''||isNumber($this->ad_size)==0||$this->ad_size>22)
         {

From 30688bda9d5edda7a8da833ad97bef4573b6fce9 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sat, 10 Oct 2020 19:35:10 +0200
Subject: [PATCH 069/257] Improve Input_Switch , do not echo but returns string

---
 include/lib/input_switch.class.php | 15 ++++++++-------
 include/template/param_jrn.php     |  2 +-
 scenario/HtmlInput.test.php        |  8 ++++----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/include/lib/input_switch.class.php b/include/lib/input_switch.class.php
index ba67d7f55..3d8345cfe 100644
--- a/include/lib/input_switch.class.php
+++ b/include/lib/input_switch.class.php
@@ -45,6 +45,7 @@ class InputSwitch extends HtmlInput
 
     function input($p_name=NULL, $p_value=NULL)
     {
+        $r="";
         if ($p_name!=NULL)
             $this->value_container=$p_name;
         if ($p_value!==NULL)
@@ -56,25 +57,25 @@ class InputSwitch extends HtmlInput
              throw new Exception(_("Valeur invalide"),1);
         }
         if ($this->readOnly == TRUE) {
-            $this->display();
-            return;
+            return $this->display();
         }
-        echo HtmlInput::hidden($this->value_container, $this->value);
+        $r.= HtmlInput::hidden($this->value_container, $this->value);
         
         $this->javascript=sprintf('toggle_onoff(\'%s\',\'%s\');%s;',$this->icon,$this->value_container,$this->javascript);
         
         if ($this->value=='1') {
-            echo Icon_Action::iconon($this->icon, $this->javascript);
+            $r.=Icon_Action::iconon($this->icon, $this->javascript);
         } else {
-            echo Icon_Action::iconoff($this->icon, $this->javascript);
+            $r.=Icon_Action::iconoff($this->icon, $this->javascript);
         }
+        return $r;
     }
     function display()
     {
         if ($this->value=='1') {
-            echo Icon_Action::iconon($this->icon, "");
+            return  Icon_Action::iconon($this->icon, "");
         } else {
-            echo Icon_Action::iconoff($this->icon, "");
+            return Icon_Action::iconoff($this->icon, "");
         }
     }
 
diff --git a/include/template/param_jrn.php b/include/template/param_jrn.php
index 6c73529d9..1d0ce32bb 100644
--- a/include/template/param_jrn.php
+++ b/include/template/param_jrn.php
@@ -98,7 +98,7 @@ if ( $type == 'ACH' || $type == 'VEN'||$new):
         <td>
            <?php
                 $negative->javascript="toggle_row_warning_enable('negative_amount','row_warning')";
-                $negative->input();
+                echo $negative->input();
             ?>
         </td>
     </tr>
diff --git a/scenario/HtmlInput.test.php b/scenario/HtmlInput.test.php
index 027f4eb73..363a8fdc3 100644
--- a/scenario/HtmlInput.test.php
+++ b/scenario/HtmlInput.test.php
@@ -61,25 +61,25 @@ $http=new HttpInput();
     <pre>
         
     $input_switch=new InputSwitch('input_switch_value',<?php echo $http->get("input_switch_value","string","0")?>);
-    $input_switch->input();
+    echo $input_switch->input();
     </pre>
     input_switch 
     <?php
     
     $input_switch=new InputSwitch('input_switch_value',$http->get("input_switch_value","string","0"));
-    $input_switch->input();
+    echo $input_switch->input();
     ?>
     <h2>ReadOnly</h2>
     <pre>
     $input_switch=new InputSwitch('input_switch_readonly',0);
     $input_switch->readOnly=TRUE;
-    $input_switch->input();
+    echo  $input_switch->input();
     </pre>
     input_switch
     <?php
     $input_switch=new InputSwitch('input_switch_readonly',0);
     $input_switch->readOnly=TRUE;
-    $input_switch->input();
+    echo $input_switch->input();
     ?>
     <h1>Submit</h1>
     <pre>

From 8033b9f7ca7dd68a3aa6f4c0cb001d49f0e8a6a3 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sat, 10 Oct 2020 19:35:33 +0200
Subject: [PATCH 070/257] Card can be disable if not used anymore

---
 html/fid_card.php                |  4 +++-
 html/js/card.js                  | 15 +++++++++++++--
 include/ajax/ajax_card.php       | 15 ++++++++++++++-
 include/template/card_result.php |  4 ++--
 sql/upgrade.sql                  |  5 +++++
 5 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/html/fid_card.php b/html/fid_card.php
index 0c66dec21..d01a89b86 100644
--- a/html/fid_card.php
+++ b/html/fid_card.php
@@ -118,13 +118,15 @@ else
         }
     }
 }
+// filter only enable card
+$filter_enable_card=" and f_id in (select f_id from fiche_detail where ad_value = '1' and ad_id=54) ";
 
 $sql_str="select distinct f_id 
          from fiche 
          join fiche_detail using (f_id) 
          where 
          ad_id in (9,1,23) 
-         and ad_value ilike '%'||$1||'%' ".$filter_card.' limit '.$limit;
+         and ad_value ilike '%'||$1||'%' ".$filter_enable_card.$filter_card.' limit '.$limit;
 
 
 $fid=$http->request("FID");
diff --git a/html/js/card.js b/html/js/card.js
index 253d213b5..3228d517d 100644
--- a/html/js/card.js
+++ b/html/js/card.js
@@ -79,6 +79,8 @@ function search_card(obj)
         var price=obj.price;
         var tvaid=obj.tvaid;
         var jrn=obj.jrn;
+        var inactive_card=0;
+        if ( obj.inactive_card) {inactive_card=obj.inactive_card.value;}
         var amount_from_type=0;
         if ( obj.amount_from_type) {
             amount_from_type=obj.amount_from_type;
@@ -104,7 +106,8 @@ function search_card(obj)
                       'ctl':'search_card','op2':'fs','jrn':jrn,
                       'typecard':typecard,'query':string_to_search,'op':'card',
                       'accvis':accvis,
-                      'amount_from_type':amount_from_type
+                      'amount_from_type':amount_from_type,
+                      'inactive_card':inactive_card
                              });
 	if (  $('search_card') ) {
 	    removeDiv('search_card');
@@ -184,6 +187,7 @@ function action_concerned_search_card(obj)
         var inp="";
         var ag_id=0;
         var search_in=-1;
+        var inactive_card=0;
         
         if (obj.dossier) {
             dossier = obj.dossier; /* From the button */
@@ -208,6 +212,9 @@ function action_concerned_search_card(obj)
             if (obj.elements['search_in']) {
                 search_in = obj.elements['search_in'].value;
             }
+            if ( obj.inactive_card) {
+                inactive_card=obj.elements['inactive_card'].value;
+            }
         }
         if (dossier == 0) {
             throw "obj.dossier not found";
@@ -223,7 +230,8 @@ function action_concerned_search_card(obj)
             'ag_id' : ag_id,
             'op':'card',
             'accvis':0,
-            'search_in':search_in
+            'search_in':search_in,
+            'inactive_card':inactive_card
         });
 
         waiting_box();
@@ -336,6 +344,9 @@ function search_get_card(obj)
     if (obj.elements['page_card']) {
         queryString+="&page_card="+obj.elements["page_card"].value;
     }
+    if ( obj.elements["inactive_card"]) {
+         queryString+="&inactive_card="+obj.elements["inactive_card"].value;
+    }
 
     queryString=encodeURI(queryString);
     $('asearch').innerHTML=loading();
diff --git a/include/ajax/ajax_card.php b/include/ajax/ajax_card.php
index b3103e471..cfc824a65 100644
--- a/include/ajax/ajax_card.php
+++ b/include/ajax/ajax_card.php
@@ -423,6 +423,11 @@ case 'fs':
  
     // to navigate
     $page_card=$http->get("page_card","number",0);
+    $inactive=$http->get("inactive_card","string",0);
+    if ($inactive=="undefined" || $inactive == "") $inactive=0;
+    $is=new InputSwitch("inactive_card",$inactive);
+    $is->value=$inactive;
+    $r.=_("Toutes les fiches").$is->input();
     
     // save previous info
     $hidden="";
@@ -439,6 +444,7 @@ case 'fs':
     $r.="</form>";
 
     $sql_array["query"]=$query;
+    $sql_array["inactive_card"]=$inactive;
     /* what is the type of the ledger */
     $type="GL";
     if (isset($jrn) && $jrn > 1)
@@ -465,8 +471,15 @@ case 'fs':
              $html.=HtmlInput::button_close("search_card");
              break;
     }
+    /**
+     * if inactive == 0 , then only active card
+     */
+    if ( $inactive == 0 ) {
+        $sql.=" and f_id in (select f_id from fiche_detail where ad_id=54 and ad_value='1') ";
+    }
+    
      /* We limit the search to MAX_SEARCH_CARD records */
-   $sql=$sql.' order by vw_name ';
+    $sql=$sql.' order by vw_name ';
    $total_card=$cn->get_value("select count(*) from ($sql) as c");
     
     $record_start=$page_card*MAX_SEARCH_CARD;
diff --git a/include/template/card_result.php b/include/template/card_result.php
index 466e7d735..7c86f3938 100644
--- a/include/template/card_result.php
+++ b/include/template/card_result.php
@@ -14,7 +14,7 @@
         echo '<form method="GET" onsubmit="this.ctl=\'ipop_card\';search_get_card(this);return false;">';           
         $url=$sql_array;
         $url["page_card"]=$page_card-1;
-        echo HtmlInput::array_to_hidden(array('accvis','inp','jrn','label','typecard','price','tvaid','amount_from_type','page_card','query'), $url);
+        echo HtmlInput::array_to_hidden(array('accvis','inp','jrn','label','typecard','price','tvaid','amount_from_type','page_card','query','inactive_card'), $url);
         echo HtmlInput::submit("previous","<");
         echo '</form>';
         echo '</li>';
@@ -24,7 +24,7 @@
          echo '<form method="GET" onsubmit="this.ctl=\'ipop_card\';search_get_card(this);return false;">';           
          $url=$sql_array;
         $url["page_card"]=$page_card+1;
-        echo HtmlInput::array_to_hidden(array('accvis','inp','jrn','label','typecard','price','tvaid','amount_from_type','page_card','query'), $url);
+        echo HtmlInput::array_to_hidden(array('accvis','inp','jrn','label','typecard','price','tvaid','amount_from_type','page_card','query','inactive_card'), $url);
         
         echo HtmlInput::submit("next",">");
         echo '</form>';
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index 50e61a794..e3b85d573 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -16,3 +16,8 @@ contact_option_ref_id bigint references contact_option_ref(cor_id) on delete cas
 );
 ALTER TABLE public.jnt_document_option_contact ADD CONSTRAINT jnt_document_option_contact_un UNIQUE (document_type_id,contact_option_ref_id);
 ALTER TABLE public.jnt_document_option_contact ADD CONSTRAINT jnt_document_option_contact_check CHECK (jdoc_enable in (0,1));
+
+insert into attr_def(ad_id,ad_text,ad_type,ad_size) values (54,'Actif','check','1');
+insert into attr_min(frd_id,ad_id) select frd_id , 54 from fiche_def_ref ;
+insert into jnt_fic_attr  (fd_id,ad_id,jnt_order) select fd_id,54,30 from fiche_def;
+insert into fiche_detail (f_id,ad_id,ad_value) select f_id, 54,1 from fiche_detail where ad_id=1;
\ No newline at end of file

From 67ce2beee64fffa412bd874a80279f2b1c7d5b73 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sat, 10 Oct 2020 19:49:33 +0200
Subject: [PATCH 071/257] Search on active card for Contact Multiple

---
 include/ajax/ajax_add_concerned_card.php |  7 ++++
 include/class/card_multiple.class.php    | 45 +++++++++++++++++++-----
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/include/ajax/ajax_add_concerned_card.php b/include/ajax/ajax_add_concerned_card.php
index 6b0d61d15..1f9f97286 100644
--- a/include/ajax/ajax_add_concerned_card.php
+++ b/include/ajax/ajax_add_concerned_card.php
@@ -72,6 +72,12 @@ $r.=HtmlInput::submit('fs', _('Recherche'), "", "smallbutton");
 $r.='</span>';
 $r.=dossier::hidden().HtmlInput::hidden('op2', 'add_concerned_card');
 $r.=HtmlInput::request_to_hidden(array('ag_id'));
+$inactive=$http->get("inactive_card","string",0);
+if ($inactive=="undefined" || $inactive == "") $inactive=0;
+$is=new InputSwitch("inactive_card",$inactive);
+$is->value=$inactive;
+$r.=_("Toutes les fiches").$is->input();
+
 $r.='</form>';
 
 
@@ -79,6 +85,7 @@ $query=$http->get("query", "string","");
 $sql_array['query']=$query;
 $sql_array['typecard']='all';
 $sql_array['search_in']=$select->selected;
+$sql_array['inactive_card']=$inactive;
 
 $fiche=new Card_Multiple($cn);
 /* Build the SQL and show result */
diff --git a/include/class/card_multiple.class.php b/include/class/card_multiple.class.php
index e03a185a0..b4094851b 100644
--- a/include/class/card_multiple.class.php
+++ b/include/class/card_multiple.class.php
@@ -31,41 +31,68 @@ class Card_Multiple
         $this->sql="select f_id,quick_code,vw_name,accounting,vw_first_name,vw_description
                   from vw_fiche_attr  ";
     }
-
+    /**
+     * 
+     * @param type $sql_array
+     * @return type
+     */
     function build_sql($sql_array)
     {
         $cn=Dossier::connect();
+        $filter="";
+        if ( $sql_array["inactive_card"]==0) {
+            $filter=" and ".$this->filter_enable_card();
+        }
         $query=sql_string($sql_array['query']);
         if ( $sql_array['search_in'] == "-1")
         {
             $string_sql=$this->sql."
                   where 
-                  vw_name ilike '%$query%' 
-                  or quick_code ilike '%$query%'
+                  (vw_name ilike '%$query%' 
+                  or quick_code ilike '%$query%')
+                     ".$filter."
                   order by vw_name 
                   limit 
                   ".MAX_CARD_SEARCH;
         } else {
             $string_sql=sprintf($this->sql." where f_id in (select f_id from fiche_detail where 
-                    ad_id = '%s' and ad_value ilike '%%%s%%') "
-                    , sql_string($sql_array["search_in"]),$query);
+                    ad_id = '%s' and ad_value ilike '%%%s%%') and %s"
+                    , sql_string($sql_array["search_in"]),$query,$filter);
         }
         return $string_sql;
     }
-
+    /**
+     * 
+     * @param type $sql_array
+     * @return type
+     */
     function count_sql($sql_array)
     {
         $cn=Dossier::connect();
         $query=sql_string($sql_array['query']);
+        $filter="";
+        if ( $sql_array["inactive_card"]==0) {
+            $filter="and ".$this->filter_enable_card();
+        }
 
         $string_sql="select count(*) 
               from vw_fiche_attr  
               where 
-              vw_name ilike '%$query%' 
-              or quick_code ilike '%$query%'";
+              ( vw_name ilike '%$query%' 
+              or quick_code ilike '%$query%')
+                     ".$filter;
 
 
-        return $cn->get_value($string_sql); ;
+        return $cn->get_value($string_sql); 
+    }
+    /**
+     * 
+     * @return string
+     */
+    private function filter_enable_card()
+    {
+        $filter_enable_card="  f_id in (select f_id from fiche_detail where ad_value = '1' and ad_id=54) ";
+        return $filter_enable_card;
     }
     /**
      * 

From d3a05bfa18d4ece3ccf1ab220d32701b76af4cb5 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sat, 10 Oct 2020 20:19:47 +0200
Subject: [PATCH 072/257] Tag Limit column size , replace input_switch by
 check_box

---
 include/class/action_document_type_mtable.class.php    | 4 +---
 include/class/follow_up.class.php                      | 4 ++--
 include/template/action_document_type_mtable_input.php | 8 +++++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/include/class/action_document_type_mtable.class.php b/include/class/action_document_type_mtable.class.php
index d3cc70b14..03a7d2dbf 100644
--- a/include/class/action_document_type_mtable.class.php
+++ b/include/class/action_document_type_mtable.class.php
@@ -224,9 +224,7 @@ class Action_Document_Type_MTable extends Manage_Table_SQL
                 $cn->exec_sql("insert into jnt_document_option_contact
                     (jdoc_enable,document_type_id,contact_option_ref_id)
                     values ($1,$2,$3)",[$this->other["contact_option".$e],$object_sql->dt_id,$option_id]);
-                tracedebug("insert-into-contact.log", $cn->sql);
-                tracedebug("insert-into-contact.log", $cn->array);
-            }
+            } 
         }
         
     }
diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 11b5f3ca6..b04bc903e 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -616,7 +616,7 @@ class Follow_Up
         $table->add('Date Doc.', $url, 'order by ag_timestamp asc', 'order by ag_timestamp desc', 'da', 'dd');
         $table->add('Date Comm.', $url, 'order by last_comment', 'order by last_comment desc', 'dca', 'dcd');
         $table->add('Date Limite', $url, 'order by ag_remind_date asc', 'order by ag_remind_date  desc', 'ra', 'rd');
-        $table->add('Tag', $url, 'order by tags asc', 'order by tags desc', 'taa', 'tad');
+        $table->add('Etiquette', $url, 'order by tags asc', 'order by tags desc', 'taa', 'tad');
         $table->add('Réf.', $url, 'order by ag_ref asc', 'order by ag_ref desc', 'ra', 'rd');
         $table->add('Groupe', $url, "order by coalesce((select p_name from profile where p_id=ag_dest),'Aucun groupe')", "order by coalesce((select p_name from profile where p_id=ag_dest),'Aucun groupe') desc", 'dea', 'ded');
         $table->add('Dest/Exp', $url, 'order by name asc', 'order by name desc', 'ea', 'ed');
@@ -666,7 +666,7 @@ class Follow_Up
         $r.='<th>'.$table->get_header(0).'</th>';
         $r.='<th>'.$table->get_header(1).'</th>';
         $r.='<th>'.$table->get_header(2).'</th>';
-        $r.='<th>'.$table->get_header(3).'</th>';
+        $r.='<th style="width:5.57%">'.$table->get_header(3).'</th>';
         $r.='<th>'.$table->get_header(4).'</th>';
         $r.='<th>'.$table->get_header(5).'</th>';
         $r.='<th>'.$table->get_header(6).'</th>';
diff --git a/include/template/action_document_type_mtable_input.php b/include/template/action_document_type_mtable_input.php
index 9328c4c80..784a4f069 100644
--- a/include/template/action_document_type_mtable_input.php
+++ b/include/template/action_document_type_mtable_input.php
@@ -25,6 +25,7 @@ if (!defined('ALLOWED'))
  * @file
  * @brief called from p_id already set, 
  * @see action_document_type_mtable::input
+ * @see 
  */
 // SQL Object Document_Type
 $table=$this->get_table();
@@ -107,7 +108,12 @@ for ($i=0;$i<$nb_option;$i++)
     echo '<li>';
     
     echo HtmlInput::hidden("cor_id[]", $aOption[$i]["cor_id"]);
-    $is=new InputSwitch("contact_option$i",$aOption[$i]["jdoc_enable"]);
+    $is=new ICheckBox("contact_option$i",1);
+    if ($aOption[$i]['jdoc_enable'] ==1 ) {
+        $is->set_check(1);
+    } else {
+        $is->set_check(0);
+    }
     echo $is->input();
     echo "&nbsp;&nbsp;&nbsp;"._($aOption[$i]['cor_label']);
     echo '</li>';

From 75190f41e1735cb71f0a22f8fc74aae9d0a4c2d0 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sat, 10 Oct 2020 21:21:14 +0200
Subject: [PATCH 073/257] Contact option : export CSV

---
 html/export.php                               |  1 +
 include/action.common.inc.php                 |  3 +
 .../export/export_follow_up_contact_csv.php   | 68 +++++++++++++++++++
 include/template/detail-action.php            | 10 ++-
 sql/upgrade.sql                               |  4 +-
 5 files changed, 83 insertions(+), 3 deletions(-)
 create mode 100644 include/export/export_follow_up_contact_csv.php

diff --git a/html/export.php b/html/export.php
index d32bc4975..9b5044c2c 100644
--- a/html/export.php
+++ b/html/export.php
@@ -50,6 +50,7 @@ if ( $action=='X'  || $g_user->check_print($action)==0 )
 
  $prfile=$cn->get_value("select me_file from menu_ref where me_code=$1",array($action));
  if ( $prfile == "") {
+     print $action;
      die (_('Export impossible'));
  }
  require_once NOALYSS_INCLUDE."/export/$prfile";
diff --git a/include/action.common.inc.php b/include/action.common.inc.php
index 33904ec76..257915c3e 100644
--- a/include/action.common.inc.php
+++ b/include/action.common.inc.php
@@ -209,9 +209,11 @@ if ($sub_action == 'detail')
             $act->ag_id = $ag_id;
             echo $act->get();
         }
+      
         
 	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"   >';
             echo $supl_hidden;
             echo HtmlInput::hidden('ac', $http->request('ac'));
@@ -221,6 +223,7 @@ if ($sub_action == 'detail')
             echo '<input type="hidden" id="delete" name="delete" value="0">';
             echo HtmlInput::submit("save", "Sauve",' onclick="$(\'delete\').value=0"');
             echo HtmlInput::submit("add_action_here", _("Ajoute un événement à celui-ci"),' onclick="$(\'delete\').value=0"');
+            
             // 
             if ($g_user->can_delete_action($ag_id))
             {
diff --git a/include/export/export_follow_up_contact_csv.php b/include/export/export_follow_up_contact_csv.php
new file mode 100644
index 000000000..569f94f12
--- /dev/null
+++ b/include/export/export_follow_up_contact_csv.php
@@ -0,0 +1,68 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
+require_once NOALYSS_INCLUDE.'/class/follow_up.class.php';
+require_once NOALYSS_INCLUDE.'/lib/noalyss_csv.class.php';
+
+$http=new HttpInput();
+$ag_id=$http->get("ag_id", "number");
+
+if ( $g_user->can_read_action($ag_id) == false ) return;
+
+
+/**
+ * @file
+ * @brief export a follow up in CSV 
+ */
+$csv=new Noalyss_CSV("followup".$ag_id);
+$csv->send_header();
+
+$document=new Follow_Up($cn);
+echo $document->export_csv(["tdoc"=>$ag_id]);
+
+$ret=$cn->exec_sql("select f_id,(select ad_value from fiche_detail where f_id=a.f_id and ad_id=25) as company,
+(select ad_value from fiche_detail where f_id=a.f_id and ad_id=1) as name,
+(select ad_value from fiche_detail where f_id=a.f_id and ad_id=32) as first_name,
+(select ad_value from fiche_detail where f_id=a.f_id and ad_id=23) as quick_code,
+cor.cor_label,
+apo.ap_value 
+from action_person a 
+left join action_person_option apo ON  (a.ap_id=apo.action_person_id)
+left join contact_option_ref cor on (apo.contact_option_ref_id=cor.cor_id)
+where ag_id=$1",[$ag_id]);
+$aTitle= array ( 
+            array("title"=>_("fiche_id"), "type"=>"string"),
+            array("title"=>_("société"), "type"=>"string"),
+            array("title"=>_("nom"), "type"=>"string"),
+            array("title"=>_("prénom"), "type"=>"string"),
+            array("title"=>_("qcode"), "type"=>"string"),
+            array("title"=>_("option"), "type"=>"string"),
+            array("title"=>_("valeur"), "type"=>"string"));
+$cn->query_to_csv($ret,$aTitle);
+
+$ret=$cn->exec_sql('select t_tag,t_description from action_tags join tags using (t_id) where ag_id=$1',[$ag_id]);
+$aTitle=array(
+    array('title'=>_('Etiquette'),"type"=>"string"),
+    array('title'=>_("Description"),"type"=>"string")
+);
+$cn->query_to_csv($ret,$aTitle);
\ No newline at end of file
diff --git a/include/template/detail-action.php b/include/template/detail-action.php
index 515559014..fc5c20b28 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -80,7 +80,13 @@ $uniq=uniqid("tab",TRUE);
                ?>
               </td>
               <td>
-
+                    <?php
+                    $csv="export.php?".
+                            http_build_query(["gDossier"=>Dossier::id(),
+                                "act"=>"CSV:FollowUpContactOption",
+                                "ag_id"=>$ag_id]);
+                    echo HtmlInput::anchor(_("Export CSV"), $csv);
+                    ?>
               </td>
           </tr>
           <?php endif; ?>
@@ -149,7 +155,7 @@ $uniq=uniqid("tab",TRUE);
 <?php if ($this->ag_id > 0 ): ?>
           <tr>
             <TD>
-                Dossier / tags
+                Dossier / Etiquette
             </TD>
             
             <td id="action_tag_td">
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index e3b85d573..4d158ddaa 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -20,4 +20,6 @@ ALTER TABLE public.jnt_document_option_contact ADD CONSTRAINT jnt_document_optio
 insert into attr_def(ad_id,ad_text,ad_type,ad_size) values (54,'Actif','check','1');
 insert into attr_min(frd_id,ad_id) select frd_id , 54 from fiche_def_ref ;
 insert into jnt_fic_attr  (fd_id,ad_id,jnt_order) select fd_id,54,30 from fiche_def;
-insert into fiche_detail (f_id,ad_id,ad_value) select f_id, 54,1 from fiche_detail where ad_id=1;
\ No newline at end of file
+insert into fiche_detail (f_id,ad_id,ad_value) select f_id, 54,1 from fiche_detail where ad_id=1;
+insert into menu_ref(me_code,me_menu,me_file,me_type) values ('CSV:FollowUpContactOption','Export action suivi','export_follow_up_contact_csv.php','PR');
+insert into profile_menu (me_code,p_id,p_type_display) select 'CSV:FollowUpContactOption',p_id,'P' from profile;

From 14a8d24b991b40f5bf179ba6dd415beef93cb051 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sat, 10 Oct 2020 21:34:51 +0200
Subject: [PATCH 074/257] Search concerned card with company , name , ... and
 export contact option to CSV

---
 include/ajax/ajax_add_concerned_card.php  | 2 +-
 include/class/card_multiple.class.php     | 3 ++-
 include/template/card_multiple_result.php | 9 +++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/include/ajax/ajax_add_concerned_card.php b/include/ajax/ajax_add_concerned_card.php
index 1f9f97286..de16902d8 100644
--- a/include/ajax/ajax_add_concerned_card.php
+++ b/include/ajax/ajax_add_concerned_card.php
@@ -112,9 +112,9 @@ for ($i=0; $i<count($a); $i++)
     $array[$i]['checkbox']=$ic->input();
     $array[$i]['quick_code']=$a[$i]['quick_code'];
     $array[$i]['name']=h($a[$i]['vw_name']);
-    $array[$i]['accounting']=$a[$i]['accounting'];
     $array[$i]['first_name']=h($a[$i]['vw_first_name']);
     $array[$i]['description']=h($a[$i]['vw_description']);
+    $array[$i]['company']=h($a[$i]['company']);
 }//foreach
 
 // No accountancy history
diff --git a/include/class/card_multiple.class.php b/include/class/card_multiple.class.php
index b4094851b..2fbd1a4d8 100644
--- a/include/class/card_multiple.class.php
+++ b/include/class/card_multiple.class.php
@@ -28,7 +28,8 @@ class Card_Multiple
     private $sql ; //!< SQL with the right column name
     function __construct()
     {
-        $this->sql="select f_id,quick_code,vw_name,accounting,vw_first_name,vw_description
+        $this->sql="select f_id,quick_code,vw_name,accounting,vw_first_name,vw_description,
+            (select ad_value from fiche_detail fd where fd.f_id=vw_fiche_attr.f_id and fd.ad_id=25) as company
                   from vw_fiche_attr  ";
     }
     /**
diff --git a/include/template/card_multiple_result.php b/include/template/card_multiple_result.php
index cef4de134..9afdb5699 100644
--- a/include/template/card_multiple_result.php
+++ b/include/template/card_multiple_result.php
@@ -13,6 +13,11 @@ $nb_array=count($array);
              ?>
         <?php printf (_("Nombre de fiches trouvées %d montrées %d"),$count_card,$nb_array);?>
         <table id="card_list" class="result" >
+            <th></th>
+            <th><?=_("QCode")?></th>
+            <th><?=_("Société")?></th>
+            <th><?=_("Nom")?></th>
+            <th><?=_("Description")?></th>
             <?php for ($i=0; $i<$nb_array; $i++) : ?>
                 <?php $class=($i%2==0)?'odd':'even'; ?>
                 <tr class="<?php echo $class; ?>">
@@ -22,11 +27,11 @@ $nb_array=count($array);
                     <td style="padding-right:55px">
                         <?php echo $array[$i]['quick_code'] ?>
                     </td>
-
                     <td>
-                        <?php echo $array[$i]['name'] ?>
+                        <?php echo $array[$i]['company'] ?>
                     </td>
                     <td>
+                        <?php echo $array[$i]['name'] ?>
                         <?php echo $array[$i]['first_name'] ?>
                     </td>
                     <td>

From fb60db4018aebfbeb4413665b5445c8dc8aae4bb Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sun, 11 Oct 2020 10:24:31 +0200
Subject: [PATCH 075/257] Fix : by default new contact options were not added
 to document_type

---
 include/class/action_document_type_mtable.class.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/include/class/action_document_type_mtable.class.php b/include/class/action_document_type_mtable.class.php
index 03a7d2dbf..f02f56d7b 100644
--- a/include/class/action_document_type_mtable.class.php
+++ b/include/class/action_document_type_mtable.class.php
@@ -168,6 +168,18 @@ class Action_Document_Type_MTable extends Manage_Table_SQL
         // Detail option contact
         $table=$this->get_table();
         $cn=$table->cn;
+        // insert new contact options
+        $cn->exec_sql("insert into   jnt_document_option_contact (jdoc_enable,document_type_id,
+                                contact_option_ref_id) 
+                         select 0 , $1, cor_id 
+                         from contact_option_ref 
+                        where
+                        cor_id not in (select cor_id from 
+                                        jnt_document_option_contact a 
+                                        where a.document_type_id=$1)",[$table->dt_id]);
+        
+        // Select all
+        
         $aOption=$cn->get_array("select cor_id,cor_label,cor_type,document_type_id ,coalesce(jdoc_enable,0) jdoc_enable
                 from 
                 contact_option_ref cor  

From 0161cd0d6930dd06cd2494a7e6b534bcf2485664 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sun, 11 Oct 2020 10:26:47 +0200
Subject: [PATCH 076/257] Add : upgrade scrip added

---
 include/constant.php                    |  2 +-
 include/database/attr_def_sql.class.php | 68 +++++++++++++++++++++++++
 include/sql/patch/upgrade145.sql        | 32 ++++++++++++
 sql/upgrade.sql                         | 25 ---------
 4 files changed, 101 insertions(+), 26 deletions(-)
 create mode 100644 include/database/attr_def_sql.class.php
 create mode 100644 include/sql/patch/upgrade145.sql

diff --git a/include/constant.php b/include/constant.php
index c6c0d23ca..b8d723d9c 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -107,7 +107,7 @@ if ( !defined ("NOALYSS_PACKAGE_REPOSITORY")) {
 if ( ! defined ("SYSINFO_DISPLAY")) {
     define ("SYSINFO_DISPLAY",TRUE);
 }
-define ("DBVERSION",145);
+define ("DBVERSION",146);
 define ("MONO_DATABASE",25);
 define ("DBVERSIONREPO",18);
 define ('NOTFOUND','--not found--');
diff --git a/include/database/attr_def_sql.class.php b/include/database/attr_def_sql.class.php
new file mode 100644
index 000000000..450a1203a
--- /dev/null
+++ b/include/database/attr_def_sql.class.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * Autogenerated file 
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
+
+/**
+ * class_attr_def_sql.php
+ *
+ * @file
+ * @brief abstract of the table public.attr_def */
+class Attr_def_SQL extends Noalyss_SQL
+{
+
+    function __construct(Database $p_cn, $p_id=-1)
+    {
+        $this->table="public.attr_def";
+        $this->primary_key="ad_id";
+        /*
+         * List of columns
+         */
+        $this->name=array(
+            "id"=>"ad_id"
+            , "desc"=>"ad_text"
+            , "type"=>"ad_type"
+            , "size"=>"ad_size"
+            , "extra"=>"ad_extra"
+            , "search_followup"=>"ad_search_followup"
+        );
+        /*
+         * Type of columns
+         */
+        $this->type=array(
+            "ad_id"=>"numeric"
+            , "ad_text"=>"text"
+            , "ad_type"=>"text"
+            , "ad_size"=>"text"
+            , "ad_extra"=>"text"
+            , "ad_search_followup"=>"numeric"
+        );
+
+
+        $this->default=array(
+            "ad_id"=>"auto"
+        );
+
+        $this->date_format="DD.MM.YYYY";
+        parent::__construct($p_cn, $p_id);
+    }
+
+}
diff --git a/include/sql/patch/upgrade145.sql b/include/sql/patch/upgrade145.sql
new file mode 100644
index 000000000..98b6fffef
--- /dev/null
+++ b/include/sql/patch/upgrade145.sql
@@ -0,0 +1,32 @@
+begin;
+
+ALTER TABLE public.document_option ADD do_option varchar NULL;
+COMMENT ON COLUMN public.document_option.do_option IS 'Option for the detail';
+
+alter table attr_def add column ad_search_followup int;
+alter table attr_def alter column ad_search_followup set default 1;
+update attr_def set ad_search_followup=1;
+comment on column attr_def.ad_search_followup is '1 : search  available  from followup , 0  : search not available in followup';
+
+
+create table jnt_document_option_contact
+(
+jdoc_id bigserial primary key,
+jdoc_enable int not null, 
+document_type_id bigint references document_type (dt_id) on delete cascade on update cascade,
+contact_option_ref_id bigint references contact_option_ref(cor_id) on delete cascade  on update  cascade
+);
+ALTER TABLE public.jnt_document_option_contact ADD CONSTRAINT jnt_document_option_contact_un UNIQUE (document_type_id,contact_option_ref_id);
+ALTER TABLE public.jnt_document_option_contact ADD CONSTRAINT jnt_document_option_contact_check CHECK (jdoc_enable in (0,1));
+
+insert into attr_def(ad_id,ad_text,ad_type,ad_size) values (54,'Actif','check','1');
+insert into attr_min(frd_id,ad_id) select frd_id , 54 from fiche_def_ref ;
+insert into jnt_fic_attr  (fd_id,ad_id,jnt_order) select fd_id,54,30 from fiche_def;
+insert into fiche_detail (f_id,ad_id,ad_value) select f_id, 54,1 from fiche_detail where ad_id=1 and f_id not in (select f_id from fiche_detail where ad_id=54);
+insert into menu_ref(me_code,me_menu,me_file,me_type) values ('CSV:FollowUpContactOption','Export action suivi','export_follow_up_contact_csv.php','PR');
+insert into profile_menu (me_code,p_id,p_type_display) select 'CSV:FollowUpContactOption',p_id,'P' from profile;
+
+
+
+insert into version (val,v_description) values (146,'Export CSV for Multiple card, contact option by document type');
+commit;
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index 4d158ddaa..e69de29bb 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -1,25 +0,0 @@
-ALTER TABLE public.document_option ADD do_option varchar NULL;
-COMMENT ON COLUMN public.document_option.do_option IS 'Option for the detail';
-
-alter table attr_def add column ad_search_followup int;
-alter table attr_def alter column ad_search_followup set default 1;
-update attr_def set ad_search_followup=1;
-comment on column attr_def.ad_search_followup is '1 : search  available  from followup , 0  : search not available in followup'
-
-
-create table jnt_document_option_contact
-(
-jdoc_id bigserial primary key,
-jdoc_enable int not null, 
-document_type_id bigint references document_type (dt_id) on delete cascade on update cascade,
-contact_option_ref_id bigint references contact_option_ref(cor_id) on delete cascade  on update  cascade
-);
-ALTER TABLE public.jnt_document_option_contact ADD CONSTRAINT jnt_document_option_contact_un UNIQUE (document_type_id,contact_option_ref_id);
-ALTER TABLE public.jnt_document_option_contact ADD CONSTRAINT jnt_document_option_contact_check CHECK (jdoc_enable in (0,1));
-
-insert into attr_def(ad_id,ad_text,ad_type,ad_size) values (54,'Actif','check','1');
-insert into attr_min(frd_id,ad_id) select frd_id , 54 from fiche_def_ref ;
-insert into jnt_fic_attr  (fd_id,ad_id,jnt_order) select fd_id,54,30 from fiche_def;
-insert into fiche_detail (f_id,ad_id,ad_value) select f_id, 54,1 from fiche_detail where ad_id=1;
-insert into menu_ref(me_code,me_menu,me_file,me_type) values ('CSV:FollowUpContactOption','Export action suivi','export_follow_up_contact_csv.php','PR');
-insert into profile_menu (me_code,p_id,p_type_display) select 'CSV:FollowUpContactOption',p_id,'P' from profile;

From 13c76eec25b194228a2c6390c1c53c121253b18f Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sun, 11 Oct 2020 14:39:26 +0200
Subject: [PATCH 077/257] fix upgrade145.sql , default value must be 1 for
 actif, sql wrong

---
 include/class/card_multiple.class.php | 2 +-
 include/constant.php                  | 1 +
 include/sql/patch/upgrade145.sql      | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/class/card_multiple.class.php b/include/class/card_multiple.class.php
index 2fbd1a4d8..d70c23745 100644
--- a/include/class/card_multiple.class.php
+++ b/include/class/card_multiple.class.php
@@ -57,7 +57,7 @@ class Card_Multiple
                   ".MAX_CARD_SEARCH;
         } else {
             $string_sql=sprintf($this->sql." where f_id in (select f_id from fiche_detail where 
-                    ad_id = '%s' and ad_value ilike '%%%s%%') and %s"
+                    ad_id = '%s' and ad_value ilike '%%%s%%')  %s"
                     , sql_string($sql_array["search_in"]),$query,$filter);
         }
         return $string_sql;
diff --git a/include/constant.php b/include/constant.php
index b8d723d9c..7382a81e2 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -212,6 +212,7 @@ define( 'ATTR_DEF_ACCOUNT_ND_TVA',50);
 define('ATTR_DEF_ACCOUNT_ND_TVA_ND',51);
 define ('ATTR_DEF_ACCOUNT_ND_PERSO',52);
 define ('ATTR_DEF_ACCOUNT_ND',53);
+define ('ATTR_DEF_ACTIF',54);
 
 define ("FICHE_TYPE_CLIENT",9);
 define ("FICHE_TYPE_VENTE",1);
diff --git a/include/sql/patch/upgrade145.sql b/include/sql/patch/upgrade145.sql
index 98b6fffef..cd5a13cfb 100644
--- a/include/sql/patch/upgrade145.sql
+++ b/include/sql/patch/upgrade145.sql
@@ -23,6 +23,7 @@ insert into attr_def(ad_id,ad_text,ad_type,ad_size) values (54,'Actif','check','
 insert into attr_min(frd_id,ad_id) select frd_id , 54 from fiche_def_ref ;
 insert into jnt_fic_attr  (fd_id,ad_id,jnt_order) select fd_id,54,30 from fiche_def;
 insert into fiche_detail (f_id,ad_id,ad_value) select f_id, 54,1 from fiche_detail where ad_id=1 and f_id not in (select f_id from fiche_detail where ad_id=54);
+update fiche_detail set ad_value='1' where ad_id=54;
 insert into menu_ref(me_code,me_menu,me_file,me_type) values ('CSV:FollowUpContactOption','Export action suivi','export_follow_up_contact_csv.php','PR');
 insert into profile_menu (me_code,p_id,p_type_display) select 'CSV:FollowUpContactOption',p_id,'P' from profile;
 

From 464567ec31bb116069de6feae70499ae24a344cd Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sun, 11 Oct 2020 17:35:55 +0200
Subject: [PATCH 078/257] Fix FollowUp : price Purchase or Sale

---
 include/class/follow_up_detail.class.php      | 11 +++--------
 include/template/follow_up_detail_display.php |  9 +++++++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/class/follow_up_detail.class.php b/include/class/follow_up_detail.class.php
index 0967d99ea..2cdd338cb 100644
--- a/include/class/follow_up_detail.class.php
+++ b/include/class/follow_up_detail.class.php
@@ -236,16 +236,11 @@ class Follow_Up_Detail
     
     public static function display(Follow_Up $p_follow_up,$p_view)
     {
+        $option=$p_follow_up->db->get_value("select do_option from document_option "
+                . "  where document_type_id=$1 and do_code='detail_operation'",[$p_follow_up->dt_id]);
+        
          require NOALYSS_TEMPLATE."/follow_up_detail_display.php";
     }
-    /*!\brief
-     *\param
-     *\return
-     *\note
-     *\see
-     */
-    static function test_me()
-{}
 
 }
 
diff --git a/include/template/follow_up_detail_display.php b/include/template/follow_up_detail_display.php
index a86a2e844..0b3946f02 100644
--- a/include/template/follow_up_detail_display.php
+++ b/include/template/follow_up_detail_display.php
@@ -88,8 +88,13 @@ $menu=new Default_Menu();
             $icard->javascript=sprintf(' onchange="fill_data_onchange(\'%s\');" ', $icard->name);
             // name of the field to update with the name of the card
             $icard->set_attribute('label', 'e_march' . $i . '_label');
-            // name of the field with the price
-            $icard->set_attribute('price', 'e_march' . $i . '_price');
+            // name of the field with the price autocomplete 
+            if ( $option == 'ACH'){
+             $icard->set_attribute('purchase', 'e_march' . $i . '_price');
+            } else {
+             $icard->set_attribute('price','e_march'.$i.'_price'); 
+            }
+            
             // name of the field with the TVA_ID
             $icard->set_attribute('tvaid', 'e_march' . $i . '_tva_id');
            $icard->amount_from_type=$option_detail;

From 30ff1b125c8b84406dd0026918729bde521544ce Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sun, 11 Oct 2020 17:36:42 +0200
Subject: [PATCH 079/257] protect

---
 html/fid.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/fid.php b/html/fid.php
index 814a28376..2b6c38964 100644
--- a/html/fid.php
+++ b/html/fid.php
@@ -115,7 +115,7 @@ if ( isset($_SESSION['isValid']) && $_SESSION['isValid'] == 1)
          from vw_fiche_attr
          where quick_code=upper($1)". $filter_card;
 
-    $array=$cn->get_array($sql,  array($_REQUEST['FID']));
+    $array=$cn->get_array($sql,  array($hi->request('FID')));
 
     if ( empty($array))
     {

From 5ee686eae65331401a2c334c1f1cdd077bd138f9 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sun, 11 Oct 2020 17:58:24 +0200
Subject: [PATCH 080/257] Follow Up : multiple card , search by category of
 card

---
 html/js/card.js                          |  9 +++++++--
 include/ajax/ajax_add_concerned_card.php | 15 +++++++++++++--
 include/class/card_multiple.class.php    | 18 ++++++++++++++----
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/html/js/card.js b/html/js/card.js
index 3228d517d..3e9c112fd 100644
--- a/html/js/card.js
+++ b/html/js/card.js
@@ -188,6 +188,7 @@ function action_concerned_search_card(obj)
         var ag_id=0;
         var search_in=-1;
         var inactive_card=0;
+        var search_cat=-1;
         
         if (obj.dossier) {
             dossier = obj.dossier; /* From the button */
@@ -212,9 +213,12 @@ function action_concerned_search_card(obj)
             if (obj.elements['search_in']) {
                 search_in = obj.elements['search_in'].value;
             }
-            if ( obj.inactive_card) {
+            if ( obj.elements['inactive_card']) {
                 inactive_card=obj.elements['inactive_card'].value;
             }
+            if ( obj.elements['search_cat']) {
+                search_cat=obj.elements['search_cat'].value;
+            }
         }
         if (dossier == 0) {
             throw "obj.dossier not found";
@@ -231,7 +235,8 @@ function action_concerned_search_card(obj)
             'op':'card',
             'accvis':0,
             'search_in':search_in,
-            'inactive_card':inactive_card
+            'inactive_card':inactive_card,
+            'search_cat':search_cat
         });
 
         waiting_box();
diff --git a/include/ajax/ajax_add_concerned_card.php b/include/ajax/ajax_add_concerned_card.php
index de16902d8..9187a7045 100644
--- a/include/ajax/ajax_add_concerned_card.php
+++ b/include/ajax/ajax_add_concerned_card.php
@@ -63,21 +63,31 @@ $q->value=(isset($query))?$query:'';
 $r.='<span style="margin-left:50px">';
 $r.=_('Fiche contenant').Icon_Action::infobulle(19);
 $r.=$q->input();
+
 // where to search
 $select=new ISelect("search_in");
 $select->value=$cn->make_array("select ad_id, ad_text from attr_def  where ad_search_followup = 1 order by 2 ",1);
 $select->selected=$http->get("search_in","string","");
 $r.=_("limité aux champs ").$select->input();
-$r.=HtmlInput::submit('fs', _('Recherche'), "", "smallbutton");
+
 $r.='</span>';
 $r.=dossier::hidden().HtmlInput::hidden('op2', 'add_concerned_card');
 $r.=HtmlInput::request_to_hidden(array('ag_id'));
+
+// Search by category
+$sel_Category=new ISelect("search_cat");
+$sel_Category->value=$cn->make_array("select fd_id,fd_label from fiche_def order by 2",1);
+$sel_Category->set_value($http->request("search_cat","string","-1"));
+$r.=_("Catégorie")." ".$sel_Category->input();
+
+// search also inactive card
 $inactive=$http->get("inactive_card","string",0);
 if ($inactive=="undefined" || $inactive == "") $inactive=0;
 $is=new InputSwitch("inactive_card",$inactive);
 $is->value=$inactive;
-$r.=_("Toutes les fiches").$is->input();
+$r.=_("Fiches inactives").$is->input();
 
+$r.=HtmlInput::submit('fs', _('Recherche'), "", "smallbutton");
 $r.='</form>';
 
 
@@ -86,6 +96,7 @@ $sql_array['query']=$query;
 $sql_array['typecard']='all';
 $sql_array['search_in']=$select->selected;
 $sql_array['inactive_card']=$inactive;
+$sql_array['search_cat']=$sel_Category->selected;
 
 $fiche=new Card_Multiple($cn);
 /* Build the SQL and show result */
diff --git a/include/class/card_multiple.class.php b/include/class/card_multiple.class.php
index d70c23745..4f59e8bfc 100644
--- a/include/class/card_multiple.class.php
+++ b/include/class/card_multiple.class.php
@@ -44,6 +44,11 @@ class Card_Multiple
         if ( $sql_array["inactive_card"]==0) {
             $filter=" and ".$this->filter_enable_card();
         }
+        // By Cat of card
+        $sql_cat="";
+        if ( $sql_array['search_cat']!=-1) {
+            $sql_cat=' and fd_id = '.sql_string($sql_array['search_cat']);
+        }
         $query=sql_string($sql_array['query']);
         if ( $sql_array['search_in'] == "-1")
         {
@@ -51,14 +56,14 @@ class Card_Multiple
                   where 
                   (vw_name ilike '%$query%' 
                   or quick_code ilike '%$query%')
-                     ".$filter."
+                     ".$filter.$sql_cat."
                   order by vw_name 
                   limit 
                   ".MAX_CARD_SEARCH;
         } else {
             $string_sql=sprintf($this->sql." where f_id in (select f_id from fiche_detail where 
-                    ad_id = '%s' and ad_value ilike '%%%s%%')  %s"
-                    , sql_string($sql_array["search_in"]),$query,$filter);
+                    ad_id = '%s' and ad_value ilike '%%%s%%')  %s %s"
+                    , sql_string($sql_array["search_in"]),$query,$filter,$sql_cat);
         }
         return $string_sql;
     }
@@ -75,13 +80,18 @@ class Card_Multiple
         if ( $sql_array["inactive_card"]==0) {
             $filter="and ".$this->filter_enable_card();
         }
+        // By Cat of card
+        $sql_cat="";
+        if ( $sql_array['search_cat']!=-1) {
+            $sql_cat=' and fd_id = '.sql_string($sql_array['search_cat']);
+        }
 
         $string_sql="select count(*) 
               from vw_fiche_attr  
               where 
               ( vw_name ilike '%$query%' 
               or quick_code ilike '%$query%')
-                     ".$filter;
+                     ".$filter.$sql_cat;
 
 
         return $cn->get_value($string_sql); 

From c1b866fa81c0adb93b462662644abaa8a5884ade Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sun, 11 Oct 2020 17:59:48 +0200
Subject: [PATCH 081/257] Search card :typo

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

diff --git a/include/ajax/ajax_card.php b/include/ajax/ajax_card.php
index cfc824a65..6af2b5be6 100644
--- a/include/ajax/ajax_card.php
+++ b/include/ajax/ajax_card.php
@@ -427,7 +427,7 @@ case 'fs':
     if ($inactive=="undefined" || $inactive == "") $inactive=0;
     $is=new InputSwitch("inactive_card",$inactive);
     $is->value=$inactive;
-    $r.=_("Toutes les fiches").$is->input();
+    $r.=_("fiches inactives").$is->input();
     
     // save previous info
     $hidden="";

From 650e55364e44aaacf42e98bfe9e5e9a40890f996 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sun, 11 Oct 2020 18:10:40 +0200
Subject: [PATCH 082/257] Follow up search card, add a button to select all ,
 cosmetic add qcode in dialog box for contact option

---
 include/class/card_multiple.class.php             | 5 +++++
 include/template/card_multiple_display_option.php | 3 +++
 include/template/card_multiple_result.php         | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/include/class/card_multiple.class.php b/include/class/card_multiple.class.php
index 4f59e8bfc..60ed305b0 100644
--- a/include/class/card_multiple.class.php
+++ b/include/class/card_multiple.class.php
@@ -127,6 +127,11 @@ class Card_Multiple
         if ( ! $g_user->can_read_action($ag_id)) {
             throw new Exception (_("CMCDO01"."Security"));
         }
+        // Retrieve Name, first Name and QCODE
+        $aIdentity=$cn->get_row("select (select ad_value from fiche_detail where f_id=$1 and ad_id=1) as name , 
+            (select ad_value from fiche_detail where f_id=$1 and ad_id=32) as first_name , 
+            (select ad_value from fiche_detail where f_id=$1 and ad_id=23) as qcode ",[$fiche_id]); 
+            
         // insert new , synchronized
         $cn->exec_sql("insert into action_person_option (ap_value,contact_option_ref_id ,action_person_id ) 
             select null,cor_id,$1
diff --git a/include/template/card_multiple_display_option.php b/include/template/card_multiple_display_option.php
index 309aa3754..9e37e481a 100644
--- a/include/template/card_multiple_display_option.php
+++ b/include/template/card_multiple_display_option.php
@@ -35,6 +35,9 @@ if (!defined('ALLOWED'))
  * @see Card_Multiple
  */
 ?>
+<h3 class="info" style="margin:1px">
+    <?=$aIdentity['name']." ".$aIdentity['first_name']." ".$aIdentity['qcode']?>
+</h2>
 <form method="POST" onsubmit="save_linked_card_option(this);return false">
     <input type="hidden" name="op" value="card">
     <input type="hidden" name="op2" value="save_card_option">
diff --git a/include/template/card_multiple_result.php b/include/template/card_multiple_result.php
index 9afdb5699..8c16fc32e 100644
--- a/include/template/card_multiple_result.php
+++ b/include/template/card_multiple_result.php
@@ -13,7 +13,7 @@ $nb_array=count($array);
              ?>
         <?php printf (_("Nombre de fiches trouvées %d montrées %d"),$count_card,$nb_array);?>
         <table id="card_list" class="result" >
-            <th></th>
+            <th><?= ICheckBox::toggle_checkbox("all", "search_card2_frm")?></th>
             <th><?=_("QCode")?></th>
             <th><?=_("Société")?></th>
             <th><?=_("Nom")?></th>

From dd5b8c2e069a67921192e7444705dfe477f1ce8f Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sun, 11 Oct 2020 18:21:51 +0200
Subject: [PATCH 083/257] Bug : from VEN , cannot get the price

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

diff --git a/include/ajax/ajax_card.php b/include/ajax/ajax_card.php
index 6af2b5be6..7b065898b 100644
--- a/include/ajax/ajax_card.php
+++ b/include/ajax/ajax_card.php
@@ -509,7 +509,7 @@ case 'fs':
                                               $price,$amount);
         }
         if ( $type=="VEN" ){
-            $amount=(isNumber($aFound[$i]['vw_buy']) == 1 )?$aFound[$i]['vw_sell']:0;
+            $amount=(isNumber($aFound[$i]['vw_sell']) == 1 )?$aFound[$i]['vw_sell']:0;
             $array[$i]['javascript'].=sprintf("set_value('%s','%s');",
                                               $price,$amount);
         }

From 41fb176fe3740ba76bd78e7275260b32d18fa3f6 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 12 Oct 2020 12:26:13 +0200
Subject: [PATCH 084/257] Follow-up fix order

---
 include/action.inc.php            | 3 +--
 include/class/follow_up.class.php | 5 +++--
 include/lib/html_input.class.php  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/action.inc.php b/include/action.inc.php
index 70406bb75..e27e5f192 100644
--- a/include/action.inc.php
+++ b/include/action.inc.php
@@ -55,8 +55,7 @@ $sub_action=$http->request("sa","string","");
  */
 $ag_id=$http->request("ag_id","string","0");
 
-$ac=$http->request("ac");
-$base=HtmlInput::request_to_string(array('ac','gDossier'),"");
+$base="do.php?".http_build_query(["ac"=>$http->request("ac"),"gDossier"=>Dossier::id()]);
 echo '<div class="content">';
 require_once NOALYSS_INCLUDE.'/action.common.inc.php';
 echo "</div>";
diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index b04bc903e..e24b46e97 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -610,7 +610,8 @@ class Follow_Up
     function myList($p_base, $p_filter="", $p_search="")
     {
         // for the sort
-        $url=HtmlInput::get_to_string(array("closed_action", "remind_date_end", "remind_date", "sag_ref", "only_internal", "state", "qcode", "ag_dest_query", "action_query", "tdoc", "date_start", "date_end", "hsstate", "searchtag")).'&'.$p_base;
+        $arg=HtmlInput::get_to_string(array("closed_action", "remind_date_end", "remind_date", "sag_ref", "only_internal", "state", "qcode", "ag_dest_query", "action_query", "tdoc", "date_start", "date_end", "hsstate", "searchtag"),"");
+        $url=$p_base.$arg;
 
         $table=new Sort_Table();
         $table->add('Date Doc.', $url, 'order by ag_timestamp asc', 'order by ag_timestamp desc', 'da', 'dd');
@@ -689,7 +690,7 @@ class Follow_Up
         //show the sub_action
         foreach ($a_row as $row)
         {
-            $href='<A class="document" HREF="do.php?'.$p_base.HtmlInput::get_to_string(array("closed_action", "remind_date_end", "remind_date", "sag_ref", "only_internal", "state", "gDossier", "qcode", "ag_dest_query", "action_query", "tdoc", "date_start", "date_end", "hsstate", "searchtag", "ac"), "&").'&sa=detail&ag_id='.$row['ag_id'].'">';
+            $href='<A class="document" HREF="'.$p_base.HtmlInput::get_to_string(array("closed_action", "remind_date_end", "remind_date", "sag_ref", "only_internal", "state", "gDossier", "qcode", "ag_dest_query", "action_query", "tdoc", "date_start", "date_end", "hsstate", "searchtag", "ac"), "").'&sa=detail&ag_id='.$row['ag_id'].'" title="detail">';
             $i++;
             $tr=($i%2==0)?'even':'odd';
             if ($row['ag_priority']<2)
diff --git a/include/lib/html_input.class.php b/include/lib/html_input.class.php
index 7ca7c5516..0cbbabbe4 100755
--- a/include/lib/html_input.class.php
+++ b/include/lib/html_input.class.php
@@ -680,7 +680,7 @@ class HtmlInput
     static function array_to_string($array, $global_array, $start="?")
     {
 
-        $r=$start;
+        $r="";
 
         if (count($global_array)==0)
             return '';
@@ -704,7 +704,7 @@ class HtmlInput
             }
             $and="&amp;";
         }
-
+        if (trim ($r) != "") $r=$start.$r;
         return $r;
     }
 

From 2427b756a9b01a90a411e4239f5dece6e68d8773 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 12 Oct 2020 12:38:10 +0200
Subject: [PATCH 085/257] Follow up cosmetic add title to anchor

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

diff --git a/include/template/detail-action.php b/include/template/detail-action.php
index fc5c20b28..0516e5f49 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -85,7 +85,7 @@ $uniq=uniqid("tab",TRUE);
                             http_build_query(["gDossier"=>Dossier::id(),
                                 "act"=>"CSV:FollowUpContactOption",
                                 "ag_id"=>$ag_id]);
-                    echo HtmlInput::anchor(_("Export CSV"), $csv);
+                    echo HtmlInput::anchor(_("Export CSV"), $csv,"",' class="line" title="Export Contacts options"');
                     ?>
               </td>
           </tr>

From ed50fc802d59c74df8b9d1e61378bb228b405f23 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 12 Oct 2020 12:59:22 +0200
Subject: [PATCH 086/257] Document Type : CFGACTION cannot add new document,
 fix order in dialog box,Fix= cannot delete action cause cascade on
 action_person

---
 include/ajax/ajax_cfgaction.php               |  4 +-
 .../action_document_type_mtable.class.php     | 70 ++++++++++++-------
 sql/upgrade.sql                               |  2 +
 3 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/include/ajax/ajax_cfgaction.php b/include/ajax/ajax_cfgaction.php
index 656253194..8d2312e91 100644
--- a/include/ajax/ajax_cfgaction.php
+++ b/include/ajax/ajax_cfgaction.php
@@ -63,13 +63,15 @@ $action_document_type->set_object_name($ctl_id);
 
 if ($action=="input")
 {
-   
+   $action_document_type->set_order(["dt_id", "dt_value","dt_prefix"]);
+
     header('Content-type: text/xml; charset=UTF-8');
     echo $action_document_type->ajax_input()->saveXML();
     return;
 }
 elseif ($action=="save")
 {
+    $action_document_type->set_order(["dt_id", "dt_value","dt_prefix"]);
     $xml=$action_document_type->ajax_save();
     header('Content-type: text/xml; charset=UTF-8');
     echo $xml->saveXML();
diff --git a/include/class/action_document_type_mtable.class.php b/include/class/action_document_type_mtable.class.php
index f02f56d7b..a48b98a70 100644
--- a/include/class/action_document_type_mtable.class.php
+++ b/include/class/action_document_type_mtable.class.php
@@ -162,35 +162,55 @@ class Action_Document_Type_MTable extends Manage_Table_SQL
     function input()
     {
         parent::input();
-        
-        
-        
+
+
+
         // Detail option contact
         $table=$this->get_table();
         $cn=$table->cn;
-        // insert new contact options
-        $cn->exec_sql("insert into   jnt_document_option_contact (jdoc_enable,document_type_id,
-                                contact_option_ref_id) 
-                         select 0 , $1, cor_id 
-                         from contact_option_ref 
-                        where
-                        cor_id not in (select cor_id from 
-                                        jnt_document_option_contact a 
-                                        where a.document_type_id=$1)",[$table->dt_id]);
+        try
+        {
+            $cn->start();
+            if ( $table->dt_id == -1 ){
+                $aOption=$cn->get_array("select cor_id,cor_label,cor_type,-1 document_type_id,0 jdoc_enable
+                    from 
+                    contact_option_ref cor  
+                    order by cor_label");
+                
+            } else {
+                // insert new contact options
+                $cn->exec_sql("insert into   jnt_document_option_contact (jdoc_enable,document_type_id,
+                                    contact_option_ref_id) 
+                             select 0 , $1, cor_id 
+                             from contact_option_ref 
+                            where
+                            cor_id not in (select cor_id from 
+                                            jnt_document_option_contact a 
+                                            where a.document_type_id=$1)", [$table->dt_id]);
+
+                // Select all
+                $aOption=$cn->get_array("select cor_id,cor_label,cor_type,document_type_id ,coalesce(jdoc_enable,0) jdoc_enable
+                    from 
+                    contact_option_ref cor  
+                    left join jnt_document_option_contact jdoc on (cor_id=contact_option_ref_id) 
+                    where 
+                    document_type_id is null
+                    or document_type_id = $1
+                    order by cor_label", [$this->table->dt_id]);
+            }
+
+            // Detail option
+            require NOALYSS_TEMPLATE."/action_document_type_mtable_input.php";
+            $cn->commit();
+        }
+        catch (Exception $exc)
+        {
+            $cn->rollback();
+                    
+            echo $exc->getMessage();
+            error_log($exc->getTraceAsString());
+        }
         
-        // Select all
-        
-        $aOption=$cn->get_array("select cor_id,cor_label,cor_type,document_type_id ,coalesce(jdoc_enable,0) jdoc_enable
-                from 
-                contact_option_ref cor  
-                left join jnt_document_option_contact jdoc on (cor_id=contact_option_ref_id) 
-                where 
-                document_type_id is null
-                or document_type_id = $1
-                order by cor_label",[$this->table->dt_id]);
-        
-        // Detail option
-        require NOALYSS_TEMPLATE."/action_document_type_mtable_input.php";
     }
 
     /**
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index e69de29bb..847dce72a 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -0,0 +1,2 @@
+ALTER TABLE public.action_person drop CONSTRAINT action_gestion_ag_id_fk2 ;
+ALTER TABLE public.action_person ADD CONSTRAINT action_gestion_ag_id_fk2 FOREIGN KEY (ag_id) REFERENCES action_gestion(ag_id) on delete cascade on update cascade;

From f2ae91ed7c93fd43457607c3951cf0b63d82a599 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 12 Oct 2020 13:33:08 +0200
Subject: [PATCH 087/257] Fix bug : follow up option contact are not remove
 when document type changed

---
 include/class/action_document_type_mtable.class.php | 13 +++++++++++++
 include/class/card_multiple.class.php               |  7 ++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/include/class/action_document_type_mtable.class.php b/include/class/action_document_type_mtable.class.php
index a48b98a70..64c8c5748 100644
--- a/include/class/action_document_type_mtable.class.php
+++ b/include/class/action_document_type_mtable.class.php
@@ -197,6 +197,19 @@ class Action_Document_Type_MTable extends Manage_Table_SQL
                     document_type_id is null
                     or document_type_id = $1
                     order by cor_label", [$this->table->dt_id]);
+                
+                // delete unused option by the action_person_
+                $cn->exec_sql("delete from action_person_option  where ap_id in (select apo.ap_id 
+                    from action_person a 
+                    left join action_person_option apo ON  (a.ap_id=apo.action_person_id)
+                    left join contact_option_ref cor on (apo.contact_option_ref_id=cor.cor_id)
+                    join action_gestion ag  on (a.ag_id=ag.ag_id)
+                    where  
+                    cor.cor_id not in (select jdoc2.contact_option_ref_id 
+                                        from jnt_document_option_contact jdoc2 
+                                        where jdoc2.document_type_id =$1 
+                                        and jdoc2.jdoc_enable =1));
+                    ",[$table->dt_id]);
             }
 
             // Detail option
diff --git a/include/class/card_multiple.class.php b/include/class/card_multiple.class.php
index 60ed305b0..13ca09f54 100644
--- a/include/class/card_multiple.class.php
+++ b/include/class/card_multiple.class.php
@@ -146,9 +146,10 @@ class Card_Multiple
         // delete disable
         $cn->exec_sql("delete 
                 from action_person_option apo 
-                where contact_option_ref_id  in 
-               (select contact_option_ref_id from jnt_document_option_contact jdoc join action_gestion on                       (ag_type=document_type_id) 
-                    where ag_id=$1 and jdoc_enable=0)",[$ag_id]);
+                where contact_option_ref_id  not in 
+               (select contact_option_ref_id from jnt_document_option_contact jdoc join action_gestion on   
+               (ag_type=document_type_id) 
+                    where ag_id=$1 and jdoc_enable=1)",[$ag_id]);
         
         // First select the option
         $sql="select ap_id,cor_id,ap_value,cor_type ,cor_label,cor_value_select

From 5a9c4eeab92597bb4e86704c292f6762cd4affcb Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 12 Oct 2020 18:37:42 +0200
Subject: [PATCH 088/257] upgrade db 146

---
 include/constant.php             | 2 +-
 include/sql/patch/upgrade146.sql | 7 +++++++
 sql/upgrade.sql                  | 2 --
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 include/sql/patch/upgrade146.sql

diff --git a/include/constant.php b/include/constant.php
index 7382a81e2..8168e6b2b 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -107,7 +107,7 @@ if ( !defined ("NOALYSS_PACKAGE_REPOSITORY")) {
 if ( ! defined ("SYSINFO_DISPLAY")) {
     define ("SYSINFO_DISPLAY",TRUE);
 }
-define ("DBVERSION",146);
+define ("DBVERSION",147);
 define ("MONO_DATABASE",25);
 define ("DBVERSIONREPO",18);
 define ('NOTFOUND','--not found--');
diff --git a/include/sql/patch/upgrade146.sql b/include/sql/patch/upgrade146.sql
new file mode 100644
index 000000000..25ffcf004
--- /dev/null
+++ b/include/sql/patch/upgrade146.sql
@@ -0,0 +1,7 @@
+begin;
+
+ALTER TABLE public.action_person drop CONSTRAINT action_gestion_ag_id_fk2 ;
+ALTER TABLE public.action_person ADD CONSTRAINT action_gestion_ag_id_fk2 FOREIGN KEY (ag_id) REFERENCES action_gestion(ag_id) on delete cascade on update cascade;
+
+insert into version (val,v_description) values (147,'Cascade delete on action_gestion');
+commit;
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index 847dce72a..e69de29bb 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -1,2 +0,0 @@
-ALTER TABLE public.action_person drop CONSTRAINT action_gestion_ag_id_fk2 ;
-ALTER TABLE public.action_person ADD CONSTRAINT action_gestion_ag_id_fk2 FOREIGN KEY (ag_id) REFERENCES action_gestion(ag_id) on delete cascade on update cascade;

From f880de50455260b357bd207211826ad77225b9b2 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 12 Oct 2020 18:38:02 +0200
Subject: [PATCH 089/257] select_box cosmetic font

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

diff --git a/include/lib/select_box.class.php b/include/lib/select_box.class.php
index 28e6bc740..396d416f9 100644
--- a/include/lib/select_box.class.php
+++ b/include/lib/select_box.class.php
@@ -157,7 +157,7 @@ class Select_Box
         
 
         // display the button
-        printf('<input type="button" class="smallbutton icon " id="%s_bt" value="%s &#x25BE;" >',
+        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);

From 3e109f941c07c53d2fa8bb28ff09a0757e26c148 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 12 Oct 2020 18:38:20 +0200
Subject: [PATCH 090/257] Follow-up correct link

---
 include/category_card.inc.php     |  2 +-
 include/category_followup.inc.php | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/include/category_card.inc.php b/include/category_card.inc.php
index 42f0e2f85..63bceb8da 100644
--- a/include/category_card.inc.php
+++ b/include/category_card.inc.php
@@ -34,7 +34,7 @@ global $http;
 
 $str_dossier=Dossier::get();
 
-$root="?".http_build_query(["ac"=>$http->request("ac"),"sb"=>"detail","f_id"=>$http->request("f_id","number")]);
+$root="do.php?".http_build_query(["ac"=>$http->request("ac"),"sb"=>"detail","f_id"=>$http->request("f_id","number")]);
 $root.="&".$str_dossier;
 
 $ss_action=$http->request("sc", "string", "dc");
diff --git a/include/category_followup.inc.php b/include/category_followup.inc.php
index da20ee72f..37e9ac803 100644
--- a/include/category_followup.inc.php
+++ b/include/category_followup.inc.php
@@ -40,8 +40,14 @@ $ag_id=$http->request("ag_id","string","0");
 if (! isset($_GET['submit_query'])) {$_REQUEST['closed_action']=1;$_GET['closed_action']=1;}
 
 $p_action=$http->request('ac');
-$base="ac=$p_action&sc=sv&sb=detail&f_id=".$_REQUEST['f_id']."&".HtmlInput::request_to_string(array("closed_action","remind_date_end","remind_date","sag_ref","only_internal","state","gDossier","qcode","ag_dest","query","tdoc","date_start","date_end","hsstate","searchtag","sb","sc"),"");
-$retour=HtmlInput::button_anchor('Retour','?'.dossier::get().'&'.$base);
+$base="do.php?".http_build_query(["ac"=>$p_action,
+                                "sc"=>"sv",
+                                "sb"=>"detail",
+                                "f_id"=>$http->request("f_id","number"),
+                                "gDossier"=>Dossier::id()
+                                ])."&amp;"
+        ;
+$retour=HtmlInput::button_anchor(_('retour'),$base);
 
 $fiche=new Fiche($cn,$http->request("f_id","number"));
 

From 1e574aac74b763a6434a8728e6bdb25d2c830dba Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 12 Oct 2020 18:38:38 +0200
Subject: [PATCH 091/257] Follow-Up create doc new Tags COMMENTS

---
 include/class/document.class.php | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/include/class/document.class.php b/include/class/document.class.php
index 2752d8827..dc029f8d4 100644
--- a/include/class/document.class.php
+++ b/include/class/document.class.php
@@ -548,7 +548,6 @@ class Document
         $p_tag=strtoupper($p_tag);
         $p_tag=str_replace('=','',$p_tag);
         $r="Tag inconnu";
-
         switch ($p_tag)
         {
 		case 'DATE':
@@ -1168,10 +1167,13 @@ class Document
                 if ( ! isset ($p_array['repo'])) return "";
                 $ret=$this->db->get_value('select r_phone from public.stock_repository where r_id=$1',array($p_array['repo']));
                 return $ret;
+        // Follow up
+        //Title
         case 'TITLE':
             if ( isset($p_array['ag_title']))                 return $p_array['ag_title'];
             return "";
             break;
+        // Description
         case 'DESCRIPTION':
             if ( isset($p_array['ag_id'])) {
                 // retrieve first comment
@@ -1183,17 +1185,39 @@ class Document
             }
             return "";
             break;
+        // Comment
         case 'COMMENT':
             if ( isset($p_array['ag_id'])) {
                 // retrieve first comment
-                $aComment=$this->db->get_array("select agc_comment "
+                $description=$this->db->get_array("select agc_comment ,"
+                        . " to_char(agc_date,'DD-MM-YY HH24:MI') as str_date ,"
+                        . " tech_user "
+                        . "  from action_gestion_comment "
+                        . "where ag_id=$1 order by 1 asc limit 2"
+                        ,[$p_array['ag_id']]);
+                if ( count($description) == 2 ) {
+                    return $description[1]['agc_comment'];
+                }
+            }
+            return "";
+            break;
+        // Comments
+        case 'COMMENTS':
+            if ( isset($p_array['ag_id'])) {
+                // retrieve first comment
+                $aComment=$this->db->get_array("select agc_comment ,"
+                        ." to_char(agc_date,'DD-MM-YY HH24:MI') as str_date ,"
+                        . " tech_user "
                         . "  from action_gestion_comment "
                         . "where ag_id=$1 order by 1"
                         ,[$p_array['ag_id']]);
                 $nb_comment=count($aComment);
                 $description="";
                 for ($i=0;$i< $nb_comment;$i++) {
-                    $description.=$aComment[$i]['agc_comment']."\n";
+                    $description.= sprintf(_('le %s , %s écrit %s'."\n"),
+                            $aComment[$i]['str_date'],
+                            $aComment[$i]['tech_user'],
+                            $aComment[$i]['agc_comment']);
                 }
                 return $description;
             }

From f7d4b380bf5d0a265db52e38ea8308c0c2cbf6ea Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 12 Oct 2020 18:38:58 +0200
Subject: [PATCH 092/257] Follow-up new column "Status"

---
 include/class/follow_up.class.php | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index e24b46e97..3c77cbbfc 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -614,14 +614,15 @@ class Follow_Up
         $url=$p_base.$arg;
 
         $table=new Sort_Table();
-        $table->add('Date Doc.', $url, 'order by ag_timestamp asc', 'order by ag_timestamp desc', 'da', 'dd');
-        $table->add('Date Comm.', $url, 'order by last_comment', 'order by last_comment desc', 'dca', 'dcd');
-        $table->add('Date Limite', $url, 'order by ag_remind_date asc', 'order by ag_remind_date  desc', 'ra', 'rd');
-        $table->add('Etiquette', $url, 'order by tags asc', 'order by tags desc', 'taa', 'tad');
-        $table->add('Réf.', $url, 'order by ag_ref asc', 'order by ag_ref desc', 'ra', 'rd');
-        $table->add('Groupe', $url, "order by coalesce((select p_name from profile where p_id=ag_dest),'Aucun groupe')", "order by coalesce((select p_name from profile where p_id=ag_dest),'Aucun groupe') desc", 'dea', 'ded');
-        $table->add('Dest/Exp', $url, 'order by name asc', 'order by name desc', 'ea', 'ed');
-        $table->add('Titre', $url, 'order by ag_title asc', 'order by ag_title desc', 'ta', 'td');
+        $table->add(_('Date Doc.'), $url, 'order by ag_timestamp asc', 'order by ag_timestamp desc', 'da', 'dd');
+        $table->add(_('Date Comm.'), $url, 'order by last_comment', 'order by last_comment desc', 'dca', 'dcd');
+        $table->add(_('Date Limite'), $url, 'order by ag_remind_date asc', 'order by ag_remind_date  desc', 'ra', 'rd');
+        $table->add(_('Etiquette'), $url, 'order by tags asc', 'order by tags desc', 'taa', 'tad');
+        $table->add(_('Réf.'), $url, 'order by ag_ref asc', 'order by ag_ref desc', 'ra', 'rd');
+        $table->add(_('Groupe'), $url, "order by coalesce((select p_name from profile where p_id=ag_dest),'Aucun groupe')", "order by coalesce((select p_name from profile where p_id=ag_dest),'Aucun groupe') desc", 'dea', 'ded');
+        $table->add(_('Dest/Exp'), $url, 'order by name asc', 'order by name desc', 'ea', 'ed');
+        $table->add(_('Titre'), $url, 'order by ag_title asc', 'order by ag_title desc', 'ta', 'td');
+        $table->add(_('Etat'), $url, 'order by s_value asc', 'order by s_value desc', 'ea', 'ed');
 
         $ord=(!isset($_GET['ord']))?"dcd":$_GET['ord'];
         $sort=$table->get_sql_order($ord);
@@ -673,6 +674,7 @@ class Follow_Up
         $r.='<th>'.$table->get_header(6).'</th>';
         $r.='<th>'.$table->get_header(7).'</th>';
         $r.=th('Priorité');
+        $r.='<th>'.$table->get_header(8).'</th>';
         $r.="</tr>";
 
 
@@ -728,7 +730,6 @@ class Follow_Up
             else
                 $r.="<td>$href Interne </a></td>";
 
-            $ref="";
 
 
             $r.='<td>'.$href.
@@ -740,18 +741,18 @@ class Follow_Up
             switch ($row['ag_priority'])
             {
                 case 1:
-                    $priority='Haute';
+                    $priority=_('Haute');
                     break;
                 case 2:
-                    $priority="Moyenne";
+                    $priority=_("Moyenne");
                     break;
                 case 3:
-                    $priority="Important";
+                    $priority=_("Important");
                     break;
             }
             $r.=td($priority);
 
-            $r.="<td>".$ref."</td>";
+            $r.="<td>".$row['s_value']."</td>";
             $r.="</tr>";
         }
 

From 7f87f1974620e33ae37192aea256ee130a7bcd06 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 12 Oct 2020 18:40:57 +0200
Subject: [PATCH 093/257] =?UTF-8?q?typo=20:=20tag=20=20instead=20of=20?=
 =?UTF-8?q?=C3=A9tiquette?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 3c77cbbfc..3964b556f 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -1510,7 +1510,7 @@ class Follow_Up
         if ($g_user->can_write_action($this->ag_id)==true)
         {
             $js=sprintf("onclick=\"action_tag_select('%s','%s')\"", dossier::id(), $this->ag_id);
-            echo HtmlInput::button('tag_bt', 'Ajout tag', $js, 'smallbutton');
+            echo HtmlInput::button('tag_bt', _('Ajout étiquette'), $js, 'smallbutton');
         }
     }
 

From da861b5e6a5ae443ea3225ac829b5fe9a1f8c89a Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 13 Oct 2020 13:12:50 +0200
Subject: [PATCH 094/257] fix : select_box search doesn't work

---
 include/lib/select_box.class.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/lib/select_box.class.php b/include/lib/select_box.class.php
index 396d416f9..8d3cceac7 100644
--- a/include/lib/select_box.class.php
+++ b/include/lib/select_box.class.php
@@ -107,22 +107,22 @@ class Select_Box
                         try {
                           
                             
-                            if (! document.getElementById("select_box_content") ) {
+                            if (! document.getElementById("select_box%s") ) {
                             
                                 var newDiv=new Element("div");
-                                newDiv.id="select_box_content";
+                                newDiv.id="select%s";
                                 document.body.appendChild(newDiv);
                                 newDiv.addClassName("select_box");
-                                $("select_box_content").onmouseleave=function() {
+                                $("select_box%s").onmouseleave=function() {
                                         try {
-                                           var newDiv=$("select_box_content");
+                                           var newDiv=$("select_box%s");
                                            newDiv.setStyle({display:"none"});
                                         } catch(e) {
                                              alert(e.message);
                                         }
                                        }
                             } else {
-                                 var newDiv=document.getElementById("select_box_content");
+                                 var newDiv=document.getElementById("select_box%s");
                             }
                             newDiv.innerHTML=$("select_box%s").innerHTML;
                             var pos=$("%s_bt").cumulativeOffset();
@@ -137,7 +137,7 @@ class Select_Box
                              alert(e.message);
                         }
                        }
-                        ', $this->id, $this->id, $this->id, $list_id, $list_id);
+                        ', $this->id,$this->id,$this->id,$this->id,$this->id, $this->id, $this->id, $this->id,$list_id, $list_id);
                
                         break;
             

From 88290a9288120080cbba2d05a50f6b0c8de0c4b1 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 13 Oct 2020 13:13:49 +0200
Subject: [PATCH 095/257] Cosmetic

---
 html/style-classic.css        |  4 ++
 html/style-classic7.css       |  7 +++-
 html/style-light.css          |  4 ++
 include/action.common.inc.php | 76 +++++++++++++++++++++++++++--------
 4 files changed, 74 insertions(+), 17 deletions(-)

diff --git a/html/style-classic.css b/html/style-classic.css
index e163c16e4..95be1394b 100644
--- a/html/style-classic.css
+++ b/html/style-classic.css
@@ -2448,3 +2448,7 @@ span.tagcell {
     color:black;
         
 }    
+#action_add_action2_list {
+    height:15rem;
+    overflow: auto;
+}
\ No newline at end of file
diff --git a/html/style-classic7.css b/html/style-classic7.css
index abbbcc316..09d256ea9 100644
--- a/html/style-classic7.css
+++ b/html/style-classic7.css
@@ -2481,4 +2481,9 @@ span.tagcell {
     border:1px solid darkblue;
     padding:3px;margin:1px;
     display: inline-block;
-}    
\ No newline at end of file
+}    
+
+#action_add_action2_list {
+    height:15rem;
+    overflow: auto;
+}
\ No newline at end of file
diff --git a/html/style-light.css b/html/style-light.css
index 8384b90c1..096ffc179 100644
--- a/html/style-light.css
+++ b/html/style-light.css
@@ -2381,3 +2381,7 @@ span.tagcell {
     display: inline-block;
     color:black;
 }    
+#action_add_action2_list {
+    height:15rem;
+    overflow: auto;
+}
\ No newline at end of file
diff --git a/include/action.common.inc.php b/include/action.common.inc.php
index 257915c3e..48b16e7be 100644
--- a/include/action.common.inc.php
+++ b/include/action.common.inc.php
@@ -30,6 +30,7 @@
  *
  */
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
+require_once NOALYSS_INCLUDE."/lib/select_box.class.php";
 $http=new HttpInput();
 $supl_hidden = '';
 if (isset($_REQUEST['sc']))
@@ -157,9 +158,9 @@ if ($sub_action == "update")
 	//----------------------------------------------------------------------
 	// Add a related action
 	//----------------------------------------------------------------------
-	if (isset($_POST['add_action_here']))
+	if (isset($_GET['add_action_here']))
 	{   
-                $ag_id=$http->post('ag_id',"number");
+                $ag_id=$http->get('ag_id',"number");
 		$act = new Follow_Up($cn,$ag_id);
                 if ($g_user->can_write_action($act->ag_id) == FALSE )
 		{
@@ -168,24 +169,37 @@ if ($sub_action == "update")
 			echo '</div>';
 			return;
 		}
-
-		//----------------------------------------
+                        //----------------------------------------
 		// puis comme ajout normal (copier / coller )
 		$act->ag_id = 0;
 		$act->d_id = 0;
-		$act->action = $http->post('ag_id',"number");
+		$act->action = $ag_id;
                 $act->ag_timestamp=date('d.m.Y');
+                $act->ag_dest=$g_user->get_profile();
                 $act->ag_hour="";
                 $act->ag_title="";
                 $act->ag_remind_date="";
+                $act->dt_id = $http->request("action_type","number");
+                $act->d_id = 0;
+                $act->ag_comment = "";
+                $act->qcode_dest="";
+                if (isset($_REQUEST['qcode'])){
+			$act->qcode_dest = $http->request ('qcode');
+                } else {
+                    // Retrieve recipient of previous followup-action
+                    $act->qcode_dest=$cn->get_value("select ad_value from action_gestion ag join fiche_detail fd
+                             on (fd.f_id=ag.f_id_dest)  where ag_id=$1 and ad_id=$2",
+                            [$ag_id,ATTR_DEF_QUICKCODE ]);
+                }
+                $act->f_id_dest=$act->qcode_dest;
+                $act->save();
 		echo '<div class="content">';
 
 		// Add hidden tag
 		echo '<form  enctype="multipart/form-data" action="do.php" method="post"">';
 
-		$act->ag_comment = "";
-		if (isset($_REQUEST['qcode_dest']))
-			$act->qcode_dest = $_REQUEST['qcode_dest'];
+		
+		
 		echo $act->Display('NEW', false, $base, $retour);
 
 		echo '<input type="hidden" name="ac" value="' . $http->request('ac') . '">';
@@ -195,6 +209,7 @@ if ($sub_action == "update")
 		echo $supl_hidden;
 		echo '</form>';
 		echo '</div>';
+                return;
 	}
 }
 //--------------------------------------------------------------------------------
@@ -222,7 +237,27 @@ if ($sub_action == 'detail')
             echo '<input type="hidden" name="sa" value="update">';
             echo '<input type="hidden" id="delete" name="delete" value="0">';
             echo HtmlInput::submit("save", "Sauve",' onclick="$(\'delete\').value=0"');
-            echo HtmlInput::submit("add_action_here", _("Ajoute un événement à celui-ci"),' onclick="$(\'delete\').value=0"');
+            
+            // Create select box for new Action
+            $selbox=new Select_Box("action_add_action2", _("Ajout action"));
+            $selbox->set_position("in-absolute");
+            $selbox->set_filter("y");
+            $aDocumentType=$cn->get_array("select dt_id,dt_value from document_type order by 2");
+            $nbDocumentType=count($aDocumentType);
+            $ac=$http->request("ac");
+            $dossier_id=Dossier::id();
+            $sup_parameter=HtmlInput::array_to_string(["sc","sb","f_id","qcode"], $_REQUEST,"&amp;");
+            for ($i=0;$i<$nbDocumentType;$i++) {
+                $selbox->add_url($aDocumentType[$i]['dt_value'], 
+                                "do.php?".http_build_query([ "ac"=>$ac,
+                                "gDossier"=>$dossier_id,
+                                "sa"=>"update",
+                                "add_action_here"=>"yes",
+                                "ag_id"=>$ag_id,
+                                "action_type"=>$aDocumentType[$i]["dt_id"]]).$sup_parameter);
+    
+            }
+            echo $selbox->input();
             
             // 
             if ($g_user->can_delete_action($ag_id))
@@ -291,15 +326,18 @@ if ($sub_action == "save_action_st2")
 	$act->md_id = (isset($_POST['gen_doc'])) ? $_POST['gen_doc'] : 0;
 
         $act->verify();
-        
+        $sup_parameter=HtmlInput::array_to_string(["sc","sb","f_id","qcode"], $_REQUEST,"&amp;");
 	// insert into action_gestion
-	echo $act->update();
-	$url = "?$base&sa=detail&ag_id=" . $act->ag_id . '&' . dossier::get();
-	echo '<p><a class="mtitle" href="' . $url . '">' . hb(_('Evènement Sauvée').'  : ' . $act->ag_ref) . '</a></p>';
+	$act->update();
+        
+	$url = "?sa=detail&ag_id=" . $act->ag_id . '&' . dossier::get()."&ac=".$http->request("ac").
+                $sup_parameter;
+	echo '<p><a class="mtitle" href="' . $url . '">' . hb(_('Action Sauvée').'  : ' . $act->ag_ref) . '</a></p>';
 
 	Follow_Up::show_action_list($cn,$base);
-	$url = "?$base&sa=detail&ag_id=" . $act->ag_id . '&' . dossier::get();
-	echo '<p><a class="mtitle" href="' . $url . '">' . hb(_('Evènement Sauvée').'  : ' . $act->ag_ref) . '</a></p>';
+	$url = "?sa=detail&ag_id=" . $act->ag_id . '&' . dossier::get()."&ac=".$http->request("ac").
+                $sup_parameter;
+	echo '<p><a class="mtitle" href="' . $url . '">' . hb(_('Action Sauvée').'  : ' . $act->ag_ref) . '</a></p>';
     } catch (Exception $e)
     {
         echo '<span class="notice">';
@@ -318,7 +356,13 @@ if ($sub_action == "add_action")
 	$act->fromArray($_POST);
 	$act->dt_id = $http->request("action_type","number");
 	$act->d_id = 0;
+        $f_id_dest=$http->request("f_id","number",null); 
+        if ( $f_id_dest != NULL ) {
+            $act->qcode_dest=$cn->get_value("select ad_value from fiche_detail where ad_id=$1 and f_id=$2",
+                    [ATTR_DEF_QUICKCODE,$f_id_dest]);
+        }
 	$act->save();
+        
 	echo '<div class="content">';
 	// Add hidden tag
 	echo '<form method="post" action="do.php" name="form_add" id="form_add" enctype="multipart/form-data" >';
@@ -328,7 +372,7 @@ if ($sub_action == "add_action")
 
 	$act->ag_comment =Decode($http->post("ag_comment","string",""));
 	if (isset($_REQUEST['qcode']))
-		$act->qcode_dest = $_REQUEST['qcode'];
+		$act->qcode_dest = $http->request('qcode');
 	echo $act->Display('NEW', false, $base, $retour);
 
 	echo '<input type="hidden" name="ac" value="' . $http->request("ac") . '">';

From fd8811cafd3337df4b7494a664ac95d7d2e4030c Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 13 Oct 2020 13:14:33 +0200
Subject: [PATCH 096/257] Fix : generate document remove "extract"

---
 include/class/document.class.php | 216 +++++++++++++++----------------
 1 file changed, 108 insertions(+), 108 deletions(-)

diff --git a/include/class/document.class.php b/include/class/document.class.php
index dc029f8d4..3a863f183 100644
--- a/include/class/document.class.php
+++ b/include/class/document.class.php
@@ -550,11 +550,11 @@ class Document
         $r="Tag inconnu";
         switch ($p_tag)
         {
-		case 'DATE':
-			$r=(isset ($p_array['ag_timestamp']))?$p_array['ag_timestamp']:$p_array['e_date'];
-			break;
+            case 'DATE':
+                    $r=(isset ($p_array['ag_timestamp']))?$p_array['ag_timestamp']:$p_array['e_date'];
+                    break;
         case 'DATE_CALC':
-                $r=' Date inconnue ';
+                $r=' ';
             // Date are in $p_array['ag_date']
             // or $p_array['e_date']
             if ( isset ($p_array['ag_timestamp'])) {
@@ -565,6 +565,7 @@ class Document
                 $date=format_date($p_array['e_date'],'DD.MM.YYYY','YYYY-MM-DD');
                 $r=$date;
             }
+            return $r;
             break;
             //
             //  the company priv
@@ -822,16 +823,21 @@ class Document
              */
         case 'DATE_LIMIT_CALC':
             if ( isset ($p_array["e_ech"] )) 
+                    return format_date($p_array["e_ech"],'DD.MM.YYYY','YYYY-MM-DD');
+            if ( isset ($p_array["ech"] )) 
                     return format_date($p_array["ech"],'DD.MM.YYYY','YYYY-MM-DD');
             if ( isset ($p_array["ag_remind_date"] )) 
                     return format_date($p_array["ag_remind_date"],'DD.MM.YYYY','YYYY-MM-DD');
-            
+            return "";
                 break;
       case 'DATE_LIMIT':
-         if ( isset ($p_array["e_ech"] )) 
+              if ( isset ($p_array["ech"] )) 
                     return $p_array["ech"];
+             if ( isset ($p_array["e_ech"] )) 
+                    return $p_array["e_ech"];
             if ( isset ($p_array["ag_remind_date"] )) 
                     return $p_array["ag_remind_date"];
+            return "";
             break;
         case 'MARCH_NEXT':
             $this->counter++;
@@ -839,109 +845,108 @@ class Document
             break;
 
         case 'VEN_ART_NAME':
-            extract ($p_array, EXTR_SKIP);
-            $id='e_march'.$this->counter;
             // check if the march exists
-            if ( ! isset (${$id})) return "";
+            if ( ! isset ($p_array["e_march".$this->counter])) return "";
             // check that something is sold
-            if ( ${'e_march'.$this->counter.'_price'} != 0 && ${'e_quant'.$this->counter} != 0 )
+            if ( $p_array['e_march'.$this->counter.'_price'] != 0 && $p_array['e_quant'.$this->counter] != 0 )
             {
                 $f=new Fiche($this->db);
-                $f->get_by_qcode(${$id},false);
+                $f->get_by_qcode($p_array["e_march".$this->counter],false);
                 $r=$f->strAttribut(ATTR_DEF_NAME);
             }
             else $r = "";
             break;
        case 'VEN_ART_LABEL':
-            extract ($p_array, EXTR_SKIP);
             $id='e_march'.$this->counter."_label";
             // check if the march exists
 
-            if (! isset (${$id}) || (isset (${$id}) && strlen(trim(${$id})) == 0))
+            if (! isset ($p_array[$id]) || (isset ($p_array[$id]) && strlen(trim($p_array[$id])) == 0))
                 {
                     $id = 'e_march' . $this->counter;
                     // check if the march exists
-                    if (!isset(${$id}))
+                    if (!isset($p_array[$id]))
                         $r= "";
                     else 
                     {
                     // check that something is sold
-                        if (${'e_march' . $this->counter . '_price'} != 0 && ${'e_quant' . $this->counter} != 0)
+                        if ($p_array['e_march'.$this->counter. '_price'] != 0 
+                                && $p_array['e_quant' . $this->counter] != 0)
                         {
                             $f = new Fiche($this->db);
-                            $f->get_by_qcode(${$id}, false);
+                            $f->get_by_qcode($p_array[$id], false);
                             $r = $f->strAttribut(ATTR_DEF_NAME);
                         } else
                             $r = "";
                     }
                 }
                 else
-                    $r=${'e_march'.$this->counter.'_label'};
+                    $r=$p_array[$id];
             break;
         case 'VEN_ART_STOCK_CODE':
-            extract ($p_array, EXTR_SKIP);
                     $id = 'e_march' . $this->counter;
                     // check if the march exists
-                    if (!isset(${$id}))
+                    if (!isset($p_array[$id]))
                         $r= "";
                     else 
                     {
                     // check that something is sold
-                        if (${'e_march' . $this->counter . '_price'} != 0 && ${'e_quant' . $this->counter} != 0)
+                        if ($p_array['e_march' . $this->counter . '_price'] != 0 
+                                && $p_array['e_quant' . $this->counter] != 0)
                         {
                             $f = new Fiche($this->db);
-                            $f->get_by_qcode(${$id}, false);
+                            $f->get_by_qcode($p_array[$id], false);
                             $r = $f->strAttribut(ATTR_DEF_STOCK);
                             $r=($r == NOTFOUND)?'':$r;
                         } 
                     }
             break;
+        case 'VEN_QCODE':
+            $id='e_march'.$this->counter ;
+            if ( !isset ($p_array[$id]) ) return "";
+            return $p_array[$id];
+            break;
         case 'VEN_ART_PRICE':
-            extract ($p_array, EXTR_SKIP);
             $id='e_march'.$this->counter.'_price' ;
-            if ( !isset (${$id}) ) return "";
-			if (${$id} == 0 ) return "";
-            $r=${$id};
+            if ( !isset ($p_array[$id]) ) return "";
+			if ( $p_array[$id]  == 0 ) return "";
+            $r=$p_array[$id];
             break;
 
         case 'TVA_RATE':
         case 'VEN_ART_TVA_RATE':
-            extract ($p_array, EXTR_SKIP);
             $id='e_march'.$this->counter.'_tva_id';
-            if ( !isset (${$id}) ) return "";
-            if ( ${$id} == -1 || ${$id}=='' ) return "";
+            if ( !isset ($p_array[$id]) ) return "";
+            if ( $p_array[$id] == -1 || $p_array[$id]=='' ) return "";
             $march_id='e_march'.$this->counter.'_price' ;
-            if ( ! isset (${$march_id})) return '';
+            if ( ! isset ($p_array[$march_id])) return '';
             $tva=new Acc_Tva($this->db);
-            $tva->set_parameter("id",${$id});
+            $tva->set_parameter("id",$p_array[$id]);
             if ( $tva->load() == -1) return '';
             return $tva->get_parameter("rate");
             break;
 
         case 'TVA_CODE':
         case 'VEN_ART_TVA_CODE':
-            extract ($p_array, EXTR_SKIP);
             $id='e_march'.$this->counter.'_tva_id';
-            if ( !isset (${$id}) ) return "";
-            if ( ${$id} == -1 ) return "";
+            if ( !isset ($p_array[$id]) ) return "";
+            if ( $p_array[$id] == -1 ) return "";
             $qt='e_quant'.$this->counter;
             $price='e_march'.$this->counter.'_price' ;
-            if ( ${$price} == 0 || ${$qt} == 0
-                    || strlen(trim( $price )) ==0
-                    || strlen(trim($qt)) ==0)
+            if ( $p_array[$price] == 0 || $p_array[$qt] == 0
+                    || strlen(trim( $p_array[$price] )) ==0
+                    || strlen(trim($p_array[$qt])) ==0)
                 return "";
 
-            $r=${$id};
+            $r=$p_array[$id];
             break;
 
         case 'TVA_LABEL':
-            extract ($p_array, EXTR_SKIP);
             $id='e_march'.$this->counter.'_tva_id';
-            if ( !isset (${$id}) ) return "";
+            if ( !isset ($p_array[$id]) ) return "";
             $march_id='e_march'.$this->counter.'_price' ;
-            if ( ! isset (${$march_id})) return '';
-            if ( ${$march_id} == 0) return '';
-            $tva=new Acc_Tva($this->db,${$id});
+            if ( ! isset ($p_array[$march_id])) return '';
+            if ( $p_array[$march_id] == 0) return '';
+            $tva=new Acc_Tva($this->db,$p_array[$id]);
             if ($tva->load() == -1 ) return "";
             $r=$tva->get_parameter('label');
 
@@ -950,131 +955,126 @@ class Document
             /* total VAT for one sold */
         case 'TVA_AMOUNT':
         case 'VEN_TVA':
-            extract ($p_array, EXTR_SKIP);
             $qt='e_quant'.$this->counter;
             $price='e_march'.$this->counter.'_price' ;
             $tva='e_march'.$this->counter.'_tva_id';
             /* if we do not use vat this var. is not set */
-            if ( !isset(${$tva}) ) return '';
-            if ( !isset (${'e_march'.$this->counter}) ) return "";
-             if ( !isset (${$tva}) ) return "";
+            if ( !isset($p_array[$tva]) ) return '';
+            if ( !isset ($p_array [ 'e_march'.$this->counter ]) ) return "";
+             if ( !isset ($p_array[$tva]) ) return "";
             // check that something is sold
-            if ( ${$price} == 0 || ${$qt} == 0
-                    || strlen(trim( $price )) ==0
-                    || strlen(trim($qt)) ==0)
+            if ( $p_array[$price] == 0 || $p_array[$qt] == 0
+                    || strlen(trim( $p_array[$price] )) ==0
+                    || strlen(trim($p_array[$qt])) ==0)
                 return "";
-            $r=${'e_march'.$this->counter.'_tva_amount'};
+            $r=$p_array['e_march'.$this->counter.'_tva_amount'];
             break;
             /* TVA automatically computed */
         case 'VEN_ART_TVA':
         
-            extract ($p_array, EXTR_SKIP);
             $qt='e_quant'.$this->counter;
             $price='e_march'.$this->counter.'_price' ;
             $tva='e_march'.$this->counter.'_tva_id';
-            if ( !isset (${'e_march'.$this->counter}) ) return "";
-            if ( !isset (${$tva}) ) return "";
+            if ( !isset ($p_array['e_march'.$this->counter]) ) return "";
+            if ( !isset ($p_array[$tva]) ) return "";
             // check that something is sold
-            if ( ${$price} == 0 || ${$qt} == 0
-                    || strlen(trim( $price )) ==0
-                    || strlen(trim($qt)) ==0)
+            if ( $p_array[$price] == 0 || $p_array[$qt] == 0
+                    || strlen(trim( $p_array[$price] )) ==0
+                    || strlen(trim($p_array[$qt])) ==0)
                 return "";
-            $oTva=new Acc_Tva($this->db,${$tva});
+            $oTva=new Acc_Tva($this->db,$p_array[$tva]);
             if ($oTva->load() == -1 ) return "";
-            $r=round(${$price},2)*$oTva->get_parameter('rate');
+            $r=round($p_array[$price],2)*$oTva->get_parameter('rate');
             $r=round($r,2);
             break;
 
         case 'VEN_ART_TVAC':
-            extract ($p_array, EXTR_SKIP);
             $qt='e_quant'.$this->counter;
             $price='e_march'.$this->counter.'_price' ;
-            $tva='e_march'.$this->counter.'_tva_id';
-            if ( !isset (${'e_march'.$this->counter}) ) return "";
-             if ( !isset (${$tva}) ) return "";
+            if ( !isset ($p_array['e_march'.$this->counter]) ) return "";
+             if ( !isset ($p_array['e_march'.$this->counter.'_tva_id']) ) return "";
             // check that something is sold
-            if ( ${$price} == 0 || ${$qt} == 0
-                    || strlen(trim( $price )) ==0
-                    || strlen(trim($qt)) ==0)
+            if ( $p_array[$price] == 0 || $p_array[$qt] == 0
+                    || strlen(trim( $p_array[$price] )) ==0
+                    || strlen(trim($p_array[$qt])) ==0)
                 return "";
-            if ( ! isset (${$tva}) ) return '';
-            $tva=new Acc_Tva($this->db,${$tva});
+            if ( ! isset ($p_array['e_march'.$this->counter.'_tva_id']) ) return '';
+            $tva=new Acc_Tva($this->db,$p_array['e_march'.$this->counter.'_tva_id'] );
             if ($tva->load() == -1 )
             {
-                $r=round(${$price},2);
+                $r=round($p_array[$price],2);
             }
             else
             {
-                $r=round(${$price}*$tva->get_parameter('rate')+${$price},2);
+                $r=round($p_array[$price]*$tva->get_parameter('rate')+$p_array[$price],2);
             }
 
             break;
 
         case 'VEN_ART_QUANT':
-            extract ($p_array, EXTR_SKIP);
             $id='e_quant'.$this->counter;
-            if ( !isset (${$id}) ) return "";
+            if ( !isset ($p_array[$id]) ) return "";
             // check that something is sold
-            if ( ${'e_march'.$this->counter.'_price'} == 0
-                    || ${'e_quant'.$this->counter} == 0
-                    || strlen(trim( ${'e_march'.$this->counter.'_price'} )) ==0
-                    || strlen(trim(${'e_quant'.$this->counter})) ==0 )
+            if ( $p_array['e_march'.$this->counter.'_price'] == 0
+                    || $p_array['e_quant'.$this->counter] == 0
+                    || strlen(trim( $p_array['e_march'.$this->counter.'_price'] )) ==0
+                    || strlen(trim($p_array['e_quant'.$this->counter])) ==0 )
                 return "";
-            $r=${$id};
+            $r=$p_array[$id];
             break;
 
         case 'VEN_HTVA':
-            extract ($p_array, EXTR_SKIP);
             $id='e_march'.$this->counter.'_price' ;
             $quant='e_quant'.$this->counter;
-            if ( !isset (${$id}) ) return "";
+            if ( !isset ($p_array[$id]) ) return "";
 
             // check that something is sold
-            if ( ${'e_march'.$this->counter.'_price'} == 0 || ${'e_quant'.$this->counter} == 0
-                    || strlen(trim( ${'e_march'.$this->counter.'_price'} )) ==0
-                    || strlen(trim(${'e_quant'.$this->counter})) ==0)
+            if ( $p_array['e_march'.$this->counter.'_price'] == 0 || $p_array['e_quant'.$this->counter] == 0
+                    || strlen(trim( $p_array['e_march'.$this->counter.'_price'] )) ==0
+                    || strlen(trim($p_array['e_quant'.$this->counter])) ==0)
                 return "";
 			bcscale(4);
-            $r=bcmul(${$id},${$quant});
+            $r=bcmul($p_array[$id],$p_array[$quant]);
 			$r=round($r,2);
             break;
 
         case 'VEN_TVAC':
-            extract ($p_array, EXTR_SKIP);
             $id='e_march'.$this->counter.'_tva_amount' ;
             $price='e_march'.$this->counter.'_price' ;
             $quant='e_quant'.$this->counter;
-            if ( ! isset(${'e_march'.$this->counter.'_price'})|| !isset(${'e_quant'.$this->counter}))     return "";
+            if ( ! isset($p_array['e_march'.$this->counter.'_price'])|| !isset($p_array['e_quant'.$this->counter])) {
+                return "";
+            }
             // check that something is sold
-            if ( ${'e_march'.$this->counter.'_price'} == 0 || ${'e_quant'.$this->counter} == 0 ) return "";
+            if ( $p_array['e_march'.$this->counter.'_price'] == 0 || $p_array['e_quant'.$this->counter] == 0 ) { return "";}
 			bcscale(4);
             // if TVA not exist
-            if ( ! isset(${$id}))
-                $r=  bcmul(${$price},${$quant});
+            if ( ! isset($p_array[$id]))
+                $r=  bcmul($p_array[$price],$p_array[$quant]);
             else{
-                $r=  bcmul(${$price},${$quant});
-                $r=bcadd($r,${$id});
+                $r=  bcmul($p_array[$price],$p_array[$quant]);
+                $r=bcadd($r,$p_array[$id]);
 			}
 			$r=round($r,2);
 			return $r;
             break;
 
         case 'TOTAL_VEN_HTVA':
-            extract($p_array, EXTR_SKIP);
-			bcscale(4);
+            bcscale(4);
             $sum=0.0;
-            for ($i=0;$i<$nb_item;$i++)
+            if ( !isset($p_array["nb_item"]) ) return "";
+            for ($i=0;$i<$p_array["nb_item"];$i++)
             {
                 $sell='e_march'.$i.'_price';
                 $qt='e_quant'.$i;
 
-                if ( ! isset (${$sell}) ) break;
+                if ( ! isset ($p_array[$sell]) ) break;
 
-                if ( strlen(trim(${$sell})) == 0 ||
-                        strlen(trim(${$qt})) == 0 ||
-                        ${$qt}==0 || ${$sell}==0)
+                if ( strlen(trim($p_array[$sell])) == 0 ||
+                        strlen(trim($p_array[$qt])) == 0 ||
+                        $p_array[$qt]==0 || $p_array[$sell]==0)
                     continue;
-                $tmp1=bcmul(${$sell},${$qt});
+                $tmp1=bcmul($p_array[$sell],$p_array[$qt]);
                 $sum=bcadd($sum,$tmp1);
 
 
@@ -1082,20 +1082,20 @@ class Document
             $r=round($sum,2);
             break;
         case 'TOTAL_VEN_TVAC':
-            extract($p_array, EXTR_SKIP);
+            if ( !isset($p_array["nb_item"]) ) return "";
             $sum=0.0;
-			bcscale(4);
-            for ($i=0;$i<$nb_item;$i++)
+            bcscale(4);
+            for ($i=0;$i<$p_array["nb_item"];$i++)
             {
                 $tva='e_march'.$i.'_tva_amount';
                 $tva_amount=0;
                 /* if we do not use vat this var. is not set */
-                if ( isset(${$tva}) )
+                if ( isset($p_array[$tva]) )
                 {
-                    $tva_amount=${$tva};
+                    $tva_amount=$p_array[$tva];
                 }
-                $sell=${'e_march'.$i.'_price'};
-                $qt=${'e_quant'.$i};
+                $sell=$p_array['e_march'.$i.'_price'];
+                $qt=$p_array['e_quant'.$i];
                 $tot=bcmul($sell,$qt);
                 $tot=bcadd($tot,$tva_amount);
                 $sum=bcadd($sum,$tot);
@@ -1104,14 +1104,14 @@ class Document
 
             break;
         case 'TOTAL_TVA':
-            extract($p_array, EXTR_SKIP);
+            if ( !isset($p_array["nb_item"]) ) return "";
             $sum=0.0;
-            for ($i=0;$i<$nb_item;$i++)
+            for ($i=0;$i<$p_array["nb_item"];$i++)
             {
                 $tva='e_march'.$i.'_tva_amount';
-                if (! isset(${$tva})) $tva_amount=0.0;
+                if (! isset($p_array[$tva])) $tva_amount=0.0;
                 else {
-                    $tva_amount=${$tva};
+                    $tva_amount=$p_array[$tva];
                     $tva_amount=($tva_amount=="")?0:$tva_amount;
                 }
                 $sum+=$tva_amount;

From 37cfa14491e1d2da75d009d9eec00068bf92bed0 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 13 Oct 2020 13:14:49 +0200
Subject: [PATCH 097/257] Follow up add followup action

---
 include/class/follow_up.class.php  |  8 ++---
 include/template/action_button.php | 47 ++++++++++++------------------
 2 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 3964b556f..c7f91027b 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -517,8 +517,7 @@ class Follow_Up
     function save()
     {
 
-        // Get The sequence id,
-        $seq_name="seq_doc_type_".$this->dt_id;
+       
         $str_file="";
         $add_file='';
 
@@ -538,6 +537,8 @@ class Follow_Up
             $this->ag_title=$doc_mod->dt_value;
         }
         $this->ag_id=$this->db->get_next_seq('action_gestion_ag_id_seq');
+         // Get The sequence id,
+        $seq_name="seq_doc_type_".$this->dt_id;
 
         // Create the reference
         $ag_ref=$this->db->get_value('select dt_prefix from document_type where dt_id=$1', array($this->dt_id)).'-'.$this->db->get_next_seq($seq_name);
@@ -564,7 +565,7 @@ class Follow_Up
             $this->dt_id, /* 3 */
             $this->ag_title, /* 4 */
             $exp->id, /* 5 */
-            $ag_ref, /* 6 */
+            $this->ag_ref, /* 6 */
             $this->ag_dest, /* 7 */
             $this->ag_hour, /* 8 */
             $this->ag_priority, /* 9 */
@@ -797,7 +798,6 @@ class Follow_Up
         $old=new Follow_Up($this->db);
         $old->ag_id=$this->ag_id;
         $old->get();
-
         // If ag_ref changed then check if unique
         if ($old->ag_ref!=$this->ag_ref)
         {
diff --git a/include/template/action_button.php b/include/template/action_button.php
index 04a621d3c..1aa348b3c 100644
--- a/include/template/action_button.php
+++ b/include/template/action_button.php
@@ -26,39 +26,28 @@
  * @brief show button in the list of actions
  *
  */
+require_once NOALYSS_INCLUDE."/lib/select_box.class.php";
 $http=new HttpInput();
+// Create select box for new Action
+$selbox=new Select_Box(uniqid(), _("Ajout action"));
+$selbox->set_position("normal");
+$selbox->set_filter("yes");
+$aDocumentType=$cn->get_array("select dt_id,dt_value from document_type order by 2");
+$nbDocumentType=count($aDocumentType);
+$ac=$http->request("ac");
+$dossier_id=Dossier::id();
+$sup_parameter=HtmlInput::array_to_string(["sc","sb","f_id","qcode"], $_REQUEST,"&amp;");
+for ($i=0;$i<$nbDocumentType;$i++) {
+    $selbox->add_url($aDocumentType[$i]['dt_value'], 
+            "do.php?".http_build_query([ "ac"=>$ac,"gDossier"=>$dossier_id,"sa"=>"add_action"
+                    ,"action_type"=>$aDocumentType[$i]["dt_id"]]).$sup_parameter);
+    
+}
 ?>
 <div class="content" style="display:inline" >
 	<div style="display:inline">
             <input id="bt_search" type="button" class="smallbutton" onclick="$('search_action').style.display='block'" value="<?php echo _('Recherche') ?>">
-            <input id="bt_add" type="button" class="smallbutton" onclick="$('b_add_action').style.display='block';document.getElementById('action_type').focus()" value="<?php echo _('Ajout') ?>">
-            <div id="b_add_action" style="display:none" class="inner_box">
-                <?php echo HtmlInput::title_box(_("Ajout d'une action"), "b_add_action","hide");?>
-		<form  method="get" style="display:inline" action="do.php">
-			<?php echo dossier::hidden();
-                        $a_typeAction=new ISelect("action_type");
-                        $a_typeAction->rowsize=10;
-                        $a_typeAction->value=$cn->make_array("select dt_id,dt_value from document_type order by 2");
-                        echo _("Type action ");
-                        echo $a_typeAction->input();
-			?>
-                        
-			<input type="hidden" name="ac" value="<?php echo  $http->request('ac')?>">
-			<input type="hidden" name="sa" value="add_action">
-			<?php echo  $supl_hidden?>
-                    <ul class="aligned-block">
-                        <li>
-                            
-			<input type="submit" class="smallbutton" name="submit_query" value="<?php echo  _("Ajout Action")?>">
-                        </li>
-                        <li>
-                            <?php echo HtmlInput::button_hide("b_add_action");?>
-                        </li>
-                    </ul>
-
-                        
-
-		</form>
-            </div>
+            <?=$selbox->input();?>
+         
 	</div>
 </div>    
\ No newline at end of file

From 410699d8f3f5f94b9b4e6167ec56050d435d058e Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 13 Oct 2020 13:35:27 +0200
Subject: [PATCH 098/257] Upgrade DB 147

---
 include/constant.php             |  2 +-
 include/sql/patch/upgrade147.sql | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 include/sql/patch/upgrade147.sql

diff --git a/include/constant.php b/include/constant.php
index 8168e6b2b..07b2dce1c 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -107,7 +107,7 @@ if ( !defined ("NOALYSS_PACKAGE_REPOSITORY")) {
 if ( ! defined ("SYSINFO_DISPLAY")) {
     define ("SYSINFO_DISPLAY",TRUE);
 }
-define ("DBVERSION",147);
+define ("DBVERSION",148);
 define ("MONO_DATABASE",25);
 define ("DBVERSIONREPO",18);
 define ('NOTFOUND','--not found--');
diff --git a/include/sql/patch/upgrade147.sql b/include/sql/patch/upgrade147.sql
new file mode 100644
index 000000000..b2fc79c54
--- /dev/null
+++ b/include/sql/patch/upgrade147.sql
@@ -0,0 +1,21 @@
+begin;
+INSERT INTO public.document_option (do_code, document_type_id, do_enable, do_option) select 'detail_operation', dt_id, 1, 
+case when dt_id in (2,3,4,5,21) then 'VEN' else 'ACH' end  do_option
+from document_type 
+where 
+not exists (select 1 from document_option where document_type_id in (2,3,4,5,10,20) and do_code='detail_operation' )
+and dt_id in (2,3,4,5,10,20,21);
+
+
+INSERT INTO public.document_option (do_code, document_type_id, do_enable, do_option) select  'contact_multiple',dt_id , 1, NULL
+from document_type where 
+not exists (select 1 from document_option where document_type_id in (2,3,4,5,10,20) and do_code='contact_multiple' );
+
+INSERT INTO public.document_option (do_code, document_type_id, do_enable, do_option) select 'make_invoice', dt_id, 1, NULL
+from document_type 
+where 
+not exists (select 1 from document_option where document_type_id in (2,4) and do_code='make_invoice' )
+and dt_id in (2,4);
+
+insert into version (val,v_description) values (148,'Default values for document_option');
+commit;

From b298a4a3bbde68d3eba0b1e13912f5c560c970ff Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 13 Oct 2020 13:45:29 +0200
Subject: [PATCH 099/257] Notice

---
 include/class/follow_up.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index c7f91027b..0a738ee71 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -83,7 +83,7 @@ class Follow_Up
     var $ag_dest;  /*!< $ag_dest person who is in charged */
     var $ag_contact;  /*!< $ag_contact contact */
     var $ag_remind_date;  /*!< $ag_contact contact */
-
+    var $f_id_dest ; /*!< followup action recipient */
     /**
      * @brief $operation string related operation
      */
@@ -108,6 +108,7 @@ class Follow_Up
         $this->operation="";
         $this->action="";
         $this->f_dest_id=0;
+        $this->f_id_dest=0;
     }
     /**
      * Create a filter based on the current user, 

From 2a0054639dc1ea1ac32235c74359ebccbdaa6676 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 13 Oct 2020 18:19:31 +0200
Subject: [PATCH 100/257] Grand livre waiting box

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

diff --git a/include/impress_gl_comptes.inc.php b/include/impress_gl_comptes.inc.php
index 6a5bdfa5e..3da5d89b3 100644
--- a/include/impress_gl_comptes.inc.php
+++ b/include/impress_gl_comptes.inc.php
@@ -40,8 +40,8 @@ global $g_user,$http;
 //-----------------------------------------------------
 echo '<div class="content">';
 
-echo '<FORM action="?" METHOD="GET">';
-echo HtmlInput::hidden('ac',$_REQUEST['ac']);
+echo '<FORM action="?" METHOD="GET" onsubmit="waiting_box();return true;">';
+echo HtmlInput::hidden('ac',$http->request('ac'));
 echo HtmlInput::hidden('type','gl_comptes');
 echo dossier::hidden();
 echo '<TABLE><TR>';

From 56a17d5aadd010e46ae0222afe619d0369850337 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 13 Oct 2020 18:39:46 +0200
Subject: [PATCH 101/257] remove dead code

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

diff --git a/include/export/export_gl_pdf.php b/include/export/export_gl_pdf.php
index eda3328e3..571c5cf5c 100644
--- a/include/export/export_gl_pdf.php
+++ b/include/export/export_gl_pdf.php
@@ -174,7 +174,7 @@ foreach ($a_poste as $poste)
                 $solde_d = 0.0;
                 $solde_c = 0.0;
                 $pdf->line_new();
-                $pdf->SetFont('DejaVuCond','',7);
+                $pdf->SetFont('DejaVuCond','',6);
 
             }
 
@@ -196,7 +196,7 @@ foreach ($a_poste as $poste)
         $pdf->LongLine($width[$i], 6, $detail['jr_internal'], 0, $lor[$i] );
         $i++;
         /* limit set to 40 for the substring */
-        $triple_point = (mb_strlen($detail['description']) > 40 ) ? '...':'';
+        //  $triple_point = (mb_strlen($detail['description']) > 40 ) ? '...':'';
         // $pdf->LongLine($width[$i], 6, mb_substr($detail['description'],0,40).$triple_point, 0,$lor[$i]);
         $pdf->LongLine($width[$i], 6,$detail['description'].'['.$detail['jr_optype'].']', 0,$lor[$i]);
         $i++;

From 259b3f48512ab2abcf5195ea016e4de3dc2d40d6 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 13 Oct 2020 18:40:11 +0200
Subject: [PATCH 102/257] Improve : Quick filter on history

---
 include/class/acc_ledger_search.class.php | 2 +-
 include/history_operation.inc.php         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/class/acc_ledger_search.class.php b/include/class/acc_ledger_search.class.php
index b7ed71b3e..ae2a6e874 100644
--- a/include/class/acc_ledger_search.class.php
+++ b/include/class/acc_ledger_search.class.php
@@ -763,7 +763,7 @@ class Acc_Ledger_Search
             return array(0, _("Aucun enregistrement trouvé"));
         }
 
-        $r.='<table class="result">';
+        $r.='<table class="result" id="history_operation_t">';
 
 
         $r.="<tr >";
diff --git a/include/history_operation.inc.php b/include/history_operation.inc.php
index e1ab03296..da5aefcfb 100644
--- a/include/history_operation.inc.php
+++ b/include/history_operation.inc.php
@@ -119,6 +119,7 @@ $bar = navigation_bar($offset, $max_line, $step, $page);
 
 echo $msg;
 echo $Ledger->display_search_form();
+echo HtmlInput::filter_table('history_operation_t', '0,1,2,3,4,5,6,7', 1);
 echo $bar;
 echo '<form method="GET" id="fpaida" class="print">';
 echo HtmlInput::hidden("ac", $http->request('ac'));

From 94bba9cf625c0df98ba6601aec1a2aff0405bd23 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 14 Oct 2020 15:53:21 +0200
Subject: [PATCH 103/257] Select_Box Add new position : absolute

---
 include/lib/select_box.class.php | 219 +++++++++++++++++++++----------
 1 file changed, 147 insertions(+), 72 deletions(-)

diff --git a/include/lib/select_box.class.php b/include/lib/select_box.class.php
index 8d3cceac7..85b768b09 100644
--- a/include/lib/select_box.class.php
+++ b/include/lib/select_box.class.php
@@ -26,7 +26,6 @@
  * Display a kind of select
  * @include select-box-test.php
  */
-
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
 class Select_Box
 {
@@ -36,8 +35,8 @@ class Select_Box
     private $cnt;
     private $filter; //!< allow a dynamic not case sensitive search
     var $default_value;
-    private $position ; //!< change depending if we are in an absolute block or not
-    
+    private $position; //!< change depending if we are in an absolute block or not
+
     /**
      * Default constructor
      * @param type $p_id javascript DOMid
@@ -52,9 +51,43 @@ class Select_Box
         $this->cnt=0;
         $this->default_value=-1;
         $this->style_box="";
-	$this->filter="";
+        $this->filter="";
         $this->position="normal";
     }
+
+    public function get_id()
+    {
+        return $this->id;
+    }
+
+    public function set_id($id)
+    {
+        $this->id=$id;
+        return $this;
+    }
+
+    public function get_item()
+    {
+        return $this->item;
+    }
+
+    public function get_default_value()
+    {
+        return $this->default_value;
+    }
+
+    public function set_item($item)
+    {
+        $this->item=$item;
+        return $this;
+    }
+
+    public function set_default_value($default_value)
+    {
+        $this->default_value=$default_value;
+        return $this;
+    }
+
     public function get_position()
     {
         return $this->position;
@@ -62,45 +95,20 @@ class Select_Box
 
     public function set_position($position)
     {
-        if ( ! in_array($position,array("normal","in-absolute") ) ) {
-            throw new Exception("SB0005",EXC_PARAM_VALUE);
+        if (!in_array($position, array("normal", "in-absolute", "absolute")))
+        {
+            throw new Exception("SB0005", EXC_PARAM_VALUE);
         }
         $this->position=$position;
         return $this;
     }
 
-   private function compute_position()
+    protected function compute_position()
     {
         $list_id=sprintf('%s_list', $this->id);
         switch ($this->position)
         {
-            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":
+            case 'absolute':
                 // Show when click
                 $javascript=sprintf('
                     $("%s_bt").onclick=function() {
@@ -110,7 +118,7 @@ class Select_Box
                             if (! document.getElementById("select_box%s") ) {
                             
                                 var newDiv=new Element("div");
-                                newDiv.id="select%s";
+                                newDiv.id="select_box%s";
                                 document.body.appendChild(newDiv);
                                 newDiv.addClassName("select_box");
                                 $("select_box%s").onmouseleave=function() {
@@ -137,10 +145,76 @@ class Select_Box
                              alert(e.message);
                         }
                        }
-                        ', $this->id,$this->id,$this->id,$this->id,$this->id, $this->id, $this->id, $this->id,$list_id, $list_id);
-               
-                        break;
-            
+                        ', $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);
+                        }
+                       }
+                        ', $this->id, $this->id, $this->id, $list_id, $list_id);
+
+                break;
+
             default:
                 break;
         }
@@ -149,55 +223,51 @@ class Select_Box
 
     function input()
     {
-        $list_id=sprintf('%s_list',$this->id);
-        
+        $list_id=sprintf('%s_list', $this->id);
+
         // 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!="")
+        {
 
-	// Show the filter if there is one, 
-	if ( $this->filter != "" ) {
-            
             echo HtmlInput::filter_list($list_id);
-	}
-        
+        }
+
         // Print the list of possible options
-        printf('<ul id="%s">',$list_id);
+        printf('<ul id="%s">', $list_id);
         for ($i=0; $i<count($this->item); $i++)
         {
             if ($this->item[$i]['type']=="url")
             {
-                printf('<li><a href="%s">%s</a></li>', $this->item[$i]['url'],
-                        $this->item[$i]['label']);
+                printf('<li><a href="%s">%s</a></li>', $this->item[$i]['url'], $this->item[$i]['label']);
             }
             else // For javascript
             if ($this->item[$i]['type']=="javascript")
             {
-                printf('<li><a href="javascript:void(0)" onclick="%s">%s</a></li>',
-                        $this->item[$i]['javascript'], $this->item[$i]['label']);
+                printf('<li><a href="javascript:void(0)" onclick="%s">%s</a></li>', $this->item[$i]['javascript'],
+                        $this->item[$i]['label']);
             }
             else if ($this->item[$i]['type']=="value")
             {
-                printf('<li><a href="javascript:void(0)" onclick="%s">%s</a></li>',
-                        $this->item[$i]['javascript'], $this->item[$i]['label']);
+                printf('<li><a href="javascript:void(0)" onclick="%s">%s</a></li>', $this->item[$i]['javascript'],
+                        $this->item[$i]['label']);
             }
-            else if ($this->item[$i]['type']=="input") {
+            else if ($this->item[$i]['type']=="input")
+            {
                 $ok=new IButton("ok");
                 $ok->value=$this->item[$i]['label'];
                 $ok->javascript=$this->item[$i]['input']->javascript;
-                printf('<li> %s %s</li>',
-                        $this->item[$i]['input']->input(),
-                        $ok->input()
-                        );
+                printf('<li> %s %s</li>', $this->item[$i]['input']->input(), $ok->input()
+                );
             }
         }
 
@@ -235,10 +305,12 @@ class Select_Box
         $this->item[$this->cnt]['type']='value';
         $this->cnt++;
     }
-    function add_input($p_label,HtmlInput $p_element) {
+
+    function add_input($p_label, HtmlInput $p_element)
+    {
         /* $this->item[$this->cnt]['label']=$p_element->label;
-        $this->item[$this->cnt]['value']=$p_element->value;
-        $this->item[$this->cnt]['javascript']=$p_element->javascript;
+          $this->item[$this->cnt]['value']=$p_element->value;
+          $this->item[$this->cnt]['javascript']=$p_element->javascript;
          * 
          */
         $this->item[$this->cnt]['label']=$p_label;
@@ -246,12 +318,15 @@ class Select_Box
         $this->item[$this->cnt]['type']='input';
         $this->cnt++;
     }
+
     function set_filter($p_filter)
     {
-      $this->filter=$p_filter;
+        $this->filter=$p_filter;
     }
-    function get_filter() {
-      return $this->filter;
+
+    function get_filter()
+    {
+        return $this->filter;
     }
 
 }

From f48a95e74d3d7846fd9ef9d81c12b34f7520d9e5 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 14 Oct 2020 15:53:53 +0200
Subject: [PATCH 104/257] Follow-Up Cosmetic, form before creating a new
 follow-up action

---
 include/action.common.inc.php                 | 29 ++------
 include/class/follow_up.class.php             | 13 +++-
 include/template/action_button.php            | 19 +----
 include/template/followup-show-action-add.php | 69 +++++++++++++++++++
 4 files changed, 88 insertions(+), 42 deletions(-)
 create mode 100644 include/template/followup-show-action-add.php

diff --git a/include/action.common.inc.php b/include/action.common.inc.php
index 48b16e7be..cd754240a 100644
--- a/include/action.common.inc.php
+++ b/include/action.common.inc.php
@@ -30,7 +30,7 @@
  *
  */
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-require_once NOALYSS_INCLUDE."/lib/select_box.class.php";
+require_once NOALYSS_INCLUDE."/lib/select_dialog.class.php";
 $http=new HttpInput();
 $supl_hidden = '';
 if (isset($_REQUEST['sc']))
@@ -205,7 +205,6 @@ if ($sub_action == "update")
 		echo '<input type="hidden" name="ac" value="' . $http->request('ac') . '">';
 		echo '<input type="hidden" name="sa" value="save_action_st2">';
 		echo '<input type="submit" class="button" name="save_action_st2" value="' . _('Enregistrer') . '">';
-		echo '<input type="submit" class="button" name="generate" value="' . _('Génère le document') . '"></p>';
 		echo $supl_hidden;
 		echo '</form>';
 		echo '</div>';
@@ -237,27 +236,9 @@ if ($sub_action == 'detail')
             echo '<input type="hidden" name="sa" value="update">';
             echo '<input type="hidden" id="delete" name="delete" value="0">';
             echo HtmlInput::submit("save", "Sauve",' onclick="$(\'delete\').value=0"');
-            
-            // Create select box for new Action
-            $selbox=new Select_Box("action_add_action2", _("Ajout action"));
-            $selbox->set_position("in-absolute");
-            $selbox->set_filter("y");
-            $aDocumentType=$cn->get_array("select dt_id,dt_value from document_type order by 2");
-            $nbDocumentType=count($aDocumentType);
-            $ac=$http->request("ac");
-            $dossier_id=Dossier::id();
-            $sup_parameter=HtmlInput::array_to_string(["sc","sb","f_id","qcode"], $_REQUEST,"&amp;");
-            for ($i=0;$i<$nbDocumentType;$i++) {
-                $selbox->add_url($aDocumentType[$i]['dt_value'], 
-                                "do.php?".http_build_query([ "ac"=>$ac,
-                                "gDossier"=>$dossier_id,
-                                "sa"=>"update",
-                                "add_action_here"=>"yes",
-                                "ag_id"=>$ag_id,
-                                "action_type"=>$aDocumentType[$i]["dt_id"]]).$sup_parameter);
-    
-            }
-            echo $selbox->input();
+           
+
+           
             
             // 
             if ($g_user->can_delete_action($ag_id))
@@ -267,6 +248,8 @@ if ($sub_action == 'detail')
             }
             echo $retour;
             echo '</form>';
+             // Create select box for new Action
+            Follow_Up::show_action_add(["sa"=>"update","add_action_here"=>1,"ag_id"=>$ag_id]);
 	}
 	else if ($g_user->can_read_action($ag_id) == true || $act->ag_dest == -1)
 	{
diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 0a738ee71..dfc1ec802 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -1193,6 +1193,15 @@ class Follow_Up
         echo $act->myList($p_base, "", $query);
         echo '</form>';
     }
+    /**
+     * Show a button for adding follow-up action, display the FORM 
+     * @param array $pa_param , will be converted in a HIDDEN input type in the form
+     */
+    static function show_action_add($pa_param)
+    {
+        require_once NOALYSS_TEMPLATE.'/followup-show-action-add.php';
+
+    }
 
     /**
      * Create a subquery to filter thanks the selected tag
@@ -1843,8 +1852,8 @@ class Follow_Up
          */
         $parent=$this->get_parent();
 
-        $base=HtmlInput::request_to_string(array("gDossier", "ac", "sa", "sb", "sc",
-                    "f_id"));
+        $base=HtmlInput::request_to_string(array("gDossier", "ac",  "sb", "sc",
+                    "f_id"))."&amp;sa=detail";
         $parent=$this->get_parent();
         if ($parent==-1)
         {
diff --git a/include/template/action_button.php b/include/template/action_button.php
index 1aa348b3c..a38ca1fbb 100644
--- a/include/template/action_button.php
+++ b/include/template/action_button.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  *   This file is part of NOALYSS.
  *
@@ -29,25 +28,11 @@
 require_once NOALYSS_INCLUDE."/lib/select_box.class.php";
 $http=new HttpInput();
 // Create select box for new Action
-$selbox=new Select_Box(uniqid(), _("Ajout action"));
-$selbox->set_position("normal");
-$selbox->set_filter("yes");
-$aDocumentType=$cn->get_array("select dt_id,dt_value from document_type order by 2");
-$nbDocumentType=count($aDocumentType);
-$ac=$http->request("ac");
-$dossier_id=Dossier::id();
-$sup_parameter=HtmlInput::array_to_string(["sc","sb","f_id","qcode"], $_REQUEST,"&amp;");
-for ($i=0;$i<$nbDocumentType;$i++) {
-    $selbox->add_url($aDocumentType[$i]['dt_value'], 
-            "do.php?".http_build_query([ "ac"=>$ac,"gDossier"=>$dossier_id,"sa"=>"add_action"
-                    ,"action_type"=>$aDocumentType[$i]["dt_id"]]).$sup_parameter);
-    
-}
+Follow_Up::show_action_add(array("sa"=>"add_action"));
 ?>
 <div class="content" style="display:inline" >
 	<div style="display:inline">
             <input id="bt_search" type="button" class="smallbutton" onclick="$('search_action').style.display='block'" value="<?php echo _('Recherche') ?>">
-            <?=$selbox->input();?>
          
 	</div>
-</div>    
\ No newline at end of file
+</div>  
\ No newline at end of file
diff --git a/include/template/followup-show-action-add.php b/include/template/followup-show-action-add.php
new file mode 100644
index 000000000..ebfb7c39b
--- /dev/null
+++ b/include/template/followup-show-action-add.php
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
+$sup_parameter=HtmlInput::array_to_string(["sc","sb","f_id","qcode"], $_REQUEST,"&amp;");
+$cn=Dossier::connect();
+/**
+ * @file
+ * @brief display a button for adding an followup action
+ */
+echo HtmlInput::button(uniqid(), _("Ajout action"),
+        'onclick="document.getElementById(\'action_add_d\').style.display=\'block\';"');
+?>
+<div id="action_add_d" class="inner_box" style="width:25rem;display:none;top:10rem;">
+    <?php echo HtmlInput::title_box(_("Choississez une action"), "action_add_d"); ?>
+    <div style="text-align: center">
+
+        <form method="get" >
+
+            <?php
+            echo HtmlInput::array_to_hidden(["ac", "sc", "sb", "f_id", "qcode", "gDossier"], $_REQUEST);
+            if ( ! empty ($pa_param)) {
+                foreach ($pa_param as $key=> $value)
+                {
+                    echo HtmlInput::hidden($key,$value);
+
+                }
+            }
+            ?>
+            
+            <?php
+            $action=new ISelect("action_type");
+            $action->style='style="width:95%"';
+            $action->value=$cn->make_array("select dt_id,dt_value from document_type order by 2");
+            $action->selected=$action->value[0]['value'];
+            $action->rowsize=10;
+            echo $action->input();
+            ?>
+            <ul class="aligned-block">
+
+                <li>
+                    <?php echo HtmlInput::submit("add_action", _("Ajout")); ?>
+                </li>
+                <li>
+                    <?php echo HtmlInput::button_hide("action_add_d") ?>
+                </li>
+            </ul>
+        </form>
+    </div>
+</div>

From 251acf11cd9606ab2163805cc97021ae568ec0dc Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 14 Oct 2020 15:54:37 +0200
Subject: [PATCH 105/257] Filter_Multiselect : make a search on select
 (multi-row)

---
 html/js/scripts.js | 43 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/html/js/scripts.js b/html/js/scripts.js
index 66c9c832f..fa05158dc 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -2201,7 +2201,7 @@ function filter_table(phrase, _id, colnr, start_row) {
     }
     if (tot_found == 0) {
         if ($('info_' + _id)) {
-            $('info_' + _id).innerHTML = content[69]
+            $('info_' + _id).innerHTML = content[69];
         }
     } else {
         if ($('info_' + _id)) {
@@ -2247,7 +2247,46 @@ function filter_list(phrase, _id) {
     }
     if (tot_found == 0) {
         if ($('info_' + _id)) {
-            $('info_' + _id).innerHTML = content[69]
+            $('info_' + _id).innerHTML = content[69];
+        }
+    } else {
+        if ($('info_' + _id)) {
+            $('info_' + _id).innerHTML = "  ";
+        }
+    }
+}
+
+/**
+ * @brief filter quickly a select 
+ * @param  phrase : DOM id of the input text where we find the word to seach
+ * @param  _id : id of the list
+ * @returns nothing
+ * @see HtmlInput::filter_list
+ */
+function filter_multiselect(phrase, _id) {
+    $('info_div').innerHTML = content[65];
+    $('info_div').style.display = "block";
+    var words = $(phrase).value.toLowerCase();
+    var l_list = document.getElementById(_id);
+
+    var tot_found = 0;
+
+    for (var r = 0; r < l_list.options.length; r++) {
+        var found = 0;
+        var ele = l_list.options[r].text;
+
+        if (ele.toLowerCase().indexOf(words) >= 0) {
+            tot_found++;
+            l_list.options[r].style.display = 'block';
+        } else {
+           l_list.options[r].style.display = 'none';
+        }
+        $('info_div').style.display = "none";
+        $('info_div').innerHTML = "";
+    }
+    if (tot_found == 0) {
+        if ($('info_' + _id)) {
+            $('info_' + _id).innerHTML = content[69];
         }
     } else {
         if ($('info_' + _id)) {

From 1f037f640ed4167cd40d69d80abfcd9d15d56016 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 14 Oct 2020 16:39:45 +0200
Subject: [PATCH 106/257] Follow-Up : comment optional

---
 include/action.common.inc.php                 |  6 ++--
 .../action_document_type_mtable.class.php     |  6 ++++
 include/class/document_option.class.php       | 31 +++++++++++++++++++
 include/class/follow_up.class.php             |  3 +-
 include/constant.php                          |  2 +-
 include/sql/patch/upgrade148.sql              |  6 ++++
 .../action_document_type_mtable_input.php     |  8 +++++
 include/template/detail-action.php            |  6 ++--
 8 files changed, 60 insertions(+), 8 deletions(-)
 create mode 100644 include/sql/patch/upgrade148.sql

diff --git a/include/action.common.inc.php b/include/action.common.inc.php
index cd754240a..ad648082c 100644
--- a/include/action.common.inc.php
+++ b/include/action.common.inc.php
@@ -193,10 +193,9 @@ if ($sub_action == "update")
                 }
                 $act->f_id_dest=$act->qcode_dest;
                 $act->save();
-		echo '<div class="content">';
 
 		// Add hidden tag
-		echo '<form  enctype="multipart/form-data" action="do.php" method="post"">';
+		echo '<form  enctype="multipart/form-data" style="display:inline" action="do.php" method="post"">';
 
 		
 		
@@ -207,7 +206,6 @@ if ($sub_action == "update")
 		echo '<input type="submit" class="button" name="save_action_st2" value="' . _('Enregistrer') . '">';
 		echo $supl_hidden;
 		echo '</form>';
-		echo '</div>';
                 return;
 	}
 }
@@ -228,7 +226,7 @@ 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"   >';
+            echo '<form  enctype="multipart/form-data"  id="action_common_frm" class="print" action="do.php"  method="post"    style="display:inline">';
             echo $supl_hidden;
             echo HtmlInput::hidden('ac', $http->request('ac'));
             echo dossier::hidden();
diff --git a/include/class/action_document_type_mtable.class.php b/include/class/action_document_type_mtable.class.php
index 64c8c5748..d0d364031 100644
--- a/include/class/action_document_type_mtable.class.php
+++ b/include/class/action_document_type_mtable.class.php
@@ -79,6 +79,7 @@ class Action_Document_Type_MTable extends Manage_Table_SQL
         $this->other['detail_operation']=$http->request("detail_operation", "string", 0);
         $this->other['contact_multiple']=$http->request("det_contact_mul", "string", 0);
         $this->other['make_invoice']=$http->request("make_invoice", "string", 0);
+        $this->other['followup_comment']=$http->request("followup_comment", "string", 0);
         $this->other['seq']=$http->request("seq", "string", 0);
         $this->other['select_option_operation']=$http->request("select_option_operation", "string", null);
         $this->other["cor_id"]=$http->request("cor_id","array",[]);
@@ -258,6 +259,10 @@ class Action_Document_Type_MTable extends Manage_Table_SQL
         $cn->exec_sql("insert into document_option (do_code,document_type_id,do_enable) values ($1,$2,$3) 
             on conflict on constraint document_option_un
             do update set do_enable=$3 ", ["make_invoice", $object_sql->dt_id, $this->other['make_invoice']]);
+        // Option for comments
+            $cn->exec_sql("insert into document_option (do_code,document_type_id,do_enable) values ($1,$2,$3) 
+                on conflict on constraint document_option_un
+                do update set do_enable=$3 ", ["followup_comment", $object_sql->dt_id, $this->other['followup_comment']]);
         
         // Option contact to save
         $cn->exec_sql("delete from jnt_document_option_contact where document_type_id=$1",[$object_sql->dt_id]);
@@ -272,6 +277,7 @@ class Action_Document_Type_MTable extends Manage_Table_SQL
             } 
         }
         
+        
     }
 
 }
diff --git a/include/class/document_option.class.php b/include/class/document_option.class.php
index cc5553356..4fd974c2c 100644
--- a/include/class/document_option.class.php
+++ b/include/class/document_option.class.php
@@ -48,6 +48,23 @@ class Document_Option
         }
         return $display_operation;
     }
+    /**
+     * returns true if comment are available otherwise false
+     * 
+     * @param int $p_document_type Document_Type.dt_id
+     * @return boolean
+     */
+    static function is_enable_comment($p_document_type)
+    {
+        $display_operation=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, 'followup_comment'])=='1')
+        {
+            $display_operation=true;
+        }
+        return $display_operation;
+    }
     /**
      * returns option from  the operation_detail 
      * 
@@ -98,5 +115,19 @@ class Document_Option
         }
         return $return;
     }
+    /**
+     * Returns true if we can add a comment , or false if it is not possible
+     * @param integer $p_id is the action_gestion.ag_id
+     */
+    static  function can_add_comment($p_id) {
+        $cn=Dossier::connect();
+        $document_type=$cn->get_value("select ag_type from action_gestion where ag_id=$1",[$p_id]);
+        if (Document_Option::is_enable_comment($document_type)) return true;
+        // If comment are disable, only the first one is authorized as event description
+        $cnt=$cn->get_value("select count(*) from action_gestion_comment where ag_id=$1",[$p_id]);
+        if ($cnt == 0 ) return true;
+        return false;
+        
+    }
 
 }
diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index dfc1ec802..52aeecbef 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -38,6 +38,7 @@ require_once NOALYSS_INCLUDE.'/lib/inum.class.php';
 require_once NOALYSS_INCLUDE.'/lib/sort_table.class.php';
 require_once NOALYSS_INCLUDE.'/lib/irelated_action.class.php';
 require_once NOALYSS_INCLUDE.'/class/tag.class.php';
+require_once NOALYSS_INCLUDE.'/class/document_option.class.php';
 require_once NOALYSS_INCLUDE.'/class/default_menu.class.php';
 require_once NOALYSS_INCLUDE.'/lib/inplace_edit.class.php';
 require_once NOALYSS_INCLUDE.'/lib/noalyss_csv.class.php';
@@ -592,7 +593,7 @@ class Follow_Up
         /* Upload the documents */
         $doc=new Document($this->db);
         $doc->Upload($this->ag_id);
-        if (trim($this->ag_comment)!='')
+        if (trim($this->ag_comment)!='' && Document_Option::can_add_comment($this->ag_id))
         {
             $this->db->exec_sql("insert into action_gestion_comment (ag_id,tech_user,agc_comment) values ($1,$2,$3)"
                     , array($this->ag_id, $_SESSION['g_user'], $this->ag_comment));
diff --git a/include/constant.php b/include/constant.php
index 07b2dce1c..fe77c4d64 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -107,7 +107,7 @@ if ( !defined ("NOALYSS_PACKAGE_REPOSITORY")) {
 if ( ! defined ("SYSINFO_DISPLAY")) {
     define ("SYSINFO_DISPLAY",TRUE);
 }
-define ("DBVERSION",148);
+define ("DBVERSION",149);
 define ("MONO_DATABASE",25);
 define ("DBVERSIONREPO",18);
 define ('NOTFOUND','--not found--');
diff --git a/include/sql/patch/upgrade148.sql b/include/sql/patch/upgrade148.sql
new file mode 100644
index 000000000..76477c192
--- /dev/null
+++ b/include/sql/patch/upgrade148.sql
@@ -0,0 +1,6 @@
+begin;
+INSERT INTO public.document_option (do_code, document_type_id, do_enable, do_option) select 'followup_comment', dt_id, 1, NULL
+from document_type ;
+
+insert into version (val,v_description) values (149,'Default values for document_option,comment on followup');
+commit;
diff --git a/include/template/action_document_type_mtable_input.php b/include/template/action_document_type_mtable_input.php
index 784a4f069..a02401f30 100644
--- a/include/template/action_document_type_mtable_input.php
+++ b/include/template/action_document_type_mtable_input.php
@@ -92,6 +92,14 @@ $i=new ICheckBox("make_invoice",1);
 if ( Document_Option::is_enable_make_invoice($table->dt_id)) $i->set_check(1); else $i->set_check(0);
 echo $i->input();
 echo _("Création de facture");
+?>
+        </li> 
+        <li>
+<?php
+$i=new ICheckBox("followup_comment",1);
+if ( Document_Option::is_enable_comment($table->dt_id)) $i->set_check(1); else $i->set_check(0);
+echo $i->input();
+echo _("Commentaire");
 ?>
         </li> 
     </ul>
diff --git a/include/template/detail-action.php b/include/template/detail-action.php
index 0516e5f49..f43d3211e 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -276,10 +276,12 @@ for( $c=0;$c<count($acomment);$c++){
         echo $comment;
 }
 echo '<span class="noprint">';
-echo $desc->input();
+if (  Document_Option::can_add_comment($ag_id) ) {
+    echo $desc->input();
+}
 echo '</span>';
 ?>
-<?php if ($p_view != "READ" ): ?>
+<?php if ($p_view != "READ" && Document_Option::can_add_comment($ag_id)): ?>
 <p class="noprint">
 <input type="button" id="bt_enlarge" <?php echo $style_enl?> value="+" onclick="enlarge('ag_comment');return false;">
 <input type="button" id="bt_small"  <?php echo $style_small?> value="-" style="display:none" onclick="small('ag_comment');return false;">

From 46c253706892d24f0233a6c55ed1cc2c0a8dbd7b Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 14 Oct 2020 17:38:05 +0200
Subject: [PATCH 107/257] fix SQL bug

---
 include/sql/patch/upgrade147.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/sql/patch/upgrade147.sql b/include/sql/patch/upgrade147.sql
index b2fc79c54..5828d3eab 100644
--- a/include/sql/patch/upgrade147.sql
+++ b/include/sql/patch/upgrade147.sql
@@ -9,7 +9,8 @@ and dt_id in (2,3,4,5,10,20,21);
 
 INSERT INTO public.document_option (do_code, document_type_id, do_enable, do_option) select  'contact_multiple',dt_id , 1, NULL
 from document_type where 
-not exists (select 1 from document_option where document_type_id in (2,3,4,5,10,20) and do_code='contact_multiple' );
+not exists (select 1 from document_option where document_type_id in (2,3,4,5,10,20) and do_code='contact_multiple' )
+and dt_id in (2,3,4,5,10,20) ;
 
 INSERT INTO public.document_option (do_code, document_type_id, do_enable, do_option) select 'make_invoice', dt_id, 1, NULL
 from document_type 

From 5e1bda9e0fc6168d6b67c003c01549ade8a7c6a9 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 16 Oct 2020 09:35:59 +0200
Subject: [PATCH 108/257] Remove select_dialog file

---
 include/action.common.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/action.common.inc.php b/include/action.common.inc.php
index ad648082c..54ed0e31b 100644
--- a/include/action.common.inc.php
+++ b/include/action.common.inc.php
@@ -30,7 +30,7 @@
  *
  */
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-require_once NOALYSS_INCLUDE."/lib/select_dialog.class.php";
+
 $http=new HttpInput();
 $supl_hidden = '';
 if (isset($_REQUEST['sc']))

From 997ca7620b38a642b3660a329ca1332ee79197a8 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 16 Oct 2020 10:00:29 +0200
Subject: [PATCH 109/257] Follow Up : an action can have several parents

---
 include/action.common.inc.php     |   1 -
 include/class/follow_up.class.php | 119 +++++++++++++++---------------
 2 files changed, 61 insertions(+), 59 deletions(-)

diff --git a/include/action.common.inc.php b/include/action.common.inc.php
index 54ed0e31b..ce874a8be 100644
--- a/include/action.common.inc.php
+++ b/include/action.common.inc.php
@@ -30,7 +30,6 @@
  *
  */
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-
 $http=new HttpInput();
 $supl_hidden = '';
 if (isset($_REQUEST['sc']))
diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 52aeecbef..5810aa265 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -1773,8 +1773,9 @@ class Follow_Up
         }
     }
     /**
-     * Return the first parent of the event tree, or -1 if not found
-     * @return integer (ag_id)
+     * Return the first parent of the event tree, or -1 if not found. The parent is an action with a lower id, 
+     * so it can happen than an action has several ones
+     * @return arrary of integer (ag_id)
      */
     function get_parent() {
         $value=$this->db->get_array('
@@ -1790,11 +1791,11 @@ class Follow_Up
                 where
                   p2.aga_greatest is not null and
                   p2.aga_greatest = p1.aga_least
-              ) select * from t order by depth desc limit 1
+              ) select aga_least,aga_greatest,depth from t order by depth desc 
                 ' , array($this->ag_id)
                 );
         if ( ! empty($value ) ) 
-            return $value[0]['aga_least'];
+            return $value;
         else
             return -1;
     }
@@ -1817,7 +1818,7 @@ class Follow_Up
                         aga_least,aga_greatest , 1
                 from 
                         action_gestion_related
-              where aga_least=$1
+              where aga_least=$1  or aga_greatest = $1
                 union all
             select key_path||'-'||p2.aga_greatest::text,
               p2.aga_least,p2.aga_greatest,depth + 1
@@ -1831,7 +1832,6 @@ class Follow_Up
           from 
             action_gestion join t on (ag_id=aga_greatest)
             join document_type on (ag_type=dt_id)
-          order by key_path
             
 ";
          $ret_array=$this->db->get_array($sql,array($p_id));
@@ -1855,15 +1855,17 @@ class Follow_Up
 
         $base=HtmlInput::request_to_string(array("gDossier", "ac",  "sb", "sc",
                     "f_id"))."&amp;sa=detail";
-        $parent=$this->get_parent();
         if ($parent==-1)
         {
             echo _('Principal');
-            $parent = $this->ag_id;
+            $parent=array();
+            $parent [0]['aga_least']= $this->ag_id;
         }
-        else
+       
+        $nb_parent=count($parent);
+        for ($i=0;$i< $nb_parent;$i++)
         {
-            $fu_parent=new Follow_Up($this->db, $parent);
+            $fu_parent=new Follow_Up($this->db, $parent[$i]['aga_least']);
             $fu_parent->get();
             echo'<span class="highlight">';
             $xaction=sprintf('view_action(%d,%d,%d)', $fu_parent->ag_id,
@@ -1874,56 +1876,57 @@ class Follow_Up
                 h($fu_parent->ag_title),
                 '('.h($fu_parent->ag_ref).')',
                     '</a>';
-                            
+
             echo "</span>";
+            echo '<ul style="padding-left:10px;list-style-type: none;">';
+
+            $action=$this->get_children($parent[$i]['aga_least']);
+            for ($o=0; $o<count($action); $o++)
+            {
+                $class=($this->ag_id == $action[$o]['aga_greatest'])?' class="highlight" ':'';
+
+                // Count the number of direct parents
+                $count_parent =$this->db->get_value('select count(*) from action_gestion_related where aga_greatest = $1',array($action[$o]['aga_greatest']));
+                $direct_parent=($count_parent > 1 ) ? _('direct parent ').$count_parent:"";
+
+                $margin=($action[$o]['depth']>1 )?str_repeat("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;",$action[$o]['depth']-1)."&#8680;":"";
+                if ($p_view!='READ'&&$p_base!='ajax')
+                {
+                    $rmAction=sprintf("return confirm_box(null,'"._('Voulez-vous effacer cette action ')."', function () {remove_action('%s','%s','%s');});",
+                            dossier::id(), $action[$o]['aga_greatest'],
+                            $_REQUEST['ag_id']);
+                    $showAction='<a class="line" href="'.$base."&ag_id=".$action[$o]['aga_greatest'].'">';
+                    $js='<a class="tinybutton" id="acact'.$action[$o]['aga_greatest'].'" href="javascript:void(0)" onclick="'.$rmAction.'">'.SMALLX.'</a>';
+                    echo '<li '.$class.' id="act'.$action[$o]['aga_greatest'].'">'.$margin.$showAction.$action[$o]['str_date'].
+                    h($action[$o]['title']).'('.h($action[$o]['action_ref']).')'.$direct_parent.'</a>'." "
+                    .$js.'</li>';
+                }
+                else
+                /*
+                 * Display detail requested from Ajax Div
+                 */
+                if ($p_base=='ajax')
+                {
+                    $xaction=sprintf('view_action(%d,%d,%d)', $action[$o]['aga_greatest'],
+                            Dossier::id(), 1);
+                    $showAction='<a class="line" href="javascript:'.$xaction.'">';
+                    echo '<li  '.$class.' >'.$margin.$showAction.$action[$o]['str_date']." ".
+                    h($action[$o]['title']).'('.h($action[$o]['action_ref']).')'.$direct_parent.'</a>'." "
+                    .'</li>';
+                }
+                /*
+                 * READ ONLY
+                 */
+                else
+                {
+                    $showAction='<a class="line" href="'.$base."&ag_id=".$action[$o]['aga_greatest'].'">';
+                    echo '<li  '.$class.' >'.$margin.$showAction.$action[$o]['str_date']." ".
+                    h($action[$o]['sub_title']).'('.h($action[$o]['action_ref']).')'.$direct_parent.'</a>'." "
+                    .'</li>';
+                }
+            }
+            echo '</ul>';
         }
-        echo '<ul style="padding-left:10px;list-style-type: none;">';
-        $action=$this->get_children($parent);
-        for ($o=0; $o<count($action); $o++)
-        {
-            $class=($this->ag_id == $action[$o]['aga_greatest'])?' class="highlight" ':'';
-            
-            // Count the number of direct parents
-            $count_parent =$this->db->get_value('select count(*) from action_gestion_related where aga_greatest = $1',array($action[$o]['aga_greatest']));
-            $direct_parent=($count_parent > 1 ) ? _('direct parent ').$count_parent:"";
-            
-            $margin=($action[$o]['depth']>1 )?str_repeat("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;",$action[$o]['depth']-1)."&#8680;":"";
-            if ($p_view!='READ'&&$p_base!='ajax')
-            {
-                $rmAction=sprintf("return confirm_box(null,'"._('Voulez-vous effacer cette action ')."', function () {remove_action('%s','%s','%s');});",
-                        dossier::id(), $action[$o]['aga_greatest'],
-                        $_REQUEST['ag_id']);
-                $showAction='<a class="line" href="'.$base."&ag_id=".$action[$o]['aga_greatest'].'">';
-                $js='<a class="tinybutton" id="acact'.$action[$o]['aga_greatest'].'" href="javascript:void(0)" onclick="'.$rmAction.'">'.SMALLX.'</a>';
-                echo '<li '.$class.' id="act'.$action[$o]['aga_greatest'].'">'.$margin.$showAction.$action[$o]['str_date'].
-                h($action[$o]['title']).'('.h($action[$o]['action_ref']).')'.$direct_parent.'</a>'." "
-                .$js.'</li>';
-            }
-            else
-            /*
-             * Display detail requested from Ajax Div
-             */
-            if ($p_base=='ajax')
-            {
-                $xaction=sprintf('view_action(%d,%d,%d)', $action[$o]['aga_greatest'],
-                        Dossier::id(), 1);
-                $showAction='<a class="line" href="javascript:'.$xaction.'">';
-                echo '<li  '.$class.' >'.$margin.$showAction.$action[$o]['str_date']." ".
-                h($action[$o]['title']).'('.h($action[$o]['action_ref']).')'.$direct_parent.'</a>'." "
-                .'</li>';
-            }
-            /*
-             * READ ONLY
-             */
-            else
-            {
-                $showAction='<a class="line" href="'.$base."&ag_id=".$action[$o]['aga_greatest'].'">';
-                echo '<li  '.$class.' >'.$margin.$showAction.$action[$o]['str_date']." ".
-                h($action[$o]['sub_title']).'('.h($action[$o]['action_ref']).')'.$direct_parent.'</a>'." "
-                .'</li>';
-            }
-        }
-        echo '</ul>';
     }
     /**
      * Display the list of parent of the current Follow_Up

From 9857de7e08d652cce01f083f91a5fed288722454 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 16 Oct 2020 10:14:12 +0200
Subject: [PATCH 110/257] Follow-Up improve search

---
 include/class/follow_up.class.php | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 5810aa265..c36fe8d60 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -1246,15 +1246,26 @@ class Follow_Up
     static function create_query($cn, $p_array=null)
     {
         if ($p_array==null)             $p_array=$_GET;
-        
+        $http=new HttpInput();
+        $search_docid=0; // search for a document 
         $action_query="";
         $ag_state=""; //<! selected status of the event , if not set or equal to -1 , it is all of them
+        //
+        // search for a specific document id (ag_id) , if given then status and date doesn't count
+         if (isset ($p_array['ag_id']) && isNumber($p_array['ag_id'])==1&&$p_array['ag_id']!=0)
+        {
+            $action_query=" and ag_id= ".sql_string($p_array['ag_id']);
+            $search_docid=$p_array['ag_id']; 
+            return $action_query;
+        }
         if (isset($_REQUEST['action_query']))
         {
+            $action_query = $http->request('action_query');
             // if a query is request build the sql stmt
-            $action_query="and (ag_title ilike '%".sql_string($_REQUEST['action_query'])."%' ".
-                    "or ag_ref ='".trim(sql_string($_REQUEST['action_query'])).
-                    "' or ag_id in (select ag_id from action_gestion_comment where agc_comment ilike '%".trim(sql_string($_REQUEST['action_query']))."%')".
+            $action_query="and (ag_title ilike '%".sql_string($action_query)."%' ".
+                    "or ag_ref ='".trim(sql_string($action_query)).
+                    "' or ag_id in (select ag_id from action_gestion_comment ".
+                    " where agc_comment ilike '%".trim(sql_string($action_query))."%')".
                     ")";
         }
 
@@ -1266,7 +1277,7 @@ class Follow_Up
             {
 
                 $fiche=new Fiche($cn);
-                $fiche->get_by_qcode($_REQUEST['qcode']);
+                $fiche->get_by_qcode($http->request('qcode'));
                 // if quick code not found then nothing
                 if ($fiche->id==0)
                     $str=' and false ';
@@ -1317,10 +1328,6 @@ class Follow_Up
 
 
         if (isset ($p_array['ag_id']) && isNumber($p_array['ag_id'])==1&&$p_array['ag_id']!=0)
-        {
-            $action_query=" and ag_id= ".sql_string($p_array['ag_id']);
-        }
-        if (isset($p_array['$remind_date'])&&$p_array['remind_date']!=""&&isDate($p_array['remind_date'])==$p_array['remind_date'])
         {
             $action_query .= " and to_date('".sql_string($p_array['$remind_date'])."','DD.MM.YYYY')<= ag_remind_date";
         }

From 91cbe1fb1ab7f31720365a2f7b0607706ec9208e Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 16 Oct 2020 11:25:16 +0200
Subject: [PATCH 111/257] Cosmetic Follow Up add waiting box for search

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

diff --git a/include/template/action_search.php b/include/template/action_search.php
index 58cab5517..f2eb1a7f7 100644
--- a/include/template/action_search.php
+++ b/include/template/action_search.php
@@ -38,7 +38,7 @@
         <?php
         echo HtmlInput::title_box(_('Recherche avancée'), "search_action_div", "close", "", "n");
         ?>
-	<form method="get" id="fsearchaction" style="padding:10px" onsubmit="result_search_action('fsearchaction');return false;">
+	<form method="get" id="fsearchaction" style="padding:10px" onsubmit="waiting_box();result_search_action('fsearchaction');return false;">
 		<?php echo HtmlInput::hidden('ctlc',$_GET['ctlc'])?>
 <?php endif; ?>
 		<?php echo  dossier::hidden()?>

From 955985c5a9cc1d6bee6ae0e80034abc5b45200e7 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 16 Oct 2020 17:44:29 +0200
Subject: [PATCH 112/257] Bug : create card failed

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

diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index 98aee882c..5bbd6fe9f 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -504,8 +504,7 @@ class Fiche
                             $bulle = Icon_Action::infobulle(14);
                             break;
                     case 'check':
-                            $w=new InputSwitch("av_text".$r->ad_id);
-                            $w->value=$r->av_text;
+                            $w=new InputSwitch("av_text".$attr->ad_id);
                             $w->value=(trim($w->value)=="")?1:$w->value;
                             break;
                     case 'select':

From 2debc04708a20f72f8b881137da5193c3774b212 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 16 Oct 2020 17:45:47 +0200
Subject: [PATCH 113/257] Cosmetic & version

---
 html/image/fontello/css/fontello-codes.css    |   7 +++
 html/image/fontello/css/fontello-embedded.css |  23 +++++---
 .../image/fontello/css/fontello-ie7-codes.css |   7 +++
 html/image/fontello/css/fontello-ie7.css      |   7 +++
 html/image/fontello/css/fontello.css          |  23 +++++---
 html/image/fontello/demo.html                 |  49 +++++++++++-------
 html/image/fontello/fontello.eot              | Bin 32768 -> 34464 bytes
 html/image/fontello/fontello.svg              |  16 +++++-
 html/image/fontello/fontello.ttf              | Bin 32600 -> 34296 bytes
 html/image/fontello/fontello.woff             | Bin 20020 -> 20936 bytes
 html/image/fontello/fontello.woff2            | Bin 16944 -> 17520 bytes
 html/image/logo7400.png                       | Bin 33498 -> 0 bytes
 html/image/logo7400.xcf                       | Bin 69520 -> 0 bytes
 html/image/logo7500.png                       | Bin 0 -> 33035 bytes
 html/image/logo7500.xcf                       | Bin 0 -> 60829 bytes
 html/index.php                                |   2 +-
 html/install.php                              |   2 +-
 include/template/tag_search_select.php        |   5 +-
 include/template/tag_select.php               |   6 ++-
 19 files changed, 106 insertions(+), 41 deletions(-)
 delete mode 100644 html/image/logo7400.png
 delete mode 100644 html/image/logo7400.xcf
 create mode 100644 html/image/logo7500.png
 create mode 100644 html/image/logo7500.xcf

diff --git a/html/image/fontello/css/fontello-codes.css b/html/image/fontello/css/fontello-codes.css
index 6a7d1c952..c848978f5 100644
--- a/html/image/fontello/css/fontello-codes.css
+++ b/html/image/fontello/css/fontello-codes.css
@@ -60,6 +60,12 @@
 .icon-down-hand:before { content: '\e83a'; } /* '' */
 .icon-eye-off:before { content: '\e83b'; } /* '' */
 .icon-arrows-cw-1:before { content: '\e83c'; } /* '' */
+.icon-tags:before { content: '\e83d'; } /* '' */
+.icon-tags-1:before { content: '\e83e'; } /* '' */
+.icon-tags-2:before { content: '\e83f'; } /* '' */
+.icon-tag-2:before { content: '\e840'; } /* '' */
+.icon-resize-small-alt:before { content: '\e841'; } /* '' */
+.icon-resize-small-1:before { content: '\e842'; } /* '' */
 .icon-down-open:before { content: '\f004'; } /* '' */
 .icon-up-open:before { content: '\f005'; } /* '' */
 .icon-right-open:before { content: '\f006'; } /* '' */
@@ -75,6 +81,7 @@
 .icon-angle-circled-up:before { content: '\f139'; } /* '' */
 .icon-angle-circled-down:before { content: '\f13a'; } /* '' */
 .icon-lock-open-alt:before { content: '\f13e'; } /* '' */
+.icon-ellipsis:before { content: '\f141'; } /* '' */
 .icon-ellipsis-vert:before { content: '\f142'; } /* '' */
 .icon-sort-alt-up:before { content: '\f160'; } /* '' */
 .icon-sort-alt-down:before { content: '\f161'; } /* '' */
diff --git a/html/image/fontello/css/fontello-embedded.css b/html/image/fontello/css/fontello-embedded.css
index 2e1ba7bc0..aeaf1c197 100644
--- a/html/image/fontello/css/fontello-embedded.css
+++ b/html/image/fontello/css/fontello-embedded.css
@@ -1,15 +1,15 @@
 @font-face {
   font-family: 'fontello';
-  src: url('../font/fontello.eot?30012397');
-  src: url('../font/fontello.eot?30012397#iefix') format('embedded-opentype'),
-       url('../font/fontello.svg?30012397#fontello') format('svg');
+  src: url('../font/fontello.eot?36632261');
+  src: url('../font/fontello.eot?36632261#iefix') format('embedded-opentype'),
+       url('../font/fontello.svg?36632261#fontello') format('svg');
   font-weight: normal;
   font-style: normal;
 }
 @font-face {
   font-family: 'fontello';
-  src: url('data:application/octet-stream;base64,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') format('woff'),
-       url('data:application/octet-stream;base64,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LTEMcmlnaHQtb3Blbi0xCWFycm93cy1jdwhkb3duLWRpcgZ1cC1kaXIDY29nB2NvZy1hbHQKZG93bi1kaXItMQh1cC1kaXItMQtkb3duLW9wZW4tMgxyaWdodC1vcGVuLTILbGVmdC1vcGVuLTIJdXAtb3Blbi0yBHBsdXMHY29tcGFzcxFyZXNpemUtZnVsbC1hbHQtMQV0YWctMQZlZGl0LTIJY29tcGFzcy0xBGNvZ3MCdXAJdGh1bWJzLXVwBGxvY2sJbG9jay1vcGVuC3RodW1icy1kb3duBGJlbGwMcmVzaXplLXNtYWxsDXJlc2l6ZS1mdWxsLTEKcmlnaHQtaGFuZAlsZWZ0LWhhbmQHdXAtaGFuZAlkb3duLWhhbmQHZXllLW9mZgthcnJvd3MtY3ctMQlkb3duLW9wZW4HdXAtb3BlbgpyaWdodC1vcGVuCWxlZnQtb3BlbgRtb3ZlEGluZm8tY2lyY2xlZC1hbHQIbGluay1leHQNY29tbWVudC1lbXB0eQhkb2MtdGV4dAxwbHVzLXNxdWFyZWQSYW5nbGUtY2lyY2xlZC1sZWZ0E2FuZ2xlLWNpcmNsZWQtcmlnaHQQYW5nbGUtY2lyY2xlZC11cBJhbmdsZS1jaXJjbGVkLWRvd24NbG9jay1vcGVuLWFsdA1lbGxpcHNpcy12ZXJ0C3NvcnQtYWx0LXVwDXNvcnQtYWx0LWRvd24JYml0YnVja2V0BWxpbnV4C2RvdC1jaXJjbGVkEHBsdXMtc3F1YXJlZC1hbHQDZmF4B3NsaWRlcnMFc2hhcmUEY2FsYw5iZWxsLW9mZi1lbXB0eQp0b2dnbGUtb2ZmCXRvZ2dsZS1vbgZzYWZhcmkGY2hyb21lB2ZpcmVmb3gKY2FsZW5kYXItMQhzZWFyY2gtMQAAAAAAAAEAAf//AA8AAAAAAAAAAAAAAAAAAAAAABgAGAAYABgDVP9jA1T/Y7AALCCwAFVYRVkgIEu4AA5RS7AGU1pYsDQbsChZYGYgilVYsAIlYbkIAAgAY2MjYhshIbAAWbAAQyNEsgABAENgQi2wASywIGBmLbACLCBkILDAULAEJlqyKAEKQ0VjRVJbWCEjIRuKWCCwUFBYIbBAWRsgsDhQWCGwOFlZILEBCkNFY0VhZLAoUFghsQEKQ0VjRSCwMFBYIbAwWRsgsMBQWCBm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IVktsDossAAWILAIQyAuRyNHI2EgYLAgYGawAmIgsABQWLBAYFlmsAFjIyAgPIo4LbA7LCMgLkawAiVGUlggPFkusSsBFCstsDwsIyAuRrACJUZQWCA8WS6xKwEUKy2wPSwjIC5GsAIlRlJYIDxZIyAuRrACJUZQWCA8WS6xKwEUKy2wPiywNSsjIC5GsAIlRlJYIDxZLrErARQrLbA/LLA2K4ogIDywBCNCijgjIC5GsAIlRlJYIDxZLrErARQrsARDLrArKy2wQCywABawBCWwBCYgLkcjRyNhsAlDKyMgPCAuIzixKwEUKy2wQSyxCAQlQrAAFrAEJbAEJSAuRyNHI2EgsAQjQrAJQysgsGBQWCCwQFFYswIgAyAbswImAxpZQkIjIEewBEOwAmIgsABQWLBAYFlmsAFjYCCwASsgiophILACQ2BkI7ADQ2FkUFiwAkNhG7ADQ2BZsAMlsAJiILAAUFiwQGBZZrABY2GwAiVGYTgjIDwjOBshICBGI0ewASsjYTghWbErARQrLbBCLLA1Ky6xKwEUKy2wQyywNishIyAgPLAEI0IjOLErARQrsARDLrArKy2wRCywABUgR7AAI0KyAAEBFRQTLrAxKi2wRSywABUgR7AAI0KyAAEBFRQTLrAxKi2wRiyxAAEUE7AyKi2wRyywNCotsEgssAAWRSMgLiBGiiNhOLErARQrLbBJLLAII0KwSCstsEossgAAQSstsEsssgABQSstsEwssgEAQSstsE0ssgEBQSstsE4ssgAAQistsE8ssgABQistsFAssgEAQistsFEssgEBQistsFIssgAAPistsFMssgABPistsFQssgEAPistsFUssgEBPistsFYssgAAQCstsFcssgABQCstsFgssgEAQCstsFkssgEBQCstsFossgAAQystsFsssgABQystsFwssgEAQystsF0ssgEBQystsF4ssgAAPystsF8ssgABPystsGAssgEAPystsGEssgEBPystsGIssDcrLrErARQrLbBjLLA3K7A7Ky2wZCywNyuwPCstsGUssAAWsDcrsD0rLbBmLLA4Ky6xKwEUKy2wZyywOCuwOystsGgssDgrsDwrLbBpLLA4K7A9Ky2waiywOSsusSsBFCstsGsssDkrsDsrLbBsLLA5K7A8Ky2wbSywOSuwPSstsG4ssDorLrErARQrLbBvLLA6K7A7Ky2wcCywOiuwPCstsHEssDorsD0rLbByLLMJBAIDRVghGyMhWUIrsAhlsAMkUHiwARUwLQBLuADIUlixAQGOWbABuQgACABjcLEABUKyAAEAKrEABUKzCgIBCCqxAAVCsw4AAQgqsQAGQroCwAABAAkqsQAHQroAQAABAAkqsQMARLEkAYhRWLBAiFixA2REsSYBiFFYugiAAAEEQIhjVFixAwBEWVlZWbMMAgEMKrgB/4WwBI2xAgBEAAA=') format('truetype');
+  src: url('data:application/octet-stream;base64,d09GRgABAAAAAFHIAA8AAAAAhfgAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABHU1VCAAABWAAAADsAAABUIIslek9TLzIAAAGUAAAAQwAAAFY+g1bqY21hcAAAAdgAAALXAAAHtkYwrbxjdnQgAAAEsAAAABQAAAAgB5v+PmZwZ20AAATEAAAFkAAAC3CKkZBZZ2FzcAAAClQAAAAIAAAACAAAABBnbHlmAAAKXAAAQLgAAGXM+npx6GhlYWQAAEsUAAAAMgAAADYa5oqZaGhlYQAAS0gAAAAgAAAAJAfBBD1obXR4AABLaAAAALsAAAGcYCL/vWxvY2EAAEwkAAAA0AAAANB5lJY0bWF4cAAATPQAAAAgAAAAIAIEDahuYW1lAABNFAAAAXQAAALNzZ0XGHBvc3QAAE6IAAACwgAABPGzjkbTcHJlcAAAUUwAAAB6AAAAhuVBK7x4nGNgZGBg4GIwYLBjYHJx8wlh4MtJLMljkGJgYYAAkDwymzEnMz2RgQPGA8qxgGkOIGaDiAIAJjsFSAB4nGNgZM5mnMDAysDAVMW0h4GBoQdCMz5gMGRkAooysDIzYAUBaa4pDAdeMHzlZQ76n8UQxbyV4SdQmBEkBwD3Dgz4AHic3dS5c1ZlHMXx7wtvEhciLrjviuK+ayBqNEFEccN918QlSElPTUlBwV+RP8DKShzHwpoqQ8PMKSie5x2WDjyX36FghkZL3zufTN47uTP33pxzgClgoz1hY9iwzsi/MTrus6OL5zdyzcXz49Gav7/Aff67LVpqM213O9QOt5PtbDvf5/tCX+or/UA/2I/0o32tr/cT/VQ/N5ma7D997MzshQsg2viyq+Z81WJfvsJV48m+S1f968/Id/krv112/O7jD/68wvEXf/sYrtrgZx37jUwzw1Vc7ee+lk3Mch2buZ4buJGb2MLN3MKt3Mbt3MGd3MXd3MO9fiv38wAPspWHeJhtPMKjPMbjfn9P8hRP8wzP8hzP+85e5CXm2M4O5nmZV3iVBV7jdRZZYidvsIs32c1bvM0e3uFd3uN9PmAvH/IRH/MJn/IZn/MFX/IVX/MN3/Id37PMCj/wIz/xM6t+mOn/8N7+b59Nw4/x8XxbHfJXhmQr/F9HMTRBMbRBMbRE4XSgcE5QODEonB0UQ3sUzhOK4e4UzhgKpw2Fc4fCCUThLKJwKlE4nyicVBTOLAqnF4VzjMKJRuFso3DKUTjvKJx8FO4ACrcBhXuBwg1B4a6gcGtQuD8o3CQU7hQKtwuFe4bCjUPh7qFwC1G4jyiGxVO4oyjcVhTuLQo3GIW7jMKtRuF+o3DTUbjzKNx+FN4BFF4EFN4GFF4JFN4LFF4OFN4QFF4TFN4VFF4YFN4aFF4dFN4fL3TxEtGmijeJNl28TrSZ4p2ihReLdqh4u2iHi1eMdrJ4z2hni5eNdr544+hzxWtH3168e/QdxQtIny/eQvpC8SrSF4v3kb5UvJT05eLNpK8Uryf9QPGO0g8WLyr9SPG20o8Wryx9rXhv6evFy0s/UbzB9FPFa0w/V7zLTMbFC81kqnirmewrXm0mvxTvN5P9xUvO6WPFm86Z2cLqP5WieUsAeJxjYEADEhDIvPU/OwgDABP4A914nK1WaXfTRhQdeUmchCwlCy1qYcTEabBGJmzBgAlBsmMgXZytlaCLFDvpvvGJ3+Bf82Tac+g3flrvGy8kkLTncJqTo3fnzdXM22USWpLYC+uRlJsvxdTWJo3sPAnphk3LUXwoO3shZYrJ3wVREK2W2rcdh0REIlC1rrBEEPseWZpkfOhRRsu2pFdNyi096S5b40G9Vd9+GjrKsTuhpGYzdGg9siVVGFWiSKY9UtKmZaj6K0krvL/CzFfNUMKITiJpvBnG0EjeG2e0ymg1tuMoimyy3ChSJJrhQRR5lNUS5+SKCQzKB82Q8sqnEeXD/Iis2KOcVrBLttP8vi95p3c5P7Ffb1G25EAfyI7s4Ox0JV+EW1th3LST7ShUEXbXd0Js2exU/2aP8ppGA7crMr3QjGCpfIUQKz+hzP4hWS2cT/mSR6NaspETQetlTuxLPoHW44gpcc0YWdDd0QkR1P2SMwz2mD4e/PHeKZYLEwJ4HMt6RyWcCBMpYXM0SdowcmAlZYsqqfWumDjldVrEW8J+7drRl85o41B3YjxbDx1bOVHJ8WhSp5lMndpJzaMpDaKUdCZ4zK8DKD+iSV5tYzWJlUfTOGbGhEQiAi3cS1NBLDuxpCkEzaMZvbkbprl2LVqkyQP13KP39OZWuLnTU9oO9LNGf1anYjrYC9PpaeQv8Wna5SJF6frpGX5M4kHWAjKRLTbDlIMHb/0O0svXlhyF1wbY7u3zK6h91kTwpAH7G9AeT9UpCUyFmFWIVkBirWtZlsnVrBapyNR3Q5pWvqzTBIpyHBfHvoxx/V8zM5aYEr7fidOzIy49c+1LCNMcfJt1PZrXqcVyAXFmeU6nWZbv6zTH8gOd5lme1+kIS1unoyw/1GmB5Uc6HWN5QQuadN/BkIsw5AIOkDCEpQNDWF6CISwVDGG5CENYFmEIyyUYwvJjGMJyGYawvKxl1dRTSePamVgGbEJgYo4eucxF5WoquVRCu2hUakOeEm6VVBTPqn9loF488oY5sBZIl8iaXzHOlY9G5fjWFS1vGjtXwLHqbx+O9jnxUtaLhT8F/9XWVCW9Ys3Dk6vwG4aebCeqNql4dE2Xz1U9uv5fVFRYC/QbSIVYKMqybHBnIoSPOp2GaqCVQ8xszDy063XLmp/D/TcxQhZQ/fg3FBoL3INOWUlZ7eCs1dfbstw7g3I4EyxJMTfz+lb4IiOz0n6RWcqej3wecAWMSmXYagOtFbzZJzEPmd4kzwRxW1E2SNrYzgSJDRzzgHnznQQmYeqqDeRO4YYN+AVhbsF5J1yieqMsh+5F7PMopPxbp+JE9qhojMCz2Rthr+9Cym9xDCQ0+aV+DFQVoakYNRXQNFJuqAZfxtm6bULGDvQjKnbDsqziw8cW95WSbRmEfKSI1aOjn9Zeok6q3H5mFJfvnb4FwSA1MX9733RxkMq7WskyR20DU7calVPXmkPjVYfq5lH1vePsEzlrmm66Jx56X9Oq28HFXCyw9m0O0lImF9T1YYUNosvFpVDqZTRJ77gHGBYY0O9Qio3/q/rYfJ4rVYXRcSTfTtS30edgDPwP2H9H9QPQ92Pocg0uz/eaE59u9OFsma6iF+un6Dcwa625WboG3NB0A+IhR62OuMoNfKcGcXqkuRzpIeBj3RXiAcAmgMXgE921jOZTAKP5jDk+wOfMYdBkDoMt5jDYZs4awA5zGOwyh8Eecxh8wZx1gC+ZwyBkDoOIOQyeMCcAeMocBl8xh8HXzGHwDXPuA3zLHAYxcxgkzGGwr+nWMMwtXtBdoLZBVaADU09Y3MPiUFNlyP6OF4b9vUHM/sEgpv6o6faQ+hMvDPVng5j6i0FM/VXTnSH1N14Y6u8GMfUPg5j6TL8Yy2UGv4x8lwoHlF1sPufvifcP28VAuQABAAH//wAPeJy9vAt8HFd1MH7PnffMvnd2ZiWtVtI+pZW8klarXdmSpbUsS7Isv2TFsR1bUYzt2JYdmyTkQewQEhOSEOI0JAYSSmM+CBQSCHEKST5ehRQopSRQmgRoebb5QmgpXxta6kaT/zmzK1l2gPBrf9/fXs3jzp0795573ufcyzhjr/2nMMe/wrKswoYrQyZwgDEmc4nL0mEmCVwS5pgoMEFkhxkwLgOfpRthmgkC28aYwCatZF06l84qUkN72rT84AMlmcj0BoulfihYEdstyiYTshI0LbunEOdgKiAnMishSYdiqdzTWyxZNliwl2MPVPWx1TMzqx9TdYDqbboIpdTjMpc5lw3n20bMOuuzLN9ZK2ZAp5HnIcmniTCzGm5bPaOrhiZ7FRWKGec6fFHkKnT4DOdZ3fSftnzP+U047bO4hgUM//HX5l/7tHCpYLAU62ZdlWXxiEcQOUMwSIAjltisAFwU+TSeuLiNiVycjNhmzKyTpfr2dLETyiU8ZBJ+yNJBNptAoYNVGAKbDqWy6YNEng9CIQ787frevbreo8fxbMT1gmHg2SjocTxjYY/+wpVffenrV8hv/dwrT934Yx89bTQWauHl+ffvfsvTV1/99Mt0wMlYHEuSdbGVrFJZ2Wz7JJFxGKNBYN/ZYRwUlkhzTMFbRZxlkixL00yS5G1MluTJiBVpxNGFVCnWnlbkRCe4h0xxCMeHh1KhCUeMB8v04/jMcjEPPiGOoztvmHs2yz55cr0UEKdkeXJSlqckn7x+Egs3u/dXTt3x0J2b+PRtH7916w1LRvybKUlav16Spqqv++SFe2yJXp/dcsc033TXh+7Cd+/YsnT0hIyEzy/x4yzIEqyHjVZWGzhn3AtM4GM4XIGLwmGsxgU2xxjgLM8xmXFRRqwGSYJpBiBtw4mXJm0rZUaiFmE1ZLJWxJTz0Fssy0ocmkuIW0pCjphWoYSY21MoSaYii80pBFC51AGibQmnL7opcc+z9yRuumjdj0H8qfPZgDG6J2AFRrqMAHzP2OD8xvm+85sNhrEBVMiAusGAFSdWrVh9+b387gOrV6w6ceVtt8FarLtnjREIGF0jgW+Gw2+///63hzPmTffzD95oMibieD8tnBbyTMURtyEN44h7cb40xjnDEWuydkQFWZGPMEVQjuALXJyWQCDEFtgsQ7TehkV8cuVAsieZKKSXR0O61IhYnfHxOCLuwhmHn2xJZLI4WrsnDkjYSLQFS5DbAR8RvWd78VDFDot/w4ybPFoffbfZHOJWLDrabL36VzZCzvqlp5Q8mSh5f2k1f0aLnjT9J5EeT9rh4FnE/bOhRqTMUHNIrPcsXNx+xmputvAATa2tTXGYss7iG0j7HfiKfjZI8y66835amHLhkGVDbG1ldAAUdQEOqqIe0cAFgSyIgiwe/t2gGFqZSluJ0DlQIHqDhdi9eEEjrgGjp8Wl8BYEBbI5l07KyPZ6iy54lEhP4ffAAoR1LVtbJkFAWOghFwBBTbdPWr6TPgtORvf43Re56V+4uPOMhS9GEBqTzfiDVjtw1jDOBuxIDSjEA36NOPFvCAs/a0EaWFEpNwQR8TXkpAQKiUtHcMT8CFEL0MhBFF3EJ94G4qTdl81mki5v6y1m2iEhN4LLt0vZcDFLBYqM/M/CAZYEsBRk9wSMTBmQ8C3eryuHFN09gC4pyltlVdI8yuWqR4WHzYiWCL36UCihRUx4REtkElsOqrqu4gE8zwPIoiyL6msS4iwPvPrLZDIYAjOQTAqhoIn4TvLqJ/w3/Ac4sm7WWekIypwJyKmBwVF8KiJ9z9K4loqnSHtjOiFJde04e4SnOE0knopD3CVo7LRt2UjfipyOQ09hEHCeEz5Ea4t/rG1fqXtXa8/NkWh8mf/tNzYnsumb7qsMZTKm6by/rtKybGO+c8MlGzvrgbXlEs3Hb/Z3xuvDN/dkZgrrKkPrsumhVRN9hWIqWp/fuGsD1l2WqFTxFbt2Db8PrxSmMy+LVxq8HkPXFFFQGVRHdAQr7QsHuWS1a9ACNv6V08GWoMRHgL/6CxDe6Zzgv3FOPAXw6h2IyAXn16C+Df7ROdX7r44Ir/4byrbXXrtK6BTWsmvYrWx35dK3Xd9TyEpcu3LX1g2jhqAoEALkDMgodK5r/DBT8LsKOywDU/E3x1T1CoShrgn6rEi6AZ/GE4dtEgnmyXecOH4s1pRNTsaT2byBxJJF+YD0jwynE+IoHJBYgsVMJ8GdKKJUKCGHKJZ785AtlpA+kJAQzk1Yt4gIZpnIThD0NuoJ/YhNZUVGvBriKGSIshDR5CQeUMhksthCgg4KsmUw7d7iIFiNgNw440MWvs/agBqM4bEDM8Oyjrglya3hWCyc46gMiAI0pWBkZhQyTVwQQRXa6VkbV31YUV89E7BR9qjqhsjlojcgxYN37gXwmaJY31wvCJaXw547Q41yyIBL9VgmZiS6mr+hSjfEZuWAqKrhgSkvcI8P3qF7AOpzUSQs/KQs6b4Vyc6Rkc5Un1+XkAuhYiLUZ2Pcozlv9fp8m1aGscseYzZ2g4yMp27f/XUgmEbANAOekAj177u8TuZeHjb9klnPY6YUCNsJHkdEYa8dFF5CerdJe0FEDgb8Pq+uqRKSAwRIkyEex47gLef7EKlshhC1JMlujwRtZIvBFkWDbEswq+F0tZQ1sK8Fy/mn62HrtRCB8PWw41rnF3h2Po5n55+vP/W7HjgPVV909Srs1wHs12YmMR/LVbLM1S2xSwIfQYWEH0X2A2wKq8I2QvfJsGkK2CcIarxFKCEVyih5hJfmH3Hm+Bbw1cX6NqzgpSn+Dedf5x+B+/gW53uxTSW+YnKA6Ing8LTwMP8NDm91pRKQuAhBkEQ+hp9Fng8iYTVyCyYgs5ckcRpZPsl6UZoEZob8CDKU4QKzwVYksx15md2jZHuQGcim1VMo28Q2AiV438d+Kb71iSfuFh8/+/jjN+7fMHrFXR/71a/4b1566FvfOvbw487jA5PbfgXTv8I+Sa5c+gfUx2TkxsvZIBsHpRKpDPYHEA6ofxVpZsZWIYaMrntU37St0oXUKAoKyifkxcD2IvGhsi3OqngjSyBfivybu9oaSSuJTzase9TA99pq9RX4A16w/1sfqnQvfUVkcPgN39m+fXvFYmxk9cqB7nxbJt5ghRESsqlJkfZ0OYviMQIZ5McWcoVwTcUgu6HcUkABiQ9QELXU7IaWQglNBaxoCTYkUcnJ1pRQ+FXlokovRDTtaS2Ef6mZ1U4X2Q/wbDKuCUqDqns9TpdrQsCz6aKUUqPl087tp/mRntM9gY7ARYHPr7poVVMJ7llowvnCwWoDwzPgE8NyTBWFYrrWxqiCLahw8kHn9gchXzxd9PsvCnTUdO/tONceFmN5NlJZ1RrnkmhFfAIS3hghnygx0rdR/EpkRiFekpwi9BcAkbAjl2ypj4YCisw84KkiYRwWlOpwTRoTx7xAGoeJXxZK8MjVX71yQZX+c12ZI6mqzJEgliX1BlVCVqhdruqCUdOZ8TA/fk4Afw12KIIkCYrzELI/xF/Z1S9DOCY/a2KdrJ+tZpezPZXLLl7DZbWtpS6ogYx0PYaGIl7gEA+LqHBh/5U5JHpN9Wmzfi9XPToajqo8wxTDUKaZohjbmKEYk3v3XDZzyfYtUxsn146tGjJTZob+JQMoSSDoCoNFM9J+g/swCkYT5XcLCnDoyWaySVmRIlQnWFNdgzVjsx9Q5pN21oTS3oK4rqYIAng4ee7yLl2pXir6uONRVQ7PclV1bj/bIEqflkX4ha6WahjRS/Uezmod1mN2Tss+gpD8rPNFKoRVdPwd184eHpz/F4+p6ybfuwrlqbQFvzj/L/mR4TwPu53YFYlB3Nylu3bNQcStKRZm9WjbLa+U0FIXXTVB5CDOILdFlBJmZUCWg6YT2jKk/UhssqGhIdmQRJuht6SQDhSHSLCmvlYJzbKRDFFEZ8JBV4tvCQo9AStuz4eqOuorVsk/8R1J+ZT81ZewxNnCbwwUo/M3uk+FY3iyApnvBOVPKa8+ygeaIz9/9SHEFuov6eMC6jeEPWHkyg2IQ0nUSMuIR0NsI7uKfbDywKo0bwytXZYSwo18rBni9RBqjIdmW5p4Y1hrnG6AcJ3tFTQ1rF0atTyCGgkiioqqNGMGUIb6DSQf5EYzPh2V+FiMTbkXLLYNaTA2eeXRwwcv3/em2V2XbN2yfnLNyNDgyoH+Fcv7yqgndHe2ZZOJluameGOsob4uSipgOBSs/QskEAftnt4k/WWXnOGCs4BU6fo2IlWNGJbUL9ee2bVn5eA5FufaCIS4jdBTuyJrwRo7ffovHnvsLxaO8MCZM8899hg8fPr0c2fOPO2RESGhenzALXru9OmQriYVD+BR1Z/viL36y8ZcrnG8mE6li8+VUsl0CcYacxtPnz6deuyxx1Kn558+fZYOqceg67Tb2ml628ngs9On55YUdcz3UlP8rxpzpXSxmC5VjznX3vqQcJnQwDRmoi7exiYqY9EgCjWx3o+2BbLtJlR5kLeN+ZC1jZLPBI0OtLaQ9c2ck/tbSe5PMGaGsSEtGA7KKP+JklENQaUkbcl+QDGB9Kqgum4n/EBs3876uT0EO+BzO+bv5o3r4C31vGF5cGiir378z1f6YDU3dOfdf8Lbji1L2no+a/P1858Cea/Tz3+z/vG68Ya+dZXg8no4zoMirElnnJtS8MG2vGy1LtPsqm7O5/i9yP28OLoG0l0QQSwzHPB7PZoqS6hVYb9Rr8DuH0EuDvsilhUWpWh7OKv09ig2/U/22ulsOdsTyQbLkWQ5W37qzWu/M37V6tVXjX9nLexbRScqWAXvvXrtd9ZedWb4Siz5x1VXYaHzMTxcOezqNLcLtlDAvjRW6hFsa1CU0FcRhPtcBi0HQyIaCMiIkwgzeDfc8YLzfqjn0fmXnCPwRwjk1/7jtduEAaEHOUe4EnANC+w525fsaSF1K1xFRZSvVQRUwCcgO4CM5G19T3MEutDyfk9rvencB2rADEiic1+E19t/HUFitf463zT/FFd17kGZP9q84IM5ILwsbHFt8UZWqHQuITCDk7mGtTipYa5BwcieIOUQFcBwiKAYLJJ1jn9l0xJLgYwohxF+dpngmlUgAx+AVtH5sbPT+emBF2H4xRedL7z4R7fffnjhBzPPQIY7P3RmnB9yyDzzoX/gL0HlJf4Pzt8uqfW6vkbZqspgmMyDMUXmoiAJIvlASVjPUWXxt3Q5FApFQ9GgSV1X0WR+fdex28kI6iu/tdcf//u/v+Hp39nde5955kc/uhCmHhZhRdTFUNoSEIn1o5IrzZIa5+q01DMRJjWNEFbzaJ5wOKTgRC92DcI9YSDXFanY5/ULVmx8ZoPzk8Edg/i7oFv8svnv88z8eEelsq2CGjy4HXuJf4iQ8AzKr2XtQTIdIHsvzMLsvY7nXu671zkNl9Ilu6A+Sq1l7b1QBrQ8sDK8cq/zoPPgJ6vvwaXO6apdw29DGaJgfZm77QOZK3AvVXMbfhBm7nPPzoNYuOQd+oYs4DsRtGmwUzDr1sDWebV3p+9zPIs2yhQqK41sc2VD1OSS7BOIPpBvCWMRENeoCpahfssOE8HL5DIU8VaU8XsofchzImxDZU6Y9Pv9jf7GRDiVCCWCmtSA5lWLYhHj75FFNFeFUqqnYJOJlSGJAfc8eOjU8S+33JF0/unMM/fcngTzzDPvuce5olp8Cp/PnXrLIy/CPfD0J//hHnqA94zVYAnf5BkcQaQSQr4wAkTSrtmFKjgqjgbAN198kWeco3D3b6m/5oL6vQ3w4oun4G7n6ILt9mlhB+p9KjvI1lSG926fXCUysV9HEBRbGwIiAYdMpyMyWgLI26s8SYAjSNkCsnq+b+clWzavHW/PJZoJ/ax2KGbQtEesS6NWhqq9YqERirZ8Fi17WcH/rjaHipsiJ/CYIc9MGRkR2vjInsiJXivsQa2/VC6VXZmJBoCNdoBda0xxfQm8f+q6Kb716q0QU5X9uhFulSX/Jq+irK+r1xQxcEz1BBrsjXJAHrVESW3V/eo+RQVd2q/67HS1rro+Wq+pQvAYCkJ/zN4o+ZVxUxS1amUdZvqnp6+Znr6OngfikYaC7JMjm0Aa8KqTsYCuXK55BiS5Epd8sqfgjzX4URN369bVNy9TPIq5aUlVo1+SVsdqVesD4Knp3leK5LtRWQil0FvZZ9j/ZR+ovP+X3+Oi7+AuLqnPfu6owKQvPPzgW6Ym1yQbNWBnPlhB5F2xjMv8vpu4IShj/+cH3LfmZjBGdFA1SVORo8lc4bJyGHFe1Hxoj2gq09Bo8yJ2S2zWjfFMe4D8QqCglWIYrpVCKrtgTP7jz7721Y9/7F13HD60Z/eO7cVCew7NdmR+fmR+NMUyMRaJvDA2XQlUFEfbRDl/1n/rpPeem3NS1N9wziOm2yJNOZD/TnG9eElqO5FFZKg2iU1ga/gy+fyghCIOWTI27jZA/QkufTeTdd/9A1+FVwgJrpmGRzr6OiC3ogNq5xdU8WLZE24SRc9IQKpELFkRvftl3Ru2h0WvvElEG9KrXCSpqrRVMar1dFmuhKOyIlBFwJqrJK+0WYwGVa98kSzDvi2yHuMjIEUaDY+hdAgwIjTqypYtit4oFAMg5tRgMGaLfDWPaVhcq51T3dri7628gM8/a+zgrU2o9fHteOjP5f76cuyLL2w3pGWPGBwWC4Y80OBVsUOegiiu80uS2uGJWl5ASpMWa0oBrKmrA/VuTaObaopyPOJtCHu46jyzQVP9viEf560NaQCjCK2c471f1TZoWsBLT+JaEZGwFeUJPfIGNN6Dz6pvZemRp5itvqThS+riS8j4sosvqTVeyQfgnxHf7YpJ+s8S92qvSe5VMGu+e3Louz7ss0bMOGtYPnjFZ8Ff+gzyshsxyyJ96jVsrx/+EtsLVnyLLUUK1FLalLMtiTwsBEL6Tb/j8Zvc43r39U9ga2bcoMCFUfNZ/R/hM7wN9cy6iuV1+4YaRq1J0w6RhqYROkM19Ibyr+r1ED7h7MYmnd2GsQvP0AqtRsyz04CTzpsMA/7YiOs7DcN5AYuNnUas+q0v8auFEfwWwkE7Hw6xUNXNXIUCyvHa5/BL/CB+JGbswlZbnRdqn/ugDgecy3R9Fz6BNvo2VaCKNfmE33rfwrfg/G/ZtvstbrlQp5GVa4PidznPQ1u1VRoZfiau79L5x50XnOfdSx3+xP28242aTvEZPlqFnwQU6CSRdsQVb7bpwo+CmNnFodVGJXxiJ4II232hNrYP0kg+aMztxG+04dd0eo4d0GuDojF9XljNX0Ne3FspoG1NcRTgR0WZk0EzTWcG2yigRM6cqF31Kcoia4CGBWeO3ImcygeZbFmpusSrfvAI/17HAK/knh3Y0ceF73YMDHR8VxjYWuHw1cHpQRC+245P26hoAL6dGxzMfZsJrzk1/yrJB4u1VtIR+H3atXlOu27GN1KkoqbKqKOm5PAQalUpeBAS3Pm+s8d54W1/B6VDR3/ofOvHnz9+9jhpginn75zdzvc5JL59/w/5oaNQ/Dv+Y+fhs8fP1uJvfyKcFBpfbzOFgl6PgTaTCIFzyC24sxOx3P6kq+YRVC0nIItJyQquAVUWxsZ/NP7Exvm/ck/wonv60RN0Ko//ePzJjfDe6hPFPTm3PImlT7j6yxXCI8JG1wLJVJJodqK2DIexC1cwCg1NE5RQa2PCZCpj91A/6mAQ7BbKQnCzExAvy3EoFygGigKLd8Shadsy+Hg47DxWVzGdbeXjPBdvboV8Q0sr/AyamlCb7nZaYwOW81gkAj+o/LwpBx2xlhzwXE2nOijc6vpwLPJQI0iwS1YkFNRVZPqcI+aiBsWFw6wamp5Bk0MkH4ogbpXQLBHRUsaXw8FgNCRjhyPBckukbINSht6WCJp/veUgmsuf41rTh5wT/zIJsnPywzyyzfnwtZtOCYXP/LTpQeeWDb8E+acfmN9z8mLny6Bmp1zb4r3CXULatYHsN8aj8FI8CuCfa+qE0NRpgLQtSOCB60B3/t25zXll6EUYeZG/7Hzp5Tufgrz5hPMd2PU58Div4MN/B/3zH8KHUHmZv+hcDfmnLOc7T7h6z2cQr2WWZV1sG7uJvYudYk9U/myN36fIksS2XrRl8+TE2iCaooYg7d+7502Xzkxv2rguYgLzceHA5bvSUUnlbz+cSjTUoYpx4/Ebrr/6zcl6FRR5bBb4QVD56PCqytDKgX7yBBnammPXXXvVlRKMkBfiCFI2alU4CypqUaqM+hKpS3NMAa7AnAiLYFFrYNlKYJm47z133Hbkikt2jI32FDrz7bmmeL0uRdpXAqoPWVdr6LFJfSB9JYL6BpqyqBAlSffJoqKBQBzkiEFprFqrj1Vr9ZXkQv1sb62+UO5ZrBf5PfXKqH0NguuGCp+7nFH9AyMT9Y3qZXpj/cTIQECZmVECbpF+meoW+dW3FScLvDTeBxV1VPWkS91mxDfOreDyZd06H1FHVF+2r9OK+EbNYP+yblVMy92yWp9OeQN6V8DT1pSUxU65W9RjrUks6vb6qIivEaOtMbk+JAdjITFVyonNMaU+9evL1HjdxJqV1Y6sXDNRF3f7Nj6KHZmh7o6O1zf2p0u8sKFL7PurhX6Iw24/sG/2Yj+G5YXuOpsLAU97S1rlXVK3rDe0YUc8Pf5qUbfcg31rw+7WReKilY/KUXi0Iadmih08wWpxNa9rS/5hvpd3wq1/47wfsWti/jPObvhg1W4nO4ryEobwxR2ViyeG+wSkEYrDU3LVYUQ50DW0XXVkETqq3ypDzZ7PkOdUFFD/pog4mfWUnSPKk1ccunzvzh0XTW2cHFzZnW9Np5KRdgM7QdkJqHsPApDPsVjK4snHEc98HKUshVKSwZ5CXLQpUtBbzA5CMUvR0iyl7bjKL/1VfepuWKHmpSSte5CXUfeNk46NKvBJC/WgmMVv6Yg9XYJE2eczbW+cWz6PpeNPD4UUyxfzxPg1a1fP8YCpN+paKDrWIEWgZXbDeGn/mlWe0+RXfL+5vDnm9VhRK9Y50dqwe8XWxYQH2NSYg+Yrm8tF8A9PRL0Zod701RmqXwHnAS7Lqii27fIHtFxrKJb1JTQoRAptIbM94/H0tW/YUW/buUbYG8951+bivpHxaCS1YVVP3/SCbfuf/Ba0bRXWRHJKQnJ2cyMOIzFfcaEbJRlOl8IByoYIt7jBZVta4j+3yXdbc5ydgUayBODZZmv+5653PHjvN09xcqN/5FD/NN+08rTzBTd9A4atZji079579x2qxm8pd8XD0hS/pSg7cf/D1VDlHHL/KygRzQ2rUZ8k5MDp3mQkRX1aSL5BKwW75nbDXtq9FjcuLpy2fCmfhUYx9Lodq/UPrr3n2bt58KSbOnLS7eKhuH1eJy+/h59ii/EH8gdU2JVsurL5zfuDfjevjFEyCUNE1hloOiKyhiDWXARWJUGlcJcsSjIisqK4gFW2IWYrk+SWz6VT6XhL3coGyh0IL8Hg5CBkET8RPUvVqBelEPp5FYnJ4ONkBMa5XXARnVwsqHgnLdKtkolsXiAPQvZcFmIt4tMIC4h+DoujIdUDjboZ4KXusbXXBLw+bySkq6GQZhn4P6B7417b9PlKKSjC07GOsen+3Q3ZyXzMCluyT29oWW6+n7D5tGfV+MEVQxtmWyAiNfBtC6jsfCtc1BO+TCyYa9UD/s58myQiIYscMVnXTT0e8gYz3ujEsL9Uajna0tGwfCuUi8PrU5FQqSvvjbWv9ebisLcxZ0ejsG290N7n8WRykVAbW5iXp4UtzMPq2TB7R8Xjag5jrQ0owUfXPerbtK2SVxBnEG/24kwBexNOoSiobpoMSAKQvS+7cowYDJcnGyqd573A597oje0VT1Mi1GoFk+GQhhMpFRHw5WKCoh6FdEsmWMzzhI9HAhKxF1PGWaGZGRTLRdeyHnRnJQ62GRdgXmvpgtCKVs25kz93X31x6tBUsZ4/lGs8i8R1tjEXy3elQvzEAam5o1k6eDNYia6uWbWrRdPaVsCffgzaYgN9iUTfQMx5/mONOTRq+3ON0cL0zG3rp+8J6AbiTCJi6IF7pjfcOjtVrPGDJ4Up1Alt1DeQAnOpBoELftLqKWdQEBd8WsCPLNowZmT5iqibVIQUmDk/RdJ1UkA1OdLlp2XKbl1ImoRHrJix+UkpIFZk+clNaGOeRaPwI+cuzbi++UnZJw/JsOIsJapufkqSKliANRBn4YAiPeVe+dynm57Ep9JSn10Ux9Fdybc21QlcDHlwZO5A3BCMm/cFwrmBrDDt+rI7kFqHq7l8OCmLHSaiumCEREzwEenJTbrpdzPPYsampySfXJHgcbMZ+yTTtfTUZve5BZIiP7lZj7spamQNYwUa3w8Wbyr4cq0GW5CbP3f5TZFdzrZWtgz1d7SKgoz8BvmMQXwGDWhuMJffSBp3+YxAfAb5jkh850J+s2d2ZuP6QmuqI9GSybZ7EFHPk5ktRRRzyHlcVkOOKRKXYFdlZZUP1fhMO1S9RZaMrGaJqCwMSqiTDYrEhJdKSiHUEXO+GLB80NXmTUesTcFMayjUevCK/AEhaHIt7lGfbMyNT/fP8DBPwOzGiQM7W1wJeVr2+Dw+XRdS+DWzPmGN7gDvty+Uk0ZzPB9NJ9ank5f4mp0HUglYKhpz8f7pZHNVLmZbqmJR9KghOZSLe/KJlDm5OpOYXoD5SwjzHjaA4ufyyp4MqOKGta0IUE5g55rOCdyCoQkEfhANnAaR2IM660E5JuMU4DwoiiusCO6SgpbwoYO7Lrn4oqlNY2tWV7q7ki3xWCQsctYDPV60itM9wWQiz12GTa4/gVzjJrL2FvIl9tNkmDZe2W66bTUN0520cDUDwHXalXur7jo3z6wfMpR/ibOH2IuyQnQzVVkoZKYSVkAUWi3VS+lYutTaBTQtzhdjHR2xJ1F6xVF74aVLrzj09erUjeEctOw8OLppN5rGYU5Osv5ve3euiaTqtayZCgkhNaSqOFcV2OuLWabE80lvndcIWZ5EOpqPNxsdy3NawpeNhVpzmjfUmU8l0ucmz3mgMdeSRaaeW+7xNCen3zKdyIxMgJkKrovnImJA12XIsXPyd0uNHr5dab4MvJ4gaHwbgOYFGbYMc0VioDJ5zEIVAnm/hrx/lEloAUkKGjOMqXtwEkVDF2nyBG7gJHpwUj04qV4GsteV3bKk4RwqjClTTFEoiUBhKBPWLGlIPfrfbWd7xdq3d8/u2Ut3IkIMxJLhSCKcDflcmVFLrg2j8FBwhhU3RNJLk20HCT8Ssm2iAUVZhY3g6jWot1JqqhtSRwUoz91gQSabF7M0/TYiQRx1IstG5dUunUtKHt3lD2qtuaBLHuSvrRJQCjbUGakdvmbYm0qNZVpycZoeWdcVj+QT2pqMfCIT4BNrMi1br9oKySaPZ3n7+h3ti7P51FJqhqUk71PO0XzX+cSNbb+OumGRE7Alcz/l0uWb2Q2V64rIn/Y2o2zeAIbUjmQ4BlyTxrKURsYEkdjfYZwSWfFUpwAUNoMM3xDBIDapahKxR1TSRA2Fua67wlzfxnSuT87t37xx3cTIcGWofwXy/65lHbnWVDJWb3nRmAVa57ASWlAikFVB1oWoIGkWkHUGyd1f7qVMObqgsJewEPIJk3JG3JLSJGSSL66nvTgokE9/CPCHLfRWva84pTbyzFAq5Dzgq68PqstSnnqwkKSQ07o0lVuRg7rmLGlUmg9panwhw3rrBqEdKSmeQkqCeBuRUiKT8za1cdUj4s8jQpUBtmRgRWf5cClbYwoK8QTQX88TzCpHgL/3ETuwnD0uJwiKSzlBKCqbKVB0QfOKVW5Q5RrV/L+vCC/xTyNB1LNBNsIuZhdXposNnIlbZLQmp1ajVrFpuC2rgiyDWA2pMbIyXWeVjL85FGv4qxoCImOuTCN6Etnk5Lpwvi5lNiqUrF3OI28so2h63eKEshmRuZv27EY1iEiqQRWb7DqKpygWTpESJrmFcwpJNw6TLROxQam9qw8SN100AweXLGH4Rv/L/TFJV0a0uk23Fgxj66vvLRSaEJl9RsoALbJt7R+LZw0rO/13x9qu/fqaVbuSvbubjQMbkwdX0uKGu+HypUsb3iLCAWfHgYKWlXUll7pufTAXuuV9ekmTZVMGyZnfcFMDROtmwuHUstmDE/qJA3sqQ6ndpfCC3nOJu35njO2q7Fid5rLWCZJsg8BVyv0cY5oqq5p8GBVbVFglfhitLEHmCFQQyMwiriZLKikPcF7u+OiaTDpdSmd6zRStBQAzUs0hV+SFXLIC5ahU/YS18FQ4UtX6EKldHlaLcpV7CeJu5MoS1qX+4f2b3zcwfk6NW9+6pzxxc1aOip45VfeZgWrp1NF1WGhLniOKB1Ivvn/z/fRSlPTwU08NLh+v6oyofq1P5WBiUO/zeuCJWsn66r0s1mpWecnnxZSrVzWiJEFtN0M6PlTVQ9d1fVRCC4LxaTxxggJnk811bX31IdcGJjMzjvRQc5FWA3UkX20g5HFT67NQKtKjZLX4bG5FB28dzPCLTOeXVr/pvDkSzzX+vHE8AifN5yNY1mjWB0CORPDJeONx90GEb4vneKaSkruc78WxUoQKxxtfQtYap4qNbmEgiO/106O4W1rLuVXEoPBnqM83sw7Wi3S3rXJRG6AuDApPJhAB6gB1xDERxeYo5UQoIoouRUPkUKRZJhMyIIOsJmaCZxwb9bK1+WUuQ+xe1pvvTdVF6ut1Upqra6BkFxqZasywXGq2BQ0oFGpblH2QQR1FQUIT3EgoKZOU6Z5HwAn/Fo/3SXHe6Nwb39b4s6sOltQ3H4Sug/fDIefRye+9b/IqGAe+3PnU5AuTyfDWPadONXfxjpGcWIiXJicPTU7CvzdPN/VJTVvjzj3x+M+OHHzfvq0fefPBg6+m4DBMr7//uxuO8Fbnv/pgenIy2VF0fpKv5PFX3LB/kzh+dHRBvjwi/JTPs6Cbt/qZaiKyToSTBUSCsVqKMZWwWsnSx9u3V99IUTIwo/VV5znbxfOc7bW24kvriOB65F3Paq3WH9bY9u2fTYZtu4fMlyCSF1Jf1XvvA/Lem7T+oJhB+kv3LLj1F3CTZ6L/t30ZXB8MOi9FikHnj5ftD1pdqUwhFISBneNp2ENPBpLgD4WcL0dn4Ju/asjEnN12Iez8IoTS/t2lP69DcZ8upHgg8m6xzbkqUgo6v0i2g98qmLCnqVCzLT8vrK/RW6rSQoGic8tVmCt4a0SGFOamY/0+Cvu9pPRGFPNb4zQdlTY3N8vQNVWDNRTIp1iNykZcZlDNFDPDddVIzUKIpmyX/SC4yW0KUJzGVvht1UjNbZ/Z+Nm18MOjboyGf/HHaz+78bPb8PrJjfy6z278zOgPwWl+ku5550/GsW4t3+4Ef3CxT+2VVkpdojw7la2hMBKl3akw8tsS7mw3ehSuZtpBNe8uWO3n8JWUXzc87CbcnTyXcMcfvHoCz/OfX00ZeTzoPnF24+HNqxfylLo55QSFKn6PxGvJNaYbIkVLrxqERXRCIk8VA9ANXaECaitvda4P8UgdXn0bOkOpQsi5Ht4ZXszXEbr49mqbusBrCTimGwrtpYArrXFxo5SZEHmSg0nEym87z2DLH60Pwjud64PFZBC6nWeCSddn+GX4F/5rbC9aiehClYcvOKerrXZXw7iDlDPltorvhlLFINzqvDXclakLQRd2vIh2jXM99jxVi3F+Hds9izNhVxADz2s2WgXAwtjdDsM7Q93pkPMstoQDhsvwHj/hPIvdLCZDC7Hg6vqUETZV2ch0TT+CCoKiHfGCoipHZKh5X0kmA68qOh5Awa1O4UmFrRJewsSqysqB/uXFnnxH2A4H05GWsOlzRbK/tpSYnJ/n4vj90JuMmAs+i1I1z5bMw1pknmR0xPXe4o3wknGXETefH/dZxkk9rp9EsTr+vEkXdF97YMSMhQdYHWZ8xh9Sb2nL7lrF11577Xbh40KPu0a1nXVSLBC1DwWlz2EVJZSkLEk3FNHuEqXXxeA6Ojo6OzrDqLBF7RRlmgWLg9wuxLlPQFupjObzoJgXfDxN3mmSNeFgT3Dixocvu/STxyYBL76E52v6Zm6++6bZEl+x88Sdt+4YgIbWoUymkhFPwMxCvS9+8saJiRs/eenYiZ0reGn2pntu3F0UB3bcujeWSPSlIOG8C9qdv130q7vzTOsvJytrWwHkIHa2nOcibwFJRD1MBvkIqhoSF8+tLse5F91V5ecv21vRkO4tpXvc9bfnLw2xakbf0nUhtTUArqdqMdKfreVzCKHFJSG309JE59rFxSBunv1zqC3tdu6tuuTg0G7K+2j0mzD52OIqELfe4hKQx1Rdh+87PyPvFb5YdV/Ri26GyEKs9yX+FdRBVrLBSn9RRRTPGNyN8gpcOMpEcrGKtPoSJ5VyCGnJDPBJYP0rUonGhlCAFiLJlDaQIBcIRfdQi6AV5T0FihRC1dVN+qXrscuUMjVDaojMYKT75jjAK1d+9WrYtLbL762/aE20OZPAe37dl+GmW1+8LZu74j0NKUH10RJpwSN6TcUMKP5te+DWFyHw4q382IYTk4NXtsV6e/KpgYggbTjxvhMbnJ9e9uFZ8bKMKno04Ghr+iWfpdLausI90/ho9sPV3LWl6xV62Gq2hV1TuYpWLXSkuCJX+riqbRrnuiGet4gBlXLSwBRNVma9oDHV0NRZHxhMlwx91lNd3uA5t7xhZKRYbGgY2TIyNTlRXF0cHljRlW/NLC558P+BSx7Ci6ZnFdGkc9eEXD0X3r/BEomTugq3u+s9rlV1eGDhammprr7xOgr4GWGruw5l+29dpXIuV3O7u+a/hzKYKYuoCUSBuwnqZNAcllBZwx8t+QemwOuCir29yR4rmUrSkn/oRfMxubiqYXFpQ6S6xqjciwZluAbPBYLk3zD9ZyzfGNLMY24w6bHqzRmfddfM6vmfExlxe/UMrEA+CGfcKmdMv3tD+zicMWFo/iUks9lVPEqn8/ZloBUGrZW0VJVGi6uWz6ebiGk3VLNJSkt3ZKjuwwBLNiaA/1puGJ/4hGEsR0Y/bxjzRgwOLNl/YJzK8XnMs1zXHbcOtCzZZuB1/fK+Qb9i1rl+XbA/xHn9utupfm+he9iv7y7t1zwlRen4uNo9rPB7+pWvoKCuLlIAitvQrgev9x9ETNSRSXtOXwAwd+OK87ZzuGO5C6pqD2LGw9iD7y/p3XNY6HGhiQPQ9Ycf1u/5nX1DnVNzo1SMUoera1NRzRdcAUeqPRdoOs0LepY91730Urh9db46l594WHe/jTCEP17SteOOvtAnt+uO/oulu0ZALR68Bemnv9JHa/QkkR3mFP+RKNmbDA9aFUeyidaLCrRetLmpIYpKqk+TWRKSC+tFL4wMx6EWUe+lNFg7wtcvDb+64WHTn/JZbtz4I+eHXs+4G0EQdZCr6QzhF8rFEPxzbS1eotIkVRPVp+kMbJvopicgMeO/Htdaj5DfrbpRAVkQUu2+fMH9goXxXNyec3s2h99vrJ6qRU3uDR7w+rPnipdWOe96YS8O9vzi2kGcdWTYoiC5gURaBezm67u0Quh4Xs/Li5tKECRRgl8wEqHmY8nWlk499wb9oev7D7nAPUSlIC95CGp1bHio+Q8W1lNnWZmNsYvZpZWdm9d6BJ2vWo5iq7uN4zTX0bqLMTRGZEkG6bCBGK1rXCfft6po6gwtW0A6J4crc+MhOEFAIuuiLevXrVlt00pHM5kyKRCVXtBbcTAL2+YEaxO0KHNaqsO+8F5JnnNFLYBl4R4ekB9DzeSMqnrndHVO1fHH16MA6nKF0bNYgDeufIK97s1Zuj7rXp6kSzzkZeUxSTqjRQRGJfNM3zhHF3QA69xlZM5dOXZB8RJ4+s+HZ0zQxXPwdDmCOIaSCnVEARCeIsJTPB+eAsHzHNK49uA5eCI07UyS4CldAIffBd/0BfXCtZ09FuAbvgDe/KPnwOK88nrYwrXnQfA8yJ6Ded0icIZeB9pn/iB4nhJCaD/oLMLa2DDbQ7xg69BAM5NgzYU0Nbiy0O0uCLHkbJ6yeeJg52kPBZuSwcJ51Jczio8rbrBsiIp8gkIJqm4OxRBYzWWklrAsUDIRBVd4Jyqf2UGBsvNL7roL+JpYaYoEfJaZiw+qV5STORCm9o28zWj1tH7o/mh9wggU/d1vu6HgL3SLuhgLd119qL+uNZ8yfEFBPwaDxzxc3evvFKLR8J1ff9dm2ilEbpJ9Eg+EEmrD6IG/eWhrQoOrkh1hLZ/XDLVZH6jU+UcyPePaVrgMlXClvkGUQ/6AyeWAX+Hm/Ld8fZlWT0M91yTdjIdLhzVpyxYBzaLwjPOrYCykjkb8Q3IgquQeSezO+uoDIUGv1yPdde1GAnmAhjDeL2xFmaCghd2CaOaFGLTBSviJ0OF6u1a1QyPo7C1sDkX+djSXKZ1IQ81VgHr2AVqThcLtS6ybpVzGLaGpBxSDgx+4np8AXv8H+wFe0Qd+RMEZvFJYzdf2O1oX/8et/7/qNvkAKd54kGl+8Gu0NQDISMqHUb0EGRVPNHdEaQ4bRJmK1m1tc5EAqIE5FvBBwDfHfAr4KM3SAMWY84ARxN8c89PuDX7UCIO6HpxmwaC+zQt6UCdPInkdjy5+cSF5VqAPz/3PP4ya3O/4Lnkw9ywZKenWh2X4fzDG/z8Bun379lVZ+Bb8NXwBPg9/Ch+Ft8DVcAnsgIthK1wEU7AeJqELOtk8e5W9wv6NfZR9hJ1mD7Lb2W3senYdO8D2s0vZDDL5Egth10x3yx25t1i25YyCzEJJEBexKae6VCxke7MZqZgtD3K0XYvuli7ITiheglfEmOgklogVIavBB1YZTX0K88q2mcyD7GpVihmnBf0KxRNLNiqEyM0ixN4E28LyKpuKU7DS3YYugxpvj1tcXT7kJpaBj2eyGUWmuKZN2R+my+sy5VISu2tV0wiwiTi3S27PBlE/LrudwprUXm8pj0ZHT7FkQSmTzETQSFfknoKdl+WkbLlpahTgpqw1E18sUgwuIVs+MGnvi3KxUKIP4OcTctbd4ob4bzJBAHMhwbMZ/Bwx8EF3+wKLOqjI1C3Twg+4OXEESWTn9CCb6SVHgLuGyl1FhaeeEoXPaUBuFJ0+IyQJnJky5TUSgGvNu/AvleMSXCkj1ullQZV9Iv+awLkoShLXORo5+O/vm1DnxH+yyKVc2BvuCslWUOWS5JE0UQY1FNBlj2pqzaro8UUCsqx7FAH//AM6SFYg1BTgooejAiWqXPfp2KxHtxRRVj1ywGiIQ1QJ6lyS8auqYdbVNcYl3Wfrpt4t6YDGlURbefk7mm3bwyEQUHVvB5GiJ0TapcDNesHwGp1FjYcCYlSGeovCgVyX61dP1Hk94JVED86Jyn2amck5n+SygDamzJHQXgbRI4k0OMUyJHmPLEsiF3BkCGWVq7pIe4jhsCVdhpWGj4fUejUGkZJfWxHRPbIZ2B8x6lrNWPPO5HI96hGlEDYsc0np0oMe8MRDsbCk6CJa5SEe9iT7vH0pbzSKXTNWN2TqUP8BPSD5dBy+MagqHGLLrFR8RaQ5w4VwuC9eUCVRl6WArzmk+zw4peCxVNUwpHgx0pJoi9fjNIRDXAFV9ek+fhh0EBQcvC7IivArfJUmR6ZNDXEav677/EpADcg4eULDoGGkdqyygEdH6yIJ1YfDTOYDlp0KoTjmsRjwlF/XJR6KBC0PtjCqSTg9TZnmoBoNATcgYHhCEDW5hh1TaX51kYOGOh3Nq8BlFQQNeyqCqHpRd64XRBEowsORjXI14fMmgxIXfYlYJiDMNOt9ks8TTPkDupDqUzTDm8lpNI/N8ag3I6mCIMhSo6a1RtR6b8Yb0IeDnhUFnx4JyfC0FgAJv3UIhynS1pFaXNCPyzpl2HLu5wLcQlswqSqyBlHiZETxeUv2+fSAGApxozWA6ifCWAXUQ9DeVHSuqoqnIGmxUBSnX9TNUFvIEEBRo7oie/yZoCQqhhBSuRCNpwzzYGMuLHk1T6C+3miN+ZOmvrFx6IqekagHkdXelu0dHupvubor1moKELICiHKI/mCq+absaKqVh2Mhv26aHkXOZdRQLISAdE3ARVtaRf0vwQYqyynnk4ObMswpZRgNEg7uDjOIp2S20s5ugjipa81N9XUBvxbRI7VFuaacyJN3PJugff4KSPp8qVNicSXt3VsW9moUN9wFlywxrxdWDv566s4P3znlHpxnlxjY1T0ZwzX/1GqKAUSRSMNA3j5yTowxUUZwCrS/qMJAoZR4WdTkWQncuAY5VRSEPO0bo26jrfwmh4d6e0tmEjX+pBuWd9X4RV1+0SA6t8MG+YaL5+0lFA6e71Pmt+jq065T7WlStRcvxxadvuQuHj+3t9DwLNy7tLai/wVd/oXuvEY1F16DVxZfqPq1PK+9hvbQz8+zhy5n17J3sveiQP0sal+PVz4dgCj79KN/+vbrN69F2+f0g+9/84FVyxVF/qO7b79se3eb4jrTLdrHix2uo7VmLDqHkLYtwZ6pR+rzoVkVVWcjfq6FPGRdybNhL1cCOhclRZwNGtxNKaezBGhHUVb5E08Ae+JLT3zpi1/430/+2ZlHPvGR//XHD9z3nne/6x23HL/hLVcdntv7pl2XVG2tlf29PcvaW+J1liYzFJ4NaF+EyaSqpbuS+0NCSXMBiElY2bBkT0HyJ1Lm+u+7D/836yuR85//rvtyr4suLcHTNGfjqRIU08J4cytM9zvxdDFuw7V2MXiR3wJnr66O0RT/jsNJXR0nf+043b/+qvoYDbqF0tdd9m63mp0H+LFiZt7tDL80XYJLwsNZZ7p/Gnu13fURX+QvWfPHF7/83t9y5bz8P3n8w5Nxe4fzU1azgz4tbOdExQs7+HSyIaTiMfYnlQ+0gyH3g1fkY/XBiKAEQDYUecZGA8Pw6MZsnd8UJB+IKGdnouBhXu7xziLdI1lPW1pIAFRaBWAzWLTg9hsZqVS6u1qaY7Fo1DQlZHgjYyNjo2sqqyurh1ctL3UNdQ+1ZZo7WzpjTbGmeGO0IdpQX2dSZmDEq4thKUyJAcEGKdJejiR701W3/YKJPwSRlt4wbcaBZ4GWbSzxMsEF9xLWC2O9p5+G28kLd5IOLznx48eF7c7e44gQZuAu15PtrhGubmSKN6uOH3filbGx8dorVPzc2BjEx8fnnx4b47csvHYX4dRPF96jHT/HqtWqPknK5aY1ISOVVU1hlE4p1I6YhvqLsJCULglH3FWocs2D6uanwz5g8VhdNBTwopBlaUjXnJOUd1culrOymyNLuV9u6j1qndlEVrFMxS7xj07s33/vQYC/7Bldt3//utGev4T9p/bxg2vH8ApLwT54z8GDaxXPni686NrjUSb280N3HwK89GEhc1NlFvZ+ovWEFP2p5uCMsS1sJzuEtuc72DsrJ3Yhvz48PbRMNPRSKiRIIg6rjpmROnOWRayQT9CNiD5rh/2CEfCogigZ4qxXc5VBd5uCoCIIEI3CtHsB0W0sCtHJE28/dv3VVx09Mrf/TbOX7Lh469TmyXWja4ZXrRxY3lfs6epsz9FOLe5uLfW0wVN1dwJKKnYzFWnVCZVw2sHgXIEPoVQ6/0mtwL0AN0sVkYe2K1wopL2fSN4QX+pBeaPUXl8qd8il9FwtpeN7uYFW3tGX/17tHj5VK3jhjR7AxykfsqOv4/lawXfNwHyJUI9/A1Gs9trEwsZQQqgxp+DFitpCfzr/Op5z333qgvt/XSi/4N45+lxjjucb3CN8rVb6zMkFOvlIrQRufvUh95s78FjLPzkoHnHXq5B3dSM7VWmYzKR9qAH0oobcArQ9DWfiWDnKZUpiDqCp3cloX1hw9x3kItuLWgLpsRQnFFFTmGUoxNzYAXnnuYRWc9f5b9C+pr//le0Vz5qRcKg1laRtfBqqS1h6a0tYNLSHXMvVXFzAki234J8Vtt2kokw1yeD8JS2Ku6QFTUQ+ojV3uSta/hZ+bu+b6NlaqAf+0Vz87PQ1U7AFHtqZWJl8vFOU/+sXUkDE836DFrmYcPNBsTmXAHHNwcaXpcDiIhcIwce6h4HWuDx/1l3ismL8wHvLX+Pv75UD4qvX4njoYkcw/Pp1L/p48RsSKl6og/y7eC3/CguwFjTWs5UUgqG6/wcSE+0HTFk2tQ2By33pVtt0l5tVV/KYcV4Y5Gm8oeAq2pEUkS6j0kFbHwh42VKIc35LfvLg1Qcn87UTPNyxYX//C6s38Ik1L6zAgrEVM7eOOVvGT8z28YGdt43CI3QJMyvOvYOnFXRbOPXwqQLdjN+6c1Do233TqZv2FHnf7Ila/PM/xOtwLCZyS9pntLZA97z9at2sCSsSb4ykrXS5KLmZPIMcKTAuVPvNJQqrCwnaypx6Vu2O27NqJ4UgdYXnNu27bt+mnFgYvwJm1mI5duOeEzMDHLv1N+cP2fXV7hdeQh2cdPWD7AZ2J0XBL73k4i2bkOMd2Lt7/aiOKDk82N8cDcic5XOZJHYYlTvkiGje0jbVyMXnGO1Dz+cYqfUUkqLdNmldliSolLGImuE0k2VacSErk7ff9vabrrv26JGZXTu2kaIWou02SavPDHILOSrNmDAopk3F3UU3YpLLI0u5qhHa4zRbHkSOlqSsA3xMW+Vl/LSiomwjLRTJ91GmHIRSJ22IYstmgdKEyXdiDYFlI1L4xLjg4oOQ5wjjuMBDZoMFoZilfiX9nmyRf0UcGd9UgEMrNNQZ1Ja2Y2tVQNNQa2s7cpmq6Iro8fChbcGMLAsZdWWDyhWlsf3YBG3gLYLWmrxyt+U1B7cGm9CkblY7R6/78BMfOjYsTlz98UcfPrqhsOnE577+uRObaieYRfkaajS5mYc1ydtSRcH5vDgwOl5sOXqpLOGHpTB+K+1+q9/QQ2i0RiF344TKaY9erS191WUhCXQpjB+kWmllZZMniX1W3O4orZlLHrpmnI+89UNPPXhjRZ688uGL9z1x26Q4fdOXnv7STdPi5G1PuHzvTajzb2EGs9ysn2eq3ks/CnSmgiQGA8iLhIVUy4ViYaH4dRUXki6bZVjcekmhbW6PqCBKqB1Ut/nm+2otxpbUU0UUma7ysFDnjZvZvr3SkEraNrDWbLI91W4n7ES8URaZAYZGCgaFAtIZWckOghSOQ1nJ895i2uUOcjZcQhZJu1/kEXvgX2+95uZhZ/f2U7H7x7/pPPO51vsvfvs1XzoqfK2Z91298aZTP+2W+54c3c333bZPnBGmYGTdOyxp59Q/bZ/9iXPXpqnAq+E7nrvhvqbpxx+8e9mECpesfWxY3HPHHj57F9lX8Nqrrn3Vg9IFbU2Phob+yKqWZjSFy4AEMzamcr6mpi25G1bhaGWKzB19/bbAxZ6OXMT0+wydbYSNpElJ7t7TtDf1INiD0OMGUprAKlu01Fqxsyjk3SUN5GpDEkj6IBun1Q2lPF3YpUzWdb4J8JsP/qa/RW+dXqEog2r0xKr4hOjL+dOWoso+wVOMq+t1vbm1rrG+M2ImmmWueix/Yma0bc+26RWBqJip6+7zq5vW3/thDl3bjr3v1MfumPjcEx/u/YDCtWWVuiuTIm0QB0I+LHpi0oF0NJfwoDpeZwBPhEHUVd6bVxLRUGtfvOfKWSvSlbn0S0PtP3107O7r9lDuquruPfinQuG83TuziLtvrtAeGogtgiwc8elcjvjDRhDtSlmZ8ahcNL0hLSBRjteMm7c2dS5vrbU1lWquafet7a3tubZUNpXNpJuTzclEy4U6fSgY6u2xpLr2yELeTk15KrcEW8K9PZEs/tkXnIspfjZVgGJyXk4Vt/Gz8/LAo48+2v+pT32qH89N/D/T+DA1r6SKWNPvdHzqUy8/+ujLS45u7skrr/2JcFxoZI044kKl04M0YaPqzcdoGLRHmijQVr4CWi7kYKFkD4FPhq10LEJZC+EMeVILlut4ttx0Qwo/usp3NlN2F7JRWrhh5ytdx2451lUsqM2xyCeTo3uSj1jq6MbhY12VDbc8eTN/x2dXr4JrL3640l0odBdvvXNQjTyS3DOa/KTZmCx0VR7ZdfPNT90yvIr9f7m/pit4nGNgZGBgAOJ+YUWLeH6brwzczC+AIgy31y6ugdH/v/xnZ6lg3grkcjAwgUQBU0kNGAAAeJxjYGRgYA76n8XAwFL2/8v/rywVDEARFJAOAKHuBwV4nF2QLQ4CMRCFS1uLWMUt+ElwOG6Bw+NXoQghKM6A3QQuQtB7ANQ6DAQEMLyZadkJ4svrz0zfm4bGubAHM3oLec80dPdPaAn6RHLHHJJyfcGa6ufO+QW0B8b0+NUb/FbhdeescH8c4HzCqI8/KdI3lSwf8TiCDdilu672+1WeI2cz6/998ouc/dLm92voCAyR66pIfWVmz+/k/0qIP95ztfEsTG0hM5DNEUuGiLX9I3qFCrqk2xfCkV/iAAAAAAAAggDoAWgB4AJkAuoDWAO8A/AE4gUuBWYFsAamBxAH1AgsCRwJignQCfIKKgqACtQLHgs2C04LaAuAC9wL9AwMDM4Ocg6aDsAO9g8sD2APlg/eECQQbBC2EQIRShKOErATehPCFBQU4BWCFeYWTBcGF9QY0hmwGmIa+BtqHAIcsBz4HUIdih20HdweCB4yHrofJh+sICwg4iFOIZoh5iI0IoIi1iMuI4okMiTaJYwp2ioyKrosECzMLSouOC78L2IvsDC0MWoyDjKMMuYAAQAAAGcB4gAPAAAAAAACAEQAVABzAAAA1gtwAAAAAHicdZDNSsNAFEa/0frXgoqCW+9KWsQ0BtwUCoWKbnQj0q2kaZqkpJkymRb6Gr6DD+NL+Cx+TaciFhMmc+6ZO3cmF8AZvqCwfu441qxwyGjNOzhA1/Eu/b3jGvnJ8R4aeHW8T//muI5rJI4bOMc7K6jaEaMJPhwrnKoTxzs4VpeOd+lvHNfIXcd7uFDPjvfpI8d1DFTpuIEr9dnXs6XJktRKs9+SwA98GS5FU2VFmEs4t6k2pfRkrAsb57n2Ij3d8EuczPPQbMLNPIhNmelCbj1/ox7jIjahjUer6uUiCawdy9joqTy4DJkZPYkj66XWzjrt9u/z0IfGDEsYZGxVCgtBk7bFOYBfDcGQGcLMdVaGAiFymhBz7kirlZJxj2PMqKCNmZGTPUT8Trf8Cynh/pxVzNbq33hAWp2RVV5wy7r+VtYjqagyw8qOfu5eYsHTAlrLXatbmupWgoc/NYT9WK1NaCJ6r+qKpe2gzfef//sG1FOERXicbVMJm9M2EM1LvEkcb7JZoLSlBz2ghbYCbCj0ht4tLT04SrlRZDn2t7JlJJmE/vpKduIm+9XfZ3s81rx582am0+0016jz/9ccXfTgYQd9DDCEjxEC7GKMCfYwxT6O4CiO4SUcx8t4Ba/iBF7D63gDb+Ik3sLbeAfv4hRO4z28jzM4iw/wIT4CwTmcxwWEiHARl/AxLuMKPsGn+Ayf4wt8ia9wFdfwNb7Bt/gO3+MH/Iif8DOu4xf8ihv4Db/jD/yJm7iF27iDv3AXf+Me7uMBHuIRHuMJnoJiBoYYHAnmSDt9IeeyMhNGC8YFYZligsd7259Rj7/g/aoUksbDWC4KZ/jUGF6YTBZ9zaliqZfTTPRtYCrVnuI6+4eTpBKCUGF6hs67bOHxODP7beAaPzCK6pTwvDQverFkQ0YFL2Kq+u48CYMNtEFVkpkUDQ+SULN/iCsJhw1TG8eXTNCculxBfV6WvCChbzEaKxA8MSt7V2XzdP3hU6XkQhO2aBLFmbICuFePyfnA3q6s0fpfnbQxNhJFm5DRRq6oZRB5pai0xctLqvX+IdlIuGOFI2GjQ+SvjpHQswR0typ9k1b5TJOq9IRkB7571MDB6ocj4824ELsraJ1TIcabecJRwzKlRezXHJ3ldK49dTm1xw4BkUkStNJYHpae7ruHJVm/oppxNN1M50qZbDlCv1VpsJJi9J9WfquUl8vnfJoViVz312ENRVYcEL40YytIbmepGR3bKUaMde86TYl+VlHF4yO0mAvehjvoo9uuOvF021eVh+Ic33Erb83CqpqVOtPjtUGec2UCLZWpm1eV49Z24f4sM7OKHXCzYwuolnZSzBp/ukm53piELgdaZDFXeken1u3ZrWAT10vXhabkkZFzx9I6/LVp95EmVGV9liqZ80GSKZ7I5Wi9VHZWm4UlYafzLzq7fkcAAHicY/DewXAiKGIjI2Nf5AbGnRwMHAzJBRsZWJ02MTAyaIEYm7mYGDkgLD4GMIvNaRfTAaA0J5DN7rSLwQHCZmZw2ajC2BEYscGhI2Ijc4rLRjUQbxdHAwMji0NHckgESEkkEGzmYWLk0drB+L91A0vvRiYGFwAMdiP0AAA=') format('woff'),
+       url('data:application/octet-stream;base64,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c3MtMQRjb2dzAnVwCXRodW1icy11cARsb2NrCWxvY2stb3Blbgt0aHVtYnMtZG93bgRiZWxsDHJlc2l6ZS1zbWFsbA1yZXNpemUtZnVsbC0xCnJpZ2h0LWhhbmQJbGVmdC1oYW5kB3VwLWhhbmQJZG93bi1oYW5kB2V5ZS1vZmYLYXJyb3dzLWN3LTEEdGFncwZ0YWdzLTEGdGFncy0yBXRhZy0yEHJlc2l6ZS1zbWFsbC1hbHQOcmVzaXplLXNtYWxsLTEJZG93bi1vcGVuB3VwLW9wZW4KcmlnaHQtb3BlbglsZWZ0LW9wZW4EbW92ZRBpbmZvLWNpcmNsZWQtYWx0CGxpbmstZXh0DWNvbW1lbnQtZW1wdHkIZG9jLXRleHQMcGx1cy1zcXVhcmVkEmFuZ2xlLWNpcmNsZWQtbGVmdBNhbmdsZS1jaXJjbGVkLXJpZ2h0EGFuZ2xlLWNpcmNsZWQtdXASYW5nbGUtY2lyY2xlZC1kb3duDWxvY2stb3Blbi1hbHQIZWxsaXBzaXMNZWxsaXBzaXMtdmVydAtzb3J0LWFsdC11cA1zb3J0LWFsdC1kb3duCWJpdGJ1Y2tldAVsaW51eAtkb3QtY2lyY2xlZBBwbHVzLXNxdWFyZWQtYWx0A2ZheAdzbGlkZXJzBXNoYXJlBGNhbGMOYmVsbC1vZmYtZW1wdHkKdG9nZ2xlLW9mZgl0b2dnbGUtb24Gc2FmYXJpBmNocm9tZQdmaXJlZm94CmNhbGVuZGFyLTEIc2VhcmNoLTEAAAAAAAABAAH//wAPAAAAAAAAAAAAAAAAAAAAAAAYABgAGAAYA7X/BwO1/wewACwgsABVWEVZICBLuAAOUUuwBlNaWLA0G7AoWWBmIIpVWLACJWG5CAAIAGNjI2IbISGwAFmwAEMjRLIAAQBDYEItsAEssCBgZi2wAiwgZCCwwFCwBCZasigBCkNFY0VSW1ghIyEbilggsFBQWCGwQFkbILA4UFghsDhZWSCxAQpDRWNFYWSwKFBYIbEBCkNFY0UgsDBQWCGwMFkbILDAUFggZiCKimEgsApQWGAbILAgUFghsApgGyCwNlBYIbA2YBtgWVlZG7ABK1lZI7AAUFhlWVktsAMsIEUgsAQlYWQgsAVDUFiwBSNCsAYjQhshIVmwAWAtsAQsIyEjISBksQViQiCwBiNCsQEKQ0VjsQEKQ7ABYEVjsAMqISCwBkMgiiCKsAErsTAFJbAEJlFYYFAbYVJZWCNZISCwQFNYsAErGyGwQFkjsABQWGVZLbAFLLAHQyuyAAIAQ2BCLbAGLLAHI0IjILAAI0JhsAJiZrABY7ABYLAFKi2wBywgIEUgsAtDY7gEAGIgsABQWLBAYFlmsAFjYESwAWAtsAgssgcLAENFQiohsgABAENgQi2wCSywAEMjRLIAAQBDYEItsAosICBFILABKyOwAEOwBCVgIEWKI2EgZCCwIFBYIbAAG7AwUFiwIBuwQFlZI7AAUFhlWbADJSNhRESwAWAtsAssICBFILABKyOwAEOwBCVgIEWKI2EgZLAkUFiwABuwQFkjsABQWGVZsAMlI2FERLABYC2wDCwgsAAjQrILCgNFWCEbIyFZKiEtsA0ssQICRbBkYUQtsA4ssAFgICCwDENKsABQWCCwDCNCWbANQ0qwAFJYILANI0JZLbAPLCCwEGJmsAFjILgEAGOKI2GwDkNgIIpgILAOI0IjLbAQLEtUWLEEZERZJLANZSN4LbARLEtRWEtTWLEEZERZGyFZJLATZSN4LbASLLEAD0NVWLEPD0OwAWFCsA8rWbAAQ7ACJUKxDAIlQrENAiVCsAEWIyCwAyVQWLEBAENgsAQlQoqKIIojYbAOKiEjsAFhIIojYbAOKiEbsQEAQ2CwAiVCsAIlYbAOKiFZsAxDR7ANQ0dgsAJiILAAUFiwQGBZZrABYyCwC0NjuAQAYiCwAFBYsEBgWWawAWNgsQAAEyNEsAFDsAA+sgEBAUNgQi2wEywAsQACRVRYsA8jQiBFsAsjQrAKI7ABYEIgYLABYbUQEAEADgBCQopgsRIGK7ByKxsiWS2wFCyxABMrLbAVLLEBEystsBYssQITKy2wFyyxAxMrLbAYLLEEEystsBkssQUTKy2wGiyxBhMrLbAbLLEHEystsBwssQgTKy2wHSyxCRMrLbAeLACwDSuxAAJFVFiwDyNCIEWwCyNCsAojsAFgQiBgsAFhtRAQAQAOAEJCimCxEgYrsHIrGyJZLbAfLLEAHistsCAssQEeKy2wISyxAh4rLbAiLLEDHistsCMssQQeKy2wJCyxBR4rLbAlLLEGHistsCYssQceKy2wJyyxCB4rLbAoLLEJHistsCksIDywAWAtsCosIGCwEGAgQyOwAWBDsAIlYbABYLApKiEtsCsssCorsCoqLbAsLCAgRyAgsAtDY7gEAGIgsABQWLBAYFlmsAFjYCNhOCMgilVYIEcgILALQ2O4BABiILAAUFiwQGBZZrABY2AjYTgbIVktsC0sALEAAkVUWLABFrAsKrABFTAbIlktsC4sALANK7EAAkVUWLABFrAsKrABFTAbIlktsC8sIDWwAWAtsDAsALABRWO4BABiILAAUFiwQGBZZrABY7ABK7ALQ2O4BABiILAAUFiwQGBZZrABY7ABK7AAFrQAAAAAAEQ+IzixLwEVKi2wMSwgPCBHILALQ2O4BABiILAAUFiwQGBZZrABY2CwAENhOC2wMiwuFzwtsDMsIDwgRyCwC0NjuAQAYiCwAFBYsEBgWWawAWNgsABDYbABQ2M4LbA0LLECABYlIC4gR7AAI0KwAiVJiopHI0cjYSBYYhshWbABI0KyMwEBFRQqLbA1LLAAFrAEJbAEJUcjRyNhsAlDK2WKLiMgIDyKOC2wNiywABawBCWwBCUgLkcjRyNhILAEI0KwCUMrILBgUFggsEBRWLMCIAMgG7MCJgMaWUJCIyCwCEMgiiNHI0cjYSNGYLAEQ7ACYiCwAFBYsEBgWWawAWNgILABKyCKimEgsAJDYGQjsANDYWRQWLACQ2EbsANDYFmwAyWwAmIgsABQWLBAYFlmsAFjYSMgILAEJiNGYTgbI7AIQ0awAiWwCENHI0cjYWAgsARDsAJiILAAUFiwQGBZZrABY2AjILABKyOwBENgsAErsAUlYbAFJbACYiCwAFBYsEBgWWawAWOwBCZhILAEJWBkI7ADJWBkUFghGyMhWSMgILAEJiNGYThZLbA3LLAAFiAgILAFJiAuRyNHI2EjPDgtsDgssAAWILAII0IgICBGI0ewASsjYTgtsDkssAAWsAMlsAIlRyNHI2GwAFRYLiA8IyEbsAIlsAIlRyNHI2EgsAUlsAQlRyNHI2GwBiWwBSVJsAIlYbkIAAgAY2MjIFhiGyFZY7gEAGIgsABQWLBAYFlmsAFjYCMuIyAgPIo4IyFZLbA6LLAAFiCwCEMgLkcjRyNhIGCwIGBmsAJiILAAUFiwQGBZZrABYyMgIDyKOC2wOywjIC5GsAIlRlJYIDxZLrErARQrLbA8LCMgLkawAiVGUFggPFkusSsBFCstsD0sIyAuRrACJUZSWCA8WSMgLkawAiVGUFggPFkusSsBFCstsD4ssDUrIyAuRrACJUZSWCA8WS6xKwEUKy2wPyywNiuKICA8sAQjQoo4IyAuRrACJUZSWCA8WS6xKwEUK7AEQy6wKystsEAssAAWsAQlsAQmIC5HI0cjYbAJQysjIDwgLiM4sSsBFCstsEEssQgEJUKwABawBCWwBCUgLkcjRyNhILAEI0KwCUMrILBgUFggsEBRWLMCIAMgG7MCJgMaWUJCIyBHsARDsAJiILAAUFiwQGBZZrABY2AgsAErIIqKYSCwAkNgZCOwA0NhZFBYsAJDYRuwA0NgWbADJbACYiCwAFBYsEBgWWawAWNhsAIlRmE4IyA8IzgbISAgRiNHsAErI2E4IVmxKwEUKy2wQiywNSsusSsBFCstsEMssDYrISMgIDywBCNCIzixKwEUK7AEQy6wKystsEQssAAVIEewACNCsgABARUUEy6wMSotsEUssAAVIEewACNCsgABARUUEy6wMSotsEYssQABFBOwMiotsEcssDQqLbBILLAAFkUjIC4gRoojYTixKwEUKy2wSSywCCNCsEgrLbBKLLIAAEErLbBLLLIAAUErLbBMLLIBAEErLbBNLLIBAUErLbBOLLIAAEIrLbBPLLIAAUIrLbBQLLIBAEIrLbBRLLIBAUIrLbBSLLIAAD4rLbBTLLIAAT4rLbBULLIBAD4rLbBVLLIBAT4rLbBWLLIAAEArLbBXLLIAAUArLbBYLLIBAEArLbBZLLIBAUArLbBaLLIAAEMrLbBbLLIAAUMrLbBcLLIBAEMrLbBdLLIBAUMrLbBeLLIAAD8rLbBfLLIAAT8rLbBgLLIBAD8rLbBhLLIBAT8rLbBiLLA3Ky6xKwEUKy2wYyywNyuwOystsGQssDcrsDwrLbBlLLAAFrA3K7A9Ky2wZiywOCsusSsBFCstsGcssDgrsDsrLbBoLLA4K7A8Ky2waSywOCuwPSstsGossDkrLrErARQrLbBrLLA5K7A7Ky2wbCywOSuwPCstsG0ssDkrsD0rLbBuLLA6Ky6xKwEUKy2wbyywOiuwOystsHAssDorsDwrLbBxLLA6K7A9Ky2wciyzCQQCA0VYIRsjIVlCK7AIZbADJFB4sAEVMC0AS7gAyFJYsQEBjlmwAbkIAAgAY3CxAAVCsgABACqxAAVCswoCAQgqsQAFQrMOAAEIKrEABkK6AsAAAQAJKrEAB0K6AEAAAQAJKrEDAESxJAGIUViwQIhYsQNkRLEmAYhRWLoIgAABBECIY1RYsQMARFlZWVmzDAIBDCq4Af+FsASNsQIARAAA') format('truetype');
 }
 /* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
 /* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
@@ -17,7 +17,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'fontello';
-    src: url('../font/fontello.svg?30012397#fontello') format('svg');
+    src: url('../font/fontello.svg?36632261#fontello') format('svg');
   }
 }
 */
@@ -26,7 +26,7 @@
   font-family: "fontello";
   font-style: normal;
   font-weight: normal;
-  speak: none;
+  speak: never;
  
   display: inline-block;
   text-decoration: inherit;
@@ -38,7 +38,7 @@
   /* For safety - reset parent styles, that can break glyph codes*/
   font-variant: normal;
   text-transform: none;
-     
+ 
   /* fix buttons height, for twitter bootstrap */
   line-height: 1em;
  
@@ -113,6 +113,12 @@
 .icon-down-hand:before { content: '\e83a'; } /* '' */
 .icon-eye-off:before { content: '\e83b'; } /* '' */
 .icon-arrows-cw-1:before { content: '\e83c'; } /* '' */
+.icon-tags:before { content: '\e83d'; } /* '' */
+.icon-tags-1:before { content: '\e83e'; } /* '' */
+.icon-tags-2:before { content: '\e83f'; } /* '' */
+.icon-tag-2:before { content: '\e840'; } /* '' */
+.icon-resize-small-alt:before { content: '\e841'; } /* '' */
+.icon-resize-small-1:before { content: '\e842'; } /* '' */
 .icon-down-open:before { content: '\f004'; } /* '' */
 .icon-up-open:before { content: '\f005'; } /* '' */
 .icon-right-open:before { content: '\f006'; } /* '' */
@@ -128,6 +134,7 @@
 .icon-angle-circled-up:before { content: '\f139'; } /* '' */
 .icon-angle-circled-down:before { content: '\f13a'; } /* '' */
 .icon-lock-open-alt:before { content: '\f13e'; } /* '' */
+.icon-ellipsis:before { content: '\f141'; } /* '' */
 .icon-ellipsis-vert:before { content: '\f142'; } /* '' */
 .icon-sort-alt-up:before { content: '\f160'; } /* '' */
 .icon-sort-alt-down:before { content: '\f161'; } /* '' */
diff --git a/html/image/fontello/css/fontello-ie7-codes.css b/html/image/fontello/css/fontello-ie7-codes.css
index fc69015d4..557bbeea3 100644
--- a/html/image/fontello/css/fontello-ie7-codes.css
+++ b/html/image/fontello/css/fontello-ie7-codes.css
@@ -60,6 +60,12 @@
 .icon-down-hand { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83a;&nbsp;'); }
 .icon-eye-off { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83b;&nbsp;'); }
 .icon-arrows-cw-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83c;&nbsp;'); }
+.icon-tags { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83d;&nbsp;'); }
+.icon-tags-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83e;&nbsp;'); }
+.icon-tags-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83f;&nbsp;'); }
+.icon-tag-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe840;&nbsp;'); }
+.icon-resize-small-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe841;&nbsp;'); }
+.icon-resize-small-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe842;&nbsp;'); }
 .icon-down-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf004;&nbsp;'); }
 .icon-up-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf005;&nbsp;'); }
 .icon-right-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf006;&nbsp;'); }
@@ -75,6 +81,7 @@
 .icon-angle-circled-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf139;&nbsp;'); }
 .icon-angle-circled-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf13a;&nbsp;'); }
 .icon-lock-open-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf13e;&nbsp;'); }
+.icon-ellipsis { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf141;&nbsp;'); }
 .icon-ellipsis-vert { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf142;&nbsp;'); }
 .icon-sort-alt-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf160;&nbsp;'); }
 .icon-sort-alt-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf161;&nbsp;'); }
diff --git a/html/image/fontello/css/fontello-ie7.css b/html/image/fontello/css/fontello-ie7.css
index b0288864d..a0f449f14 100644
--- a/html/image/fontello/css/fontello-ie7.css
+++ b/html/image/fontello/css/fontello-ie7.css
@@ -71,6 +71,12 @@
 .icon-down-hand { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83a;&nbsp;'); }
 .icon-eye-off { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83b;&nbsp;'); }
 .icon-arrows-cw-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83c;&nbsp;'); }
+.icon-tags { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83d;&nbsp;'); }
+.icon-tags-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83e;&nbsp;'); }
+.icon-tags-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83f;&nbsp;'); }
+.icon-tag-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe840;&nbsp;'); }
+.icon-resize-small-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe841;&nbsp;'); }
+.icon-resize-small-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe842;&nbsp;'); }
 .icon-down-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf004;&nbsp;'); }
 .icon-up-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf005;&nbsp;'); }
 .icon-right-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf006;&nbsp;'); }
@@ -86,6 +92,7 @@
 .icon-angle-circled-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf139;&nbsp;'); }
 .icon-angle-circled-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf13a;&nbsp;'); }
 .icon-lock-open-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf13e;&nbsp;'); }
+.icon-ellipsis { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf141;&nbsp;'); }
 .icon-ellipsis-vert { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf142;&nbsp;'); }
 .icon-sort-alt-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf160;&nbsp;'); }
 .icon-sort-alt-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf161;&nbsp;'); }
diff --git a/html/image/fontello/css/fontello.css b/html/image/fontello/css/fontello.css
index 8c1edd55d..696f2ad6a 100644
--- a/html/image/fontello/css/fontello.css
+++ b/html/image/fontello/css/fontello.css
@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'fontello';
-  src: url('../font/fontello.eot?62647818');
-  src: url('../font/fontello.eot?62647818#iefix') format('embedded-opentype'),
-       url('../font/fontello.woff2?62647818') format('woff2'),
-       url('../font/fontello.woff?62647818') format('woff'),
-       url('../font/fontello.ttf?62647818') format('truetype'),
-       url('../font/fontello.svg?62647818#fontello') format('svg');
+  src: url('../font/fontello.eot?84662865');
+  src: url('../font/fontello.eot?84662865#iefix') format('embedded-opentype'),
+       url('../font/fontello.woff2?84662865') format('woff2'),
+       url('../font/fontello.woff?84662865') format('woff'),
+       url('../font/fontello.ttf?84662865') format('truetype'),
+       url('../font/fontello.svg?84662865#fontello') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -15,7 +15,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'fontello';
-    src: url('../font/fontello.svg?62647818#fontello') format('svg');
+    src: url('../font/fontello.svg?84662865#fontello') format('svg');
   }
 }
 */
@@ -24,7 +24,7 @@
   font-family: "fontello";
   font-style: normal;
   font-weight: normal;
-  speak: none;
+  speak: never;
  
   display: inline-block;
   text-decoration: inherit;
@@ -116,6 +116,12 @@
 .icon-down-hand:before { content: '\e83a'; } /* '' */
 .icon-eye-off:before { content: '\e83b'; } /* '' */
 .icon-arrows-cw-1:before { content: '\e83c'; } /* '' */
+.icon-tags:before { content: '\e83d'; } /* '' */
+.icon-tags-1:before { content: '\e83e'; } /* '' */
+.icon-tags-2:before { content: '\e83f'; } /* '' */
+.icon-tag-2:before { content: '\e840'; } /* '' */
+.icon-resize-small-alt:before { content: '\e841'; } /* '' */
+.icon-resize-small-1:before { content: '\e842'; } /* '' */
 .icon-down-open:before { content: '\f004'; } /* '' */
 .icon-up-open:before { content: '\f005'; } /* '' */
 .icon-right-open:before { content: '\f006'; } /* '' */
@@ -131,6 +137,7 @@
 .icon-angle-circled-up:before { content: '\f139'; } /* '' */
 .icon-angle-circled-down:before { content: '\f13a'; } /* '' */
 .icon-lock-open-alt:before { content: '\f13e'; } /* '' */
+.icon-ellipsis:before { content: '\f141'; } /* '' */
 .icon-ellipsis-vert:before { content: '\f142'; } /* '' */
 .icon-sort-alt-up:before { content: '\f160'; } /* '' */
 .icon-sort-alt-down:before { content: '\f161'; } /* '' */
diff --git a/html/image/fontello/demo.html b/html/image/fontello/demo.html
index 9eb49bbc7..a14e56fe0 100644
--- a/html/image/fontello/demo.html
+++ b/html/image/fontello/demo.html
@@ -229,11 +229,11 @@ body {
 }
 @font-face {
       font-family: 'fontello';
-      src: url('./fontello.eot?69183758');
-      src: url('./fontello.eot?69183758#iefix') format('embedded-opentype'),
-           url('./fontello.woff?69183758') format('woff'),
-           url('./fontello.ttf?69183758') format('truetype'),
-           url('./fontello.svg?69183758#fontello') format('svg');
+      src: url('./font/fontello.eot?68207935');
+      src: url('./font/fontello.eot?68207935#iefix') format('embedded-opentype'),
+           url('./font/fontello.woff?68207935') format('woff'),
+           url('./font/fontello.ttf?68207935') format('truetype'),
+           url('./font/fontello.svg?68207935#fontello') format('svg');
       font-weight: normal;
       font-style: normal;
     }
@@ -244,7 +244,7 @@ body {
       font-family: "fontello";
       font-style: normal;
       font-weight: normal;
-      speak: none;
+      speak: never;
      
       display: inline-block;
       text-decoration: inherit;
@@ -389,58 +389,69 @@ body {
       </div>
       <div class="row">
         <div class="the-icons span3" title="Code: 0xe83c"><i class="demo-icon icon-arrows-cw-1">&#xe83c;</i> <span class="i-name">icon-arrows-cw-1</span><span class="i-code">0xe83c</span></div>
+        <div class="the-icons span3" title="Code: 0xe83d"><i class="demo-icon icon-tags">&#xe83d;</i> <span class="i-name">icon-tags</span><span class="i-code">0xe83d</span></div>
+        <div class="the-icons span3" title="Code: 0xe83e"><i class="demo-icon icon-tags-1">&#xe83e;</i> <span class="i-name">icon-tags-1</span><span class="i-code">0xe83e</span></div>
+        <div class="the-icons span3" title="Code: 0xe83f"><i class="demo-icon icon-tags-2">&#xe83f;</i> <span class="i-name">icon-tags-2</span><span class="i-code">0xe83f</span></div>
+      </div>
+      <div class="row">
+        <div class="the-icons span3" title="Code: 0xe840"><i class="demo-icon icon-tag-2">&#xe840;</i> <span class="i-name">icon-tag-2</span><span class="i-code">0xe840</span></div>
+        <div class="the-icons span3" title="Code: 0xe841"><i class="demo-icon icon-resize-small-alt">&#xe841;</i> <span class="i-name">icon-resize-small-alt</span><span class="i-code">0xe841</span></div>
+        <div class="the-icons span3" title="Code: 0xe842"><i class="demo-icon icon-resize-small-1">&#xe842;</i> <span class="i-name">icon-resize-small-1</span><span class="i-code">0xe842</span></div>
         <div class="the-icons span3" title="Code: 0xf004"><i class="demo-icon icon-down-open">&#xf004;</i> <span class="i-name">icon-down-open</span><span class="i-code">0xf004</span></div>
+      </div>
+      <div class="row">
         <div class="the-icons span3" title="Code: 0xf005"><i class="demo-icon icon-up-open">&#xf005;</i> <span class="i-name">icon-up-open</span><span class="i-code">0xf005</span></div>
         <div class="the-icons span3" title="Code: 0xf006"><i class="demo-icon icon-right-open">&#xf006;</i> <span class="i-name">icon-right-open</span><span class="i-code">0xf006</span></div>
-      </div>
-      <div class="row">
         <div class="the-icons span3" title="Code: 0xf007"><i class="demo-icon icon-left-open">&#xf007;</i> <span class="i-name">icon-left-open</span><span class="i-code">0xf007</span></div>
         <div class="the-icons span3" title="Code: 0xf047"><i class="demo-icon icon-move">&#xf047;</i> <span class="i-name">icon-move</span><span class="i-code">0xf047</span></div>
+      </div>
+      <div class="row">
         <div class="the-icons span3" title="Code: 0xf086"><i class="demo-icon icon-info-circled-alt">&#xf086;</i> <span class="i-name">icon-info-circled-alt</span><span class="i-code">0xf086</span></div>
         <div class="the-icons span3" title="Code: 0xf08e"><i class="demo-icon icon-link-ext">&#xf08e;</i> <span class="i-name">icon-link-ext</span><span class="i-code">0xf08e</span></div>
-      </div>
-      <div class="row">
         <div class="the-icons span3" title="Code: 0xf0e5"><i class="demo-icon icon-comment-empty">&#xf0e5;</i> <span class="i-name">icon-comment-empty</span><span class="i-code">0xf0e5</span></div>
         <div class="the-icons span3" title="Code: 0xf0f6"><i class="demo-icon icon-doc-text">&#xf0f6;</i> <span class="i-name">icon-doc-text</span><span class="i-code">0xf0f6</span></div>
+      </div>
+      <div class="row">
         <div class="the-icons span3" title="Code: 0xf0fe"><i class="demo-icon icon-plus-squared">&#xf0fe;</i> <span class="i-name">icon-plus-squared</span><span class="i-code">0xf0fe</span></div>
         <div class="the-icons span3" title="Code: 0xf137"><i class="demo-icon icon-angle-circled-left">&#xf137;</i> <span class="i-name">icon-angle-circled-left</span><span class="i-code">0xf137</span></div>
-      </div>
-      <div class="row">
         <div class="the-icons span3" title="Code: 0xf138"><i class="demo-icon icon-angle-circled-right">&#xf138;</i> <span class="i-name">icon-angle-circled-right</span><span class="i-code">0xf138</span></div>
         <div class="the-icons span3" title="Code: 0xf139"><i class="demo-icon icon-angle-circled-up">&#xf139;</i> <span class="i-name">icon-angle-circled-up</span><span class="i-code">0xf139</span></div>
-        <div class="the-icons span3" title="Code: 0xf13a"><i class="demo-icon icon-angle-circled-down">&#xf13a;</i> <span class="i-name">icon-angle-circled-down</span><span class="i-code">0xf13a</span></div>
-        <div class="the-icons span3" title="Code: 0xf13e"><i class="demo-icon icon-lock-open-alt">&#xf13e;</i> <span class="i-name">icon-lock-open-alt</span><span class="i-code">0xf13e</span></div>
       </div>
       <div class="row">
+        <div class="the-icons span3" title="Code: 0xf13a"><i class="demo-icon icon-angle-circled-down">&#xf13a;</i> <span class="i-name">icon-angle-circled-down</span><span class="i-code">0xf13a</span></div>
+        <div class="the-icons span3" title="Code: 0xf13e"><i class="demo-icon icon-lock-open-alt">&#xf13e;</i> <span class="i-name">icon-lock-open-alt</span><span class="i-code">0xf13e</span></div>
+        <div class="the-icons span3" title="Code: 0xf141"><i class="demo-icon icon-ellipsis">&#xf141;</i> <span class="i-name">icon-ellipsis</span><span class="i-code">0xf141</span></div>
         <div class="the-icons span3" title="Code: 0xf142"><i class="demo-icon icon-ellipsis-vert">&#xf142;</i> <span class="i-name">icon-ellipsis-vert</span><span class="i-code">0xf142</span></div>
+      </div>
+      <div class="row">
         <div class="the-icons span3" title="Code: 0xf160"><i class="demo-icon icon-sort-alt-up">&#xf160;</i> <span class="i-name">icon-sort-alt-up</span><span class="i-code">0xf160</span></div>
         <div class="the-icons span3" title="Code: 0xf161"><i class="demo-icon icon-sort-alt-down">&#xf161;</i> <span class="i-name">icon-sort-alt-down</span><span class="i-code">0xf161</span></div>
         <div class="the-icons span3" title="Code: 0xf171"><i class="demo-icon icon-bitbucket">&#xf171;</i> <span class="i-name">icon-bitbucket</span><span class="i-code">0xf171</span></div>
+        <div class="the-icons span3" title="Code: 0xf17c"><i class="demo-icon icon-linux">&#xf17c;</i> <span class="i-name">icon-linux</span><span class="i-code">0xf17c</span></div>
       </div>
       <div class="row">
-        <div class="the-icons span3" title="Code: 0xf17c"><i class="demo-icon icon-linux">&#xf17c;</i> <span class="i-name">icon-linux</span><span class="i-code">0xf17c</span></div>
         <div class="the-icons span3" title="Code: 0xf192"><i class="demo-icon icon-dot-circled">&#xf192;</i> <span class="i-name">icon-dot-circled</span><span class="i-code">0xf192</span></div>
         <div class="the-icons span3" title="Code: 0xf196"><i class="demo-icon icon-plus-squared-alt">&#xf196;</i> <span class="i-name">icon-plus-squared-alt</span><span class="i-code">0xf196</span></div>
         <div class="the-icons span3" title="Code: 0xf1ac"><i class="demo-icon icon-fax">&#xf1ac;</i> <span class="i-name">icon-fax</span><span class="i-code">0xf1ac</span></div>
+        <div class="the-icons span3" title="Code: 0xf1de"><i class="demo-icon icon-sliders">&#xf1de;</i> <span class="i-name">icon-sliders</span><span class="i-code">0xf1de</span></div>
       </div>
       <div class="row">
-        <div class="the-icons span3" title="Code: 0xf1de"><i class="demo-icon icon-sliders">&#xf1de;</i> <span class="i-name">icon-sliders</span><span class="i-code">0xf1de</span></div>
         <div class="the-icons span3" title="Code: 0xf1e0"><i class="demo-icon icon-share">&#xf1e0;</i> <span class="i-name">icon-share</span><span class="i-code">0xf1e0</span></div>
         <div class="the-icons span3" title="Code: 0xf1ec"><i class="demo-icon icon-calc">&#xf1ec;</i> <span class="i-name">icon-calc</span><span class="i-code">0xf1ec</span></div>
         <div class="the-icons span3" title="Code: 0xf1f7"><i class="demo-icon icon-bell-off-empty">&#xf1f7;</i> <span class="i-name">icon-bell-off-empty</span><span class="i-code">0xf1f7</span></div>
+        <div class="the-icons span3" title="Code: 0xf204"><i class="demo-icon icon-toggle-off">&#xf204;</i> <span class="i-name">icon-toggle-off</span><span class="i-code">0xf204</span></div>
       </div>
       <div class="row">
-        <div class="the-icons span3" title="Code: 0xf204"><i class="demo-icon icon-toggle-off">&#xf204;</i> <span class="i-name">icon-toggle-off</span><span class="i-code">0xf204</span></div>
         <div class="the-icons span3" title="Code: 0xf205"><i class="demo-icon icon-toggle-on">&#xf205;</i> <span class="i-name">icon-toggle-on</span><span class="i-code">0xf205</span></div>
         <div class="the-icons span3" title="Code: 0xf267"><i class="demo-icon icon-safari">&#xf267;</i> <span class="i-name">icon-safari</span><span class="i-code">0xf267</span></div>
         <div class="the-icons span3" title="Code: 0xf268"><i class="demo-icon icon-chrome">&#xf268;</i> <span class="i-name">icon-chrome</span><span class="i-code">0xf268</span></div>
+        <div class="the-icons span3" title="Code: 0xf269"><i class="demo-icon icon-firefox">&#xf269;</i> <span class="i-name">icon-firefox</span><span class="i-code">0xf269</span></div>
       </div>
       <div class="row">
-        <div class="the-icons span3" title="Code: 0xf269"><i class="demo-icon icon-firefox">&#xf269;</i> <span class="i-name">icon-firefox</span><span class="i-code">0xf269</span></div>
         <div class="the-icons span3" title="Code: 0xf4c5"><i class="demo-icon icon-calendar-1">&#xf4c5;</i> <span class="i-name">icon-calendar-1</span><span class="i-code">0xf4c5</span></div>
         <div class="the-icons span3" title="Code: 0xf50d"><i class="demo-icon icon-search-1">&#xf50d;</i> <span class="i-name">icon-search-1</span><span class="i-code">0xf50d</span></div>
       </div>
     </div>
     <div class="container footer">Generated by <a href="http://fontello.com">fontello.com</a></div>
   </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/html/image/fontello/fontello.eot b/html/image/fontello/fontello.eot
index f9a98fda40692ad6d22315b072fa75bba88951dc..73174bb3a18226b357d2761f16e45d8275340e24 100644
GIT binary patch
delta 5084
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
LoRGF1y5{^JP|NgW

delta 3518
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
D?5d&h

diff --git a/html/image/fontello/fontello.svg b/html/image/fontello/fontello.svg
index a610d15c9..29459ce02 100644
--- a/html/image/fontello/fontello.svg
+++ b/html/image/fontello/fontello.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Copyright (C) 2019 by original authors @ fontello.com</metadata>
+<metadata>Copyright (C) 2020 by original authors @ fontello.com</metadata>
 <defs>
 <font id="fontello" horiz-adv-x="1000" >
 <font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
@@ -128,6 +128,18 @@
 
 <glyph glyph-name="arrows-cw-1" unicode="&#xe83c;" d="M843 261q0-3 0-4-36-150-150-243t-267-93q-81 0-157 31t-136 88l-72-72q-11-11-25-11t-25 11-11 25v250q0 14 11 25t25 11h250q14 0 25-11t10-25-10-25l-77-77q40-36 90-57t105-20q74 0 139 37t104 99q6 10 30 66 4 13 16 13h107q8 0 13-6t5-12z m14 446v-250q0-14-10-25t-26-11h-250q-14 0-25 11t-10 25 10 25l77 77q-82 77-194 77-75 0-140-37t-104-99q-6-10-29-66-5-13-17-13h-111q-7 0-13 6t-5 12v4q36 150 151 243t268 93q81 0 158-31t137-88l72 72q11 11 25 11t26-11 10-25z" horiz-adv-x="857.1" />
 
+<glyph glyph-name="tags" unicode="&#xe83d;" d="M250 600q0 30-21 51t-50 20-51-20-21-51 21-50 51-21 50 21 21 50z m595-321q0-30-20-51l-274-274q-22-21-51-21-30 0-50 21l-399 399q-21 21-36 57t-15 65v232q0 29 21 50t50 22h233q29 0 65-15t57-36l399-399q20-21 20-50z m215 0q0-30-21-51l-274-274q-22-21-51-21-20 0-33 8t-29 25l262 262q21 21 21 51 0 29-21 50l-399 399q-21 21-57 36t-65 15h125q29 0 65-15t57-36l399-399q21-21 21-50z" horiz-adv-x="1071.4" />
+
+<glyph glyph-name="tags-1" unicode="&#xe83e;" d="M1011 502q30-32 30-74t-30-73l-56-56 5-5q30-31 29-74t-30-73l-364-366q-30-30-74-30t-73 30q-227 227-342 338-106 106-106 258 0 102 54 188-8 165 105 278 106 106 257 106 153 0 259-106z m-490-647l364 365-336 340q-76 77-184 77-109 0-185-77t-76-183 76-184q115-111 341-338z m102 779l258-261 57 56-337 340q-76 76-185 76-107 0-183-76-35-35-54-79 86 52 186 52 150 0 258-108z m-258-179q-32 0-56-23t-23-55 23-55 56-23 55 23 23 55-23 55-55 23z m0 52q54 0 92-39t38-91-38-92-92-38-92 38-38 92 38 91 92 39z" horiz-adv-x="1041" />
+
+<glyph glyph-name="tags-2" unicode="&#xe83f;" d="M0 460l0 240q2 27 21 46t43 19l241 0q43 0 88-28l377-414q17-23 17-48t-17-44l-280-277q-21-18-47-19t-43 19l-355 397q-45 54-45 109z m104 138q0-25 17-42 22-20 46-19t42 19q18 19 18 44t-18 43q-20 18-45 17t-43-17q-17-21-17-45z m316 165l92 0q72-4 109-45l356-397q17-21 17-48t-17-44l-280-277q-60-35-95 8l271 271q18 22 18 47t-18 45l-318 356q-24 31-71 56t-64 28z" horiz-adv-x="994" />
+
+<glyph glyph-name="tag-2" unicode="&#xe840;" d="M250 600q0 30-21 51t-50 20-51-20-21-51 21-50 51-21 50 21 21 50z m595-321q0-30-20-51l-274-274q-22-21-51-21-30 0-50 21l-399 399q-21 21-36 57t-15 65v232q0 29 21 50t50 22h233q29 0 65-15t57-36l399-399q20-21 20-50z" horiz-adv-x="857.1" />
+
+<glyph glyph-name="resize-small-alt" unicode="&#xe841;" d="M648 88l-72-72 0 223 223 0-72-72 184-185-79-79z m-448 447l-182 183 79 79 183-182 73 70-1-222-222-1z m-182-553l184 185-72 72 223 0 0-223-72 72-184-185z m782 480l-224 0 0 225 73-72 183 182 79-79-183-183z" horiz-adv-x="928" />
+
+<glyph glyph-name="resize-small-1" unicode="&#xe842;" d="M66 672l114-116 73 74 0-210-210 0 72 72-115 115z m0-644l-66 67 115 113-72 73 210 0 0-210-73 72z m513 644l65-65-115-115 72-72-210 0 0 210 73-73z m-115-529l-73-72 0 210 210 0-72-73 115-113-65-67z" horiz-adv-x="644" />
+
 <glyph glyph-name="down-open" unicode="&#xf004;" d="M0 533q0 25 18 43t44 18 42-18l305-303 304 303q18 18 43 18t43-18q18-18 18-43t-18-43l-390-391-391 391q-18 19-18 43z" horiz-adv-x="817.4" />
 
 <glyph glyph-name="up-open" unicode="&#xf005;" d="M0 167q0 26 18 43l391 391 390-391q17-17 17-43 0-26-17-44-18-17-44-17t-43 17l-303 305-305-305q-18-17-43-17t-43 17q-18 18-18 44z" horiz-adv-x="816.9" />
@@ -158,6 +170,8 @@
 
 <glyph glyph-name="lock-open-alt" unicode="&#xf13e;" d="M589 421q23 0 38-15t16-38v-322q0-22-16-37t-38-16h-535q-23 0-38 16t-16 37v322q0 22 16 38t38 15h17v179q0 103 74 177t176 73 177-73 73-177q0-14-10-25t-25-11h-36q-14 0-25 11t-11 25q0 59-42 101t-101 42-101-42-41-101v-179h410z" horiz-adv-x="642.9" />
 
+<glyph glyph-name="ellipsis" unicode="&#xf141;" d="M214 439v-107q0-22-15-38t-38-15h-107q-23 0-38 15t-16 38v107q0 23 16 38t38 16h107q22 0 38-16t15-38z m286 0v-107q0-22-16-38t-38-15h-107q-22 0-38 15t-15 38v107q0 23 15 38t38 16h107q23 0 38-16t16-38z m286 0v-107q0-22-16-38t-38-15h-107q-22 0-38 15t-16 38v107q0 23 16 38t38 16h107q23 0 38-16t16-38z" horiz-adv-x="785.7" />
+
 <glyph glyph-name="ellipsis-vert" unicode="&#xf142;" d="M214 154v-108q0-22-15-37t-38-16h-107q-23 0-38 16t-16 37v108q0 22 16 38t38 15h107q22 0 38-15t15-38z m0 285v-107q0-22-15-38t-38-15h-107q-23 0-38 15t-16 38v107q0 23 16 38t38 16h107q22 0 38-16t15-38z m0 286v-107q0-22-15-38t-38-16h-107q-23 0-38 16t-16 38v107q0 22 16 38t38 16h107q22 0 38-16t15-38z" horiz-adv-x="214.3" />
 
 <glyph glyph-name="sort-alt-up" unicode="&#xf160;" d="M411 46q0-6-6-13l-178-178q-5-5-13-5-6 0-12 5l-179 179q-8 9-4 19 4 11 17 11h107v768q0 8 5 13t13 5h107q8 0 13-5t5-13v-768h107q8 0 13-5t5-13z m589-71v-107q0-8-5-13t-13-5h-464q-8 0-13 5t-5 13v107q0 8 5 13t13 5h464q8 0 13-5t5-13z m-107 286v-107q0-8-5-13t-13-5h-357q-8 0-13 5t-5 13v107q0 8 5 13t13 5h357q8 0 13-5t5-13z m-107 285v-107q0-7-5-12t-13-6h-250q-8 0-13 6t-5 12v107q0 8 5 13t13 5h250q8 0 13-5t5-13z m-107 286v-107q0-8-5-13t-13-5h-143q-8 0-13 5t-5 13v107q0 8 5 13t13 5h143q8 0 13-5t5-13z" horiz-adv-x="1000" />
diff --git a/html/image/fontello/fontello.ttf b/html/image/fontello/fontello.ttf
index 1ca5c8462c1d98101fd4afd4c0e029a6a4476a7c..7547dd25d1a0e3d16927a2221026e7180cff86c0 100644
GIT binary patch
delta 5065
zcmaht32<EHdEfW{|9fu_S*yKu?P?{hcWvEXoj#DCWLcLNSvHGV8Emg?U6v)UWO=Af
z(h*HbN}Yg#m+=sY6FQl6NG7zRYiyE20x8L4QsSo6rQ{gbaS}!lDA+O7P_ydy?~_|Q
z6Nuzb-+zDi@%&mAuYR6AR6hTgJKhAqK>*mXZ+dv9yWy$lX#OOCc6#64heO)q*>-@V
z7id2;HZwkb?BR!o0PdlweP(=kZiWU0wEr4m%lOpMu@CQ=T?DYE07hS)7#$ude*M^&
z0Ma$I-!ef9+Kb{Anvc*tJTZOvNHSHi^gJ!xPei{wmEJde^ou8&0A|B<;HT5WM`oB<
zLCnlvp?T=w@bu_UPWlT04tW6BPiE3{hcgd${~N&J-vEe9GlxcJe%nz^0(^Gn;j4Gz
z0V9Fy9WN}xdn@?%rAgSypMejIuV7&Hc|dv)@HODMQ4L`mJ$W7kev3AmAOr$Di=D=A
zun#+oI(B>gv+&)UeqVx@;D_*|Kl1xyI16Wue_$^<Q!osBVIPdZD2x$3)%Xj3)krbB
zBTv#7Qg8BSEOWm&&*m3NHxht!zPJpqk;cmaI*peBI%vEM&`INEfK34J3KO7<uwnvi
zCajtO-Gnt0pog#t^8mdx`J4&RNBBV#pr7z>O@J+g-!}o`gtI2VtpJx=O@INyZ6?50
z!fQ<ca<oh9On_~KNk|E>op1-yzeEzjZG=f036LP1G68NUJZu8&AUtaV+(G!$CP0$#
zBPIZO>ZKDVz)r$sSqX3_;qxZIU4$=~0Q0+O@RkX%oA7^|0DAx~lS(B3F>{$zDuIj(
zm&Z*YGsEQx6Ug9jdA|u{dbsif6UYh36-|)t01RO11Ac)06GTCW&P<;5pGA3}-n{`e
zixn6H)&myJlD4A8wKS+)a8*njZ|4;oEAqeB!I$1!dYb>9ZwCjILnExyTT7gbGb=Kb
zR~4qDf#zxQZa_|~qY#(?M3E#%7jeVtcs%oUM?046)%VOFZHz?~W<9iP$3VB8YZ|%`
zG~Q!ube0;&oh6ySbKZvyNGwnCMWX442EEqj^*9S0`73Nziy}C~0tVQFL><yJWo*nC
zcaKp(OG)?BwQZn4K2+&ZARe)YZgAEG3>jq-x<+mQn52-zxbdO8J+s#HmZ)B<w|I~V
z?4fnRQ0%7HxWaf!MKXf2osc5!u0Y&~7o9BrivD=VN)~YS)rPq{z<NR$EJjx#=t>zM
z6gBwrZHz-{DQwRTpfm}kP#Vu{Do$eNWJwKk#Ps?=X-RQWp`WC4+l|xJQR7-*bd%H~
z3GpVs4J_b<Lg>)j-6%NrXetw2;X;`vofB&ZNDMB3r${nn39_UVijh!H1V@{1dM6LO
z(4?;cP)QTOrEH2|N{Z}*A^~JCx+&;pOIgbJQrRnfn?7J13`P9{R7I#{QqFTG<w@Yk
z<Hk2a6PbeY4%Ow?Jyud=PHmVbj>e3m(RhdyOk%vi9_3x&0Xjr#zv<8i(f-WlRe5MU
zU0rUZSMM}_wEC-M5xtT;iCDyGI(?AD<1#csQU#*=wW={!&d8JebL1Ot@WCcsH;SuE
z3W*>&#cooFpdHS|4uzB^`i=hTMCNa*!`yHNBF5WwuG^%3pXNL1l!dZh8g}Y;^mn##
zu8<6*SElf3umakwn95~q8+o(^m||h{I%tAxq&8K}sZC9SD%5yppnfA}KHt!dJfUwh
z&aG+8*R<RLElD@Dc%~rMh4Yf~B!7u4n+L^|O+TyW<+$!yRYFpCZ&}D6OzL$SDx@og
zqL|`qACVT^B2q*e6;3QMRn6I2l4feWM6bW;0(r&9-O!e=82{e*975)yre_5IS3P9(
zt_=mYELe$lHz=y6D%v!?0hSRGU)XITWz4J%hqdjXX)*vbAflUZIBA)=@u1_zgG0J6
z^W@qN<e$=y7;mjxspWyH<*6y7V12oR*=#vUY)P;&TRgLQeH=3nZFrdF6!p9ab35@7
zpfX7*AR@Iv77|RPxpbx(g$xcXL5NAV7{o(GtJ{iQs#09-Zi?h%khP#kL$xA`b$AOl
zwX`<Ie17!#<zi(;B#JFfa;wr@{;+CY4O`V7VYknFvj62<@5#=3gH?ey0=-^5?)eWd
ztpz;A1*m$xw9^~-^W27)C4*HgqKDOn?9YO9$V;bbcQH_fG@bPZa*G8{y0>0#1#_$9
z)Ra}0G~uLf!4Dy*fo7`5N&WWK$mWF$HC9={RHX>PB6<X>*iEeh(*#R_W<@d+1+Pl#
zQ7z;eT!t^^QCWo*&{tQxeqC!zY)x%*U30j|TU=~YimK7)aiHI)=JXMXMw**iBdskV
zKeu9}LiPB4R&1q_rfMyX^D$nb1~Jx-k!Z~4QR_%|{P)3Nn-XM!>=%Q{z^~^fTP(Aa
z*f9ARPGuM3KYKJjhrP(wX8%6^TD;P|W8}n%Py?&!suHnaOFTXmkK_BHL|L0swj-E*
zBpCd4dh*e+9bccFoV*ssX-wSu*tvl;Tb2EvHcZ6l<CQf{*<aP^b@Z=kU}8}8&UBM(
zxs>)4zsNqK#8?V-aC*yvjoj9T$VHTLAnPgFvS43cf#sDOw}*zz8(~r=r@)%NIo${|
z-OMlNo8`xXHy#q0OG<>UXQdMTlV4kYY-s3ArQ7dsRLB_4=5}0<G4e%n#e9rnq?Iht
zj!h8?zm<*i(o3b2UiVNIDZEr&i$|T#?4q~HnLSxM;q*0xBQci~H{8{`5=Z3DhDvm}
zT-omz?#7qjEs2z7_xfY*?C)I6gAcU4SmgAum9a1@@ID|`XXm^v&g}0htI^?$d2pmG
zM%txtT6&(}%I)*HunX(u<Ww@|WVFfMT(mC78U-3x{GS|X{~u9*B%nSaZsxCt2z5eB
zU**SnfLwhA)sYgY(O2hcrkz>=D{l6<T@ETxXo0R=Qb<#hfH9A|$R(7*>Xlk^qvqEz
z+Ujq0Aa9K}dZQXvHv3!s8oR&uKYO3u`qBNTx1Q<4^E1!NDf`}qzB60T%qMB`?XB#{
znXRY0&to?9Z8>N4zv`vK<T+AT_pvAbkEv>XmB(E`j4)zkGx6tJk!Q77uuG;akm(A?
zygr{>^5pindMjI_?r4r1^lN_N$7wR!d8qG|-nq`snz`Or`tW#%L~^BrJ#o07@JG*Y
znx#2&=614sX?u24rflPG+^}8W3O1`PZAYtSO|PKNPD`sqoj73A0;#+(et<mpU>;f!
zE!zoMkV+)Y`i(RC4~<WCESALezEy~-lWw)vF~Q1F5u%5B1~qLQ?JTt?r0Y|v<<tV5
z?EG<UyS~23LKGr)Dx1^^a>i#s$m%7iW>PrjS_YPsombp=VAD&+V3$91w>~Eut(q{?
zRK1N^tb@JGW+yt!eU~xcRpH7rn=V4vo36~6t^u)Xz1~I?sCj{Drc%LI01xC^1+FMu
z@~0$0;Y!?C)puBy5n|SbZ&T-52K7*(mnqa+P^*xT7$GUBb|A!?<xgX-aCkjxRMv)O
zvs@_4^VUC@UoR)G2K@*8K@9m0_(B*kk-1bBa>zwmqWv>++pzbSAsCPMo#lJ<yNs#+
zP?eo(n9a&;De5>Zn$@zKs;i0`HC$93lmtlWDb>iHGt>W$UzQBBEp|{Z-%1}<cYu8A
zxh?W3K~IUBpW^bVoWL@alR1Bk8$A9_=Dqm6h&7qJ2TBnqjb987R)B+4!X4CNIBhm(
z0-R1;as}F)wm9WMnPz7UHkb@K$gm%CNM_y<<Ie{B1E27go}*U$@h38!+x}YPr}U?d
zv&kk4Ih)_d{ksh|ROxlv8M&;IkXS(yhgzk0=9ZxXG9zT-cMh@OU+MSlLa%2!v9XqV
zmzFSPDZzW72t3{*Ps;emT`PS~jS6OAAtrJIEKEWn7REDIcb!BpeJx8JQ;#8=G(Ty1
zE1WQ%+*7%)p1!Mviej3MFhL(#8gNzPvI<j^Obr^bluMA(1DQfSQp3$R*z}*eVysHN
zlPMbhG;)d&<I%mnehWFXMOJ!EQxl-7vYk|^oxHO55p+vV_whG~Q#&=n6;KWTVtjd|
zXCfp6pBh`_nAWH=^0WnoBGQsA`ch+K%XO{vhI1A{N>TU?XY@b$j4?U-O$RPrBbR)G
zH<F?#2^rzBh>zY?KxP6Z*8@w12nxxev1^&c__G*3?rJO8<Jj;X*!iLi(O*3EHTtkN
z@zND)ijMGSjE4R7IBul&U-gN4Qn`~N`62;*ZSyB&{xx<?wlnTD9+})V|0YlJ=lHwg
zqEe@fDGTb~Y6aRkOO3VEdd&J$>t$P&?OxkCd(hruAFxl@@3sHZekCt2?`-~|{KxWN
z$ba8a<48G9IL;S@3#JNAJDIcJ^`L9PeUJP59*^gO_cPwteR03)KUerl(L(Xw;;SW-
zrL1(J^lG3pa4c{t@XNb`mS8OSow7*Tw?Z|ci{%65kCne((Nyu7idQS^DvyO@;h(Sk
z!s?$_#j3tjQ&97AZB<=c-L?9?^$QKB)=b9oV_%59E`t=t@gij^`NQb{R1z>pqgRdZ
z9=O6{4aTXdQ#=L@nFG`PNQyaq@P&Nbi~Dc{M{x|taUyefT4$}|@bLJYD*x23F;PsR
zS#7M~(CFO$dq!*LriZ7dYKNx|=ij(soSOZC)iOFYwSQ)A|D193&;{+8C5;ngQgc`B
F{|k5S^JxG8

delta 3479
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

diff --git a/html/image/fontello/fontello.woff b/html/image/fontello/fontello.woff
index 30198d049e2657226440f21adce8f8c97bf137ec..4506671e15e36fe739a48ad4a04ad3c517c93f16 100644
GIT binary patch
delta 19391
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
Ec7s^bhyVZp

delta 18488
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

diff --git a/html/image/fontello/fontello.woff2 b/html/image/fontello/fontello.woff2
index 02666c48ee7d76eab0b0253fc7b1602b31a12fc4..226a86f59d6c8f59b1230bd71e894573d262173d 100644
GIT binary patch
literal 17520
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
LSJI#VA=Ur^ELMdi

literal 16944
zcmV(>K-j-`Pew8T0RR91075VT4*&oF0Do8j0729M0RR9100000000000000000000
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
Hngt>NB15|I

diff --git a/html/image/logo7400.png b/html/image/logo7400.png
deleted file mode 100644
index 14d2577fb0738ef6e046a373ddc062e185f1a9d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 33498
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
BFTDT&

diff --git a/html/image/logo7400.xcf b/html/image/logo7400.xcf
deleted file mode 100644
index 95e59ef13a21c5fb5af73601b7b26029c7e95445..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 69520
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%0D4$d3_P(A
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
Hz19CO2=|`$

diff --git a/html/image/logo7500.png b/html/image/logo7500.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9164d74c247633989c7473bb879f5e57cdabb7c
GIT binary patch
literal 33035
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
DmAUp)

literal 0
HcmV?d00001

diff --git a/html/image/logo7500.xcf b/html/image/logo7500.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..e3ad80a426900acd78bc2b11faa9adb4e0342911
GIT binary patch
literal 60829
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
z%0D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
E2VRU6g#Z8m

literal 0
HcmV?d00001

diff --git a/html/index.php b/html/index.php
index a0263f654..172e15b81 100644
--- a/html/index.php
+++ b/html/index.php
@@ -191,7 +191,7 @@ if (isset ($_REQUEST['reconnect']) && isset ($_REQUEST['backurl'])) {
 }
 echo '
 
-<IMG SRC="image/logo7400.png" id="logo_id" alt="NOALYSS">
+<IMG SRC="image/logo7500.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 1536f6650..847a91145 100644
--- a/html/install.php
+++ b/html/install.php
@@ -79,7 +79,7 @@
 </head>
 <body>
 <p align="center">
-  <IMG SRC="image/logo7400.png" style="width: 400px;z-index:-1;position:fixed;top:30px;rigth:50px;opacity: 0.2" alt="NOALYSS">
+  <IMG SRC="image/logo7500.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/include/template/tag_search_select.php b/include/template/tag_search_select.php
index bfa67d5c3..547a5486d 100644
--- a/include/template/tag_search_select.php
+++ b/include/template/tag_search_select.php
@@ -56,10 +56,11 @@ $gDossier=Dossier::id();
 </table>
  
 <?php 
-    $tab_tag->set_content(ob_get_contents());
-    ob_end_clean();
+  $tab_tag->set_content(ob_get_contents());
+   ob_end_clean();
 // Tab for the groups 
 //
+ob_start();
 $tab_tag_group=new Html_Tab($p_prefix."tab_tag_group",_("Groupe"));
 $aGroup=$this->cn->get_array("select tg_id, tg_name from tag_group order by 2 desc");
 $nb_agroup=count($aGroup);
diff --git a/include/template/tag_select.php b/include/template/tag_select.php
index 475e9594a..fc81c2cb6 100644
--- a/include/template/tag_select.php
+++ b/include/template/tag_select.php
@@ -41,7 +41,11 @@ if (isNumber($ag_id) == 0 ) die ('ERROR : parameters invalid');
         </td>
         <td>
             <?php
-            echo $row['t_description'];
+            if ( $row['t_description'] != "G"):
+                echo $row['t_description'];
+            else :
+                echo '<span class="icon">&#0xe83d;</span>';
+            endif;
             ?>
         </td>
     </tr>

From 63c1dbae900174533a8589a12d30a335d8297e17 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sat, 17 Oct 2020 18:35:08 +0200
Subject: [PATCH 114/257] Analytic accountancy protect against divide by zero

---
 include/class/anc_operation.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/class/anc_operation.class.php b/include/class/anc_operation.class.php
index 6e87cc9df..f8c2ea835 100644
--- a/include/class/anc_operation.class.php
+++ b/include/class/anc_operation.class.php
@@ -710,7 +710,10 @@ class Anc_Operation
                 $op->po_id=$hplan[$p_item][$e];
                 $op->oa_group=$this->oa_group;
                 $op->j_id=$p_j_id;
-                $ratio=bcdiv($val[$p_item][$row],${"amount_t".$p_item});
+                $ratio=0;
+                if (${"amount_t".$p_item} != 0 ) {
+                    $ratio=bcdiv($val[$p_item][$row],${"amount_t".$p_item});
+                }
                 $amount=  bcmul($p_nd, $ratio);
                 $op->oa_amount=round($amount,2);
                 $op->oa_debit=$this->oa_debit;

From 9f878b1be3939c9781d0ad37748bf42fc4e190c0 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 22 Oct 2020 13:54:05 +0200
Subject: [PATCH 115/257] Modern CheckBox

---
 html/image/fontello/css/fontello-codes.css    |  14 +--
 html/image/fontello/css/fontello-embedded.css |  26 ++---
 .../image/fontello/css/fontello-ie7-codes.css |  14 +--
 html/image/fontello/css/fontello-ie7.css      |  14 +--
 html/image/fontello/css/fontello.css          |  28 ++---
 html/image/fontello/demo.html                 |  88 +++++++--------
 html/image/fontello/fontello.eot              | Bin 34464 -> 35304 bytes
 html/image/fontello/fontello.svg              |  22 ++--
 html/image/fontello/fontello.ttf              | Bin 34296 -> 35136 bytes
 html/image/fontello/fontello.woff             | Bin 20936 -> 21500 bytes
 html/image/fontello/fontello.woff2            | Bin 17520 -> 17964 bytes
 html/js/scripts.js                            |  20 ++++
 include/lib/icon_action.class.php             |  25 ++++-
 include/lib/inplace_edit.class.php            |   4 +-
 include/lib/input_checkbox.class.php          | 101 ++++++++++++++++++
 include/template/detail-action.php            |   2 +-
 include/template/tag_select.php               |   2 +-
 17 files changed, 252 insertions(+), 108 deletions(-)
 create mode 100644 include/lib/input_checkbox.class.php

diff --git a/html/image/fontello/css/fontello-codes.css b/html/image/fontello/css/fontello-codes.css
index c848978f5..d5e617199 100644
--- a/html/image/fontello/css/fontello-codes.css
+++ b/html/image/fontello/css/fontello-codes.css
@@ -1,4 +1,6 @@
 
+.icon-check:before { content: '\e741'; } /* '' */
+.icon-resize-small-1:before { content: '\e746'; } /* '' */
 .icon-logout:before { content: '\e800'; } /* '' */
 .icon-cancel-circled:before { content: '\e801'; } /* '' */
 .icon-cancel-circled2:before { content: '\e802'; } /* '' */
@@ -57,15 +59,13 @@
 .icon-right-hand:before { content: '\e837'; } /* '' */
 .icon-left-hand:before { content: '\e838'; } /* '' */
 .icon-up-hand:before { content: '\e839'; } /* '' */
+.icon-tags-3:before { content: '\e839'; } /* '' */
 .icon-down-hand:before { content: '\e83a'; } /* '' */
 .icon-eye-off:before { content: '\e83b'; } /* '' */
 .icon-arrows-cw-1:before { content: '\e83c'; } /* '' */
-.icon-tags:before { content: '\e83d'; } /* '' */
-.icon-tags-1:before { content: '\e83e'; } /* '' */
-.icon-tags-2:before { content: '\e83f'; } /* '' */
-.icon-tag-2:before { content: '\e840'; } /* '' */
-.icon-resize-small-alt:before { content: '\e841'; } /* '' */
-.icon-resize-small-1:before { content: '\e842'; } /* '' */
+.icon-resize-small-alt:before { content: '\e83d'; } /* '' */
+.icon-tags:before { content: '\e83e'; } /* '' */
+.icon-tags-4:before { content: '\e83f'; } /* '' */
 .icon-down-open:before { content: '\f004'; } /* '' */
 .icon-up-open:before { content: '\f005'; } /* '' */
 .icon-right-open:before { content: '\f006'; } /* '' */
@@ -73,6 +73,7 @@
 .icon-move:before { content: '\f047'; } /* '' */
 .icon-info-circled-alt:before { content: '\f086'; } /* '' */
 .icon-link-ext:before { content: '\f08e'; } /* '' */
+.icon-check-empty:before { content: '\f096'; } /* '' */
 .icon-comment-empty:before { content: '\f0e5'; } /* '' */
 .icon-doc-text:before { content: '\f0f6'; } /* '' */
 .icon-plus-squared:before { content: '\f0fe'; } /* '' */
@@ -81,7 +82,6 @@
 .icon-angle-circled-up:before { content: '\f139'; } /* '' */
 .icon-angle-circled-down:before { content: '\f13a'; } /* '' */
 .icon-lock-open-alt:before { content: '\f13e'; } /* '' */
-.icon-ellipsis:before { content: '\f141'; } /* '' */
 .icon-ellipsis-vert:before { content: '\f142'; } /* '' */
 .icon-sort-alt-up:before { content: '\f160'; } /* '' */
 .icon-sort-alt-down:before { content: '\f161'; } /* '' */
diff --git a/html/image/fontello/css/fontello-embedded.css b/html/image/fontello/css/fontello-embedded.css
index aeaf1c197..70f3ca318 100644
--- a/html/image/fontello/css/fontello-embedded.css
+++ b/html/image/fontello/css/fontello-embedded.css
@@ -1,15 +1,15 @@
 @font-face {
   font-family: 'fontello';
-  src: url('../font/fontello.eot?36632261');
-  src: url('../font/fontello.eot?36632261#iefix') format('embedded-opentype'),
-       url('../font/fontello.svg?36632261#fontello') format('svg');
+  src: url('../font/fontello.eot?99450207');
+  src: url('../font/fontello.eot?99450207#iefix') format('embedded-opentype'),
+       url('../font/fontello.svg?99450207#fontello') format('svg');
   font-weight: normal;
   font-style: normal;
 }
 @font-face {
   font-family: 'fontello';
-  src: url('data:application/octet-stream;base64,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') format('woff'),
-       url('data:application/octet-stream;base64,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c3MtMQRjb2dzAnVwCXRodW1icy11cARsb2NrCWxvY2stb3Blbgt0aHVtYnMtZG93bgRiZWxsDHJlc2l6ZS1zbWFsbA1yZXNpemUtZnVsbC0xCnJpZ2h0LWhhbmQJbGVmdC1oYW5kB3VwLWhhbmQJZG93bi1oYW5kB2V5ZS1vZmYLYXJyb3dzLWN3LTEEdGFncwZ0YWdzLTEGdGFncy0yBXRhZy0yEHJlc2l6ZS1zbWFsbC1hbHQOcmVzaXplLXNtYWxsLTEJZG93bi1vcGVuB3VwLW9wZW4KcmlnaHQtb3BlbglsZWZ0LW9wZW4EbW92ZRBpbmZvLWNpcmNsZWQtYWx0CGxpbmstZXh0DWNvbW1lbnQtZW1wdHkIZG9jLXRleHQMcGx1cy1zcXVhcmVkEmFuZ2xlLWNpcmNsZWQtbGVmdBNhbmdsZS1jaXJjbGVkLXJpZ2h0EGFuZ2xlLWNpcmNsZWQtdXASYW5nbGUtY2lyY2xlZC1kb3duDWxvY2stb3Blbi1hbHQIZWxsaXBzaXMNZWxsaXBzaXMtdmVydAtzb3J0LWFsdC11cA1zb3J0LWFsdC1kb3duCWJpdGJ1Y2tldAVsaW51eAtkb3QtY2lyY2xlZBBwbHVzLXNxdWFyZWQtYWx0A2ZheAdzbGlkZXJzBXNoYXJlBGNhbGMOYmVsbC1vZmYtZW1wdHkKdG9nZ2xlLW9mZgl0b2dnbGUtb24Gc2FmYXJpBmNocm9tZQdmaXJlZm94CmNhbGVuZGFyLTEIc2VhcmNoLTEAAAAAAAABAAH//wAPAAAAAAAAAAAAAAAAAAAAAAAYABgAGAAYA7X/BwO1/wewACwgsABVWEVZICBLuAAOUUuwBlNaWLA0G7AoWWBmIIpVWLACJWG5CAAIAGNjI2IbISGwAFmwAEMjRLIAAQBDYEItsAEssCBgZi2wAiwgZCCwwFCwBCZasigBCkNFY0VSW1ghIyEbilggsFBQWCGwQFkbILA4UFghsDhZWSCxAQpDRWNFYWSwKFBYIbEBCkNFY0UgsDBQWCGwMFkbILDAUFggZiCKimEgsApQWGAbILAgUFghsApgGyCwNlBYIbA2YBtgWVlZG7ABK1lZI7AAUFhlWVktsAMsIEUgsAQlYWQgsAVDUFiwBSNCsAYjQhshIVmwAWAtsAQsIyEjISBksQViQiCwBiNCsQEK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') format('truetype');
+  src: url('data:application/octet-stream;base64,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') format('woff'),
+       url('data:application/octet-stream;base64,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dXAtb3Blbi0xC2xlZnQtb3Blbi0xDHJpZ2h0LW9wZW4tMQlhcnJvd3MtY3cIZG93bi1kaXIGdXAtZGlyA2NvZwdjb2ctYWx0CmRvd24tZGlyLTEIdXAtZGlyLTELZG93bi1vcGVuLTIMcmlnaHQtb3Blbi0yC2xlZnQtb3Blbi0yCXVwLW9wZW4tMgRwbHVzB2NvbXBhc3MRcmVzaXplLWZ1bGwtYWx0LTEFdGFnLTEGZWRpdC0yCWNvbXBhc3MtMQRjb2dzAnVwCXRodW1icy11cARsb2NrCWxvY2stb3Blbgt0aHVtYnMtZG93bgRiZWxsDHJlc2l6ZS1zbWFsbA1yZXNpemUtZnVsbC0xCnJpZ2h0LWhhbmQJbGVmdC1oYW5kB3VwLWhhbmQGdGFncy0zCWRvd24taGFuZAdleWUtb2ZmC2Fycm93cy1jdy0xEHJlc2l6ZS1zbWFsbC1hbHQEdGFncwZ0YWdzLTQJZG93bi1vcGVuB3VwLW9wZW4KcmlnaHQtb3BlbglsZWZ0LW9wZW4EbW92ZRBpbmZvLWNpcmNsZWQtYWx0CGxpbmstZXh0C2NoZWNrLWVtcHR5DWNvbW1lbnQtZW1wdHkIZG9jLXRleHQMcGx1cy1zcXVhcmVkEmFuZ2xlLWNpcmNsZWQtbGVmdBNhbmdsZS1jaXJjbGVkLXJpZ2h0EGFuZ2xlLWNpcmNsZWQtdXASYW5nbGUtY2lyY2xlZC1kb3duDWxvY2stb3Blbi1hbHQNZWxsaXBzaXMtdmVydAtzb3J0LWFsdC11cA1zb3J0LWFsdC1kb3duCWJpdGJ1Y2tldAVsaW51eAtkb3QtY2lyY2xlZBBwbHVzLXNxdWFyZWQtYWx0A2ZheAdzbGlkZXJzBXNoYXJlBGNhbGMOYmVsbC1vZmYtZW1wdHkKdG9nZ2xlLW9mZgl0b2dnbGUtb24Gc2FmYXJpBmNocm9tZQdmaXJlZm94CmNhbGVuZGFyLTEIc2VhcmNoLTEAAAABAAH//wAPAAAAAAAAAAAAAAAAAAAAALAALCCwAFVYRVkgIEu4AA5RS7AGU1pYsDQbsChZYGYgilVYsAIlYbkIAAgAY2MjYhshIbAAWbAAQyNEsgABAENgQi2wASywIGBmLbACLCMhIyEtsAMsIGSzAxQVAEJDsBNDIGBgQrECFENCsSUDQ7ACQ1R4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Qy6wMCstsEkssAAVIEewACNCsgABARUUEy6wNiotsEossAAVIEewACNCsgABARUUEy6wNiotsEsssQABFBOwNyotsEwssDkqLbBNLLAAFkUjIC4gRoojYTixMAEUKy2wTiywCiNCsE0rLbBPLLIAAEYrLbBQLLIAAUYrLbBRLLIBAEYrLbBSLLIBAUYrLbBTLLIAAEcrLbBULLIAAUcrLbBVLLIBAEcrLbBWLLIBAUcrLbBXLLMAAABDKy2wWCyzAAEAQystsFksswEAAEMrLbBaLLMBAQBDKy2wWyyzAAABQystsFwsswABAUMrLbBdLLMBAAFDKy2wXiyzAQEBQystsF8ssgAARSstsGAssgABRSstsGEssgEARSstsGIssgEBRSstsGMssgAASCstsGQssgABSCstsGUssgEASCstsGYssgEBSCstsGcsswAAAEQrLbBoLLMAAQBEKy2waSyzAQAARCstsGosswEBAEQrLbBrLLMAAAFEKy2wbCyzAAEBRCstsG0sswEAAUQrLbBuLLMBAQFEKy2wbyyxADwrLrEwARQrLbBwLLEAPCuwQCstsHEssQA8K7BBKy2wciywABaxADwrsEIrLbBzLLEBPCuwQCstsHQssQE8K7BBKy2wdSywABaxATwrsEIrLbB2LLEAPSsusTABFCstsHcssQA9K7BAKy2weCyxAD0rsEErLbB5LLEAPSuwQistsHossQE9K7BAKy2weyyxAT0rsEErLbB8LLEBPSuwQistsH0ssQA+Ky6xMAEUKy2wfiyxAD4rsEArLbB/LLEAPiuwQSstsIAssQA+K7BCKy2wgSyxAT4rsEArLbCCLLEBPiuwQSstsIMssQE+K7BCKy2whCyxAD8rLrEwARQrLbCFLLEAPyuwQCstsIYssQA/K7BBKy2whyyxAD8rsEIrLbCILLEBPyuwQCstsIkssQE/K7BBKy2wiiyxAT8rsEIrLbCLLLILAANFUFiwBhuyBAIDRVgjIRshWVlCK7AIZbADJFB4sQUBFUVYMFktAEu4AMhSWLEBAY5ZsAG5CAAIAGNwsQAHQrEAACqxAAdCsQAKKrEAB0KxAAoqsQAHQrkAAAALKrEAB0K5AAAACyq5AAMAAESxJAGIUViwQIhYuQADAGREsSgBiFFYuAgAiFi5AAMAAERZG7EnAYhRWLoIgAABBECIY1RYuQADAABEWVlZWVmxAA4quAH/hbAEjbECAESzBWQGAERE') format('truetype');
 }
 /* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
 /* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
@@ -17,7 +17,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'fontello';
-    src: url('../font/fontello.svg?36632261#fontello') format('svg');
+    src: url('../font/fontello.svg?99450207#fontello') format('svg');
   }
 }
 */
@@ -52,6 +52,8 @@
   /* Uncomment for 3D effect */
   /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
 }
+.icon-check:before { content: '\e741'; } /* '' */
+.icon-resize-small-1:before { content: '\e746'; } /* '' */
 .icon-logout:before { content: '\e800'; } /* '' */
 .icon-cancel-circled:before { content: '\e801'; } /* '' */
 .icon-cancel-circled2:before { content: '\e802'; } /* '' */
@@ -110,15 +112,13 @@
 .icon-right-hand:before { content: '\e837'; } /* '' */
 .icon-left-hand:before { content: '\e838'; } /* '' */
 .icon-up-hand:before { content: '\e839'; } /* '' */
+.icon-tags-3:before { content: '\e839'; } /* '' */
 .icon-down-hand:before { content: '\e83a'; } /* '' */
 .icon-eye-off:before { content: '\e83b'; } /* '' */
 .icon-arrows-cw-1:before { content: '\e83c'; } /* '' */
-.icon-tags:before { content: '\e83d'; } /* '' */
-.icon-tags-1:before { content: '\e83e'; } /* '' */
-.icon-tags-2:before { content: '\e83f'; } /* '' */
-.icon-tag-2:before { content: '\e840'; } /* '' */
-.icon-resize-small-alt:before { content: '\e841'; } /* '' */
-.icon-resize-small-1:before { content: '\e842'; } /* '' */
+.icon-resize-small-alt:before { content: '\e83d'; } /* '' */
+.icon-tags:before { content: '\e83e'; } /* '' */
+.icon-tags-4:before { content: '\e83f'; } /* '' */
 .icon-down-open:before { content: '\f004'; } /* '' */
 .icon-up-open:before { content: '\f005'; } /* '' */
 .icon-right-open:before { content: '\f006'; } /* '' */
@@ -126,6 +126,7 @@
 .icon-move:before { content: '\f047'; } /* '' */
 .icon-info-circled-alt:before { content: '\f086'; } /* '' */
 .icon-link-ext:before { content: '\f08e'; } /* '' */
+.icon-check-empty:before { content: '\f096'; } /* '' */
 .icon-comment-empty:before { content: '\f0e5'; } /* '' */
 .icon-doc-text:before { content: '\f0f6'; } /* '' */
 .icon-plus-squared:before { content: '\f0fe'; } /* '' */
@@ -134,7 +135,6 @@
 .icon-angle-circled-up:before { content: '\f139'; } /* '' */
 .icon-angle-circled-down:before { content: '\f13a'; } /* '' */
 .icon-lock-open-alt:before { content: '\f13e'; } /* '' */
-.icon-ellipsis:before { content: '\f141'; } /* '' */
 .icon-ellipsis-vert:before { content: '\f142'; } /* '' */
 .icon-sort-alt-up:before { content: '\f160'; } /* '' */
 .icon-sort-alt-down:before { content: '\f161'; } /* '' */
diff --git a/html/image/fontello/css/fontello-ie7-codes.css b/html/image/fontello/css/fontello-ie7-codes.css
index 557bbeea3..bf52a4374 100644
--- a/html/image/fontello/css/fontello-ie7-codes.css
+++ b/html/image/fontello/css/fontello-ie7-codes.css
@@ -1,4 +1,6 @@
 
+.icon-check { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe741;&nbsp;'); }
+.icon-resize-small-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe746;&nbsp;'); }
 .icon-logout { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe800;&nbsp;'); }
 .icon-cancel-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe801;&nbsp;'); }
 .icon-cancel-circled2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe802;&nbsp;'); }
@@ -57,15 +59,13 @@
 .icon-right-hand { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe837;&nbsp;'); }
 .icon-left-hand { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe838;&nbsp;'); }
 .icon-up-hand { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe839;&nbsp;'); }
+.icon-tags-3 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe839;&nbsp;'); }
 .icon-down-hand { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83a;&nbsp;'); }
 .icon-eye-off { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83b;&nbsp;'); }
 .icon-arrows-cw-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83c;&nbsp;'); }
-.icon-tags { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83d;&nbsp;'); }
-.icon-tags-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83e;&nbsp;'); }
-.icon-tags-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83f;&nbsp;'); }
-.icon-tag-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe840;&nbsp;'); }
-.icon-resize-small-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe841;&nbsp;'); }
-.icon-resize-small-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe842;&nbsp;'); }
+.icon-resize-small-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83d;&nbsp;'); }
+.icon-tags { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83e;&nbsp;'); }
+.icon-tags-4 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83f;&nbsp;'); }
 .icon-down-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf004;&nbsp;'); }
 .icon-up-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf005;&nbsp;'); }
 .icon-right-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf006;&nbsp;'); }
@@ -73,6 +73,7 @@
 .icon-move { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf047;&nbsp;'); }
 .icon-info-circled-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf086;&nbsp;'); }
 .icon-link-ext { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf08e;&nbsp;'); }
+.icon-check-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf096;&nbsp;'); }
 .icon-comment-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e5;&nbsp;'); }
 .icon-doc-text { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0f6;&nbsp;'); }
 .icon-plus-squared { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0fe;&nbsp;'); }
@@ -81,7 +82,6 @@
 .icon-angle-circled-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf139;&nbsp;'); }
 .icon-angle-circled-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf13a;&nbsp;'); }
 .icon-lock-open-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf13e;&nbsp;'); }
-.icon-ellipsis { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf141;&nbsp;'); }
 .icon-ellipsis-vert { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf142;&nbsp;'); }
 .icon-sort-alt-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf160;&nbsp;'); }
 .icon-sort-alt-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf161;&nbsp;'); }
diff --git a/html/image/fontello/css/fontello-ie7.css b/html/image/fontello/css/fontello-ie7.css
index a0f449f14..e07293d92 100644
--- a/html/image/fontello/css/fontello-ie7.css
+++ b/html/image/fontello/css/fontello-ie7.css
@@ -10,6 +10,8 @@
   /* font-size: 120%; */
 }
  
+.icon-check { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe741;&nbsp;'); }
+.icon-resize-small-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe746;&nbsp;'); }
 .icon-logout { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe800;&nbsp;'); }
 .icon-cancel-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe801;&nbsp;'); }
 .icon-cancel-circled2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe802;&nbsp;'); }
@@ -68,15 +70,13 @@
 .icon-right-hand { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe837;&nbsp;'); }
 .icon-left-hand { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe838;&nbsp;'); }
 .icon-up-hand { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe839;&nbsp;'); }
+.icon-tags-3 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe839;&nbsp;'); }
 .icon-down-hand { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83a;&nbsp;'); }
 .icon-eye-off { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83b;&nbsp;'); }
 .icon-arrows-cw-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83c;&nbsp;'); }
-.icon-tags { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83d;&nbsp;'); }
-.icon-tags-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83e;&nbsp;'); }
-.icon-tags-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83f;&nbsp;'); }
-.icon-tag-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe840;&nbsp;'); }
-.icon-resize-small-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe841;&nbsp;'); }
-.icon-resize-small-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe842;&nbsp;'); }
+.icon-resize-small-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83d;&nbsp;'); }
+.icon-tags { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83e;&nbsp;'); }
+.icon-tags-4 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe83f;&nbsp;'); }
 .icon-down-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf004;&nbsp;'); }
 .icon-up-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf005;&nbsp;'); }
 .icon-right-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf006;&nbsp;'); }
@@ -84,6 +84,7 @@
 .icon-move { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf047;&nbsp;'); }
 .icon-info-circled-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf086;&nbsp;'); }
 .icon-link-ext { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf08e;&nbsp;'); }
+.icon-check-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf096;&nbsp;'); }
 .icon-comment-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e5;&nbsp;'); }
 .icon-doc-text { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0f6;&nbsp;'); }
 .icon-plus-squared { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0fe;&nbsp;'); }
@@ -92,7 +93,6 @@
 .icon-angle-circled-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf139;&nbsp;'); }
 .icon-angle-circled-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf13a;&nbsp;'); }
 .icon-lock-open-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf13e;&nbsp;'); }
-.icon-ellipsis { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf141;&nbsp;'); }
 .icon-ellipsis-vert { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf142;&nbsp;'); }
 .icon-sort-alt-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf160;&nbsp;'); }
 .icon-sort-alt-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf161;&nbsp;'); }
diff --git a/html/image/fontello/css/fontello.css b/html/image/fontello/css/fontello.css
index 696f2ad6a..9306608f7 100644
--- a/html/image/fontello/css/fontello.css
+++ b/html/image/fontello/css/fontello.css
@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'fontello';
-  src: url('../font/fontello.eot?84662865');
-  src: url('../font/fontello.eot?84662865#iefix') format('embedded-opentype'),
-       url('../font/fontello.woff2?84662865') format('woff2'),
-       url('../font/fontello.woff?84662865') format('woff'),
-       url('../font/fontello.ttf?84662865') format('truetype'),
-       url('../font/fontello.svg?84662865#fontello') format('svg');
+  src: url('../font/fontello.eot?16636759');
+  src: url('../font/fontello.eot?16636759#iefix') format('embedded-opentype'),
+       url('../font/fontello.woff2?16636759') format('woff2'),
+       url('../font/fontello.woff?16636759') format('woff'),
+       url('../font/fontello.ttf?16636759') format('truetype'),
+       url('../font/fontello.svg?16636759#fontello') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -15,7 +15,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'fontello';
-    src: url('../font/fontello.svg?84662865#fontello') format('svg');
+    src: url('../font/fontello.svg?16636759#fontello') format('svg');
   }
 }
 */
@@ -55,6 +55,8 @@
   /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
 }
  
+.icon-check:before { content: '\e741'; } /* '' */
+.icon-resize-small-1:before { content: '\e746'; } /* '' */
 .icon-logout:before { content: '\e800'; } /* '' */
 .icon-cancel-circled:before { content: '\e801'; } /* '' */
 .icon-cancel-circled2:before { content: '\e802'; } /* '' */
@@ -113,15 +115,13 @@
 .icon-right-hand:before { content: '\e837'; } /* '' */
 .icon-left-hand:before { content: '\e838'; } /* '' */
 .icon-up-hand:before { content: '\e839'; } /* '' */
+.icon-tags-3:before { content: '\e839'; } /* '' */
 .icon-down-hand:before { content: '\e83a'; } /* '' */
 .icon-eye-off:before { content: '\e83b'; } /* '' */
 .icon-arrows-cw-1:before { content: '\e83c'; } /* '' */
-.icon-tags:before { content: '\e83d'; } /* '' */
-.icon-tags-1:before { content: '\e83e'; } /* '' */
-.icon-tags-2:before { content: '\e83f'; } /* '' */
-.icon-tag-2:before { content: '\e840'; } /* '' */
-.icon-resize-small-alt:before { content: '\e841'; } /* '' */
-.icon-resize-small-1:before { content: '\e842'; } /* '' */
+.icon-resize-small-alt:before { content: '\e83d'; } /* '' */
+.icon-tags:before { content: '\e83e'; } /* '' */
+.icon-tags-4:before { content: '\e83f'; } /* '' */
 .icon-down-open:before { content: '\f004'; } /* '' */
 .icon-up-open:before { content: '\f005'; } /* '' */
 .icon-right-open:before { content: '\f006'; } /* '' */
@@ -129,6 +129,7 @@
 .icon-move:before { content: '\f047'; } /* '' */
 .icon-info-circled-alt:before { content: '\f086'; } /* '' */
 .icon-link-ext:before { content: '\f08e'; } /* '' */
+.icon-check-empty:before { content: '\f096'; } /* '' */
 .icon-comment-empty:before { content: '\f0e5'; } /* '' */
 .icon-doc-text:before { content: '\f0f6'; } /* '' */
 .icon-plus-squared:before { content: '\f0fe'; } /* '' */
@@ -137,7 +138,6 @@
 .icon-angle-circled-up:before { content: '\f139'; } /* '' */
 .icon-angle-circled-down:before { content: '\f13a'; } /* '' */
 .icon-lock-open-alt:before { content: '\f13e'; } /* '' */
-.icon-ellipsis:before { content: '\f141'; } /* '' */
 .icon-ellipsis-vert:before { content: '\f142'; } /* '' */
 .icon-sort-alt-up:before { content: '\f160'; } /* '' */
 .icon-sort-alt-down:before { content: '\f161'; } /* '' */
diff --git a/html/image/fontello/demo.html b/html/image/fontello/demo.html
index a14e56fe0..b60c0cc4c 100644
--- a/html/image/fontello/demo.html
+++ b/html/image/fontello/demo.html
@@ -229,11 +229,11 @@ body {
 }
 @font-face {
       font-family: 'fontello';
-      src: url('./font/fontello.eot?68207935');
-      src: url('./font/fontello.eot?68207935#iefix') format('embedded-opentype'),
-           url('./font/fontello.woff?68207935') format('woff'),
-           url('./font/fontello.ttf?68207935') format('truetype'),
-           url('./font/fontello.svg?68207935#fontello') format('svg');
+      src: url('./font/fontello.eot?78114184');
+      src: url('./font/fontello.eot?78114184#iefix') format('embedded-opentype'),
+           url('./font/fontello.woff?78114184') format('woff'),
+           url('./font/fontello.ttf?78114184') format('truetype'),
+           url('./font/fontello.svg?78114184#fontello') format('svg');
       font-weight: normal;
       font-style: normal;
     }
@@ -298,105 +298,105 @@ body {
     </div>
     <div class="container" id="icons">
       <div class="row">
+        <div class="the-icons span3" title="Code: 0xe741"><i class="demo-icon icon-check">&#xe741;</i> <span class="i-name">icon-check</span><span class="i-code">0xe741</span></div>
+        <div class="the-icons span3" title="Code: 0xe746"><i class="demo-icon icon-resize-small-1">&#xe746;</i> <span class="i-name">icon-resize-small-1</span><span class="i-code">0xe746</span></div>
         <div class="the-icons span3" title="Code: 0xe800"><i class="demo-icon icon-logout">&#xe800;</i> <span class="i-name">icon-logout</span><span class="i-code">0xe800</span></div>
         <div class="the-icons span3" title="Code: 0xe801"><i class="demo-icon icon-cancel-circled">&#xe801;</i> <span class="i-name">icon-cancel-circled</span><span class="i-code">0xe801</span></div>
+      </div>
+      <div class="row">
         <div class="the-icons span3" title="Code: 0xe802"><i class="demo-icon icon-cancel-circled2">&#xe802;</i> <span class="i-name">icon-cancel-circled2</span><span class="i-code">0xe802</span></div>
         <div class="the-icons span3" title="Code: 0xe803"><i class="demo-icon icon-eye">&#xe803;</i> <span class="i-name">icon-eye</span><span class="i-code">0xe803</span></div>
-      </div>
-      <div class="row">
         <div class="the-icons span3" title="Code: 0xe804"><i class="demo-icon icon-upload">&#xe804;</i> <span class="i-name">icon-upload</span><span class="i-code">0xe804</span></div>
         <div class="the-icons span3" title="Code: 0xe805"><i class="demo-icon icon-download">&#xe805;</i> <span class="i-name">icon-download</span><span class="i-code">0xe805</span></div>
+      </div>
+      <div class="row">
         <div class="the-icons span3" title="Code: 0xe806"><i class="demo-icon icon-attention">&#xe806;</i> <span class="i-name">icon-attention</span><span class="i-code">0xe806</span></div>
         <div class="the-icons span3" title="Code: 0xe807"><i class="demo-icon icon-search">&#xe807;</i> <span class="i-name">icon-search</span><span class="i-code">0xe807</span></div>
-      </div>
-      <div class="row">
         <div class="the-icons span3" title="Code: 0xe808"><i class="demo-icon icon-mail">&#xe808;</i> <span class="i-name">icon-mail</span><span class="i-code">0xe808</span></div>
         <div class="the-icons span3" title="Code: 0xe809"><i class="demo-icon icon-anchor">&#xe809;</i> <span class="i-name">icon-anchor</span><span class="i-code">0xe809</span></div>
+      </div>
+      <div class="row">
         <div class="the-icons span3" title="Code: 0xe80a"><i class="demo-icon icon-resize-full-alt">&#xe80a;</i> <span class="i-name">icon-resize-full-alt</span><span class="i-code">0xe80a</span></div>
         <div class="the-icons span3" title="Code: 0xe80b"><i class="demo-icon icon-tag">&#xe80b;</i> <span class="i-name">icon-tag</span><span class="i-code">0xe80b</span></div>
-      </div>
-      <div class="row">
         <div class="the-icons span3" title="Code: 0xe80c"><i class="demo-icon icon-cw">&#xe80c;</i> <span class="i-name">icon-cw</span><span class="i-code">0xe80c</span></div>
         <div class="the-icons span3" title="Code: 0xe80d"><i class="demo-icon icon-edit">&#xe80d;</i> <span class="i-name">icon-edit</span><span class="i-code">0xe80d</span></div>
+      </div>
+      <div class="row">
         <div class="the-icons span3" title="Code: 0xe80e"><i class="demo-icon icon-attention-circled">&#xe80e;</i> <span class="i-name">icon-attention-circled</span><span class="i-code">0xe80e</span></div>
         <div class="the-icons span3" title="Code: 0xe80f"><i class="demo-icon icon-trash-empty">&#xe80f;</i> <span class="i-name">icon-trash-empty</span><span class="i-code">0xe80f</span></div>
-      </div>
-      <div class="row">
         <div class="the-icons span3" title="Code: 0xe810"><i class="demo-icon icon-doc">&#xe810;</i> <span class="i-name">icon-doc</span><span class="i-code">0xe810</span></div>
         <div class="the-icons span3" title="Code: 0xe811"><i class="demo-icon icon-calendar">&#xe811;</i> <span class="i-name">icon-calendar</span><span class="i-code">0xe811</span></div>
+      </div>
+      <div class="row">
         <div class="the-icons span3" title="Code: 0xe812"><i class="demo-icon icon-edit-1">&#xe812;</i> <span class="i-name">icon-edit-1</span><span class="i-code">0xe812</span></div>
         <div class="the-icons span3" title="Code: 0xe813"><i class="demo-icon icon-resize-full">&#xe813;</i> <span class="i-name">icon-resize-full</span><span class="i-code">0xe813</span></div>
-      </div>
-      <div class="row">
         <div class="the-icons span3" title="Code: 0xe814"><i class="demo-icon icon-up-bold">&#xe814;</i> <span class="i-name">icon-up-bold</span><span class="i-code">0xe814</span></div>
         <div class="the-icons span3" title="Code: 0xe815"><i class="demo-icon icon-down-fat">&#xe815;</i> <span class="i-name">icon-down-fat</span><span class="i-code">0xe815</span></div>
+      </div>
+      <div class="row">
         <div class="the-icons span3" title="Code: 0xe816"><i class="demo-icon icon-cancel-circled2-1">&#xe816;</i> <span class="i-name">icon-cancel-circled2-1</span><span class="i-code">0xe816</span></div>
         <div class="the-icons span3" title="Code: 0xe817"><i class="demo-icon icon-upload-1">&#xe817;</i> <span class="i-name">icon-upload-1</span><span class="i-code">0xe817</span></div>
-      </div>
-      <div class="row">
         <div class="the-icons span3" title="Code: 0xe818"><i class="demo-icon icon-exclamation">&#xe818;</i> <span class="i-name">icon-exclamation</span><span class="i-code">0xe818</span></div>
         <div class="the-icons span3" title="Code: 0xe819"><i class="demo-icon icon-down-open-1">&#xe819;</i> <span class="i-name">icon-down-open-1</span><span class="i-code">0xe819</span></div>
+      </div>
+      <div class="row">
         <div class="the-icons span3" title="Code: 0xe81a"><i class="demo-icon icon-up-open-1">&#xe81a;</i> <span class="i-name">icon-up-open-1</span><span class="i-code">0xe81a</span></div>
         <div class="the-icons span3" title="Code: 0xe81b"><i class="demo-icon icon-left-open-1">&#xe81b;</i> <span class="i-name">icon-left-open-1</span><span class="i-code">0xe81b</span></div>
-      </div>
-      <div class="row">
         <div class="the-icons span3" title="Code: 0xe81c"><i class="demo-icon icon-right-open-1">&#xe81c;</i> <span class="i-name">icon-right-open-1</span><span class="i-code">0xe81c</span></div>
         <div class="the-icons span3" title="Code: 0xe81d"><i class="demo-icon icon-arrows-cw">&#xe81d;</i> <span class="i-name">icon-arrows-cw</span><span class="i-code">0xe81d</span></div>
+      </div>
+      <div class="row">
         <div class="the-icons span3" title="Code: 0xe81e"><i class="demo-icon icon-down-dir">&#xe81e;</i> <span class="i-name">icon-down-dir</span><span class="i-code">0xe81e</span></div>
         <div class="the-icons span3" title="Code: 0xe81f"><i class="demo-icon icon-up-dir">&#xe81f;</i> <span class="i-name">icon-up-dir</span><span class="i-code">0xe81f</span></div>
-      </div>
-      <div class="row">
         <div class="the-icons span3" title="Code: 0xe820"><i class="demo-icon icon-cog">&#xe820;</i> <span class="i-name">icon-cog</span><span class="i-code">0xe820</span></div>
         <div class="the-icons span3" title="Code: 0xe821"><i class="demo-icon icon-cog-alt">&#xe821;</i> <span class="i-name">icon-cog-alt</span><span class="i-code">0xe821</span></div>
+      </div>
+      <div class="row">
         <div class="the-icons span3" title="Code: 0xe822"><i class="demo-icon icon-down-dir-1">&#xe822;</i> <span class="i-name">icon-down-dir-1</span><span class="i-code">0xe822</span></div>
         <div class="the-icons span3" title="Code: 0xe823"><i class="demo-icon icon-up-dir-1">&#xe823;</i> <span class="i-name">icon-up-dir-1</span><span class="i-code">0xe823</span></div>
-      </div>
-      <div class="row">
         <div class="the-icons span3" title="Code: 0xe824"><i class="demo-icon icon-down-open-2">&#xe824;</i> <span class="i-name">icon-down-open-2</span><span class="i-code">0xe824</span></div>
         <div class="the-icons span3" title="Code: 0xe825"><i class="demo-icon icon-right-open-2">&#xe825;</i> <span class="i-name">icon-right-open-2</span><span class="i-code">0xe825</span></div>
+      </div>
+      <div class="row">
         <div class="the-icons span3" title="Code: 0xe826"><i class="demo-icon icon-left-open-2">&#xe826;</i> <span class="i-name">icon-left-open-2</span><span class="i-code">0xe826</span></div>
         <div class="the-icons span3" title="Code: 0xe827"><i class="demo-icon icon-up-open-2">&#xe827;</i> <span class="i-name">icon-up-open-2</span><span class="i-code">0xe827</span></div>
-      </div>
-      <div class="row">
         <div class="the-icons span3" title="Code: 0xe828"><i class="demo-icon icon-plus">&#xe828;</i> <span class="i-name">icon-plus</span><span class="i-code">0xe828</span></div>
         <div class="the-icons span3" title="Code: 0xe829"><i class="demo-icon icon-compass">&#xe829;</i> <span class="i-name">icon-compass</span><span class="i-code">0xe829</span></div>
+      </div>
+      <div class="row">
         <div class="the-icons span3" title="Code: 0xe82a"><i class="demo-icon icon-resize-full-alt-1">&#xe82a;</i> <span class="i-name">icon-resize-full-alt-1</span><span class="i-code">0xe82a</span></div>
         <div class="the-icons span3" title="Code: 0xe82b"><i class="demo-icon icon-tag-1">&#xe82b;</i> <span class="i-name">icon-tag-1</span><span class="i-code">0xe82b</span></div>
-      </div>
-      <div class="row">
         <div class="the-icons span3" title="Code: 0xe82c"><i class="demo-icon icon-edit-2">&#xe82c;</i> <span class="i-name">icon-edit-2</span><span class="i-code">0xe82c</span></div>
         <div class="the-icons span3" title="Code: 0xe82d"><i class="demo-icon icon-compass-1">&#xe82d;</i> <span class="i-name">icon-compass-1</span><span class="i-code">0xe82d</span></div>
+      </div>
+      <div class="row">
         <div class="the-icons span3" title="Code: 0xe82e"><i class="demo-icon icon-cogs">&#xe82e;</i> <span class="i-name">icon-cogs</span><span class="i-code">0xe82e</span></div>
         <div class="the-icons span3" title="Code: 0xe82f"><i class="demo-icon icon-up">&#xe82f;</i> <span class="i-name">icon-up</span><span class="i-code">0xe82f</span></div>
-      </div>
-      <div class="row">
         <div class="the-icons span3" title="Code: 0xe830"><i class="demo-icon icon-thumbs-up">&#xe830;</i> <span class="i-name">icon-thumbs-up</span><span class="i-code">0xe830</span></div>
         <div class="the-icons span3" title="Code: 0xe831"><i class="demo-icon icon-lock">&#xe831;</i> <span class="i-name">icon-lock</span><span class="i-code">0xe831</span></div>
+      </div>
+      <div class="row">
         <div class="the-icons span3" title="Code: 0xe832"><i class="demo-icon icon-lock-open">&#xe832;</i> <span class="i-name">icon-lock-open</span><span class="i-code">0xe832</span></div>
         <div class="the-icons span3" title="Code: 0xe833"><i class="demo-icon icon-thumbs-down">&#xe833;</i> <span class="i-name">icon-thumbs-down</span><span class="i-code">0xe833</span></div>
-      </div>
-      <div class="row">
         <div class="the-icons span3" title="Code: 0xe834"><i class="demo-icon icon-bell">&#xe834;</i> <span class="i-name">icon-bell</span><span class="i-code">0xe834</span></div>
         <div class="the-icons span3" title="Code: 0xe835"><i class="demo-icon icon-resize-small">&#xe835;</i> <span class="i-name">icon-resize-small</span><span class="i-code">0xe835</span></div>
+      </div>
+      <div class="row">
         <div class="the-icons span3" title="Code: 0xe836"><i class="demo-icon icon-resize-full-1">&#xe836;</i> <span class="i-name">icon-resize-full-1</span><span class="i-code">0xe836</span></div>
         <div class="the-icons span3" title="Code: 0xe837"><i class="demo-icon icon-right-hand">&#xe837;</i> <span class="i-name">icon-right-hand</span><span class="i-code">0xe837</span></div>
-      </div>
-      <div class="row">
         <div class="the-icons span3" title="Code: 0xe838"><i class="demo-icon icon-left-hand">&#xe838;</i> <span class="i-name">icon-left-hand</span><span class="i-code">0xe838</span></div>
         <div class="the-icons span3" title="Code: 0xe839"><i class="demo-icon icon-up-hand">&#xe839;</i> <span class="i-name">icon-up-hand</span><span class="i-code">0xe839</span></div>
+      </div>
+      <div class="row">
+        <div class="the-icons span3" title="Code: 0xe839"><i class="demo-icon icon-tags-3">&#xe839;</i> <span class="i-name">icon-tags-3</span><span class="i-code">0xe839</span></div>
         <div class="the-icons span3" title="Code: 0xe83a"><i class="demo-icon icon-down-hand">&#xe83a;</i> <span class="i-name">icon-down-hand</span><span class="i-code">0xe83a</span></div>
         <div class="the-icons span3" title="Code: 0xe83b"><i class="demo-icon icon-eye-off">&#xe83b;</i> <span class="i-name">icon-eye-off</span><span class="i-code">0xe83b</span></div>
-      </div>
-      <div class="row">
         <div class="the-icons span3" title="Code: 0xe83c"><i class="demo-icon icon-arrows-cw-1">&#xe83c;</i> <span class="i-name">icon-arrows-cw-1</span><span class="i-code">0xe83c</span></div>
-        <div class="the-icons span3" title="Code: 0xe83d"><i class="demo-icon icon-tags">&#xe83d;</i> <span class="i-name">icon-tags</span><span class="i-code">0xe83d</span></div>
-        <div class="the-icons span3" title="Code: 0xe83e"><i class="demo-icon icon-tags-1">&#xe83e;</i> <span class="i-name">icon-tags-1</span><span class="i-code">0xe83e</span></div>
-        <div class="the-icons span3" title="Code: 0xe83f"><i class="demo-icon icon-tags-2">&#xe83f;</i> <span class="i-name">icon-tags-2</span><span class="i-code">0xe83f</span></div>
       </div>
       <div class="row">
-        <div class="the-icons span3" title="Code: 0xe840"><i class="demo-icon icon-tag-2">&#xe840;</i> <span class="i-name">icon-tag-2</span><span class="i-code">0xe840</span></div>
-        <div class="the-icons span3" title="Code: 0xe841"><i class="demo-icon icon-resize-small-alt">&#xe841;</i> <span class="i-name">icon-resize-small-alt</span><span class="i-code">0xe841</span></div>
-        <div class="the-icons span3" title="Code: 0xe842"><i class="demo-icon icon-resize-small-1">&#xe842;</i> <span class="i-name">icon-resize-small-1</span><span class="i-code">0xe842</span></div>
+        <div class="the-icons span3" title="Code: 0xe83d"><i class="demo-icon icon-resize-small-alt">&#xe83d;</i> <span class="i-name">icon-resize-small-alt</span><span class="i-code">0xe83d</span></div>
+        <div class="the-icons span3" title="Code: 0xe83e"><i class="demo-icon icon-tags">&#xe83e;</i> <span class="i-name">icon-tags</span><span class="i-code">0xe83e</span></div>
+        <div class="the-icons span3" title="Code: 0xe83f"><i class="demo-icon icon-tags-4">&#xe83f;</i> <span class="i-name">icon-tags-4</span><span class="i-code">0xe83f</span></div>
         <div class="the-icons span3" title="Code: 0xf004"><i class="demo-icon icon-down-open">&#xf004;</i> <span class="i-name">icon-down-open</span><span class="i-code">0xf004</span></div>
       </div>
       <div class="row">
@@ -408,19 +408,19 @@ body {
       <div class="row">
         <div class="the-icons span3" title="Code: 0xf086"><i class="demo-icon icon-info-circled-alt">&#xf086;</i> <span class="i-name">icon-info-circled-alt</span><span class="i-code">0xf086</span></div>
         <div class="the-icons span3" title="Code: 0xf08e"><i class="demo-icon icon-link-ext">&#xf08e;</i> <span class="i-name">icon-link-ext</span><span class="i-code">0xf08e</span></div>
+        <div class="the-icons span3" title="Code: 0xf096"><i class="demo-icon icon-check-empty">&#xf096;</i> <span class="i-name">icon-check-empty</span><span class="i-code">0xf096</span></div>
         <div class="the-icons span3" title="Code: 0xf0e5"><i class="demo-icon icon-comment-empty">&#xf0e5;</i> <span class="i-name">icon-comment-empty</span><span class="i-code">0xf0e5</span></div>
-        <div class="the-icons span3" title="Code: 0xf0f6"><i class="demo-icon icon-doc-text">&#xf0f6;</i> <span class="i-name">icon-doc-text</span><span class="i-code">0xf0f6</span></div>
       </div>
       <div class="row">
+        <div class="the-icons span3" title="Code: 0xf0f6"><i class="demo-icon icon-doc-text">&#xf0f6;</i> <span class="i-name">icon-doc-text</span><span class="i-code">0xf0f6</span></div>
         <div class="the-icons span3" title="Code: 0xf0fe"><i class="demo-icon icon-plus-squared">&#xf0fe;</i> <span class="i-name">icon-plus-squared</span><span class="i-code">0xf0fe</span></div>
         <div class="the-icons span3" title="Code: 0xf137"><i class="demo-icon icon-angle-circled-left">&#xf137;</i> <span class="i-name">icon-angle-circled-left</span><span class="i-code">0xf137</span></div>
         <div class="the-icons span3" title="Code: 0xf138"><i class="demo-icon icon-angle-circled-right">&#xf138;</i> <span class="i-name">icon-angle-circled-right</span><span class="i-code">0xf138</span></div>
-        <div class="the-icons span3" title="Code: 0xf139"><i class="demo-icon icon-angle-circled-up">&#xf139;</i> <span class="i-name">icon-angle-circled-up</span><span class="i-code">0xf139</span></div>
       </div>
       <div class="row">
+        <div class="the-icons span3" title="Code: 0xf139"><i class="demo-icon icon-angle-circled-up">&#xf139;</i> <span class="i-name">icon-angle-circled-up</span><span class="i-code">0xf139</span></div>
         <div class="the-icons span3" title="Code: 0xf13a"><i class="demo-icon icon-angle-circled-down">&#xf13a;</i> <span class="i-name">icon-angle-circled-down</span><span class="i-code">0xf13a</span></div>
         <div class="the-icons span3" title="Code: 0xf13e"><i class="demo-icon icon-lock-open-alt">&#xf13e;</i> <span class="i-name">icon-lock-open-alt</span><span class="i-code">0xf13e</span></div>
-        <div class="the-icons span3" title="Code: 0xf141"><i class="demo-icon icon-ellipsis">&#xf141;</i> <span class="i-name">icon-ellipsis</span><span class="i-code">0xf141</span></div>
         <div class="the-icons span3" title="Code: 0xf142"><i class="demo-icon icon-ellipsis-vert">&#xf142;</i> <span class="i-name">icon-ellipsis-vert</span><span class="i-code">0xf142</span></div>
       </div>
       <div class="row">
diff --git a/html/image/fontello/fontello.eot b/html/image/fontello/fontello.eot
index 73174bb3a18226b357d2761f16e45d8275340e24..18d667c66413a74e25c6ce7d7fb4e348cc7087ea 100644
GIT binary patch
delta 11539
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
z%0Dfd89imG9W9{d;y2<quvle_n!=U}(=(H?(&6HCqS#W5TbU!%pv79O%$h7+mY%j8
zxz3xg3tLYHJ`>qQ+@eIbWJxC<vcxG!V(A@SmLnZ!aXmS+uoN`+Jgudi>6;D@<wmm|
zEjM97_6)AHMY+Vt-EX(~@YB1Yx0jyoFMHDV#49y!l1HJdSfZuaf#dh4E0Q#7&6Y;G
zEMFSy#p9MYcaYBz4XDcU@z-H|`E14cF_F&}F8+!_r*0%lmOnQWzcCZH{1Cs(3Z%#H
zovtXeBgLduGncsBWd+mYLxt(_Bh}tm3kX4*5K31lkUKhE2?TPMC}k~wXAxVlq*S)z
z<sUxt<Igni_I0!*K#ucTXyX8|UuFW>Jw=GT4}$JP?@8<v$C;TavI3zqb8;#4i7Vl9
zI87CjM(>@r0*P#V)bijwYhV~N+4#&Cahv0Rgaj#@&GJq{povl?WOP~|?u@m<ULp`R
z+}UMC(-pzE7J6e`m#)Z+>(dp5aV%X?88@UW8so-vMQ7YpPFD<WG^Z;L#+_*#bybm;
zHUpI<;@y^bknOL_O0OeE?h+rZ61&zB+wKxCREhC4S>DcHve9yNr`XmXR5!~zUBAN?
z>@W_&TCqdM3G9$@5<6s^!VVd?VTX*{u|vk2utUb1u|dWi*dXKXbbQ$Mq@Hwq#;V;k
z6Nl%E89v<-+jTda-<Gu1(`og<#J9r4_rdt=^D@tuYlPh@CraC3F<n;g+VNF9+9*yZ
zVr}iHs3JT%y`^ZMP~W<pzaLM3IzC{_G=SNv^NgN?8E-Ticq&}2+HbyHZuIqwFbg|~
z9YIE0#M<DtE^8>=9Ubnnwyo=L7Te9mrDS=Vz<;B_wsycLBUTjlq#!J$_9gZuN)<O{
zEmy8{?nZYa9v{AenRaeui+9_MaZ5{N*SO=>4EtoJFukJ0)p%@0X;bTqS&kS^1RqR{
zsS{%}mIf7@^3}SalAD=LSSms{974&JVwP(5Tur8(xiK69M%hDP?mS|n3T7~?=uB9e
zS-zUd46jKS#{sErtI{QgA^5JlB+Ci6ipR$i`*>stwB2ho^Cws5+<Vr(Ag?*|Y+E@4
zJMLyl#;j;=dNPJ!86PfoSGI@{%xCWg>fzYr25NQ#b#3hW`QAGsm$r6vu4gE(japlA
zByH{NynzE@t>4(To_8ZF^wn)`fsCW}miS=Xsyi>?vdmV`jt@8id+APWTiwxEy5dw2
zv|tZBq&M|{cFOxK?GslU-se!G=GQ+I>#u5V9~^l{=i09J<7;PU3mY2mYgL-NTR33)
zuLadXSn5G;mAN&JAtDsChS1KZt?fYf@J>gelK2>+@Y;?JrTNgUd!UMm^i85MG$zpy
z+$f}P3cKep8g|bS=Gh0*z0AXnqs+sN`<MrfvNe@nK^~Mt-!xi?^k@~+D@didbquX)
z-~G%dxbFexvs(``pWQmne0J*uFFFdg8D5kdC0>*pCwWnBoMN8+Xv~(GiCc5b#EplT
zi5v5_U?XUqwguzXf-M-g9<~MJ)+4rH+&W_m#;voqVB9)q3&ySU(DLxzV_LMota1jF
zN2~3<XkK8wGoO{k*F}V8G@0kIYLj_>#pYoG^IXE<U3aH_-2SphT&^~G#1qvfvp<P>
zc2%c*3e7Uw%<*)!n>n5V^X|J7Ua`OI32~!=V6!h(o6LR{Bhkw;K3i?_d>^Vdnc*6E
z_uQRt+5WQGpF^{}r#j)UR=b)1I)<W`Cw#uz<Oy$7o6PXx^iBM>2uY2l#ctv?IEqXY
zS4J`0X&G~toSeM8c29KC_$&0y!_yTZehpdPmkhjHPc2qR&sOk192q}VA*bC~!(W0i
zy6m26>q~g!(MTmJt{0GGT%YFe*^$a7{(i-vY6p!JW0iL9`Z9j0Bb3bbQ}^1OAn>0G
Xc{*MZ?<`x&3l+QyR@7OIMn?WO{+ngZ

delta 10575
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
S_q065FWqfP_byT<#{L`Oe^kf-

diff --git a/html/image/fontello/fontello.svg b/html/image/fontello/fontello.svg
index 29459ce02..bdca170f5 100644
--- a/html/image/fontello/fontello.svg
+++ b/html/image/fontello/fontello.svg
@@ -6,6 +6,10 @@
 <font id="fontello" horiz-adv-x="1000" >
 <font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
 <missing-glyph horiz-adv-x="1000" />
+<glyph glyph-name="check" unicode="&#xe741;" d="M786 331v-177q0-67-47-114t-114-47h-464q-67 0-114 47t-47 114v464q0 66 47 113t114 48h464q35 0 65-14 9-4 10-13 2-10-5-16l-27-28q-6-5-13-5-1 0-5 1-13 3-25 3h-464q-37 0-63-26t-27-63v-464q0-37 27-63t63-27h464q37 0 63 27t26 63v141q0 8 5 13l36 35q6 6 13 6 3 0 7-2 11-4 11-16z m129 273l-455-454q-13-14-31-14t-32 14l-240 240q-14 13-14 31t14 32l61 62q14 13 32 13t32-13l147-147 361 361q13 13 31 13t32-13l62-61q13-14 13-32t-13-32z" horiz-adv-x="928.6" />
+
+<glyph glyph-name="resize-small-1" unicode="&#xe746;" d="M66 672l114-116 73 74 0-210-210 0 72 72-115 115z m0-644l-66 67 115 113-72 73 210 0 0-210-73 72z m513 644l65-65-115-115 72-72-210 0 0 210 73-73z m-115-529l-73-72 0 210 210 0-72-73 115-113-65-67z" horiz-adv-x="644" />
+
 <glyph glyph-name="logout" unicode="&#xe800;" d="M357 46q0-2 1-11t0-14-2-14-5-11-12-3h-178q-67 0-114 47t-47 114v392q0 67 47 114t114 47h178q8 0 13-5t5-13q0-2 1-11t0-15-2-13-5-11-12-3h-178q-37 0-63-26t-27-64v-392q0-37 27-63t63-27h174t6 0 7-2 4-3 4-5 1-8z m518 304q0-14-11-25l-303-304q-11-10-25-10t-25 10-11 25v161h-250q-14 0-25 11t-11 25v214q0 15 11 25t25 11h250v161q0 14 11 25t25 10 25-10l303-304q11-10 11-25z" horiz-adv-x="928.6" />
 
 <glyph glyph-name="cancel-circled" unicode="&#xe801;" d="M641 224q0 14-10 25l-101 101 101 101q10 11 10 25 0 15-10 26l-51 50q-10 11-25 11-15 0-25-11l-101-101-101 101q-11 11-25 11-16 0-26-11l-50-50q-11-11-11-26 0-14 11-25l101-101-101-101q-11-11-11-25 0-15 11-26l50-50q10-11 26-11 14 0 25 11l101 101 101-101q10-11 25-11 15 0 25 11l51 50q10 11 10 26z m216 126q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
@@ -122,23 +126,19 @@
 
 <glyph glyph-name="up-hand" unicode="&#xe839;" d="M714-43q0 15-10 25t-25 11-25-11-11-25 11-25 25-11 25 11 10 25z m72 427q0 105-93 105-15 0-32-3-9 17-29 27t-41 9-38-10q-28 30-67 30-14 0-31-6t-26-14v185q0 29-22 50t-50 22q-28 0-50-22t-21-50v-321q-11 0-27 8t-31 19-38 18-47 8q-37 0-55-24t-17-65q0-13 78-50 25-14 36-21 36-22 81-62 45-40 59-57 32-38 32-78v-18h357v18q0 40 18 93t36 108 18 101z m71 2q0-74-38-179-33-92-33-125v-161q0-29-21-50t-51-21h-357q-29 0-50 21t-21 50v161q0 6-3 12t-8 13-10 13-12 13-12 12-12 10-10 8q-41 36-72 56-11 7-34 18t-40 21-36 23-27 30-10 39q0 70 37 115t106 46q38 0 71-13v209q0 58 43 101t100 42q58 0 101-42t42-101v-94q35-2 66-21 12 2 24 2 57 0 100-34 77 1 122-47t45-127z" horiz-adv-x="857.1" />
 
+<glyph glyph-name="tags-3" unicode="&#xe839;" d="M1011 502q30-32 30-74t-30-73l-56-56 5-5q30-31 29-74t-30-73l-364-366q-30-30-74-30t-73 30q-227 227-342 338-106 106-106 258 0 102 54 188-8 165 105 278 106 106 257 106 153 0 259-106z m-490-647l364 365-336 340q-76 77-184 77-109 0-185-77t-76-183 76-184q115-111 341-338z m102 779l258-261 57 56-337 340q-76 76-185 76-107 0-183-76-35-35-54-79 86 52 186 52 150 0 258-108z m-258-179q-32 0-56-23t-23-55 23-55 56-23 55 23 23 55-23 55-55 23z m0 52q54 0 92-39t38-91-38-92-92-38-92 38-38 92 38 91 92 39z" horiz-adv-x="1041" />
+
 <glyph glyph-name="down-hand" unicode="&#xe83a;" d="M786 314q0 47-18 102t-36 109-18 93v18h-357v-18q0-20-7-38t-20-35-26-28-30-27q-5-4-8-7-45-40-81-62-12-8-38-21-1-1-12-6t-20-10-20-12-17-12-7-10q0-40 17-64t55-25q24 0 47 8t38 19 31 18 27 8v-321q0-28 21-50t50-22q29 0 50 22t22 50v185q25-20 57-20 39 0 67 30 17-10 38-10t41 9 29 27q14-2 32-2 47 0 70 27t23 75z m-72 429q0 14-10 25t-25 11-25-11-11-25 11-25 25-11 25 11 10 25z m143-426q0-80-43-129t-121-48l-3 0q-43-34-100-34-12 0-24 2-30-17-66-21v-94q0-59-42-101t-101-42q-58 0-100 42t-43 101v209q-30-13-71-13-68 0-105 46t-38 115q0 21 10 39t27 31 36 22 40 21 34 18q31 20 72 56 2 1 10 8t12 10 12 12 12 13 10 13 8 13 3 12v161q0 29 21 50t50 21h357q30 0 51-21t21-50v-161q0-33 33-125 38-106 38-176z" horiz-adv-x="857.1" />
 
 <glyph glyph-name="eye-off" unicode="&#xe83b;" d="M310 105l43 79q-48 35-76 88t-27 114q0 67 34 125-128-65-213-197 94-144 239-209z m217 424q0 11-8 19t-19 7q-70 0-120-50t-50-119q0-11 8-19t19-8 19 8 8 19q0 48 34 82t82 34q11 0 19 8t8 19z m202 106q0-4 0-5-59-105-176-316t-176-316l-28-50q-5-9-15-9-7 0-75 39-9 6-9 16 0 7 25 49-80 36-147 96t-117 137q-11 17-11 38t11 39q86 131 212 207t277 76q50 0 100-10l31 54q5 9 15 9 3 0 10-3t18-9 18-10 18-10 10-7q9-5 9-15z m21-249q0-78-44-142t-117-91l157 280q4-25 4-47z m250-72q0-19-11-38-22-36-61-81-84-96-194-149t-234-53l41 74q119 10 219 76t169 171q-65 100-158 164l35 63q53-36 102-85t81-103q11-19 11-39z" horiz-adv-x="1000" />
 
 <glyph glyph-name="arrows-cw-1" unicode="&#xe83c;" d="M843 261q0-3 0-4-36-150-150-243t-267-93q-81 0-157 31t-136 88l-72-72q-11-11-25-11t-25 11-11 25v250q0 14 11 25t25 11h250q14 0 25-11t10-25-10-25l-77-77q40-36 90-57t105-20q74 0 139 37t104 99q6 10 30 66 4 13 16 13h107q8 0 13-6t5-12z m14 446v-250q0-14-10-25t-26-11h-250q-14 0-25 11t-10 25 10 25l77 77q-82 77-194 77-75 0-140-37t-104-99q-6-10-29-66-5-13-17-13h-111q-7 0-13 6t-5 12v4q36 150 151 243t268 93q81 0 158-31t137-88l72 72q11 11 25 11t26-11 10-25z" horiz-adv-x="857.1" />
 
-<glyph glyph-name="tags" unicode="&#xe83d;" d="M250 600q0 30-21 51t-50 20-51-20-21-51 21-50 51-21 50 21 21 50z m595-321q0-30-20-51l-274-274q-22-21-51-21-30 0-50 21l-399 399q-21 21-36 57t-15 65v232q0 29 21 50t50 22h233q29 0 65-15t57-36l399-399q20-21 20-50z m215 0q0-30-21-51l-274-274q-22-21-51-21-20 0-33 8t-29 25l262 262q21 21 21 51 0 29-21 50l-399 399q-21 21-57 36t-65 15h125q29 0 65-15t57-36l399-399q21-21 21-50z" horiz-adv-x="1071.4" />
+<glyph glyph-name="resize-small-alt" unicode="&#xe83d;" d="M648 88l-72-72 0 223 223 0-72-72 184-185-79-79z m-448 447l-182 183 79 79 183-182 73 70-1-222-222-1z m-182-553l184 185-72 72 223 0 0-223-72 72-184-185z m782 480l-224 0 0 225 73-72 183 182 79-79-183-183z" horiz-adv-x="928" />
 
-<glyph glyph-name="tags-1" unicode="&#xe83e;" d="M1011 502q30-32 30-74t-30-73l-56-56 5-5q30-31 29-74t-30-73l-364-366q-30-30-74-30t-73 30q-227 227-342 338-106 106-106 258 0 102 54 188-8 165 105 278 106 106 257 106 153 0 259-106z m-490-647l364 365-336 340q-76 77-184 77-109 0-185-77t-76-183 76-184q115-111 341-338z m102 779l258-261 57 56-337 340q-76 76-185 76-107 0-183-76-35-35-54-79 86 52 186 52 150 0 258-108z m-258-179q-32 0-56-23t-23-55 23-55 56-23 55 23 23 55-23 55-55 23z m0 52q54 0 92-39t38-91-38-92-92-38-92 38-38 92 38 91 92 39z" horiz-adv-x="1041" />
+<glyph glyph-name="tags" unicode="&#xe83e;" d="M250 600q0 30-21 51t-50 20-51-20-21-51 21-50 51-21 50 21 21 50z m595-321q0-30-20-51l-274-274q-22-21-51-21-30 0-50 21l-399 399q-21 21-36 57t-15 65v232q0 29 21 50t50 22h233q29 0 65-15t57-36l399-399q20-21 20-50z m215 0q0-30-21-51l-274-274q-22-21-51-21-20 0-33 8t-29 25l262 262q21 21 21 51 0 29-21 50l-399 399q-21 21-57 36t-65 15h125q29 0 65-15t57-36l399-399q21-21 21-50z" horiz-adv-x="1071.4" />
 
-<glyph glyph-name="tags-2" unicode="&#xe83f;" d="M0 460l0 240q2 27 21 46t43 19l241 0q43 0 88-28l377-414q17-23 17-48t-17-44l-280-277q-21-18-47-19t-43 19l-355 397q-45 54-45 109z m104 138q0-25 17-42 22-20 46-19t42 19q18 19 18 44t-18 43q-20 18-45 17t-43-17q-17-21-17-45z m316 165l92 0q72-4 109-45l356-397q17-21 17-48t-17-44l-280-277q-60-35-95 8l271 271q18 22 18 47t-18 45l-318 356q-24 31-71 56t-64 28z" horiz-adv-x="994" />
-
-<glyph glyph-name="tag-2" unicode="&#xe840;" d="M250 600q0 30-21 51t-50 20-51-20-21-51 21-50 51-21 50 21 21 50z m595-321q0-30-20-51l-274-274q-22-21-51-21-30 0-50 21l-399 399q-21 21-36 57t-15 65v232q0 29 21 50t50 22h233q29 0 65-15t57-36l399-399q20-21 20-50z" horiz-adv-x="857.1" />
-
-<glyph glyph-name="resize-small-alt" unicode="&#xe841;" d="M648 88l-72-72 0 223 223 0-72-72 184-185-79-79z m-448 447l-182 183 79 79 183-182 73 70-1-222-222-1z m-182-553l184 185-72 72 223 0 0-223-72 72-184-185z m782 480l-224 0 0 225 73-72 183 182 79-79-183-183z" horiz-adv-x="928" />
-
-<glyph glyph-name="resize-small-1" unicode="&#xe842;" d="M66 672l114-116 73 74 0-210-210 0 72 72-115 115z m0-644l-66 67 115 113-72 73 210 0 0-210-73 72z m513 644l65-65-115-115 72-72-210 0 0 210 73-73z m-115-529l-73-72 0 210 210 0-72-73 115-113-65-67z" horiz-adv-x="644" />
+<glyph glyph-name="tags-4" unicode="&#xe83f;" d="M0 460l0 240q2 27 21 46t43 19l241 0q43 0 88-28l377-414q17-23 17-48t-17-44l-280-277q-21-18-47-19t-43 19l-355 397q-45 54-45 109z m104 138q0-25 17-42 22-20 46-19t42 19q18 19 18 44t-18 43q-20 18-45 17t-43-17q-17-21-17-45z m316 165l92 0q72-4 109-45l356-397q17-21 17-48t-17-44l-280-277q-60-35-95 8l271 271q18 22 18 47t-18 45l-318 356q-24 31-71 56t-64 28z" horiz-adv-x="994" />
 
 <glyph glyph-name="down-open" unicode="&#xf004;" d="M0 533q0 25 18 43t44 18 42-18l305-303 304 303q18 18 43 18t43-18q18-18 18-43t-18-43l-390-391-391 391q-18 19-18 43z" horiz-adv-x="817.4" />
 
@@ -154,6 +154,8 @@
 
 <glyph glyph-name="link-ext" unicode="&#xf08e;" d="M786 332v-178q0-67-47-114t-114-47h-464q-67 0-114 47t-47 114v464q0 66 47 113t114 48h393q7 0 12-5t5-13v-36q0-8-5-13t-12-5h-393q-37 0-63-26t-27-63v-464q0-37 27-63t63-27h464q37 0 63 27t26 63v178q0 8 5 13t13 5h36q8 0 13-5t5-13z m214 482v-285q0-15-11-25t-25-11-25 11l-98 98-364-364q-5-6-13-6t-12 6l-64 64q-6 5-6 12t6 13l364 364-98 98q-11 11-11 25t11 25 25 11h285q15 0 25-11t11-25z" horiz-adv-x="1000" />
 
+<glyph glyph-name="check-empty" unicode="&#xf096;" d="M625 707h-464q-37 0-63-26t-27-63v-464q0-37 27-63t63-27h464q37 0 63 27t26 63v464q0 37-26 63t-63 26z m161-89v-464q0-67-47-114t-114-47h-464q-67 0-114 47t-47 114v464q0 66 47 113t114 48h464q66 0 114-48t47-113z" horiz-adv-x="785.7" />
+
 <glyph glyph-name="comment-empty" unicode="&#xf0e5;" d="M500 636q-114 0-213-39t-157-105-59-142q0-62 40-119t113-98l48-28-15-53q-13-51-39-97 85 36 154 96l24 21 32-3q38-5 72-5 114 0 213 39t157 105 59 142-59 142-157 105-213 39z m500-286q0-97-67-179t-182-130-251-48q-39 0-81 4-110-97-257-135-27-8-63-12h-3q-8 0-15 6t-9 15v1q-2 2 0 6t1 6 2 5l4 5t4 5 4 5q4 5 17 19t20 22 17 22 18 28 15 33 15 42q-88 50-138 123t-51 157q0 97 67 179t182 130 251 48 251-48 182-130 67-179z" horiz-adv-x="1000" />
 
 <glyph glyph-name="doc-text" unicode="&#xf0f6;" d="M819 638q16-16 27-42t11-50v-642q0-23-15-38t-38-16h-750q-23 0-38 16t-16 38v892q0 23 16 38t38 16h500q22 0 49-11t42-27z m-248 136v-210h210q-5 17-12 23l-175 175q-6 7-23 12z m215-853v572h-232q-23 0-38 16t-16 37v233h-429v-858h715z m-572 483q0 7 5 12t13 5h393q8 0 13-5t5-12v-36q0-8-5-13t-13-5h-393q-8 0-13 5t-5 13v36z m411-125q8 0 13-5t5-13v-36q0-8-5-13t-13-5h-393q-8 0-13 5t-5 13v36q0 8 5 13t13 5h393z m0-143q8 0 13-5t5-13v-36q0-8-5-13t-13-5h-393q-8 0-13 5t-5 13v36q0 8 5 13t13 5h393z" horiz-adv-x="857.1" />
@@ -170,8 +172,6 @@
 
 <glyph glyph-name="lock-open-alt" unicode="&#xf13e;" d="M589 421q23 0 38-15t16-38v-322q0-22-16-37t-38-16h-535q-23 0-38 16t-16 37v322q0 22 16 38t38 15h17v179q0 103 74 177t176 73 177-73 73-177q0-14-10-25t-25-11h-36q-14 0-25 11t-11 25q0 59-42 101t-101 42-101-42-41-101v-179h410z" horiz-adv-x="642.9" />
 
-<glyph glyph-name="ellipsis" unicode="&#xf141;" d="M214 439v-107q0-22-15-38t-38-15h-107q-23 0-38 15t-16 38v107q0 23 16 38t38 16h107q22 0 38-16t15-38z m286 0v-107q0-22-16-38t-38-15h-107q-22 0-38 15t-15 38v107q0 23 15 38t38 16h107q23 0 38-16t16-38z m286 0v-107q0-22-16-38t-38-15h-107q-22 0-38 15t-16 38v107q0 23 16 38t38 16h107q23 0 38-16t16-38z" horiz-adv-x="785.7" />
-
 <glyph glyph-name="ellipsis-vert" unicode="&#xf142;" d="M214 154v-108q0-22-15-37t-38-16h-107q-23 0-38 16t-16 37v108q0 22 16 38t38 15h107q22 0 38-15t15-38z m0 285v-107q0-22-15-38t-38-15h-107q-23 0-38 15t-16 38v107q0 23 16 38t38 16h107q22 0 38-16t15-38z m0 286v-107q0-22-15-38t-38-16h-107q-23 0-38 16t-16 38v107q0 22 16 38t38 16h107q22 0 38-16t15-38z" horiz-adv-x="214.3" />
 
 <glyph glyph-name="sort-alt-up" unicode="&#xf160;" d="M411 46q0-6-6-13l-178-178q-5-5-13-5-6 0-12 5l-179 179q-8 9-4 19 4 11 17 11h107v768q0 8 5 13t13 5h107q8 0 13-5t5-13v-768h107q8 0 13-5t5-13z m589-71v-107q0-8-5-13t-13-5h-464q-8 0-13 5t-5 13v107q0 8 5 13t13 5h464q8 0 13-5t5-13z m-107 286v-107q0-8-5-13t-13-5h-357q-8 0-13 5t-5 13v107q0 8 5 13t13 5h357q8 0 13-5t5-13z m-107 285v-107q0-7-5-12t-13-6h-250q-8 0-13 6t-5 12v107q0 8 5 13t13 5h250q8 0 13-5t5-13z m-107 286v-107q0-8-5-13t-13-5h-143q-8 0-13 5t-5 13v107q0 8 5 13t13 5h143q8 0 13-5t5-13z" horiz-adv-x="1000" />
diff --git a/html/image/fontello/fontello.ttf b/html/image/fontello/fontello.ttf
index 7547dd25d1a0e3d16927a2221026e7180cff86c0..cbb3370ff24499d0a061517ba8e2759bd9747ff8 100644
GIT binary patch
delta 11394
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
WHU7@3C4Hib#C=_n=M*+F^1lIJw@B;&

delta 10546
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

diff --git a/html/image/fontello/fontello.woff b/html/image/fontello/fontello.woff
index 4506671e15e36fe739a48ad4a04ad3c517c93f16..100f0a30eb6ce23d5c6231e9c70f56e822f4c799 100644
GIT binary patch
delta 21094
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

delta 20507
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

diff --git a/html/image/fontello/fontello.woff2 b/html/image/fontello/fontello.woff2
index 226a86f59d6c8f59b1230bd71e894573d262173d..5bba9db43f514d57c73646f217b34c52efcf675e 100644
GIT binary patch
literal 17964
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

literal 17520
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
LSJI#VA=Ur^ELMdi

diff --git a/html/js/scripts.js b/html/js/scripts.js
index fa05158dc..983efa173 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -3727,6 +3727,26 @@ function toggle_onoff(icon_domid, p_value_domid)
         $(icon_domid).style = 'color:red';
     }
 }
+/**
+ * turn on or off ,  set an domElement to 1 or 0 and change the icon
+ * @param string icon_domid : id of the domElement which must be changed
+ * @param string p_value_domid : id of domElement containing 1 or 0
+ * @see param_jrn.php
+ */
+function toggle_checkbox_onoff(icon_domid, p_value_domid)
+{
+    console.log("toggle_checkbox_onoff");
+    console.log("icon_domid"+icon_domid);
+    console.log("p_value_domid"+p_value_domid);
+    
+    if ($(p_value_domid).value == 0) {
+        $(p_value_domid).value = 1;
+        $(icon_domid).innerHTML = '&#xe741;';
+    } else {
+        $(p_value_domid).value = 0;
+        $(icon_domid).innerHTML = '&#xf096;';
+    }
+}
 /**
  * in CFGLED show or hide the row depending if the warning is enable or not
  * 
diff --git a/include/lib/icon_action.class.php b/include/lib/icon_action.class.php
index 9e4dedece..252f9b575 100644
--- a/include/lib/icon_action.class.php
+++ b/include/lib/icon_action.class.php
@@ -211,7 +211,7 @@ class Icon_Action
     static function hide($action, $javascript)
     {
         $r='';
-        $r.='<span id="hide" class="icon"   onclick="'.$javascript.'">'.$action.'</span>';
+        $r.='<span id="hide" class="icon"   onclick="'.$javascript.'">&#xe83b;'.$action.'</span>';
         return $r;
     }
     /**
@@ -356,4 +356,27 @@ class Icon_Action
         if ( $p_value == 1 ) { return \Icon_Action::iconon($p_id, $p_javascript,$p_style);}
         if ( $p_value == 0 ) { return \Icon_Action::iconoff($p_id, $p_javascript,$p_style);}
     }
+    
+    static function checked ($p_id,$p_javascript="") {
+        $lock_cur="&#xe741;";
+        
+        $r=sprintf( '<span id="%s" onclick="%s" class="icon smallicon">%s</span>',
+                $p_id,
+                $p_javascript, 
+                $lock_cur);
+        return $r;
+    }
+    static function unchecked ($p_id,$p_javascript="") {
+        $lock_cur="&#xf096";
+        
+        $r=sprintf( '<span id="%s" onclick="%s" class="icon smallicon" >%s</span>',
+                $p_id,
+                $p_javascript, 
+                $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);}
+    }
 }
diff --git a/include/lib/inplace_edit.class.php b/include/lib/inplace_edit.class.php
index 0d372de17..a6734474c 100644
--- a/include/lib/inplace_edit.class.php
+++ b/include/lib/inplace_edit.class.php
@@ -110,7 +110,7 @@ EOF;
         $v=$this->input->get_value();
         $v=(trim($v)=="")?$this->message:$v;
         echo $v,
-                 '<span class="smallicon icon" style="margin-left:5px">&#xe80d;</span> ',
+                 '<span class="smallicon icon" style="margin-left:5px">&#xe812;</span> ',
                 "
             <script>
             $('{$this->input->id}edit').removeClassName('inplace_edit_input');
@@ -132,7 +132,7 @@ EOF;
         $v=$this->input->get_value();
         $v=(trim($v)=="")?$this->message:$v;
         echo $v;
-        echo'<span class="smallicon icon" style="margin-left:5px">&#xe80d;</span> ';
+        echo'<span class="smallicon icon" style="margin-left:5px">&#xe812;</span> ';
         echo "</span>";
         echo "
             
diff --git a/include/lib/input_checkbox.class.php b/include/lib/input_checkbox.class.php
new file mode 100644
index 000000000..a81ac5780
--- /dev/null
+++ b/include/lib/input_checkbox.class.php
@@ -0,0 +1,101 @@
+<?php
+
+/*
+ * * Copyright (C) 2019 Dany De Bontridder <dany@alchimerys.be>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Aut
+ * 
+ */
+
+// Copyright Author Dany De Bontridder danydb@noalyss.eu
+
+/**
+ * @file
+ * @brief modern checkbox, using a javascript to change the icon when clicked and a hidden field, there is always a 
+ * value , either 1 or 0 
+ */
+require_once NOALYSS_INCLUDE.'/lib/html_input.class.php';
+
+class InputCheckBox extends HtmlInput
+{
+
+    var $icon;
+    var $value_container;
+    var $value;
+    /**
+     * Construct an input_checkbox object 
+     * 
+     * @param string $name of the hidden 
+     * @param bool $value Value is 1 or 0
+     * @param string $p_id id of the hidden
+     */
+    function __construct($name='', $value='', $p_id="")
+    {
+        $this->value_container=$name;
+        $this->value=$value;
+        
+        $this->id_hidden=$p_id;
+        $this->id_icon=uniqid($p_id);
+        $this->javascript="";
+    }
+
+    function input($p_name=NULL, $p_value=0)
+    {
+        $r="";
+        if ($p_name!=NULL)
+            $this->value_container=$p_name;
+        if ($p_value!==0)
+            $this->value=$p_value;
+
+        
+        if  ( trim($this->value_container) ==="" || trim($this->value) === "") {
+             throw new Exception(_("Valeur invalide"),1);
+        }
+        if ($this->readOnly == TRUE) {
+            return $this->display();
+        }
+        $r.= HtmlInput::hidden($this->value_container, $this->value,$this->id_hidden);
+        
+        $this->javascript=sprintf('toggle_checkbox_onoff(\'%s\',\'%s\');%s;',
+                $this->id_icon,
+                $this->id_hidden,
+                $this->javascript);
+        
+        if ($this->value=='1') {
+            $r.=Icon_Action::checked($this->id_icon,$this->javascript);
+        } else {
+            $r.=Icon_Action::unchecked($this->id_icon,$this->javascript);
+        }
+        return $r;
+    }
+    function display()
+    {
+        if ($this->value=='1') {
+            return  Icon_Action::checked($this->id_icon, "");
+        } else {
+            return Icon_Action::unchecked($this->id_icon, "");
+        }
+    }
+    
+    /**
+     * click several checkbox when you shift click on that name
+     */ 
+    function click_range()
+    {
+        
+    }
+
+}
\ No newline at end of file
diff --git a/include/template/detail-action.php b/include/template/detail-action.php
index f43d3211e..9dfad5c61 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -371,7 +371,7 @@ for ($i=0;$i<sizeof($aAttachedFile);$i++) :
     ?>
         </td>
         <td>
-  <?php if ($p_view != 'READ') : ?>  <span class="icon"  id="<?php echo "ac".$aAttachedFile[$i]['d_id'];?>" href="javascript:void(0)" onclick="<?php echo $rmDoc;?>">&#xe80f;</span><?php endif;?>
+  <?php if ($p_view != 'READ') : ?>  <span class="icon"  id="<?php echo "ac".$aAttachedFile[$i]['d_id'];?>" href="javascript:void(0)" onclick="<?php echo $rmDoc;?>">&#xe80d;</span><?php endif;?>
         </td>
   </tr>
   <?php
diff --git a/include/template/tag_select.php b/include/template/tag_select.php
index fc81c2cb6..f166662cf 100644
--- a/include/template/tag_select.php
+++ b/include/template/tag_select.php
@@ -44,7 +44,7 @@ if (isNumber($ag_id) == 0 ) die ('ERROR : parameters invalid');
             if ( $row['t_description'] != "G"):
                 echo $row['t_description'];
             else :
-                echo '<span class="icon">&#0xe83d;</span>';
+                echo '<span class="icon">&#xe83e;</span>';
             endif;
             ?>
         </td>

From bfe3db9037671c708391a1173af4fe68113656a8 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 22 Oct 2020 14:49:56 +0200
Subject: [PATCH 116/257] Follow-up export contact option with all the the
 card's attribute

---
 .../export/export_follow_up_contact_csv.php   | 95 ++++++++++++++-----
 1 file changed, 69 insertions(+), 26 deletions(-)

diff --git a/include/export/export_follow_up_contact_csv.php b/include/export/export_follow_up_contact_csv.php
index 569f94f12..d7b4a1e93 100644
--- a/include/export/export_follow_up_contact_csv.php
+++ b/include/export/export_follow_up_contact_csv.php
@@ -37,32 +37,75 @@ if ( $g_user->can_read_action($ag_id) == false ) return;
 $csv=new Noalyss_CSV("followup".$ag_id);
 $csv->send_header();
 
-$document=new Follow_Up($cn);
-echo $document->export_csv(["tdoc"=>$ag_id]);
+$document_type=$cn->get_value("select ag_type from action_gestion where ag_id=$1",[$ag_id]);
 
-$ret=$cn->exec_sql("select f_id,(select ad_value from fiche_detail where f_id=a.f_id and ad_id=25) as company,
-(select ad_value from fiche_detail where f_id=a.f_id and ad_id=1) as name,
-(select ad_value from fiche_detail where f_id=a.f_id and ad_id=32) as first_name,
-(select ad_value from fiche_detail where f_id=a.f_id and ad_id=23) as quick_code,
-cor.cor_label,
-apo.ap_value 
+$aRow=$cn->get_array("select a.f_id,ap_id,ag_id,f.ad_value,f.ad_id,fd.fd_id,jfa.jnt_order
 from action_person a 
-left join action_person_option apo ON  (a.ap_id=apo.action_person_id)
-left join contact_option_ref cor on (apo.contact_option_ref_id=cor.cor_id)
-where ag_id=$1",[$ag_id]);
-$aTitle= array ( 
-            array("title"=>_("fiche_id"), "type"=>"string"),
-            array("title"=>_("société"), "type"=>"string"),
-            array("title"=>_("nom"), "type"=>"string"),
-            array("title"=>_("prénom"), "type"=>"string"),
-            array("title"=>_("qcode"), "type"=>"string"),
-            array("title"=>_("option"), "type"=>"string"),
-            array("title"=>_("valeur"), "type"=>"string"));
-$cn->query_to_csv($ret,$aTitle);
+join fiche f1 on (a.f_id=f1.f_id)
+join fiche_detail f on (a.f_id=f.f_id)
+join fiche_def fd on (fd.fd_id=f1.fd_id)
+join jnt_fic_attr jfa on (fd.fd_id=jfa.fd_id and jfa.ad_id=f.ad_id)
+where ag_id=$1 
+order by f1.fd_id, a.f_id,jnt_order;;",[$ag_id]);
 
-$ret=$cn->exec_sql('select t_tag,t_description from action_tags join tags using (t_id) where ag_id=$1',[$ag_id]);
-$aTitle=array(
-    array('title'=>_('Etiquette'),"type"=>"string"),
-    array('title'=>_("Description"),"type"=>"string")
-);
-$cn->query_to_csv($ret,$aTitle);
\ No newline at end of file
+$nb=count($aRow);
+$lastcat=0;$lastcard=0;
+for ($i=0;$i< $nb;$i++)
+{
+
+    // for each card we sent all info
+    if ($lastcard != $aRow[$i]['f_id']) {
+       // Write contact option
+       $aOption=$cn->get_array(" select ap_value
+from 
+action_person a
+join action_person_option apo on (a.ap_id=apo.action_person_id)
+join contact_option_ref cor on (cor.cor_id=apo.contact_option_ref_id)
+where ag_id=$1 and f_id=$2  order by cor_id",array($ag_id,$lastcard));
+       $nb_option=count($aOption);
+       for ($h=0;$h < $nb_option;$h++) {
+           $csv->add($h);
+       }
+       $csv->write();
+       $lastcard=$aRow[$i]['f_id'];
+    }
+    // For each category we send the column header
+    if (  $lastcat != $aRow[$i]['fd_id']) {
+        // Get attribut fd
+        $aColHeader = $cn->get_array("select jnt_order,
+                                ad_text,
+                                ad_type 
+                        from fiche_def  f
+                        join jnt_fic_attr jfa  using (fd_id) 
+                        join attr_def ad using (ad_id)
+                        where 
+                            f.fd_id=$1 
+                        order by jnt_order",[$aRow[$i]['fd_id']]);
+        $aCol=array();
+        $nb_col=count($aColHeader);
+        for ( $j = 0;$j < $nb_col;$j++) {
+            $aCol[]=$aColHeader[$j]['ad_text'];
+        }
+        
+        // Add contact header option
+        $aOptionCat=$cn->get_array("select
+	cor.cor_label
+        from
+                public.jnt_document_option_contact jdoc
+        join contact_option_ref cor on
+                (jdoc.contact_option_ref_id = cor_id )
+        where
+                document_type_id = $1
+                and jdoc_enable = 1 order by cor_id",array($document_type));
+        $nb_col=count($aOptionCat);
+        for ( $j = 0;$j < $nb_col;$j++) {
+            $aCol[]=$aOptionCat[$j]['cor_label'];
+        }
+        $csv->write_header($aCol);
+        $lastcat=$aRow[$i]['fd_id'];
+    }
+    $csv->add($aRow[$i]['ad_value']);
+    
+}
+
+$csv->write();
\ No newline at end of file

From 8ad5b5656b7926f1075f83842dc3889112875de7 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 22 Oct 2020 15:00:09 +0200
Subject: [PATCH 117/257] Fontello : fix icon-edit

---
 include/lib/inplace_edit.class.php | 4 ++--
 include/template/detail-action.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/lib/inplace_edit.class.php b/include/lib/inplace_edit.class.php
index a6734474c..0d372de17 100644
--- a/include/lib/inplace_edit.class.php
+++ b/include/lib/inplace_edit.class.php
@@ -110,7 +110,7 @@ EOF;
         $v=$this->input->get_value();
         $v=(trim($v)=="")?$this->message:$v;
         echo $v,
-                 '<span class="smallicon icon" style="margin-left:5px">&#xe812;</span> ',
+                 '<span class="smallicon icon" style="margin-left:5px">&#xe80d;</span> ',
                 "
             <script>
             $('{$this->input->id}edit').removeClassName('inplace_edit_input');
@@ -132,7 +132,7 @@ EOF;
         $v=$this->input->get_value();
         $v=(trim($v)=="")?$this->message:$v;
         echo $v;
-        echo'<span class="smallicon icon" style="margin-left:5px">&#xe812;</span> ';
+        echo'<span class="smallicon icon" style="margin-left:5px">&#xe80d;</span> ';
         echo "</span>";
         echo "
             
diff --git a/include/template/detail-action.php b/include/template/detail-action.php
index 9dfad5c61..f43d3211e 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -371,7 +371,7 @@ for ($i=0;$i<sizeof($aAttachedFile);$i++) :
     ?>
         </td>
         <td>
-  <?php if ($p_view != 'READ') : ?>  <span class="icon"  id="<?php echo "ac".$aAttachedFile[$i]['d_id'];?>" href="javascript:void(0)" onclick="<?php echo $rmDoc;?>">&#xe80d;</span><?php endif;?>
+  <?php if ($p_view != 'READ') : ?>  <span class="icon"  id="<?php echo "ac".$aAttachedFile[$i]['d_id'];?>" href="javascript:void(0)" onclick="<?php echo $rmDoc;?>">&#xe80f;</span><?php endif;?>
         </td>
   </tr>
   <?php

From bc168d22ef3f9c02030ba2687885b6879cb4116d Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Mon, 26 Oct 2020 18:13:43 +0100
Subject: [PATCH 118/257] Tache #0001859: PARAM/CFGDOC : icone fermer + bouton

---
 include/lib/icon_action.class.php    | 13 ++++++++++++-
 include/template/modele_document.php |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/include/lib/icon_action.class.php b/include/lib/icon_action.class.php
index 252f9b575..eef3a58a4 100644
--- a/include/lib/icon_action.class.php
+++ b/include/lib/icon_action.class.php
@@ -211,9 +211,20 @@ class Icon_Action
     static function hide($action, $javascript)
     {
         $r='';
-        $r.='<span id="hide" class="icon"   onclick="'.$javascript.'">&#xe83b;'.$action.'</span>';
+        $r.='<span id="hide" class="icon"   onclick="'.$javascript.'">'.$action.'</span>';
         return $r;
     }
+    /**
+     * Return a html string with an eye
+     * @param type $javascript
+     * @return string
+     */
+    static function notvisible($javascript) {
+        $r='';
+        $r.='<span id="hide" class="icon"   onclick="'.$javascript.'">&#xe83b;</span>';
+        return $r;
+        
+    }
     /**
      * Display the icon of a trashbin
      * @param string $p_id DOMid 
diff --git a/include/template/modele_document.php b/include/template/modele_document.php
index 1ba0ef718..7a248128f 100644
--- a/include/template/modele_document.php
+++ b/include/template/modele_document.php
@@ -117,6 +117,6 @@ echo dossier::hidden();
 echo HtmlInput::hidden('sa','mod_template');
 echo HtmlInput::hidden('id',$doc->md_id);
 echo HtmlInput::submit("mod",_('Sauver'));
-
+echo HtmlInput::button_hide("mod_doc");
 ?>
 </form>
\ No newline at end of file

From 746406448b590bda94be268882a2c45eecb3beca Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 27 Oct 2020 19:42:54 +0100
Subject: [PATCH 119/257] Nouvelle balises

---
 include/class/document.class.php | 238 +++++++++++++++++++++++++++----
 1 file changed, 208 insertions(+), 30 deletions(-)

diff --git a/include/class/document.class.php b/include/class/document.class.php
index 3a863f183..084e0beaf 100644
--- a/include/class/document.class.php
+++ b/include/class/document.class.php
@@ -40,6 +40,8 @@ class Document
     var $d_description;       /*!< Description of the file*/
     var $d_number;    /*!< $d_number number of the document */
     var $md_id;       /*!< $md_id document's template */
+    private $counter; /*!< counter for the items ( goods ) */
+   
     /* Constructor
      * \param $p_cn Database connection
      */
@@ -47,8 +49,11 @@ class Document
     {
         $this->db=$p_cn;
         $this->d_id=$p_d_id;
+        
+        // counter for MARCH_NEXT
         $this->counter=0;
     }
+    
     /*!\brief insert a minimal document and set the d_id
      */
     function blank()
@@ -548,6 +553,24 @@ class Document
         $p_tag=strtoupper($p_tag);
         $p_tag=str_replace('=','',$p_tag);
         $r="Tag inconnu";
+        static $aComment=NULL;
+        static  $counter_comment =0  ; /*<! counter for the comment */
+        
+        static $aRelatedAction=NULL;
+        static  $counter_related_action =0 ; /*<! counter for the related action */
+        
+        static $aRelatedOperation=NULL;
+        static  $counter_related_operation =0 ; /*<! counter for the related operation */
+        
+        static $aFileAttached=NULL;
+        static  $counter_file =0 ; /*<! counter for the file */
+        
+        static $aOtherCard = NULL;
+        static  $counter_other_card =0 ; /*<! counter for the other card */
+        
+        static $aTag = NULL;
+        static  $counter_tag =0 ; /*<! counter for the tags */   
+        
         switch ($p_tag)
         {
             case 'DATE':
@@ -1173,56 +1196,211 @@ class Document
             if ( isset($p_array['ag_title']))                 return $p_array['ag_title'];
             return "";
             break;
-        // Description
+        // Description is the first comment
         case 'DESCRIPTION':
             if ( isset($p_array['ag_id'])) {
                 // retrieve first comment
                 $description=$this->db->get_value("select agc_comment "
                         . "  from action_gestion_comment "
-                        . "where ag_id=$1 order by 1 asc limit 1"
+                        . "where ag_id=$1 order by AGC_ID asc limit 1"
                         ,[$p_array['ag_id']]);
                 return $description;
             }
             return "";
             break;
-        // Comment
-        case 'COMMENT':
-            if ( isset($p_array['ag_id'])) {
-                // retrieve first comment
-                $description=$this->db->get_array("select agc_comment ,"
-                        . " to_char(agc_date,'DD-MM-YY HH24:MI') as str_date ,"
-                        . " tech_user "
-                        . "  from action_gestion_comment "
-                        . "where ag_id=$1 order by 1 asc limit 2"
-                        ,[$p_array['ag_id']]);
-                if ( count($description) == 2 ) {
-                    return $description[1]['agc_comment'];
-                }
-            }
-            return "";
-            break;
-        // Comments
+      
+        // Comments, use a counter to move to the next comment, only for Follow-Up
+        //
         case 'COMMENTS':
             if ( isset($p_array['ag_id'])) {
-                // retrieve first comment
-                $aComment=$this->db->get_array("select agc_comment ,"
-                        ." to_char(agc_date,'DD-MM-YY HH24:MI') as str_date ,"
-                        . " tech_user "
-                        . "  from action_gestion_comment "
-                        . "where ag_id=$1 order by 1"
-                        ,[$p_array['ag_id']]);
+                // Static value, if null the retrieve all of them
+                if ( $aComment == NULL ) {
+                    // retrieve comments
+                    $aComment=$this->db->get_array("select AGC_ID,agc_comment ,"
+                            ." to_char(agc_date,'DD-MM-YY HH24:MI') as str_date ,"
+                            . " tech_user "
+                            . "  from action_gestion_comment "
+                            . "where ag_id=$1 order by 1"
+                            ,[$p_array['ag_id']]);
+                }
                 $nb_comment=count($aComment);
                 $description="";
-                for ($i=0;$i< $nb_comment;$i++) {
+                if (count ($aComment) >  $this->counter_comment) {
                     $description.= sprintf(_('le %s , %s écrit %s'."\n"),
-                            $aComment[$i]['str_date'],
-                            $aComment[$i]['tech_user'],
-                            $aComment[$i]['agc_comment']);
+                            $aComment[$this->counter_comment]['str_date'],
+                            $aComment[$this->counter_comment]['tech_user'],
+                            $aComment[$this->counter_comment]['agc_comment']);
+                    $this->counter_comment++;
                 }
                 return $description;
             }
             return "";
             break;
+        // Related Action, use a counter to move to the next related action, only for Follow-Up
+        //
+        case 'RELATED_ACTION':
+            if ( isset($p_array['ag_id'])) {
+                // Static value, if null the retrieve all of them
+                if ( $aRelatedAction == NULL ) {
+                    // retrieve parent
+                    $followup=new Follow_Up($this->db,$p_array["ag_id"]);
+                    $aRelatedAction=array();
+                    $aParent=$followup->get_parent();
+                    $nb_parent=count($aParent);
+                    $sql_related_action = "
+                 select ag_id,
+                    f_id_dest,
+                    (select ad_value from fiche_detail fd1 where fd1.ad_id=23 and fd1.f_id=f_id_dest) as qcode,
+                    (select ad_value from fiche_detail fd1 where fd1.ad_id=1 and fd1.f_id=f_id_dest) as card_name,
+                    (select ad_value from fiche_detail fd1 where fd1.ad_id=32 and fd1.f_id=f_id_dest) as card_fname,
+                    ag_title,
+                    to_char(ag_timestamp,'DD.MM.YYYY') as strdate,
+                    ag_ref
+                    from action_gestion ag where ag_id=$1 ";
+                    
+                    for ($x = 0 ; $x < $nb_parent ; $x++ )
+                    {
+                        $aRelatedAction[]=$this->db->get_row($sql_related_action,[$aParent[$x]['aga_least']]);
+                        $aChild=$followup->get_children($aParent[$x]['aga_least']);
+                        $nb_child=count($aChild);
+                        for ($y=0;$y < $nb_child;$y++) {
+                            $aRelatedAction[]=$this->db->get_row($sql_related_action,[ $aChild[$y]['aga_greatest'] ]);
+                        }
+                        
+                    }
+                    
+                }
+                $description="";
+                if (count ($aRelatedAction) >  $counter_related_action ) {
+                    $description = sprintf("docid %s %s %s %s %s %s %s",
+                            $aRelatedAction[$counter_related_action]['ag_id'],
+                            $aRelatedAction[$counter_related_action]['ag_ref'],
+                            $aRelatedAction[$counter_related_action]['strdate'],
+                            $aRelatedAction[$counter_related_action]['qcode'],
+                            $aRelatedAction[$counter_related_action]['card_fname'],
+                            $aRelatedAction[$counter_related_action]['card_name'],
+                            $aRelatedAction[$counter_related_action]['ag_title']
+                            );
+                    
+                    $counter_related_action++;
+                }
+                return $description;
+            }
+            return "";
+            break;
+            
+        // Concerned operation, use a counter to move to the next one, only for Follow-Up
+        //
+        case 'CONCERNED_OPERATION':
+            if ( isset($p_array['ag_id'])) {
+                // Static value, if null the retrieve all of them
+                if ( $aRelatedOperation == NULL ) {
+                    // retrieve comments
+                    $aRelatedOperation=$this->db->get_array("select ago_id,
+                        j.jr_id,
+                        j.jr_internal,
+                        j.jr_comment,
+                        j.jr_pj_number,
+                        to_char(j.jr_date,'DD.MM.YY') as str_date
+			from jrn as j 
+                        join action_gestion_operation as ago on (j.jr_id=ago.jr_id)
+			where ag_id=$1 order by jr_date,jr_id"
+                            ,[$p_array['ag_id']]);
+                }
+                $description="";
+                if (count ($aRelatedOperation) >  $counter_related_operation) {
+                    $description.= sprintf('%s %s %s %s ',
+                            $aRelatedOperation[$counter_related_operation]['str_date'],
+                            $aRelatedOperation[$counter_related_operation]['jr_internal'],
+                            $aRelatedOperation[$counter_related_operation]['jr_comment'],
+                            $aRelatedOperation[$counter_related_operation]['jr_pj_number']
+                            );
+                    $counter_related_operation++;
+                }
+                return $description;
+            }
+            return "";
+            break;
+        // Other card, use a counter to move to the next one, only for Follow-Up
+        //
+        case 'OTHER_CARDS':
+            if ( isset($p_array['ag_id'])) {
+                // Static value, if null the retrieve all of them
+                if ( $aOtherCard == NULL ) {
+                    // retrieve comments
+                    $aOtherCard=$this->db->get_array("
+                        select 
+                        (select ad_value from fiche_detail where f_id = ap.f_id and ad_id = 1) as cname,
+                        (select ad_value from fiche_detail where f_id = ap.f_id and ad_id = 32) as cfname,
+                        (select ad_value from fiche_detail where f_id = ap.f_id and ad_id = 23) as qcode,
+                        (select ad_value from fiche_detail where f_id = ap.f_id and ad_id = 18 ) as email,
+                        (select ad_value from fiche_detail where f_id = ap.f_id and ad_id = 27 ) as mobile,
+                        (select ad_value from fiche_detail where f_id = ap.f_id and ad_id = 17 ) as phone
+                         from action_person ap  
+                         where ag_id=$1
+                            "
+                            ,[$p_array['ag_id']]);
+                }
+                $description="";
+                if (count ($aOtherCard) >  $counter_other_card ) {
+                    $description.= sprintf('%s %s %s %s %s %s ',
+                            $aOtherCard[$counter_other_card]['cname'],
+                            $aOtherCard[$counter_other_card]['cfname'],
+                            $aOtherCard[$counter_other_card]['qcode'],
+                            $aOtherCard[$counter_other_card]['email'],
+                            $aOtherCard[$counter_other_card]['phone'],
+                            $aOtherCard[$counter_other_card]['mobile']);
+                    $counter_other_card++;
+                }
+                return $description;
+            }
+            return "";
+            break;    
+        // Attachment , use a counter to move to the next one, only for Follow-Up
+        //
+        case 'ATTACHED_FILES':
+            if ( isset($p_array['ag_id'])) {
+                // Static value, if null the retrieve all of them
+                if ( $aFileAttached == NULL ) {
+                    // retrieve comments
+                    $aFileAttached=$this->db->get_array("
+                        select d_filename,d_description from document d  where ag_id=$1
+                            "
+                            ,[$p_array['ag_id']]);
+                }
+                $nb_comment=count($aFileAttached);
+                $description="";
+                if (count ($aFileAttached) >  $this->counter_comment) {
+                    $description.= sprintf("%s %s ",
+                           $aFileAttached[$counter_file]['d_filename'],
+                           $aFileAttached [$counter_file]['d_description']);
+                    $counter_file++;
+                }
+                return $description;
+            }
+            return "";
+            break;    
+        // Tag , use a counter to move to the next one
+        case 'TAGS':
+            if ( isset($p_array['ag_id'])) {
+                // Static value, if null the retrieve all of them
+                if ( $aTag == NULL ) {
+                    // retrieve comments
+                    $aTag=$this->db->get_array("
+                       select t_tag from action_tags at2 join tags t using(t_id)  where ag_id=$1
+                            "
+                            ,[$p_array['ag_id']]);
+                }
+                $description="";
+                if (count ($aTag) > $counter_tag) {
+                    $description.= sprintf("%s ",
+                           $aTag [$counter_tag]['t_tag']);
+                    $counter_tag++;
+                }
+                return $description;
+            }
+            return "";
+            break;    
         case 'COMM_PAYMENT':
             if ( isset($p_array["e_comm_paiement"])) {
             return $p_array["e_comm_paiement"];

From 4eb86ba3e774a3b136079d6bc8133481e6e3d356 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 27 Oct 2020 19:43:14 +0100
Subject: [PATCH 120/257] Sort by earliest one

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

diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index c36fe8d60..fe247b2a6 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -1798,7 +1798,7 @@ class Follow_Up
                 where
                   p2.aga_greatest is not null and
                   p2.aga_greatest = p1.aga_least
-              ) select aga_least,aga_greatest,depth from t order by depth desc 
+              ) select aga_least,aga_greatest,depth from t order by depth desc,aga_least asc 
                 ' , array($this->ag_id)
                 );
         if ( ! empty($value ) ) 

From 3416e51acc4acccedfa95f54df0745a7a789ca02 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 28 Oct 2020 18:16:26 +0100
Subject: [PATCH 121/257] FollowUp : nouvelle balises HOUR , GROUPMGMT ,
 PRIORITY

---
 include/class/document.class.php | 41 +++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/include/class/document.class.php b/include/class/document.class.php
index 084e0beaf..86f557baa 100644
--- a/include/class/document.class.php
+++ b/include/class/document.class.php
@@ -1211,7 +1211,7 @@ class Document
       
         // Comments, use a counter to move to the next comment, only for Follow-Up
         //
-        case 'COMMENTS':
+        case 'COMMENT':
             if ( isset($p_array['ag_id'])) {
                 // Static value, if null the retrieve all of them
                 if ( $aComment == NULL ) {
@@ -1225,12 +1225,12 @@ class Document
                 }
                 $nb_comment=count($aComment);
                 $description="";
-                if (count ($aComment) >  $this->counter_comment) {
-                    $description.= sprintf(_('le %s , %s écrit %s'."\n"),
-                            $aComment[$this->counter_comment]['str_date'],
-                            $aComment[$this->counter_comment]['tech_user'],
-                            $aComment[$this->counter_comment]['agc_comment']);
-                    $this->counter_comment++;
+                if (count ($aComment) >  $counter_comment) {
+                    $description.= sprintf(_('le %s , %s écrit %s'),
+                            $aComment[$counter_comment]['str_date'],
+                            $aComment[$counter_comment]['tech_user'],
+                            $aComment[$counter_comment]['agc_comment']);
+                    $counter_comment++;
                 }
                 return $description;
             }
@@ -1370,7 +1370,7 @@ class Document
                 }
                 $nb_comment=count($aFileAttached);
                 $description="";
-                if (count ($aFileAttached) >  $this->counter_comment) {
+                if (count ($aFileAttached) >  $counter_file) {
                     $description.= sprintf("%s %s ",
                            $aFileAttached[$counter_file]['d_filename'],
                            $aFileAttached [$counter_file]['d_description']);
@@ -1405,7 +1405,30 @@ class Document
             if ( isset($p_array["e_comm_paiement"])) {
             return $p_array["e_comm_paiement"];
              } else return "";
-	}
+             
+        // priority of the follow up  document
+            case 'PRIORITY':
+                if ( isset($p_array['ag_priority'])) {
+                    $aPriority=array(1=>_("Haute"),2=>_("Normale"),3=>_("Basse"));
+                    return $aPriority[$p_array["ag_priority"]];
+                }
+                return "";
+        // Priority of the follow up  document
+            case 'GROUPMGT':
+                if ( isset($p_array['ag_dest'])) {
+                   $profile=$this->db->get_value("select p_name from profile where p_id=$1",array($p_array['ag_dest']));
+                   return $profile;
+                }
+                return "";
+        // Hour in the follow up document
+            case 'HOUR':
+                if ( isset($p_array['ag_hour'])) {
+                    return $p_array["ag_hour"];
+                }
+                return "";
+                
+        
+    } // end switch 
         /*
          * retrieve the value of ATTR for e_march
          */

From e248feea705754ba9fddff56c183b32d4ce224bf Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 28 Oct 2020 18:16:46 +0100
Subject: [PATCH 122/257] Followup : change moyenne par normale

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

diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index fe247b2a6..4cbd1336c 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -267,7 +267,7 @@ class Follow_Up
         $ag_priority->name="ag_priority";
         $ag_priority->selected=$this->ag_priority;
         $ag_priority->value=array(array('value'=>1, 'label'=>_('Haute')),
-            array('value'=>2, 'label'=>_('Moyenne')),
+            array('value'=>2, 'label'=>_('Normale')),
             array('value'=>3, 'label'=>_('Basse'))
         );
         $str_ag_priority=$ag_priority->input();

From 86b674997fa4b416b91e1f5f1cf75c1764ab58ff Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 28 Oct 2020 18:22:45 +0100
Subject: [PATCH 123/257] Balise : nouveau STATUS , etat du document

---
 include/class/document.class.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/include/class/document.class.php b/include/class/document.class.php
index 86f557baa..1f9ed7508 100644
--- a/include/class/document.class.php
+++ b/include/class/document.class.php
@@ -1426,6 +1426,14 @@ class Document
                     return $p_array["ag_hour"];
                 }
                 return "";
+        // State in the follow up document
+            case 'STATUS':
+                if ( isset($p_array['ag_state'])) {
+                    $status=$this->db->get_value("
+                            select s_value from document_state where s_id=$1",array($p_array['ag_state']));
+                   return $status;
+                }
+                return "";
                 
         
     } // end switch 

From 92ff23dd635613cb1a16ccdaf682553c6f839702 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 28 Oct 2020 18:49:38 +0100
Subject: [PATCH 124/257] Compta analytique : ajout du tiers dans Grand'Livre

---
 include/class/anc_grandlivre.class.php | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/include/class/anc_grandlivre.class.php b/include/class/anc_grandlivre.class.php
index fdefa13ff..2965087c3 100644
--- a/include/class/anc_grandlivre.class.php
+++ b/include/class/anc_grandlivre.class.php
@@ -60,7 +60,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 oa_id,
+        $array=$this->db->get_array("	 select oa_id,
 	po_name,
 	oa_description,
 	po_description,
@@ -73,11 +73,10 @@ class Anc_GrandLivre extends Anc_Print
 	jr_id,
 	coalesce(jr_comment,b.oa_description) as jr_comment,
 	case when j_poste is null and b.f_id is not null then
-        (select ad_value from fiche_detail where fiche_detail.f_id=b.f_id and ad_id=".ATTR_DEF_ACCOUNT.")
+        (select ad_value from fiche_detail where fiche_detail.f_id=b.f_id and ad_id=23)
             when j_poste is not null then
             j_poste
-            end as j_poste
-        ,
+            end as j_poste,
 	coalesce(jrnx.f_id,b.f_id) as f_id,
         case when jrnx.f_id is not null then 
 		 (select ad_value from fiche_Detail where f_id=jrnx.f_id and ad_id=23) 
@@ -86,10 +85,17 @@ class Anc_GrandLivre extends Anc_Print
 	end
 		 as qcode,
         jr_pj_number,
-        jr_tech_per
+        jr_tech_per,
+        ftiers.cardid,
+        (select ad_value from fiche_detail where f_id=ftiers.cardid and ad_id=23) as qcode_tiers
 	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)
+	left join ( 	select distinct qp_supplier as cardid,j_id from  quant_purchase qp 
+					union
+			       	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
 	order by po_name,oa_date::date,qcode,j_poste");
         $this->has_data=count($array);
@@ -123,6 +129,7 @@ class Anc_GrandLivre extends Anc_Print
 	end
 		 as qcode,
         coalesce(jr_comment,b.oa_description) as jr_comment,
+        (select ad_value from fiche_detail where f_id=ftiers.cardid and ad_id=23) as qcode_tiers,
         coalesce (jr_pj_number,'') as jr_pj_number,
 	coalesce(jr_internal,'') as jr_internal,
         coalesce(oa_group,0) as oa_group,
@@ -132,6 +139,11 @@ class Anc_GrandLivre extends Anc_Print
 	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)
+        left join ( 	select distinct qp_supplier as cardid,j_id from  quant_purchase qp 
+					union
+			       	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
 	order by po_name,oa_date::date,qcode,j_poste");
 
@@ -214,6 +226,7 @@ class Anc_GrandLivre extends Anc_Print
                         '<th>' . _('Poste') . '</th>' .
                         '<th>' . _('Quick_code') . '</th>' .
                         '<th>' . _('Libellé') . '</th>' .
+                        th(_("Tiers")).
                         '<th>' . '</th>' .
                         '<th>' . _('Pièce') . '</th>' .
                         '<th>' . _('Interne') . '</th>' .
@@ -269,6 +282,7 @@ class Anc_GrandLivre extends Anc_Print
                     td($post_detail) .
                     td($card_detail) .
                     td($row['jr_comment']) .
+                    td($row["qcode_tiers"]).
                     '<td>' . $str_document . '</td>' .
                     td($row['jr_pj_number']) .
                     '<td>' . $detail . '</td>' .
@@ -330,6 +344,7 @@ class Anc_GrandLivre extends Anc_Print
         $aheader[]=array("title"=>'Poste','type'=>'string');
         $aheader[]=array("title"=>'Quick_Code','type'=>'string');
         $aheader[]=array("title"=>'libelle','type'=>'string');
+        $aheader[]=array("title"=>'tiers','type'=>'string');
         $aheader[]=array("title"=>'Pièce','type'=>'string');
         $aheader[]=array("title"=>'Num.interne','type'=>'string');
         $aheader[]=array("title"=>'row','type'=>'string');

From d8c068cc091f5de793f5a0891ccbf28c4a660b5a Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Wed, 28 Oct 2020 21:31:09 +0100
Subject: [PATCH 125/257] =?UTF-8?q?0001827:=20Delta=20des=20op=C3=A9ration?=
 =?UTF-8?q?s=20li=C3=A9es=20bas=C3=A9=20sur=20le=20montant=20d'une=20seule?=
 =?UTF-8?q?=20op=C3=A9ration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/template/ledger_detail_bottom.php | 20 +++++++++++++++++---
 include/template/ledger_detail_fin.php    |  2 +-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/include/template/ledger_detail_bottom.php b/include/template/ledger_detail_bottom.php
index 2eb2113d7..f62975a17 100644
--- a/include/template/ledger_detail_bottom.php
+++ b/include/template/ledger_detail_bottom.php
@@ -173,13 +173,13 @@ endif;
  <?php 
           // display title only in popup
           if ($div == 'popup') :
-          ?> 
+          ?> er
                 <h1 class="legend"><?php echo $a_tab['linked_operation_div']['label']?></h1>
           <?php endif; ?>
 <?php 
 
 if ($aRap  != null ) {
-    $amount_tva_include=(isset($tvac))?$tvac:$detail->det->jr_montant;
+    $amount_tva_include=(isset($total_tvac))?$total_tvac:$detail->det->jr_montant;
   $tableid="tb".$div;
   $total_rec=0;
   echo '<table id="'.$tableid.'">';
@@ -187,8 +187,22 @@ if ($aRap  != null ) {
     $opRap=new Acc_Operation($cn);
     $opRap->jr_id=$aRap[$e];
     $internal=$opRap->get_internal();
-    $array_jr=$cn->get_array('select jr_date,jr_pj_number,jr_montant,jr_comment from jrn where jr_id=$1',array($aRap[$e]));
+    $array_jr=$cn->get_array('select jr_date,jr_pj_number,jr_montant,jr_comment , jr_internal 
+                                from jrn where jr_id=$1',
+        array($aRap[$e]));
     $amount=$array_jr[0]['jr_montant'];
+    switch (substr($array_jr[0]['jr_internal'],0,1)) {
+        case 'A':
+            $amount = $cn->get_value("select sum(qp_price+qp_vat-qp_vat_sided) from quant_purchase qp 
+                                            where qp_internal=$1",
+                array($internal));
+            break;
+        case 'V':
+            $amount=$cn->get_value("select sum(qs_price+qs_vat-qs_vat_sided) from quant_sold qs  
+                                        where qs_internal=$1",
+                array($internal));
+            break;
+    }
     $total_rec=bcadd($total_rec,$amount);
     $str="modifyOperation(".$aRap[$e].",".$gDossier.")";
     
diff --git a/include/template/ledger_detail_fin.php b/include/template/ledger_detail_fin.php
index 291a125d7..50ea04f67 100644
--- a/include/template/ledger_detail_fin.php
+++ b/include/template/ledger_detail_fin.php
@@ -32,7 +32,7 @@ $date->value=format_date($obj->det->jr_date);
 <?php 
 $bk=new Fiche($cn,$obj->det->array[0]['qf_bank']);
 $view_card_detail=HtmlInput::card_detail($bk->get_quick_code(),h($bk->getName()), ' class="line" ');
-echo td(_('Compte en banque')).td($view_card_detail).td();;
+echo td(_('Compte en banque')).td($view_card_detail).td();
 
 ?>
 </tr>

From a8530b1f16ab9495d124885be66d1951eb4b7929 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 29 Oct 2020 18:27:24 +0100
Subject: [PATCH 126/257] FollowUp commentaire unique et modifiable

---
 html/ajax_misc.php                            |   2 +
 include/ajax/ajax_follow_up.php               |  62 +++++++++++
 .../action_document_type_mtable.class.php     |  14 ++-
 include/class/document_option.class.php       |  17 ++-
 .../action_document_type_mtable_input.php     |   5 +
 include/template/detail-action.php            | 100 +++++++++++++-----
 6 files changed, 167 insertions(+), 33 deletions(-)

diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index 9a74ce07c..713444d63 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -250,6 +250,8 @@ $path = array(
     'template_cat_category'=>'ajax_template_cat_category',
     // From FollowUp , update a comment on a file
     'update_comment_followUp'=>'ajax_follow_up',
+    // Update a follow up's comment
+    'followup_comment_oneedit'=>'ajax_follow_up',
     // TVA param
     "tva_parameter"=>"ajax_tva_parameter",
     // Display all cards using an accounting
diff --git a/include/ajax/ajax_follow_up.php b/include/ajax/ajax_follow_up.php
index bd44370a9..792c4889a 100644
--- a/include/ajax/ajax_follow_up.php
+++ b/include/ajax/ajax_follow_up.php
@@ -71,4 +71,66 @@ if ($op=='update_comment_followUp')
             throw new Exception(__FILE__.':'.__LINE__.'Invalide value');
             break;
     }
+    return;
+}
+// Modify followup 
+if ($op == 'followup_comment_oneedit') {
+     $input=$http->request('input');
+    $action=$http->request('ieaction', 'string', 'display');
+    $agc_id=$http->request('agc_id', "number");
+    $ag_id=$http->request('ag_id', "number");
+    global $g_user;
+    // check comment is the comment of this ag_id
+    $ctl_ag_id=$cn->get_value("select ag_id from action_gestion_comment where agc_id=$1",[$agc_id]);
+    if ( $agc_id != -1 && $ctl_ag_id != $ag_id) {
+        record_log("FLP02 ag_id [$ag_id] <> ctl_ag_id [$ctl_ag_id]");
+        return;
+    }
+    // Build inplace input
+    $inplace_description=Inplace_Edit::build($input);
+    $inplace_description->set_callback("ajax_misc.php");
+    
+    $inplace_description->add_json_param("ag_id", $ag_id);
+    $inplace_description->add_json_param("gDossier", Dossier::id());
+    $inplace_description->add_json_param("op", "followup_comment_oneedit");
+    switch ($action)
+    {
+        case 'display':
+            $inplace_description->add_json_param("agc_id", $agc_id);
+            echo $inplace_description->ajax_input();
+
+            break;
+        case 'ok':
+            if ($g_user->check_action(VIEWDOC)==1)
+            {
+                $value=strip_tags($http->request('value'));
+                if ($g_user->can_write_action($ag_id))
+                {
+                    // retrieve the document
+                    if ( $agc_id==-1) {
+                      $agc_id=  $cn->get_value("insert into action_gestion_comment(ag_id,agc_comment,tech_user)
+                                values ($1,$2,$3) returning agc_id" ,[$ag_id,$value,$g_user->login]);
+                    } else {
+                          $cn->exec_sql("update action_gestion_comment set agc_comment=$1,tech_user=$2
+                                where agc_id=$3
+                                " ,[$value,$g_user->login,$agc_id]);
+                    }
+                    
+                }
+                $inplace_description->add_json_param("agc_id", $agc_id);
+                $inplace_description->set_value($value);
+            }
+            echo $inplace_description->value();
+            break;
+        case 'cancel':
+            $inplace_description->add_json_param("agc_id", $agc_id);
+            echo '<pre>';
+            echo $inplace_description->value();
+            echo '</pre>';
+            break;
+        default:
+            throw new Exception(__FILE__.':'.__LINE__.'Invalide value');
+            break;
+    }
+    return;
 }
\ No newline at end of file
diff --git a/include/class/action_document_type_mtable.class.php b/include/class/action_document_type_mtable.class.php
index d0d364031..f56b1f267 100644
--- a/include/class/action_document_type_mtable.class.php
+++ b/include/class/action_document_type_mtable.class.php
@@ -80,8 +80,10 @@ class Action_Document_Type_MTable extends Manage_Table_SQL
         $this->other['contact_multiple']=$http->request("det_contact_mul", "string", 0);
         $this->other['make_invoice']=$http->request("make_invoice", "string", 0);
         $this->other['followup_comment']=$http->request("followup_comment", "string", 0);
+        $this->other['enable_followup']=$http->request("enable_followup", "string", 0);
         $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["cor_id"]=$http->request("cor_id","array",[]);
         $nb_corid=count($this->other["cor_id"]);
         $http->set_empty(0);
@@ -244,7 +246,8 @@ class Action_Document_Type_MTable extends Manage_Table_SQL
         // Save detail operation
         $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", ["detail_operation", 
+            do update set do_enable=$3,do_option=$4", 
+                        [                   "detail_operation", 
                                             $object_sql->dt_id,
                                             $this->other['detail_operation'],
                                             $this->other['select_option_operation']
@@ -260,9 +263,14 @@ class Action_Document_Type_MTable extends Manage_Table_SQL
             on conflict on constraint document_option_un
             do update set do_enable=$3 ", ["make_invoice", $object_sql->dt_id, $this->other['make_invoice']]);
         // Option for comments
-            $cn->exec_sql("insert into document_option (do_code,document_type_id,do_enable) values ($1,$2,$3) 
+            $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 ", ["followup_comment", $object_sql->dt_id, $this->other['followup_comment']]);
+                do update set do_enable=$3,do_option=$4 ", 
+                    [   "followup_comment", 
+                        $object_sql->dt_id, 
+                        $this->other['followup_comment'],
+                        $this->other['select_comment']
+                    ]);
         
         // 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 4fd974c2c..388284b5c 100644
--- a/include/class/document_option.class.php
+++ b/include/class/document_option.class.php
@@ -129,5 +129,20 @@ class Document_Option
         return false;
         
     }
+    
+    /**
+     * returns option from  the operation_detail 
+     * 
+     * @param int $p_document_type Document_Type.dt_id
+     * @return string ONE_EDIT or SOME_FIXED
+     */
+    static function option_comment($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, 'followup_comment']);
+        return $option_operation;
+    }
 
-}
+    }
diff --git a/include/template/action_document_type_mtable_input.php b/include/template/action_document_type_mtable_input.php
index a02401f30..25f2426b5 100644
--- a/include/template/action_document_type_mtable_input.php
+++ b/include/template/action_document_type_mtable_input.php
@@ -100,6 +100,11 @@ $i=new ICheckBox("followup_comment",1);
 if ( Document_Option::is_enable_comment($table->dt_id)) $i->set_check(1); else $i->set_check(0);
 echo $i->input();
 echo _("Commentaire");
+$select_comment_type=new ISelect("select_comment");
+$select_comment_type->value=array(["value"=>"ONE_EDIT","label"=>_("Unique")],
+                                      ["value"=>"SOME_FIXED","label"=>_("Multiples")]);
+$select_comment_type->set_value(Document_Option::option_comment($table->dt_id));
+echo $select_comment_type->input();
 ?>
         </li> 
     </ul>
diff --git a/include/template/detail-action.php b/include/template/detail-action.php
index f43d3211e..1d6451645 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -245,43 +245,85 @@ function small(p_id_textarea){
     <div style="margin-left:10px;">
    <?php
    $style_enl='style="display:inline"';$style_small='style="display:none"';
+    if ( Document_Option::can_add_comment($ag_id) 
+            && Document_Option::option_comment($this->dt_id) == "ONE_EDIT")
+    {
+        if ( count($acomment)==0) {
+              echo $desc->input();
+        } else  {
+            echo '<pre class="field_follow_up">';
+            echo h($acomment[0]['agc_comment']);
+            echo '</pre>';
+            
+            $comment=new ITextarea("ag_comment_edit");
+            $comment->style='class="input_text field_follow_up" style="height:21rem"';
+            
+            $ag_comment_id= (count($acomment) > 1)?$acomment[1]['agc_id']:-1;
+            $comment->value=(count($acomment) > 1 )?$acomment[1]['agc_comment']:'';
+            $comment->id="ag_comment_edit";
 
-for( $c=0;$c<count($acomment);$c++){
-        if ($c == 0) { $m_desc=_('Description');}
-        else
-         { $m_desc=_('Commentaire');}
-         $comment="";
-         if ( $p_view != 'READ' && $c > 0)
-	{
-            $rmComment=sprintf("return confirm_box(null,'"._('Voulez-vous effacer ce commentaire')." ?',function() {remove_comment('%s','%s');});",
-                                            dossier::id(),
-                                            $acomment[$c]['agc_id']);
-            $js=Icon_Action::trash("accom".$acomment[$c]['agc_id'], $rmComment);
-            $comment= h($m_desc.' '.$acomment[$c]['agc_id'].'('.$acomment[$c]['tech_user']." ".$acomment[$c]['str_agc_date'].')').$js.
-                            '<pre class="field_follow_up" id="com'.$acomment[$c]['agc_id'].'"> '.
-                            " ".h($acomment[$c]['agc_comment']).'</pre>'
-                            ;
+            // One editable comment is available
+            $editable_comment=new Inplace_Edit($comment);
+            $editable_comment->add_json_param("op", "followup_comment_oneedit");
+            $editable_comment->add_json_param("agc_id", $ag_comment_id);
+            $editable_comment->add_json_param("ag_id", $ag_id);
+            $editable_comment->add_json_param("gDossier", Dossier::id());
+            $editable_comment->set_callback("ajax_misc.php");
 
-	}
-	else
-	{
-		$comment=h($m_desc.' '.$acomment[$c]['agc_id'].'('.$acomment[$c]['tech_user']." ".$acomment[$c]['str_agc_date'].')').
-				'<pre class="field_follow_up" id="com'.$acomment[$c]['agc_id'].'"> '.
-				" ".h($acomment[$c]['agc_comment']).'</pre>'
-				;
-                
+            echo $editable_comment->input();
+            
+        }
+        
+        
+    } elseif (Document_Option::can_add_comment($ag_id) 
+            && Document_Option::option_comment($this->dt_id) == "SOME_FIXED")
+    {
+        for( $c=0;$c<count($acomment);$c++){
+            if ($c == 0) { $m_desc=_('Description');}
+            else
+             { $m_desc=_('Commentaire');}
+             $comment="";
+             if ( $p_view != 'READ' && $c > 0)
+            {
+                $rmComment=sprintf("return confirm_box(null,'"._('Voulez-vous effacer ce commentaire').
+                        " ?',function() {remove_comment('%s','%s');});",
+                                                dossier::id(),
+                                                $acomment[$c]['agc_id']);
+                $js=Icon_Action::trash("accom".$acomment[$c]['agc_id'], $rmComment);
+                $comment= h($m_desc.' '.$acomment[$c]['agc_id'].'('.$acomment[$c]['tech_user']." ".
+                        $acomment[$c]['str_agc_date'].')').$js.
+                                '<pre class="field_follow_up" id="com'.$acomment[$c]['agc_id'].'"> '.
+                                " ".h($acomment[$c]['agc_comment']).'</pre>'
+                                ;
 
-	}
-        $comment=preg_replace('/#([0-9]+)/','<a class="line" href="javascript:void()" onclick="view_action(\1,'.Dossier::id().',0)" >\1</a>',$comment);
-        echo $comment;
+            }
+            else
+            {
+                    $comment=h($m_desc.' '.$acomment[$c]['agc_id'].'('.$acomment[$c]['tech_user']." ".
+                            $acomment[$c]['str_agc_date'].')').
+                                    '<pre class="field_follow_up" id="com'.$acomment[$c]['agc_id'].'"> '.
+                                    " ".h($acomment[$c]['agc_comment']).'</pre>'
+                                    ;
+
+
+            }
+            $comment=preg_replace('/#([0-9]+)/','<a class="line" href="javascript:void()" onclick="view_action(\1,'.
+                    Dossier::id().',0)" >\1</a>',$comment);
+            echo $comment;
+     }
 }
 echo '<span class="noprint">';
-if (  Document_Option::can_add_comment($ag_id) ) {
-    echo $desc->input();
+if (  Document_Option::can_add_comment($ag_id) && Document_Option::option_comment($this->dt_id) == "SOME_FIXED")  {
+        echo $desc->input();
+     
 }
 echo '</span>';
 ?>
-<?php if ($p_view != "READ" && Document_Option::can_add_comment($ag_id)): ?>
+
+<?php if ($p_view != "READ" 
+        && Document_Option::can_add_comment($ag_id) 
+        && Document_Option::option_comment($this->dt_id) == "SOME_FIXED" ): ?>
+        
 <p class="noprint">
 <input type="button" id="bt_enlarge" <?php echo $style_enl?> value="+" onclick="enlarge('ag_comment');return false;">
 <input type="button" id="bt_small"  <?php echo $style_small?> value="-" style="display:none" onclick="small('ag_comment');return false;">

From 2a5581b173838a701cc73a350ff29d43b2c9a813 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 29 Oct 2020 18:27:35 +0100
Subject: [PATCH 127/257] Adapt for Textarea

---
 include/lib/inplace_edit.class.php | 41 +++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/include/lib/inplace_edit.class.php b/include/lib/inplace_edit.class.php
index 0d372de17..2a492dd33 100644
--- a/include/lib/inplace_edit.class.php
+++ b/include/lib/inplace_edit.class.php
@@ -75,6 +75,9 @@ class Inplace_Edit
      function ajax_input() {
          ob_start();
         echo $this->input->input();
+        if ($this->input instanceof ITextarea) {
+            echo '<br>';
+        } 
         echo '<a style="display:inline" class="smallbutton"  id="inplace_edit_ok'.$this->input->id.'">'._('ok').'</a>';
         echo '<a style="display:inline" class="smallbutton" id="inplace_edit_cancel'.$this->input->id.'">'._('cancel').'</a>';
         echo <<<EOF
@@ -108,11 +111,21 @@ EOF;
     function value()
     {
         $v=$this->input->get_value();
-        $v=(trim($v)=="")?$this->message:$v;
-        echo $v,
-                 '<span class="smallicon icon" style="margin-left:5px">&#xe80d;</span> ',
-                "
-            <script>
+         if ( $this->input instanceof ITextarea) {
+            echo '<span class="input_text" id="'.$this->input->id.'edit" >';
+            echo '<pre class="field_follow_up">';
+            $v=(trim($v)=="")?$this->message:$v;
+            echo $v;
+            echo '</pre>';
+            echo'<span class="smallbutton" style="margin-left:5px">Cliquer pour changer</span> ';
+        } else {
+            $v=(trim($v)=="")?$this->message:$v;
+            echo $v,
+                     '<span class="smallicon icon" style="margin-left:5px">&#xe80d;</span> ';
+        }
+                    
+         echo "
+                <script>
             $('{$this->input->id}edit').removeClassName('inplace_edit_input');
         {$this->input->id}edit.onclick=function() {
                  new Ajax.Updater('{$this->input->id}edit'
@@ -126,13 +139,23 @@ EOF;
      */
     function input() {
         ob_start();
+        $v=$this->input->get_value();
+        if ( $this->input instanceof ITextarea) {
+            echo '<span class="" id="'.$this->input->id.'edit" >';
+            echo '<pre class="field_follow_up">';
+            $v=(trim($v)=="")?$this->message:$v;
+            echo $v;
+            echo '</pre>';
+            echo'<span class="smallbutton" style="margin-left:5px">Cliquer pour changer</span> ';
+        } else {
+            $v=(trim($v)=="")?$this->message:$v;
         echo <<<EOF
             <span class="inplace_edit" id="{$this->input->id}edit" >
 EOF;
-        $v=$this->input->get_value();
-        $v=(trim($v)=="")?$this->message:$v;
-        echo $v;
-        echo'<span class="smallicon icon" style="margin-left:5px">&#xe80d;</span> ';
+            echo $v;
+            
+            echo'<span class="smallicon icon" style="margin-left:5px">&#xe80d;</span> ';
+        }
         echo "</span>";
         echo "
             

From 91874630103903800211eddfa626b2b6e8f423cd Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 30 Oct 2020 10:19:17 +0100
Subject: [PATCH 128/257] Correct SQL script

---
 include/sql/patch/upgrade148.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/sql/patch/upgrade148.sql b/include/sql/patch/upgrade148.sql
index 76477c192..64c328b6a 100644
--- a/include/sql/patch/upgrade148.sql
+++ b/include/sql/patch/upgrade148.sql
@@ -1,5 +1,5 @@
 begin;
-INSERT INTO public.document_option (do_code, document_type_id, do_enable, do_option) select 'followup_comment', dt_id, 1, NULL
+INSERT INTO public.document_option (do_code, document_type_id, do_enable, do_option) select 'followup_comment', dt_id, 1, 'SOME_FIXED'
 from document_type ;
 
 insert into version (val,v_description) values (149,'Default values for document_option,comment on followup');

From 6952f879349232a2688a727f8e3691181d40a7b7 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sat, 31 Oct 2020 00:20:10 +0100
Subject: [PATCH 129/257] Style : improve h2

---
 html/style-classic7.css | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/html/style-classic7.css b/html/style-classic7.css
index 09d256ea9..3846206d4 100644
--- a/html/style-classic7.css
+++ b/html/style-classic7.css
@@ -86,14 +86,15 @@ table.sortable th,  table.table_large th,table.result th {
 
 h2 {
     font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
-    font-family: 'SansationLight';
-    color:#888;
+    color:white;
+    background-color:#6393c1;
     /*! margin:1px; */
-    padding:1px;
-    /*! font-style: italic; */
+    padding:3px;
+    font-style: italic; 
     font-size:15px;
-    font-size:1.2rem;
-    margin-bottom: 0;
+    font-size:1.1rem;
+    margin-bottom: 5px;
+    margin-top: 5px;
 }
 div.info {
     background:#879ED4;
@@ -2096,7 +2097,6 @@ td.selectedmenu {
     white-space: -moz-pre-wrap;
     white-space: pre-wrap;
     border:1px solid blue;
-    width:95%;
 }
 
 @media only screen and (max-width:850px) {

From 0f4b05ab461a1a6bd3cac8cae466f1fda2573cee Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sat, 31 Oct 2020 00:20:50 +0100
Subject: [PATCH 130/257] Suivi : description modifiable

---
 .../action_document_type_mtable.class.php     |   7 ++
 include/class/document_option.class.php       |  18 +++
 .../action_document_type_mtable_input.php     |  11 ++
 include/template/detail-action.php            | 114 ++++++++++++------
 include/template/follow_up_detail_display.php |   2 +
 5 files changed, 117 insertions(+), 35 deletions(-)

diff --git a/include/class/action_document_type_mtable.class.php b/include/class/action_document_type_mtable.class.php
index f56b1f267..574d8ac29 100644
--- a/include/class/action_document_type_mtable.class.php
+++ b/include/class/action_document_type_mtable.class.php
@@ -80,6 +80,7 @@ class Action_Document_Type_MTable extends Manage_Table_SQL
         $this->other['contact_multiple']=$http->request("det_contact_mul", "string", 0);
         $this->other['make_invoice']=$http->request("make_invoice", "string", 0);
         $this->other['followup_comment']=$http->request("followup_comment", "string", 0);
+        $this->other['editable_description']=$http->request("editable_description", "string", 0);
         $this->other['enable_followup']=$http->request("enable_followup", "string", 0);
         $this->other['seq']=$http->request("seq", "string", 0);
         $this->other['select_option_operation']=$http->request("select_option_operation", "string", null);
@@ -258,6 +259,12 @@ class Action_Document_Type_MTable extends Manage_Table_SQL
             on conflict on constraint document_option_un
             do update set do_enable=$3 ", ["contact_multiple", $object_sql->dt_id, $this->other['contact_multiple']]);
         
+         // Save editable description
+        $cn->exec_sql("insert into document_option (do_code,document_type_id,do_enable) values ($1,$2,$3) 
+            on conflict on constraint document_option_un
+            do update set do_enable=$3 ", ["editable_description", $object_sql->dt_id
+                , $this->other['editable_description']]);
+        
         // Save make invoice
         $cn->exec_sql("insert into document_option (do_code,document_type_id,do_enable) values ($1,$2,$3) 
             on conflict on constraint document_option_un
diff --git a/include/class/document_option.class.php b/include/class/document_option.class.php
index 388284b5c..30630b21d 100644
--- a/include/class/document_option.class.php
+++ b/include/class/document_option.class.php
@@ -144,5 +144,23 @@ class Document_Option
                         [$p_document_type, 'followup_comment']);
         return $option_operation;
     }
+    
+    /**
+     * returns true if it is possible to edit the description , otherwise false
+     * 
+     * @param int $p_document_type Document_Type.dt_id
+     * @return boolean
+     */
+    static function is_enable_editable_description($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, 'editable_description'])=='1')
+        {
+            $return=true;
+        }
+        return $return;
+    }
 
     }
diff --git a/include/template/action_document_type_mtable_input.php b/include/template/action_document_type_mtable_input.php
index 25f2426b5..b0a32899f 100644
--- a/include/template/action_document_type_mtable_input.php
+++ b/include/template/action_document_type_mtable_input.php
@@ -94,6 +94,17 @@ echo $i->input();
 echo _("Création de facture");
 ?>
         </li> 
+        
+        <li>
+            <?php
+            $description=new ICheckBox("editable_description",1);
+            if ( Document_Option::is_enable_editable_description($table->dt_id)) $description->set_check(1); 
+                else $description->set_check(0);
+                
+            echo $description->input();
+            echo _("Description modifiable");
+            ?>
+        </li>
         <li>
 <?php
 $i=new ICheckBox("followup_comment",1);
diff --git a/include/template/detail-action.php b/include/template/detail-action.php
index 1d6451645..cee6c9a4a 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -242,22 +242,62 @@ function small(p_id_textarea){
     <?php echo $title->input();
     ?>
 </p>
-    <div style="margin-left:10px;">
+    <div>
+        <?php 
+/**********************************************************************************************************************
+ * Start BLOCK Comment and description
+ **********************************************************************************************************************/
+?>
    <?php
    $style_enl='style="display:inline"';$style_small='style="display:none"';
-    if ( Document_Option::can_add_comment($ag_id) 
-            && Document_Option::option_comment($this->dt_id) == "ONE_EDIT")
-    {
-        if ( count($acomment)==0) {
-              echo $desc->input();
-        } else  {
+   // description
+   $description = new ITextarea("ag_description");
+   $description->id="ag_description";
+   //---------------------------------- Description -------------------------------------------------------------------
+   if ( count($acomment)> 0) {
+        $editable_description = Document_Option::is_enable_editable_description($this->dt_id);
+        if ( $editable_description == true){
+             echo h2(_("Description"));
+            $itDescription=new ITextarea("ag_description");
+            $itDescription->style='class="input_text field_follow_up" style="height:21rem;width:98%"';
+            
+            $ag_description_id= $acomment[0]['agc_id'];
+            $itDescription->value=$acomment[0]['agc_comment'];
+            $itDescription->id="ag_description";
+
+             // One editable comment is available
+            $editable_description=new Inplace_Edit($itDescription);
+            $editable_description->add_json_param("op", "followup_comment_oneedit");
+            $editable_description->add_json_param("agc_id", $ag_description_id);
+            $editable_description->add_json_param("ag_id", $ag_id);
+            $editable_description->add_json_param("gDossier", Dossier::id());
+            $editable_description->set_callback("ajax_misc.php");
+
+            echo $editable_description->input();
+        } 
+        elseif ($p_view == 'READ' || $editable_description == false)
+        {
+            echo h2(_("Description"));
+            
             echo '<pre class="field_follow_up">';
-            echo h($acomment[0]['agc_comment']);
-            echo '</pre>';
-            
+                echo h($acomment[0]['agc_comment']);
+                echo '</pre>';
+        }
+   } else {
+       echo h2(_("Description"));
+       echo $desc->input();
+   }
+   
+   //---------------------------------- Comment -----------------------------------------------------------------------
+   
+   if (    Document_Option::can_add_comment($ag_id)  && 
+           Document_Option::option_comment($this->dt_id) == "ONE_EDIT" ) 
+   {
+        if (count($acomment) > 1 && $p_view != 'READ')  {
+            echo h2(_("Commentaire"));
             $comment=new ITextarea("ag_comment_edit");
-            $comment->style='class="input_text field_follow_up" style="height:21rem"';
-            
+            $comment->style='class="input_text field_follow_up" style="height:21rem;width:98%"';
+
             $ag_comment_id= (count($acomment) > 1)?$acomment[1]['agc_id']:-1;
             $comment->value=(count($acomment) > 1 )?$acomment[1]['agc_comment']:'';
             $comment->id="ag_comment_edit";
@@ -269,16 +309,24 @@ function small(p_id_textarea){
             $editable_comment->add_json_param("ag_id", $ag_id);
             $editable_comment->add_json_param("gDossier", Dossier::id());
             $editable_comment->set_callback("ajax_misc.php");
-
+            echo '<p></p>';
             echo $editable_comment->input();
-            
+        } else {
+            echo '<span class="noprint">';
+            if (  $p_view == 'UPD' && Document_Option::can_add_comment($ag_id) && $add_comment)  {
+            echo '<p></p>';
+            echo $desc->input();
+     
+            }
+            echo '</span>';
         }
-        
-        
-    } elseif (Document_Option::can_add_comment($ag_id) 
+   }
+    if (    Document_Option::can_add_comment($ag_id) 
             && Document_Option::option_comment($this->dt_id) == "SOME_FIXED")
     {
-        for( $c=0;$c<count($acomment);$c++){
+        echo h2(_("Commentaire"));
+
+        for( $c=1;$c<count($acomment);$c++){
             if ($c == 0) { $m_desc=_('Description');}
             else
              { $m_desc=_('Commentaire');}
@@ -309,26 +357,22 @@ function small(p_id_textarea){
             }
             $comment=preg_replace('/#([0-9]+)/','<a class="line" href="javascript:void()" onclick="view_action(\1,'.
                     Dossier::id().',0)" >\1</a>',$comment);
+            echo '<p></p>';
             echo $comment;
-     }
-}
-echo '<span class="noprint">';
-if (  Document_Option::can_add_comment($ag_id) && Document_Option::option_comment($this->dt_id) == "SOME_FIXED")  {
+        } // end for
+        echo '<span class="noprint">';
+        if (  $p_view == 'UPD' && Document_Option::can_add_comment($ag_id))  {
+            echo '<p></p>';
         echo $desc->input();
      
-}
-echo '</span>';
+        }
+        echo '</span>';
+    }
+
+    
+
 ?>
 
-<?php if ($p_view != "READ" 
-        && Document_Option::can_add_comment($ag_id) 
-        && Document_Option::option_comment($this->dt_id) == "SOME_FIXED" ): ?>
-        
-<p class="noprint">
-<input type="button" id="bt_enlarge" <?php echo $style_enl?> value="+" onclick="enlarge('ag_comment');return false;">
-<input type="button" id="bt_small"  <?php echo $style_small?> value="-" style="display:none" onclick="small('ag_comment');return false;">
-</p>
-<?php endif; ?>
   </div>
 </div>
 <?php 
@@ -353,9 +397,9 @@ if ( $this->ag_id > 0 && Document_Option::is_enable_operation_detail($this->dt_i
   
 
 <div class="myfieldset" id="div_action_attached_doc">
-  <legend>
+  <h2>
      <?php echo _('Pièces attachées')?>
-  </legend>
+  </h2>
     <div class="noprint">
         <?php 
 /**********************************************************************************************************************
diff --git a/include/template/follow_up_detail_display.php b/include/template/follow_up_detail_display.php
index 0b3946f02..e10cd3473 100644
--- a/include/template/follow_up_detail_display.php
+++ b/include/template/follow_up_detail_display.php
@@ -41,6 +41,8 @@ $option_detail= Document_Option::option_operation_detail($document_type);
 $menu=new Default_Menu();
 ?>
 <div id="follow_up_detail">
+    
+    <?php echo h2(_("Détail opération")) ?>
     <?php echo HtmlInput::hidden("nb_item", $article_count); ?>
 
     <table style="width:100%"  id="sold_item">

From 47d9a08595ac66db1ae543d2d4b93d5bcb650c22 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sat, 31 Oct 2020 00:32:24 +0100
Subject: [PATCH 131/257] Balise Document_Type

---
 include/class/document.class.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/include/class/document.class.php b/include/class/document.class.php
index 1f9ed7508..64641f8c1 100644
--- a/include/class/document.class.php
+++ b/include/class/document.class.php
@@ -554,7 +554,7 @@ class Document
         $p_tag=str_replace('=','',$p_tag);
         $r="Tag inconnu";
         static $aComment=NULL;
-        static  $counter_comment =0  ; /*<! counter for the comment */
+        static  $counter_comment =1  ; /*<! counter for the comment , skip the first one which is the descrition*/
         
         static $aRelatedAction=NULL;
         static  $counter_related_action =0 ; /*<! counter for the related action */
@@ -1246,6 +1246,7 @@ class Document
                     $followup=new Follow_Up($this->db,$p_array["ag_id"]);
                     $aRelatedAction=array();
                     $aParent=$followup->get_parent();
+                    if ($aParent == -1 )return "";
                     $nb_parent=count($aParent);
                     $sql_related_action = "
                  select ag_id,
@@ -1434,6 +1435,16 @@ class Document
                    return $status;
                 }
                 return "";
+         // type of document
+            case 'DOCUMENT_TYPE':
+                $ret="";
+                if ( isset($p_array['ag_id'])){
+                    $ret=$this->db->get_value("select dt_value 
+                                             from action_gestion 
+                                             join document_type dt  on (ag_type=dt.dt_id) 
+                            where ag_id=$1",array($p_array["ag_id"]));
+                }
+                return $ret;
                 
         
     } // end switch 

From 0ca583f629754d5f784c482984d028d58fce76e4 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sat, 31 Oct 2020 09:17:13 +0100
Subject: [PATCH 132/257] cosmetic : set the total and compute button outside
 of the frame

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

diff --git a/include/template/predf_ledger_detail.php b/include/template/predf_ledger_detail.php
index 2174ea1d1..01f417b15 100644
--- a/include/template/predf_ledger_detail.php
+++ b/include/template/predf_ledger_detail.php
@@ -53,6 +53,7 @@ echo '</tr>';
 ?>
 </table>
 
+</div>
 
 <div style="position:float;float:right;text-align:right;padding-right:5px;font-size:1.2em;font-weight:bold;color:blue">
       <?php echo HtmlInput::button('act',_('Actualiser'),'onClick="compute_all_ledger();"'); ?>
@@ -79,7 +80,6 @@ echo '</tr>';
      <br><?php echo _('Total')?>
 <?php endif; ?>
 </div>
-</div>
 
 
 

From c4d8630c5c24023698d309d1a2f4752c66694ba1 Mon Sep 17 00:00:00 2001
From: Dany wm De Bontridder <danydb@noalyss.eu>
Date: Sun, 1 Nov 2020 13:03:55 +0100
Subject: [PATCH 133/257] Document_State : rewriting

---
 html/ajax_misc.php                            |  4 +-
 include/ajax/ajax_document_state.php          | 65 +++++++++++++++++++
 include/class/document_state_mtable.php       | 58 +++++++++++++++++
 include/database/document_state_sql.class.php | 62 ++++++++++++++++++
 include/doc_state.inc.php                     | 48 ++------------
 5 files changed, 195 insertions(+), 42 deletions(-)
 create mode 100644 include/ajax/ajax_document_state.php
 create mode 100644 include/class/document_state_mtable.php
 create mode 100644 include/database/document_state_sql.class.php

diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index 713444d63..77f49a03e 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -267,7 +267,9 @@ $path = array(
     // Add group of tags
    'tag_group'=>'ajax_tag_group',
     // set the group for a tag
-    'tag_set_group'=>"ajax_tag_set_group"
+    'tag_set_group'=>"ajax_tag_set_group",
+    // Document_state
+    "document_state"=>"ajax_document_state"
 )    ;
 
 if (array_key_exists($op, $path)) {
diff --git a/include/ajax/ajax_document_state.php b/include/ajax/ajax_document_state.php
new file mode 100644
index 000000000..d5cfed6fd
--- /dev/null
+++ b/include/ajax/ajax_document_state.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   Noalyss is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+if (!defined('ALLOWED'))     die('Appel direct ne sont pas permis');
+
+require_once NOALYSS_INCLUDE."/class/document_state_mtable.php";
+global $g_user;
+
+$g_user->check_action('CFGDOCST',2);
+
+/**
+ * @file
+ * @brief Manage Document_State
+ */
+try {
+    $table=$http->request('table');
+    $action=$http->request('action');
+    $p_id=$http->request('p_id', "number");
+    $ctl_id=$http->request('ctl');
+
+} catch(Exception $e) {
+    echo $e->getMessage();
+    return;
+}
+
+
+$document_state_sql=new Document_State_SQL($cn,$p_id);
+$mtable=new Document_State_MTable($document_state_sql);
+$mtable->build();
+$mtable->set_object_name($ctl_id);
+if ($action=="input")
+{
+
+    header('Content-type: text/xml; charset=UTF-8');
+    echo $mtable->ajax_input()->saveXML();
+    return;
+}
+elseif ($action=="save")
+{
+    $xml=$mtable->ajax_save();
+    header('Content-type: text/xml; charset=UTF-8');
+    echo $xml->saveXML();
+}
+elseif ($action=="delete")
+{
+   return;
+}
\ No newline at end of file
diff --git a/include/class/document_state_mtable.php b/include/class/document_state_mtable.php
new file mode 100644
index 000000000..41f5be48e
--- /dev/null
+++ b/include/class/document_state_mtable.php
@@ -0,0 +1,58 @@
+<?php
+/*
+ * Copyright (C) 2017 Dany De Bontridder <dany@alchimerys.be>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * Part of Noalyss (2002-2020)
+ */
+
+
+/***
+ * @file
+ * @brief class Document_State_MTable
+ * @see Manage_Table_SQL
+ *
+ */
+require_once NOALYSS_INCLUDE.'/database/document_state_sql.class.php';
+require_once NOALYSS_INCLUDE.'/lib/manage_table_sql.class.php';
+/**
+ * @brief this instance extends Manage_Table_SQL and aims to manage
+ * the Table tmp_pcmn thanks a web interface (add , delete, display...)
+ *
+ * @see Document_State_SQL
+ */
+
+class Document_State_MTable extends Manage_Table_SQL
+{
+    function __construct(Document_State_SQL $p_table)
+    {
+        parent::__construct($p_table);
+        $this->set_col_label("s_value", _("Label"));
+        $this->set_col_label('s_status',_('Action'));
+        $this->set_delete_row(false);
+        $this->set_col_type('s_status','select',array(
+                                array('value'=>'C','label'=>_('Ferme')),
+                              array('value'=>'','label'=>_('Aucune')))
+                            );
+        $this->set_property_visible('s_id',false);
+        $this->set_property_updatable('s_id',false);
+    }
+    function build()
+    {
+        $this->set_callback("ajax_misc.php");
+        $this->add_json_param("op", "document_state");
+    }
+}
\ No newline at end of file
diff --git a/include/database/document_state_sql.class.php b/include/database/document_state_sql.class.php
new file mode 100644
index 000000000..8b6ae7fc2
--- /dev/null
+++ b/include/database/document_state_sql.class.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Autogenerated file
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php';
+require_once NOALYSS_INCLUDE.'/class/database.class.php';
+
+/**
+ * class_attr_def_sql.php
+ *
+ * @file
+ * @brief abstract of the table public.document_state */
+class Document_State_SQL extends Noalyss_SQL
+{
+
+    function __construct(Database $p_cn, $p_id=-1)
+    {
+        $this->table="public.document_state";
+        $this->primary_key="s_id";
+        /*
+         * List of columns
+         */
+        $this->name=array(
+            "s_id"=>"s_id"
+        , "s_value"=>"s_value"
+        , "s_status"=>"s_status"
+        );
+        /*
+         * Type of columns
+         */
+        $this->type=array(
+            "s_id"=>"numeric"
+        , "s_value"=>"text"
+        , "s_status"=>"text"
+        );
+
+
+        $this->default=array(
+            "s_id"=>"auto"
+        );
+
+        $this->date_format="DD.MM.YYYY";
+        parent::__construct($p_cn, $p_id);
+    }
+
+}
diff --git a/include/doc_state.inc.php b/include/doc_state.inc.php
index 4ea6eaf1e..47343161d 100644
--- a/include/doc_state.inc.php
+++ b/include/doc_state.inc.php
@@ -18,7 +18,7 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-// Copyright Author Dany De Bontridder danydb@aevalys.eu
+// Copyright Author Dany De Bontridder danydb@noalyss.eu
 
 /**
  * @file
@@ -26,47 +26,13 @@
  *
  */
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-global $cn;
 
-if ( isset($_POST['add']))
-{
-	if (trim ($_POST['s_value'])!="")
-	{
-		if ( isset($_POST['s_state']))
-		{
-			$cn->exec_sql('insert into document_state(s_value,s_status) values ($1,$2)',array($_POST['s_value'],'C'));
-		}
-		else
-		{
-			$cn->exec_sql('insert into document_state(s_value) values ($1)',array($_POST['s_value']));
-		}
-	}
-}
-$a_stat=$cn->get_array("select s_value,s_status from document_state order by 1");
-?>
+require_once NOALYSS_INCLUDE."/class/document_state_mtable.php";
 
-<table>
-	<?php for ($i=0;$i<count($a_stat);$i++):?>
+$document_state_sql=new Document_State_SQL($cn);
+$mtable=new Document_State_MTable($document_state_sql);
 
-	<tr>
-		<td>
-			<?php echo h($a_stat[$i]['s_value'])?>
-		</td>
+$mtable->build();
+$mtable->create_js_script();
+echo $mtable->display_table();
 
-		<td>
-			<?php if ($a_stat[$i]['s_status']=='C') { echo _("Ferme l'action"); } ?>
-		</td>
-	</tr>
-	<?php endfor;?>
-</table>
-<h2>Ajout d'un état</h2>
-<form method="post" id='etat_add_frm' onsubmit="return confirm_box(this,'Vous confirmez ?'); ">
-	<p>
-		Nom de l'état <?php $value=new IText("s_value",""); echo $value->input()?>
-	</p>
-	<p>
-		Cochez la case si cet état ferme une action <?php $state=new ICheckBox("s_state",""); echo $state->input()?>
-                <input type='hidden' name='add' value='1'>
-		<?php echo HtmlInput::submit("addbt", "Ajouter")?>
-	</p>
-</form>
\ No newline at end of file

From df9d424becfcc8063774115299d9504c9bf73fb3 Mon Sep 17 00:00:00 2001
From: Dany wm De Bontridder <danydb@noalyss.eu>
Date: Sun, 1 Nov 2020 13:04:51 +0100
Subject: [PATCH 134/257] Security Can_Request log the security for Ajax

---
 include/class/user.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/class/user.class.php b/include/class/user.class.php
index 23051d0f7..6d43289b6 100644
--- a/include/class/user.class.php
+++ b/include/class/user.class.php
@@ -745,7 +745,7 @@ class User
 	/**\brief Check if the user can access
 	 * otherwise warn and exit
 	 * \param $p_action requested action
-	 * \param $p_js = 1 javascript, or 0 just a text
+	 * \param $p_js = 1 javascript, or 0 just a text or 2 to log it silently
 	 * \return nothing the program exits automatically
 	 */
 
@@ -760,6 +760,9 @@ class User
 				echo "alert ('Cette action ne vous est pas autorisée. Contactez votre responsable');";
 				echo "</script>";
 			}
+			elseif ($p_js == 2) {
+				record_log(_("Access invalid").$p_action);
+			}
 			else
 			{
 				echo '<div class="redcontent">';

From 9a03147cbf04d033b843d8d64939c3925eef8c2c Mon Sep 17 00:00:00 2001
From: Dany wm De Bontridder <danydb@noalyss.eu>
Date: Sun, 1 Nov 2020 13:33:31 +0100
Subject: [PATCH 135/257] Security For document_state and tag_group

---
 include/ajax/ajax_document_state.php | 6 +++++-
 include/ajax/ajax_tag_group.php      | 9 ++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/include/ajax/ajax_document_state.php b/include/ajax/ajax_document_state.php
index d5cfed6fd..e0776afa9 100644
--- a/include/ajax/ajax_document_state.php
+++ b/include/ajax/ajax_document_state.php
@@ -24,7 +24,11 @@ if (!defined('ALLOWED'))     die('Appel direct ne sont pas permis');
 require_once NOALYSS_INCLUDE."/class/document_state_mtable.php";
 global $g_user;
 
-$g_user->check_action('CFGDOCST',2);
+if ( $g_user->check_module('CFGDOCST') == 0 ) {
+    record_log("forbidden : CFGDOCST ".__FILE__);
+    exit();
+}
+
 
 /**
  * @file
diff --git a/include/ajax/ajax_tag_group.php b/include/ajax/ajax_tag_group.php
index dc1357619..7da3aa46a 100644
--- a/include/ajax/ajax_tag_group.php
+++ b/include/ajax/ajax_tag_group.php
@@ -21,6 +21,12 @@
 
 if (!defined('ALLOWED'))
     die('Appel direct ne sont pas permis');
+
+if ( $g_user->check_module('CFGTAG') == 0 ) {
+    record_log("forbidden : AJT01 ".__FILE__);
+    exit();
+}
+
 require_once NOALYSS_INCLUDE."/class/tag_group_mtable.class.php";
 /**
  * @file
@@ -36,6 +42,7 @@ try {
     echo $e->getMessage();
     return;
 }
+
 $obj=new Tag_Group_SQL($cn,$p_id);
 $obj_manage=new Tag_Group_MTable($obj);
 $obj_manage->set_callback("ajax_misc.php");
@@ -61,4 +68,4 @@ elseif ($action=="delete")
     $xml=$obj_manage->ajax_delete();
     header('Content-type: text/xml; charset=UTF-8');
     echo $xml->saveXML();
-}
\ No newline at end of file
+}

From 525cecc8d50683dcfcb2f5ee9cbf28dcea97980d Mon Sep 17 00:00:00 2001
From: Dany wm De Bontridder <danydb@noalyss.eu>
Date: Sun, 1 Nov 2020 13:57:52 +0100
Subject: [PATCH 136/257] Follow UP detail do not show the "Add Rows button" in
 READ mode

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

diff --git a/include/template/follow_up_detail_display.php b/include/template/follow_up_detail_display.php
index e10cd3473..48f9be533 100644
--- a/include/template/follow_up_detail_display.php
+++ b/include/template/follow_up_detail_display.php
@@ -189,7 +189,7 @@ $menu=new Default_Menu();
 
     </div>
     <div id="d_add_rows">
-    <?php echo Html_Input_Noalyss::ledger_add_item("O"); ?>
+    <?php if ( $p_view != 'READ' ) echo Html_Input_Noalyss::ledger_add_item("O"); ?>
         
     <?php echo HtmlInput::button('actualiser', _('Recalculer'), ' onClick="compute_all_ledger();"'); ?>
     </div>

From c3e06e4049adcf0cbdc7dead8db1d8e207f7285f Mon Sep 17 00:00:00 2001
From: Dany wm De Bontridder <danydb@noalyss.eu>
Date: Sun, 1 Nov 2020 14:47:28 +0100
Subject: [PATCH 137/257] Predefined Operation filter by ledger

---
 include/preod.inc.php | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/include/preod.inc.php b/include/preod.inc.php
index bea0caa58..240f5375e 100644
--- a/include/preod.inc.php
+++ b/include/preod.inc.php
@@ -34,11 +34,30 @@ $operation_predef_mtable->set_json(json_encode(array(   "ac"=>$http->request("ac
                                                         "op"=>"save_predf",
                                                         "gDossier"=>Dossier::id()
                                                      )));
+echo '<form method="GET">';
+echo Dossier::hidden();
+echo HtmlInput::hidden("ac",$http->request("ac"));
+$filter_ledger=new ISelect("f_ledger");
+
+
+$filter_ledger->selected=$http->request('f_ledger',"number",-1);
+$sql_filter='where '.$g_user->get_ledger_sql('ALL',2);
+
+
+$filter_ledger->value=$cn->make_array("select jrn_def_id ,jrn_def_name from jrn_def
+$sql_filter and jrn_def_type !='FIN' order by jrn_def_name",1);
+echo $filter_ledger->input();
+echo HtmlInput::submit('ledgerf',_("Filter par journal"));
+$operation_predef_mtable->display_button_add();
+
+echo '</form>';
+if ( $filter_ledger->selected != -1 && isNumber($filter_ledger->selected ) == 1 ) {
+    $sql_filter.= ' and jrn_Def_id = '.sql_string($filter_ledger->selected);
+}
 $operation_predef_mtable->create_js_script();
 echo '<p>';
- $operation_predef_mtable->display_button_add();
 echo '</p>';
-$operation_predef_mtable->display_table();
+ $operation_predef_mtable->display_table($sql_filter);
 echo '<p>';
 $operation_predef_mtable->display_button_add();
 echo '</p>';
\ No newline at end of file

From 455381420f91487a13fd1687aeafc6c715f8695f Mon Sep 17 00:00:00 2001
From: Dany wm De Bontridder <danydb@noalyss.eu>
Date: Sun, 1 Nov 2020 14:53:01 +0100
Subject: [PATCH 138/257] Cosmetic Admin List Folders : add close button

---
 include/template/folder_display.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/template/folder_display.php b/include/template/folder_display.php
index a4eb2e5ba..8f1c50f9f 100644
--- a/include/template/folder_display.php
+++ b/include/template/folder_display.php
@@ -69,4 +69,6 @@ for ($i=0;$i<$nb_dossier;$i++):
 <?php
 endfor;
 ?>
-</table>
\ No newline at end of file
+</table>
+<?php
+echo HtmlInput::button_close("folder_list_div");?>
\ No newline at end of file

From 86d85a3635a1e6eef279e1997058b8550efd2d60 Mon Sep 17 00:00:00 2001
From: Dany wm De Bontridder <danydb@noalyss.eu>
Date: Sun, 1 Nov 2020 15:35:35 +0100
Subject: [PATCH 139/257] cosmetic , remove myfiedset class, unclosed tag , the
 title comment is not show if there is no comment

---
 include/template/detail-action.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/template/detail-action.php b/include/template/detail-action.php
index cee6c9a4a..102202ed8 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -324,7 +324,7 @@ function small(p_id_textarea){
     if (    Document_Option::can_add_comment($ag_id) 
             && Document_Option::option_comment($this->dt_id) == "SOME_FIXED")
     {
-        echo h2(_("Commentaire"));
+       if( count($acomment) >0 ) echo h2(_("Commentaire"));
 
         for( $c=1;$c<count($acomment);$c++){
             if ($c == 0) { $m_desc=_('Description');}
@@ -396,7 +396,7 @@ if ( $this->ag_id > 0 && Document_Option::is_enable_operation_detail($this->dt_i
 
   
 
-<div class="myfieldset" id="div_action_attached_doc">
+<div  id="div_action_attached_doc">
   <h2>
      <?php echo _('Pièces attachées')?>
   </h2>
@@ -409,7 +409,7 @@ if ( $this->ag_id > 0 && Document_Option::is_enable_operation_detail($this->dt_i
 
  <?php if ($p_view != 'READ' && $str_select_doc != '') : ?>
          <?php echo _('Document à générer')?>
-  </legend>
+
   <?php echo $str_select_doc;
  echo $str_submit_generate;
 

From 3a177e4cc7a74bb2b05d30f267b024ed0e14e6ed Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sun, 1 Nov 2020 17:31:40 +0100
Subject: [PATCH 140/257] Cosmetic

---
 html/style-classic7.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/html/style-classic7.css b/html/style-classic7.css
index 3846206d4..e0235d9bb 100644
--- a/html/style-classic7.css
+++ b/html/style-classic7.css
@@ -53,6 +53,7 @@ input:focus {
 .notice {
     color:orangered;
     font-style: italic;
+    background-color:transparent;
     
 }
 a.mtitle span.notice {
@@ -2486,4 +2487,4 @@ span.tagcell {
 #action_add_action2_list {
     height:15rem;
     overflow: auto;
-}
\ No newline at end of file
+}

From e5b8e5af5a35a8985978428a4bc3e9c62d6b953e Mon Sep 17 00:00:00 2001
From: Dany wm De Bontridder <danydb@noalyss.eu>
Date: Sun, 1 Nov 2020 18:19:24 +0100
Subject: [PATCH 141/257] Cosmetic : ledger name

---
 html/ajax_misc.php                      | 2 +-
 include/cfgledger.inc.php               | 4 ++--
 include/class/acc_ledger_fin.class.php  | 2 +-
 include/compta_fin.inc.php              | 2 +-
 include/compta_fin_rec.inc.php          | 2 +-
 include/compta_ods.inc.php              | 2 +-
 include/opening.inc.php                 | 2 +-
 include/operation_ods_confirm.inc.php   | 2 +-
 include/operation_ods_new.inc.php       | 2 +-
 include/template/form_ledger_detail.php | 2 +-
 include/template/form_ledger_fin.php    | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index 77f49a03e..2db616d12 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -540,7 +540,7 @@ EOF;
             if ( count($ajrn)==1)
             {
                 echo '<div>';
-                echo '<h2 id="info">'.$ajrn[0]['jrn_def_name'].'</h2>';
+                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>';
                 }
diff --git a/include/cfgledger.inc.php b/include/cfgledger.inc.php
index 7984d48b9..fe8ea120e 100644
--- a/include/cfgledger.inc.php
+++ b/include/cfgledger.inc.php
@@ -79,9 +79,9 @@ if ($action_frm == 'delete' )
 		$ledger->delete_ledger();
 		$sa="";
 		echo '<div id="jrn_name_div">';
-		echo '<h2 id="jrn_name">';
+		echo '<h1 id="jrn_name">';
                 printf(_(" %s est effacé"),h($name));
-                echo "</h2>";
+                echo "</h1>";
 		echo '</div>';
                 $show_menu=1;
 	}
diff --git a/include/class/acc_ledger_fin.class.php b/include/class/acc_ledger_fin.class.php
index 15c381211..50db84369 100644
--- a/include/class/acc_ledger_fin.class.php
+++ b/include/class/acc_ledger_fin.class.php
@@ -478,7 +478,7 @@ class Acc_Ledger_Fin extends Acc_Ledger
 		$r.='';
 		$r.='<fieldset><legend>Banque, caisse </legend>';
 		$r.= '<div id="jrn_name_div">';
-		$r.='<h2 id="jrn_name" style="display:inline">' . $this->get_name() . '</h2>';
+		$r.='<h1 id="jrn_name" style="display:inline">' . $this->get_name() . '</h1>';
 		$r.= '</div>';
 		$r.='<TABLE  width="100%">';
 		//  Date
diff --git a/include/compta_fin.inc.php b/include/compta_fin.inc.php
index b15f39d6d..5a60d628a 100644
--- a/include/compta_fin.inc.php
+++ b/include/compta_fin.inc.php
@@ -108,7 +108,7 @@ if ( isset($_POST['confirm']))
 	if ( !isset($correct))
 	{
 		echo '<div id="jrn_name_div">';
-		echo '<h2 id="jrn_name" style="display:inline">' . $Ledger->get_name() . '</h2>';
+		echo '<h1 id="jrn_name" style="display:inline">' . $Ledger->get_name() . '</h1>';
 		echo '</div>';
 
 		echo '<div class="content">';
diff --git a/include/compta_fin_rec.inc.php b/include/compta_fin_rec.inc.php
index d39365872..7ca464ee1 100644
--- a/include/compta_fin_rec.inc.php
+++ b/include/compta_fin_rec.inc.php
@@ -182,7 +182,7 @@ $wLedger = $Ledger->select_ledger('FIN', 3,FALSE);
 if ($wLedger == null)
 	exit('Pas de journal disponible');
 echo '<div id="jrn_name_div">';
-echo '<h2 id="jrn_name" style="display:inline">' . $Ledger->get_name() . '</h2>';
+echo '<h1 id="jrn_name" style="display:inline">' . $Ledger->get_name() . '</h1>';
 echo '</div>';
 $wLedger->javascript = "onchange='this.form.submit()';";
 echo $wLedger->input();
diff --git a/include/compta_ods.inc.php b/include/compta_ods.inc.php
index c6360dade..40496cfae 100644
--- a/include/compta_ods.inc.php
+++ b/include/compta_ods.inc.php
@@ -101,7 +101,7 @@ elseif (isset($_POST['save']))
 		printf('<a class="detail" style="display:inline" href="javascript:modifyOperation(%d,%d)">%s</a><hr>', $jr_id, dossier::id(), $ledger->internal);
 
 		// show feedback
-		echo '<div id="jrn_name_div">'; echo '<h2 id="jrn_name"  style="display:inline">' . $ledger->get_name() . '</h2>'; echo '</div>';
+		echo '<div id="jrn_name_div">'; echo '<h1 id="jrn_name"  style="display:inline">' . $ledger->get_name() . '</h1>'; echo '</div>';
 		echo $ledger->confirm($_POST, true);
                  // extourne
                 if (isset($_POST['reverse_ck']))
diff --git a/include/opening.inc.php b/include/opening.inc.php
index 033288844..9e38be066 100644
--- a/include/opening.inc.php
+++ b/include/opening.inc.php
@@ -90,7 +90,7 @@ if (isset($_POST['save']))
                 $jr_id, dossier::id(), $ledger->internal);
 
         // show feedback
-        echo '<div id="jrn_name_div">'; echo '<h2 id="jrn_name" style="display:inline">'.$ledger->get_name().'</h2>'; echo '</div>';
+        echo '<div id="jrn_name_div">'; echo '<h1 id="jrn_name" style="display:inline">'.$ledger->get_name().'</h1>'; echo '</div>';
         echo $ledger->confirm($_POST, true);
     }
     catch (Exception $e)
diff --git a/include/operation_ods_confirm.inc.php b/include/operation_ods_confirm.inc.php
index 8007ef472..e29348e5a 100644
--- a/include/operation_ods_confirm.inc.php
+++ b/include/operation_ods_confirm.inc.php
@@ -30,7 +30,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 echo '<div class="content">';
 echo h2(_("Confirmation"),'class="info"');
 echo '<div id="jrn_name_div">';
-echo '<h2 id="jrn_name" style="display:inline">' . $ledger->get_name() . '</h2>';
+echo '<h1 id="jrn_name" style="display:inline">' . $ledger->get_name() . '</h1>';
 echo '</div>';
 
 echo '<div id="warning_ven_id" class="notice" style="width: 50%; margin-left: 0px; float: right;">';
diff --git a/include/operation_ods_new.inc.php b/include/operation_ods_new.inc.php
index c1067321c..03e637816 100644
--- a/include/operation_ods_new.inc.php
+++ b/include/operation_ods_new.inc.php
@@ -49,7 +49,7 @@ echo '<div class="content">';
 
 
 echo '<div id="jrn_name_div">';
-echo '<h2 id="jrn_name" style="display:inline">' . $ledger->get_name() . '</h2>';
+echo '<h1 id="jrn_name" style="display:inline">' . $ledger->get_name() . '</h1>';
 echo '</div>';
 
 // Show the predef operation
diff --git a/include/template/form_ledger_detail.php b/include/template/form_ledger_detail.php
index 5801ab278..8af1f569f 100644
--- a/include/template/form_ledger_detail.php
+++ b/include/template/form_ledger_detail.php
@@ -3,7 +3,7 @@
 //see licence.txt
 ?>
 	<div id="jrn_name_div">
-	<h2 id="jrn_name"> <?php echo $this->get_name()?></h2>
+	<h1 id="jrn_name"> <?php echo $this->get_name()?></h1>
 </div>
 <table>
     <tr>
diff --git a/include/template/form_ledger_fin.php b/include/template/form_ledger_fin.php
index ef12d1846..187889cf0 100644
--- a/include/template/form_ledger_fin.php
+++ b/include/template/form_ledger_fin.php
@@ -3,7 +3,7 @@
 //see licence.txt
 ?><fieldset>
 	<div id="jrn_name_div">
-	<h2  id="jrn_name"> <?php echo $this->get_name()?></h2>
+	<h1  id="jrn_name"> <?php echo $this->get_name()?></h1>
 </div>
 <legend><?php echo $f_legend ?> </legend>
 <?php 

From 4f1d78b311c50bc5be7da6a76764935decc66668 Mon Sep 17 00:00:00 2001
From: Dany wm De Bontridder <danydb@noalyss.eu>
Date: Sun, 1 Nov 2020 20:10:49 +0100
Subject: [PATCH 142/257] Contact : navigation bar was not correct

---
 include/class/contact.class.php | 2 +-
 include/contact.inc.php         | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/class/contact.class.php b/include/class/contact.class.php
index 4bd785c17..39bf44953 100644
--- a/include/class/contact.class.php
+++ b/include/class/contact.class.php
@@ -59,7 +59,7 @@ class contact extends Fiche
         $script=$_SERVER['PHP_SELF'];
         // Creation of the nav bar
         // Get the max numberRow
-        $all_contact=$this->count_by_modele($this->fiche_def_ref,$p_search,$extra_sql);
+        $all_contact=$this->count_by_modele($this->fiche_def_ref,$p_search,$extra_sql.$p_sql);
         // Get offset and page variable
         $offset=( isset ($_REQUEST['offset'] )) ?$_REQUEST['offset']:0;
         $page=(isset($_REQUEST['page']))?$_REQUEST['page']:1;
diff --git a/include/contact.inc.php b/include/contact.inc.php
index f22661800..ca3b0bad3 100644
--- a/include/contact.inc.php
+++ b/include/contact.inc.php
@@ -29,8 +29,9 @@ require_once NOALYSS_INCLUDE.'/class/fiche_def.class.php';
 
 $http=new HttpInput();
 
-$low_action = (isset($_REQUEST['sb'])) ? $_REQUEST['sb'] : "list";
-/** \file
+$low_action = $http->request('sb','string','list');
+/**
+ * \file
  * \brief Called from the module "Gestion" to manage the contact
  */
 $href=basename($_SERVER['PHP_SELF']);
@@ -81,7 +82,7 @@ if ($low_action == "list")
 			' where  frd_id=' . FICHE_TYPE_CONTACT .
 			' order by fd_label ', 1);
 		$sel_card->selected = (isset($_GET['cat'])) ? $_GET['cat'] : -1;
-		$sel_card->javascript = ' onchange="submit(this);"';
+		$sel_card->javascript = ' onchange="waiting_box();submit(this);"';
 
 		echo _('Catégorie :') . $sel_card->input();
 

From 09974078e9a16732bfcd856e3b92bfd3fe8eaddc Mon Sep 17 00:00:00 2001
From: Dany wm De Bontridder <danydb@noalyss.eu>
Date: Sun, 1 Nov 2020 20:25:08 +0100
Subject: [PATCH 143/257] cosmetic : waiting box

---
 html/js/scripts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/js/scripts.js b/html/js/scripts.js
index 983efa173..a13ab26ef 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -449,7 +449,7 @@ function success_misc(req)
 }
 function loading()
 {
-    var str = '<h2>' + content[64] + '</h2>';
+    var str = '<p>' + content[64] + '</p>';
     str = str + '<image src="image/loading.gif" alt="chargement"></image>';
     return str;
 }

From 86aedf7452494bc4c666cd102b8eadffd7f4a4dc Mon Sep 17 00:00:00 2001
From: Dany wm De Bontridder <danydb@noalyss.eu>
Date: Sun, 1 Nov 2020 20:25:42 +0100
Subject: [PATCH 144/257] Cosmetic : add waiting box when searching by card
 category for Management customer, supplier,...

---
 include/adm.inc.php      | 2 +-
 include/bank.inc.php     | 2 +-
 include/customer.inc.php | 2 +-
 include/manager.inc.php  | 2 +-
 include/supplier.inc.php | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/adm.inc.php b/include/adm.inc.php
index 5c571f66d..f68519e61 100644
--- a/include/adm.inc.php
+++ b/include/adm.inc.php
@@ -86,7 +86,7 @@ if ( $low_action == "list" )
                                              ' where  frd_id=$1 '.
                                              ' order by fd_label ',1,array(FICHE_TYPE_ADM_TAX));
             $sel_card->selected=$http->get("cat","number",-1);
-            $sel_card->javascript=' onchange="submit(this);"';
+            $sel_card->javascript=' onchange="waiting_box();submit(this);"';
             echo _('Catégorie :').$sel_card->input();
         } else
         {
diff --git a/include/bank.inc.php b/include/bank.inc.php
index 6fd15dd42..d64f2b5f0 100644
--- a/include/bank.inc.php
+++ b/include/bank.inc.php
@@ -82,7 +82,7 @@ if ( $low_action == "list" )
                                          ' where  frd_id=$1'.
                                          ' order by fd_label ',1,array(FICHE_TYPE_FIN));
         $sel_card->selected=$http->get("cat","number",-1);
-        $sel_card->javascript=' onchange="submit(this);"';
+        $sel_card->javascript=' onchange="waiting_box();submit(this);"';
         echo _('Catégorie :').$sel_card->input();
     }
     else
diff --git a/include/customer.inc.php b/include/customer.inc.php
index d42e835bf..48bcfb729 100644
--- a/include/customer.inc.php
+++ b/include/customer.inc.php
@@ -86,7 +86,7 @@ if ($low_action == "list")
                                                  ' where  frd_id='.FICHE_TYPE_CLIENT.
                                                  ' order by fd_label ',1);
                 $sel_card->selected=$http->get("cat","number",-1);
-                $sel_card->javascript=' onchange="submit(this);"';
+                $sel_card->javascript=' onchange="waiting_box();submit(this);"';
                 echo _('Catégorie :').$sel_card->input();
             } else 
             {
diff --git a/include/manager.inc.php b/include/manager.inc.php
index 83c336b18..ba0a22b8a 100644
--- a/include/manager.inc.php
+++ b/include/manager.inc.php
@@ -89,7 +89,7 @@ if ($low_action == "list")
                             ' where  frd_id=' . FICHE_TYPE_EMPL .
                             ' order by fd_label ', 1);
                     $sel_card->selected=$http->get("cat","number",-1);
-                    $sel_card->javascript = ' onchange="submit(this);"';
+                    $sel_card->javascript = ' onchange="waiting_box();submit(this);"';
                     echo _('Catégorie :') . $sel_card->input();
                 }
                 else
diff --git a/include/supplier.inc.php b/include/supplier.inc.php
index 5c2931228..d5aee3c29 100644
--- a/include/supplier.inc.php
+++ b/include/supplier.inc.php
@@ -88,7 +88,7 @@ if ( $low_action == "list" )
                                          ' where  frd_id='.FICHE_TYPE_FOURNISSEUR.
                                          ' order by fd_label ',1);
         $sel_card->selected=$http->get("cat","number",-1);
-        $sel_card->javascript=' onchange="submit(this);"';
+        $sel_card->javascript=' onchange="waiting_box();submit(this);"';
         echo _('Catégorie :').$sel_card->input();
     } else 
     {

From d1d5be2d9eb66f9f066afc2a2138622ce0c1a606 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Mon, 2 Nov 2020 23:58:25 +0100
Subject: [PATCH 145/257] code : fix deprecated unparenthized (a)?b:c?e:x

---
 include/template/balance_aged_result.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/template/balance_aged_result.php b/include/template/balance_aged_result.php
index 04e06a798..d33d1bab4 100644
--- a/include/template/balance_aged_result.php
+++ b/include/template/balance_aged_result.php
@@ -174,19 +174,19 @@ bcscale(2);
             
         </td>
         <td style="text-align: right">
-            <?php echo nbm(abs($sum_fin));echo ($sum_fin < 0)?'C':($sum_fin == 0)?'=':'D'; ?>
+            <?php echo nbm(abs($sum_fin));echo ($sum_fin < 0)?'C':(($sum_fin == 0)?'=':'D'); ?>
         </td>
         <td style="text-align: right">
-            <?php echo nbm($sum_lt_30);echo ($sum_lt_30 < 0)?'C':($sum_lt_30 == 0)?'=':'D';?>
+            <?php echo nbm($sum_lt_30);echo ($sum_lt_30 < 0)?'C':(($sum_lt_30 == 0)?'=':'D');?>
         </td>
         <td style="text-align: right">
-            <?php echo nbm($sum_gt_30_lt_60);echo ($sum_gt_30_lt_60 < 0)?'C':($sum_gt_30_lt_60 == 0)?'=':'D';?>
+            <?php echo nbm($sum_gt_30_lt_60);echo ($sum_gt_30_lt_60 < 0)?'C':(($sum_gt_30_lt_60 == 0)?'=':'D');?>
         </td>
         <td style="text-align: right">
-            <?php echo nbm($sum_gt_60_lt_90);echo ($sum_gt_60_lt_90 < 0)?'C':($sum_gt_60_lt_90 == 0)?'=':'D';?>
+            <?php echo nbm($sum_gt_60_lt_90);echo ($sum_gt_60_lt_90 < 0)?'C':(($sum_gt_60_lt_90 == 0)?'=':'D');?>
         </td>
         <td style="text-align: right">
-            <?php echo nbm($sum_gt_90);echo ($sum_gt_90 < 0)?'C':($sum_gt_90 == 0)?'=':'D';?>
+            <?php echo nbm($sum_gt_90);echo ($sum_gt_90 < 0)?'C':(($sum_gt_90 == 0)?'=':'D');?>
         </td>
     </tr>
 </table>    

From 5b75b8127a1e70e876c9ea4db752667922e3f37c Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 4 Nov 2020 17:06:53 +0100
Subject: [PATCH 146/257] =?UTF-8?q?Task=20#0001861:=20Plage=20de=20cases?=
 =?UTF-8?q?=20=C3=A0=20cocher?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/js/card.js                           |  3 +
 html/js/noalyss_checkbox.js               | 84 +++++++++++++++++++++++
 html/js/scripts.js                        |  2 +-
 include/ajax/ajax_add_concerned_card.php  |  3 +-
 include/class/acc_ledger_search.class.php |  1 +
 include/class/anc_grandlivre.class.php    |  2 +
 include/class/follow_up.class.php         |  4 +-
 include/compta_fin_rec.inc.php            | 45 +++++++++++-
 include/history_operation.inc.php         |  6 +-
 include/lib/function_javascript.php       |  1 +
 include/lib/icheckbox.class.php           | 29 +++++++-
 include/template/fiche_list.php           |  9 ++-
 scenario/HtmlInput.test.php               | 41 ++++++++++-
 13 files changed, 218 insertions(+), 12 deletions(-)
 create mode 100644 html/js/noalyss_checkbox.js

diff --git a/html/js/card.js b/html/js/card.js
index 3e9c112fd..aba30582f 100644
--- a/html/js/card.js
+++ b/html/js/card.js
@@ -161,6 +161,8 @@ function action_concerned_save_card(obj)
                 code_html = unescape_xml(code_html);
                 $(namectl).update(code_html);
                 removeDiv('search_card');
+                
+
             }
         });
     } catch (e)
@@ -277,6 +279,7 @@ function action_concerned_search_card(obj)
                         if ( ! $('search_card')) { add_div({id: 'search_card', cssclass: 'inner_box', html: "", style: div_style, drag: true}); }
                         $('search_card').innerHTML = code_html;
                         $('query').focus();
+                        activate_checkbox_range('select_card_ck');
                         }catch (e) {
                             alert_box(e.message);
                         }
diff --git a/html/js/noalyss_checkbox.js b/html/js/noalyss_checkbox.js
new file mode 100644
index 000000000..04c44b26e
--- /dev/null
+++ b/html/js/noalyss_checkbox.js
@@ -0,0 +1,84 @@
+/* 
+ * Copyright (C) 2020 Dany De Bontridder <dany@alchimerys.be>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+/**
+ * 
+ * @param {event} evt event 
+ * @param {object} elt checkbox elt
+ * @param {string} p_name name of the checkbox object
+ 
+ * @returns {undefined}
+ */
+
+var lastcheck = null;
+var endcheck = null;
+
+/**
+ * Check or uncheck checkbox if shift key is pressed and between the last checked elemet and the current one
+ * @param {type} evt event
+ * @param {type} elt Dom element 
+ * @param {type} p_name name of range
+ */
+function checkbox_set_range(evt, elt, p_name) {
+    if (!evt.shiftKey) {
+        lastcheck = elt;
+        return;
+    }
+    var aName = document.getElementsByClassName(p_name);
+
+    var from = 0;
+    var end = 0;
+    for (var i = 0; i < aName.length; i++) {
+        if (aName[i] == elt) {
+            endcheck = aName[i];
+            from = i;
+        }
+        if (aName[i] == lastcheck) {
+            end = i;
+        }
+    }
+    if (from > end) {
+        let a = from;
+        from = end;
+        end = a;
+    }
+    var check = (aName[from].checked) ? true : false;
+    for (x = from; x <= end; x++) {
+        aName[x].checked = check;
+    }
+}
+
+
+/**
+ * For each checkbox , add an event on click
+ * @param {string} p_range_name name of the checkbox object
+ * @returns {undefined}
+ */
+function activate_checkbox_range(p_range_name) {
+    let node_lstCheckBox = document.getElementsByClassName(p_range_name);
+    var aCheckBox=Array.from(node_lstCheckBox)
+    if (aCheckBox == undefined) {
+        console.error("activate_checkbox_range_failed")
+    }
+
+    aCheckBox.forEach(elt => elt.addEventListener ('click',function (event) {
+            checkbox_set_range(event, elt, p_range_name);
+        },false));
+}
+;
+
+
diff --git a/html/js/scripts.js b/html/js/scripts.js
index a13ab26ef..25307b890 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -3803,4 +3803,4 @@ function json_concat(p_json1,p_json2)
         }
         return result;
 
-}
\ No newline at end of file
+}
diff --git a/include/ajax/ajax_add_concerned_card.php b/include/ajax/ajax_add_concerned_card.php
index 9187a7045..bda4c60a3 100644
--- a/include/ajax/ajax_add_concerned_card.php
+++ b/include/ajax/ajax_add_concerned_card.php
@@ -120,6 +120,7 @@ for ($i=0; $i<count($a); $i++)
 {
     $ic=new ICheckBox("selected_card[]");
     $ic->value=$a[$i]['f_id'];
+    $ic->set_range("select_card_ck");
     $array[$i]['checkbox']=$ic->input();
     $array[$i]['quick_code']=$a[$i]['quick_code'];
     $array[$i]['name']=h($a[$i]['vw_name']);
@@ -141,8 +142,6 @@ echo HtmlInput::button_close("search_card");
 echo '</li>';
 echo '</ul>';
 echo '</form>';
-
-
 $response=ob_get_contents();
 ob_end_clean();
 
diff --git a/include/class/acc_ledger_search.class.php b/include/class/acc_ledger_search.class.php
index ae2a6e874..801e98b34 100644
--- a/include/class/acc_ledger_search.class.php
+++ b/include/class/acc_ledger_search.class.php
@@ -897,6 +897,7 @@ class Acc_Ledger_Search
             if ($p_paid!=0)
             {
                 $w=new ICheckBox();
+                $w->set_range("paid_operation_ck");
                 $w->name="rd_paid".$row['jr_id'];
                 $w->selected=($row['jr_rapt']=='paid')?true:false;
                 // if p_paid == 2 then readonly
diff --git a/include/class/anc_grandlivre.class.php b/include/class/anc_grandlivre.class.php
index 2965087c3..d8d7991fd 100644
--- a/include/class/anc_grandlivre.class.php
+++ b/include/class/anc_grandlivre.class.php
@@ -272,6 +272,7 @@ class Anc_GrandLivre extends Anc_Print
                 if ($str_document != "")
                 {
                     $ck = new ICheckBox('ck[]', $row['jr_id']);
+                    $ck->set_range("document_export_ck");
                     $str_ck = $ck->input();
                 }
             }
@@ -298,6 +299,7 @@ class Anc_GrandLivre extends Anc_Print
         $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.= '</table>';
+        $r.=ICheckBox::javascript_set_range("document_export_ck");
         return $r;
     }
       /*!
diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 4cbd1336c..0ad9fdc43 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -692,6 +692,7 @@ class Follow_Up
         $today=date('d.m.Y');
         $i=0;
         $checkbox=new ICheckBox("mag_id[]");
+        $checkbox->set_range("action_followup_ck");
         //show the sub_action
         foreach ($a_row as $row)
         {
@@ -762,6 +763,7 @@ class Follow_Up
         $r.="</table>";
 
         $r.='<p>'.$bar.'</p>';
+        $r.=ICheckBox::javascript_set_range("action_followup_ck");
         return $r;
     }
 
@@ -1928,7 +1930,7 @@ class Follow_Up
                 {
                     $showAction='<a class="line" href="'.$base."&ag_id=".$action[$o]['aga_greatest'].'">';
                     echo '<li  '.$class.' >'.$margin.$showAction.$action[$o]['str_date']." ".
-                    h($action[$o]['sub_title']).'('.h($action[$o]['action_ref']).')'.$direct_parent.'</a>'." "
+                    h($action[$o]['title']).'('.h($action[$o]['action_ref']).')'.$direct_parent.'</a>'." "
                     .'</li>';
                 }
             }
diff --git a/include/compta_fin_rec.inc.php b/include/compta_fin_rec.inc.php
index 7ca464ee1..8b53fa8bd 100644
--- a/include/compta_fin_rec.inc.php
+++ b/include/compta_fin_rec.inc.php
@@ -32,7 +32,43 @@ require_once NOALYSS_INCLUDE.'/class/acc_ledger_fin.class.php';
 bcscale(2);
 ?>
 <script>
+        function checkbox_set_range(evt, elt, p_name) {
+        if (!evt.shiftKey) {
+            lastcheck = elt;
+            return;
+        }
+        var aName = document.getElementsByClassName(p_name);
+
+        var from = 0;
+        var end = 0;
+        for (var i = 0; i < aName.length; i++) {
+            if (aName[i] == elt) {
+                endcheck = aName[i];
+                from = i;
+            }
+            if (aName[i] == lastcheck) {
+                end = i;
+            }
+        }
+        if (from > end) {
+            let a = from;
+            from = end;
+            end = a;
+        }
+        var check = (aName[from].checked) ? true : false;
+        for (x = from; x <= end; x++) {
+            aName[x].checked = check;
+            if( x < end && x > from ) {
+                update_selected(aName[x],aName[x].getAttribute('amount_operation'));
+                update_remain(aName[x],aName[x].getAttribute('amount_operation'));
+            }
+        }
+    }
+
+
     function update_selected(p_node,p_amount) {
+        p_amount=parseFloat(p_amount);
+        console.log("update_selected"+p_amount);
         try {
             if (p_node.checked ) 
             {
@@ -48,6 +84,7 @@ bcscale(2);
         }
     }
     function update_remain(p_node,p_amount) {
+         p_amount=parseFloat(p_amount);
     try {
             if ( parseFloat($('delta_amount').innerHTML) == 0) return;
             if (p_node.checked ) 
@@ -239,7 +276,7 @@ $r.=th('N° interne');
 $r.=th('Montant', ' style="text-align:right"');
 $r.=th('Selection', ' style="text-align:center" ');
 echo tr($r);
-$iradio = new ICheckBox('op[]');
+
 $tot_not_reconcilied = 0;
 $diff = 0;
 $delta=bcsub($end_extrait,$start_extrait);
@@ -247,6 +284,8 @@ $selected_amount=0;
 $remain_amount=$delta;
 for ($i = 0; $i < count($operation); $i++)
 {
+        $iradio = new ICheckBox('op[]');
+        $iradio->set_range("operation_ck");
 	$row = $operation[$i];
 	$r = '';
 	$js = HtmlInput::detail_op($row['jr_id'], $row['jr_internal']);
@@ -254,12 +293,13 @@ for ($i = 0; $i < count($operation); $i++)
 	$r.=td($row['jr_comment']);
 	$r.=td($js);
 	$amount=$cn->get_value('select qf_amount from quant_fin where jr_id=$1', array($row['jr_id']));
-	$r.='<td class="num" class="sorttable_numeric" sorttable_customkey="'.$amount.'" style="text-align:right">'.nbm ($amount).'</td>';
+	$r.='<td class="num" class="sorttable_numeric"  sorttable_customkey="'.$amount.'" style="text-align:right">'.nbm ($amount).'</td>';
 
 	$diff=bcadd($diff,$amount);
 	$tot_not_reconcilied+=$row['jr_montant'];
 	$iradio->value = $row['jr_id'];
 	$iradio->selected=false;
+        $iradio->set_attribute("amount_operation", $amount);
         $iradio->javascript=sprintf(' onchange = "update_selected(this,%s);update_remain(this,%s)"',$amount,$amount);
 	if (isset($_POST['op']))
 	{
@@ -281,6 +321,7 @@ for ($i = 0; $i < count($operation); $i++)
 		echo tr($r,' class="even" ');
 }
 echo '</table>';
+if ( $i>0) { echo $iradio->javascript_set_range("operation_ck"); }
 $bk_card = new Fiche($cn);
 $bk_card->id = $Ledger->get_bank();
 $filter_year = "  j_tech_per in (select p_id from parm_periode where  p_exercice='" . $g_user->get_exercice() . "')";
diff --git a/include/history_operation.inc.php b/include/history_operation.inc.php
index da5aefcfb..5e7aac3e0 100644
--- a/include/history_operation.inc.php
+++ b/include/history_operation.inc.php
@@ -127,6 +127,8 @@ echo HtmlInput::hidden('ledger_type',$ledger_type);
 echo dossier::hidden();
 
 list($count, $html) = $Ledger->list_operation($sql, $offset, $ask_pay);
+
+
 echo $html;
 echo $bar;
 $r = HtmlInput::get_to_hidden(array('search_opnb_jrn',
@@ -162,8 +164,10 @@ if (isset($_GET['search_opr_jrn']))
 }
 echo $r;
 
-if ($ask_pay)
+if ($ask_pay) {
 	echo '<p>' . HtmlInput::submit('paid', _('Mise à jour paiement')) . IButton::select_checkbox('fpaida') . IButton::unselect_checkbox('fpaida') . '</p>';
+        echo ICheckBox::javascript_set_range("paid_operation_ck");
+}
 
 echo '</form>';
 /*
diff --git a/include/lib/function_javascript.php b/include/lib/function_javascript.php
index b34b68cb0..846adcdee 100644
--- a/include/lib/function_javascript.php
+++ b/include/lib/function_javascript.php
@@ -2783,6 +2783,7 @@ function load_all_script()
     echo js_include('nicEdit.js');
     echo js_include('managetable.js');
     echo js_include('taggroup.js');
+    echo js_include('noalyss_checkbox.js');
 
 
 }
diff --git a/include/lib/icheckbox.class.php b/include/lib/icheckbox.class.php
index 13177dc10..b934bed93 100644
--- a/include/lib/icheckbox.class.php
+++ b/include/lib/icheckbox.class.php
@@ -25,6 +25,20 @@
 require_once NOALYSS_INCLUDE.'/lib/html_input.class.php';
 class ICheckBox extends HtmlInput
 {
+    var $range;
+    
+    function __construct($p_name="", $p_value="", $p_id="")
+    {
+        parent::__construct($p_name, $p_value, $p_id);
+        $this->range="";
+    }
+    
+    function get_range($p_name) {
+        return $this->range;
+    }
+    function set_range($p_name) {
+        $this->range=' class="'.$p_name.'" ';
+    }
     /*!\brief show the html  input of the widget*/
     public function input($p_name=null,$p_value=null,$id="")
     {
@@ -36,6 +50,7 @@ class ICheckBox extends HtmlInput
         $check=( $this->selected==true )?"checked":"unchecked";
         $r='<input type="CHECKBOX" id="'.$this->id.'" name="'.$this->name.'"'.' value="'.$this->value.'"';
         $r.="  $check";
+        $r.= $this->range;
         $r.=$this->get_node_attribute();
         $r.=' '.$this->disabled."  ".$this->javascript.'>';
 
@@ -69,7 +84,15 @@ class ICheckBox extends HtmlInput
             $a->javascript='onclick="toggle_checkbox(\''.$p_form.'\')"';
             return $a->input();
         }
-    static public function test_me()
-    {
+    /**
+     * Before calling this function , you must set a range with the function set_range. It will add the event on
+     * click (checkbox_set_range) 
+     *
+     * @param string $p_name
+     * @returns javascript to execute string
+     */    
+    static function javascript_set_range($p_name) {
+     $js=sprintf("(function () {activate_checkbox_range('%s');})();",$p_name);
+     return create_script($js);
     }
-}
+}
\ No newline at end of file
diff --git a/include/template/fiche_list.php b/include/template/fiche_list.php
index 9282b2277..e82563623 100644
--- a/include/template/fiche_list.php
+++ b/include/template/fiche_list.php
@@ -73,7 +73,10 @@
 					if ($write == 1)
 					{
 						$ck = new ICheckBox('f_id[]', $row['f_id']);
-						echo $ck->input();
+						if ( $allcard != 1 ) {
+                                                    $ck->set_range("range".$p_cat);
+                                                }
+                                                    echo $ck->input();
 					}
 					?>
 				</td>
@@ -83,6 +86,10 @@
 
 	</table>
 	<?php echo $str_add_card?>
+<?php
+if ( $allcard != 1 ) { echo ICheckBox::javascript_set_range("range".$p_cat); }
+
+?>
 <?php echo HtmlInput::hidden('action',"1");?>
 <?php echo HtmlInput::hidden('delete',"0");?>
 <?php echo HtmlInput::hidden('move',"0");?>
diff --git a/scenario/HtmlInput.test.php b/scenario/HtmlInput.test.php
index 363a8fdc3..794771e23 100644
--- a/scenario/HtmlInput.test.php
+++ b/scenario/HtmlInput.test.php
@@ -47,9 +47,11 @@ require_once NOALYSS_INCLUDE.'/lib/itext.class.php';
 require_once NOALYSS_INCLUDE.'/lib/itextarea.class.php';
 require_once NOALYSS_INCLUDE.'/lib/itva_popup.class.php';
 require_once NOALYSS_INCLUDE.'/lib/input_switch.class.php';
+require_once NOALYSS_INCLUDE.'/lib/input_checkbox.class.php';
 
 $http=new HttpInput();
 ?>
+<script src="js/noalyss_checkbox.js"></script>
 <pre>
     <?php var_dump($_GET);?>
 </pre>
@@ -67,6 +69,7 @@ $http=new HttpInput();
     <?php
     
     $input_switch=new InputSwitch('input_switch_value',$http->get("input_switch_value","string","0"));
+    
     echo $input_switch->input();
     ?>
     <h2>ReadOnly</h2>
@@ -81,6 +84,20 @@ $http=new HttpInput();
     $input_switch->readOnly=TRUE;
     echo $input_switch->input();
     ?>
+    <h2>InputCheckBox (Check Box)</h2>
+    <ul>
+        
+            
+    <?php
+    for ($i = 0 ; $i < 10 ; $i ++) :
+        echo '<li>';
+            $check[$i]=new InputCheckBox("check[]",1,"checkid".$i);
+            echo $i, " - name = ",$check[$i]->value_container,",id = " , $check[$i]->id_icon,$check[$i]->input();
+        echo '</li>';
+    endfor;
+    ?>
+    </ul>
+    
     <h1>Submit</h1>
     <pre>
         echo HtmlInput::submit("submit", _("Envoi"));
@@ -88,4 +105,26 @@ $http=new HttpInput();
     <p>
     <?php echo HtmlInput::submit("submit", _("Envoi"));?>
     </p>
-</form>
\ No newline at end of file
+    <h2>ICheckBox</h2>
+    <p>
+        For using range all the checkbox must have the same name , like checkbox[]
+    </p>
+    <ol>
+       <?php
+       
+       for ($i=0;$i<10;$i++) {
+        $icheckbox=new ICheckBox('icheckbox[]',0);
+        $icheckbox->id=uniqid();
+        $icheckbox->set_range("icheckbox11");
+        echo '<li>';
+        printf ("%s ".$icheckbox->input(),$i);
+        echo '</li>';
+        
+       }
+       echo ICheckBox::javascript_set_range("icheckbox11");
+    ?>
+    </ol>
+</form>
+<div id="debug_box"></div>
+
+    
\ No newline at end of file

From bc15e323880f180b4662e9115426f2f243bf60fe Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 4 Nov 2020 17:27:40 +0100
Subject: [PATCH 147/257] followyup list reorder

---
 include/class/follow_up.class.php | 62 ++++++++++++++++---------------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 0ad9fdc43..34a8ff0fd 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -618,7 +618,7 @@ class Follow_Up
 
         $table=new Sort_Table();
         $table->add(_('Date Doc.'), $url, 'order by ag_timestamp asc', 'order by ag_timestamp desc', 'da', 'dd');
-        $table->add(_('Date Comm.'), $url, 'order by last_comment', 'order by last_comment desc', 'dca', 'dcd');
+        //$table->add(_('Date Comm.'), $url, 'order by last_comment', 'order by last_comment desc', 'dca', 'dcd');
         $table->add(_('Date Limite'), $url, 'order by ag_remind_date asc', 'order by ag_remind_date  desc', 'ra', 'rd');
         $table->add(_('Etiquette'), $url, 'order by tags asc', 'order by tags desc', 'taa', 'tad');
         $table->add(_('Réf.'), $url, 'order by ag_ref asc', 'order by ag_ref desc', 'ra', 'rd');
@@ -668,16 +668,16 @@ class Follow_Up
         $r.='<table class="document">';
         $r.="<tr>";
         $r.='<th name="ag_id_td" style="display:none" >'.ICheckBox::toggle_checkbox('ag', 'list_ag_frm').'</th>';
-        $r.='<th>'.$table->get_header(0).'</th>';
-        $r.='<th>'.$table->get_header(1).'</th>';
-        $r.='<th>'.$table->get_header(2).'</th>';
+        $r.='<th style="width:5.57%">'.$table->get_header(0).'</th>';
+//        $r.='<th>'.$table->get_header(1).'</th>';
+        $r.='<th style="width:5.57%">'.$table->get_header(1).'</th>';
+        $r.=th('Priorité','style="width:5.57%"');
+        $r.='<th style="width:5.57%">'.$table->get_header(7).'</th>';
+        $r.='<th style="width:35%">'.$table->get_header(6).'</th>';
+        $r.='<th style="width:5.57%">'.$table->get_header(2).'</th>';
         $r.='<th style="width:5.57%">'.$table->get_header(3).'</th>';
-        $r.='<th>'.$table->get_header(4).'</th>';
-        $r.='<th>'.$table->get_header(5).'</th>';
-        $r.='<th>'.$table->get_header(6).'</th>';
-        $r.='<th>'.$table->get_header(7).'</th>';
-        $r.=th('Priorité');
-        $r.='<th>'.$table->get_header(8).'</th>';
+        $r.='<th style="width:5.57%">'.$table->get_header(4).'</th>';
+        $r.='<th style="width:5.57%">'.$table->get_header(5).'</th>';
         $r.="</tr>";
 
 
@@ -714,8 +714,28 @@ class Follow_Up
             $checkbox->value=$row['ag_id'];
             $r.='<td name="ag_id_td" style="display:none">'.$checkbox->input().'</td>';
             $r.="<td>".$href.smaller_date($row['my_date']).'</a>'."</td>";
-            $r.="<td>".$href.$row['str_last_comment'].'</a>'."</td>";
+            //$r.="<td>".$href.$row['str_last_comment'].'</a>'."</td>";
             $r.="<td>".$href.smaller_date($row['my_remind']).'</a>'."</td>";
+                        /*
+             * State
+             */
+            switch ($row['ag_priority'])
+            {
+                case 1:
+                    $priority=_('Haute');
+                    break;
+                case 2:
+                    $priority=_("Moyenne");
+                    break;
+                case 3:
+                    $priority=_("Important");
+                    break;
+            }
+            $r.=td($priority);
+
+            $r.="<td>".$row['s_value']."</td>";
+             $r.='<td>'.$href.
+                    h($row['ag_title'])."</A></td>";
             $r.="<td>".$href.h($row['tags']).'</a>'."</td>";
             $r.="<td>".$href.$row['ag_ref'].'</a>'."</td>";
             $r.="<td>".$href.h($row['dest']).'</a>'."</td>";
@@ -736,27 +756,9 @@ class Follow_Up
 
 
 
-            $r.='<td>'.$href.
-                    h($row['ag_title'])."</A></td>";
+           
 
-            /*
-             * State
-             */
-            switch ($row['ag_priority'])
-            {
-                case 1:
-                    $priority=_('Haute');
-                    break;
-                case 2:
-                    $priority=_("Moyenne");
-                    break;
-                case 3:
-                    $priority=_("Important");
-                    break;
-            }
-            $r.=td($priority);
 
-            $r.="<td>".$row['s_value']."</td>";
             $r.="</tr>";
         }
 

From a8c5b98780968336311352da2819b22b3faa1d8a Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 4 Nov 2020 18:19:41 +0100
Subject: [PATCH 148/257] remove warning

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

diff --git a/include/template/detail-action.php b/include/template/detail-action.php
index 102202ed8..1e13df757 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -313,7 +313,7 @@ function small(p_id_textarea){
             echo $editable_comment->input();
         } else {
             echo '<span class="noprint">';
-            if (  $p_view == 'UPD' && Document_Option::can_add_comment($ag_id) && $add_comment)  {
+            if (  $p_view == 'UPD' && Document_Option::can_add_comment($ag_id) )  {
             echo '<p></p>';
             echo $desc->input();
      

From 2a81143afc23a79e3f5c4cab077af750ab3fb9f9 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 5 Nov 2020 23:43:53 +0100
Subject: [PATCH 149/257] Traduction

---
 html/lang/en_US/LC_MESSAGES/messages.po | 2458 ++++++++++--
 html/lang/messages.po                   | 4879 ++++++++++++++---------
 html/lang/nl_NL/LC_MESSAGES/messages.po | 2521 ++++++++++--
 3 files changed, 7245 insertions(+), 2613 deletions(-)

diff --git a/html/lang/en_US/LC_MESSAGES/messages.po b/html/lang/en_US/LC_MESSAGES/messages.po
index 8cc29d166..4cccc9079 100644
--- a/html/lang/en_US/LC_MESSAGES/messages.po
+++ b/html/lang/en_US/LC_MESSAGES/messages.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the NOALYSS package.
 # Dany De Bontridder <dany@alchimerys.be>
 #
-#: include/database.item.php:126
+#: include/database.item.php:125
 # dany, 2014.
-# Dany De Bontridder <danydb@noalyss.eu>, 2014, 2015, 2016, 2017, 2018, 2019.
+# Dany De Bontridder <danydb@noalyss.eu>, 2014, 2015, 2016, 2017, 2018, 2019, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: NOALYSS 672\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-26 13:23+0200\n"
-"PO-Revision-Date: 2019-08-26 13:28+0100\n"
+"POT-Creation-Date: 2020-11-04 17:42+0100\n"
+"PO-Revision-Date: 2020-11-04 18:01+0100\n"
 "Last-Translator: dany <danydb@noalyss.eu>\n"
 "Language-Team: French <kde-i18n-doc@kde.org>\n"
 "Language: en_US\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.12.3\n"
 
 #: include/database.item.php:124
 msgid "  "
@@ -78,7 +78,7 @@ msgstr "Grid 01: Operations for which the VAT is due (6%)"
 #: html/ajax_card.php:475 include/ajax/ajax_card.php:455
 #: include/ajax/ajax_card.php:456 include/ajax/ajax_card.php:457
 #: include/ajax/ajax_card.php:490 include/ajax/ajax_card.php:494
-#: include/ajax/ajax_card.php:495
+#: include/ajax/ajax_card.php:495 include/ajax/ajax_card.php:571
 msgid " Banque"
 msgstr "Bank"
 
@@ -92,6 +92,7 @@ msgstr "Database"
 #: include/template/ledger_detail_bottom.php:142
 #: include/template/ledger_detail_bottom.php:143
 #: include/template/ledger_detail_bottom.php:148
+#: include/template/ledger_detail_bottom.php:153
 msgid " Bon de commande"
 msgstr "Customer order"
 
@@ -105,6 +106,7 @@ msgstr "C"
 #: include/fiche.inc.php:176 include/fiche.inc.php:180
 #: include/fiche.inc.php:182 include/fiche.inc.php:183
 #: include/fiche.inc.php:184 include/fiche.inc.php:185
+#: include/fiche.inc.php:186
 msgid " Ces fiches n'ont pas été effacées  "
 msgstr "These files were not deleted"
 
@@ -114,7 +116,7 @@ msgstr "These files were not deleted"
 #: include/lib/ac_common.php:434 include/lib/ac_common.php:435
 #: include/lib/ac_common.php:436 include/lib/ac_common.php:437
 #: include/lib/ac_common.php:438 include/lib/ac_common.php:440
-#: include/lib/ac_common.php:456
+#: include/lib/ac_common.php:456 include/lib/ac_common.php:466
 msgid " Cette action ne vous est pas autorisée Contactez votre responsable"
 msgstr "This work is not authorized Contact your administrator"
 
@@ -137,6 +139,7 @@ msgstr "D"
 #: include/ajax_mod_periode.php:55 include/ajax/ajax_mod_periode.php:55
 #: include/ajax/ajax_periode.php:171 include/class/periode.class.php:702
 #: include/class/periode.class.php:704 include/class/periode.class.php:706
+#: include/class/periode.class.php:707
 msgid " Début période : "
 msgstr "Start periode"
 
@@ -147,7 +150,7 @@ msgstr "Sorry but this period is used"
 #: html/ajax_card.php:478 html/ajax_card.php:479 include/ajax/ajax_card.php:459
 #: include/ajax/ajax_card.php:460 include/ajax/ajax_card.php:461
 #: include/ajax/ajax_card.php:494 include/ajax/ajax_card.php:498
-#: include/ajax/ajax_card.php:499
+#: include/ajax/ajax_card.php:499 include/ajax/ajax_card.php:575
 msgid " Employé ou administrateur"
 msgstr "Manager or Employee"
 
@@ -162,24 +165,26 @@ msgstr "Error in formula"
 #: include/ajax_mod_periode.php:57 include/ajax/ajax_mod_periode.php:57
 #: include/ajax/ajax_periode.php:173 include/class/periode.class.php:704
 #: include/class/periode.class.php:706 include/class/periode.class.php:708
+#: include/class/periode.class.php:709
 msgid " Exercice : "
 msgstr "Exercise"
 
 #: include/ajax_mod_periode.php:56 include/ajax/ajax_mod_periode.php:56
 #: include/ajax/ajax_periode.php:172 include/class/periode.class.php:703
 #: include/class/periode.class.php:705 include/class/periode.class.php:707
+#: include/class/periode.class.php:708
 msgid " Fin période : "
 msgstr "End Periode :"
 
 #: include/user_menu.php:147 include/user_menu.php:151
 #: include/lib/user_menu.php:160 include/lib/user_menu.php:173
-#: include/lib/user_menu.php:131
+#: include/lib/user_menu.php:131 include/lib/user_menu.php:130
 msgid " Hors Bilan"
 msgstr "Out Balance Sheet"
 
 #: include/user_menu.php:148 include/user_menu.php:152
 #: include/lib/user_menu.php:161 include/lib/user_menu.php:174
-#: include/lib/user_menu.php:132
+#: include/lib/user_menu.php:132 include/lib/user_menu.php:131
 msgid " Immobilisé"
 msgstr "Fixed Asset"
 
@@ -197,6 +202,7 @@ msgstr "Unable to save"
 #: include/class/acc_ledger_purchase.class.php:194
 #: include/class/acc_ledger_sold.class.php:190
 #: include/class/acc_ledger_purchase.class.php:193
+#: include/class/acc_ledger_purchase.class.php:195
 msgid " La TVA "
 msgstr "The VAT"
 
@@ -207,6 +213,7 @@ msgstr "Your version is %s"
 
 #: include/class/acc_ledger.class.php:1136
 #: include/class/acc_ledger.class.php:1152
+#: include/class/acc_ledger.class.php:1148
 #, php-format
 msgid " Le poste %s appartient à  fiche(s) dont : %s"
 msgstr "Accounting %s belong to the cards : %s"
@@ -256,6 +263,7 @@ msgstr "VAT"
 #: include/class/acc_ledger.class.php:115
 #: include/class/acc_ledger.class.php:116
 #: include/class/acc_ledger.class.php:134
+#: include/class/acc_ledger.class.php:133
 msgid " Tous les journaux"
 msgstr "All the  ledgers"
 
@@ -295,6 +303,18 @@ msgstr ""
 "thanks a package , compile one, read carefully instructions to migrate your "
 "databases"
 
+#: html/install.php:462
+msgid ""
+" Vous devez absolument utiliser au minimum une version 9.5 de PostGresql, si "
+"votre distribution n'en\n"
+"offre pas, installez-en une en la compilant. Lisez attentivement la notice "
+"sur postgresql.org pour migrer\n"
+"vos bases de données"
+msgstr ""
+"The version of Postgresql must be higher than 9.0, if you can't install it "
+"thanks a package , compile one, read carefully instructions to migrate your "
+"databases"
+
 #: include/history_operation.inc.php:97 include/history_operation.inc.php:101
 #: include/history_operation.inc.php:93 include/history_operation.inc.php:94
 #: include/history_operation.inc.php:98
@@ -306,6 +326,7 @@ msgstr "to"
 #: include/ajax/ajax_card.php:447 include/ajax/ajax_card.php:448
 #: include/ajax/ajax_card.php:449 include/ajax/ajax_card.php:482
 #: include/ajax/ajax_card.php:486 include/ajax/ajax_card.php:487
+#: include/ajax/ajax_card.php:563
 msgid " d'administration"
 msgstr "of administration"
 
@@ -314,6 +335,7 @@ msgstr "of administration"
 #: include/ajax/ajax_card.php:439 include/ajax/ajax_card.php:440
 #: include/ajax/ajax_card.php:441 include/ajax/ajax_card.php:474
 #: include/ajax/ajax_card.php:478 include/ajax/ajax_card.php:479
+#: include/ajax/ajax_card.php:555
 msgid " de clients"
 msgstr "of customers"
 
@@ -321,7 +343,7 @@ msgstr "of customers"
 #: html/ajax_card.php:470 html/ajax_card.php:471 include/ajax/ajax_card.php:451
 #: include/ajax/ajax_card.php:452 include/ajax/ajax_card.php:453
 #: include/ajax/ajax_card.php:486 include/ajax/ajax_card.php:490
-#: include/ajax/ajax_card.php:491
+#: include/ajax/ajax_card.php:491 include/ajax/ajax_card.php:567
 msgid " de contacts"
 msgstr "of contacts"
 
@@ -330,6 +352,7 @@ msgstr "of contacts"
 #: include/ajax/ajax_card.php:443 include/ajax/ajax_card.php:444
 #: include/ajax/ajax_card.php:445 include/ajax/ajax_card.php:478
 #: include/ajax/ajax_card.php:482 include/ajax/ajax_card.php:483
+#: include/ajax/ajax_card.php:559
 msgid " de fournisseurs"
 msgstr "of suppliers"
 
@@ -353,7 +376,7 @@ msgstr "must be migrated in unicode"
 #: include/action.common.inc.php:218 include/action.common.inc.php:238
 #: include/action.common.inc.php:239 include/action.common.inc.php:244
 #: include/action.common.inc.php:246 include/action.common.inc.php:247
-#: include/action.common.inc.php:253
+#: include/action.common.inc.php:253 include/action.common.inc.php:278
 msgid " effacée"
 msgstr "removed"
 
@@ -361,6 +384,7 @@ msgstr "removed"
 #: include/ajax/ajax_search_operation.php:119
 #: include/ajax/ajax_search_operation.php:122
 #: include/ajax/ajax_search_operation.php:124
+#: include/ajax/ajax_search_operation.php:129
 msgid " enregistrements. Le nombre d'enregistrements trouvés est de "
 msgstr "records. The number of found records is "
 
@@ -403,6 +427,7 @@ msgstr "Until"
 #: include/class/class_acc_ledger_purchase.php:220
 #: include/class/acc_ledger_purchase.class.php:220
 #: include/class/acc_ledger_purchase.class.php:219
+#: include/class/acc_ledger_purchase.class.php:221
 msgid " le poste comptable"
 msgstr "the accounting item"
 
@@ -418,6 +443,7 @@ msgstr "the accounting item"
 #: include/class/acc_ledger_purchase.class.php:149
 #: include/class/acc_ledger_sold.class.php:145
 #: include/class/acc_ledger_sold.class.php:204
+#: include/class/acc_ledger_purchase.class.php:151
 msgid " le poste comptable ["
 msgstr "The accounting item ["
 
@@ -458,6 +484,7 @@ msgstr "And using the accounting item"
 #: include/class_acc_ledger_purchase.php:120
 #: include/class/class_acc_ledger_purchase.php:120
 #: include/class/acc_ledger_purchase.class.php:120
+#: include/class/acc_ledger_purchase.class.php:122
 msgid " vous ne pouvez pas encoder à une  date antérieure dans ce journal"
 msgstr "You cannot add an entry before the last operation of this ledger"
 
@@ -500,6 +527,7 @@ msgstr "You have added% s% d months since% d /% d% d for the year"
 #: include/lib/class_sendmail.php:96 include/lib/class_sendmail.php:97
 #: include/lib/class_sendmail.php:98 include/lib/sendmail.class.php:98
 #: include/lib/sendmail.class.php:102 include/lib/sendmail_core.class.php:105
+#: include/lib/sendmail_core.class.php:106
 #, php-format
 msgid "%s est vide"
 msgstr "%s is empty"
@@ -738,6 +766,10 @@ msgstr "From"
 msgid "A partir du mois de"
 msgstr "From"
 
+#: include/class/acc_ledger_search.class.php:603
+msgid "ALS01 Etat inconnu"
+msgstr "ALS01 unknown status"
+
 #: include/lib/message_javascript.php:41
 msgid ""
 "ATTENTION changer le poste comptable d'une fiche <b>ne modifiera pas toutes "
@@ -760,6 +792,10 @@ msgstr "Invalid options"
 msgid "Accepter"
 msgstr "Accept"
 
+#: include/class/user.class.php:764
+msgid "Access invalid"
+msgstr "Forbidden access"
+
 #: include/database.item.php:73 include/user_menu.php:115
 #: include/user_menu.php:122 include/database.item.php:76
 #: include/database.item.php:81 include/database.item.php:79
@@ -767,6 +803,8 @@ msgstr "Accept"
 #: include/lib/user_menu.php:131 include/lib/user_menu.php:124
 #: include/lib/user_menu.php:143 include/database.item.php:75
 #: include/lib/user_menu.php:81 include/lib/user_menu.php:100
+#: include/database.item.php:74 include/lib/user_menu.php:80
+#: include/lib/user_menu.php:99
 msgid "Accueil"
 msgstr "Home"
 
@@ -820,7 +858,9 @@ msgstr "Incorrect direct access"
 #: html/recherche.php:58 include/ajax/ajax_todo_list.php:203
 #: include/ajax/ajax_todo_list.php:266 include/class/acc_ledger.class.php:1029
 #: include/class/acc_ledger.class.php:1034
-#: include/class/acc_ledger.class.php:1050
+#: include/class/acc_ledger.class.php:1050 html/recherche.php:63
+#: include/class/acc_ledger.class.php:1042
+#: include/class/acc_ledger_purchase.class.php:77
 msgid "Accès interdit"
 msgstr "Forbidden access"
 
@@ -838,7 +878,7 @@ msgstr "Access Ledger"
 
 #: html/do.php:210 html/do.php:211 html/do.php:239 html/do.php:252
 #: html/do.php:254 html/do.php:251 html/do.php:288 html/do.php:300
-#: html/do.php:310 html/do.php:279
+#: html/do.php:310 html/do.php:279 html/do.php:281
 msgid "Accès menu impossible"
 msgstr "Unauthorized access"
 
@@ -849,7 +889,7 @@ msgid "Accès non autorisé"
 msgstr "Unauthorized"
 
 #: include/param_sec.inc.php:278 include/param_sec.inc.php:220
-#: include/param_sec.inc.php:224
+#: include/param_sec.inc.php:224 include/param_sec.inc.php:262
 msgid "Accès à tout"
 msgstr "all access"
 
@@ -871,7 +911,10 @@ msgstr "all access"
 #: include/cfgledger.inc.php:171 include/class/acc_ledger_search.class.php:1086
 #: include/class/acc_ledger_search.class.php:1099
 #: include/template/tax_summary_display.php:176 include/database.item.php:235
-#: include/database.item.php:254
+#: include/database.item.php:254 include/class/acc_ledger_search.class.php:1188
+#: include/class/operation_predef_mtable.class.php:172
+#: include/database.item.php:3 include/database.item.php:67
+#: include/database.item.php:219 include/database.item.php:231
 msgid "Achat"
 msgstr "Purchase"
 
@@ -885,13 +928,13 @@ msgstr "Acquisition year"
 #: include/user_detail.inc.php:152 include/user.inc.php:129
 #: include/class/acc_plan_mtable.class.php:49
 #: include/template/tag_detail.php:15
-#: include/class/acc_plan_mtable.class.php:55
+#: include/class/acc_plan_mtable.class.php:55 include/template/tag_list.php:20
 msgid "Actif"
 msgstr "Active"
 
 #: include/user_menu.php:149 include/user_menu.php:153
 #: include/lib/user_menu.php:162 include/lib/user_menu.php:175
-#: include/lib/user_menu.php:133
+#: include/lib/user_menu.php:133 include/lib/user_menu.php:132
 msgid "Actif a un an au plus"
 msgstr "Asset of one year max"
 
@@ -908,13 +951,15 @@ msgstr "Inverse Asset"
 
 #: include/template/dashboard.php:105 include/template/dashboard.php:71
 #: include/template/dashboard.php:75 include/template/dashboard.php:54
+#: include/class/contact_option_ref_mtable.class.php:38
+#: include/class/document_state_mtable.php:44
 msgid "Action"
 msgstr "Action"
 
 #: include/action.common.inc.php:218 include/action.common.inc.php:238
 #: include/action.common.inc.php:239 include/action.common.inc.php:244
 #: include/action.common.inc.php:246 include/action.common.inc.php:247
-#: include/action.common.inc.php:253
+#: include/action.common.inc.php:253 include/action.common.inc.php:278
 msgid "Action "
 msgstr "Action"
 
@@ -926,6 +971,7 @@ msgstr "Action Management"
 
 #: include/action.common.inc.php:277 include/action.common.inc.php:281
 #: include/action.common.inc.php:272 include/action.common.inc.php:276
+#: include/action.common.inc.php:315 include/action.common.inc.php:320
 msgid "Action Sauvée"
 msgstr "Saved"
 
@@ -961,6 +1007,10 @@ msgstr "Late"
 #: include/ajax/ajax_card.php:214 include/ajax/ajax_card.php:369
 #: include/ajax/ajax_card.php:527 include/ajax/ajax_card.php:582
 #: include/ajax/ajax_card.php:594 include/ajax/ajax_card.php:624
+#: include/ajax/ajax_card.php:220 include/ajax/ajax_card.php:402
+#: include/ajax/ajax_card.php:603 include/ajax/ajax_card.php:658
+#: include/ajax/ajax_card.php:673 include/ajax/ajax_card.php:702
+#: include/ajax/ajax_card.php:738
 msgid "Action interdite"
 msgstr "Forbidden"
 
@@ -978,6 +1028,7 @@ msgstr "Forbidden"
 #: include/class/acc_ledger.class.php:2700
 #: include/class/acc_ledger.class.php:2709
 #: include/class/acc_ledger.class.php:2748
+#: include/class/acc_ledger.class.php:2772
 msgid "Action non accessible"
 msgstr "Folder not available"
 
@@ -996,12 +1047,13 @@ msgid "Action pour aujourd'hui"
 msgstr "For today"
 
 #: include/param_sec.inc.php:319 include/param_sec.inc.php:259
-#: include/param_sec.inc.php:291
+#: include/param_sec.inc.php:291 include/param_sec.inc.php:303
 msgid "Actions"
 msgstr "Actions"
 
 #: include/template/ledger_detail_bottom.php:35
 #: include/template/ledger_detail_bottom.php:40
+#: include/template/ledger_detail_bottom.php:45
 msgid "Actions Gestion"
 msgstr "Action Management"
 
@@ -1011,6 +1063,7 @@ msgstr "Action Management"
 #: include/template/detail-action.php:192
 #: include/template/detail-action.php:191
 #: include/template/detail-action.php:166
+#: include/template/detail-action.php:173
 msgid "Actions concernées"
 msgstr "Concerned operations"
 
@@ -1032,6 +1085,7 @@ msgstr "Accounting / Activity"
 #: include/class/acc_ledger.class.php:2274
 #: include/class/acc_ledger.class.php:2283
 #: include/class/acc_ledger.class.php:2299
+#: include/class/acc_ledger.class.php:2318
 msgid "Activé"
 msgstr "Activated"
 
@@ -1057,7 +1111,9 @@ msgstr "Activated"
 #: include/compta_ven.inc.php:328 include/compta_ven.inc.php:331
 #: include/template/form_ledger_detail.php:128 include/compta_ach.inc.php:296
 #: include/compta_ven.inc.php:339 include/compta_ven.inc.php:337
-#: include/compta_ach.inc.php:294
+#: include/compta_ach.inc.php:294 include/compta_ven.inc.php:329
+#: include/compta_ach.inc.php:295 include/template/form_ledger_detail.php:131
+#: include/template/predf_ledger_detail.php:59
 msgid "Actualiser"
 msgstr "Refresh"
 
@@ -1073,11 +1129,13 @@ msgstr "Refresh"
 #: include/user.inc.php:173 include/export/export_security_pdf.php:112
 #: html/user_login.php:109 include/database.item.php:127
 #: include/param_sec.inc.php:99 include/param_sec.inc.php:158
-#: html/user_login.php:115
+#: html/user_login.php:115 include/database.item.php:126
+#: include/param_sec.inc.php:100 include/param_sec.inc.php:163
 msgid "Administrateur"
 msgstr "Administrator"
 
 #: include/template/template_config_form.php:56
+#: include/template/template_config_form.php:57
 msgid "Administrateur de noalyss"
 msgstr "Noalyss Administrators"
 
@@ -1089,7 +1147,7 @@ msgstr "Noalyss Administrators"
 #: include/admin_repo.inc.php:63 include/database.item.php:130
 #: html/user_login.php:160 include/admin_repo.inc.php:65
 #: include/database.item.php:124 html/user_login.php:166
-#: html/user_login.php:143
+#: html/user_login.php:143 include/database.item.php:123
 msgid "Administration"
 msgstr "Administration"
 
@@ -1108,7 +1166,7 @@ msgstr "Global Parameter"
 #: include/class/class_fiche.php:1601 include/class/class_fiche.php:1604
 #: include/class/fiche.class.php:1758 include/class/fiche.class.php:1761
 #: include/class/fiche.class.php:1763 include/class/fiche.class.php:1781
-#: include/class/fiche.class.php:1782
+#: include/class/fiche.class.php:1782 include/class/fiche.class.php:1808
 msgid "Adresse"
 msgstr "Address"
 
@@ -1122,6 +1180,7 @@ msgstr "Address"
 
 #: include/template/template_config_form.php:55
 #: include/template/template_config_form.php:63
+#: include/template/template_config_form.php:73
 msgid "Adresse Serveur Postgresql"
 msgstr "Postgresql Host"
 
@@ -1149,7 +1208,7 @@ msgstr "Responsible"
 
 #: include/template/action_search.php:63 include/template/action_search.php:77
 #: include/template/action_search.php:111
-#: include/template/action_search.php:107
+#: include/template/action_search.php:107 include/template/action_search.php:60
 msgid "Affiche aussi les actions fermées"
 msgstr "Display also the closed actions"
 
@@ -1158,12 +1217,12 @@ msgstr "Display also the closed actions"
 #: include/ext/tva/ext_list_assujetti.class.php:54
 #: include/ext/tva/ext_tvagen.class.php:114
 #: include/lib/message_javascript.php:94 include/lib/message_javascript.php:96
-#: include/tax_summary.inc.php:43
+#: include/tax_summary.inc.php:43 include/tax_summary.inc.php:52
 msgid "Afficher"
 msgstr "Display"
 
 #: include/company.inc.php:121 include/company.inc.php:140
-#: include/company.inc.php:144
+#: include/company.inc.php:144 include/company.inc.php:158
 msgid "Afficher la période comptable pour éviter les erreurs de date"
 msgstr "Display the accounting period dates to AVOID errors"
 
@@ -1179,15 +1238,20 @@ msgstr ""
 #: include/database.item.php:127 include/database.item.php:130
 #: include/database.item.php:136 include/database.item.php:132
 #: include/database.item.php:131 include/database.item.php:135
-#: include/database.item.php:129
+#: include/database.item.php:129 include/database.item.php:128
 msgid "Agenda"
 msgstr "Calendar"
 
 #: include/database.item.php:132 include/database.item.php:135
 #: include/database.item.php:129 include/database.item.php:127
+#: include/database.item.php:128
 msgid "Agenda, présentation du suivi sous forme d'agenda "
 msgstr "Calendar, display the follow up like a calendar"
 
+#: include/template/template_config_form.php:91
+msgid "Aide"
+msgstr "Help"
+
 #: include/ajax_navigator.php:59 include/ajax/ajax_navigator.php:59
 #: include/ajax/ajax_navigator.php:63
 msgid "Aide sur le wiki"
@@ -1224,6 +1288,13 @@ msgstr "Help "
 #: include/class/acc_ledger_search.class.php:250
 #: include/lib/manage_table_sql.class.php:616
 #: include/lib/manage_table_sql.class.php:655
+#: include/class/anc_key.class.php:353
+#: include/class/acc_ledger_search.class.php:264
+#: include/class/tag_group_mtable.class.php:91
+#: include/class/operation_predef_mtable.class.php:170
+#: include/template/followup-show-action-add.php:61
+#: include/lib/manage_table_sql.class.php:663
+#: include/lib/manage_table_sql.class.php:704
 msgid "Ajout"
 msgstr "Add"
 
@@ -1244,6 +1315,11 @@ msgstr "Add Menu"
 msgid "Ajout Utilisateur"
 msgstr "Add users"
 
+#: scenario/select_dialog.test.php:32
+#: include/template/followup-show-action-add.php:30
+msgid "Ajout action"
+msgstr "Add Action"
+
 #: include/class_acc_ledger_purchase.php:1271
 #: include/class_acc_ledger_sold.php:1273 include/class_pre_op_ach.php:390
 #: include/class_pre_op_ven.php:384 include/compta_fin.inc.php:142
@@ -1294,7 +1370,7 @@ msgstr "Add item"
 #: include/lib/class_html_input.php:958 include/lib/class_html_input.php:984
 #: include/lib/html_input.class.php:1037 include/lib/html_input.class.php:1095
 #: include/lib/html_input.class.php:1096 include/lib/html_input.class.php:1111
-#: include/lib/html_input.class.php:1112
+#: include/lib/html_input.class.php:1112 include/lib/html_input.class.php:1145
 msgid "Ajout autres"
 msgstr "Adding others"
 
@@ -1315,7 +1391,7 @@ msgstr "Add materiel to amortize"
 msgid "Ajout d'un dossier"
 msgstr "Add folder"
 
-#: include/class/tag.class.php:60
+#: include/class/tag.class.php:60 include/class/tag.class.php:65
 msgid "Ajout d'un dossier (ou tag)"
 msgstr "Add folder or tag"
 
@@ -1351,6 +1427,10 @@ msgstr "Add a template"
 msgid "Ajout d'un modèle"
 msgstr "Add a template"
 
+#: include/anc_pa.inc.php:174 include/anc_pa.inc.php:194
+msgid "Ajout d'un plan analytique"
+msgstr "Add Analytical group"
+
 #: include/anc_pa.inc.php:248 include/anc_pa.inc.php:283
 #: include/anc_pa.inc.php:285 include/anc_pa.inc.php:267
 #: include/anc_pa.inc.php:269 include/anc_pa.inc.php:287
@@ -1388,6 +1468,8 @@ msgstr "Adding a VAT rates"
 #: include/manager.inc.php:140 include/supplier.inc.php:139
 #: include/contact.inc.php:138 include/manager.inc.php:141
 #: include/adm.inc.php:136 include/customer.inc.php:138
+#: include/bank.inc.php:135 include/supplier.inc.php:140
+#: include/contact.inc.php:140 include/customer.inc.php:139
 msgid "Ajout d'une catégorie"
 msgstr "Add a category"
 
@@ -1438,6 +1520,7 @@ msgstr "Configuration label"
 #: include/database.item.php:210 include/database.item.php:187
 #: include/database.item.php:188 include/database.item.php:191
 #: include/database.item.php:202 include/database.item.php:207
+#: include/database.item.php:197
 msgid "Ajout de fiche"
 msgstr "Adding Record"
 
@@ -1447,10 +1530,11 @@ msgstr "Adding equipment"
 
 #: include/database.item.php:15 include/database.item.php:18
 #: include/database.item.php:12 include/database.item.php:10
+#: include/database.item.php:11
 msgid "Ajout de menu ou de plugins"
 msgstr "Add  menus or plugins"
 
-#: include/periode.inc.php:102
+#: include/periode.inc.php:102 include/periode.inc.php:103
 msgid "Ajout exercice"
 msgstr "Add exercise"
 
@@ -1475,6 +1559,7 @@ msgstr "Add repair card"
 #: include/class/acc_ledger.class.php:2179
 #: include/class/acc_ledger.class.php:2188
 #: include/class/acc_ledger.class.php:2204
+#: include/class/acc_ledger.class.php:2223
 msgid "Ajout journal"
 msgstr "Add ledger"
 
@@ -1501,6 +1586,7 @@ msgstr "Add forecast"
 
 #: include/periode.inc.php:113 include/class/periode.class.php:687
 #: include/class/periode.class.php:689 include/class/periode.class.php:691
+#: include/class/periode.class.php:692 include/periode.inc.php:114
 msgid "Ajout période"
 msgstr "Add periode"
 
@@ -1508,6 +1594,10 @@ msgstr "Add periode"
 msgid "Ajout utilisateur"
 msgstr "Add users"
 
+#: include/class/follow_up.class.php:1535
+msgid "Ajout étiquette"
+msgstr "Add tag"
+
 #: include/action.common.inc.php:207 include/action.common.inc.php:212
 #: include/action.common.inc.php:214 include/action.common.inc.php:215
 #: include/action.common.inc.php:221
@@ -1525,6 +1615,7 @@ msgstr "Add an Action here"
 #: include/dossier.inc.php:214 include/modele.inc.php:261
 #: include/dossier.inc.php:217 include/dossier.inc.php:222
 #: include/modele.inc.php:262 include/modele.inc.php:263
+#: include/ajax/ajax_add_concerned_card.php:138
 msgid "Ajouter"
 msgstr "Add"
 
@@ -1557,6 +1648,7 @@ msgstr "Add a repository"
 #: include/template/detail-action.php:476
 #: include/template/detail-action.php:480
 #: include/template/detail-action.php:478
+#: include/template/detail-action.php:491
 msgid "Ajouter un fichier"
 msgstr "Add an attachment"
 
@@ -1587,6 +1679,7 @@ msgstr "Add a profile"
 #: include/class/class_anc_group_operation.php:190
 #: include/class/anc_group_operation.class.php:207
 #: include/class/anticipation.class.php:431 include/template/stock_inv.php:106
+#: include/class/anc_group_operation.class.php:208
 msgid "Ajouter une ligne"
 msgstr "Add a row"
 
@@ -1631,6 +1724,8 @@ msgstr "Add a receipt"
 #: include/class/acc_ledger_purchase.class.php:1726
 #: include/class/acc_ledger_sold.class.php:986
 #: include/class/acc_ledger_purchase.class.php:1732
+#: include/class/acc_ledger_purchase.class.php:1756
+#: include/class/acc_ledger_sold.class.php:990
 msgid "Ajoutez une pièce justificative "
 msgstr "Add a receipt"
 
@@ -1696,6 +1791,7 @@ msgstr "Old balance"
 #: html/test_class.php:220 include/ajax_preference.php:174
 #: include/ajax/ajax_preference.php:174 include/ajax/ajax_preference.php:253
 #: dev/test/test_class.php:216 include/ajax/ajax_preference.php:264
+#: dev-2/test/test_class.php:216
 msgid "Anglais"
 msgstr "English"
 
@@ -1727,7 +1823,7 @@ msgstr "Cancel"
 #: include/template/dashboard.php:353 include/template/pcmn_update.php:54
 #: include/ext/amortis/include/template/material_add.php:88
 #: include/ajax/ajax_card.php:304 include/template/dashboard.php:351
-#: include/ajax/ajax_mod_predf_op.php:55
+#: include/ajax/ajax_mod_predf_op.php:55 include/ajax/ajax_mod_predf_op.php:68
 msgid "Annuler"
 msgstr "Cancel"
 
@@ -1771,7 +1867,7 @@ msgid "Année d'achat"
 msgstr "Year of purchase"
 
 #: include/class/periode.class.php:430 include/class/periode.class.php:432
-#: include/class/periode.class.php:434
+#: include/class/periode.class.php:434 include/class/periode.class.php:435
 #, php-format
 msgid "Année doit être entre %s et %s "
 msgstr "Year must be between %s and%s"
@@ -1792,7 +1888,7 @@ msgid "Année invalide ["
 msgstr "Invalid year ["
 
 #: include/class/periode.class.php:427 include/class/periode.class.php:429
-#: include/class/periode.class.php:431
+#: include/class/periode.class.php:431 include/class/periode.class.php:432
 msgid "Année n'est pas un nombre"
 msgstr "year is not a number"
 
@@ -1801,7 +1897,7 @@ msgid "Anomalie pour le compte "
 msgstr "Anomaly for the accounting"
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
-#: include/class/periode.class.php:652
+#: include/class/periode.class.php:652 include/class/periode.class.php:653
 msgid "Août"
 msgstr "August"
 
@@ -1844,7 +1940,7 @@ msgid "Argument"
 msgstr "Arguments"
 
 #: include/company.inc.php:118 include/company.inc.php:137
-#: include/company.inc.php:141
+#: include/company.inc.php:141 include/company.inc.php:155
 msgid "Assujetti à la tva"
 msgstr "VAT users"
 
@@ -1855,6 +1951,7 @@ msgid "Attente"
 msgstr "Wait"
 
 #: include/verif_bilan.inc.php:117 include/verif_bilan.inc.php:153
+#: include/verif_bilan.inc.php:151
 msgid "Attention "
 msgstr "Warning"
 
@@ -1876,7 +1973,7 @@ msgstr "Warning% s does not contain 11 columns"
 msgid "Attention , erreur Acc_Ledger_Fin::insert  , coche paiement"
 msgstr "Warning error Acc_Legder::insert"
 
-#: include/compta_fin_rec.inc.php:151
+#: include/compta_fin_rec.inc.php:151 include/compta_fin_rec.inc.php:188
 msgid "Attention : Fichier non chargé"
 msgstr "Warning : file not uploaded"
 
@@ -1918,6 +2015,7 @@ msgstr "Warning : it is preferable to use card than accounting"
 #: include/class/acc_ledger.class.php:1198
 #: include/class/acc_ledger.class.php:1207
 #: include/class/acc_ledger.class.php:1223
+#: include/class/acc_ledger.class.php:1219
 msgid ""
 "Attention : il vaut mieux utiliser les fiches que les postes comptables "
 msgstr "Warning : it is preferable to use card than accounting"
@@ -1927,6 +2025,25 @@ msgstr "Warning : it is preferable to use card than accounting"
 msgid "Attention : il y a %d enregistrements incorrects "
 msgstr "Attention:% d records incorrect"
 
+#: include/impress_bilan.inc.php:75
+msgid ""
+"Attention : si le bilan n'est pas équilibré.<br> Vérifiez <ul>\n"
+"           <li>L'affectation du résultat est fait</li>\n"
+"           <li>Vos comptes actifs ont  un solde débiteur (sauf les comptes "
+"dit inversés)</li>\n"
+"           <li> les comptes passifs ont un solde créditeur (sauf les comptes "
+"dit inversés) </li>\n"
+"           </ul>\n"
+"           Utilisez la balance des comptes pour vérifier."
+msgstr ""
+"Attention : if the outcome is not balanced<br> check <ul>\n"
+"<li>You allocate the results </li>\n"
+"<li>The asset has a saldo on debit (except the reverse accounting)</li> \n"
+"<li> The  liability has a saldo on credit(except the reverse accounting) </"
+"li>\n"
+"</ul> \n"
+"Use the balance of accouting to check"
+
 #: include/impress_bilan.inc.php:65 include/impress_bilan.inc.php:72
 msgid ""
 "Attention : si le bilan n'est pas équilibré.<br> Vérifiez <ul>\n"
@@ -1949,6 +2066,7 @@ msgstr ""
 #: html/admin/template_config_form.php:76
 #: include/template/template_config_form.php:80
 #: include/template/template_config_form.php:88
+#: include/template/template_config_form.php:100
 msgid ""
 "Attention : si vous installez sous windows n'utilisez pas le \\ mais plutôt "
 "le / dans les nom de répertoire (càd les chemins ou path)"
@@ -1984,6 +2102,8 @@ msgstr "Warning : you cannot use step with the calendar"
 #: include/class/acc_ledger_purchase.class.php:1546
 #: include/class/acc_ledger_sold.class.php:804
 #: include/class/acc_ledger_purchase.class.php:1549
+#: include/class/acc_ledger_purchase.class.php:1560
+#: include/class/acc_ledger_sold.class.php:807
 msgid "Attention Différence entre TVA calculée et donnée"
 msgstr "Warning difference computed with VAT"
 
@@ -2004,7 +2124,7 @@ msgstr "Warning the parameter effective_cache_size is %s instead of 1000"
 #: html/admin/setup.php:442 html/install.php:506 html/install.php:505
 #: html/install.php:503 html/install.php:509 html/install.php:501
 #: html/install.php:507 html/install.php:469 html/install.php:444
-#: html/install.php:450 html/install.php:453
+#: html/install.php:450 html/install.php:453 html/install.php:502
 #, php-format
 msgid "Attention le paramètre effective_cache_size est de %s au lieu de 1000"
 msgstr "Warning the parameter effective_cache_size is %s instead of 1000"
@@ -2032,6 +2152,8 @@ msgstr "Warning the parameter effective_cache_size is %s instead of 1000"
 #: include/ext/modop/modop_save.php:170
 #: include/class/acc_ledger_purchase.class.php:1401
 #: include/compta_ods.inc.php:99
+#: include/class/acc_ledger_purchase.class.php:1412
+#: include/class/acc_ledger_sold.class.php:683
 msgid "Attention numéro pièce existante, elle a du être adaptée"
 msgstr "Warning, the receipt number already exists and has been changed"
 
@@ -2048,6 +2170,7 @@ msgstr "Be careful not grade sheet cushion"
 #: include/lib/ac_common.php:629 include/lib/ac_common.php:630
 #: include/lib/ac_common.php:641 include/lib/ac_common.php:642
 #: include/lib/ac_common.php:644 include/lib/ac_common.php:660
+#: include/lib/ac_common.php:670
 #, php-format
 msgid ""
 "Attention periode \n"
@@ -2063,6 +2186,8 @@ msgstr ""
 "be displayed"
 
 #: include/class/acc_ledger.class.php:2555
+#: include/class/acc_ledger.class.php:2430
+#: include/class/acc_ledger.class.php:2585 include/database.item.php:233
 msgid "Attention, ce journal doit utiliser des montants négatifs"
 msgstr "Warning this ledger must used negative amounts"
 
@@ -2098,6 +2223,7 @@ msgstr "Warning : Database version is superior to your application"
 #: include/database.item.php:90 include/database.item.php:93
 #: include/database.item.php:98 include/database.item.php:95
 #: include/database.item.php:94 include/database.item.php:92
+#: include/database.item.php:91
 msgid "Attribut de fiche"
 msgstr "Card attribute"
 
@@ -2106,6 +2232,7 @@ msgid "Attribut déjà ajouté"
 msgstr "This attribute was already added"
 
 #: include/ajax/ajax_template_cat_category.php:92
+#: include/ajax/ajax_template_cat_category.php:91
 msgid "Attribut déjà utilisé"
 msgstr "Attribute already used"
 
@@ -2114,13 +2241,19 @@ msgid "Attribut minimum pour les catégories de fiches"
 msgstr "Minimum attribut for cards category"
 
 #: include/ajax/ajax_template_cat_category.php:95
+#: include/ajax/ajax_template_cat_category.php:94
 msgid "Attribut obligatoire"
 msgstr "mandatory attribute"
 
 #: include/class/template_card_category.class.php:158
+#: include/class/template_card_category.class.php:157
 msgid "Attribut à ajouter"
 msgstr "Attribute to add"
 
+#: include/template/action_search.php:150
+msgid "Au moins une étiquette"
+msgstr "At least one tag"
+
 #: include/class_follow_up.php:1196 include/class_follow_up.php:1199
 #: include/class_follow_up.php:1200 include/class_follow_up.php:1211
 #: include/class_follow_up.php:1218 include/class_follow_up.php:1223
@@ -2132,6 +2265,7 @@ msgstr "Attribute to add"
 #: include/class/follow_up.class.php:1221
 #: include/class/follow_up.class.php:1219
 #: include/class/follow_up.class.php:1220
+#: include/class/follow_up.class.php:1137
 msgid "Aucun"
 msgstr "No"
 
@@ -2147,7 +2281,10 @@ msgstr "No"
 #: include/class/profile_menu.class.php:248
 #: include/class/profile_menu.class.php:273 include/param_sec.inc.php:149
 #: include/param_sec.inc.php:226 include/param_sec.inc.php:260
-#: include/param_sec.inc.php:339
+#: include/param_sec.inc.php:339 include/class/profile_menu.class.php:249
+#: include/class/profile_menu.class.php:274 include/param_sec.inc.php:154
+#: include/param_sec.inc.php:264 include/param_sec.inc.php:271
+#: include/param_sec.inc.php:354
 msgid "Aucun accès"
 msgstr "No access"
 
@@ -2209,6 +2346,9 @@ msgstr "No VAT code corresponds to the rate"
 #: include/class/acc_ledger.class.php:2355
 #: include/class/acc_ledger.class.php:2428
 #: include/class/acc_ledger.class.php:2614
+#: include/class/acc_ledger.class.php:2381
+#: include/class/acc_ledger.class.php:2456
+#: include/class/acc_ledger.class.php:2638
 msgid "Aucun compte en banque n'est donné"
 msgstr "No bank account given"
 
@@ -2227,7 +2367,7 @@ msgstr "No folder"
 #: include/class_user.php:985 include/class_user.php:986
 #: include/class/class_user.php:986 include/class/class_user.php:974
 #: include/class/class_user.php:973 include/class/user.class.php:973
-#: include/class/user.class.php:997
+#: include/class/user.class.php:997 include/class/user.class.php:1000
 msgid "Aucun dossier disponible"
 msgstr "No available folder"
 
@@ -2242,7 +2382,7 @@ msgstr "No record found"
 #: include/class_acc_bilan.php:256 include/class_acc_bilan.php:257
 #: include/class/class_acc_bilan.php:257 include/class/class_acc_bilan.php:273
 #: include/class/acc_bilan.class.php:273 include/class/acc_bilan.class.php:276
-#: include/class/acc_bilan.class.php:278
+#: include/class/acc_bilan.class.php:278 include/class/acc_bilan.class.php:279
 msgid "Aucun enregistrement trouve"
 msgstr "No record found"
 
@@ -2266,7 +2406,9 @@ msgstr "No record found"
 #: include/class/acc_ledger_search.class.php:930
 #: include/class/acc_ledger_search.class.php:677
 #: include/class/acc_ledger_search.class.php:943
-#: include/class/follow_up.class.php:775
+#: include/class/follow_up.class.php:775 include/class/follow_up.class.php:688
+#: include/class/acc_ledger_search.class.php:763
+#: include/class/acc_ledger_search.class.php:1032
 msgid "Aucun enregistrement trouvé"
 msgstr "No record found"
 
@@ -2340,13 +2482,13 @@ msgid "Aucun plan défini"
 msgstr "No plane defined"
 
 #: include/ajax_anc_search.php:74 include/ajax/ajax_anc_search.php:74
-#: include/ajax/ajax_anc_search.php:76
+#: include/ajax/ajax_anc_search.php:76 include/ajax/ajax_anc_search.php:79
 msgid "Aucun poste trouvé"
 msgstr "No accounting found"
 
 #: html/do.php:219 html/do.php:224 html/do.php:252 html/do.php:265
 #: html/do.php:268 html/do.php:270 html/do.php:307 html/do.php:319
-#: html/do.php:329 html/do.php:331 html/do.php:300
+#: html/do.php:329 html/do.php:331 html/do.php:300 html/do.php:302
 msgid "Aucun profil utilisateur"
 msgstr "No user profile"
 
@@ -2371,13 +2513,17 @@ msgstr "No result"
 msgid "Aucun titre"
 msgstr "No title"
 
+#: include/class/document_state_mtable.php:48
+msgid "Aucune"
+msgstr "None"
+
 #: include/class/tax_summary.class.php:116
 #: include/class/tax_summary.class.php:130
 msgid "Aucune Donnée"
 msgstr "no data"
 
 #: include/param_sec.inc.php:321 include/param_sec.inc.php:261
-#: include/param_sec.inc.php:293
+#: include/param_sec.inc.php:293 include/template/security_list_action.php:9
 msgid "Aucune action"
 msgstr "No Action"
 
@@ -2403,6 +2549,7 @@ msgstr "All amount in ledger are normal"
 #: html/ajax_card.php:286 include/ajax/ajax_card.php:266
 #: include/ajax/ajax_card.php:267 include/ajax/ajax_card.php:273
 #: include/ajax/ajax_card.php:275 include/ajax/ajax_card.php:276
+#: include/ajax/ajax_card.php:282
 msgid "Aucune catégorie de fiche ne correspond  à votre demande"
 msgstr "No class plug will match your request"
 
@@ -2414,7 +2561,8 @@ msgstr "No class plug will match your request"
 #: include/ajax/ajax_card.php:377 include/ajax/ajax_card.php:261
 #: include/ajax/ajax_card.php:410 include/ajax/ajax_card.php:264
 #: include/ajax/ajax_card.php:413 include/ajax/ajax_card.php:265
-#: include/ajax/ajax_card.php:414
+#: include/ajax/ajax_card.php:414 include/ajax/ajax_card.php:271
+#: include/ajax/ajax_card.php:468
 msgid ""
 "Aucune catégorie de fiche ne correspond à votre demande, le journal pourrait "
 "n'avoir accès à aucune fiche"
@@ -2439,6 +2587,7 @@ msgstr "No matching"
 
 #: include/ajax/ajax_anc_plan.php:56 include/class/anc_plan.class.php:126
 #: include/ajax/ajax_anc_plan.php:59 include/ajax/ajax_anc_plan.php:60
+#: include/class/anc_plan.class.php:127
 msgid "Aucune description"
 msgstr "No description"
 
@@ -2460,6 +2609,7 @@ msgstr "No description"
 #: include/template/ledger_detail_bottom.php:284
 #: include/template/tax_summary_display.php:105
 #: include/template/tax_summary_display.php:277
+#: include/template/ledger_detail_bottom.php:302 include/lib/ac_common.php:1257
 msgid "Aucune donnée"
 msgstr "no data"
 
@@ -2480,6 +2630,7 @@ msgstr "No plugin available"
 #: html/ajax_card.php:192 include/ajax/ajax_card.php:172
 #: include/ajax/ajax_card.php:173 include/ajax/ajax_card.php:176
 #: include/ajax/ajax_card.php:182 include/ajax/ajax_card.php:183
+#: include/ajax/ajax_card.php:186
 msgid "Aucune fiche demandée"
 msgstr "No card Abebooks web sites"
 
@@ -2488,7 +2639,8 @@ msgstr "No card Abebooks web sites"
 #: include/fiche.inc.php:383 include/fiche.inc.php:386
 #: include/fiche.inc.php:133 include/fiche.inc.php:387
 #: include/fiche.inc.php:134 include/fiche.inc.php:388
-#: include/fiche.inc.php:395
+#: include/fiche.inc.php:395 include/fiche.inc.php:135
+#: include/fiche.inc.php:405
 msgid "Aucune fiche trouvée"
 msgstr "No record found"
 
@@ -2515,6 +2667,7 @@ msgstr "No operation selected"
 #: include/ajax/ajax_history.php:117 include/ajax/ajax_history.php:202
 #: include/ajax/ajax_history.php:121 include/ajax/ajax_history.php:207
 #: include/ajax/ajax_history.php:208 include/ajax/ajax_history.php:209
+#: include/balance_card.inc.php:71
 msgid "Aucune opération pour l'exercice courant"
 msgstr "No operation for the current exercise"
 
@@ -2575,6 +2728,9 @@ msgstr "No room to send"
 #: include/class/acc_ledger.class.php:837
 #: include/class/acc_ledger_sold.class.php:1112
 #: include/class/acc_ledger.class.php:853
+#: include/class/acc_ledger.class.php:841
+#: include/class/acc_ledger_purchase.class.php:1057
+#: include/class/acc_ledger_sold.class.php:1079
 msgid "Aucune période ouverte"
 msgstr "No period opened"
 
@@ -2595,6 +2751,7 @@ msgstr "Nothing selected"
 
 #: include/template/tag_choose.php:8 include/template/tag_search_select.php:8
 #: include/template/tag_select.php:8 include/template/tag_select.php:12
+#: include/template/tag_select.php:14
 msgid "Aucune étiquette disponible"
 msgstr "No tag available"
 
@@ -2602,10 +2759,12 @@ msgstr "No tag available"
 #: include/lib/user_menu.php:121 include/lib/user_menu.php:130
 #: include/lib/user_menu.php:122 include/lib/user_menu.php:141
 #: include/lib/user_menu.php:79 include/lib/user_menu.php:98
+#: include/lib/user_menu.php:78 include/lib/user_menu.php:97
 msgid "Audit"
 msgstr "Audit"
 
 #: include/upgrade-plugin.php:53 include/upgrade-plugin.php:65
+#: include/upgrade-plugin.php:68
 msgid "Auteur"
 msgstr "Author"
 
@@ -2627,6 +2786,10 @@ msgstr "Automatic"
 msgid "Autre Journal ?"
 msgstr "another ledger"
 
+#: include/template/ledger_detail_bottom.php:16
+msgid "Autre action"
+msgstr "Other Actions"
+
 #: html/ajax_history.php:90 html/ajax_history.php:96 html/ajax_history.php:161
 #: html/ajax_history.php:167 html/ajax_history.php:108
 #: html/ajax_history.php:114 html/ajax_history.php:179
@@ -2644,11 +2807,17 @@ msgstr "another ledger"
 msgid "Autre exercice"
 msgstr "Other exercise"
 
+#: include/balance_card.inc.php:61
+#, php-format
+msgid "Autre exercice %s"
+msgstr "Other exercise %s"
+
 #: include/template/ledger_detail_bottom.php:12
 #: include/template/ledger_detail_bottom.php:145
 #: include/ext/importbank/ajax.php:89 include/ext/importbank/ajax.php:90
 #: include/template/ledger_detail_bottom.php:146
 #: include/template/ledger_detail_bottom.php:151
+#: include/template/ledger_detail_bottom.php:156
 msgid "Autre information"
 msgstr "Other info"
 
@@ -2676,6 +2845,8 @@ msgstr "Other info"
 #: include/class/acc_ledger_purchase.class.php:1744
 #: include/class/acc_ledger_sold.class.php:1004
 #: include/class/acc_ledger_purchase.class.php:1750
+#: include/class/acc_ledger_purchase.class.php:1774
+#: include/class/acc_ledger_sold.class.php:1008
 msgid "Autre information : "
 msgstr "Other info"
 
@@ -2693,6 +2864,7 @@ msgstr "Others concerned persons"
 #: include/database.item.php:123 include/database.item.php:122
 #: include/balance.inc.php:92 include/balance.inc.php:93
 #: include/balance.inc.php:96 include/database.item.php:118
+#: include/database.item.php:119
 msgid "Avancé"
 msgstr "Advanced"
 
@@ -2750,19 +2922,21 @@ msgstr "With the card"
 #: html/install.php:429 html/install.php:384 html/install.php:393
 #: html/install.php:351 html/install.php:360 html/install.php:369
 #: html/install.php:354 html/install.php:363 html/install.php:372
+#: html/install.php:403 html/install.php:412 html/install.php:421
 msgid "Avertissement"
 msgstr "Warning"
 
-#: include/template/param_jrn.php:106
+#: include/template/param_jrn.php:106 include/template/param_jrn.php:107
 msgid "Avertissement montant positif"
 msgstr "Warning positive amount"
 
 #: include/class/acc_ledger.class.php:2362
+#: include/class/acc_ledger.class.php:2393
 msgid "Avertissement ne peut être vide"
 msgstr "Warning can not be empty"
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
-#: include/class/periode.class.php:651
+#: include/class/periode.class.php:651 include/class/periode.class.php:652
 msgid "Avril"
 msgstr "April"
 
@@ -2807,12 +2981,13 @@ msgstr "Backup for user"
 #: include/database.item.php:73 include/database.item.php:67
 #: include/database.item.php:101 include/category_card.inc.php:79
 #: include/fiche.inc.php:70 include/database.item.php:102
+#: include/database.item.php:66
 msgid "Balance"
 msgstr "Balance"
 
 #: include/database.item.php:6 include/database.item.php:9
 #: include/database.item.php:11 include/database.item.php:14
-#: include/database.item.php:8
+#: include/database.item.php:8 include/database.item.php:7
 msgid "Balance Analytique/comptabilité"
 msgstr "Analytical Balance / Accounting"
 
@@ -2840,12 +3015,14 @@ msgstr "Balance"
 #: include/database.item.php:82 include/database.item.php:85
 #: include/database.item.php:90 include/database.item.php:87
 #: include/database.item.php:86 include/database.item.php:84
+#: include/database.item.php:83
 msgid "Balance croisée double"
 msgstr "Crossed balance"
 
 #: include/database.item.php:82 include/database.item.php:85
 #: include/database.item.php:90 include/database.item.php:87
 #: include/database.item.php:86 include/database.item.php:84
+#: include/database.item.php:83
 msgid "Balance double croisées des imputations analytiques"
 msgstr "Double crossed balance"
 
@@ -2870,6 +3047,7 @@ msgstr "Tiers balance"
 #: include/class/acc_ledger.class.php:1300
 #: include/class/acc_ledger.class.php:1309
 #: include/class/acc_ledger.class.php:1325
+#: include/class/acc_ledger.class.php:1321
 msgid "Balance incorrecte"
 msgstr "wrong balance"
 
@@ -2883,6 +3061,7 @@ msgstr "wrong balance"
 #: include/class/acc_ledger.class.php:1149
 #: include/class/acc_ledger.class.php:1158
 #: include/class/acc_ledger.class.php:1174
+#: include/class/acc_ledger.class.php:1170
 msgid "Balance incorrecte "
 msgstr "wrong balance"
 
@@ -2911,13 +3090,13 @@ msgstr "Balance by category of cards, only for cards with an accounting"
 
 #: include/database.item.php:7 include/database.item.php:10
 #: include/database.item.php:12 include/database.item.php:15
-#: include/database.item.php:9
+#: include/database.item.php:9 include/database.item.php:8
 msgid "Balance par groupe"
 msgstr "Balance group"
 
 #: include/database.item.php:4 include/database.item.php:7
 #: include/database.item.php:9 include/database.item.php:12
-#: include/database.item.php:6
+#: include/database.item.php:6 include/database.item.php:5
 msgid "Balance simple"
 msgstr "Simple balance"
 
@@ -2928,7 +3107,7 @@ msgstr "Simple balance %s"
 
 #: include/database.item.php:4 include/database.item.php:7
 #: include/database.item.php:9 include/database.item.php:12
-#: include/database.item.php:6
+#: include/database.item.php:6 include/database.item.php:5
 msgid "Balance simple des imputations analytiques"
 msgstr "Simple analytic balance for record"
 
@@ -2963,6 +3142,7 @@ msgstr "Balance en-cours"
 #: include/class/anticipation.class.php:293 include/database.item.php:71
 #: include/template/acc_ledger_history_financial_oneline.php:31
 #: include/template/acc_ledger_history_financial_oneline.php:32
+#: include/database.item.php:70
 msgid "Banque"
 msgstr "Bank"
 
@@ -3006,6 +3186,7 @@ msgstr "Invalid Database"
 #: include/lib/class_database.php:429 include/lib/class_database.php:434
 #: include/lib/database.class.php:433 include/lib/database.class.php:442
 #: include/lib/database.class.php:443 include/class/database.class.php:125
+#: include/class/database.class.php:128
 msgid "Base de donnée vide"
 msgstr "Empty  Database"
 
@@ -3016,7 +3197,8 @@ msgstr "Empty  Database"
 #: include/upgrade.inc.php:68 include/upgrade.inc.php:96 html/install.php:392
 #: include/upgrade.inc.php:33 include/class/dossier.class.php:367
 #: include/class/dossier.class.php:395 html/install.php:398
-#: html/install.php:401
+#: html/install.php:401 html/install.php:450
+#: include/class/dossier.class.php:373 include/class/dossier.class.php:401
 msgid "Base de données"
 msgstr "Database"
 
@@ -3025,7 +3207,8 @@ msgstr "Database"
 #: include/template/action_display_short.php:59
 #: include/class/class_follow_up.php:263 include/class/follow_up.class.php:263
 #: include/template/action_display_short.php:60
-#: include/class/follow_up.class.php:264
+#: include/class/follow_up.class.php:264 include/class/document.class.php:1413
+#: include/class/follow_up.class.php:271
 msgid "Basse"
 msgstr "Low"
 
@@ -3053,6 +3236,7 @@ msgid "Biens amortissables"
 msgstr "Depreciable property"
 
 #: html/test_class.php:213 dev/test/test_class.php:209
+#: dev-2/test/test_class.php:209
 msgid "Bienvenu sur mon site"
 msgstr "Welcome on my website"
 
@@ -3067,10 +3251,12 @@ msgstr "Welcome"
 #: include/database.item.php:105 include/database.item.php:108
 #: include/database.item.php:114 include/database.item.php:111
 #: include/database.item.php:110 include/database.item.php:106
+#: include/database.item.php:107
 msgid "Bilan"
 msgstr "Balance sheet"
 
 #: include/export/export_security_pdf.php:104
+#: include/class/card_attribut_mtable.class.php:155
 msgid "Bloqué"
 msgstr "Locked"
 
@@ -3079,6 +3265,7 @@ msgstr "Locked"
 #: include/database.item.php:195 include/database.item.php:174
 #: include/database.item.php:175 include/database.item.php:178
 #: include/database.item.php:186 include/database.item.php:191
+#: include/database.item.php:184
 msgid "Bon de commande Fournisseur"
 msgstr "Order Supplier"
 
@@ -3087,6 +3274,7 @@ msgstr "Order Supplier"
 #: include/database.item.php:196 include/database.item.php:173
 #: include/database.item.php:174 include/database.item.php:177
 #: include/database.item.php:185 include/database.item.php:190
+#: include/database.item.php:183
 msgid "Bons de commande client"
 msgstr "Customer order"
 
@@ -3110,6 +3298,10 @@ msgstr "Budget"
 msgid "C"
 msgstr "D / C "
 
+#: include/class/card_multiple.class.php:128
+msgid "CMCDO01Security"
+msgstr "CMCDO01Security"
+
 #: include/class_document_export.php:198 include/class_document_export.php:208
 #: include/class/class_document_export.php:208
 #: include/class/class_document_export.php:207
@@ -3147,6 +3339,7 @@ msgstr "Hide details"
 #: include/database.item.php:202 include/database.item.php:201
 #: include/database.item.php:203 include/database.item.php:204
 #: include/database.item.php:206 include/database.item.php:220
+#: include/database.item.php:210 include/database.item.php:212
 msgid "Caisse"
 msgstr "Fund"
 
@@ -3155,7 +3348,12 @@ msgstr "Fund"
 msgid "Calcul automatique du poste comptable"
 msgstr "Automatic creation of the accounting"
 
-#: include/database.item.php:141
+#: include/tax_summary.inc.php:46
+#, php-format
+msgid "Calcul d'après la date"
+msgstr "Compute"
+
+#: include/database.item.php:141 include/database.item.php:140
 msgid "Calcul des totaux  par TVA et par journal"
 msgstr "Total VAT by ledger"
 
@@ -3191,6 +3389,7 @@ msgstr "calculator is visible"
 #: include/ajax/ajax_calendar_zoom.php:26 include/lib/html_input.class.php:991
 #: include/ajax/ajax_calendar_zoom.php:32 include/lib/html_input.class.php:992
 #: include/lib/html_input.class.php:1007 include/lib/html_input.class.php:1008
+#: include/lib/html_input.class.php:1041
 msgid "Calendrier"
 msgstr "Calendar"
 
@@ -3204,6 +3403,7 @@ msgstr "from"
 #: include/lib/manage_table_sql.class.php:1028
 #: include/lib/manage_table_sql.class.php:1025
 #: include/lib/manage_table_sql.class.php:1069
+#: include/lib/manage_table_sql.class.php:1125
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -3235,6 +3435,8 @@ msgstr "Category"
 #: include/class/fiche.class.php:562 include/lib/html_input.class.php:386
 #: include/class/fiche.class.php:434 include/class/fiche.class.php:564
 #: include/class/fiche.class.php:433 include/class/fiche.class.php:563
+#: include/class/fiche.class.php:576
+#: include/ajax/ajax_add_concerned_card.php:81
 msgid "Catégorie"
 msgstr "Category"
 
@@ -3247,6 +3449,7 @@ msgstr "Category"
 #: include/customer.inc.php:89 include/manager.inc.php:92
 #: include/supplier.inc.php:92 include/contact.inc.php:86
 #: include/manager.inc.php:93 include/customer.inc.php:90
+#: include/contact.inc.php:87
 msgid "Catégorie :"
 msgstr "Category"
 
@@ -3274,7 +3477,7 @@ msgstr "Document category"
 #: include/ext/import_doli/include/template/test_file.php:27
 #: include/ext/import_card/include/template/input_file.php:36
 #: include/ext/import_card/include/template/input_format.php:25
-#: include/database.item.php:109
+#: include/database.item.php:109 include/database.item.php:110
 msgid "Catégorie de fiche"
 msgstr "Card Category"
 
@@ -3297,7 +3500,7 @@ msgstr "Existing category"
 #: html/ajax_card.php:530 html/ajax_card.php:529 include/ajax/ajax_card.php:509
 #: include/ajax/ajax_card.php:510 include/ajax/ajax_card.php:511
 #: include/ajax/ajax_card.php:544 include/ajax/ajax_card.php:548
-#: include/ajax/ajax_card.php:563
+#: include/ajax/ajax_card.php:563 include/ajax/ajax_card.php:639
 msgid "Catégorie existe déjà"
 msgstr "Category already exists"
 
@@ -3311,7 +3514,7 @@ msgstr "Invalid category"
 #: html/ajax_card.php:532 html/ajax_card.php:531 include/ajax/ajax_card.php:511
 #: include/ajax/ajax_card.php:512 include/ajax/ajax_card.php:513
 #: include/ajax/ajax_card.php:546 include/ajax/ajax_card.php:550
-#: include/ajax/ajax_card.php:567
+#: include/ajax/ajax_card.php:567 include/ajax/ajax_card.php:643
 msgid "Catégorie sauvée"
 msgstr "Category saved"
 
@@ -3341,7 +3544,7 @@ msgstr "This accounting does not exist"
 #: include/ajax/ajax_view_action.php:55 include/action.common.inc.php:223
 #: include/action.common.inc.php:225 include/ajax/ajax_view_action.php:56
 #: include/ajax/ajax_view_action.php:52 include/action.common.inc.php:226
-#: include/action.common.inc.php:232
+#: include/action.common.inc.php:232 include/action.common.inc.php:257
 msgid "Ce document n'est pas accessible"
 msgstr "This document is not available"
 
@@ -3362,11 +3565,13 @@ msgstr "This file does not exist"
 #: include/class/print_ledger.class.php:71
 #: include/class/print_ledger.class.php:109
 #: include/class/print_ledger.class.php:115
+#: include/class/print_ledger.class.php:150
+#: include/class/print_ledger.class.php:194
 msgid "Ce journal ne peut être imprimé en mode simple"
 msgstr "This ledger can not be printed in this mode"
 
 #: include/database.item.php:133 include/database.item.php:136
-#: include/database.item.php:131
+#: include/database.item.php:131 include/database.item.php:132
 msgid "Ce menu vous présente  un menu rapide de vos menus préférés"
 msgstr "This menu keeps your favorite menus"
 
@@ -3376,17 +3581,19 @@ msgid "Ce n'est pas un fichier valide"
 msgstr "It is not a valid card"
 
 #: include/class/tva_rate_mtable.class.php:223
+#: include/class/tva_rate_mtable.class.php:240
 msgid "Ce nom est déjà utilisé"
 msgstr "This name already exists"
 
 #: include/ajax_anc_search.php:65 include/ajax/ajax_anc_search.php:65
-#: include/ajax/ajax_anc_search.php:67
+#: include/ajax/ajax_anc_search.php:67 include/ajax/ajax_anc_search.php:70
 msgid "Ce plan n'existe pas"
 msgstr "This plan does not exist"
 
 #: html/ajax_misc.php:571 html/ajax_misc.php:613 html/ajax_misc.php:408
 #: html/ajax_misc.php:434 html/ajax_misc.php:546 html/ajax_misc.php:548
 #: html/ajax_misc.php:554 html/ajax_misc.php:556 html/ajax_misc.php:560
+#: html/ajax_misc.php:525
 msgid "Ce plugin n'existe pas "
 msgstr "No plugin"
 
@@ -3419,11 +3626,12 @@ msgstr "It could make difference between the balance by accountings and cards"
 #: include/class/acc_ledger.class.php:1665
 #: include/class/acc_ledger.class.php:1674
 #: include/class/acc_ledger.class.php:1690
+#: include/class/acc_ledger.class.php:1680
 msgid "Celui qui paie n' a pas de poste comptable"
 msgstr "Has no accounting entry"
 
 #: include/param_sec.inc.php:228 include/param_sec.inc.php:162
-#: include/param_sec.inc.php:168
+#: include/param_sec.inc.php:168 include/param_sec.inc.php:173
 msgid "Cet utilisateur est administrateur, il a tous les droits"
 msgstr "This user is an adminstrator and has a full access "
 
@@ -3440,7 +3648,8 @@ msgstr "This user does not exist"
 #: include/lib/ac_common.php:431 include/action.common.inc.php:129
 #: include/lib/ac_common.php:432 include/action.common.inc.php:131
 #: include/action.common.inc.php:165 include/lib/ac_common.php:434
-#: include/lib/ac_common.php:450
+#: include/lib/ac_common.php:450 include/action.common.inc.php:133
+#: include/action.common.inc.php:167 include/lib/ac_common.php:460
 msgid "Cette action ne vous est pas autorisée Contactez votre responsable"
 msgstr "This work is not allowed, please contact your administrator"
 
@@ -3458,6 +3667,7 @@ msgstr "This category has no email attribute"
 #: include/fiche.inc.php:290 include/fiche.inc.php:363
 #: include/fiche.inc.php:366 include/fiche.inc.php:367
 #: include/fiche.inc.php:368 include/fiche.inc.php:375
+#: include/fiche.inc.php:385
 msgid "Cette catégorie n'ayant pas de poste comptable n'a pas de balance"
 msgstr "This record has no valid accounting "
 
@@ -3519,6 +3729,8 @@ msgstr "This note is not yours"
 #: include/class/acc_ledger.class.php:221
 #: include/class/acc_ledger.class.php:235
 #: include/class/acc_ledger.class.php:239
+#: include/class/acc_ledger.class.php:234
+#: include/class/acc_ledger.class.php:238
 msgid "Cette opération n'existe pas"
 msgstr "This account does not exist"
 
@@ -3533,11 +3745,13 @@ msgid "Champ \"linetype\" vide mais autres valeurs présentes"
 msgstr "COlumn \"linetype\" empty but other values present"
 
 #: html/test_class.php:231 dev/test/test_class.php:227
+#: dev-2/test/test_class.php:227
 msgid "Change de langue"
 msgstr "Change the language"
 
 #: html/admin/template_config_form.php:39
 #: include/template/template_config_form.php:39
+#: include/template/template_config_form.php:40
 msgid "Changement de langue"
 msgstr "Select your language"
 
@@ -3567,7 +3781,7 @@ msgid "Changer format"
 msgstr "Change format"
 
 #: include/company.inc.php:123 include/company.inc.php:142
-#: include/company.inc.php:146
+#: include/company.inc.php:146 include/company.inc.php:160
 msgid "Changer le libellé des détails"
 msgstr "Change the label details"
 
@@ -3601,6 +3815,7 @@ msgid "Chargement"
 msgstr "Loading"
 
 #: include/database.item.php:89 include/database.item.php:87
+#: include/database.item.php:88
 msgid ""
 "Chargement de modèles de documents qui seront générés par NOALYSS, les "
 "formats utilisables sont libreoffice, html, text et rtf"
@@ -3618,7 +3833,7 @@ msgstr ""
 
 #: include/user_menu.php:153 include/user_menu.php:157
 #: include/lib/user_menu.php:166 include/lib/user_menu.php:179
-#: include/lib/user_menu.php:137
+#: include/lib/user_menu.php:137 include/lib/user_menu.php:136
 msgid "Charges"
 msgstr "Expenses"
 
@@ -3631,6 +3846,7 @@ msgstr "Path"
 
 #: html/admin/template_config_form.php:43
 #: include/template/template_config_form.php:43
+#: include/template/template_config_form.php:44
 msgid "Chemin complet vers les executable de Postgresql"
 msgstr "full path to postgresql"
 
@@ -3684,6 +3900,11 @@ msgstr "full path to postgresql"
 #: include/class/fiche.class.php:2247 html/ajax_misc.php:464
 #: include/lib/manage_table_sql.class.php:634 html/ajax_misc.php:468
 #: include/ajax/ajax_card.php:292 include/class/acc_ledger.class.php:2201
+#: html/ajax_misc.php:433 include/class/pre_operation.class.php:346
+#: include/class/acc_ledger.class.php:2220 include/class/fiche.class.php:2274
+#: include/ajax/ajax_card.php:298 include/compta_fin_rec.inc.php:263
+#: include/template/tag_select.php:18 include/template/tag_search_select.php:15
+#: include/lib/manage_table_sql.class.php:681
 #, php-format
 msgid "Cherche"
 msgstr "Search"
@@ -3692,7 +3913,7 @@ msgstr "Search"
 #: include/adm.inc.php:81 include/bank.inc.php:74 include/contact.inc.php:77
 #: include/customer.inc.php:77 include/manager.inc.php:81
 #: include/supplier.inc.php:81 include/adm.inc.php:78
-#: include/customer.inc.php:78
+#: include/customer.inc.php:78 include/contact.inc.php:78
 msgid "Cherche "
 msgstr "Search"
 
@@ -3705,6 +3926,7 @@ msgstr "Search"
 #: include/class/anc_operation.class.php:294 include/fiche.inc.php:94
 #: include/class/acc_ledger_search.class.php:588
 #: include/class/anc_operation.class.php:295
+#: include/class/acc_ledger_search.class.php:674
 msgid "Chercher"
 msgstr "Search"
 
@@ -3730,7 +3952,7 @@ msgid ""
 msgstr "Select the exercice ( N-1 )  to report  for the Report As New"
 
 #: html/ajax_misc.php:452 html/ajax_misc.php:454 html/ajax_misc.php:460
-#: html/ajax_misc.php:462 html/ajax_misc.php:466
+#: html/ajax_misc.php:462 html/ajax_misc.php:466 html/ajax_misc.php:431
 msgid "Choisissez la TVA"
 msgstr "Select the VAT"
 
@@ -3742,7 +3964,7 @@ msgstr "Select the VAT"
 #: html/ajax_card.php:291 html/ajax_card.php:293 html/ajax_card.php:294
 #: include/ajax/ajax_card.php:274 include/ajax/ajax_card.php:275
 #: include/ajax/ajax_card.php:283 include/ajax/ajax_card.php:285
-#: include/ajax/ajax_card.php:286
+#: include/ajax/ajax_card.php:286 include/ajax/ajax_card.php:292
 msgid ""
 "Choisissez la catégorie de fiche à laquelle vous aimeriez ajouter une fiche"
 msgstr "Select the category of card"
@@ -3774,6 +3996,7 @@ msgstr "Select card or accounting "
 #: include/balance.inc.php:47 include/impress_bilan.inc.php:51
 #: include/impress_jrn.inc.php:86 include/ext/bilan_interne/index.php:56
 #: include/balance.inc.php:51 include/impress_jrn.inc.php:104
+#: include/impress_bilan.inc.php:54
 msgid "Choisissez un autre exercice"
 msgstr "Select another year"
 
@@ -3783,6 +4006,8 @@ msgstr "Select your folder"
 
 #: include/class/payment_method_mtable.class.php:77
 #: include/class/payment_method_mtable.class.php:87
+#: include/class/payment_method_mtable.class.php:78
+#: include/class/payment_method_mtable.class.php:88
 msgid "Choisissez un journal"
 msgstr "Select a ledger"
 
@@ -3797,13 +4022,14 @@ msgid "Choisissez un poste"
 msgstr "Select an accouting"
 
 #: include/class/payment_method_mtable.class.php:115
+#: include/class/payment_method_mtable.class.php:120
 msgid "Choisissez un type de fiche"
 msgstr "Select a type of card"
 
 #: html/ajax_card.php:295 html/ajax_card.php:297 html/ajax_card.php:298
 #: include/ajax/ajax_card.php:278 include/ajax/ajax_card.php:279
 #: include/ajax/ajax_card.php:285 include/ajax/ajax_card.php:287
-#: include/ajax/ajax_card.php:288
+#: include/ajax/ajax_card.php:288 include/ajax/ajax_card.php:294
 msgid "Choisissez une catégorie svp"
 msgstr "Select a category"
 
@@ -3835,16 +4061,23 @@ msgstr "Choose another year"
 msgid "Choississez un dossier"
 msgstr "Select your folder"
 
+#: include/template/followup-show-action-add.php:34
+msgid "Choississez une action"
+msgstr "Select an action"
+
 #: html/user_login.php:160
 msgid "Choississez votre dossier"
 msgstr "Select your folder"
 
 #: html/test_class.php:218 dev/test/test_class.php:214
+#: dev-2/test/test_class.php:214
 msgid "Choississez votre langue"
 msgstr "Select your language"
 
 #: include/ajax_anc_search.php:78 include/ajax_anc_search.php:79
 #: include/ajax/ajax_anc_search.php:78 include/ajax/ajax_anc_search.php:79
+#: include/class/card_attribut_mtable.class.php:54
+#: include/class/contact_option_ref_mtable.class.php:44
 msgid "Choix"
 msgstr "Choice"
 
@@ -3879,12 +4112,14 @@ msgstr "choice of distribution key"
 #: include/ajax/ajax_card.php:259 include/ajax/ajax_card.php:269
 #: include/ajax/ajax_card.php:334 include/ajax/ajax_card.php:280
 #: include/ajax/ajax_card.php:337 include/ajax/ajax_card.php:281
-#: include/ajax/ajax_card.php:338
+#: include/ajax/ajax_card.php:338 include/ajax/ajax_card.php:287
+#: include/ajax/ajax_card.php:357
 msgid "Choix de la catégorie"
 msgstr "Category"
 
 #: include/database.item.php:78 include/database.item.php:81
 #: include/database.item.php:75 include/database.item.php:73
+#: include/database.item.php:74
 msgid "Choix de votre dossier"
 msgstr "Select your folder"
 
@@ -3908,6 +4143,7 @@ msgstr "Selected folder %s"
 #: include/compta_ach.inc.php:83 include/compta_ach.inc.php:86
 #: include/compta_ven.inc.php:95 include/compta_ach.inc.php:88
 #: include/compta_ach.inc.php:90 include/compta_ven.inc.php:97
+#: include/compta_ach.inc.php:87
 msgid "Choix du dépôt"
 msgstr "select warehouse"
 
@@ -3933,10 +4169,12 @@ msgstr "Select the type of paper"
 #: include/class/acc_ledger.class.php:2328
 #: include/class/acc_ledger.class.php:2337
 #: include/class/acc_ledger.class.php:2359
+#: include/class/acc_ledger.class.php:2385
 msgid "Choix du type de journal est obligatoire"
 msgstr "Select the type of ledger"
 
 #: include/class/tva_rate_mtable.class.php:250
+#: include/class/tva_rate_mtable.class.php:267
 msgid "Choix incorrect"
 msgstr "Incorrect select"
 
@@ -3999,7 +4237,7 @@ msgstr "Key"
 #: include/ext/coprop/index.php:44 include/database.item.php:3
 #: include/database.item.php:143 include/database.item.php:139
 #: include/database.item.php:138 include/database.item.php:131
-#: include/database.item.php:129
+#: include/database.item.php:129 include/database.item.php:130
 msgid "Clef de répartition"
 msgstr "Key distribution"
 
@@ -4058,6 +4296,12 @@ msgstr "Invalid key"
 #: include/class/print_ledger_simple.class.php:103
 #: include/class/acc_ledger_sold.class.php:1083
 #: include/class/acc_ledger_sold.class.php:1339
+#: include/class/pre_op_ach.class.php:394
+#: include/class/pre_op_ven.class.php:392
+#: include/class/acc_ledger_sold.class.php:710
+#: include/class/acc_ledger_sold.class.php:1050
+#: include/class/acc_ledger_sold.class.php:1306
+#: include/class/print_ledger_simple.class.php:100 include/database.item.php:16
 msgid "Client"
 msgstr "Customer"
 
@@ -4081,6 +4325,7 @@ msgstr "Customers(c)"
 
 #: include/template/param_jrn.php:194 include/template/param_jrn.php:201
 #: include/template/param_jrn.php:203 include/template/param_jrn.php:248
+#: include/template/param_jrn.php:249
 msgid "Clients (D)"
 msgstr "Customers(c)"
 
@@ -4105,7 +4350,7 @@ msgstr "Click here to update your preference"
 #: include/lib/ac_common.php:816 include/lib/ac_common.php:823
 #: include/lib/ac_common.php:834 include/lib/ac_common.php:835
 #: include/lib/ac_common.php:847 include/lib/ac_common.php:849
-#: include/lib/ac_common.php:865
+#: include/lib/ac_common.php:865 include/lib/ac_common.php:875
 msgid "Cliquez ici pour vous reconnecter dans une autre page"
 msgstr "Click here to reconnect in another tab"
 
@@ -4137,6 +4382,11 @@ msgstr "Impossible action"
 msgid "Cloner"
 msgstr "Clone"
 
+#: include/class/card_attribut_mtable.class.php:57
+#: include/class/contact_option_ref_mtable.class.php:46
+msgid "Coche"
+msgstr "Checkbox"
+
 #: include/param_pcmn.inc.php:65 include/template/pcmn_update.php:50
 #: include/template/pcmn_update.php:51
 msgid "Cocher pour effacer"
@@ -4234,6 +4484,10 @@ msgstr "Tick ​​to delete this record"
 #: include/class/acc_ledger_sold.class.php:718
 #: include/class/acc_ledger_purchase.class.php:1440
 #: include/upgrade-plugin.php:68
+#: include/class/acc_ledger_purchase.class.php:1451
+#: include/class/acc_ledger_sold.class.php:721
+#: include/class/print_ledger_detail_item.class.php:58
+#: include/upgrade-plugin.php:71
 msgid "Code"
 msgstr "Code"
 
@@ -4246,7 +4500,7 @@ msgstr "Code"
 #: include/lib/ac_common.php:1160 include/lib/ac_common.php:1171
 #: include/lib/ac_common.php:1172 include/lib/ac_common.php:1173
 #: include/lib/ac_common.php:1185 include/lib/ac_common.php:1187
-#: include/lib/ac_common.php:1211
+#: include/lib/ac_common.php:1211 include/lib/ac_common.php:1221
 msgid "Code Interne"
 msgstr "Internal code"
 
@@ -4276,6 +4530,8 @@ msgstr "Internal code"
 #: include/class/acc_ledger_purchase.class.php:1836
 #: include/class/acc_ledger_sold.class.php:1416
 #: include/class/acc_ledger_purchase.class.php:1842
+#: include/class/acc_ledger_purchase.class.php:1879
+#: include/class/acc_ledger_sold.class.php:1401
 msgid "Code Item"
 msgstr "Code"
 
@@ -4292,7 +4548,7 @@ msgid "Code Pays incorrect"
 msgstr "Country code incorrect"
 
 #: include/company.inc.php:107 include/company.inc.php:126
-#: include/company.inc.php:130
+#: include/company.inc.php:130 include/company.inc.php:138
 msgid "Code Postal"
 msgstr "ZIP Code"
 
@@ -4352,6 +4608,12 @@ msgstr "Stock"
 #: include/class/print_ledger_detail_item.class.php:163
 #: include/class/acc_ledger_sold.class.php:1426
 #: include/class/acc_ledger_purchase.class.php:1852
+#: include/class/acc_ledger_purchase.class.php:1889
+#: include/class/acc_ledger_sold.class.php:1411
+#: include/export/export_printtva_pdf.php:59
+#: include/export/export_printtva_pdf.php:216
+#: include/template/follow_up_detail_display.php:54
+#: include/template/newEmptyPHP_NOALYSS.php:39
 msgid "Code TVA"
 msgstr "VAT Code"
 
@@ -4400,6 +4662,8 @@ msgstr "Menu code"
 #: include/class/acc_ledger_purchase.class.php:1841
 #: include/class/acc_ledger_sold.class.php:1421
 #: include/class/acc_ledger_purchase.class.php:1847
+#: include/class/acc_ledger_purchase.class.php:1884
+#: include/class/acc_ledger_sold.class.php:1406
 msgid "Code fournisseur"
 msgstr "Dealer code"
 
@@ -4411,6 +4675,7 @@ msgstr "Dealer code"
 #: include/class/fiche.class.php:1457
 #: include/class/acc_account_ledger.class.php:395
 #: include/class/fiche.class.php:1458 include/class/fiche.class.php:1460
+#: include/class/acc_account_ledger.class.php:387
 msgid "Code interne"
 msgstr "Internal code"
 
@@ -4452,6 +4717,8 @@ msgstr "Invalid code"
 #: include/class/acc_ledger_purchase.class.php:1833
 #: include/class/acc_ledger_sold.class.php:1413
 #: include/class/acc_ledger_purchase.class.php:1839
+#: include/class/acc_ledger_purchase.class.php:1876
+#: include/class/acc_ledger_sold.class.php:1398
 msgid "Code journal"
 msgstr "Ledger code"
 
@@ -4460,6 +4727,11 @@ msgstr "Ledger code"
 msgid "Code malformé dans le fichier "
 msgstr "Malformed code"
 
+#: include/class/acc_ledger_history_sale.class.php:274
+#: include/class/acc_ledger_history_purchase.class.php:289
+msgid "Code paiement"
+msgstr "Payment code"
+
 #: include/ext/transform/include/template/listing_assujetti_declarant.php:35
 #: include/ext/transform/include/template/listing_assujetti_representative.php:36
 #: include/ext/sav/include/template/sas_display_detail.php:99
@@ -4490,6 +4762,7 @@ msgstr "Code not used"
 #: include/export/export_fiche_balance_csv.php:155
 #: include/export/export_fiche_balance_csv.php:156 include/fiche.inc.php:519
 #: include/fiche.inc.php:521 include/fiche.inc.php:530
+#: include/fiche.inc.php:543
 msgid "Comm"
 msgstr "How"
 
@@ -4501,7 +4774,7 @@ msgstr "Unknow command"
 #: html/install.php:533 html/install.php:532 html/install.php:530
 #: html/install.php:536 html/install.php:528 html/install.php:534
 #: html/install.php:496 html/install.php:471 html/install.php:477
-#: html/install.php:480
+#: html/install.php:480 html/install.php:529
 msgid "Commencer la mise à jour ou l'installation"
 msgstr "Start the uprade or the installation"
 
@@ -4555,6 +4828,14 @@ msgstr "Start the uprade or the installation"
 #: include/class/acc_ledger_history_generic.class.php:687
 #: include/class/acc_ledger_sold.class.php:1415
 #: include/class/acc_ledger_purchase.class.php:1841
+#: include/class/print_ledger_misc.class.php:46
+#: include/class/acc_ledger_purchase.class.php:1878
+#: include/class/acc_ledger_sold.class.php:1400
+#: include/class/acc_ledger_history_generic.class.php:688
+#: include/template/action_document_type_mtable_input.php:113
+#: include/template/detail-action.php:297
+#: include/template/detail-action.php:327
+#: include/template/detail-action.php:332
 msgid "Commentaire"
 msgstr "How"
 
@@ -4589,6 +4870,8 @@ msgstr "Comment"
 #: include/class/acc_ledger_purchase.class.php:1843
 #: include/class/acc_ledger_sold.class.php:1423
 #: include/class/acc_ledger_purchase.class.php:1849
+#: include/class/acc_ledger_purchase.class.php:1886
+#: include/class/acc_ledger_sold.class.php:1408
 msgid "Commentaire TVA"
 msgstr "Comment VAT"
 
@@ -4597,7 +4880,7 @@ msgid "Commentaire vide"
 msgstr "Empty comment"
 
 #: include/company.inc.php:109 include/company.inc.php:128
-#: include/company.inc.php:132
+#: include/company.inc.php:132 include/company.inc.php:140
 msgid "Commune"
 msgstr "Department"
 
@@ -4647,12 +4930,15 @@ msgstr "Department"
 #: include/class/acc_ledger_purchase.class.php:1462
 #: include/class/acc_ledger.class.php:622
 #: include/class/acc_ledger.class.php:638
+#: include/class/acc_ledger_purchase.class.php:1473
+#: include/class/acc_ledger_sold.class.php:741
 msgid "Compt. Analytique"
 msgstr "Cost Accounting"
 
 #: include/database.item.php:115 include/database.item.php:118
 #: include/database.item.php:124 include/database.item.php:121
 #: include/database.item.php:120 include/database.item.php:116
+#: include/database.item.php:117
 msgid "Compta Analytique"
 msgstr "Analytic accountancy"
 
@@ -4662,12 +4948,13 @@ msgstr "Analytic accountancy"
 #: include/class/class_pdf_operation.php:371
 #: include/template/security_list_action.php:63
 #: include/class/pdf_operation.class.php:371 include/database.item.php:76
-#: include/template/security_list_action.php:66
+#: include/template/security_list_action.php:66 include/database.item.php:75
 msgid "Comptabilité"
 msgstr "Accountancy"
 
 #: include/template/ledger_detail_bottom.php:36
 #: include/template/ledger_detail_bottom.php:41
+#: include/template/ledger_detail_bottom.php:46
 msgid "Comptabilité Analytique"
 msgstr "Cost Accounting"
 
@@ -4676,6 +4963,7 @@ msgstr "Cost Accounting"
 #: include/database.item.php:184 include/database.item.php:143
 #: include/database.item.php:144 include/database.item.php:145
 #: include/database.item.php:150 include/database.item.php:155
+#: include/database.item.php:151
 msgid "Compte bancaire"
 msgstr "Bank account"
 
@@ -4726,12 +5014,13 @@ msgstr "reverse account : produt with a credit result"
 #: include/class/acc_plan_mtable.class.php:145
 #: include/class/acc_plan_mtable.class.php:157
 #: include/class/acc_plan_mtable.class.php:181
+#: include/class/acc_plan_mtable.class.php:185
 msgid "Compte parent n'existe pas"
 msgstr "Parent accounting doesn't exist"
 
 #: include/user_menu.php:151 include/user_menu.php:155
 #: include/lib/user_menu.php:164 include/lib/user_menu.php:177
-#: include/lib/user_menu.php:135
+#: include/lib/user_menu.php:135 include/lib/user_menu.php:134
 msgid "Compte tiers"
 msgstr "Other account"
 
@@ -4768,6 +5057,8 @@ msgstr "Accounting"
 #: include/class/acc_ledger_search.class.php:950
 #: include/class/acc_ledger_search.class.php:708
 #: include/class/acc_ledger_search.class.php:963
+#: include/class/acc_ledger_search.class.php:794
+#: include/class/acc_ledger_search.class.php:1052
 msgid "Concerne"
 msgstr "Regarding"
 
@@ -4776,7 +5067,7 @@ msgstr "Regarding"
 #: include/database.item.php:235 include/database.item.php:212
 #: include/database.item.php:213 include/database.item.php:216
 #: include/database.item.php:236 include/database.item.php:214
-#: include/database.item.php:245
+#: include/database.item.php:245 include/database.item.php:226
 msgid ""
 "Concerne tous les achats, factures reçues, notes de crédit reçues et notes "
 "de frais"
@@ -4786,7 +5077,7 @@ msgstr "Related to all sales, credit notes sent"
 #: include/database.item.php:236 include/database.item.php:213
 #: include/database.item.php:214 include/database.item.php:217
 #: include/database.item.php:237 include/database.item.php:215
-#: include/database.item.php:243
+#: include/database.item.php:243 include/database.item.php:224
 msgid ""
 "Concerne tous les mouvements financiers (comptes en banque, caisses, visa...)"
 msgstr "Balance of bank accounts, cash ..."
@@ -4796,7 +5087,7 @@ msgstr "Balance of bank accounts, cash ..."
 #: include/database.item.php:237 include/database.item.php:214
 #: include/database.item.php:215 include/database.item.php:218
 #: include/database.item.php:238 include/database.item.php:216
-#: include/database.item.php:242
+#: include/database.item.php:242 include/database.item.php:223
 msgid ""
 "Concerne toutes les opérations comme les amortissements, les comptes TVA, ..."
 msgstr "Concerns all operations like VAT Accounting,..."
@@ -4806,13 +5097,13 @@ msgstr "Concerns all operations like VAT Accounting,..."
 #: include/database.item.php:238 include/database.item.php:215
 #: include/database.item.php:216 include/database.item.php:219
 #: include/database.item.php:239 include/database.item.php:217
-#: include/database.item.php:244
+#: include/database.item.php:244 include/database.item.php:225
 msgid "Concerne toutes les ventes, notes de crédit envoyées"
 msgstr "Relates to all sales, credit notes sent"
 
 #: include/database.item.php:10 include/database.item.php:13
 #: include/database.item.php:15 include/database.item.php:18
-#: include/database.item.php:12
+#: include/database.item.php:12 include/database.item.php:11
 msgid "Config. Menu"
 msgstr "Config. Menu"
 
@@ -4826,14 +5117,14 @@ msgstr "Config. category of documents"
 
 #: include/database.item.php:8 include/database.item.php:11
 #: include/database.item.php:13 include/database.item.php:16
-#: include/database.item.php:10
+#: include/database.item.php:10 include/database.item.php:9
 msgid "Config. de la tva"
 msgstr "VAT setting"
 
 #: include/database.item.php:121 include/database.item.php:124
 #: include/database.item.php:130 include/database.item.php:126
 #: include/database.item.php:125 include/database.item.php:129
-#: include/database.item.php:123
+#: include/database.item.php:123 include/database.item.php:122
 msgid "Config. des méthodes de paiement"
 msgstr "Payment method configuration"
 
@@ -4847,6 +5138,7 @@ msgstr "Config. Chart of Accounts"
 #: include/database.item.php:87 include/database.item.php:90
 #: include/database.item.php:95 include/database.item.php:92
 #: include/database.item.php:91 include/database.item.php:89
+#: include/database.item.php:88
 msgid "Config. modèle de document"
 msgstr "Of paper template parameters"
 
@@ -4860,18 +5152,20 @@ msgstr "Config accountancy"
 #: html/admin/setup.php:236 html/admin/setup.php:254 html/admin/setup.php:256
 #: html/install.php:320 html/install.php:319 html/install.php:317
 #: html/install.php:323 html/install.php:329 html/install.php:280
-#: html/install.php:287 html/install.php:290
+#: html/install.php:287 html/install.php:290 html/install.php:339
 msgid "Configuration"
 msgstr "Setting"
 
 #: include/database.item.php:109 include/database.item.php:112
 #: include/database.item.php:118 include/database.item.php:115
 #: include/database.item.php:114 include/database.item.php:110
+#: include/database.item.php:111
 msgid "Configuration de catégorie de fiches"
 msgstr "Configuration category pages"
 
 #: include/database.item.php:94 include/database.item.php:97
 #: include/database.item.php:91 include/database.item.php:89
+#: include/database.item.php:90
 msgid ""
 "Configuration de la sécurité, vous permet de donner un profil à vos "
 "utilisateurs, cela leur permettra d'utiliser ce que vous souhaitez qu'ils "
@@ -4880,42 +5174,46 @@ msgstr ""
 "Setting of the security , let you give a profile to your user , so they will "
 "be able to access the menu you decided"
 
-#: include/database.item.php:139
+#: include/database.item.php:139 include/database.item.php:138
 msgid "Configuration des devises"
 msgstr "Configuration currency"
 
 #: include/database.item.php:106 include/database.item.php:109
 #: include/database.item.php:115 include/database.item.php:112
 #: include/database.item.php:111 include/database.item.php:107
+#: include/database.item.php:108
 msgid "Configuration des dépôts"
 msgstr "Repository configuration"
 
 #: include/database.item.php:112 include/database.item.php:115
 #: include/database.item.php:109 include/database.item.php:107
+#: include/database.item.php:108
 msgid "Configuration des entrepots de dépôts"
 msgstr "Repository configuration"
 
 #: include/database.item.php:88 include/database.item.php:91
 #: include/database.item.php:96 include/database.item.php:93
 #: include/database.item.php:92 include/database.item.php:90
+#: include/database.item.php:89
 msgid "Configuration des journaux"
 msgstr "Ledger setting"
 
 #: include/database.item.php:10 include/database.item.php:13
 #: include/database.item.php:15 include/database.item.php:18
-#: include/database.item.php:12
+#: include/database.item.php:12 include/database.item.php:11
 msgid "Configuration des menus et plugins"
 msgstr "Setting menus and plugins"
 
 #: include/database.item.php:126 include/database.item.php:129
 #: include/database.item.php:135 include/database.item.php:131
 #: include/database.item.php:130 include/database.item.php:134
-#: include/database.item.php:128
+#: include/database.item.php:128 include/database.item.php:127
 msgid "Configuration des menus par défaut"
 msgstr "Configuring default menu"
 
 #: include/database.item.php:131 include/database.item.php:134
 #: include/database.item.php:128 include/database.item.php:126
+#: include/database.item.php:127
 msgid ""
 "Configuration des menus par défaut, ces menus sont appelés par des actions "
 "dans d'autres menus"
@@ -4923,6 +5221,7 @@ msgstr "Configuration of default menu, called from other action"
 
 #: include/database.item.php:126 include/database.item.php:129
 #: include/database.item.php:123 include/database.item.php:121
+#: include/database.item.php:122
 msgid ""
 "Configuration des moyens de paiements que vous voulez utiliser dans les "
 "journaux de type VEN ou ACH, les moyens de paiement permettent de générer "
@@ -4934,6 +5233,7 @@ msgstr ""
 
 #: include/database.item.php:81 include/database.item.php:84
 #: include/database.item.php:78 include/database.item.php:76
+#: include/database.item.php:77
 msgid ""
 "Configuration des profils des utilisateurs, permet de fixer les journaux, "
 "profils dans les documents et stock que  ce profil peut utiliser. Cela "
@@ -4951,6 +5251,7 @@ msgstr "Configuration tags"
 
 #: include/database.item.php:85 include/database.item.php:88
 #: include/database.item.php:82 include/database.item.php:80
+#: include/database.item.php:81
 msgid ""
 "Configuration des tags ou dossiers, on l'appele tag ou dossier suivant la "
 "façon dont vous utilisez \n"
@@ -4966,6 +5267,7 @@ msgstr "Setting SYNDICAT plugin"
 #: include/database.item.php:106 include/database.item.php:109
 #: include/database.item.php:115 include/database.item.php:112
 #: include/database.item.php:111 include/database.item.php:107
+#: include/database.item.php:108
 msgid "Configuration dépôts"
 msgstr "Warehouse configuration"
 
@@ -4976,6 +5278,7 @@ msgstr "Configuration and parameter"
 #: include/database.item.php:4 include/database.item.php:144
 #: include/database.item.php:140 include/database.item.php:139
 #: include/database.item.php:132 include/database.item.php:130
+#: include/database.item.php:131
 msgid "Configuration extension"
 msgstr "Configuration plugin"
 
@@ -5051,7 +5354,7 @@ msgstr "You are not an administrator"
 #: html/install.php:635 html/install.php:656 html/install.php:657
 #: html/install.php:683 html/install.php:676 html/install.php:655
 #: html/install.php:682 html/install.php:617 html/install.php:644
-#: html/install.php:607 html/install.php:614
+#: html/install.php:607 html/install.php:614 html/install.php:667
 msgid "Connectez-vous à NOALYSS"
 msgstr "Connect to NOALYSS"
 
@@ -5066,6 +5369,10 @@ msgstr "Connect to NOALYSS"
 msgid "Contact"
 msgstr "Contact"
 
+#: include/template/action_document_type_mtable_input.php:86
+msgid "Contacts multiples"
+msgstr "Multiple contacts"
+
 #: include/class/acc_plan_mtable.class.php:57
 #: include/class/acc_plan_mtable.class.php:63
 msgid "Contexte"
@@ -5078,7 +5385,7 @@ msgstr "Context"
 #: html/install.php:300 html/install.php:264 html/install.php:306
 #: html/install.php:215 html/install.php:257 include/opening.inc.php:140
 #: include/opening.inc.php:174 html/install.php:222 html/install.php:225
-#: html/install.php:267
+#: html/install.php:267 html/install.php:272 html/install.php:315
 msgid "Continuer"
 msgstr "Continue"
 
@@ -5166,6 +5473,7 @@ msgstr "Correcting accounting entry"
 #: include/compta_ven.inc.php:119 include/compta_ach.inc.php:115
 #: include/compta_ven.inc.php:123 include/operation_ods_confirm.inc.php:90
 #: include/compta_ven.inc.php:121 include/compta_ach.inc.php:113
+#: include/compta_ach.inc.php:112
 msgid "Corriger"
 msgstr "Correct"
 
@@ -5173,7 +5481,7 @@ msgstr "Correct"
 #: include/database.item.php:207 include/database.item.php:204
 #: include/database.item.php:177 include/database.item.php:178
 #: include/database.item.php:181 include/database.item.php:189
-#: include/database.item.php:194
+#: include/database.item.php:194 include/database.item.php:187
 msgid "Courrier"
 msgstr "Email"
 
@@ -5187,14 +5495,14 @@ msgstr "Folder Creation"
 #: html/admin/setup.php:497 html/install.php:561 html/install.php:560
 #: html/install.php:558 html/install.php:569 html/install.php:567
 #: html/install.php:529 html/install.php:513 html/install.php:519
-#: html/install.php:522
+#: html/install.php:522 html/install.php:572
 msgid "Creation of Modele 1"
 msgstr "Creation template 1"
 
 #: html/admin/setup.php:510 html/install.php:574 html/install.php:573
 #: html/install.php:571 html/install.php:582 html/install.php:580
 #: html/install.php:542 html/install.php:532 html/install.php:538
-#: html/install.php:541
+#: html/install.php:541 html/install.php:591
 msgid "Creation of Modele 2"
 msgstr "Creation template 2"
 
@@ -5208,7 +5516,8 @@ msgstr "Creation template 2"
 #: include/ext/tools/include/anc_grandlivre_ext.class.php:127
 #: include/export/export_poste_detail_pdf.php:104
 #: include/ajax/ajax_display_letter.php:123 include/fiche.inc.php:580
-#: include/fiche.inc.php:589
+#: include/fiche.inc.php:589 include/fiche.inc.php:602
+#: include/ajax/ajax_display_letter.php:141
 msgid "Credit"
 msgstr "Credit"
 
@@ -5240,6 +5549,10 @@ msgstr "Automatic Creation of the accounting entry if only single"
 msgid "Création d'avis et annonces pour les trésoriers"
 msgstr "Create announces from the treasurer"
 
+#: include/template/action_document_type_mtable_input.php:94
+msgid "Création de facture"
+msgstr "Create an invoice"
+
 #: include/ext/tva/class_ext_tva.php:340 include/ext/tva/ext_tva.class.php:340
 #: include/ext/tva/ext_tva.class.php:341
 msgid "Création de l'écriture comptable"
@@ -5247,7 +5560,7 @@ msgstr "Creating the accounting entry"
 
 #: include/database.item.php:13 include/database.item.php:16
 #: include/database.item.php:18 include/database.item.php:21
-#: include/database.item.php:15
+#: include/database.item.php:15 include/database.item.php:14
 msgid "Création de rapport"
 msgstr "Create a report"
 
@@ -5257,6 +5570,7 @@ msgstr "Create advanced report"
 
 #: include/database.item.php:18 include/database.item.php:21
 #: include/database.item.php:15 include/database.item.php:13
+#: include/database.item.php:14
 msgid ""
 "Création de rapport sur mesure, comme les ratios, vous permet de créer des "
 "graphiques de vos données (vente, achat...)"
@@ -5277,6 +5591,7 @@ msgstr "Creation statement for distance call"
 
 #: include/database.item.php:93 include/database.item.php:96
 #: include/database.item.php:90 include/database.item.php:88
+#: include/database.item.php:89
 msgid ""
 "Création et modification des journaux, préfixe des pièces justificatives, "
 "numérotation, catégories de fiches accessibles à ce journal"
@@ -5288,6 +5603,7 @@ msgstr ""
 #: include/database.item.php:211 include/database.item.php:188
 #: include/database.item.php:189 include/database.item.php:192
 #: include/database.item.php:203 include/database.item.php:208
+#: include/database.item.php:198
 msgid "Création, modification et effacement de fiche"
 msgstr "Creation, modification and deletion of record"
 
@@ -5380,7 +5696,14 @@ msgstr "Credit"
 #: include/class/fiche.class.php:1480
 #: include/class/pdfbalance_simple.class.php:57
 #: include/class/acc_ledger_history_generic.class.php:775
-#: include/class/acc_ledger.class.php:630
+#: include/class/acc_ledger.class.php:630 include/fiche.inc.php:419
+#: include/class/fiche.class.php:1507
+#: include/class/acc_account_ledger.class.php:392
+#: include/class/acc_ledger_history_generic.class.php:776
+#: include/class/anc_grandlivre.class.php:234
+#: include/export/export_balance_csv.php:79
+#: include/template/ledger_detail_bottom.php:97
+#: include/operation_ods_new.inc.php:86
 msgid "Crédit"
 msgstr "Credit"
 
@@ -5399,6 +5722,7 @@ msgstr "Add users"
 #: include/database.item.php:219 include/database.item.php:196
 #: include/database.item.php:197 include/database.item.php:200
 #: include/database.item.php:211 include/database.item.php:216
+#: include/database.item.php:206
 msgid "Créer une note publique"
 msgstr "Add a new public note"
 
@@ -5489,13 +5813,21 @@ msgstr "Add a new public note"
 #: include/class/follow_up.class.php:297 include/category_card.inc.php:162
 #: include/class/acc_ledger.class.php:2436 include/fiche.inc.php:116
 #: include/class/acc_ledger.class.php:2445
-#: include/class/acc_ledger.class.php:2476
+#: include/class/acc_ledger.class.php:2476 include/fiche.inc.php:241
+#: include/class/pre_op_ach.class.php:177
+#: include/class/pre_op_ach.class.php:184 include/class/follow_up.class.php:304
+#: include/class/pre_op_ven.class.php:173
+#: include/class/pre_op_ven.class.php:180
+#: include/class/acc_ledger.class.php:2505
+#: include/class/pre_op_advanced.class.php:177 include/bank.inc.php:125
+#: include/supplier.inc.php:130 include/contact.inc.php:131
+#: include/customer.inc.php:128
 msgid "Créer une nouvelle fiche"
 msgstr "Add a new card"
 
 #: html/install.php:264 html/install.php:263 html/install.php:261
 #: html/install.php:266 html/install.php:272 html/install.php:223
-#: html/install.php:230 html/install.php:233
+#: html/install.php:230 html/install.php:233 html/install.php:280
 #, php-format
 msgid "Créez ce fichier %s avec les informations suivantes "
 msgstr "Create this file %s with the following informations"
@@ -5522,7 +5854,7 @@ msgstr "D"
 #: include/class/anc_listing.class.php:85
 #: include/class/pdf_operation.class.php:250
 #: include/class/anc_listing.class.php:87
-#: include/class/pdfbalance_simple.class.php:59
+#: include/class/pdfbalance_simple.class.php:59 include/fiche.inc.php:421
 msgid "D/C"
 msgstr "D / C"
 
@@ -5542,6 +5874,7 @@ msgstr "DIFF"
 #: include/class/acc_ledger_history_purchase.class.php:257
 #: include/class/acc_ledger_history_purchase.class.php:258
 #: include/class/acc_ledger_history_purchase.class.php:262
+#: include/class/acc_ledger_history_purchase.class.php:273
 msgid "DNA"
 msgstr "Unallowed fee"
 
@@ -5558,6 +5891,7 @@ msgstr "Unallowed fee"
 #: include/class/acc_ledger.class.php:2770
 #: include/class/acc_ledger.class.php:2779
 #: include/class/acc_ledger.class.php:2818
+#: include/class/acc_ledger.class.php:2842
 msgid "Dans le dépôt"
 msgstr "In the warehouse"
 
@@ -5566,6 +5900,7 @@ msgid "Dans le journal"
 msgstr "In the ledger"
 
 #: include/lib/database_core.class.php:464
+#: include/lib/database_core.class.php:467
 msgid "Database:get_row retourne trop de lignes"
 msgstr "Database::get_row returns too many rows"
 
@@ -5790,7 +6125,32 @@ msgstr "Database::get_row returns too many rows"
 #: include/class/acc_ledger_sold.class.php:1406
 #: include/class/acc_ledger.class.php:617
 #: include/class/acc_ledger.class.php:830
-#: include/class/acc_ledger_purchase.class.php:1832
+#: include/class/acc_ledger_purchase.class.php:1832 include/fiche.inc.php:540
+#: include/class/acc_ledger_history_sale.class.php:252
+#: include/class/acc_ledger_search.class.php:724
+#: include/class/acc_ledger_search.class.php:1046
+#: include/class/acc_ledger_history_purchase.class.php:264
+#: include/class/acc_ledger.class.php:818
+#: include/class/print_ledger_misc.class.php:42
+#: include/class/fiche.class.php:1424 include/class/fiche.class.php:1499
+#: include/class/card_attribut_mtable.class.php:52
+#: include/class/acc_ledger_purchase.class.php:1418
+#: include/class/acc_ledger_purchase.class.php:1869
+#: include/class/acc_ledger_sold.class.php:690
+#: include/class/acc_ledger_sold.class.php:1391
+#: include/class/print_ledger_simple.class.php:97
+#: include/class/contact_option_ref_mtable.class.php:45
+#: include/class/acc_account_ledger.class.php:384
+#: include/class/print_ledger_detail_item.class.php:56
+#: include/class/acc_ledger_history_generic.class.php:684
+#: include/class/acc_ledger_history_generic.class.php:771
+#: include/class/anc_grandlivre.class.php:225
+#: include/ajax/ajax_display_letter.php:68
+#: include/export/export_printtva_pdf.php:47
+#: include/export/export_ledger_csv.php:227
+#: include/export/export_histo_csv.php:41
+#: include/template/form_ledger_detail.php:25
+#: include/template/detail-action.php:102 include/lib/ac_common.php:1220
 #, php-format
 msgid "Date"
 msgstr "Date"
@@ -5819,11 +6179,16 @@ msgstr "Date Acquisition"
 msgid "Date DMY"
 msgstr "Date DMY"
 
+#: include/class/follow_up.class.php:620
+msgid "Date Doc."
+msgstr "Date"
+
 #: include/ext/sav/include/template/sas_display_detail.php:141
 #: include/ajax/ajax_display_letter.php:98
 #: include/ajax/ajax_display_letter.php:103 include/class/periode.class.php:517
 #: include/class/periode_ledger_table.class.php:98
 #: include/class/periode.class.php:519 include/class/periode.class.php:521
+#: include/class/periode.class.php:522 include/ajax/ajax_display_letter.php:119
 msgid "Date Début"
 msgstr "Start date"
 
@@ -5837,10 +6202,15 @@ msgstr "Start date"
 #: include/ajax/ajax_display_letter.php:116 include/class/periode.class.php:518
 #: include/class/periode_ledger_table.class.php:99
 #: include/class/periode.class.php:520 include/database.item.php:179
-#: include/class/periode.class.php:522
+#: include/class/periode.class.php:522 include/class/periode.class.php:523
+#: include/ajax/ajax_display_letter.php:134 include/database.item.php:175
 msgid "Date Fin"
 msgstr "End Date"
 
+#: include/class/follow_up.class.php:622
+msgid "Date Limite"
+msgstr "Deadline"
+
 #: include/ext/amortis/include/class_amortissement_table_pdf.php:54
 #: include/ext/amortis/include/class_amortissement_material_pdf.php:35
 #: include/ext/amortis/include/class_amortissement_table_pdf.php:42
@@ -5885,6 +6255,7 @@ msgstr "Date of transaction"
 #: include/class/acc_ledger_purchase.class.php:270
 #: include/class/acc_ledger_sold.class.php:225
 #: include/class/acc_ledger_purchase.class.php:269
+#: include/class/acc_ledger_purchase.class.php:271
 msgid "Date de paiement invalide"
 msgstr "Invalid payment date"
 
@@ -5907,6 +6278,7 @@ msgstr "Reminder before"
 #: include/database.item.php:152 include/database.item.php:151
 #: include/database.item.php:144 include/database.item.php:145
 #: include/database.item.php:153 include/database.item.php:156
+#: include/lettering.account.inc.php:82 include/lettering.card.inc.php:78
 msgid "Date début"
 msgstr "Start date"
 
@@ -5937,6 +6309,8 @@ msgstr "Start date for amortization\t"
 #: include/class/acc_ledger.class.php:1055
 #: include/class/acc_ledger.class.php:1060
 #: include/class/acc_ledger.class.php:1076
+#: include/class/acc_ledger.class.php:1072
+#: include/class/acc_ledger_purchase.class.php:106
 msgid "Date et periode ne correspondent pas"
 msgstr "Date and period do not match"
 
@@ -5944,6 +6318,7 @@ msgstr "Date and period do not match"
 #: include/lettering.gestion.inc.php:34
 #: include/ext/tools/include/export_operation.inc.php:33
 #: include/lettering.gestion.inc.php:33 include/lettering.account.inc.php:85
+#: include/lettering.account.inc.php:86 include/lettering.card.inc.php:84
 msgid "Date fin"
 msgstr "End date"
 
@@ -6002,6 +6377,11 @@ msgstr "Date out of bound"
 #: include/class/acc_ledger.class.php:1044
 #: include/class/acc_ledger.class.php:225
 #: include/class/acc_ledger.class.php:1060
+#: include/class/follow_up.class.php:1646
+#: include/class/follow_up.class.php:1648
+#: include/class/acc_ledger.class.php:224
+#: include/class/acc_ledger.class.php:1052
+#: include/class/acc_ledger_purchase.class.php:91
 msgid "Date invalide"
 msgstr "Invalid Date"
 
@@ -6010,6 +6390,7 @@ msgid "Date invalide "
 msgstr "Invalid date"
 
 #: include/fiche.inc.php:278 include/fiche.inc.php:279
+#: include/fiche.inc.php:293
 msgid "Date invalide !"
 msgstr "Invalid date"
 
@@ -6019,7 +6400,7 @@ msgstr "Invalid date"
 #: include/compta_ven.inc.php:217 include/compta_ach.inc.php:205
 #: include/compta_ods.inc.php:130 include/compta_ven.inc.php:222
 #: include/compta_ods.inc.php:132 include/compta_ven.inc.php:220
-#: include/compta_ach.inc.php:203
+#: include/compta_ach.inc.php:203 include/compta_ach.inc.php:202
 msgid "Date invalide, opération non extournée"
 msgstr "Invalid date, operation not reversed"
 
@@ -6027,6 +6408,7 @@ msgstr "Invalid date, operation not reversed"
 #: include/template/detail-action.php:110
 #: include/template/detail-action.php:115
 #: include/template/detail-action.php:114
+#: include/template/detail-action.php:121
 msgid "Date limite"
 msgstr "Deadline"
 
@@ -6037,6 +6419,8 @@ msgstr "Deadline"
 #: include/ajax/ajax_display_letter.php:105
 #: include/ajax/ajax_display_letter.php:96
 #: include/ajax/ajax_display_letter.php:110
+#: include/ajax/ajax_display_letter.php:112
+#: include/ajax/ajax_display_letter.php:128
 msgid "Date malformée"
 msgstr "Date malformed"
 
@@ -6045,6 +6429,7 @@ msgstr "Date malformed"
 #: include/lettering.card.inc.php:76 include/lettering.gestion.inc.php:74
 #: include/lettering.gestion.inc.php:73 include/lettering.account.inc.php:67
 #: include/lettering.account.inc.php:80 include/lettering.account.inc.php:124
+#: include/lettering.account.inc.php:76 include/lettering.card.inc.php:71
 msgid "Date malformée, désolé"
 msgstr "Wrong time sorry"
 
@@ -6094,6 +6479,11 @@ msgstr "Date of operation"
 #: include/class/acc_ledger_history_sale.class.php:263
 #: include/class/acc_ledger_sold.class.php:1407
 #: include/class/acc_ledger_purchase.class.php:1833
+#: include/class/acc_ledger_history_sale.class.php:273
+#: include/class/acc_ledger_history_purchase.class.php:288
+#: include/class/acc_ledger_purchase.class.php:1870
+#: include/class/acc_ledger_sold.class.php:1392
+#: include/export/export_ledger_csv.php:146
 msgid "Date paiement"
 msgstr "Payment date"
 
@@ -6133,12 +6523,15 @@ msgstr "Date of reception"
 #: include/class/acc_ledger_purchase.class.php:1828
 #: include/class/acc_ledger_sold.class.php:1408
 #: include/class/acc_ledger_purchase.class.php:1834
+#: include/class/acc_ledger_purchase.class.php:1871
+#: include/class/acc_ledger_sold.class.php:1393
 msgid "Date échéance"
 msgstr " Limit Date"
 
 #: include/class/acc_ledger_purchase.class.php:276
 #: include/class/acc_ledger_sold.class.php:232
 #: include/class/acc_ledger_purchase.class.php:275
+#: include/class/acc_ledger_purchase.class.php:277
 msgid "Date échéance invalide"
 msgstr "Inavlid limit date"
 
@@ -6152,7 +6545,8 @@ msgstr "Inavlid limit date"
 #: include/ext/tools/include/anc_grandlivre_ext.class.php:126
 #: include/export/export_poste_detail_pdf.php:102
 #: include/ajax/ajax_display_letter.php:122 include/fiche.inc.php:576
-#: include/fiche.inc.php:585
+#: include/fiche.inc.php:585 include/fiche.inc.php:598
+#: include/ajax/ajax_display_letter.php:140
 msgid "Debit"
 msgstr "Debit"
 
@@ -6160,6 +6554,7 @@ msgstr "Debit"
 #: html/ajax_misc.php:400 html/ajax_misc.php:478
 #: include/ajax/ajax_display_letter.php:114
 #: include/ajax/ajax_display_letter.php:119
+#: include/ajax/ajax_display_letter.php:137
 msgid "Debit / Credit"
 msgstr "Debit / Credit"
 
@@ -6216,11 +6611,12 @@ msgstr "Last receipt number for that type of document"
 
 #: include/template/param_jrn.php:102 include/template/param_jrn.php:99
 #: include/template/param_jrn.php:106 include/template/param_jrn.php:108
-#: include/template/param_jrn.php:152
+#: include/template/param_jrn.php:152 include/template/param_jrn.php:153
 msgid "Dernière pièce numérotée"
 msgstr "Last numbered receipt"
 
 #: include/upgrade-plugin.php:105 include/upgrade-plugin.php:117
+#: include/upgrade-plugin.php:120
 msgid "Dernière version installée"
 msgstr "Last installed version"
 
@@ -6233,6 +6629,7 @@ msgstr "Last entries"
 #: html/ajax_misc.php:196 html/ajax_misc.php:274 html/ajax_misc.php:279
 #: html/ajax_misc.php:307 html/ajax_misc.php:399 html/ajax_misc.php:401
 #: html/ajax_misc.php:407 html/ajax_misc.php:409 html/ajax_misc.php:413
+#: include/class/action_document_type_mtable.class.php:149
 msgid "Des actions dépendent de cette catégorie"
 msgstr "Event depends on this category"
 
@@ -6413,6 +6810,27 @@ msgstr "Event depends on this category"
 #: include/class/print_ledger_simple.class.php:108
 #: include/template/param_jrn.php:129 include/modele.inc.php:249
 #: include/modele.inc.php:363 include/database.item.php:160
+#: include/class/acc_ledger_search.class.php:740
+#: include/class/acc_ledger_search.class.php:1049
+#: include/class/acc_ledger_search.class.php:1194
+#: include/class/operation_predef_mtable.class.php:54
+#: include/class/fiche.class.php:1425 include/class/fiche.class.php:1504
+#: include/class/anc_plan.class.php:139 include/class/anc_plan.class.php:155
+#: include/class/print_ledger_simple.class.php:105
+#: include/class/user.class.php:994
+#: include/class/acc_account_ledger.class.php:389
+#: include/export/export_histo_csv.php:47
+#: include/template/follow_up_detail_display.php:51
+#: include/template/tag_select.php:25 include/template/detail-action.php:260
+#: include/template/detail-action.php:280
+#: include/template/detail-action.php:287
+#: include/template/detail-action.php:330
+#: include/template/detail-action.php:486
+#: include/template/tag_search_select.php:24 include/template/tag_list.php:16
+#: include/template/param_jrn.php:130
+#: include/template/newEmptyPHP_NOALYSS.php:36
+#: include/template/card_multiple_result.php:20 include/lib/ac_common.php:1223
+#: include/upgrade-plugin.php:65
 msgid "Description"
 msgstr "Description"
 
@@ -6422,6 +6840,9 @@ msgstr "Description"
 #: include/class/pre_operation.class.php:63
 #: include/ajax/ajax_mod_predf_op.php:43
 #: include/class/pre_operation.class.php:64
+#: include/class/pre_operation.class.php:74
+#: include/ajax/ajax_mod_predf_op.php:56
+#: include/template/pre_operation_display.php:34
 msgid "Description (max 50 car.)"
 msgstr "Description"
 
@@ -6434,9 +6855,18 @@ msgstr "Description"
 #: include/class_anc_key.php:336 include/class_anc_key.php:338
 #: include/class/class_anc_key.php:339 include/class/class_anc_key.php:340
 #: include/class/class_anc_key.php:341 include/class/anc_key.class.php:350
+#: include/class/anc_key.class.php:351
 msgid "Description de la nouvelle clef"
 msgstr "Description of the new key"
 
+#: include/template/action_document_type_mtable_input.php:105
+msgid "Description modifiable"
+msgstr "Editable description"
+
+#: include/class/card_attribut_mtable.class.php:176
+msgid "Description ne peut pas être vide"
+msgstr "The description can not be empty"
+
 #: include/ext/sav/include/template/sas_display_detail.php:188
 msgid "Description panne"
 msgstr "Description"
@@ -6451,6 +6881,10 @@ msgstr ""
 "Sorry the folder creation failed,\n"
 " it is likely due to a duplicate name"
 
+#: include/class/follow_up.class.php:626
+msgid "Dest/Exp"
+msgstr "Recipient"
+
 #: include/template/action_search.php:94 include/template/detail-action.php:65
 #: include/template/action_search_result.php:53
 #: include/template/detail-action.php:125 include/template/detail-action.php:40
@@ -6469,7 +6903,7 @@ msgstr "Recipient"
 msgid "Destinataire invalide"
 msgstr "Invalid recipient"
 
-#: include/database.item.php:139
+#: include/database.item.php:139 include/database.item.php:138
 msgid "Devises"
 msgstr "Currency"
 
@@ -6504,6 +6938,7 @@ msgstr "Cumulated diff"
 #: include/ext/coprop/include/coprop_appel_fond.class.php:252
 #: include/operation_ods_new.inc.php:86
 #: include/class/acc_ledger_fin.class.php:645
+#: include/operation_ods_new.inc.php:87
 msgid "Difference"
 msgstr "Difference"
 
@@ -6545,6 +6980,7 @@ msgstr ""
 "h2>"
 
 #: include/compta_fin_rec.inc.php:299 include/compta_fin_rec.inc.php:300
+#: include/compta_fin_rec.inc.php:341
 msgid "Différence relevé"
 msgstr "Difference"
 
@@ -6580,6 +7016,7 @@ msgstr "Available in the ledgers"
 #: include/database.item.php:190 include/database.item.php:180
 #: include/database.item.php:181 include/database.item.php:184
 #: include/database.item.php:77 include/database.item.php:197
+#: include/database.item.php:76
 msgid "Divers"
 msgstr "Miscelleanous"
 
@@ -6615,7 +7052,9 @@ msgstr "Miscelleanous"
 #: include/class/acc_ledger_search.class.php:696
 #: include/class/acc_ledger_search.class.php:709 include/compta_ven.inc.php:186
 #: include/ajax/ajax_ledger.php:323 include/ajax/ajax_ledger.php:352
-#: include/compta_ach.inc.php:174
+#: include/compta_ach.inc.php:174 include/class/document.class.php:177
+#: include/class/acc_ledger_search.class.php:795 include/compta_ach.inc.php:173
+#: include/template/ledger_detail_bottom.php:44 include/database.item.php:88
 msgid "Document"
 msgstr "Document"
 
@@ -6624,13 +7063,14 @@ msgstr "Document"
 #: include/database.item.php:192 include/database.item.php:172
 #: include/database.item.php:173 include/database.item.php:176
 #: include/database.item.php:184 include/database.item.php:189
+#: include/database.item.php:182
 msgid "Document Interne"
 msgstr "Internal Document"
 
 #: include/database.item.php:120 include/database.item.php:123
 #: include/database.item.php:129 include/database.item.php:125
 #: include/database.item.php:124 include/database.item.php:128
-#: include/database.item.php:122
+#: include/database.item.php:122 include/database.item.php:121
 msgid "Document de suivi sous forme de liste"
 msgstr "Consignment as list"
 
@@ -6664,6 +7104,7 @@ msgstr "Document generated only if the payment method is set"
 #: include/template/detail-action.php:377
 #: include/template/detail-action.php:379
 #: include/ext/invoicing/include/invoicing.inc.php:100
+#: include/template/detail-action.php:411
 msgid "Document à générer"
 msgstr "Document to generate"
 
@@ -6701,6 +7142,7 @@ msgstr "Give a name to this template of import"
 #: include/class_pre_operation.php:56 include/class/class_pre_operation.php:56
 #: include/class/pre_operation.class.php:56
 #: include/class/pre_operation.class.php:57
+#: include/class/pre_operation.class.php:67
 msgid "Donnez un nom pour sauver cette opération comme modèle"
 msgstr "Give a name to save this operation as a template"
 
@@ -6750,6 +7192,10 @@ msgid "Donnez une partie du quickcode, nom, description... pour filtrer"
 msgstr ""
 "Give the name of the quickcode, name or firstname, VAT Number ... to filter"
 
+#: include/lib/manage_table_sql.class.php:1107
+msgid "Donnée"
+msgstr "Data"
+
 #: include/action.common.inc.php:99 include/ajax/ajax_ledger.php:152
 #: include/ajax/ajax_remove_submenu.php:29 include/ext/importbank/index.php:146
 #: include/ext/importbank/include/class_import_bank.php:473
@@ -6765,6 +7211,8 @@ msgstr ""
 #: include/ext/importbank/include/import_bank.class.php:463
 #: include/ext/importbank/include/import_bank.class.php:484
 #: include/modele.inc.php:412 include/modele.inc.php:413
+#: include/class/acc_ledger_history.class.php:85
+#: include/compta_fin_rec.inc.php:152 include/compta_fin_rec.inc.php:159
 msgid "Donnée invalide"
 msgstr "Invalid data"
 
@@ -6784,6 +7232,11 @@ msgstr "Info"
 msgid "Données invalides"
 msgstr "Invalid data"
 
+#: include/class/tax_summary.class.php:137
+#: include/class/tax_summary.class.php:154
+msgid "Données manquantes"
+msgstr "Invalid data"
+
 #: include/ac_common.php:782 include/ac_common.php:783
 #: include/ac_common.php:784 include/ac_common.php:792
 #: include/ac_common.php:793 include/ac_common.php:803
@@ -6792,6 +7245,7 @@ msgstr "Invalid data"
 #: include/lib/ac_common.php:812 include/lib/ac_common.php:823
 #: include/lib/ac_common.php:824 include/lib/ac_common.php:836
 #: include/lib/ac_common.php:838 include/lib/ac_common.php:854
+#: include/lib/ac_common.php:864
 msgid "Données non disponibles"
 msgstr "No data available"
 
@@ -6815,7 +7269,7 @@ msgstr "Folder Management"
 #: include/dossier.inc.php:268 include/upgrade.inc.php:78
 #: include/upgrade.inc.php:79 include/dossier.inc.php:271
 #: include/dossier.inc.php:276 include/upgrade.inc.php:80
-#: include/class/dossier.class.php:379
+#: include/class/dossier.class.php:379 include/class/dossier.class.php:385
 msgid "Dossier inexistant"
 msgstr "Folder does not exist"
 
@@ -6827,11 +7281,13 @@ msgstr "Invalid folder"
 #: include/class_user.php:932 include/class_user.php:933
 #: include/class/class_user.php:933 include/class/class_user.php:921
 #: include/class/user.class.php:921 include/class/user.class.php:945
+#: include/class/user.class.php:948
 msgid "Dossier non accessible"
 msgstr "Folder not available"
 
 #: include/user_menu.php:111 include/lib/user_menu.php:117
 #: include/lib/user_menu.php:118 include/lib/user_menu.php:75
+#: include/lib/user_menu.php:74
 msgid "Dossiers"
 msgstr "Folders"
 
@@ -6870,15 +7326,26 @@ msgstr "Staffing"
 #: include/class/acc_ledger_sold.class.php:80
 #: include/class/acc_ledger.class.php:1039
 #: include/class/acc_ledger.class.php:1055
+#: include/class/acc_ledger.class.php:1047
+#: include/class/acc_ledger_purchase.class.php:82
 msgid "Double Encodage"
 msgstr "Double entries"
 
 #: include/cfgfiche.inc.php:143 include/profile.inc.php:355
 #: include/cfgfiche.inc.php:158 include/profile.inc.php:336
 #: include/cfgfiche.inc.php:159
+#: include/class/card_attribut_mtable.class.php:169
 msgid "Doublon"
 msgstr "Duplicate"
 
+#: include/class/action_document_type_mtable.class.php:118
+msgid "Doublon, ce nom existe déjà "
+msgstr "This name is already used"
+
+#: include/class/action_document_type_mtable.class.php:125
+msgid "Doublon, ce préfixe existe déjà "
+msgstr "This accounting already exists"
+
 #: scenario/package_repository.test.php:71
 msgid "Download core"
 msgstr "Download core"
@@ -6893,14 +7360,24 @@ msgstr "From %s to %s"
 #: include/ext/import_account/include/class_impacc_tva.php:76
 #: include/ext/import_account/include/impacc_tva.class.php:64
 #: include/ext/import_account/include/impacc_tva.class.php:76
+#: include/template/ledger_detail_bottom.php:354
 msgid "Duplicate"
 msgstr "Duplicate"
 
+#: include/class/acc_operation.class.php:798
+msgid "Dupliquer"
+msgstr "Duplicate"
+
+#: include/ajax/ajax_ledger.php:589
+msgid "Dupliquer une opération"
+msgstr "Duplicate an operation"
+
 #: include/database.item.php:132 include/database.item.php:135
 #: include/database.item.php:175 include/database.item.php:179
 #: include/database.item.php:178 include/database.item.php:137
 #: include/database.item.php:138 include/database.item.php:139
 #: include/database.item.php:144 include/database.item.php:149
+#: include/database.item.php:145
 msgid "Durée Amortissement"
 msgstr "Amortization term"
 
@@ -6993,7 +7470,16 @@ msgstr "Amortization term"
 #: include/class/pdfbalance_simple.class.php:56
 #: include/class/acc_ledger_history_generic.class.php:774
 #: include/class/acc_ledger.class.php:629
-#: include/class/acc_ledger.class.php:905
+#: include/class/acc_ledger.class.php:905 include/fiche.inc.php:418
+#: include/class/anc_group_operation.class.php:138
+#: include/class/acc_ledger.class.php:893 include/class/fiche.class.php:1506
+#: include/class/acc_account_ledger.class.php:391
+#: include/class/pre_op_advanced.class.php:202
+#: include/class/acc_ledger_history_generic.class.php:775
+#: include/class/anc_grandlivre.class.php:233
+#: include/export/export_balance_csv.php:79
+#: include/template/ledger_detail_bottom.php:96
+#: include/operation_ods_new.inc.php:85
 msgid "Débit"
 msgstr "Debit"
 
@@ -7010,7 +7496,7 @@ msgstr "Debit or credit"
 #: include/class/class_fiche.php:1235 include/class/class_fiche.php:1238
 #: include/class/fiche.class.php:1382 include/class/fiche.class.php:1383
 #: include/class/fiche.class.php:1385 include/class/fiche.class.php:1399
-#: include/class/fiche.class.php:1400
+#: include/class/fiche.class.php:1400 include/class/fiche.class.php:1427
 msgid "Débit/Crédit"
 msgstr "Debit or credit"
 
@@ -7019,7 +7505,7 @@ msgid "Débiteur"
 msgstr "Debit"
 
 #: include/class/periode.class.php:649 include/class/periode.class.php:651
-#: include/class/periode.class.php:653
+#: include/class/periode.class.php:653 include/class/periode.class.php:654
 msgid "Décembre"
 msgstr "December"
 
@@ -7061,6 +7547,7 @@ msgstr "Logout"
 
 #: include/database.item.php:104 include/database.item.php:107
 #: include/database.item.php:101 include/database.item.php:99
+#: include/database.item.php:103
 msgid "Déconnexion "
 msgstr "Disconnect"
 
@@ -7087,6 +7574,8 @@ msgstr "Disconnect"
 #: include/class/acc_ledger_sold.class.php:944
 #: include/class/acc_ledger_purchase.class.php:1702
 #: include/class/acc_ledger_sold.class.php:946
+#: include/class/acc_ledger_purchase.class.php:1724
+#: include/class/acc_ledger_sold.class.php:950
 msgid "Déduction acompte "
 msgstr "Amount already paid"
 
@@ -7129,6 +7618,9 @@ msgstr "Delimiter "
 #: include/class/acc_ledger_purchase.class.php:1438
 #: include/class/acc_ledger_sold.class.php:719
 #: include/class/acc_ledger_purchase.class.php:1441
+#: include/class/acc_ledger_purchase.class.php:1452
+#: include/class/acc_ledger_sold.class.php:722
+#: include/template/form_ledger_detail.php:75
 msgid "Dénomination"
 msgstr "Name"
 
@@ -7138,6 +7630,7 @@ msgid "Dépend"
 msgstr "Depending on"
 
 #: include/template/detail-action.php:168
+#: include/template/detail-action.php:175
 msgid "Dépendant"
 msgstr "Depending on"
 
@@ -7160,6 +7653,7 @@ msgstr "Purchase"
 #: include/database.item.php:183 include/database.item.php:142
 #: include/database.item.php:143 include/database.item.php:144
 #: include/database.item.php:149 include/database.item.php:154
+#: include/database.item.php:150
 msgid "Dépense  charge du grant (partie privé) "
 msgstr "Expenditure charged to the grant (private party)"
 
@@ -7168,7 +7662,7 @@ msgid "Dépense  charge du gérant (partie privé) "
 msgstr "Expense charged to the grant (private part)"
 
 #: include/template/fiche_list.php:89 include/template/fiche_list.php:91
-#: include/template/fiche_list.php:93
+#: include/template/fiche_list.php:93 include/template/fiche_list.php:98
 msgid "Déplacer la sélection  vers"
 msgstr "Move selection to"
 
@@ -7184,11 +7678,12 @@ msgstr "Warehouse"
 #: include/compta_ven.inc.php:92 include/compta_ach.inc.php:86
 #: include/compta_ven.inc.php:95 include/compta_ach.inc.php:88
 #: include/compta_ach.inc.php:90 include/compta_ven.inc.php:97
+#: include/compta_ach.inc.php:87
 msgid "Dépôt"
 msgstr "Warehouse"
 
 #: include/ajax_get_profile.php:123 include/ajax/ajax_get_profile.php:123
-#: include/ajax/ajax_get_profile.php:129
+#: include/ajax/ajax_get_profile.php:129 include/ajax/ajax_get_profile.php:128
 msgid "Dépôt de stock accessible"
 msgstr "Repository not available"
 
@@ -7205,7 +7700,7 @@ msgstr "Warehouse"
 
 #: html/admin/setup.php:75 html/admin/setup.php:78 html/admin/setup.php:129
 #: html/install.php:131 html/install.php:130 html/install.php:136
-#: html/install.php:143
+#: html/install.php:143 html/install.php:156
 msgid "Désactiver le changement de langue (requis pour MacOSX)"
 msgstr "Deactivate the language support"
 
@@ -7213,6 +7708,7 @@ msgstr "Deactivate the language support"
 #: include/class/acc_ledger.class.php:2275
 #: include/class/acc_ledger.class.php:2284
 #: include/class/acc_ledger.class.php:2300
+#: include/class/acc_ledger.class.php:2319
 msgid "Désactivé"
 msgstr "Deactivated"
 
@@ -7261,6 +7757,7 @@ msgstr "Sorry , you are in strict mode , you cannot use this plugin"
 
 #: include/class/fiche.class.php:838 include/class/fiche.class.php:840
 #: include/class/fiche.class.php:843 include/class/fiche.class.php:844
+#: include/class/fiche.class.php:871
 msgid "Désolé, il y a trop de virgule dans le poste comptable "
 msgstr "Sorry too many coma in the accounting"
 
@@ -7307,6 +7804,7 @@ msgstr "Sorry another event  must be saved first"
 #: include/stock_inv_histo.inc.php:107
 #: include/ajax/ajax_anc_detail_operation.php:44
 #: include/class/pdf_operation.class.php:405
+#: include/template/action_document_type_mtable_input.php:66
 msgid "Détail"
 msgstr "Detail"
 
@@ -7354,6 +7852,9 @@ msgstr "Details item"
 #: include/class/acc_ledger_purchase.class.php:1433
 #: include/class/acc_ledger_purchase.class.php:1008
 #: include/class/acc_ledger_purchase.class.php:1436
+#: include/class/pre_op_ach.class.php:263
+#: include/class/acc_ledger_purchase.class.php:1019
+#: include/class/acc_ledger_purchase.class.php:1447
 msgid "Détail articles achetés"
 msgstr "Detail items"
 
@@ -7380,6 +7881,9 @@ msgstr "Detail items"
 #: include/class/acc_ledger_sold.class.php:714
 #: include/class/acc_ledger_sold.class.php:1206
 #: include/class/acc_ledger_sold.class.php:1215
+#: include/class/pre_op_ven.class.php:261
+#: include/class/acc_ledger_sold.class.php:717
+#: include/class/acc_ledger_sold.class.php:1182
 msgid "Détail articles vendus"
 msgstr "Detail sold items"
 
@@ -7413,7 +7917,7 @@ msgstr "Details operation"
 msgid "Détail du dossier ou tag"
 msgstr "Detail of the folder or tag"
 
-#: include/ajax/ajax_tag_detail.php:16
+#: include/ajax/ajax_tag_detail.php:16 include/ajax/ajax_tag_detail.php:18
 msgid "Détail du dossier ou étiquette"
 msgstr "Detail of the folder or tag"
 
@@ -7431,7 +7935,8 @@ msgstr "Plugin detail"
 #: include/ajax/ajax_add_concerned_card.php:44 include/ajax/ajax_card.php:133
 #: include/ajax/ajax_card.php:375 include/export/export_fiche_detail_pdf.php:53
 #: include/ajax/ajax_add_concerned_card.php:48 include/ajax/ajax_card.php:378
-#: include/ajax/ajax_card.php:379
+#: include/ajax/ajax_card.php:379 include/ajax/ajax_card.php:113
+#: include/ajax/ajax_card.php:412 include/ajax/ajax_add_concerned_card.php:56
 msgid "Détail fiche"
 msgstr "Card details"
 
@@ -7440,7 +7945,7 @@ msgstr "Card details"
 #: html/ajax_card.php:563 include/ajax/ajax_card.php:543
 #: include/ajax/ajax_card.php:544 include/ajax/ajax_card.php:545
 #: include/ajax/ajax_card.php:578 include/ajax/ajax_card.php:582
-#: include/ajax/ajax_card.php:605
+#: include/ajax/ajax_card.php:605 include/ajax/ajax_card.php:684
 msgid "Détail fiche (sauvée)"
 msgstr "Card details(saved)"
 
@@ -7448,6 +7953,8 @@ msgstr "Card details(saved)"
 #: include/class/class_pdf_operation.php:422
 #: include/class/pdf_operation.class.php:421
 #: include/class/pdf_operation.class.php:422
+#: include/template/follow_up_detail_display.php:45
+#: include/template/action_document_type_mtable_input.php:73
 msgid "Détail opération"
 msgstr "Details operation"
 
@@ -7468,6 +7975,8 @@ msgstr "Details operation"
 #: include/class/acc_ledger_purchase.class.php:1382
 #: include/class/acc_ledger_sold.class.php:664
 #: include/class/acc_ledger_purchase.class.php:1385
+#: include/class/acc_ledger_purchase.class.php:1396
+#: include/class/acc_ledger_sold.class.php:667
 msgid "Détail opération "
 msgstr "Details operation"
 
@@ -7523,6 +8032,11 @@ msgstr "ERROR"
 #: include/class/acc_ledger_purchase.class.php:1410
 #: include/class/acc_ledger_search.class.php:629
 #: include/class/acc_ledger_search.class.php:642
+#: include/class/acc_ledger_search.class.php:728
+#: include/class/acc_ledger_purchase.class.php:1421
+#: include/class/acc_ledger_sold.class.php:693
+#: include/export/export_histo_csv.php:42
+#: include/template/form_ledger_detail.php:33
 msgid "Echeance"
 msgstr "Limit Date"
 
@@ -7550,6 +8064,7 @@ msgstr "Limit Date"
 #: include/class/acc_ledger_purchase.class.php:1776
 #: include/class/acc_ledger_sold.class.php:1035
 #: include/class/acc_ledger_purchase.class.php:1782
+#: include/class/acc_ledger_purchase.class.php:1806
 msgid "Echeance dépassée"
 msgstr "Missed deadline"
 
@@ -7570,6 +8085,7 @@ msgid "Echec Ajout detail "
 msgstr "Add details failed"
 
 #: include/class/pre_operation.class.php:149
+#: include/class/pre_operation.class.php:550
 #, php-format
 msgid "Echec PreOperatoin chargement %s"
 msgstr "Fail loading operation template"
@@ -7631,6 +8147,8 @@ msgstr "Failure update"
 #: include/class/acc_bilan.class.php:373 include/class/acc_bilan.class.php:394
 #: include/class/acc_bilan.class.php:299 include/class/acc_bilan.class.php:311
 #: include/class/acc_bilan.class.php:375 include/class/acc_bilan.class.php:396
+#: include/class/acc_bilan.class.php:300 include/class/acc_bilan.class.php:312
+#: include/class/acc_bilan.class.php:376 include/class/acc_bilan.class.php:397
 msgid "Echec ouverture fichier "
 msgstr "Error opening file"
 
@@ -7651,6 +8169,7 @@ msgstr "Response Failed"
 #: include/class/pdf_operation.class.php:70
 #: include/class/acc_ledger_sold.class.php:1081
 #: include/class/acc_ledger_sold.class.php:1090
+#: include/class/acc_ledger_sold.class.php:1057
 msgid "Echéance"
 msgstr "Date Limit"
 
@@ -7668,17 +8187,21 @@ msgstr "Limit of payment"
 #: include/export/export_security_pdf.php:147
 #: include/class/profile_menu.class.php:247
 #: include/class/profile_menu.class.php:272
+#: include/class/profile_menu.class.php:248
+#: include/class/profile_menu.class.php:273
 msgid "Ecriture"
 msgstr "Writing"
 
 #: include/template/ledger_detail_bottom.php:31
 #: include/template/ledger_detail_bottom.php:36
+#: include/template/ledger_detail_bottom.php:41
 msgid "Ecriture Comptable"
 msgstr "Accounting writing"
 
 #: include/database.item.php:86 include/database.item.php:89
 #: include/database.item.php:94 include/database.item.php:91
 #: include/database.item.php:90 include/database.item.php:88
+#: include/database.item.php:87
 msgid "Ecriture Ouverture"
 msgstr "Opening writing"
 
@@ -7693,6 +8216,7 @@ msgstr "Accounting records"
 #: include/database.item.php:86 include/database.item.php:89
 #: include/database.item.php:94 include/database.item.php:91
 #: include/database.item.php:90 include/database.item.php:88
+#: include/database.item.php:87
 msgid "Ecriture d'ouverture"
 msgstr "Opening"
 
@@ -7703,6 +8227,7 @@ msgstr "Opening entry %d"
 
 #: include/database.item.php:91 include/database.item.php:94
 #: include/database.item.php:88 include/database.item.php:86
+#: include/database.item.php:87
 msgid ""
 "Ecriture d'ouverture ou écriture à nouveau, reporte les soldes des comptes "
 "de l'année passé du poste comptable 0xxx à 5xxxx sur l'année courante"
@@ -7710,9 +8235,13 @@ msgstr ""
 "Open writing , reput the saldo of accounting of previous exercice 0xxx to "
 "5xxxx  on  current one"
 
+#: include/class/profile_menu.class.php:247
+msgid "Ecriture et suppression"
+msgstr "Writing and removing"
+
 #: html/admin/setup.php:199 html/admin/setup.php:217 html/admin/setup.php:219
 #: html/install.php:225 html/install.php:223 html/install.php:231
-#: html/install.php:182 html/install.php:189
+#: html/install.php:182 html/install.php:189 html/install.php:205
 msgid "Ecriture non possible"
 msgstr "Writing not possible"
 
@@ -7742,7 +8271,7 @@ msgstr "Accounting"
 #: include/ajax/ajax_admin.php:276 include/cfgledger.inc.php:136
 #: include/ajax/ajax_admin.php:254 include/ajax/ajax_admin.php:280
 #: include/ajax/ajax_card.php:171 include/cfgledger.inc.php:139
-#: include/ajax/ajax_card.php:172
+#: include/ajax/ajax_card.php:172 include/ajax/ajax_card.php:175
 msgid "Efface"
 msgstr "Remove"
 
@@ -7753,7 +8282,7 @@ msgstr "Remove this plan"
 
 #: include/action.common.inc.php:208 include/action.common.inc.php:213
 #: include/action.common.inc.php:215 include/action.common.inc.php:216
-#: include/action.common.inc.php:222
+#: include/action.common.inc.php:222 include/action.common.inc.php:243
 msgid "Efface cet événement "
 msgstr "Remove this event"
 
@@ -7761,11 +8290,19 @@ msgstr "Remove this event"
 msgid "Efface cette action"
 msgstr "Remobe this Action"
 
+#: include/class/anc_operation.class.php:658
+msgid "Efface détail"
+msgstr "Remove details"
+
 #: include/report.inc.php:134 include/report.inc.php:120
 #: include/report.inc.php:119
 msgid "Effacement"
 msgstr "Remove"
 
+#: include/class/card_attribut_mtable.class.php:196
+msgid "Effacement bloqué : attribut utilisé"
+msgstr "Removal blocked, this attribute is used"
+
 #: include/modele.inc.php:342 include/modele.inc.php:356
 #: include/modele.inc.php:398 include/modele.inc.php:381
 #: include/modele.inc.php:382 include/modele.inc.php:387
@@ -7779,7 +8316,7 @@ msgid "Effacement déclaration"
 msgstr "Erase statement"
 
 #: include/class/periode.class.php:673 include/class/periode.class.php:675
-#: include/class/periode.class.php:677
+#: include/class/periode.class.php:677 include/class/periode.class.php:678
 msgid "Effacement impossible"
 msgstr "Impossible removal"
 
@@ -7787,7 +8324,12 @@ msgstr "Impossible removal"
 msgid "Effacement impossible : catégorie utilisée"
 msgstr "Remove impossible : category in use"
 
+#: include/class/anc_account_table.class.php:120
+msgid "Effacement impossible : le poste est utilisé dans une période fermée"
+msgstr "Warning : you can not change in a closed period"
+
 #: include/class/tva_rate_mtable.class.php:267
+#: include/class/tva_rate_mtable.class.php:284
 msgid "Effacement interdit : TVA utilisée"
 msgstr "Removal forbidden : VAT In use"
 
@@ -7876,6 +8418,9 @@ msgstr "Removal forbidden"
 #: include/lib/manage_table_sql.class.php:768
 #: include/template/ledger_detail_bottom.php:325 include/modele.inc.php:317
 #: include/class/periode.class.php:598 include/class/periode.class.php:603
+#: include/class/document_type.class.php:84 include/class/periode.class.php:604
+#: include/template/ledger_detail_bottom.php:344
+#: include/lib/manage_table_sql.class.php:820
 msgid "Effacer"
 msgstr "Remove"
 
@@ -7890,6 +8435,7 @@ msgstr "Remove"
 #: include/compta_ven.inc.php:330 include/compta_ven.inc.php:333
 #: include/compta_ach.inc.php:299 include/compta_ven.inc.php:341
 #: include/compta_ven.inc.php:339 include/compta_ach.inc.php:297
+#: include/compta_ven.inc.php:331 include/compta_ach.inc.php:298
 msgid "Effacer "
 msgstr "Remove"
 
@@ -7919,7 +8465,7 @@ msgid "Effacer la sélection"
 msgstr "Clear selection"
 
 #: include/template/fiche_list.php:87 include/template/fiche_list.php:89
-#: include/template/fiche_list.php:91
+#: include/template/fiche_list.php:91 include/template/fiche_list.php:96
 msgid "Effacer la sélection "
 msgstr "Clear selection"
 
@@ -7931,6 +8477,7 @@ msgstr "Remove selected documents"
 #: include/database.item.php:213 include/database.item.php:190
 #: include/database.item.php:191 include/database.item.php:194
 #: include/database.item.php:205 include/database.item.php:210
+#: include/database.item.php:200
 msgid "Effacer les documents du suivi"
 msgstr "Clear documentation of monitoring"
 
@@ -7938,18 +8485,21 @@ msgstr "Clear documentation of monitoring"
 #: include/class/acc_ledger_search.class.php:1072
 #: include/class/acc_ledger_search.class.php:1080
 #: include/class/acc_ledger_search.class.php:1093
+#: include/class/acc_ledger_search.class.php:1182
 msgid "Effacer sel"
 msgstr "Remove"
 
 #: include/database.item.php:220 include/database.item.php:197
 #: include/database.item.php:198 include/database.item.php:201
 #: include/database.item.php:212 include/database.item.php:217
+#: include/database.item.php:207
 msgid "Effacer une note publique"
 msgstr "Remove  a public note"
 
 #: include/database.item.php:217 include/database.item.php:194
 #: include/database.item.php:195 include/database.item.php:198
 #: include/database.item.php:209 include/database.item.php:214
+#: include/database.item.php:204
 msgid "Effacer une opération "
 msgstr "Remove an operation"
 
@@ -7961,6 +8511,7 @@ msgstr "Remove an operation"
 #: include/lib/manage_table_sql.class.php:1095
 #: include/lib/manage_table_sql.class.php:1092
 #: include/lib/manage_table_sql.class.php:1136
+#: include/lib/manage_table_sql.class.php:1192
 msgid "Effacé"
 msgstr "Erased"
 
@@ -7979,7 +8530,7 @@ msgstr "Items"
 #: include/database.item.php:180 include/database.item.php:183
 #: include/user.inc.php:84 include/database.item.php:191
 #: include/ajax/ajax_preference.php:74 include/ajax/ajax_preference.php:85
-#: include/database.item.php:196
+#: include/database.item.php:196 include/database.item.php:189
 msgid "Email"
 msgstr "E-mail"
 
@@ -8048,7 +8599,7 @@ msgstr ""
 
 #: html/admin/setup.php:80 html/admin/setup.php:83 html/admin/setup.php:134
 #: html/install.php:136 html/install.php:135 html/install.php:141
-#: html/install.php:148
+#: html/install.php:148 html/install.php:161
 msgid ""
 "En version mono dossier, le nom de la base de données doit être mentionné"
 msgstr "In mono mode, the database name must be set"
@@ -8066,6 +8617,7 @@ msgstr "en-cours"
 #: include/class/class_pre_op_ven.php:193
 #: include/class/class_pre_op_ven.php:201
 #: include/class/pre_op_ven.class.php:201
+#: include/class/pre_op_ven.class.php:196
 msgid "En-tête facture client"
 msgstr "Customer invoice header"
 
@@ -8074,6 +8626,7 @@ msgstr "Customer invoice header"
 #: include/class/class_pre_op_ach.php:196
 #: include/class/class_pre_op_ach.php:197
 #: include/class/pre_op_ach.class.php:197
+#: include/class/pre_op_ach.class.php:200
 msgid "En-tête facture fournisseur"
 msgstr "Supplier invoice header"
 
@@ -8099,6 +8652,7 @@ msgstr "Encode bank receipt"
 
 #: include/database.item.php:14 include/database.item.php:17
 #: include/database.item.php:11 include/database.item.php:9
+#: include/database.item.php:10
 msgid "Encodage de tous vos revenus ou vente"
 msgstr "Encode all in and outcomes"
 
@@ -8146,6 +8700,7 @@ msgstr "Remove all tags for the selected documents"
 #: include/database.item.php:216 include/database.item.php:193
 #: include/database.item.php:194 include/database.item.php:197
 #: include/database.item.php:208 include/database.item.php:213
+#: include/database.item.php:203
 msgid "Enlever une pièce justificative"
 msgstr "Remove a receipt"
 
@@ -8167,10 +8722,12 @@ msgstr "Record"
 #: include/compta_ach.inc.php:167 include/compta_ven.inc.php:122
 #: include/ext/tva/ajax.php:111 include/compta_ven.inc.php:120
 #: include/compta_ach.inc.php:112 include/compta_ach.inc.php:165
+#: include/compta_ach.inc.php:111 include/compta_ach.inc.php:164
 msgid "Enregistrement"
 msgstr "Record"
 
 #: include/class/payment_method_mtable.class.php:39
+#: include/class/payment_method_mtable.class.php:40
 msgid "Enregistrement dans"
 msgstr "Recorded in"
 
@@ -8192,6 +8749,8 @@ msgstr "Recorded in"
 #: include/action.common.inc.php:191 include/action.common.inc.php:325
 #: include/compta_ach.inc.php:298 include/compta_ven.inc.php:340
 #: include/compta_ven.inc.php:338 include/compta_ach.inc.php:296
+#: include/compta_ven.inc.php:330 include/compta_ach.inc.php:297
+#: include/action.common.inc.php:205 include/action.common.inc.php:361
 msgid "Enregistrer"
 msgstr "Submit"
 
@@ -8229,13 +8788,13 @@ msgstr "Enter the date of the declaration"
 #: html/admin/setup.php:208 html/admin/setup.php:226 html/admin/setup.php:228
 #: html/install.php:290 html/install.php:289 html/install.php:287
 #: html/install.php:293 html/install.php:299 html/install.php:250
-#: html/install.php:257 html/install.php:260
+#: html/install.php:257 html/install.php:260 html/install.php:308
 msgid "Entrez les informations nécessaires à noalyss"
 msgstr "Enter the required information for Noalyss"
 
 #: include/ext/rapport_avance/include/template/parameter_send_mail_input.php:23
 #: include/ext/rapport_avance/include/template/parameter_send_mail_input.php:27
-#: scenario/HtmlInput.test.php:89
+#: scenario/HtmlInput.test.php:89 scenario/HtmlInput.test.php:106
 msgid "Envoi"
 msgstr "Sending"
 
@@ -8310,7 +8869,8 @@ msgstr "Sent by"
 #: include/ext/importbank/include/import_bank.class.php:140
 #: include/lib/ac_common.php:343 include/action.common.inc.php:144
 #: include/action.common.inc.php:295 include/lib/ac_common.php:345
-#: include/lib/ac_common.php:361
+#: include/lib/ac_common.php:361 include/action.common.inc.php:146
+#: include/action.common.inc.php:324 include/lib/ac_common.php:371
 msgid "Erreur"
 msgstr "Error:"
 
@@ -8331,6 +8891,8 @@ msgstr "wrong balance diff = %s"
 #: include/class_noalyss_sql.php:316 include/lib/class_noalyss_sql.php:316
 #: include/lib/data_sql.class.php:286 include/lib/noalyss_sql.class.php:391
 #: include/lib/data_sql.class.php:248 include/lib/database_core.class.php:168
+#: include/lib/database_core.class.php:170
+#: include/lib/noalyss_sql.class.php:379 include/lib/data_sql.class.php:278
 msgid "Erreur : exec_sql attend un array"
 msgstr "Error exec_sql expects an array"
 
@@ -8363,6 +8925,11 @@ msgstr "Disconnect"
 msgid "Erreur D/C"
 msgstr "Error: Invalid balance D/C"
 
+#: include/class/noalyss_parameter_folder.class.php:73
+#, php-format
+msgid "Erreur Filtre analytique %s"
+msgstr "Error analytic filter %s"
+
 #: include/ext/import_account/include/class_sql_impacc.php:36
 #: include/ext/import_account/include/class_sql_impacc.php:47
 #: include/class_acc_account.php:66 include/class_acc_account.php:77
@@ -8393,13 +8960,14 @@ msgid "Erreur exercice invalide"
 msgstr "Invalid exercice"
 
 #: include/class/payment_method_mtable.class.php:140
+#: include/class/payment_method_mtable.class.php:145
 #, php-format
 msgid "Erreur key %s value %s"
 msgstr "Error key %s value %s"
 
 #: html/do.php:196 html/do.php:224 html/do.php:237 html/do.php:239
 #: html/do.php:236 html/do.php:273 html/do.php:285 html/do.php:295
-#: html/do.php:264
+#: html/do.php:264 html/do.php:266
 msgid "Erreur menu"
 msgstr "Error menu"
 
@@ -8428,15 +8996,21 @@ msgid "Erreur paramètre"
 msgstr "Settings error"
 
 #: include/ajax/ajax_card.php:356 include/ajax/ajax_card.php:359
-#: include/ajax/ajax_card.php:360
+#: include/ajax/ajax_card.php:360 include/ajax/ajax_card.php:393
 msgid "Erreur sauvegarde"
 msgstr "Error backup"
 
+#: include/param_sec.inc.php:120
+msgid "Erreur sécurité"
+msgstr "Security error"
+
 #: html/install.php:636 html/install.php:643 html/install.php:646
+#: html/install.php:699
 msgid "Essai effacement install.php et se connecter à NOALYSS"
 msgstr "Try to unlink install.php and connect to Noalyss"
 
 #: html/test_class.php:214 dev/test/test_class.php:210
+#: dev-2/test/test_class.php:210
 msgid "Essayer de vous y amuser"
 msgstr "I hope you will enjoy it"
 
@@ -8465,10 +9039,12 @@ msgid "Et uniquement non payées"
 msgstr "And only unpaid"
 
 #: include/template/ledger_search.php:56 include/template/ledger_search.php:59
+#: include/template/ledger_search.php:63
 msgid "Et utilisant la fiche (quick code)"
 msgstr "And using the card (quick code)"
 
 #: include/template/ledger_search.php:64 include/template/ledger_search.php:67
+#: include/template/ledger_search.php:71
 msgid "Et utilisant le poste comptable"
 msgstr "And using the accounting item"
 
@@ -8508,6 +9084,7 @@ msgid "Etape 2 : période"
 msgstr "Step 2 : Period"
 
 #: include/impress_bilan.inc.php:82 include/impress_bilan.inc.php:89
+#: include/impress_bilan.inc.php:93
 msgid "Etape 2 :Impression"
 msgstr "Step 2 : printing"
 
@@ -8532,24 +9109,28 @@ msgstr "Step 4/4 : data are loaded"
 #: include/ext/sav/include/template/sas_display_detail.php:145
 #: include/template/detail-action.php:124
 #: include/template/detail-action.php:123 include/template/action_search.php:60
-#: include/template/action_search.php:56
+#: include/template/action_search.php:56 include/class/follow_up.class.php:628
+#: include/template/detail-action.php:130 include/template/ledger_search.php:83
 msgid "Etat"
 msgstr "State"
 
 #: include/database.item.php:110 include/database.item.php:113
 #: include/database.item.php:119 include/database.item.php:116
 #: include/database.item.php:115 include/database.item.php:111
+#: include/database.item.php:112
 msgid "Etat des documents"
 msgstr "State documents"
 
 #: include/database.item.php:91 include/database.item.php:94
 #: include/database.item.php:99 include/database.item.php:96
 #: include/database.item.php:95 include/database.item.php:93
+#: include/database.item.php:92
 msgid "Etat des stock"
 msgstr "State of the stock"
 
 #: include/database.item.php:96 include/database.item.php:99
 #: include/database.item.php:93 include/database.item.php:91
+#: include/database.item.php:92
 msgid "Etat des stock de l'exercice indiqué"
 msgstr "State of the repository for the selected exercice"
 
@@ -8570,6 +9151,8 @@ msgstr "Are you sure to remove this folder"
 #: include/template/action_search.php:67 include/template/tag_choose.php:5
 #: include/template/action_search.php:81 include/template/action_search.php:115
 #: include/template/action_search.php:129 include/class/tag.class.php:85
+#: include/class/follow_up.class.php:623 include/class/tag.class.php:90
+#: include/template/action_search.php:130 include/cfgtags.inc.php:38
 msgid "Etiquette"
 msgstr "Etiquette"
 
@@ -8581,6 +9164,10 @@ msgstr "Tag"
 msgid "Etiquette(tag) actif"
 msgstr "Tag"
 
+#: include/template/tag_search_select.php:12
+msgid "Etiquettes"
+msgstr "Tag"
+
 #: include/action.common.inc.php:273 include/action.common.inc.php:277
 #: include/action.common.inc.php:278 include/action.common.inc.php:282
 #: include/action.common.inc.php:280 include/action.common.inc.php:284
@@ -8607,6 +9194,7 @@ msgstr "Exclude State"
 #: include/class/periode_ledger_table.class.php:100
 #: include/template/stock_inv.php:126 include/ajax/ajax_preference.php:142
 #: include/class/periode.class.php:521 include/class/periode.class.php:523
+#: include/impress_bilan.inc.php:52 include/class/periode.class.php:524
 msgid "Exercice"
 msgstr "Exercise"
 
@@ -8615,7 +9203,7 @@ msgid "Exercice comptable d'achat"
 msgstr "Purchase accounting year"
 
 #: include/class/periode.class.php:424 include/class/periode.class.php:426
-#: include/class/periode.class.php:428
+#: include/class/periode.class.php:428 include/class/periode.class.php:429
 #, php-format
 msgid "Exercice doit être entre %s et %s "
 msgstr "Exercice is between %s and %s"
@@ -8625,14 +9213,28 @@ msgid "Exercice invalide"
 msgstr "Invalid exercice"
 
 #: include/class/periode.class.php:421 include/class/periode.class.php:423
-#: include/class/periode.class.php:425
+#: include/class/periode.class.php:425 include/class/periode.class.php:426
 msgid "Exercice n'est pas un nombre"
 msgstr "exercice is not a number"
 
+#: include/class/tax_summary.class.php:232
+#: include/class/tax_summary.class.php:306
+msgid "Exig TVA invalide"
+msgstr "Avail. VAT invalid"
+
+#: include/class/tva_rate_mtable.class.php:60
+msgid "Exigible achat"
+msgstr "Due for purchase"
+
+#: include/class/tva_rate_mtable.class.php:67
+msgid "Exigible vente"
+msgstr "Due for sales"
+
 #: html/ajax_misc.php:197 html/ajax_misc.php:216 html/ajax_misc.php:230
 #: html/ajax_misc.php:236 html/ajax_misc.php:314 html/ajax_misc.php:319
 #: html/ajax_misc.php:347 html/ajax_misc.php:459 html/ajax_misc.php:461
 #: html/ajax_misc.php:467 html/ajax_misc.php:469 html/ajax_misc.php:473
+#: html/ajax_misc.php:438
 msgid "Explication"
 msgstr "Explanation"
 
@@ -8641,19 +9243,20 @@ msgstr "Explanation"
 msgid "Export"
 msgstr "Export CSV"
 
-#: include/database.item.php:140
+#: include/database.item.php:140 include/database.item.php:139
 msgid "Export ANC"
 msgstr "Export ANC"
 
 #: include/database.item.php:46 include/database.item.php:49
 #: include/database.item.php:53 include/database.item.php:52
 #: include/database.item.php:55 include/database.item.php:48
+#: include/database.item.php:47
 msgid "Export Action Gestion"
 msgstr "Export Management Action"
 
 #: include/database.item.php:144 include/database.item.php:143
 #: include/database.item.php:6 include/database.item.php:135
-#: include/database.item.php:133
+#: include/database.item.php:133 include/database.item.php:134
 msgid "Export Balance agée"
 msgstr "Export ageing balance"
 
@@ -8668,12 +9271,14 @@ msgstr "Export accountancy balance"
 #: include/database.item.php:42 include/database.item.php:45
 #: include/database.item.php:49 include/database.item.php:48
 #: include/database.item.php:51 include/database.item.php:44
+#: include/database.item.php:43
 msgid "Export Balance groupe analytique"
 msgstr "Export Balance analytic group"
 
 #: include/database.item.php:43 include/database.item.php:46
 #: include/database.item.php:50 include/database.item.php:49
 #: include/database.item.php:52 include/database.item.php:45
+#: include/database.item.php:44
 msgid "Export Bilan"
 msgstr "Export balance"
 
@@ -8703,6 +9308,11 @@ msgstr "Export balance"
 #: include/fiche.inc.php:242 include/fiche.inc.php:302
 #: include/fiche.inc.php:340 include/class/fiche.class.php:1620
 #: include/class/fiche.class.php:2215 include/class/tax_summary.class.php:334
+#: include/fiche.inc.php:252 include/fiche.inc.php:312
+#: include/fiche.inc.php:350 include/class/tax_summary.class.php:437
+#: include/class/fiche.class.php:1646 include/class/fiche.class.php:2242
+#: include/class/acc_account_ledger.class.php:727
+#: include/template/detail-action.php:88
 msgid "Export CSV"
 msgstr "Export CSV"
 
@@ -8711,6 +9321,7 @@ msgstr "Export CSV"
 #: include/database.item.php:40 include/database.item.php:42
 #: include/database.item.php:39 include/database.item.php:41
 #: include/database.item.php:44 include/database.item.php:37
+#: include/database.item.php:34
 msgid "Export Comptabilité analytique"
 msgstr "Export Analytic"
 
@@ -8725,6 +9336,7 @@ msgstr "Export Double crossed analytic balance"
 #: include/database.item.php:34 include/database.item.php:37
 #: include/database.item.php:41 include/database.item.php:40
 #: include/database.item.php:43 include/database.item.php:36
+#: include/database.item.php:35
 msgid "Export Comptabilité analytique balance simple"
 msgstr "Export single analytic balance"
 
@@ -8763,18 +9375,21 @@ msgstr "Export Great Ledger"
 #: include/database.item.php:17 include/database.item.php:20
 #: include/database.item.php:24 include/database.item.php:23
 #: include/database.item.php:26 include/database.item.php:19
+#: include/database.item.php:18
 msgid "Export Historique"
 msgstr "Export History"
 
 #: include/database.item.php:41 include/database.item.php:44
 #: include/database.item.php:48 include/database.item.php:47
 #: include/database.item.php:50 include/database.item.php:43
+#: include/database.item.php:42
 msgid "Export Historique Compt. Analytique"
 msgstr "Export for analytic history"
 
 #: include/database.item.php:47 include/database.item.php:50
 #: include/database.item.php:54 include/database.item.php:53
 #: include/database.item.php:56 include/database.item.php:49
+#: include/database.item.php:48
 msgid "Export Historique mouvement stock"
 msgstr "Export Background stock movement"
 
@@ -8803,6 +9418,10 @@ msgstr "Export Ledger"
 #: include/class/fiche.class.php:2213 include/class/fiche.class.php:1604
 #: include/class/fiche.class.php:2236 include/class/fiche.class.php:1605
 #: include/class/fiche.class.php:2237 include/class/tax_summary.class.php:350
+#: include/class/tax_summary.class.php:453 include/class/fiche.class.php:1631
+#: include/class/fiche.class.php:2264
+#: include/class/acc_account_ledger.class.php:749
+#: include/template/ledger_detail_bottom.php:359
 msgid "Export PDF"
 msgstr "Export PDF"
 
@@ -8815,24 +9434,28 @@ msgid "Export Poste détail"
 msgstr "Export Accountancy"
 
 #: include/database.item.php:142 include/database.item.php:143
+#: include/database.item.php:141
 msgid "Export Résumé TVA"
 msgstr "Export summary VAT"
 
 #: include/database.item.php:48 include/database.item.php:51
 #: include/database.item.php:55 include/database.item.php:54
 #: include/database.item.php:57 include/database.item.php:50
+#: include/database.item.php:49
 msgid "Export Résumé list stock"
 msgstr "Export Summary list stock"
 
 #: include/database.item.php:32 include/database.item.php:35
 #: include/database.item.php:39 include/database.item.php:38
 #: include/database.item.php:41 include/database.item.php:34
+#: include/database.item.php:33
 msgid "Export Sécurité"
 msgstr "Export Security"
 
 #: include/database.item.php:40 include/database.item.php:43
 #: include/database.item.php:47 include/database.item.php:46
 #: include/database.item.php:49 include/database.item.php:42
+#: include/database.item.php:41
 msgid "Export Tableau Analytique"
 msgstr "Export analytic tabel"
 
@@ -8847,45 +9470,53 @@ msgstr "Export analytic tabel"
 #: include/class/anc_grandlivre.class.php:169
 #: include/class/anc_grandlivre.class.php:162
 #: include/class/anc_grandlivre.class.php:170
+#: include/class/anc_grandlivre.class.php:174
+#: include/class/anc_grandlivre.class.php:182
 msgid "Export des pièces en PDF"
 msgstr "Export in PDF"
 
 #: include/database.item.php:45 include/database.item.php:48
 #: include/database.item.php:52 include/database.item.php:51
 #: include/database.item.php:54 include/database.item.php:47
+#: include/database.item.php:46
 msgid "Export définition d'un raport"
 msgstr "Export definition of a report"
 
-#: include/class/anc_table.class.php:233
+#: include/class/anc_table.class.php:233 include/fiche.inc.php:285
 msgid "Export en CSV"
 msgstr "Export CSV"
 
-#: html/export.php:53
+#: include/fiche.inc.php:272
+msgid "Export en PDF"
+msgstr "Export PDF"
+
+#: html/export.php:53 html/export.php:54
 msgid "Export impossible"
 msgstr "Export failed"
 
 #: include/database.item.php:8 include/database.item.php:137
-#: include/database.item.php:135
+#: include/database.item.php:135 include/database.item.php:136
 msgid "Export le document"
 msgstr "Export documents"
 
 #: include/database.item.php:124 include/database.item.php:127
 #: include/database.item.php:133 include/database.item.php:129
 #: include/database.item.php:128 include/database.item.php:132
-#: include/database.item.php:126
+#: include/database.item.php:126 include/database.item.php:125
 msgid "Export opérations rapprochées"
 msgstr "Export close operations"
 
 #: include/database.item.php:124 include/database.item.php:127
 #: include/database.item.php:133 include/database.item.php:129
 #: include/database.item.php:128 include/database.item.php:132
-#: include/database.item.php:126
+#: include/database.item.php:126 include/database.item.php:125
 msgid "Export opérations rapprochées en CSV"
 msgstr "Export CSV close operations"
 
 #: include/database.item.php:2 include/database.item.php:142
 #: include/database.item.php:138 include/database.item.php:137
 #: include/database.item.php:130 include/database.item.php:128
+#: include/database.item.php:129
 msgid "Export pièce PDF"
 msgstr "Export in PDF"
 
@@ -8901,6 +9532,7 @@ msgstr "Export report"
 #: html/recherche.php:125 include/history_operation.inc.php:147
 #: html/recherche.php:126 html/recherche.php:129
 #: include/history_operation.inc.php:167 include/history_operation.inc.php:178
+#: html/recherche.php:141 include/history_operation.inc.php:192
 msgid "Export vers CSV"
 msgstr "Export CSV"
 
@@ -8910,12 +9542,12 @@ msgid "Exportation d'opérations "
 msgstr "Export operations"
 
 #: include/database.item.php:7 include/database.item.php:136
-#: include/database.item.php:134
+#: include/database.item.php:134 include/database.item.php:135
 msgid "Exporte la pièce"
 msgstr "Export receipt"
 
 #: include/database.item.php:9 include/database.item.php:138
-#: include/database.item.php:136
+#: include/database.item.php:136 include/database.item.php:137
 msgid "Exporte le modèle de document"
 msgstr "Exporte template of document"
 
@@ -8968,7 +9600,8 @@ msgstr "Plugin"
 #: include/operation_ods_confirm.inc.php:53 include/compta_ach.inc.php:90
 #: include/compta_ach.inc.php:92 include/compta_ven.inc.php:99
 #: include/ajax/ajax_ledger.php:564 include/class/acc_operation.class.php:729
-#: include/ajax/ajax_ledger.php:565
+#: include/ajax/ajax_ledger.php:565 include/compta_ach.inc.php:89
+#: include/template/ledger_detail_bottom.php:349
 msgid "Extourne"
 msgstr "Reverse"
 
@@ -8976,7 +9609,7 @@ msgstr "Reverse"
 #: include/operation_ods_confirm.inc.php:61
 #: include/operation_ods_confirm.inc.php:62 include/compta_ach.inc.php:104
 #: include/compta_ach.inc.php:106 include/compta_ven.inc.php:113
-#: include/compta_ven.inc.php:111
+#: include/compta_ven.inc.php:111 include/compta_ach.inc.php:103
 msgid "Extourne opération"
 msgstr "Reverse operation"
 
@@ -8999,6 +9632,7 @@ msgstr "Reverse operation"
 #: include/template/ledger_detail_bottom.php:349
 #: include/template/ledger_detail_bottom.php:333
 #: include/template/ledger_detail_bottom.php:346
+#: include/template/ledger_detail_bottom.php:374
 msgid "Extourner"
 msgstr "Reverse"
 
@@ -9009,6 +9643,7 @@ msgstr "Reverse"
 #: include/template/ledger_detail_bottom.php:350
 #: include/template/ledger_detail_bottom.php:351
 #: include/template/ledger_detail_bottom.php:348
+#: include/template/ledger_detail_bottom.php:376
 msgid ""
 "Extourner une opération vous permet de l'annuler par son écriture inverse"
 msgstr "Avoid an operation by writing the reversed one"
@@ -9023,6 +9658,7 @@ msgstr "Reversed on "
 
 #: include/compta_ach.inc.php:184 include/compta_ach.inc.php:186
 #: include/compta_ach.inc.php:191 include/compta_ach.inc.php:189
+#: include/compta_ach.inc.php:188
 #, php-format
 msgid "Extourné au %s"
 msgstr "Reversed on %s"
@@ -9069,7 +9705,8 @@ msgstr "Invoicing, send invoices by email, download"
 #: include/ext/invoicing/include/invoice_to_zip.inc.php:76
 #: include/compta_ach.inc.php:89 include/compta_ven.inc.php:96
 #: include/database.item.php:179 include/database.item.php:187
-#: include/database.item.php:192
+#: include/database.item.php:192 include/compta_ach.inc.php:86
+#: include/database.item.php:185
 msgid "Facture"
 msgstr "Invoice"
 
@@ -9098,9 +9735,14 @@ msgstr "Bookmark"
 #: include/database.item.php:164 include/database.item.php:157
 #: include/database.item.php:158 include/company.inc.php:124
 #: include/database.item.php:166 include/database.item.php:169
+#: include/company.inc.php:132
 msgid "Fax"
 msgstr "Fax"
 
+#: include/class/document_state_mtable.php:47
+msgid "Ferme"
+msgstr "close"
+
 #: include/doc_state.inc.php:57
 msgid "Ferme l'action"
 msgstr "Firm action"
@@ -9179,11 +9821,16 @@ msgstr "Firm action"
 #: include/template/ledger_detail_bottom.php:303
 #: include/template/ledger_detail_bottom.php:299
 #: include/template/ledger_detail_bottom.php:300 include/ajax/ajax_card.php:313
+#: html/recherche.php:92 html/recherche.php:144
+#: include/class/extension.class.php:276 include/ajax/ajax_card.php:319
+#: include/template/ledger_detail_bottom.php:317
+#: include/template/ledger_detail_bottom.php:318
+#: include/template/action_search.php:169
 #, php-format
 msgid "Fermer"
 msgstr "close"
 
-#: include/periode.inc.php:94
+#: include/periode.inc.php:94 include/periode.inc.php:95
 msgid "Fermer les périodes sélectionnées"
 msgstr "Close selected periods"
 
@@ -9202,6 +9849,7 @@ msgstr "close"
 #: include/class/periode.class.php:585
 #: include/class/periode_ledger_table.class.php:142
 #: include/class/periode.class.php:587 include/class/periode.class.php:589
+#: include/class/periode.class.php:590
 msgid "Fermée"
 msgstr "Closed"
 
@@ -9241,6 +9889,11 @@ msgstr "Closed"
 #: include/database.item.php:110 include/category_card.inc.php:75
 #: include/template/stock_inv.php:67
 #: include/class/payment_method_mtable.class.php:41
+#: include/class/payment_method_mtable.class.php:42
+#: include/class/anc_group_operation.class.php:122
+#: include/class/card_attribut_mtable.class.php:55
+#: include/template/follow_up_detail_display.php:50
+#: include/template/newEmptyPHP_NOALYSS.php:35 include/database.item.php:111
 msgid "Fiche"
 msgstr "Card"
 
@@ -9279,25 +9932,33 @@ msgstr "VAT record"
 #: include/ajax/ajax_card.php:347 include/ajax/ajax_add_concerned_card.php:50
 #: include/ajax/ajax_card.php:380 include/ajax/ajax_add_concerned_card.php:54
 #: include/ajax/ajax_card.php:383 include/ajax/ajax_card.php:384
+#: include/ajax/ajax_card.php:417 include/ajax/ajax_add_concerned_card.php:64
 msgid "Fiche contenant"
 msgstr "Card"
 
 #: include/class/payment_method_mtable.class.php:98
+#: include/class/payment_method_mtable.class.php:102
 msgid "Fiche inexistante"
 msgstr "Inexistent card"
 
+#: include/class/fiche.class.php:1181
+msgid "Fiche n'existe pas"
+msgstr "card does not exist"
+
 #: include/ext/import_account/include/class_impacc_csv.php:53
 #: include/ext/import_account/include/impacc_csv.class.php:53
 msgid "Fiche non disponible pour journal"
 msgstr "Card not available for this ledger"
 
 #: include/ajax/ajax_card.php:619 include/ajax/ajax_card.php:642
+#: include/ajax/ajax_card.php:756
 msgid "Fiche non effacée"
 msgstr "Card not deleted"
 
 #: include/fiche.inc.php:175 include/fiche.inc.php:179
 #: include/fiche.inc.php:181 include/fiche.inc.php:182
 #: include/fiche.inc.php:183 include/fiche.inc.php:184
+#: include/fiche.inc.php:185
 msgid "Fiche non effacées"
 msgstr "Undeleted record"
 
@@ -9311,6 +9972,7 @@ msgstr "Undeleted record"
 #: include/ext/importbank/include/import_bank.class.php:490
 #: include/ajax/ajax_card.php:148 include/class/fiche.class.php:661
 #: include/class/fiche.class.php:663 include/class/fiche.class.php:662
+#: include/class/fiche.class.php:681 include/ajax/ajax_card.php:151
 msgid "Fiche non trouvée"
 msgstr "Card not found"
 
@@ -9320,7 +9982,8 @@ msgstr "Card not found"
 #: include/ajax/ajax_card.php:539 include/ajax/ajax_card.php:540
 #: include/ajax/ajax_card.php:573 include/ajax/ajax_card.php:577
 #: include/ajax/ajax_card.php:607 include/ajax/ajax_card.php:600
-#: include/ajax/ajax_card.php:630
+#: include/ajax/ajax_card.php:630 include/ajax/ajax_card.php:679
+#: include/ajax/ajax_card.php:708 include/ajax/ajax_card.php:744
 msgid "Fiche non valide"
 msgstr "Invalid file"
 
@@ -9332,6 +9995,7 @@ msgstr "Card for hours"
 #: html/ajax_card.php:343 include/ajax/ajax_card.php:323
 #: include/ajax/ajax_card.php:324 include/ajax/ajax_card.php:342
 #: include/ajax/ajax_card.php:345 include/ajax/ajax_card.php:346
+#: include/ajax/ajax_card.php:358
 msgid "Fiche sauvée"
 msgstr "Card saved"
 
@@ -9349,11 +10013,17 @@ msgid "Fiches"
 msgstr "Sheets"
 
 #: include/verif_bilan.inc.php:99 include/verif_bilan.inc.php:126
+#: include/verif_bilan.inc.php:124
 msgid "Fiches ayant changé de poste comptable"
 msgstr "The card %s has changed his accouting"
 
+#: include/ajax/ajax_add_concerned_card.php:88
+msgid "Fiches inactives"
+msgstr "disabled card"
+
 #: include/template/param_jrn.php:251 include/template/param_jrn.php:258
 #: include/template/param_jrn.php:260 include/template/param_jrn.php:305
+#: include/template/param_jrn.php:306
 msgid "Fiches utilisables (D/C)"
 msgstr "Usable Cards (D/C)"
 
@@ -9388,11 +10058,11 @@ msgstr "Removed file"
 #: include/ext/import_account/include/class_impacc_file.php:69
 #: html/install.php:269 html/install.php:220
 #: include/ext/import_account/include/impacc_file.class.php:69
-#: html/install.php:227 html/install.php:230
+#: html/install.php:227 html/install.php:230 html/install.php:277
 msgid "Fichier non sauvé"
 msgstr "Card not found"
 
-#: include/lib/ac_common.php:1129
+#: include/lib/ac_common.php:1129 include/lib/ac_common.php:1139
 msgid "Fichier non trouvé"
 msgstr "File not found"
 
@@ -9421,6 +10091,15 @@ msgstr "File to include (from the folder \"include\")"
 msgid "Filter"
 msgstr "Filter"
 
+#: include/class/acc_ledger_history.class.php:361
+#: include/class/pdf.class.php:151 include/class/print_ledger.class.php:103
+msgid "Filter invalide "
+msgstr "Invalid filter "
+
+#: include/preod.inc.php:50
+msgid "Filter par journal"
+msgstr "filter by ledger"
+
 #: include/anc_od.inc.php:108
 msgid "Filter par période"
 msgstr "Filter per periode"
@@ -9461,6 +10140,8 @@ msgstr "Filter per periode"
 #: include/class/acc_ledger_search.class.php:565 html/recherche.php:83
 #: include/class/acc_ledger_search.class.php:553
 #: include/class/acc_ledger_search.class.php:562 include/modele.inc.php:279
+#: html/recherche.php:88 include/class/acc_ledger_search.class.php:648
+#: include/lettering.card.inc.php:98
 msgid "Filtre"
 msgstr "Filter"
 
@@ -9470,6 +10151,7 @@ msgstr "Filter"
 #: include/class/acc_ledger_search.class.php:1069
 #: include/class/acc_ledger_search.class.php:1077
 #: include/class/acc_ledger_search.class.php:1090
+#: include/class/acc_ledger_search.class.php:1179
 msgid "Filtre "
 msgstr "Filter"
 
@@ -9477,6 +10159,13 @@ msgstr "Filter"
 msgid "Filtre :"
 msgstr "Filter:"
 
+#: include/class/acc_ledger_history.class.php:337
+#: include/class/acc_ledger_purchase.class.php:1845
+#: include/class/acc_ledger_sold.class.php:1368
+#: include/class/print_ledger.class.php:331
+msgid "Filtre invalide"
+msgstr "Invalid filter"
+
 #: include/impress_rec.inc.php:42
 msgid "Filtre par journal"
 msgstr "filter on ledger"
@@ -9486,6 +10175,7 @@ msgstr "filter on ledger"
 #: include/class/class_acc_account_ledger.php:703
 #: include/class/acc_account_ledger.class.php:763
 #: include/class/acc_account_ledger.class.php:766
+#: include/class/acc_account_ledger.class.php:758
 msgid "Filtre rapide"
 msgstr "quick filter:"
 
@@ -9498,7 +10188,7 @@ msgstr "Rapid filter:"
 #: include/fiche.inc.php:312 include/fiche.inc.php:317
 #: include/fiche.inc.php:390 include/fiche.inc.php:393
 #: include/fiche.inc.php:394 include/fiche.inc.php:395
-#: include/fiche.inc.php:402
+#: include/fiche.inc.php:402 include/fiche.inc.php:412
 msgid "Filtre rapide:"
 msgstr "Rapid filter:"
 
@@ -9547,6 +10237,7 @@ msgid "Fin"
 msgstr "Fin"
 
 #: html/test_class.php:239 dev/test/test_class.php:235
+#: dev-2/test/test_class.php:235
 msgid "Fin de programme"
 msgstr "End of program"
 
@@ -9567,6 +10258,8 @@ msgstr "Fin /MO"
 #: include/class/acc_ledger_search.class.php:1082
 #: include/class/acc_ledger_search.class.php:1095 include/lib/user_menu.php:136
 #: include/database.item.php:233 include/database.item.php:252
+#: include/class/acc_ledger_search.class.php:1184 include/database.item.php:217
+#: include/database.item.php:229 include/lib/user_menu.php:135
 msgid "Financier"
 msgstr "Financial"
 
@@ -9575,12 +10268,14 @@ msgid "Format Export CSV"
 msgstr "Export CSV"
 
 #: include/lib/ac_common.php:811 include/lib/ac_common.php:813
-#: include/lib/ac_common.php:829
+#: include/lib/ac_common.php:829 include/lib/ac_common.php:839
 msgid "Format Invalide"
 msgstr "invalid format"
 
 #: include/class/tax_summary.class.php:74
 #: include/class/tax_summary.class.php:93
+#: include/class/tax_summary.class.php:91
+#: include/class/tax_summary.class.php:111
 msgid "Format date invalide"
 msgstr "invalid format"
 
@@ -9665,6 +10360,11 @@ msgstr "Formula"
 #: include/class/print_ledger_simple.class.php:105
 #: include/class/acc_ledger_history_purchase.class.php:253
 #: include/class/acc_ledger_history_purchase.class.php:257
+#: include/class/acc_ledger_history_sale.class.php:256
+#: include/class/acc_ledger_history_purchase.class.php:268
+#: include/class/acc_ledger_purchase.class.php:1314
+#: include/class/acc_ledger_purchase.class.php:1441
+#: include/class/print_ledger_simple.class.php:102 include/database.item.php:12
 msgid "Fournisseur"
 msgstr "Supplier"
 
@@ -9683,11 +10383,13 @@ msgstr "Supplier"
 #: include/class/pre_op_ach.class.php:231
 #: include/class/acc_ledger_purchase.class.php:1130
 #: include/class/acc_ledger_purchase.class.php:1133
+#: include/class/acc_ledger_purchase.class.php:1144
 msgid "Fournisseur "
 msgstr "Supplier"
 
 #: include/template/param_jrn.php:139 include/template/param_jrn.php:146
 #: include/template/param_jrn.php:148 include/template/param_jrn.php:193
+#: include/template/param_jrn.php:194
 msgid "Fournisseurs (C)"
 msgstr "Supplier (C)"
 
@@ -9707,11 +10409,12 @@ msgstr "Supplier to pay today"
 #: html/test_class.php:219 include/ajax_preference.php:173
 #: include/ajax/ajax_preference.php:173 include/ajax/ajax_preference.php:252
 #: dev/test/test_class.php:215 include/ajax/ajax_preference.php:263
+#: dev-2/test/test_class.php:215
 msgid "Français"
 msgstr "French"
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
-#: include/class/periode.class.php:651
+#: include/class/periode.class.php:651 include/class/periode.class.php:652
 msgid "Février"
 msgstr "February"
 
@@ -9727,28 +10430,33 @@ msgstr "GSM"
 #: include/database.item.php:71 include/database.item.php:74
 #: include/database.item.php:14 include/database.item.php:76
 #: include/database.item.php:79 include/database.item.php:73
+#: include/database.item.php:72
 msgid "Gestion"
 msgstr "Management"
 
 #: include/database.item.php:108 include/database.item.php:111
 #: include/database.item.php:117 include/database.item.php:114
 #: include/database.item.php:113 include/database.item.php:109
+#: include/database.item.php:110
 msgid "Gestion catégorie de fiche"
 msgstr "Category record management"
 
 #: include/database.item.php:90 include/database.item.php:93
 #: include/database.item.php:98 include/database.item.php:95
 #: include/database.item.php:94 include/database.item.php:92
+#: include/database.item.php:91
 msgid "Gestion des attributs de fiches "
 msgstr "Management attributes sheets"
 
 #: include/user_menu.php:111 include/lib/user_menu.php:117
 #: include/lib/user_menu.php:118 include/lib/user_menu.php:75
+#: include/lib/user_menu.php:74
 msgid "Gestion des dossiers"
 msgstr "Folders managements"
 
 #: include/user_menu.php:112 include/lib/user_menu.php:118
 #: include/lib/user_menu.php:119 include/lib/user_menu.php:76
+#: include/lib/user_menu.php:75
 msgid "Gestion des modèles"
 msgstr "Template management"
 
@@ -9762,11 +10470,13 @@ msgstr "Manage predefined writing"
 #: include/database.item.php:84 include/database.item.php:87
 #: include/database.item.php:92 include/database.item.php:89
 #: include/database.item.php:88 include/database.item.php:86
+#: include/database.item.php:85
 msgid "Gestion des périodes"
 msgstr "Setting period"
 
 #: include/database.item.php:89 include/database.item.php:92
 #: include/database.item.php:86 include/database.item.php:84
+#: include/database.item.php:85
 msgid ""
 "Gestion des périodes : clôture, ajout de période, afin de créer des périodes "
 "vous pouvez aussi utiliser le plugin outil comptable"
@@ -9778,6 +10488,7 @@ msgstr ""
 #: include/lib/user_menu.php:116 include/lib/user_menu.php:129
 #: include/lib/user_menu.php:117 include/lib/user_menu.php:140
 #: include/lib/user_menu.php:74 include/lib/user_menu.php:97
+#: include/lib/user_menu.php:73 include/lib/user_menu.php:96
 msgid "Gestion des utilisateurs"
 msgstr "Users managements"
 
@@ -9785,6 +10496,7 @@ msgstr "Users managements"
 #: include/database.item.php:170 include/database.item.php:169
 #: include/database.item.php:168 include/database.item.php:172
 #: include/database.item.php:177 include/database.item.php:180
+#: include/database.item.php:176
 msgid "Gestion stock"
 msgstr "Stock management"
 
@@ -9803,10 +10515,12 @@ msgstr "Global period for all ledgers"
 #: include/class/acc_ledger.class.php:372
 #: include/class/acc_ledger.class.php:373
 #: include/class/acc_ledger.class.php:391
+#: include/class/acc_ledger.class.php:390 include/database.item.php:65
 msgid "Grand Livre"
 msgstr "General Ledger"
 
 #: include/verif_bilan.inc.php:78 include/verif_bilan.inc.php:105
+#: include/verif_bilan.inc.php:103
 msgid "Grand livre"
 msgstr "General Ledger"
 
@@ -9814,11 +10528,13 @@ msgstr "General Ledger"
 #: include/database.item.php:79 include/database.item.php:77
 #: include/database.item.php:76 include/database.item.php:75
 #: include/database.item.php:78 include/database.item.php:72
+#: include/database.item.php:71
 msgid "Grand livre analytique"
 msgstr "Great analytical book"
 
 #: include/database.item.php:75 include/database.item.php:78
 #: include/database.item.php:72 include/database.item.php:70
+#: include/database.item.php:71
 msgid "Grand livre pour la comptabilité analytique"
 msgstr "General Ledger for Analytic accountancy"
 
@@ -9826,6 +10542,7 @@ msgstr "General Ledger for Analytic accountancy"
 #: include/database.item.php:79 include/database.item.php:77
 #: include/database.item.php:76 include/database.item.php:75
 #: include/database.item.php:78 include/database.item.php:72
+#: include/database.item.php:71
 msgid "Grand'Livre"
 msgstr "General Ledger"
 
@@ -9958,13 +10675,16 @@ msgstr ""
 #: include/class/class_anc_account.php:290 include/database.item.php:15
 #: include/class/anc_account_table.class.php:50 include/database.item.php:9
 #: include/database.item.php:51 include/export/export_anc_axis_csv.php:47
-#: include/database.item.php:52
+#: include/database.item.php:52 include/class/follow_up.class.php:625
+#: include/template/tag_search_select.php:64
+#: include/template/tag_search_select.php:70 include/database.item.php:8
 msgid "Groupe"
 msgstr "Group"
 
 #: include/template/detail-action.php:139
 #: include/template/detail-action.php:144
-#: include/template/detail-action.php:143
+#: include/template/detail-action.php:143 include/ajax/ajax_get_profile.php:58
+#: include/template/detail-action.php:150
 msgid "Groupe Gestion"
 msgstr "Management group"
 
@@ -9975,6 +10695,10 @@ msgstr "Management group"
 msgid "Groupe analytique"
 msgstr "Analytical group"
 
+#: include/cfgtags.inc.php:83
+msgid "Groupe étiquettes"
+msgstr "Tag group"
+
 #: include/action.common.inc.php:161 include/action.common.inc.php:178
 #: include/action.common.inc.php:183 include/action.common.inc.php:185
 #: include/action.common.inc.php:186 include/action.common.inc.php:192
@@ -10014,7 +10738,7 @@ msgstr "Accounting entries generation"
 #: include/class_follow_up.php:418 include/class_follow_up.php:420
 #: include/class_follow_up.php:421 include/class/class_follow_up.php:421
 #: include/class/class_follow_up.php:411 include/class/follow_up.class.php:411
-#: include/class/follow_up.class.php:412
+#: include/class/follow_up.class.php:412 include/class/follow_up.class.php:419
 msgid "Génére le document"
 msgstr "Generate the document"
 
@@ -10047,6 +10771,7 @@ msgstr "Generate invoices"
 #: include/compta_ach.inc.php:82 include/compta_ach.inc.php:85
 #: include/compta_ven.inc.php:94 include/compta_ach.inc.php:87
 #: include/compta_ach.inc.php:89 include/compta_ven.inc.php:96
+#: include/compta_ach.inc.php:86
 msgid "Générer une facture ou charger un document"
 msgstr "Generate an invoice or upload a document"
 
@@ -10077,6 +10802,9 @@ msgstr "Generate an invoice or upload a document"
 #: include/class/acc_ledger_history_purchase.class.php:256
 #: include/class/acc_ledger_history_purchase.class.php:260
 #: include/class/print_ledger_detail_item.class.php:161
+#: include/class/acc_ledger_history_sale.class.php:259
+#: include/class/acc_ledger_history_purchase.class.php:271
+#: include/class/print_ledger_simple.class.php:107
 msgid "HTVA"
 msgstr "wo VAT"
 
@@ -10106,6 +10834,8 @@ msgstr "wo VAT"
 #: include/class/acc_ledger_purchase.class.php:1854
 #: include/class/acc_ledger_sold.class.php:1431
 #: include/class/acc_ledger_purchase.class.php:1860
+#: include/class/acc_ledger_purchase.class.php:1897
+#: include/class/acc_ledger_sold.class.php:1416
 msgid "HTVA Opération"
 msgstr "Operation without tax"
 
@@ -10114,7 +10844,8 @@ msgstr "Operation without tax"
 #: include/template/action_display_short.php:57
 #: include/class/class_follow_up.php:261 include/class/follow_up.class.php:261
 #: include/template/action_display_short.php:58
-#: include/class/follow_up.class.php:262
+#: include/class/follow_up.class.php:262 include/class/document.class.php:1413
+#: include/class/follow_up.class.php:269 include/class/follow_up.class.php:725
 msgid "Haute"
 msgstr "High"
 
@@ -10124,17 +10855,20 @@ msgstr "High"
 #: include/template/detail-action.php:104
 #: include/template/action_display_short.php:88
 #: include/template/action_display_short.php:89
+#: include/template/detail-action.php:111
 msgid "Heure"
 msgstr "Hour"
 
 #: include/verif_bilan.inc.php:127 include/verif_bilan.inc.php:165
 #: include/verif_bilan.inc.php:168 include/verif_bilan.inc.php:169
+#: include/verif_bilan.inc.php:167
 msgid "Hist."
 msgstr "Hist."
 
 #: include/database.item.php:93 include/database.item.php:96
 #: include/database.item.php:101 include/database.item.php:98
 #: include/database.item.php:97 include/database.item.php:95
+#: include/database.item.php:94
 msgid "Histo. Changement"
 msgstr "Histo. Change"
 
@@ -10154,7 +10888,8 @@ msgstr "Histo. Change"
 #: include/database.item.php:11 include/ajax/ajax_card.php:166
 #: include/database.item.php:5 include/database.item.php:98
 #: include/ext/import-winbook/index.php:66 include/fiche.inc.php:65
-#: include/ajax/ajax_card.php:167
+#: include/ajax/ajax_card.php:167 include/ajax/ajax_card.php:170
+#: include/database.item.php:4 include/database.item.php:97
 msgid "Historique"
 msgstr "History"
 
@@ -10187,6 +10922,7 @@ msgstr ""
 
 #: include/database.item.php:66 include/database.item.php:69
 #: include/database.item.php:63 include/database.item.php:61
+#: include/database.item.php:62
 msgid ""
 "Historique de toutes vos opérations dans les journaux d'opérations diverses "
 "un menu de recherche, vous permettra de retrouver rapidement l'opération qui "
@@ -10197,6 +10933,7 @@ msgstr ""
 
 #: include/database.item.php:109 include/database.item.php:112
 #: include/database.item.php:106 include/database.item.php:104
+#: include/database.item.php:105
 msgid ""
 "Historique de toutes vos opérations dans les journaux de trésorerie un menu "
 "de recherche, vous permettra de retrouver rapidement l'opération qui vous "
@@ -10207,6 +10944,7 @@ msgstr ""
 
 #: include/database.item.php:108 include/database.item.php:111
 #: include/database.item.php:105 include/database.item.php:103
+#: include/database.item.php:104
 msgid ""
 "Historique de toutes vos opérations dans les journaux de vente un menu de "
 "recherche, vous permettra de retrouver rapidement l'opération qui vous "
@@ -10217,6 +10955,7 @@ msgstr ""
 
 #: include/database.item.php:100 include/database.item.php:103
 #: include/database.item.php:97 include/database.item.php:95
+#: include/database.item.php:96
 msgid ""
 "Historique de toutes vos opérations dans tous  les journaux auquels vous "
 "avez accès, vous permettra de retrouver rapidement l'opération qui vous "
@@ -10238,6 +10977,7 @@ msgstr ""
 
 #: include/database.item.php:101 include/database.item.php:104
 #: include/database.item.php:98 include/database.item.php:96
+#: include/database.item.php:97
 msgid ""
 "Historique de toutes vos opérations un menu de recherche, vous permettra de "
 "retrouver rapidement l'opération qui vous intéresse"
@@ -10266,7 +11006,7 @@ msgstr "History made imports"
 
 #: include/database.item.php:3 include/database.item.php:6
 #: include/database.item.php:8 include/database.item.php:11
-#: include/database.item.php:5
+#: include/database.item.php:5 include/database.item.php:4
 msgid "Historique des imputations analytiques"
 msgstr "History analytic record"
 
@@ -10282,12 +11022,14 @@ msgstr "Transaction History"
 #: include/database.item.php:102 include/database.item.php:105
 #: include/database.item.php:111 include/database.item.php:108
 #: include/database.item.php:107 include/database.item.php:103
+#: include/database.item.php:104
 msgid "Historique des ventes"
 msgstr "Sales History"
 
 #: include/database.item.php:103 include/database.item.php:106
 #: include/database.item.php:112 include/database.item.php:109
 #: include/database.item.php:108 include/database.item.php:104
+#: include/database.item.php:105
 msgid "Historique financier"
 msgstr "Financial History"
 
@@ -10308,18 +11050,21 @@ msgstr "Not lettered history"
 #: include/database.item.php:70 include/database.item.php:68
 #: include/database.item.php:67 include/database.item.php:66
 #: include/database.item.php:69 include/database.item.php:63
+#: include/database.item.php:62
 msgid "Historique opérations diverses"
 msgstr "History"
 
 #: include/database.item.php:16 include/database.item.php:19
 #: include/database.item.php:23 include/database.item.php:22
 #: include/database.item.php:25 include/database.item.php:18
+#: include/database.item.php:17
 msgid "Historique stock"
 msgstr "Stock History"
 
 #: include/database.item.php:102 include/database.item.php:105
 #: include/database.item.php:111 include/database.item.php:108
 #: include/database.item.php:107 include/database.item.php:103
+#: include/database.item.php:104
 msgid "Historique vente"
 msgstr "Sales history"
 
@@ -10328,6 +11073,7 @@ msgstr "Sales history"
 #: include/lib/user_menu.php:168 include/lib/user_menu.php:169
 #: include/lib/user_menu.php:181 include/lib/user_menu.php:182
 #: include/lib/user_menu.php:139 include/lib/user_menu.php:140
+#: include/lib/user_menu.php:138
 msgid "Hors Comptabilité"
 msgstr "Out of accountancy system"
 
@@ -10355,10 +11101,14 @@ msgstr "IN/OUT"
 #: include/class_user.php:973 include/class_user.php:974
 #: include/class/class_user.php:974 include/class/class_user.php:962
 #: include/class/class_user.php:961 include/class/user.class.php:961
-#: include/class/user.class.php:985
+#: include/class/user.class.php:985 include/class/user.class.php:988
 msgid "Id"
 msgstr "Id"
 
+#: include/lib/message_javascript.php:109
+msgid "Il est conseillé d'avoir un quickcode de moins de 9 car."
+msgstr "It is recommanded to have a short quickcode (9 char max)"
+
 #: include/ext/importbank/include/class_import_bank.php:78
 #: include/ext/importbank/include/import_bank.class.php:78
 msgid "Il manque la colonne pour les  dates"
@@ -10383,13 +11133,14 @@ msgstr "There is no document, click to add one"
 #: include/class/acc_ledger_purchase.class.php:266
 #: include/class/acc_ledger_sold.class.php:214
 #: include/class/acc_ledger_purchase.class.php:265
+#: include/class/acc_ledger_purchase.class.php:267
 msgid "Il n'y a aucune marchandise"
 msgstr "There is no item"
 
 #: html/admin/setup.php:462 html/install.php:526 html/install.php:525
 #: html/install.php:523 html/install.php:529 html/install.php:521
 #: html/install.php:527 html/install.php:489 html/install.php:464
-#: html/install.php:470 html/install.php:473
+#: html/install.php:470 html/install.php:473 html/install.php:522
 #, php-format
 msgid "Il y a %s param&egrave;tre qui sont trop bas"
 msgstr "There are %s invalid parameters"
@@ -10397,6 +11148,7 @@ msgstr "There are %s invalid parameters"
 #: html/ajax_misc.php:572 html/ajax_misc.php:614 html/ajax_misc.php:409
 #: html/ajax_misc.php:435 html/ajax_misc.php:547 html/ajax_misc.php:549
 #: html/ajax_misc.php:555 html/ajax_misc.php:557 html/ajax_misc.php:561
+#: html/ajax_misc.php:526
 msgid "Il y a une erreur, ce plugin n'existe pas"
 msgstr "This plugin doesn't exist"
 
@@ -10458,6 +11210,8 @@ msgstr "Import / export"
 #: html/install.php:213 html/install.php:543 html/install.php:599
 #: html/install.php:625 html/install.php:549 html/install.php:606
 #: html/install.php:632 html/install.php:552 html/install.php:635
+#: html/install.php:259 html/install.php:602 html/install.php:659
+#: html/install.php:688 include/class/follow_up.class.php:731
 msgid "Important"
 msgstr "Important"
 
@@ -10546,6 +11300,7 @@ msgstr "Imported"
 #: include/class/class_fiche.php:1024 include/class/class_fiche.php:1027
 #: include/class/fiche.class.php:1117 include/class/fiche.class.php:1119
 #: include/class/fiche.class.php:1133 include/class/fiche.class.php:1134
+#: include/class/fiche.class.php:1161
 msgid "Impossible cette fiche est utilisée dans un journal"
 msgstr "Can not remove this card, it is used"
 
@@ -10578,6 +11333,7 @@ msgstr "It is not possible to remove this accounting.It is still in use"
 #: include/class/acc_ledger.class.php:2584
 #: include/class/acc_ledger.class.php:2593
 #: include/class/acc_ledger.class.php:2632
+#: include/class/acc_ledger.class.php:2656
 msgid "Impossible d'effacer un journal qui contient des opérations"
 msgstr "It is not possible to remove this ledger.It is still in use"
 
@@ -10601,7 +11357,7 @@ msgid "Impossible de changer la valeur: poste déjà utilisé"
 msgstr "It is not possible to remove this accounting.It is still in use"
 
 #: include/param_sec.inc.php:244 include/param_sec.inc.php:178
-#: include/param_sec.inc.php:184
+#: include/param_sec.inc.php:184 include/param_sec.inc.php:189
 msgid ""
 "Impossible de modifier cet utilisateur dans cet écran, il faut passer par\n"
 "\t\t\tl'écran administration -> utilisateur."
@@ -10610,7 +11366,7 @@ msgstr ""
 "\t\t\tAdministrator -> User"
 
 #: include/param_sec.inc.php:231 include/param_sec.inc.php:165
-#: include/param_sec.inc.php:171
+#: include/param_sec.inc.php:171 include/param_sec.inc.php:176
 msgid ""
 "Impossible de modifier cet utilisateur dans cet écran, il faut passer par\n"
 "\t\tl'écran administration -> utilisateur."
@@ -10624,7 +11380,7 @@ msgstr "Unable to save this file"
 
 #: html/install.php:278 html/install.php:277 html/install.php:275
 #: html/install.php:281 html/install.php:287 html/install.php:238
-#: html/install.php:245 html/install.php:248
+#: html/install.php:245 html/install.php:248 html/install.php:295
 msgid ""
 "Impossible de se connecter à Postgresql, vérifiez les informations de "
 "connection"
@@ -10646,35 +11402,42 @@ msgstr "Impossible to connect to Postgresql"
 #: include/database.item.php:73 include/ajax/ajax_get_profile.php:114
 #: include/database.item.php:76 include/ajax/ajax_get_profile.php:120
 #: include/database.item.php:70 include/database.item.php:115
+#: include/ajax/ajax_get_profile.php:119 include/database.item.php:69
+#: include/database.item.php:116
 msgid "Impression"
 msgstr "Print"
 
 #: include/database.item.php:44 include/database.item.php:47
 #: include/database.item.php:51 include/database.item.php:50
 #: include/database.item.php:53 include/database.item.php:46
+#: include/database.item.php:45
 msgid "Impression Grand-Livre"
 msgstr "Print General Ledger"
 
 #: include/database.item.php:112 include/database.item.php:115
 #: include/database.item.php:121 include/database.item.php:118
 #: include/database.item.php:117 include/database.item.php:113
+#: include/database.item.php:114
 msgid "Impression Journaux"
 msgstr "Ledger report"
 
 #: include/database.item.php:114 include/database.item.php:117
 #: include/database.item.php:123 include/database.item.php:120
 #: include/database.item.php:119 include/database.item.php:115
+#: include/database.item.php:116
 msgid "Impression compta. analytique"
 msgstr "Print analytic"
 
 #: include/database.item.php:105 include/database.item.php:108
 #: include/database.item.php:114 include/database.item.php:111
 #: include/database.item.php:110 include/database.item.php:106
+#: include/database.item.php:107
 msgid "Impression de bilan"
 msgstr "Print balance sheet"
 
 #: include/database.item.php:111 include/database.item.php:114
 #: include/database.item.php:108 include/database.item.php:106
+#: include/database.item.php:107
 msgid ""
 "Impression de bilan, ce module est basique, il est plus intéressant "
 "d'utiliser le plugin \"rapport avancés\""
@@ -10686,11 +11449,13 @@ msgstr ""
 #: include/database.item.php:72 include/database.item.php:70
 #: include/database.item.php:69 include/database.item.php:68
 #: include/database.item.php:71 include/database.item.php:65
+#: include/database.item.php:64
 msgid "Impression de rapport"
 msgstr "Print report"
 
 #: include/database.item.php:68 include/database.item.php:71
 #: include/database.item.php:65 include/database.item.php:63
+#: include/database.item.php:64
 msgid ""
 "Impression de rapport personnalisé, il est aussi possible d'exporter en CSV "
 "afin de faire des graphiques"
@@ -10700,17 +11465,20 @@ msgstr "Printing of customized report, it is also possible to export in CSV"
 #: include/database.item.php:74 include/database.item.php:72
 #: include/database.item.php:71 include/database.item.php:70
 #: include/database.item.php:73 include/database.item.php:67
+#: include/database.item.php:66
 msgid "Impression des balances comptables"
 msgstr "Print balance"
 
 #: include/database.item.php:112 include/database.item.php:115
 #: include/database.item.php:121 include/database.item.php:118
 #: include/database.item.php:117 include/database.item.php:113
+#: include/database.item.php:114
 msgid "Impression des journaux"
 msgstr "Ledger report"
 
 #: include/database.item.php:118 include/database.item.php:121
 #: include/database.item.php:115 include/database.item.php:113
+#: include/database.item.php:114
 msgid ""
 "Impression des journaux avec les détails pour les parties privés, la TVA et "
 "ce qui est non déductibles en ce qui concerne les journaux de vente et "
@@ -10722,11 +11490,13 @@ msgstr ""
 #: include/database.item.php:104 include/database.item.php:107
 #: include/database.item.php:113 include/database.item.php:110
 #: include/database.item.php:109 include/database.item.php:105
+#: include/database.item.php:106
 msgid "Impression des rapprochements"
 msgstr "Print reconciliations"
 
 #: include/database.item.php:110 include/database.item.php:113
 #: include/database.item.php:107 include/database.item.php:105
+#: include/database.item.php:106
 msgid ""
 "Impression des rapprochements : opérations non rapprochées ou avec des "
 "montants différents"
@@ -10738,6 +11508,7 @@ msgstr ""
 #: include/database.item.php:71 include/database.item.php:69
 #: include/database.item.php:68 include/database.item.php:67
 #: include/database.item.php:70 include/database.item.php:64
+#: include/database.item.php:63
 msgid "Impression du détail d'un poste comptable"
 msgstr "Detail of a print job accounting"
 
@@ -10745,6 +11516,7 @@ msgstr "Detail of a print job accounting"
 #: include/database.item.php:73 include/database.item.php:71
 #: include/database.item.php:70 include/database.item.php:69
 #: include/database.item.php:72 include/database.item.php:66
+#: include/database.item.php:65
 msgid "Impression du grand livre"
 msgstr "Print great ledger"
 
@@ -10793,7 +11565,7 @@ msgid ""
 "sauvés exemple c:/temp, /tmp"
 msgstr "Give the folder for temporary files example c:/temp , /tmp,..."
 
-#: html/install.php:142
+#: html/install.php:142 html/install.php:155
 msgid ""
 "Indiquez ici le répertoire où les documents temporaires peuvent être sauvés "
 "exemple c:/temp, /tmp"
@@ -10824,6 +11596,7 @@ msgstr "Extra info"
 #: include/template/ledger_detail_bottom.php:37 include/ext/tva/ajax.php:101
 #: include/ext/tva/ajax.php:200 include/ajax/ajax_ledger.php:104
 #: include/ajax/ajax_ledger.php:126
+#: include/template/ledger_detail_bottom.php:42
 msgid "Information"
 msgstr "Information"
 
@@ -10831,6 +11604,7 @@ msgstr "Information"
 #: include/database.item.php:78 include/database.item.php:76
 #: include/database.item.php:75 include/database.item.php:74
 #: include/database.item.php:77 include/database.item.php:71
+#: include/database.item.php:70
 msgid "Information Banque"
 msgstr "Information Bank"
 
@@ -10841,6 +11615,7 @@ msgstr "Data saved"
 
 #: include/database.item.php:88 include/database.item.php:91
 #: include/database.item.php:85 include/database.item.php:83
+#: include/database.item.php:84
 msgid ""
 "Information sur votre société : nom, adresse... utilisé lors de la "
 "génération de documents"
@@ -10850,7 +11625,8 @@ msgstr ""
 
 #: include/lib/user_menu.php:122 include/lib/user_menu.php:123
 #: include/lib/user_menu.php:142 include/lib/user_menu.php:80
-#: include/lib/user_menu.php:99
+#: include/lib/user_menu.php:99 include/lib/user_menu.php:79
+#: include/lib/user_menu.php:98
 msgid "Information système"
 msgstr "System information"
 
@@ -10867,10 +11643,13 @@ msgstr "General Information"
 #: html/install.php:235 include/upgrade-plugin.php:113
 #: include/lib/user_menu.php:121 html/install.php:238
 #: include/upgrade-plugin.php:125 include/lib/user_menu.php:78
+#: html/install.php:285 include/lib/user_menu.php:77
+#: include/upgrade-plugin.php:128
 msgid "Installation"
 msgstr "Installation"
 
 #: include/lib/user_menu.php:121 include/lib/user_menu.php:78
+#: include/lib/user_menu.php:77
 msgid "Installation Mise à jour du système et des bases de données"
 msgstr "Update system and databases"
 
@@ -10900,6 +11679,10 @@ msgstr "Installed on %s"
 msgid "Installé par défaut dans %s"
 msgstr "Install by default in %s"
 
+#: include/ajax/ajax_anc_key_clean.php:65
+msgid "Interdit"
+msgstr "Forbidden"
+
 #: include/class_acc_ledger.php:656 include/class_acc_ledger.php:655
 #: include/class_acc_ledger.php:659 include/class_acc_ledger.php:660
 #: include/class_acc_ledger.php:661 include/class/class_acc_ledger.php:661
@@ -10910,6 +11693,8 @@ msgstr "Install by default in %s"
 #: include/class/acc_ledger_search.class.php:929
 #: include/class/acc_ledger_search.class.php:937
 #: include/class/acc_ledger_search.class.php:950
+#: include/class/acc_ledger_search.class.php:1039
+#: include/export/export_histo_csv.php:39
 msgid "Internal"
 msgstr "Internal"
 
@@ -10970,11 +11755,17 @@ msgstr "Internal"
 #: include/class/fiche.class.php:1475
 #: include/class/acc_ledger_history_generic.class.php:769
 #: include/class/acc_ledger_sold.class.php:1412
-#: include/class/acc_ledger_purchase.class.php:1838
+#: include/class/acc_ledger_purchase.class.php:1838 include/fiche.inc.php:542
+#: include/class/print_ledger_misc.class.php:44
+#: include/class/fiche.class.php:1502
+#: include/class/acc_ledger_purchase.class.php:1875
+#: include/class/acc_ledger_sold.class.php:1397
+#: include/class/acc_ledger_history_generic.class.php:770
+#: include/class/anc_grandlivre.class.php:232
 msgid "Interne"
 msgstr "Internal"
 
-#: include/ajax/ajax_periode.php:291
+#: include/ajax/ajax_periode.php:291 include/ajax/ajax_periode.php:261
 msgid "Invalid command"
 msgstr "Invalid command"
 
@@ -10985,7 +11776,7 @@ msgid "Invalide"
 msgstr "Invalide"
 
 #: html/ajax_misc.php:288 html/ajax_misc.php:290 html/ajax_misc.php:296
-#: html/ajax_misc.php:298
+#: html/ajax_misc.php:298 html/ajax_misc.php:313
 msgid "Invalide type"
 msgstr "Invalide type"
 
@@ -11008,7 +11799,7 @@ msgstr "Invalid inventory"
 #: include/class_html_input.php:332 include/lib/class_html_input.php:332
 #: include/lib/class_ibutton.php:63 include/compta_fin_rec.inc.php:221
 #: include/lib/class_html_input.php:333 include/lib/class_html_input.php:334
-#: include/lib/ibutton.class.php:63
+#: include/lib/ibutton.class.php:63 include/compta_fin_rec.inc.php:258
 msgid "Inverser la sélection"
 msgstr "Invert selection"
 
@@ -11016,6 +11807,7 @@ msgstr "Invert selection"
 #: include/class/acc_ledger_search.class.php:1070
 #: include/class/acc_ledger_search.class.php:1078
 #: include/class/acc_ledger_search.class.php:1091
+#: include/class/acc_ledger_search.class.php:1180
 msgid "Inverser sel"
 msgstr "Invert sel"
 
@@ -11027,7 +11819,7 @@ msgid "Item"
 msgstr "Item"
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
-#: include/class/periode.class.php:651
+#: include/class/periode.class.php:651 include/class/periode.class.php:652
 msgid "Janvier"
 msgstr "January"
 
@@ -11045,6 +11837,7 @@ msgstr "Javascript"
 #: include/template/detail-action.php:461
 #: include/template/detail-action.php:465
 #: include/template/detail-action.php:463
+#: include/template/detail-action.php:476
 msgid "Je ne peux pas ajouter de fichier"
 msgstr "I can not add this file"
 
@@ -11096,11 +11889,66 @@ msgstr "Thursday"
 #: include/class/acc_ledger_search.class.php:954
 #: include/export/export_printtva_csv.php:39
 #: include/export/export_printtva_csv.php:58
+#: unit-test/include/class/print_ledger_detail.classTest.php:75
+#: unit-test/include/class/print_ledger_fin.classTest.php:72
+#: unit-test/include/class/print_ledger_fin.classTest.php:83
+#: unit-test/include/class/print_ledger_fin.classTest.php:95
+#: unit-test/include/class/print_ledger_fin.classTest.php:106
+#: include/class/acc_ledger_search.class.php:1043
+#: include/class/operation_predef_mtable.class.php:51
+#: include/class/acc_ledger_purchase.class.php:1433
+#: include/class/acc_ledger_sold.class.php:703
+#: include/export/export_printtva_csv.php:51
+#: include/export/export_printtva_csv.php:70
+#: include/export/export_ledger_pdf.php:84
+#: include/export/export_histo_csv.php:40
+#: include/template/pre_operation_display.php:38
 msgid "Journal"
 msgstr "Ledger"
 
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:78
+#: unit-test/include/class/print_ledger_simple.classTest.php:82
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:82
+msgid "Journal Achat Payé"
+msgstr "Purchase ledger paid"
+
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:107
+#: unit-test/include/class/print_ledger_simple.classTest.php:111
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:109
+msgid "Journal Achat tous"
+msgstr "Purchase ledger all"
+
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:92
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:141
+#: unit-test/include/class/print_ledger_simple.classTest.php:96
+#: unit-test/include/class/print_ledger_simple.classTest.php:145
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:95
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:141
+msgid "Journal Non Payé"
+msgstr "Ledger not paid"
+
+#: unit-test/include/class/print_ledger_misc.classTest.php:84
+msgid "Journal Opérations diverses"
+msgstr "Miscellaneous ledger"
+
+#: unit-test/include/class/print_ledger_misc.classTest.php:73
+msgid "Journal Opérations diverses "
+msgstr "Miscellaneous ledger"
+
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:127
+#: unit-test/include/class/print_ledger_simple.classTest.php:131
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:128
+msgid "Journal Vente Payé"
+msgstr "Sale purchase paid"
+
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:156
+#: unit-test/include/class/print_ledger_simple.classTest.php:160
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:155
+msgid "Journal Vente tous"
+msgstr "Sales ledger all"
+
 #: include/template/param_jrn.php:125 include/template/param_jrn.php:127
-#: include/template/param_jrn.php:171
+#: include/template/param_jrn.php:171 include/template/param_jrn.php:172
 msgid "Journal actif"
 msgstr "Enabled ledger"
 
@@ -11124,6 +11972,7 @@ msgstr "Financial ledger misconfigured"
 #: include/class/acc_ledger.class.php:2871
 #: include/class/acc_ledger.class.php:2880
 #: include/class/acc_ledger.class.php:2919
+#: include/class/acc_ledger.class.php:2943
 msgid "Journal incorrect"
 msgstr "Incorrect ledger"
 
@@ -11135,6 +11984,7 @@ msgstr "No existent ledger"
 #: include/ext/import_account/include/class_impacc_export.php:104
 #: include/ext/import_account/include/impacc_export.class.php:104
 #: include/class/acc_ledger.class.php:2938
+#: include/class/acc_ledger.class.php:2962
 msgid "Journal invalide"
 msgstr "Invalid Ledger"
 
@@ -11155,6 +12005,7 @@ msgstr "Ledger misconfigured"
 #: include/class/acc_ledger.class.php:2205
 #: include/class/acc_ledger.class.php:2214
 #: include/class/acc_ledger.class.php:2230
+#: include/class/acc_ledger.class.php:2249
 msgid "Journal n'existe pas"
 msgstr "The ledger does not exist"
 
@@ -11172,9 +12023,14 @@ msgstr "Ledger not found"
 #: include/param_sec.inc.php:223 include/class/acc_ledger_search.class.php:1065
 #: include/class/acc_ledger_search.class.php:1073
 #: include/class/acc_ledger_search.class.php:1086
+#: include/class/acc_ledger_search.class.php:1175 include/param_sec.inc.php:228
 msgid "Journaux"
 msgstr "Ledgers"
 
+#: include/lib/message_javascript.php:108
+msgid "Journaux Achat ou vente en mode simple, TVA ou détaillé"
+msgstr "Ledger Sales or Purchase  , basic, detailled or VAT"
+
 #: include/class_acc_ledger.php:3380 include/class/class_acc_ledger.php:3380
 #: include/class/class_acc_ledger.php:3379
 #: include/class/class_acc_ledger.php:3384
@@ -11183,6 +12039,7 @@ msgstr "Ledgers"
 #: include/class/acc_ledger.class.php:2111
 #: include/class/acc_ledger.class.php:2120
 #: include/class/acc_ledger.class.php:2136
+#: include/class/acc_ledger.class.php:2155
 msgid "Journaux Financier"
 msgstr "Financial"
 
@@ -11194,6 +12051,7 @@ msgstr "Financial"
 #: include/class/acc_ledger.class.php:2112
 #: include/class/acc_ledger.class.php:2121
 #: include/class/acc_ledger.class.php:2137
+#: include/class/acc_ledger.class.php:2156
 msgid "Journaux d'Opérations diverses"
 msgstr "Miscellaneous ledger"
 
@@ -11205,6 +12063,7 @@ msgstr "Miscellaneous ledger"
 #: include/class/acc_ledger.class.php:2110
 #: include/class/acc_ledger.class.php:2119
 #: include/class/acc_ledger.class.php:2135
+#: include/class/acc_ledger.class.php:2154
 msgid "Journaux d'achat"
 msgstr "Purchase ledger"
 
@@ -11220,16 +12079,17 @@ msgstr "Purchase ledger"
 #: include/class/acc_ledger.class.php:2109
 #: include/class/acc_ledger.class.php:2118
 #: include/class/acc_ledger.class.php:2134
+#: include/class/acc_ledger.class.php:2153
 msgid "Journaux de vente"
 msgstr "Ledger of sales"
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
-#: include/class/periode.class.php:652
+#: include/class/periode.class.php:652 include/class/periode.class.php:653
 msgid "Juillet"
 msgstr "July"
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
-#: include/class/periode.class.php:652
+#: include/class/periode.class.php:652 include/class/periode.class.php:653
 msgid "Juin"
 msgstr "June"
 
@@ -11263,10 +12123,14 @@ msgid "L'extension est installée, pourriez-vous en vérifier le paramètrage ?"
 msgstr "The extension is installed, could you check the settings?"
 
 #: include/param_sec.inc.php:242 include/param_sec.inc.php:176
-#: include/param_sec.inc.php:182
+#: include/param_sec.inc.php:182 include/param_sec.inc.php:187
 msgid "L'utilisateur n'a pas accès à ce dossier"
 msgstr "User can access this folder"
 
+#: include/class/html_input_noalyss.class.php:46
+msgid "LAD46 Erreur type"
+msgstr "LAD46 error type"
+
 #: html/admin/setup.php:459
 msgid "La base de donn&eacute;es est bien configur&eacute;e "
 msgstr "The database is properly configured"
@@ -11286,7 +12150,7 @@ msgstr ""
 
 #: html/install.php:605 html/install.php:621 html/install.php:613
 #: html/install.php:619 html/install.php:581 html/install.php:571
-#: html/install.php:577 html/install.php:580
+#: html/install.php:577 html/install.php:580 html/install.php:630
 #, php-format
 msgid ""
 "La base de donnée %s est vide, \n"
@@ -11327,7 +12191,7 @@ msgstr ""
 #: html/admin/setup.php:459 html/install.php:523 html/install.php:522
 #: html/install.php:520 html/install.php:526 html/install.php:518
 #: html/install.php:524 html/install.php:486 html/install.php:461
-#: html/install.php:467 html/install.php:470
+#: html/install.php:467 html/install.php:470 html/install.php:519
 msgid "La base de données est bien configurée "
 msgstr "The database is properly configured"
 
@@ -11404,6 +12268,13 @@ msgstr "The date is invalid, format is dd.mm.yyyy"
 #: include/class/acc_ledger_sold.class.php:210
 #: include/class/acc_ledger_purchase.class.php:200
 #: include/class/acc_ledger_purchase.class.php:225
+#: include/class/acc_ledger_purchase.class.php:132
+#: include/class/acc_ledger_purchase.class.php:157
+#: include/class/acc_ledger_purchase.class.php:176
+#: include/class/acc_ledger_purchase.class.php:182
+#: include/class/acc_ledger_purchase.class.php:187
+#: include/class/acc_ledger_purchase.class.php:202
+#: include/class/acc_ledger_purchase.class.php:227
 msgid "La fiche "
 msgstr "The card"
 
@@ -11428,6 +12299,8 @@ msgstr "The card"
 #: include/class/acc_ledger.class.php:1252
 #: include/class/acc_ledger.class.php:1125
 #: include/class/acc_ledger.class.php:1268
+#: include/class/acc_ledger.class.php:1121
+#: include/class/acc_ledger.class.php:1264
 #, php-format
 msgid "La fiche %s n'a pas de poste comptable"
 msgstr "The card% s Has No accountancy"
@@ -11444,12 +12317,31 @@ msgstr ""
 "The numbering concerns only one each ledger , let it to 0 if you don't want "
 "to change it"
 
+#: include/param_sec.inc.php:327
+msgid ""
+"La sécurité sur les actions permet de limiter ce que l'utilisateur peut "
+"faire, si  elle n'est pas active l'utilisateur a donc accès à toutes ces "
+"actions"
+msgstr ""
+"The security on the action limit what the user can do , if it is not enable,"
+" the user can do all those actions"
+
+#: include/param_sec.inc.php:253
+msgid ""
+"La sécurité sur les journaux, permet de limiter l'accès de l'utilisateur aux "
+"journaux, si cette  sécurité n'est pas activée , l'utilisateur a accès à "
+"tous les journaux en lecture et écriture"
+msgstr ""
+"The security on the ledger limit what the user can access, if it is not"
+" enable, the user can access all the ledgers"
+
 #: include/class_fiche_def.php:453 include/ajax_plugin_detail.php:35
 #: include/class_fiche_def.php:436 include/class_fiche_def.php:442
 #: include/class_fiche_def.php:452 include/ajax/ajax_plugin_detail.php:35
 #: include/class/class_fiche_def.php:452
 #: include/class/anc_account_table.class.php:48
 #: include/class/fiche_def.class.php:453
+#: include/class/document_state_mtable.php:43
 msgid "Label"
 msgstr "Label"
 
@@ -11475,7 +12367,7 @@ msgstr "Latin"
 
 #: html/admin/setup.php:76 html/admin/setup.php:79 html/admin/setup.php:130
 #: html/install.php:132 html/install.php:131 html/install.php:137
-#: html/install.php:144
+#: html/install.php:144 html/install.php:157
 msgid "Le chemin vers le repertoire contenant psql, pg_dump..."
 msgstr "Give the path to the postgresql binaries (psql, pg_dump,...)"
 
@@ -11521,12 +12413,23 @@ msgstr "The mini-report"
 msgid "Le modèle %s est effacé"
 msgstr "Folder %s is dropped"
 
+#: html/install.php:226
+msgid "Le mot de passe du super admin et le login ne peuvent être vides"
+msgstr "The password can not be empty"
+
+#: html/install.php:243
+msgid ""
+"Le mot de passe du super admin et le superadmin ne peut pas contenir des "
+"guillemets ou espaces, ni @mobile"
+msgstr "Password of superadmin cannot contains space, quote or @mobile"
+
 #: include/user.inc.php:98 include/user.inc.php:99 include/user.inc.php:101
 msgid "Le mot de passe ne peut être vide"
 msgstr "The password can not be empty"
 
 #: include/database.item.php:99 include/database.item.php:102
 #: include/database.item.php:96 include/database.item.php:94
+#: include/database.item.php:95
 msgid ""
 "Le navigateur vous présente une liste de menu auquel vous avez accès et vous "
 "permet d'accèder plus rapidement au menu que vous souhaitez"
@@ -11535,7 +12438,7 @@ msgstr ""
 "faster"
 
 #: include/lib/icard.class.php:222 include/lib/icard.class.php:223
-#: include/lib/icard.class.php:224
+#: include/lib/icard.class.php:224 include/lib/icard.class.php:225
 msgid "Le nom d une icard doit être donne"
 msgstr "The name can not be empty"
 
@@ -11577,7 +12480,7 @@ msgstr "The name and the accounting base can not be empty"
 #: include/ajax/ajax_card.php:551 include/class/forecast.class.php:70
 #: include/ajax/ajax_card.php:555
 #: include/class/template_card_category.class.php:73
-#: include/ajax/ajax_card.php:574
+#: include/ajax/ajax_card.php:574 include/ajax/ajax_card.php:650
 msgid "Le nom ne peut pas être vide"
 msgstr "the name cannot be empty"
 
@@ -11612,6 +12515,7 @@ msgstr "The accounting item"
 
 #: include/class/acc_ledger.class.php:1124
 #: include/class/acc_ledger.class.php:1140
+#: include/class/acc_ledger.class.php:1136
 #, php-format
 msgid "Le poste %s n'est pas dans ce journal"
 msgstr "Account %s doesn't belong to this ledger"
@@ -11658,12 +12562,14 @@ msgstr "Processing , please do not reload"
 #: include/export/export_security_pdf.php:137
 #: include/class/profile_menu.class.php:246
 #: include/class/profile_menu.class.php:271
+#: include/class/profile_menu.class.php:272
 msgid "Lecture"
 msgstr "Reading"
 
 #: include/param_sec.inc.php:286 include/param_sec.inc.php:228
 #: include/param_sec.inc.php:278 include/param_sec.inc.php:259
-#: include/param_sec.inc.php:335
+#: include/param_sec.inc.php:335 include/param_sec.inc.php:270
+#: include/param_sec.inc.php:350
 msgid "Lecture et écriture"
 msgstr "Read and write"
 
@@ -11671,15 +12577,19 @@ msgstr "Read and write"
 #: html/ajax_misc.php:405 html/ajax_misc.php:483
 #: include/ajax/ajax_display_letter.php:119
 #: include/ajax/ajax_display_letter.php:124
+#: include/ajax/ajax_display_letter.php:142
 msgid "Les 2"
 msgstr "Both"
 
 #: include/class/tva_rate_mtable.class.php:207
 #: include/class/tva_rate_mtable.class.php:209
+#: include/class/tva_rate_mtable.class.php:224
+#: include/class/tva_rate_mtable.class.php:226
 msgid "Les 2 postes comptables ne peuvent être nuls"
 msgstr "Both accounting cannot be empty"
 
 #: include/param_sec.inc.php:237 include/param_sec.inc.php:302
+#: include/param_sec.inc.php:240 include/param_sec.inc.php:313
 msgid "Les administrateurs NOALYSS ont toujours accès à tout"
 msgstr "NOALYSS administrator are granted with all privileges"
 
@@ -11700,6 +12610,7 @@ msgstr "The date formats are DD.MM.YYYY"
 #: include/class/class_anc_grandlivre.php:146
 #: include/class/anc_grandlivre.class.php:167
 #: include/class/anc_grandlivre.class.php:168
+#: include/class/anc_grandlivre.class.php:180
 msgid ""
 "Les extensions CONVERT_GIF_PDF et PDFTK pour convertir en pdf ne sont pas "
 "installées "
@@ -11725,7 +12636,7 @@ msgstr "The plugs must have at least one name"
 #: html/admin/setup.php:193 html/admin/setup.php:211 html/admin/setup.php:213
 #: html/install.php:255 html/install.php:254 html/install.php:252
 #: html/install.php:257 html/install.php:263 html/install.php:214
-#: html/install.php:221 html/install.php:224
+#: html/install.php:221 html/install.php:224 html/install.php:271
 msgid "Les informations sont sauv&eacute;es vous pouvez continuer"
 msgstr "Parameters are saved , continue"
 
@@ -11763,6 +12674,7 @@ msgstr ""
 #: include/class/class_user.php:1212 include/class/class_user.php:1200
 #: include/class/class_user.php:1238 include/class/class_user.php:1236
 #: include/class/user.class.php:1236 include/class/user.class.php:1261
+#: include/class/user.class.php:1284
 msgid "Les mots de passe ne correspondent pas. Mot de passe inchangé"
 msgstr "The password do not match, the password is not changed"
 
@@ -11826,7 +12738,7 @@ msgstr "Let."
 #: include/export/export_fiche_balance_csv.php:161 include/fiche.inc.php:522
 #: include/export/export_fiche_detail_csv.php:80
 #: include/export/export_poste_detail_csv.php:91 include/fiche.inc.php:524
-#: include/fiche.inc.php:533
+#: include/fiche.inc.php:533 include/fiche.inc.php:546
 msgid "Let."
 msgstr "Let."
 
@@ -11842,7 +12754,8 @@ msgstr "Let."
 #: include/export/export_gl_csv.php:90 include/template/letter_prop.php:65
 #: include/category_card.inc.php:79 include/export/export_gl_csv.php:96
 #: include/database.item.php:74 include/ajax/ajax_display_letter.php:49
-#: include/category_card.inc.php:81
+#: include/category_card.inc.php:81 include/ajax/ajax_display_letter.php:63
+#: include/database.item.php:73
 msgid "Lettrage"
 msgstr "Lettering"
 
@@ -11870,11 +12783,12 @@ msgstr "Lettering Post"
 msgid "Lettrage par fiche"
 msgstr "Lettering by card"
 
-#: include/lettering.card.inc.php:50
+#: include/lettering.card.inc.php:50 include/lettering.card.inc.php:51
 msgid "Lettrage pour la fiche "
 msgstr "Lettering for the card"
 
 #: include/lettering.account.inc.php:47 include/lettering.account.inc.php:53
+#: include/lettering.account.inc.php:55
 msgid "Lettrage pour le poste comptable "
 msgstr "Lettering for the accounting"
 
@@ -11882,7 +12796,7 @@ msgstr "Lettering for the accounting"
 #: include/database.item.php:198 include/database.item.php:201
 #: include/database.item.php:176 include/database.item.php:177
 #: include/database.item.php:180 include/database.item.php:188
-#: include/database.item.php:193
+#: include/database.item.php:193 include/database.item.php:186
 msgid "Lettre de rappel"
 msgstr "Reminder"
 
@@ -12068,7 +12982,22 @@ msgstr "label"
 #: include/class/acc_ledger.class.php:621
 #: include/class/acc_ledger.class.php:628
 #: include/class/acc_ledger.class.php:903
-#: include/class/acc_ledger_purchase.class.php:1836
+#: include/class/acc_ledger_purchase.class.php:1836 include/fiche.inc.php:416
+#: include/class/payment_method_mtable.class.php:39
+#: include/class/acc_ledger.class.php:869
+#: include/class/acc_ledger.class.php:891
+#: include/class/acc_ledger_purchase.class.php:1436
+#: include/class/acc_ledger_purchase.class.php:1873
+#: include/class/acc_ledger_sold.class.php:706
+#: include/class/acc_ledger_sold.class.php:1395
+#: include/class/pre_op_advanced.class.php:200
+#: include/class/print_ledger_detail_item.class.php:59
+#: include/class/acc_ledger_history_generic.class.php:774
+#: include/class/anc_grandlivre.class.php:228
+#: include/export/export_ledger_csv.php:149
+#: include/template/form_ledger_detail.php:59
+#: include/template/ledger_detail_bottom.php:95
+#: include/template/ledger_detail_bottom.php:384
 #, php-format
 msgid "Libellé"
 msgstr "Label"
@@ -12096,6 +13025,8 @@ msgstr "Label"
 #: include/class/acc_ledger_sold.class.php:945
 #: include/class/acc_ledger_purchase.class.php:1703
 #: include/class/acc_ledger_sold.class.php:947
+#: include/class/acc_ledger_purchase.class.php:1725
+#: include/class/acc_ledger_sold.class.php:951
 msgid "Libellé :"
 msgstr "Follows:"
 
@@ -12114,7 +13045,7 @@ msgstr "Link"
 
 #: include/database.item.php:6 include/database.item.php:9
 #: include/database.item.php:11 include/database.item.php:14
-#: include/database.item.php:8
+#: include/database.item.php:8 include/database.item.php:7
 msgid "Lien entre comptabilité et Comptabilité analytique"
 msgstr "Link between Accounting and Cost Accounting"
 
@@ -12175,7 +13106,7 @@ msgstr "Import List"
 #: include/database.item.php:120 include/database.item.php:123
 #: include/database.item.php:129 include/database.item.php:125
 #: include/database.item.php:124 include/database.item.php:128
-#: include/database.item.php:122
+#: include/database.item.php:122 include/database.item.php:121
 msgid "Liste Suivi"
 msgstr "Follow up"
 
@@ -12197,6 +13128,7 @@ msgstr "List of contacts"
 
 #: include/database.item.php:125 include/database.item.php:128
 #: include/database.item.php:122 include/database.item.php:120
+#: include/database.item.php:121
 msgid ""
 "Liste de vos suivis, en fait de tous les documents, réunions ... dont vous "
 "avez besoin afin de suivre vos clients, fournisseurs ou administrations. Il "
@@ -12214,11 +13146,13 @@ msgstr "List depreciable property"
 #: include/database.item.php:93 include/database.item.php:96
 #: include/database.item.php:101 include/database.item.php:98
 #: include/database.item.php:97 include/database.item.php:95
+#: include/database.item.php:94
 msgid "Liste des changements manuels des stocks"
 msgstr "List of books stock changes"
 
 #: include/database.item.php:98 include/database.item.php:101
 #: include/database.item.php:95 include/database.item.php:93
+#: include/database.item.php:94
 msgid ""
 "Liste des changements manuels des stocks, inventaire, transfert de "
 "marchandises entre dépôts..."
@@ -12250,6 +13184,7 @@ msgstr "List of detailled entries"
 #: include/ajax/ajax_search_operation.php:119
 #: include/ajax/ajax_search_operation.php:122
 #: include/ajax/ajax_search_operation.php:124
+#: include/ajax/ajax_search_operation.php:129
 msgid "Liste limitée à "
 msgstr "Limited to 12"
 
@@ -12322,7 +13257,7 @@ msgid "Lundi"
 msgstr "Monday"
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
-#: include/class/periode.class.php:652
+#: include/class/periode.class.php:652 include/class/periode.class.php:653
 msgid "Mai"
 msgstr "May"
 
@@ -12338,42 +13273,49 @@ msgstr "Representative"
 #: include/class_extension.php:247 include/class_extension.php:262
 #: include/class/class_extension.php:262 include/class/class_extension.php:270
 #: include/class/extension.class.php:270 include/class/extension.class.php:302
+#: include/class/extension.class.php:308
 msgid "Manque auteur"
 msgstr "Missing author"
 
 #: include/class_extension.php:246 include/class_extension.php:261
 #: include/class/class_extension.php:261 include/class/class_extension.php:269
 #: include/class/extension.class.php:269 include/class/extension.class.php:300
+#: include/class/extension.class.php:306
 msgid "Manque code"
 msgstr "Missing code "
 
 #: include/class_extension.php:245 include/class_extension.php:260
 #: include/class/class_extension.php:260 include/class/class_extension.php:268
 #: include/class/extension.class.php:268 include/class/extension.class.php:298
+#: include/class/extension.class.php:304
 msgid "Manque description"
 msgstr "Missing description"
 
 #: include/class_extension.php:249 include/class_extension.php:264
 #: include/class/class_extension.php:264 include/class/class_extension.php:272
 #: include/class/extension.class.php:272 include/class/extension.class.php:306
+#: include/class/extension.class.php:312
 msgid "Manque fichier à inclure"
 msgstr "Missing file to load"
 
 #: include/class_extension.php:244 include/class_extension.php:259
 #: include/class/class_extension.php:259 include/class/class_extension.php:267
 #: include/class/extension.class.php:267 include/class/extension.class.php:296
+#: include/class/extension.class.php:302
 msgid "Manque nom"
 msgstr "Missing name"
 
 #: include/class_extension.php:239 include/class_extension.php:254
 #: include/class/class_extension.php:254 include/class/class_extension.php:262
 #: include/class/extension.class.php:262 include/class/extension.class.php:290
+#: include/class/extension.class.php:296
 msgid "Manque plugin"
 msgstr "Missing this plugin"
 
 #: include/class_extension.php:248 include/class_extension.php:263
 #: include/class/class_extension.php:263 include/class/class_extension.php:271
 #: include/class/extension.class.php:271 include/class/extension.class.php:304
+#: include/class/extension.class.php:310
 msgid "Manque répertoire racine"
 msgstr "Missing root directory"
 
@@ -12395,7 +13337,7 @@ msgid "Marquer pour suppression"
 msgstr "Mark for deleting"
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
-#: include/class/periode.class.php:651
+#: include/class/periode.class.php:651 include/class/periode.class.php:652
 msgid "Mars"
 msgstr "March"
 
@@ -12422,6 +13364,7 @@ msgstr "Material damping"
 #: html/ajax_misc.php:497 html/ajax_misc.php:575
 #: include/ajax/ajax_display_letter.php:211
 #: include/ajax/ajax_display_letter.php:216
+#: include/ajax/ajax_display_letter.php:223
 msgid "Mauvais type objet"
 msgstr "Bad type of object"
 
@@ -12463,18 +13406,20 @@ msgstr "Menu"
 #: include/database.item.php:76 include/database.item.php:74
 #: include/database.item.php:73 include/database.item.php:72
 #: include/database.item.php:75 include/database.item.php:69
+#: include/database.item.php:68
 msgid "Menu "
 msgstr "Menu"
 
 #: include/database.item.php:119 include/database.item.php:122
 #: include/database.item.php:128 include/database.item.php:124
 #: include/database.item.php:123 include/database.item.php:127
-#: include/database.item.php:121
+#: include/database.item.php:121 include/database.item.php:120
 msgid "Menu Financier"
 msgstr "Financial Menu"
 
 #: include/database.item.php:77 include/database.item.php:80
 #: include/database.item.php:74 include/database.item.php:72
+#: include/database.item.php:73
 msgid "Menu Lettrage"
 msgstr "Lettering"
 
@@ -12482,6 +13427,7 @@ msgstr "Lettering"
 #: include/database.item.php:75 include/database.item.php:73
 #: include/database.item.php:72 include/database.item.php:71
 #: include/database.item.php:74 include/database.item.php:68
+#: include/database.item.php:67
 msgid "Menu achat"
 msgstr "Purchase menu"
 
@@ -12492,11 +13438,13 @@ msgstr "Current menu"
 #: include/database.item.php:117 include/database.item.php:120
 #: include/database.item.php:126 include/database.item.php:123
 #: include/database.item.php:122 include/database.item.php:118
+#: include/database.item.php:119
 msgid "Menu avancé"
 msgstr "Advanced Menu"
 
 #: include/database.item.php:80 include/database.item.php:83
 #: include/database.item.php:77 include/database.item.php:75
+#: include/database.item.php:76
 msgid "Menu de différents paramètres"
 msgstr "Parameters"
 
@@ -12504,6 +13452,7 @@ msgstr "Parameters"
 #: include/database.item.php:76 include/database.item.php:74
 #: include/database.item.php:73 include/database.item.php:72
 #: include/database.item.php:75 include/database.item.php:69
+#: include/database.item.php:68
 msgid "Menu et profil"
 msgstr "Menu and Profile"
 
@@ -12511,12 +13460,18 @@ msgstr "Menu and Profile"
 #: include/database.item.php:77 include/database.item.php:75
 #: include/database.item.php:74 include/database.item.php:73
 #: include/database.item.php:76 include/database.item.php:70
+#: include/database.item.php:69
 msgid "Menu impression"
 msgstr "Report menu"
 
+#: include/class/acc_operation.class.php:747
+msgid "Menu invalide"
+msgstr "Invalid menu"
+
 #: include/database.item.php:111 include/database.item.php:114
 #: include/database.item.php:120 include/database.item.php:117
 #: include/database.item.php:116 include/database.item.php:112
+#: include/database.item.php:113
 msgid "Menu opérations diverses"
 msgstr "Menu misc. operations"
 
@@ -12527,31 +13482,34 @@ msgstr "Menu misc. operations"
 #: include/database.item.php:130 include/ajax/ajax_add_menu.php:156
 #: include/ajax/ajax_get_menu_detail.php:71 include/ajax/ajax_add_menu.php:157
 #: include/database.item.php:134 include/ajax/ajax_add_menu.php:165
-#: include/database.item.php:128
+#: include/database.item.php:128 include/database.item.php:127
 msgid "Menu par défaut"
 msgstr "Default menu"
 
 #: include/database.item.php:123 include/database.item.php:126
 #: include/database.item.php:120 include/database.item.php:118
+#: include/database.item.php:119
 msgid ""
 "Menu regroupant la création de rapport, la vérification de la comptabilité..."
 msgstr "Group of menus for report creation, verification of your bookkeeping"
 
 #: include/database.item.php:19 include/database.item.php:22
 #: include/database.item.php:51 include/database.item.php:49
-#: include/database.item.php:62
+#: include/database.item.php:62 include/database.item.php:61
 msgid "Menu regroupant les plugins"
 msgstr "Group of plugins menus"
 
 #: include/database.item.php:94 include/database.item.php:97
 #: include/database.item.php:102 include/database.item.php:99
 #: include/database.item.php:98 include/database.item.php:96
+#: include/database.item.php:95
 msgid "Menu simplifié pour retrouver rapidement un menu"
 msgstr "Simplified menu to quickly locate a menu"
 
 #: include/database.item.php:113 include/database.item.php:116
 #: include/database.item.php:122 include/database.item.php:119
 #: include/database.item.php:118 include/database.item.php:114
+#: include/database.item.php:115
 msgid "Menu ventes et recettes"
 msgstr "Menu Sales and revenue"
 
@@ -12572,13 +13530,13 @@ msgstr "Wednesday"
 #: include/ext/invoicing/include/template/recorded_message_display.php:27
 #: include/compta_ach.inc.php:111 include/compta_ven.inc.php:118
 #: include/operation_ods_confirm.inc.php:68 include/compta_ven.inc.php:116
-#: include/compta_ach.inc.php:109
+#: include/compta_ach.inc.php:109 include/compta_ach.inc.php:108
 msgid "Message"
 msgstr "Message"
 
 #: include/compta_ach.inc.php:109 include/compta_ven.inc.php:116
 #: include/operation_ods_confirm.inc.php:67 include/compta_ven.inc.php:114
-#: include/compta_ach.inc.php:107
+#: include/compta_ach.inc.php:107 include/compta_ach.inc.php:106
 msgid "Message extourne"
 msgstr "Message reverse"
 
@@ -12587,6 +13545,7 @@ msgid "Met à jour toutes les dossiers et modèles"
 msgstr "Update system and databases"
 
 #: include/export/export_ledger_csv.php:143
+#: include/export/export_ledger_csv.php:148
 msgid "Methode paiement"
 msgstr "means of payment"
 
@@ -12612,6 +13571,8 @@ msgstr "Upgrade your database "
 #: include/ajax/ajax_search_operation.php:132
 #: include/ajax/ajax_search_operation.php:129
 #: include/ajax/ajax_search_operation.php:134
+#: include/ajax/ajax_search_operation.php:135
+#: include/ajax/ajax_search_operation.php:140
 msgid "Mettre à jour"
 msgstr "Update"
 
@@ -12620,8 +13581,8 @@ msgid ""
 "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"
 msgstr ""
-"Set it to YES if a ledger is dedicated to have only negative amount, and"
-" issue a warning is the amount is positive"
+"Set it to YES if a ledger is dedicated to have only negative amount, and "
+"issue a warning is the amount is positive"
 
 #: include/ajax_preference.php:149 include/ajax_preference.php:150
 #: include/ajax_preference.php:157 include/ajax/ajax_preference.php:157
@@ -12630,7 +13591,7 @@ msgid "Mini-Rapport : "
 msgstr "Mini-Report"
 
 #: include/template/param_jrn.php:68 include/template/param_jrn.php:75
-#: include/template/param_jrn.php:119
+#: include/template/param_jrn.php:119 include/template/param_jrn.php:120
 msgid "Minimum de lignes à afficher"
 msgstr "Minimum rows to display"
 
@@ -12641,7 +13602,7 @@ msgstr "Update"
 #: html/admin/setup.php:528 html/install.php:592 html/install.php:591
 #: html/install.php:589 html/install.php:602 html/install.php:594
 #: html/install.php:600 html/install.php:562 html/install.php:552
-#: html/install.php:558 html/install.php:561
+#: html/install.php:558 html/install.php:561 html/install.php:611
 msgid "Mise  à jour dossier"
 msgstr "Update folder"
 
@@ -12678,18 +13639,20 @@ msgstr "Update Repository"
 #: include/ext/import_card/include/import_card.class.php:340
 #: include/upgrade-plugin.php:101 include/upgrade-template.php:39
 #: include/upgrade-plugin.php:113 include/upgrade-template.php:51
+#: include/upgrade-plugin.php:116
 msgid "Mise à jour"
 msgstr "Update"
 
 #: html/admin/setup.php:549 html/install.php:613 html/install.php:614
 #: html/install.php:621 html/install.php:637 html/install.php:629
 #: html/install.php:635 html/install.php:597 html/install.php:587
-#: html/install.php:594
+#: html/install.php:594 html/install.php:647
 msgid "Mise à jour Repository"
 msgstr "Update Repository"
 
 #: include/upgrade.inc.php:50 include/upgrade.inc.php:45
 #: include/upgrade.inc.php:46 include/class/dossier.class.php:344
+#: include/class/dossier.class.php:350
 msgid "Mise à jour de la base de données principale"
 msgstr "Update the main  database"
 
@@ -12699,6 +13662,7 @@ msgstr "Update"
 
 #: include/upgrade.inc.php:65 include/upgrade.inc.php:60
 #: include/upgrade.inc.php:61 include/class/dossier.class.php:360
+#: include/class/dossier.class.php:366
 msgid "Mise à jour dossiers"
 msgstr "Update folder"
 
@@ -12710,7 +13674,7 @@ msgstr "Update plugin, could you check the parameter setting?"
 #: html/admin/setup.php:527 html/install.php:591 html/install.php:590
 #: html/install.php:588 html/install.php:601 html/install.php:593
 #: html/install.php:599 html/install.php:561 html/install.php:551
-#: html/install.php:557 html/install.php:560
+#: html/install.php:557 html/install.php:560 html/install.php:610
 msgid "Mise à jour du systeme"
 msgstr "Update"
 
@@ -12721,6 +13685,7 @@ msgstr "Update system and databases"
 #: include/upgrade.inc.php:91 include/upgrade.inc.php:86
 #: include/upgrade.inc.php:87 include/upgrade.inc.php:88
 #: include/upgrade.inc.php:89 include/class/dossier.class.php:388
+#: include/class/dossier.class.php:394
 msgid "Mise à jour modèles"
 msgstr "Update templates"
 
@@ -12751,6 +13716,8 @@ msgstr "Update templates"
 #: include/history_operation.inc.php:150 include/history_operation.inc.php:156
 #: include/class/acc_ledger_sold.class.php:1046
 #: include/class/acc_ledger_purchase.class.php:1793
+#: include/history_operation.inc.php:168
+#: include/class/acc_ledger_purchase.class.php:1817
 msgid "Mise à jour paiement"
 msgstr "Update payment"
 
@@ -12766,10 +13733,11 @@ msgstr "Missing parameter"
 #: html/admin/template_config_form.php:59
 #: include/template/template_config_form.php:63
 #: include/template/template_config_form.php:71
+#: include/template/template_config_form.php:81
 msgid "Mode Serveur mutualisé"
 msgstr "Mode Server (default) or limited "
 
-#: include/lib/html_tab.class.php:99
+#: include/lib/html_tab.class.php:99 include/lib/html_tab.class.php:119
 msgid "Mode invalide"
 msgstr "Invalid mode"
 
@@ -12796,6 +13764,7 @@ msgstr "Change"
 #: include/database.item.php:92 include/database.item.php:95
 #: include/database.item.php:100 include/database.item.php:97
 #: include/database.item.php:96 include/database.item.php:94
+#: include/database.item.php:93
 msgid "Modification Stocks"
 msgstr "Changing Stocks"
 
@@ -12817,16 +13786,18 @@ msgstr ""
 #: include/database.item.php:92 include/database.item.php:95
 #: include/database.item.php:100 include/database.item.php:97
 #: include/database.item.php:96 include/database.item.php:94
+#: include/database.item.php:93
 msgid "Modification des stocks (inventaire)"
 msgstr "Changing stocks (inventory)"
 
 #: include/database.item.php:97 include/database.item.php:100
 #: include/database.item.php:94 include/database.item.php:92
+#: include/database.item.php:93
 msgid "Modification des stocks, menu utilisé pour l'inventaire"
 msgstr "Changing inventory "
 
 #: include/ajax_mod_predf_op.php:32 include/ajax/ajax_mod_predf_op.php:32
-#: include/ajax/ajax_mod_predf_op.php:31
+#: include/ajax/ajax_mod_predf_op.php:31 include/ajax/ajax_mod_predf_op.php:44
 msgid "Modification du nom"
 msgstr "Name modification"
 
@@ -12887,6 +13858,8 @@ msgstr "Missing description"
 #: include/class/anc_operation.class.php:318
 #: include/class/anc_operation.class.php:319
 #: include/lib/manage_table_sql.class.php:755
+#: include/class/document_type.class.php:77
+#: include/lib/manage_table_sql.class.php:807
 msgid "Modifier"
 msgstr "Modify"
 
@@ -12899,6 +13872,7 @@ msgstr "Modify"
 #: include/database.item.php:215 include/database.item.php:192
 #: include/database.item.php:193 include/database.item.php:196
 #: include/database.item.php:207 include/database.item.php:212
+#: include/database.item.php:202
 msgid "Modifier le type de document"
 msgstr "Change the document type"
 
@@ -12927,12 +13901,14 @@ msgstr "Module ERP"
 #: include/database.item.php:74 include/database.item.php:77
 #: include/database.item.php:82 include/database.item.php:80
 #: include/database.item.php:79 include/database.item.php:76
+#: include/database.item.php:75
 msgid "Module comptabilité"
 msgstr "Accountancy Module"
 
 #: include/database.item.php:115 include/database.item.php:118
 #: include/database.item.php:124 include/database.item.php:121
 #: include/database.item.php:120 include/database.item.php:116
+#: include/database.item.php:117
 msgid "Module comptabilité analytique"
 msgstr "Cost Accounting Module"
 
@@ -12943,6 +13919,7 @@ msgstr "VAT module"
 #: include/database.item.php:71 include/database.item.php:74
 #: include/database.item.php:14 include/database.item.php:76
 #: include/database.item.php:79 include/database.item.php:73
+#: include/database.item.php:72
 msgid "Module gestion"
 msgstr "Module ERP"
 
@@ -12957,6 +13934,7 @@ msgstr "Module ERP"
 #: include/lib/ac_common.php:881 include/class/extension.class.php:122
 #: include/lib/ac_common.php:893 include/class/extension.class.php:138
 #: include/lib/ac_common.php:895 include/lib/ac_common.php:911
+#: include/lib/ac_common.php:921
 msgid "Module inexistant"
 msgstr "Module not found"
 
@@ -12973,7 +13951,7 @@ msgstr "Setting"
 msgid "Module paramètres"
 msgstr "Parameters module"
 
-#: html/install.php:384 html/install.php:387
+#: html/install.php:384 html/install.php:387 html/install.php:436
 msgid "Module php-pgsql n'est pas installé"
 msgstr " php-pgsql is not installed"
 
@@ -12985,6 +13963,7 @@ msgstr " php-pgsql is not installed"
 #: include/dossier.inc.php:353 include/compta_ach.inc.php:89
 #: include/compta_ach.inc.php:91 include/compta_ven.inc.php:98
 #: include/dossier.inc.php:358 include/upgrade.inc.php:36
+#: include/compta_ach.inc.php:88
 msgid "Modèle"
 msgstr "Template"
 
@@ -12993,6 +13972,7 @@ msgstr "Template"
 #: include/class/acc_ledger.class.php:798
 #: include/class/acc_ledger.class.php:803
 #: include/class/acc_ledger.class.php:819
+#: include/class/acc_ledger.class.php:807
 msgid "Modèle d'opération"
 msgstr "Entry template"
 
@@ -13005,6 +13985,8 @@ msgstr "Entry template"
 #: include/class/pre_operation.class.php:249
 #: include/class/pre_operation.class.php:248
 #: include/class/pre_operation.class.php:250
+#: include/class/pre_operation.class.php:312
+#: include/class/pre_operation.class.php:315
 msgid "Modèle d'opérations"
 msgstr "Operation template"
 
@@ -13016,6 +13998,7 @@ msgstr "Document template"
 #: include/upgrade.inc.php:106 include/upgrade.inc.php:101
 #: include/upgrade.inc.php:102 include/upgrade.inc.php:104
 #: include/upgrade.inc.php:105 include/class/dossier.class.php:404
+#: include/class/dossier.class.php:410
 msgid "Modèle inexistant"
 msgstr "Template not found"
 
@@ -13033,13 +14016,14 @@ msgid "Modèle non trouvé"
 msgstr "Template not found"
 
 #: include/template/form_ledger_detail.php:15
+#: include/template/form_ledger_detail.php:18
 msgid "Modèle opération"
 msgstr "Entry template"
 
 #: include/compta_ach.inc.php:84 include/compta_ach.inc.php:87
 #: include/compta_ven.inc.php:96 include/operation_ods_confirm.inc.php:51
 #: include/compta_ach.inc.php:89 include/compta_ach.inc.php:91
-#: include/compta_ven.inc.php:98
+#: include/compta_ven.inc.php:98 include/compta_ach.inc.php:88
 msgid "Modèle à sauver"
 msgstr "Template"
 
@@ -13048,9 +14032,14 @@ msgstr "Template"
 #: include/modele.inc.php:274 include/lib/user_menu.php:119
 #: include/modele.inc.php:257 include/modele.inc.php:258
 #: include/lib/user_menu.php:76 include/modele.inc.php:259
+#: include/lib/user_menu.php:75
 msgid "Modèles"
 msgstr "Template"
 
+#: include/template/fiche_def_input.php:26
+msgid "Modèles de catégorie"
+msgstr "Template of category"
+
 #: include/modele.inc.php:326 include/modele.inc.php:327
 msgid "Modèles disponibles dans le dépôt"
 msgstr "Available template in the repository"
@@ -13066,6 +14055,7 @@ msgstr "Month"
 
 #: include/class/periode.class.php:438 include/class/periode.class.php:440
 #: include/class/periode.class.php:442 include/class/periode.class.php:444
+#: include/class/periode.class.php:443 include/class/periode.class.php:445
 msgid "Mois de début n'existe pas "
 msgstr "Starting month does not exist"
 
@@ -13178,6 +14168,15 @@ msgstr "Starting month does not exist"
 #: include/class/anc_listing.class.php:86 include/class/fiche.class.php:1398
 #: include/lib/ac_common.php:1215 include/fiche.inc.php:531
 #: include/class/fiche.class.php:1399 include/class/acc_ledger.class.php:904
+#: include/fiche.inc.php:544 include/class/anc_group_operation.class.php:137
+#: include/class/acc_ledger_search.class.php:738
+#: include/class/acc_ledger_search.class.php:1051
+#: include/class/acc_ledger.class.php:892
+#: include/class/print_ledger_misc.class.php:47
+#: include/class/fiche.class.php:1426
+#: include/class/acc_ledger_purchase.class.php:1463
+#: include/class/acc_ledger_sold.class.php:733
+#: include/class/pre_op_advanced.class.php:201 include/lib/ac_common.php:1225
 msgid "Montant"
 msgstr "Amount"
 
@@ -13205,6 +14204,10 @@ msgstr "Amount Cushioning"
 #: include/export/export_printtva_csv.php:64
 #: include/export/export_printtva_pdf.php:58
 #: include/export/export_printtva_pdf.php:213
+#: include/export/export_printtva_pdf.php:60
+#: include/export/export_printtva_pdf.php:217
+#: include/export/export_printtva_csv.php:56
+#: include/export/export_printtva_csv.php:76
 msgid "Montant Autoliquidation"
 msgstr "Autoreverse"
 
@@ -13216,6 +14219,10 @@ msgstr "Autoreverse"
 #: include/export/export_printtva_csv.php:61
 #: include/export/export_printtva_pdf.php:57
 #: include/export/export_printtva_pdf.php:212
+#: include/export/export_printtva_pdf.php:59
+#: include/export/export_printtva_pdf.php:216
+#: include/export/export_printtva_csv.php:54
+#: include/export/export_printtva_csv.php:73
 msgid "Montant HT"
 msgstr "Amount without VAT"
 
@@ -13241,6 +14248,8 @@ msgstr "Amount without VAT"
 #: include/class/acc_ledger_purchase.class.php:1446
 #: include/class/acc_ledger_sold.class.php:727
 #: include/class/acc_ledger_purchase.class.php:1449
+#: include/class/acc_ledger_purchase.class.php:1460
+#: include/class/acc_ledger_sold.class.php:730
 msgid "Montant HTVA"
 msgstr "Amount without VAT"
 
@@ -13263,12 +14272,15 @@ msgstr "Initial amount"
 #: include/class/acc_ledger_purchase.class.php:1851
 #: include/export/export_printtva_csv.php:65
 #: include/class/acc_ledger_purchase.class.php:1857
+#: include/class/acc_ledger_purchase.class.php:1894
+#: include/export/export_printtva_csv.php:77
 msgid "Montant ND"
 msgstr "Amount ND"
 
 #: include/template/tax_summary_display.php:214
 #: include/template/tax_summary_display.php:306
 #: include/export/export_printtva_pdf.php:213
+#: include/export/export_printtva_pdf.php:217
 msgid "Montant Non Déd"
 msgstr "Amount ND"
 
@@ -13337,6 +14349,16 @@ msgstr "Amount ND"
 #: include/export/export_printtva_pdf.php:212
 #: include/class/acc_ledger_sold.class.php:1427
 #: include/class/acc_ledger_purchase.class.php:1853
+#: include/class/acc_ledger_purchase.class.php:1459
+#: include/class/acc_ledger_purchase.class.php:1890
+#: include/class/acc_ledger_sold.class.php:729
+#: include/class/acc_ledger_sold.class.php:1412
+#: include/export/export_printtva_pdf.php:59
+#: include/export/export_printtva_pdf.php:216
+#: include/export/export_printtva_csv.php:55
+#: include/export/export_printtva_csv.php:75
+#: include/template/follow_up_detail_display.php:55
+#: include/template/newEmptyPHP_NOALYSS.php:40
 msgid "Montant TVA"
 msgstr "VAT Amount"
 
@@ -13354,6 +14376,7 @@ msgstr "VAT Amount"
 #: include/class/acc_ledger_purchase.class.php:1849
 #: include/class/acc_ledger_purchase.class.php:1852
 #: include/class/acc_ledger_purchase.class.php:1858
+#: include/class/acc_ledger_purchase.class.php:1895
 msgid "Montant TVA ND"
 msgstr "VAT Amount"
 
@@ -13389,6 +14412,10 @@ msgstr "VAT amount incorrect"
 #: include/class/acc_ledger_purchase.class.php:1447
 #: include/class/acc_ledger_sold.class.php:728
 #: include/class/acc_ledger_purchase.class.php:1450
+#: include/class/acc_ledger_purchase.class.php:1461
+#: include/class/acc_ledger_sold.class.php:731
+#: include/template/follow_up_detail_display.php:56
+#: include/template/newEmptyPHP_NOALYSS.php:41
 msgid "Montant TVAC"
 msgstr "Amount VAT included"
 
@@ -13424,6 +14451,7 @@ msgstr "Amount less or equal to"
 #: include/database.item.php:179 include/database.item.php:138
 #: include/database.item.php:139 include/database.item.php:140
 #: include/database.item.php:145 include/database.item.php:150
+#: include/database.item.php:146
 msgid "Montant initial"
 msgstr "Initial amount"
 
@@ -13440,6 +14468,7 @@ msgstr "Initial amount"
 #: include/ext/amortis/include/am_card.class.php:279
 #: include/class/acc_ledger.class.php:1105
 #: include/class/acc_ledger.class.php:1121
+#: include/class/acc_ledger.class.php:1117
 msgid "Montant invalide"
 msgstr "Invalid amount"
 
@@ -13447,6 +14476,7 @@ msgstr "Invalid amount"
 #: html/ajax_misc.php:362 html/ajax_misc.php:440
 #: include/ajax/ajax_display_letter.php:76
 #: include/ajax/ajax_display_letter.php:81
+#: include/ajax/ajax_display_letter.php:96
 msgid "Montant max. "
 msgstr "Max Amount"
 
@@ -13454,18 +14484,23 @@ msgstr "Max Amount"
 #: html/ajax_misc.php:355 html/ajax_misc.php:433
 #: include/ajax/ajax_display_letter.php:69
 #: include/ajax/ajax_display_letter.php:74
+#: include/ajax/ajax_display_letter.php:89
 msgid "Montant min. "
 msgstr "min Amount"
 
 #: include/export/export_histo_csv.php:44
 #: include/export/export_histo_csv.php:45
 #: include/export/export_histo_csv.php:46
+#: include/export/export_histo_csv.php:49
 msgid "Montant opération"
 msgstr "Operation amount"
 
 #: include/export/export_ledger_csv.php:142
 #: include/class/acc_ledger_history_purchase.class.php:279
 #: include/class/acc_ledger_history_sale.class.php:265
+#: include/class/acc_ledger_history_sale.class.php:275
+#: include/class/acc_ledger_history_purchase.class.php:291
+#: include/export/export_ledger_csv.php:147
 msgid "Montant paiement"
 msgstr "Payment Amount"
 
@@ -13474,6 +14509,7 @@ msgid "Montant supérieur ou égal à"
 msgstr "Amount bigger or equal to"
 
 #: include/compta_fin_rec.inc.php:303 include/compta_fin_rec.inc.php:304
+#: include/compta_fin_rec.inc.php:345
 msgid "Montant sélectionné"
 msgstr "Selected amount"
 
@@ -13510,7 +14546,7 @@ msgstr "Amount to purchase"
 msgid "Montrer articles"
 msgstr "Show items"
 
-#: include/periode.inc.php:88
+#: include/periode.inc.php:88 include/periode.inc.php:86
 msgid "Montrer l'exercice"
 msgstr "Show exercise"
 
@@ -13532,9 +14568,19 @@ msgstr "Show details"
 #: html/install.php:593 html/install.php:208 html/install.php:555
 #: include/user.inc.php:83 html/install.php:215 html/install.php:545
 #: html/install.php:551 html/install.php:218 html/install.php:554
+#: html/install.php:265 html/install.php:604
 msgid "Mot de passe"
 msgstr "password"
 
+#: include/template/template_config_form.php:65
+msgid "Mot de passe administrateur de noalyss"
+msgstr "Noalyss Administrators password"
+
+#: html/install.php:164
+msgid ""
+"Mot de passe administrateur, il peut être changé ensuite dans les préférences"
+msgstr "Administrator password can be change in the \"Preference\""
+
 #: html/admin/template_config_form.php:51
 msgid "Mot de passe de l'utilisateur"
 msgstr "Postgresql  password of user"
@@ -13545,11 +14591,12 @@ msgstr "User's password"
 
 #: html/admin/template_config_form.php:51
 #: include/template/template_config_form.php:51
+#: include/template/template_config_form.php:52
 msgid "Mot de passe de l'utilisateur Postgresql"
 msgstr "User's password"
 
 #: html/admin/setup.php:132 html/install.php:134 html/install.php:133
-#: html/install.php:139 html/install.php:146
+#: html/install.php:139 html/install.php:146 html/install.php:159
 msgid "Mot de passe de l'utilisateur de Postgresql"
 msgstr "User's password"
 
@@ -13570,7 +14617,7 @@ msgstr "Reason of change"
 #: include/database.item.php:121 include/database.item.php:124
 #: include/database.item.php:130 include/database.item.php:126
 #: include/database.item.php:125 include/database.item.php:129
-#: include/database.item.php:123
+#: include/database.item.php:123 include/database.item.php:122
 msgid "Moyen de paiement"
 msgstr "Payment middle"
 
@@ -13579,16 +14626,22 @@ msgstr "Payment middle"
 #: include/template/action_display_short.php:58
 #: include/class/class_follow_up.php:262 include/class/follow_up.class.php:262
 #: include/template/action_display_short.php:59
-#: include/class/follow_up.class.php:263
+#: include/class/follow_up.class.php:263 include/class/follow_up.class.php:728
 msgid "Moyenne"
 msgstr "Medium"
 
 #: include/upgrade-plugin.php:91 include/upgrade-plugin.php:103
+#: include/upgrade-plugin.php:106
 msgid "MultiModule"
 msgstr "MultiModule"
 
+#: include/template/action_document_type_mtable_input.php:116
+msgid "Multiples"
+msgstr "Multiple"
+
 #: include/class/acc_ledger_history_purchase.class.php:278
 #: include/class/acc_ledger_history_sale.class.php:264
+#: include/class/acc_ledger_history_purchase.class.php:290
 msgid "Méthode paiement"
 msgstr "Means of payment"
 
@@ -13600,7 +14653,7 @@ msgstr "Do not use the same separator for decimal and field"
 #: include/database.item.php:102 include/ajax_navigator.php:23
 #: include/database.item.php:99 include/database.item.php:98
 #: include/ajax/ajax_navigator.php:23 include/database.item.php:96
-#: include/ajax/ajax_navigator.php:28
+#: include/ajax/ajax_navigator.php:28 include/database.item.php:95
 msgid "Navigateur"
 msgstr "Navigator"
 
@@ -13654,6 +14707,15 @@ msgstr "Do not give this accounting is not used for sales"
 msgid "Ne donner pas ce poste comptable si ce code n'est pas utilisé à l'achat"
 msgstr "Do not give this accounting is not used for purchase"
 
+#: include/lib/message_javascript.php:78
+msgid ""
+"Ne donnez pas ce poste comptable si ce code n'est pas utilisé  à la vente"
+msgstr "Do not give this accounting is not used for sales"
+
+#: include/lib/message_javascript.php:77
+msgid "Ne donnez pas ce poste comptable si ce code n'est pas utilisé à l'achat"
+msgstr "Do not give this accounting is not used for purchase"
+
 #: include/restore.inc.php:196 include/restore.inc.php:135
 #: include/restore.inc.php:197 include/restore.inc.php:198
 #: include/restore.inc.php:136 include/restore.inc.php:199
@@ -13676,6 +14738,7 @@ msgstr "Can not add"
 #: include/class_document.php:199 include/class_document.php:200
 #: include/class/class_document.php:200 include/class/class_document.php:201
 #: include/class/class_document.php:207 include/class/document.class.php:207
+#: include/class/document.class.php:212
 msgid "Ne peut pas créer le répertoire "
 msgstr "Cannot create the directory"
 
@@ -13736,6 +14799,7 @@ msgstr "Warning : you can not change "
 #: include/ext/rapport_avance/include/rapav_declaration.class.php:361
 #: include/ext/rapport_avance/include/rapav_declaration.class.php:434
 #: include/class/document.class.php:311 include/class/document.class.php:285
+#: include/class/document.class.php:290
 msgid "Ne peut pas sauver "
 msgstr "Can not save"
 
@@ -13873,7 +14937,16 @@ msgstr "No action"
 #: include/class/acc_ledger_fin.class.php:754
 #: include/class/fiche.class.php:1780 include/class/fiche.class.php:1781
 #: include/modele.inc.php:248 include/modele.inc.php:359
-#: include/database.item.php:157
+#: include/database.item.php:157 include/class/acc_ledger_search.class.php:1193
+#: include/class/tag_group_mtable.class.php:40
+#: include/class/operation_predef_mtable.class.php:52
+#: include/class/fiche.class.php:1807
+#: include/class/card_attribut_mtable.class.php:39
+#: include/class/action_document_type_mtable.class.php:48
+#: include/class/anc_plan.class.php:138 include/class/anc_plan.class.php:154
+#: include/class/contact_option_ref_mtable.class.php:36
+#: include/class/user.class.php:991
+#: include/template/card_multiple_result.php:19 include/upgrade-plugin.php:62
 msgid "Nom"
 msgstr "Name"
 
@@ -13907,12 +14980,15 @@ msgstr "name"
 #: include/class/acc_ledger_purchase.class.php:1842
 #: include/class/acc_ledger_sold.class.php:1422
 #: include/class/acc_ledger_purchase.class.php:1848
+#: include/class/acc_ledger_purchase.class.php:1885
+#: include/class/acc_ledger_sold.class.php:1407
 msgid "Nom TVA"
 msgstr "Label VAT"
 
 #: html/admin/template_config_form.php:64
 #: include/template/template_config_form.php:68
 #: include/template/template_config_form.php:76
+#: include/template/template_config_form.php:86
 msgid "Nom base de donnée"
 msgstr "Database name"
 
@@ -13967,6 +15043,7 @@ msgstr "Folder name"
 #: include/class/acc_ledger_search.class.php:259
 #: include/class/acc_ledger_search.class.php:246
 #: include/class/acc_ledger_search.class.php:248
+#: include/class/acc_ledger_search.class.php:262
 msgid "Nom du filtre"
 msgstr "Filter name"
 
@@ -13978,6 +15055,14 @@ msgstr "Filter name"
 msgid "Nom du format"
 msgstr "Format  Name"
 
+#: include/template/pre_operation_display.php:32
+msgid "Nom du modèle"
+msgstr "Template name"
+
+#: include/class/pre_operation.class.php:69
+msgid "Nom du modèle "
+msgstr "Template name"
+
 #: include/class/acc_report.class.php:115
 msgid "Nom du rapport"
 msgstr "Report  Name"
@@ -14008,6 +15093,8 @@ msgstr "Report  Name"
 #: include/class/acc_ledger_purchase.class.php:1838
 #: include/class/acc_ledger_sold.class.php:1418
 #: include/class/acc_ledger_purchase.class.php:1844
+#: include/class/acc_ledger_purchase.class.php:1881
+#: include/class/acc_ledger_sold.class.php:1403
 msgid "Nom fiche"
 msgstr "From card"
 
@@ -14037,6 +15124,8 @@ msgstr "From card"
 #: include/class/acc_ledger_purchase.class.php:1840
 #: include/class/acc_ledger_sold.class.php:1420
 #: include/class/acc_ledger_purchase.class.php:1846
+#: include/class/acc_ledger_purchase.class.php:1883
+#: include/class/acc_ledger_sold.class.php:1405
 msgid "Nom fournisseur"
 msgstr "Dealer name"
 
@@ -14057,15 +15146,18 @@ msgid "Nom manquant"
 msgstr "Name is missing"
 
 #: include/ajax/ajax_search_filter.php:73
+#: include/class/action_document_type_mtable.class.php:106
 msgid "Nom ne peut être vide"
 msgstr "The name can not be empty"
 
 #: include/company.inc.php:97 include/company.inc.php:116
-#: include/company.inc.php:120
+#: include/company.inc.php:120 include/company.inc.php:128
 msgid "Nom société"
 msgstr "Company name"
 
 #: include/card_attr.inc.php:78 include/card_attr.inc.php:79
+#: include/class/card_attribut_mtable.class.php:53
+#: include/class/contact_option_ref_mtable.class.php:43
 msgid "Nombre"
 msgstr "Number"
 
@@ -14108,6 +15200,11 @@ msgstr "Number of unit"
 msgid "Nombre de colonnes incorrect"
 msgstr "Incorrect number of columns"
 
+#: include/template/card_multiple_result.php:14
+#, php-format
+msgid "Nombre de fiches trouvées %d montrées %d"
+msgstr "%d card  found, shown %d"
+
 #: include/class_acc_ledger.php:3406 include/class_acc_ledger.php:3476
 #: include/class_acc_ledger.php:3475 include/class_acc_ledger.php:3491
 #: include/class_acc_ledger.php:3508 include/class_acc_ledger.php:3535
@@ -14121,6 +15218,7 @@ msgstr "Incorrect number of columns"
 #: include/class/acc_ledger.class.php:2313
 #: include/class/acc_ledger.class.php:2322
 #: include/class/acc_ledger.class.php:2344
+#: include/class/acc_ledger.class.php:2368
 msgid "Nombre de ligne incorrect"
 msgstr "Number of incorrect rows"
 
@@ -14143,7 +15241,7 @@ msgid "Nombre de mois"
 msgstr "Number of month"
 
 #: include/class/periode.class.php:436 include/class/periode.class.php:438
-#: include/class/periode.class.php:440
+#: include/class/periode.class.php:440 include/class/periode.class.php:441
 msgid "Nombre de mois doit être compris entre 1 & 60 "
 msgstr "Number of months must be between 1 and 60"
 
@@ -14152,7 +15250,7 @@ msgid "Nombre de mois invalide"
 msgstr "Number of month invalid"
 
 #: include/class/periode.class.php:434 include/class/periode.class.php:436
-#: include/class/periode.class.php:438
+#: include/class/periode.class.php:438 include/class/periode.class.php:439
 msgid "Nombre de mois n'est pas un nombre"
 msgstr "Number of month is not a number"
 
@@ -14191,6 +15289,8 @@ msgstr "Number of operation% d"
 #: include/template/profile_menu_display_submenu.php:65
 #: include/user_detail.inc.php:158
 #: include/template/profile_menu_display_module.php:81
+#: include/class/tva_rate_mtable.class.php:56 include/company.inc.php:71
+#: include/company.inc.php:74 include/company.inc.php:112
 msgid "Non"
 msgstr "No"
 
@@ -14222,6 +15322,7 @@ msgstr "Not Deductible from Tax"
 #: include/class/acc_ledger_purchase.class.php:1778
 #: include/class/acc_ledger_sold.class.php:1037
 #: include/class/acc_ledger_purchase.class.php:1784
+#: include/class/acc_ledger_purchase.class.php:1808
 msgid "Non Payée"
 msgstr "Not paid"
 
@@ -14263,6 +15364,7 @@ msgid "Non enregistré : données incorrectes"
 msgstr "Not saved, invalid data"
 
 #: include/upgrade-plugin.php:112 include/upgrade-plugin.php:124
+#: include/upgrade-plugin.php:127
 msgid "Non installée"
 msgstr "Not installed"
 
@@ -14274,9 +15376,14 @@ msgstr "Not installed"
 #: include/class/acc_ledger_search.class.php:860
 #: include/class/acc_ledger_search.class.php:868
 #: include/class/acc_ledger_search.class.php:881
+#: include/class/acc_ledger_search.class.php:970
 msgid "Non payé"
 msgstr "unpaid"
 
+#: include/class/acc_ledger_search.class.php:213
+msgid "Non payées"
+msgstr "unpaid"
+
 #: include/ext/import_account/include/class_impacc_operation.php:47
 #: include/ext/import_account/include/class_impacc_operation.php:78
 #: include/ext/import_account/include/impacc_operation.class.php:47
@@ -14286,6 +15393,7 @@ msgstr "not supported"
 
 #: include/ext/amortis/include/class_am_card.php:245 html/fid_card.php:169
 #: html/fid_card.php:170 html/fid_card.php:175 html/fid_card.php:174
+#: html/fid_card.php:176
 msgid "Non trouvé"
 msgstr "Not found"
 
@@ -14297,6 +15405,7 @@ msgstr "Not found"
 #: include/template/ledger_detail_bottom.php:291
 #: include/template/ledger_detail_bottom.php:292
 #: include/template/ledger_detail_bottom.php:289
+#: include/template/ledger_detail_bottom.php:307
 msgid "Non utilisée"
 msgstr "not used"
 
@@ -14305,6 +15414,10 @@ msgstr "not used"
 msgid "Normal"
 msgstr "Normal"
 
+#: include/class/document.class.php:1413 include/class/follow_up.class.php:270
+msgid "Normale"
+msgstr "Normal"
+
 #: include/template/ledger_detail_ven.php:95
 #: include/template/ledger_detail_ven.php:101
 #: include/template/security_list_action.php:73
@@ -14322,10 +15435,13 @@ msgstr "Normal"
 #: include/class/acc_ledger_history_sale.class.php:247
 #: include/class/acc_ledger_history_purchase.class.php:254
 #: include/class/acc_ledger_history_purchase.class.php:258
+#: include/class/acc_ledger_history_sale.class.php:257
+#: include/class/acc_ledger_history_purchase.class.php:269
+#: include/export/export_histo_csv.php:48
 msgid "Note"
 msgstr "Note"
 
-#: include/database.item.php:236
+#: include/database.item.php:236 include/database.item.php:220
 msgid "Note de crédit"
 msgstr "Credit Note"
 
@@ -14333,7 +15449,7 @@ msgstr "Credit Note"
 #: include/database.item.php:192 include/database.item.php:195
 #: include/database.item.php:193 include/database.item.php:181
 #: include/database.item.php:182 include/database.item.php:185
-#: include/database.item.php:198
+#: include/database.item.php:198 include/database.item.php:191
 msgid "Note de frais"
 msgstr "Note of free"
 
@@ -14347,6 +15463,7 @@ msgstr "Note of free"
 #: include/class/acc_ledger_search.class.php:940
 #: include/class/acc_ledger_search.class.php:948
 #: include/class/acc_ledger_search.class.php:961
+#: include/class/acc_ledger_search.class.php:1050
 msgid "Notes"
 msgstr "Notes"
 
@@ -14389,7 +15506,7 @@ msgstr "New balance"
 
 #: include/database.item.php:2 include/database.item.php:5
 #: include/database.item.php:7 include/database.item.php:10
-#: include/database.item.php:4
+#: include/database.item.php:4 include/database.item.php:3
 msgid "Nouvel achat ou dépense"
 msgstr "New purchase"
 
@@ -14421,12 +15538,14 @@ msgstr "New bank statement"
 #: include/template/action_display_short.php:81
 #: include/lib/html_input.class.php:1103 include/lib/html_input.class.php:1104
 #: include/lib/html_input.class.php:1119 include/lib/html_input.class.php:1120
+#: include/lib/html_input.class.php:1153
 msgid "Nouvel événement"
 msgstr "New event"
 
 #: include/class_anc_key.php:335 include/class_anc_key.php:337
 #: include/class/class_anc_key.php:338 include/class/class_anc_key.php:339
 #: include/class/class_anc_key.php:340 include/class/anc_key.class.php:349
+#: include/class/anc_key.class.php:350
 msgid "Nouvelle clef"
 msgstr "New key"
 
@@ -14438,7 +15557,7 @@ msgstr "New plugin"
 #: html/ajax_card.php:182 html/ajax_card.php:200 html/ajax_card.php:201
 #: include/ajax/ajax_card.php:181 include/ajax/ajax_card.php:182
 #: include/ajax/ajax_card.php:185 include/ajax/ajax_card.php:191
-#: include/ajax/ajax_card.php:192
+#: include/ajax/ajax_card.php:192 include/ajax/ajax_card.php:195
 msgid "Nouvelle fiche"
 msgstr "New card"
 
@@ -14470,6 +15589,7 @@ msgstr "New row"
 #: include/class/acc_ledger.class.php:2789
 #: include/class/acc_ledger.class.php:2798
 #: include/class/acc_ledger.class.php:2837
+#: include/class/acc_ledger.class.php:2861
 msgid "Nouvelle opération"
 msgstr "New  operations"
 
@@ -14483,17 +15603,18 @@ msgstr "New misc. operations"
 
 #: include/database.item.php:9 include/database.item.php:12
 #: include/database.item.php:14 include/database.item.php:17
-#: include/database.item.php:11
+#: include/database.item.php:11 include/database.item.php:10
 msgid "Nouvelle vente ou recette"
 msgstr "New sale"
 
 #: include/upgrade-plugin.php:98 include/upgrade-plugin.php:110
+#: include/upgrade-plugin.php:113
 #, php-format
 msgid "Nouvelle version disponible %s , votre version %s"
 msgstr "Available version %s , your version %s"
 
 #: include/class/periode.class.php:649 include/class/periode.class.php:651
-#: include/class/periode.class.php:653
+#: include/class/periode.class.php:653 include/class/periode.class.php:654
 msgid "Novembre"
 msgstr "November"
 
@@ -14537,6 +15658,8 @@ msgstr "Internal number"
 #: include/class/acc_ledger_purchase.class.php:1743
 #: include/class/acc_ledger_sold.class.php:1003
 #: include/class/acc_ledger_purchase.class.php:1749
+#: include/class/acc_ledger_purchase.class.php:1773
+#: include/class/acc_ledger_sold.class.php:1007
 msgid "Numero de bon de commande : "
 msgstr "Number of ordering"
 
@@ -14549,7 +15672,7 @@ msgid "Numero de client"
 msgstr " customer id"
 
 #: include/company.inc.php:105 include/company.inc.php:124
-#: include/company.inc.php:128
+#: include/company.inc.php:128 include/company.inc.php:136
 msgid "Numéro"
 msgstr "Number"
 
@@ -14600,6 +15723,12 @@ msgstr "Number"
 #: include/class/acc_ledger_sold.class.php:682
 #: include/class/acc_ledger_purchase.class.php:1395
 #: include/class/acc_ledger_purchase.class.php:1403
+#: include/class/acc_ledger_purchase.class.php:1406
+#: include/class/acc_ledger_purchase.class.php:1411
+#: include/class/acc_ledger_purchase.class.php:1414
+#: include/class/acc_ledger_sold.class.php:677
+#: include/class/acc_ledger_sold.class.php:685
+#: include/template/form_ledger_detail.php:51
 msgid "Numéro Pièce"
 msgstr "Receipt #"
 
@@ -14619,7 +15748,7 @@ msgid "Numéro de TVA incorrect"
 msgstr "VAT number incorrect"
 
 #: include/company.inc.php:113 include/company.inc.php:132
-#: include/company.inc.php:136
+#: include/company.inc.php:136 include/company.inc.php:144
 msgid "Numéro de Tva"
 msgstr "VAT Number"
 
@@ -14648,6 +15777,7 @@ msgstr "Incorrect phone number"
 #: include/template/action_search.php:88 include/template/action_search.php:102
 #: include/template/action_search.php:139
 #: include/template/action_search.php:121
+#: include/template/action_search.php:122
 msgid "Numéro document"
 msgstr "Document #"
 
@@ -14666,6 +15796,7 @@ msgstr "Number of warranty"
 #: include/class/class_pdf_operation.php:76
 #: include/class/pdf_operation.class.php:76
 #: include/class/print_ledger_detail_item.class.php:58
+#: include/class/print_ledger_detail_item.class.php:57
 msgid "Numéro interne"
 msgstr "Internal number"
 
@@ -14696,6 +15827,8 @@ msgstr "Internal number"
 #: include/class/acc_ledger_purchase.class.php:1825
 #: include/class/acc_ledger_sold.class.php:1405
 #: include/class/acc_ledger_purchase.class.php:1831
+#: include/class/acc_ledger_purchase.class.php:1868
+#: include/class/acc_ledger_sold.class.php:1390
 msgid "Numéro opération"
 msgstr "Operation #"
 
@@ -14720,6 +15853,8 @@ msgstr "#"
 #: include/export/export_ledger_csv.php:212
 #: include/export/export_ledger_csv.php:220
 #: include/class/acc_ledger_history_generic.class.php:768
+#: include/class/acc_ledger_history_generic.class.php:769
+#: include/export/export_ledger_csv.php:228
 msgid "N° Pièce"
 msgstr "Receipt #"
 
@@ -14757,6 +15892,8 @@ msgstr "Document No."
 #: include/class/acc_ledger_purchase.class.php:1837
 #: include/class/acc_ledger_sold.class.php:1417
 #: include/class/acc_ledger_purchase.class.php:1843
+#: include/class/acc_ledger_purchase.class.php:1880
+#: include/class/acc_ledger_sold.class.php:1402
 msgid "N° fiche"
 msgstr "# Card"
 
@@ -14786,6 +15923,8 @@ msgstr "# Card"
 #: include/class/acc_ledger_purchase.class.php:1839
 #: include/class/acc_ledger_sold.class.php:1419
 #: include/class/acc_ledger_purchase.class.php:1845
+#: include/class/acc_ledger_purchase.class.php:1882
+#: include/class/acc_ledger_sold.class.php:1404
 msgid "N° fiche fournisseur"
 msgstr "# dealer card"
 
@@ -14809,7 +15948,7 @@ msgstr "receipt #"
 
 #: include/template/param_jrn.php:110 include/template/param_jrn.php:108
 #: include/template/param_jrn.php:115 include/template/param_jrn.php:117
-#: include/template/param_jrn.php:161
+#: include/template/param_jrn.php:161 include/template/param_jrn.php:162
 msgid "N° pièce justificative"
 msgstr "Receipt number"
 
@@ -14817,12 +15956,13 @@ msgstr "Receipt number"
 #: html/test_class.php:221 include/ajax_preference.php:175
 #: include/ajax/ajax_preference.php:175 include/ajax/ajax_preference.php:254
 #: dev/test/test_class.php:217 include/ajax/ajax_preference.php:265
+#: dev-2/test/test_class.php:217
 msgid "Néerlandais"
 msgstr "Dutch"
 
 #: include/database.item.php:12 include/database.item.php:15
 #: include/database.item.php:17 include/database.item.php:20
-#: include/database.item.php:14
+#: include/database.item.php:14 include/database.item.php:13
 msgid "OD analytique"
 msgstr "MW analytic"
 
@@ -14832,6 +15972,7 @@ msgstr "MW analytic"
 #: include/lib/manage_table_sql.class.php:1025
 #: include/lib/manage_table_sql.class.php:1022
 #: include/lib/manage_table_sql.class.php:1066
+#: include/lib/manage_table_sql.class.php:1122
 msgid "OK"
 msgstr "OK"
 
@@ -14846,6 +15987,7 @@ msgstr "OK"
 #: include/class/acc_ledger.class.php:1342
 #: include/class/acc_ledger.class.php:1351
 #: include/class/acc_ledger.class.php:1367
+#: include/class/acc_ledger.class.php:1365
 msgid "OPERATION ANNULEE "
 msgstr "Canceled"
 
@@ -14856,6 +15998,10 @@ msgstr "Canceled"
 msgid "OUT"
 msgstr "Out"
 
+#: include/lib/output_html_tab.class.php:71
+msgid "OUTPUTHTML070 Mode invalide"
+msgstr "OUTPUTHTML070 Invalid mode"
+
 #: include/class/class_acc_operation.php:595
 #: include/class/class_acc_operation.php:599
 #: include/class/class_acc_operation.php:610
@@ -14883,19 +16029,19 @@ msgid ""
 msgstr "Mandatory for FIN ledger: give here the card of the bank"
 
 #: include/template/param_jrn.php:61 include/template/param_jrn.php:68
-#: include/template/param_jrn.php:74
+#: include/template/param_jrn.php:74 include/template/param_jrn.php:75
 msgid ""
 "Obligatoire pour les journaux FIN : donner ici la fiche du compte en banque "
 "utilisée"
 msgstr "Mandatory for FIN ledger: give here the card of the bank"
 
 #: include/class/periode.class.php:649 include/class/periode.class.php:651
-#: include/class/periode.class.php:653
+#: include/class/periode.class.php:653 include/class/periode.class.php:654
 msgid "Octobre"
 msgstr "October"
 
 #: include/class/periode.class.php:688 include/class/periode.class.php:690
-#: include/class/periode.class.php:692
+#: include/class/periode.class.php:692 include/class/periode.class.php:693
 msgid "On ne peut ajouter une période que sur un exercice qui existe déjà"
 msgstr "It is possible to add a period on an existing exercice"
 
@@ -14906,7 +16052,7 @@ msgstr "Warning : you can not change in a closed period"
 
 #: html/admin/setup.php:201 html/admin/setup.php:219 html/admin/setup.php:221
 #: html/install.php:227 html/install.php:225 html/install.php:233
-#: html/install.php:184 html/install.php:191
+#: html/install.php:184 html/install.php:191 html/install.php:207
 msgid ""
 "On ne peut pas écrire dans le répertoire de NOALYSS, changez-en les droits "
 msgstr "Not possible to write in the Noalyss folder, change the rights"
@@ -14943,6 +16089,7 @@ msgstr "Concerned op"
 #: include/class/acc_ledger_search.class.php:1080
 #: include/class/acc_ledger_search.class.php:1088
 #: include/class/acc_ledger_search.class.php:1101
+#: include/class/acc_ledger_search.class.php:1190
 msgid "Op.Diverses"
 msgstr "Miscelleanous"
 
@@ -14952,12 +16099,29 @@ msgstr "Miscelleanous"
 msgid "Operation non equilibrée"
 msgstr "Unbalanced operation"
 
+#: include/class/card_attribut_mtable.class.php:42
+msgid "Option sup."
+msgstr "Extra options"
+
+#: include/template/action_search.php:146
+msgid "Option étiquettes"
+msgstr "Tag options"
+
+#: include/class/contact_option_ref_mtable.class.php:39
+msgid "Options"
+msgstr "Options"
+
 #: include/ajax_preference.php:69 include/ajax_preference.php:70
 #: include/ajax/ajax_preference.php:69 include/ajax/ajax_preference.php:70
 #: include/ajax/ajax_preference.php:81
 msgid "Options Générales"
 msgstr "General setting"
 
+#: include/ajax/ajax_display_card_option.php:42
+#: include/template/action_document_type_mtable_input.php:125
+msgid "Options contact"
+msgstr "Options contact"
+
 #: include/export_ledger_csv.php:49 include/export/export_ledger_csv.php:49
 #: include/export/export_ledger_csv.php:50
 msgid "Options invalides"
@@ -14969,7 +16133,7 @@ msgstr "Invalid options"
 msgid "Options pour la page d'accueil"
 msgstr "Option for the welcome page"
 
-#: include/ext/tools/index.php:41
+#: include/ext/tools/index.php:41 include/tax_summary.inc.php:41
 msgid "Opération"
 msgstr "Operation"
 
@@ -14978,7 +16142,7 @@ msgstr "Operation"
 #: include/database.item.php:231 include/database.item.php:208
 #: include/database.item.php:209 include/database.item.php:212
 #: include/database.item.php:229 include/database.item.php:210
-#: include/database.item.php:232
+#: include/database.item.php:232 include/database.item.php:216
 msgid "Opération Diverses"
 msgstr "Miscellaneous operation"
 
@@ -15000,6 +16164,11 @@ msgstr "Operation id"
 msgid "Opération a effacer"
 msgstr "Removed entry"
 
+#: include/company.inc.php:146
+msgid ""
+"Opération analytique uniquement pour les postes comptables commençant par"
+msgstr "Analytic operation only for accounting beginning with"
+
 #: include/class_acc_ledger.php:762 include/class_acc_ledger.php:990
 #: include/class_acc_ledger.php:761 include/class_acc_ledger.php:989
 #: include/class_acc_ledger.php:765 include/class_acc_ledger.php:996
@@ -15017,6 +16186,8 @@ msgstr "Removed entry"
 #: include/class/acc_ledger_search.class.php:1045
 #: include/class/acc_ledger_search.class.php:850
 #: include/class/acc_ledger_search.class.php:1058
+#: include/class/acc_ledger_search.class.php:939
+#: include/class/acc_ledger_search.class.php:1147
 msgid "Opération annulée"
 msgstr "Entry canceled"
 
@@ -15060,6 +16231,7 @@ msgstr "Reversed accounting"
 #: include/class/acc_ledger.class.php:2826
 #: include/class/acc_ledger.class.php:2835
 #: include/class/acc_ledger.class.php:2874
+#: include/class/acc_ledger.class.php:2898
 msgid "Opération identique"
 msgstr "Same operation"
 
@@ -15077,7 +16249,7 @@ msgstr "Operation not removed"
 #: include/compta_ven.inc.php:209 include/compta_ach.inc.php:197
 #: include/compta_ods.inc.php:121 include/compta_ven.inc.php:214
 #: include/compta_ods.inc.php:123 include/compta_ven.inc.php:212
-#: include/compta_ach.inc.php:195
+#: include/compta_ach.inc.php:195 include/compta_ach.inc.php:194
 msgid "Opération non extournée"
 msgstr "Not Reversed accounting"
 
@@ -15086,10 +16258,11 @@ msgid "Opération non trouvée"
 msgstr "operation not found"
 
 #: include/export/export_ledger_csv.php:144
+#: include/export/export_ledger_csv.php:150
 msgid "Opération paiement"
 msgstr "Payment Writing "
 
-#: include/operation_ods_new.inc.php:94
+#: include/operation_ods_new.inc.php:94 include/operation_ods_new.inc.php:95
 #, php-format
 msgid "Opération rapprochée : %s"
 msgstr "Linked operation : %s"
@@ -15142,12 +16315,15 @@ msgstr "Operation &amp; Lettering"
 #: include/database.item.php:56 include/database.item.php:248
 #: include/database.item.php:223 include/cfgledger.inc.php:172
 #: include/database.item.php:55 include/database.item.php:255
+#: include/class/operation_predef_mtable.class.php:180
+#: include/database.item.php:232
 msgid "Opérations Diverses"
 msgstr "Misc. operations"
 
 #: include/lettering.account.inc.php:87 include/lettering.card.inc.php:92
 #: include/lettering.gestion.inc.php:43 include/lettering.gestion.inc.php:42
-#: include/lettering.account.inc.php:95
+#: include/lettering.account.inc.php:95 include/lettering.account.inc.php:96
+#: include/lettering.card.inc.php:94
 msgid "Opérations NON lettrées"
 msgstr "Not Lettered operations"
 
@@ -15156,6 +16332,7 @@ msgid "Opérations Ventes/Achats"
 msgstr "Operations Sales / Purchases"
 
 #: include/template/detail-action.php:167
+#: include/template/detail-action.php:174
 msgid "Opérations concernées"
 msgstr "Concerned operations"
 
@@ -15164,29 +16341,34 @@ msgstr "Concerned operations"
 #: include/database.item.php:120 include/database.item.php:117
 #: include/database.item.php:116 include/database.item.php:17
 #: include/database.item.php:20 include/database.item.php:14
-#: include/database.item.php:112
+#: include/database.item.php:112 include/database.item.php:13
+#: include/database.item.php:113
 msgid "Opérations diverses"
 msgstr "Misc. writing"
 
 #: include/database.item.php:17 include/database.item.php:20
 #: include/database.item.php:14 include/database.item.php:12
+#: include/database.item.php:13
 msgid "Opérations diverses en Analytique"
 msgstr "Misc. writing for analytic"
 
 #: include/lettering.account.inc.php:85 include/lettering.card.inc.php:90
 #: include/lettering.gestion.inc.php:42 include/lettering.gestion.inc.php:41
 #: include/lettering.account.inc.php:93 include/impress_poste.inc.php:104
+#: include/lettering.account.inc.php:94 include/lettering.card.inc.php:92
 msgid "Opérations lettrées"
 msgstr "Lettered operations"
 
 #: include/lettering.account.inc.php:86 include/lettering.card.inc.php:91
-#: include/lettering.account.inc.php:94
+#: include/lettering.account.inc.php:94 include/lettering.account.inc.php:95
+#: include/lettering.card.inc.php:93
 msgid "Opérations lettrées montants différents"
 msgstr "Lettered writing with different Amounts"
 
 #: include/template/ledger_detail_bottom.php:18
 #: include/template/ledger_detail_bottom.php:33
 #: include/template/ledger_detail_bottom.php:38
+#: include/template/ledger_detail_bottom.php:43
 msgid "Opérations liées"
 msgstr "Linked operations"
 
@@ -15259,6 +16441,9 @@ msgstr "Select the card"
 #: include/template/profile_menu_display_module.php:81
 #: include/class/acc_plan_mtable.class.php:59
 #: include/class/acc_plan_mtable.class.php:65
+#: include/class/tva_rate_mtable.class.php:57
+#: include/class/acc_plan_mtable.class.php:66 include/company.inc.php:72
+#: include/company.inc.php:75 include/company.inc.php:113
 msgid "Oui"
 msgstr "yes"
 
@@ -15278,6 +16463,7 @@ msgstr "Tools for co-ownership"
 #: include/class/periode_ledger_table.class.php:142
 #: include/class/periode_ledger_table.class.php:144
 #: include/class/periode.class.php:587 include/class/periode.class.php:589
+#: include/class/periode.class.php:590
 msgid "Ouvert"
 msgstr "Open"
 
@@ -15292,6 +16478,7 @@ msgstr "Opening entry"
 #: include/class/class_acc_bilan.php:637 include/class/class_acc_bilan.php:654
 #: include/class/acc_bilan.class.php:655 include/class/acc_bilan.class.php:658
 #: include/class/acc_bilan.class.php:663 include/class/acc_bilan.class.php:665
+#: include/class/acc_bilan.class.php:670
 msgid "Ouverture fichier impossible"
 msgstr "Error opening file"
 
@@ -15322,6 +16509,7 @@ msgstr "PDF2PS is not installed"
 #: include/class/acc_ledger.class.php:228
 #: include/class/acc_ledger.class.php:229
 #: include/class/acc_ledger.class.php:247
+#: include/class/acc_ledger.class.php:246
 msgid "PERIODE FERMEE"
 msgstr "Close period"
 
@@ -15371,6 +16559,8 @@ msgstr "PDF2PS is not installed"
 #: include/class/acc_ledger_purchase.class.php:1850
 #: include/class/acc_ledger_sold.class.php:1430
 #: include/class/acc_ledger_purchase.class.php:1856
+#: include/class/acc_ledger_purchase.class.php:1893
+#: include/class/acc_ledger_sold.class.php:1415
 msgid "PU"
 msgstr "Pu"
 
@@ -15402,6 +16592,11 @@ msgstr "Pu"
 #: include/class/acc_ledger_history_purchase.class.php:250
 #: include/class/acc_ledger_history_purchase.class.php:254
 #: include/class/acc_ledger.class.php:2452
+#: include/class/acc_ledger_history_sale.class.php:253
+#: include/class/acc_ledger_search.class.php:730
+#: include/class/acc_ledger_history_purchase.class.php:265
+#: include/class/acc_ledger.class.php:2480
+#: include/export/export_histo_csv.php:43 include/tax_summary.inc.php:42
 msgid "Paiement"
 msgstr "Payment"
 
@@ -15441,6 +16636,7 @@ msgstr "Paid by"
 #: include/database.item.php:219 include/database.item.php:224
 #: include/database.item.php:201 include/database.item.php:202
 #: include/database.item.php:205 include/database.item.php:203
+#: include/database.item.php:211
 msgid "Paiement électronique"
 msgstr "Electronic payment"
 
@@ -15485,6 +16681,7 @@ msgstr "Per file"
 #: include/database.item.php:226 include/database.item.php:203
 #: include/database.item.php:204 include/database.item.php:207
 #: include/database.item.php:221 include/database.item.php:205
+#: include/database.item.php:213
 msgid "Par gérant ou administrateur"
 msgstr "By the manager or administrator"
 
@@ -15505,6 +16702,7 @@ msgstr "Invalid parameter"
 #: include/database.item.php:83 include/database.item.php:86
 #: include/database.item.php:91 include/database.item.php:88
 #: include/database.item.php:87 include/database.item.php:85
+#: include/database.item.php:84
 msgid "Parametre societe"
 msgstr "Company parametes"
 
@@ -15516,6 +16714,7 @@ msgstr "Company parametes"
 #: include/class/acc_ledger.class.php:427
 #: include/class/acc_ledger.class.php:428
 #: include/class/acc_ledger.class.php:443
+#: include/class/acc_ledger.class.php:442
 msgid "Parametres journaux non trouves"
 msgstr "Ledger parameters not found"
 
@@ -15556,6 +16755,7 @@ msgstr "Parameter"
 #: html/install.php:471 include/admin_repo.inc.php:125 html/install.php:477
 #: html/install.php:439 include/admin_repo.inc.php:127 html/install.php:414
 #: include/admin_repo.inc.php:129 html/install.php:420 html/install.php:423
+#: html/install.php:472
 msgid "Paramètre base de données"
 msgstr "Database parameters"
 
@@ -15588,6 +16788,7 @@ msgstr "Invalid parameter"
 #: include/lib/http_input.class.php:121 include/class/acc_ledger.class.php:89
 #: include/lib/http_input.class.php:123 include/class/periode.class.php:237
 #: include/class/acc_ledger.class.php:91 include/class/periode.class.php:239
+#: include/lib/http_input.class.php:161
 msgid "Paramètre invalide"
 msgstr "Invalid parameter"
 
@@ -15604,6 +16805,7 @@ msgstr "Parameter for VAT"
 #: include/database.item.php:75 include/database.item.php:78
 #: include/database.item.php:83 include/database.item.php:81
 #: include/database.item.php:80 include/database.item.php:77
+#: include/database.item.php:76
 msgid "Paramètres divers"
 msgstr "Misc. parameters"
 
@@ -15624,6 +16826,7 @@ msgstr "share"
 #: include/database.item.php:218 include/database.item.php:195
 #: include/database.item.php:196 include/database.item.php:199
 #: include/database.item.php:210 include/database.item.php:215
+#: include/database.item.php:205
 msgid "Partager une note"
 msgstr "Share a note"
 
@@ -15636,6 +16839,7 @@ msgstr "Part of the name or share of the accounting item"
 #: include/database.item.php:182 include/database.item.php:141
 #: include/database.item.php:142 include/database.item.php:143
 #: include/database.item.php:148 include/database.item.php:153
+#: include/database.item.php:149
 msgid "Partie fiscalement non déductible"
 msgstr "Non-tax deductible portion"
 
@@ -15737,6 +16941,9 @@ msgstr "Not given file"
 #: include/class/acc_ledger_fin.class.php:1052 include/compta_ven.inc.php:251
 #: include/class/acc_ledger_sold.class.php:1132
 #: include/class/acc_ledger.class.php:790 include/compta_ach.inc.php:236
+#: include/class/acc_ledger.class.php:777
+#: include/class/acc_ledger_purchase.class.php:1083
+#: include/class/acc_ledger_sold.class.php:1099 include/compta_ach.inc.php:235
 msgid "Pas de journal disponible"
 msgstr "No available ledger"
 
@@ -15771,7 +16978,7 @@ msgstr "Payment"
 #: include/template/stock_summary_list.php:41 include/company.inc.php:130
 #: include/ext/sav/include/template/sas_display_detail.php:107
 #: include/ajax/ajax_mod_stock_repo.php:63 include/company.inc.php:134
-#: include/export/export_stock_resume_list.php:38
+#: include/export/export_stock_resume_list.php:38 include/company.inc.php:142
 msgid "Pays"
 msgstr "Country"
 
@@ -15798,6 +17005,8 @@ msgstr "Country"
 #: include/class/acc_ledger_search.class.php:864
 #: include/class/acc_ledger_search.class.php:706
 #: include/class/acc_ledger_search.class.php:877
+#: include/class/acc_ledger_search.class.php:792
+#: include/class/acc_ledger_search.class.php:966
 msgid "Payé"
 msgstr "Paid"
 
@@ -15820,9 +17029,15 @@ msgstr "Paid"
 #: include/class/acc_ledger_purchase.class.php:1698
 #: include/class/acc_ledger_purchase.class.php:1701
 #: include/class/print_ledger_simple.class.php:274
+#: include/class/acc_ledger_purchase.class.php:1722
+#: include/class/print_ledger_simple.class.php:297
 msgid "Payé par"
 msgstr "Paid by"
 
+#: include/class/acc_ledger_search.class.php:214
+msgid "Payées"
+msgstr "Paid"
+
 #: include/template/dashboard.php:185 include/template/dashboard.php:10
 msgid "Pense-Bête"
 msgstr "Todo List"
@@ -15848,11 +17063,14 @@ msgstr "Period N-1"
 #: include/class/acc_ledger_sold.class.php:113
 #: include/class/acc_ledger.class.php:1068
 #: include/class/acc_ledger.class.php:1084
+#: include/class/acc_ledger.class.php:1080
+#: include/class/acc_ledger_purchase.class.php:111
 msgid "Periode fermee"
 msgstr "Closed Period"
 
 #: include/database.item.php:95 include/database.item.php:98
 #: include/database.item.php:92 include/database.item.php:90
+#: include/database.item.php:91
 msgid ""
 "Permet d'ajouter de nouveaux attributs que vous pourrez par la suite ajouter "
 "à des catégories de fiches"
@@ -15862,7 +17080,8 @@ msgstr ""
 #: include/database.item.php:113 include/database.item.php:115
 #: include/database.item.php:116 include/database.item.php:118
 #: include/database.item.php:110 include/database.item.php:112
-#: include/database.item.php:108
+#: include/database.item.php:108 include/database.item.php:109
+#: include/database.item.php:111
 msgid ""
 "Permet d'ajouter de nouvelles catégorie de fiche, d'ajouter des attributs à "
 "ces catégories (numéro de téléphone, gsm, email...)"
@@ -15872,6 +17091,7 @@ msgstr ""
 
 #: include/database.item.php:13 include/database.item.php:16
 #: include/database.item.php:10 include/database.item.php:8
+#: include/database.item.php:9
 msgid ""
 "Permet d'ajouter des taux de TVA ou de les modifier ainsi que les postes "
 "comptables de ces TVA, ces TVA sont utilisables dans les menus de vente et "
@@ -15880,6 +17100,7 @@ msgstr "Let you add and modify TVA setting ."
 
 #: include/database.item.php:116 include/database.item.php:119
 #: include/database.item.php:113 include/database.item.php:111
+#: include/database.item.php:112
 msgid ""
 "Permet d'ajouter des état pour les documents utilisés dans le suivi (à "
 "faire, à suivre...)"
@@ -15887,6 +17108,7 @@ msgstr "Let you add status for documents used in the follow-up"
 
 #: include/database.item.php:83 include/database.item.php:86
 #: include/database.item.php:80 include/database.item.php:78
+#: include/database.item.php:79
 msgid ""
 "Permet d'avoir la balance de toutes vos fiches, les résumés exportables en "
 "CSV, les historiques avec ou sans lettrages"
@@ -15896,15 +17118,21 @@ msgstr ""
 
 #: include/database.item.php:114 include/database.item.php:117
 #: include/database.item.php:111 include/database.item.php:109
+#: include/database.item.php:110
 msgid "Permet de changer le poste comptable de base des catégories de fiches"
 msgstr "Let modify the base accounting of category of card"
 
-#: include/database.item.php:139
+#: include/lib/message_javascript.php:110
+msgid "Permet de chercher dans le suivi pour les contacts multiques"
+msgstr "Let you search in the follow-up for the multiples concerned"
+
+#: include/database.item.php:139 include/database.item.php:138
 msgid "Permet de configurer les devises"
 msgstr "Set currency"
 
 #: include/database.item.php:102 include/database.item.php:105
 #: include/database.item.php:99 include/database.item.php:97
+#: include/database.item.php:98
 msgid ""
 "Permet de faire correspondre vos extraits bancaires avec les opérations de "
 "vente ou d'achat, le lettrage se fait automatiquement"
@@ -15942,6 +17170,8 @@ msgstr ""
 #: include/export/export_histo_csv.php:40
 #: include/export/export_histo_csv.php:41
 #: include/class/print_ledger_misc.class.php:44 include/compta_ods.inc.php:96
+#: include/class/print_ledger_misc.class.php:43
+#: include/export/export_histo_csv.php:44
 msgid "Piece"
 msgstr "Receipt"
 
@@ -16047,6 +17277,15 @@ msgstr "Receipt"
 #: include/class/acc_ledger_sold.class.php:1411
 #: include/class/acc_ledger.class.php:874
 #: include/class/acc_ledger_purchase.class.php:1837
+#: include/class/acc_ledger_history_sale.class.php:255
+#: include/class/acc_ledger_search.class.php:732
+#: include/class/acc_ledger_search.class.php:1047
+#: include/class/acc_ledger_history_purchase.class.php:267
+#: include/class/acc_ledger.class.php:862
+#: include/class/acc_ledger_purchase.class.php:1874
+#: include/class/acc_ledger_sold.class.php:1396
+#: include/class/print_ledger_simple.class.php:96
+#: include/class/anc_grandlivre.class.php:231 include/lib/ac_common.php:1222
 msgid "Pièce"
 msgstr "Receipt"
 
@@ -16057,7 +17296,7 @@ msgstr "Receipt"
 msgid "Pièce inexistante"
 msgstr "Spare part not found"
 
-#: include/compta_fin_rec.inc.php:339
+#: include/compta_fin_rec.inc.php:339 include/compta_fin_rec.inc.php:380
 msgid "Pièce justificative"
 msgstr "Receipt number"
 
@@ -16071,6 +17310,7 @@ msgstr "Receipt number"
 #: include/template/detail-action.php:403
 #: include/template/detail-action.php:407
 #: include/template/detail-action.php:405
+#: include/template/detail-action.php:401
 msgid "Pièces attachées"
 msgstr "Attachment"
 
@@ -16151,6 +17391,7 @@ msgstr "Port %s"
 
 #: include/template/template_config_form.php:59
 #: include/template/template_config_form.php:67
+#: include/template/template_config_form.php:77
 msgid "Port de Postgresql"
 msgstr "Port of Postgresql"
 
@@ -16160,7 +17401,7 @@ msgid "Port de postgresql"
 msgstr "Port of Postgresql"
 
 #: html/install.php:135 html/install.php:134 html/install.php:140
-#: html/install.php:147
+#: html/install.php:147 html/install.php:160
 msgid "Port pour postgresql"
 msgstr "Port of Postgresql"
 
@@ -16257,7 +17498,14 @@ msgstr "Possible %d"
 #: include/class/acc_ledger_sold.class.php:1414
 #: include/class/acc_ledger.class.php:627
 #: include/class/acc_ledger.class.php:902
-#: include/class/acc_ledger_purchase.class.php:1840
+#: include/class/acc_ledger_purchase.class.php:1840 include/fiche.inc.php:417
+#: include/class/acc_ledger.class.php:890 include/class/fiche.class.php:1501
+#: include/class/acc_ledger_purchase.class.php:1877
+#: include/class/acc_ledger_sold.class.php:1399
+#: include/class/pre_op_advanced.class.php:199
+#: include/class/acc_ledger_history_generic.class.php:772
+#: include/class/anc_grandlivre.class.php:226
+#: include/ajax/ajax_display_letter.php:64 include/database.item.php:63
 msgid "Poste"
 msgstr "Account. Item"
 
@@ -16296,6 +17544,7 @@ msgstr "Post Charge"
 #: include/class/acc_plan_mtable.class.php:45 include/class/fiche.class.php:470
 #: include/class/fiche.class.php:469
 #: include/class/pdfbalance_simple.class.php:55
+#: include/template/ledger_detail_bottom.php:93
 msgid "Poste Comptable"
 msgstr "Accounting item"
 
@@ -16315,6 +17564,7 @@ msgstr "Accounting basis of item"
 #: include/class/acc_ledger.class.php:1122
 #: include/class/acc_ledger.class.php:1131
 #: include/class/acc_ledger.class.php:1147
+#: include/class/acc_ledger.class.php:1143
 msgid "Poste Inexistant ["
 msgstr "non-existent accounting"
 
@@ -16328,6 +17578,7 @@ msgstr "non-existent accounting"
 #: include/class/acc_ledger.class.php:1107
 #: include/class/acc_ledger.class.php:1114
 #: include/class/acc_ledger.class.php:1130
+#: include/class/acc_ledger.class.php:1126
 msgid "Poste Inexistant pour la fiche ["
 msgstr "Inexisting accountancy"
 
@@ -16369,7 +17620,8 @@ msgstr "Post load"
 #: include/class/fiche.class.php:1756 include/class/pdf_operation.class.php:246
 #: include/ajax/ajax_boxcard_search.php:65 include/class/fiche.class.php:1759
 #: include/class/fiche.class.php:1761 include/class/fiche.class.php:1779
-#: include/class/fiche.class.php:1780
+#: include/class/fiche.class.php:1780 include/class/fiche.class.php:1806
+#: include/class/card_attribut_mtable.class.php:58
 msgid "Poste comptable"
 msgstr "Accounting"
 
@@ -16408,17 +17660,21 @@ msgstr "Maximum accounting length is 40 char"
 #: include/class/acc_plan_mtable.class.php:137
 #: include/class/acc_plan_mtable.class.php:149
 #: include/class/acc_plan_mtable.class.php:173
+#: include/class/acc_plan_mtable.class.php:177
 msgid "Poste comptable dépendant ne peut pas être vide"
 msgstr "Depending account can not be empty"
 
 #: include/class/acc_plan_mtable.class.php:127
 #: include/class/acc_plan_mtable.class.php:139
 #: include/class/acc_plan_mtable.class.php:163
+#: include/class/acc_plan_mtable.class.php:167
 msgid "Poste comptable est unique"
 msgstr "Accounting is unique"
 
 #: include/class/tva_rate_mtable.class.php:233
 #: include/class/tva_rate_mtable.class.php:243
+#: include/class/tva_rate_mtable.class.php:250
+#: include/class/tva_rate_mtable.class.php:260
 msgid "Poste comptable inexistant"
 msgstr "Invalid accounting"
 
@@ -16429,6 +17685,7 @@ msgstr "This accounting does not exist"
 #: include/class/acc_plan_mtable.class.php:130
 #: include/class/acc_plan_mtable.class.php:142
 #: include/class/acc_plan_mtable.class.php:166
+#: include/class/acc_plan_mtable.class.php:170
 msgid "Poste comptable ne peut être vide"
 msgstr "Accounting  can not be empty"
 
@@ -16454,7 +17711,10 @@ msgstr "Accounting or card"
 #: include/class/fiche.class.php:849 include/class/fiche.class.php:995
 #: include/class/fiche.class.php:996 include/class/fiche.class.php:1036
 #: include/class/fiche.class.php:850 include/class/fiche.class.php:997
-#: include/class/fiche.class.php:1037
+#: include/class/fiche.class.php:1037 include/class/fiche.class.php:846
+#: include/class/fiche.class.php:876 include/class/fiche.class.php:877
+#: include/class/fiche.class.php:1024 include/class/fiche.class.php:1064
+#: include/class/acc_plan_mtable.class.php:174
 msgid "Poste comptable trop long"
 msgstr "Accounting too large"
 
@@ -16522,6 +17782,7 @@ msgstr "Unknown accounting"
 #: include/class/acc_ledger.class.php:1119
 #: include/class/acc_ledger.class.php:1128
 #: include/class/acc_ledger.class.php:1144
+#: include/class/acc_ledger.class.php:1140
 msgid "Poste invalide ["
 msgstr "Invalid accounting ["
 
@@ -16530,6 +17791,10 @@ msgstr "Invalid accounting ["
 msgid "Poste parent incorrect"
 msgstr "Wrong parent accounting"
 
+#: include/class/acc_plan_mtable.class.php:197
+msgid "Poste utilisé"
+msgstr "Used accounting"
+
 #: include/class/acc_account.class.php:181
 #: include/class/acc_account.class.php:182
 msgid "Poste utilisé : effacement interdit"
@@ -16549,7 +17814,7 @@ msgid ""
 "Pour ajouter, effacer ou modifier une p&eacute;riode, il faut choisir global"
 msgstr "To add , remove or modify a period you must use global"
 
-#: include/periode.inc.php:126
+#: include/periode.inc.php:126 include/periode.inc.php:127
 msgid "Pour ajouter, effacer ou modifier une période, il faut choisir global"
 msgstr "To add , remove or modify a period you must use global"
 
@@ -16560,7 +17825,7 @@ msgstr "For today"
 #: html/admin/setup.php:420 html/install.php:484 html/install.php:483
 #: html/install.php:481 html/install.php:487 html/install.php:479
 #: html/install.php:485 html/install.php:447 html/install.php:422
-#: html/install.php:428 html/install.php:431
+#: html/install.php:428 html/install.php:431 html/install.php:480
 msgid ""
 "Pour cela, sur la ligne de commande en tant qu\\'utilisateur postgres, "
 "faites createlang plpgsql template1"
@@ -16619,6 +17884,8 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:145
 #: include/class/acc_ledger_sold.class.php:204
 #: include/class/acc_ledger_purchase.class.php:219
+#: include/class/acc_ledger_purchase.class.php:151
+#: include/class/acc_ledger_purchase.class.php:221
 msgid "Pour la fiche "
 msgstr "For the card"
 
@@ -16633,6 +17900,7 @@ msgstr "For the card"
 #: include/class/acc_ledger.class.php:1683
 #: include/class/acc_ledger.class.php:1692
 #: include/class/acc_ledger.class.php:1708
+#: include/class/acc_ledger.class.php:1698
 #, php-format
 msgid "Pour la fiche %s le poste comptable [%s] n'existe pas"
 msgstr "For the card %s the accounting %s doesn't exist"
@@ -16642,6 +17910,7 @@ msgstr "For the card %s the accounting %s doesn't exist"
 #: include/class/class_acc_ledger_purchase.php:254
 #: include/class/acc_ledger_purchase.class.php:254
 #: include/class/acc_ledger_purchase.class.php:253
+#: include/class/acc_ledger_purchase.class.php:255
 #, php-format
 msgid "Pour la fiche %s, le compte contrepartie %s n'existe pas"
 msgstr "For the card% s,% s the otherside does not exist"
@@ -16680,6 +17949,7 @@ msgid ""
 msgstr "For a better web experience, take the time to update your brower"
 
 #: include/impress_bilan.inc.php:87 include/impress_bilan.inc.php:94
+#: include/impress_bilan.inc.php:98
 msgid "Pour une vérification complète, allez dans "
 msgstr "For a complete verification go to"
 
@@ -16704,6 +17974,7 @@ msgstr "First road"
 #: include/class/follow_up.class.php:1923
 #: include/class/follow_up.class.php:1921
 #: include/class/follow_up.class.php:1922
+#: include/class/follow_up.class.php:1871
 msgid "Principal"
 msgstr "Main"
 
@@ -16714,10 +17985,12 @@ msgstr "Main"
 #: include/template/detail-action.php:133
 #: include/template/action_display_short.php:99
 #: include/template/action_display_short.php:100
+#: include/template/detail-action.php:140
 msgid "Priorité"
 msgstr "Priority"
 
 #: include/class/print_ledger_simple.class.php:113
+#: include/class/print_ledger_simple.class.php:110
 msgid "Priv/DNA"
 msgstr "Private/DNA"
 
@@ -16725,6 +17998,8 @@ msgstr "Private/DNA"
 #: include/template/tax_summary_display.php:297
 #: include/export/export_printtva_csv.php:62
 #: include/export/export_printtva_pdf.php:212
+#: include/export/export_printtva_pdf.php:216
+#: include/export/export_printtva_csv.php:74
 msgid "Privée"
 msgstr "Private"
 
@@ -16747,6 +18022,8 @@ msgstr "Price / unit"
 #: include/database.item.php:172 include/database.item.php:136
 #: include/database.item.php:137 include/database.item.php:147
 #: include/database.item.php:152 include/database.item.php:182
+#: include/template/action_document_type_mtable_input.php:76
+#: include/database.item.php:178
 msgid "Prix achat"
 msgstr "Purchase price"
 
@@ -16755,6 +18032,8 @@ msgstr "Purchase price"
 #: include/database.item.php:171 include/database.item.php:135
 #: include/database.item.php:136 include/database.item.php:146
 #: include/database.item.php:151 include/database.item.php:181
+#: include/template/action_document_type_mtable_input.php:75
+#: include/database.item.php:177
 msgid "Prix vente"
 msgstr "Sale Price"
 
@@ -16790,6 +18069,7 @@ msgid "Problème réseau"
 msgstr "Network issue"
 
 #: include/template/document_mod_change.php:71
+#: include/template/action_document_type_mtable_input.php:36
 msgid "Prochain numéro"
 msgstr "Next issue"
 
@@ -16805,7 +18085,7 @@ msgstr "Reverse Income"
 
 #: include/user_menu.php:154 include/user_menu.php:158
 #: include/lib/user_menu.php:167 include/lib/user_menu.php:180
-#: include/lib/user_menu.php:138
+#: include/lib/user_menu.php:138 include/lib/user_menu.php:137
 msgid "Produits"
 msgstr "Products"
 
@@ -16823,7 +18103,7 @@ msgstr "Products"
 #: include/template/action_search.php:56 include/database.item.php:84
 #: include/param_sec.inc.php:217 include/database.item.php:78
 #: include/param_sec.inc.php:221 include/template/action_search.php:52
-#: include/database.item.php:76
+#: include/database.item.php:76 include/param_sec.inc.php:226
 msgid "Profil"
 msgstr "Profile"
 
@@ -16851,7 +18131,8 @@ msgstr "Progr."
 #: include/export/export_poste_detail_csv.php:90
 #: include/class/anc_grandlivre.class.php:221
 #: include/class/anc_grandlivre.class.php:222 include/fiche.inc.php:523
-#: include/fiche.inc.php:532
+#: include/fiche.inc.php:532 include/fiche.inc.php:545
+#: include/class/anc_grandlivre.class.php:235
 msgid "Prog."
 msgstr "Progr."
 
@@ -16859,7 +18140,7 @@ msgstr "Progr."
 #: include/database.item.php:205 include/database.item.php:202
 #: include/database.item.php:178 include/database.item.php:179
 #: include/database.item.php:182 include/database.item.php:190
-#: include/database.item.php:195
+#: include/database.item.php:195 include/database.item.php:188
 msgid "Proposition"
 msgstr "Proposal"
 
@@ -16877,11 +18158,21 @@ msgstr "Prefix"
 
 #: include/template/param_jrn.php:84 include/template/param_jrn.php:91
 #: include/template/param_jrn.php:93 include/template/param_jrn.php:137
+#: include/template/param_jrn.php:138
 msgid "Préfixe code interne"
 msgstr "Prefix for internal code"
 
+#: include/class/action_document_type_mtable.class.php:49
+msgid "Préfixe document"
+msgstr "Prefix for document"
+
+#: include/class/action_document_type_mtable.class.php:111
+msgid "Préfixe ne peut être vide"
+msgstr "Prefix cannot be empty"
+
 #: include/template/param_jrn.php:88 include/template/param_jrn.php:95
 #: include/template/param_jrn.php:97 include/template/param_jrn.php:141
+#: include/template/param_jrn.php:142
 msgid "Préfixe pièce justificative"
 msgstr "Prefix for receipt"
 
@@ -16901,6 +18192,7 @@ msgstr "Setting"
 
 #: include/database.item.php:84 include/database.item.php:87
 #: include/database.item.php:81 include/database.item.php:79
+#: include/database.item.php:80
 msgid ""
 "Préférence de l'utilisateur, apparence de l'application pour l'utilisateur, "
 "période par défaut et mot de passe"
@@ -16917,6 +18209,7 @@ msgstr "User's preference, display, default period, email and password"
 #: include/database.item.php:165 include/user.inc.php:81
 #: include/user.inc.php:145 include/class/balance_age.class.php:146
 #: include/database.item.php:170 include/database.item.php:173
+#: include/database.item.php:169
 msgid "Prénom"
 msgstr "First Name"
 
@@ -16936,12 +18229,13 @@ msgstr "Display"
 #: include/database.item.php:123 include/database.item.php:126
 #: include/database.item.php:132 include/database.item.php:128
 #: include/database.item.php:127 include/database.item.php:131
-#: include/database.item.php:125
+#: include/database.item.php:125 include/database.item.php:124
 msgid "Prévision"
 msgstr "Forecast"
 
 #: include/database.item.php:128 include/database.item.php:131
 #: include/database.item.php:125 include/database.item.php:123
+#: include/database.item.php:124
 msgid ""
 "Prévision de vos achats, revenus, permet de suivre l'évolution de votre "
 "société. Vos prévisions sont des formules sur les postes comptables et vous "
@@ -16957,11 +18251,11 @@ msgstr "Public"
 
 #: html/install.php:268 html/install.php:267 html/install.php:265
 #: html/install.php:270 html/install.php:276 html/install.php:227
-#: html/install.php:234 html/install.php:237
+#: html/install.php:234 html/install.php:237 html/install.php:284
 msgid "Puis cliquez sur ce lien"
 msgstr "After click on this link"
 
-#: html/install.php:586 html/install.php:589
+#: html/install.php:586 html/install.php:589 html/install.php:639
 msgid ""
 "Puis refaites la procédure d'installation pour mettre la base de données à "
 "jour"
@@ -16999,6 +18293,8 @@ msgstr "Then perform the install procedure to upgrade the database"
 #: include/ajax/ajax_preference.php:150
 #: include/class/acc_ledger_sold.class.php:1409
 #: include/class/acc_ledger_purchase.class.php:1835
+#: include/class/acc_ledger_purchase.class.php:1872
+#: include/class/acc_ledger_sold.class.php:1394 include/database.item.php:85
 msgid "Période"
 msgstr "Period"
 
@@ -17041,6 +18337,8 @@ msgstr "period between%s  and %s"
 #: include/class/acc_ledger_purchase.class.php:1415
 #: include/class/acc_ledger.class.php:604
 #: include/class/acc_ledger.class.php:620
+#: include/class/acc_ledger_purchase.class.php:1426
+#: include/class/acc_ledger_sold.class.php:696
 msgid "Période Comptable"
 msgstr "Accounting Period"
 
@@ -17086,6 +18384,9 @@ msgstr "Period overlaping another one"
 #: include/class/acc_ledger.class.php:842
 #: include/class/acc_ledger_sold.class.php:1116
 #: include/class/acc_ledger.class.php:858
+#: include/class/acc_ledger.class.php:846
+#: include/class/acc_ledger_purchase.class.php:1063
+#: include/class/acc_ledger_sold.class.php:1083
 msgid "Période comptable"
 msgstr "Accounting period"
 
@@ -17104,7 +18405,7 @@ msgstr "Invalid start period"
 msgid "Période de fin non valable"
 msgstr "Invalid end period"
 
-#: include/tax_summary.inc.php:39
+#: include/tax_summary.inc.php:39 include/tax_summary.inc.php:48
 #, php-format
 msgid "Période du %s au %s"
 msgstr "period between%s  and %s"
@@ -17113,6 +18414,10 @@ msgstr "period between%s  and %s"
 msgid "Période fermée"
 msgstr "Closed Period"
 
+#: include/class/acc_ledger.class.php:1063
+msgid "Période inexistante"
+msgstr "Inexisting period"
+
 #: include/ext/import_account/include/class_impacc_csv.php:48
 #: include/ext/import_account/include/class_impacc_csv.php:49
 #: include/ext/import_account/include/impacc_csv.class.php:48
@@ -17126,6 +18431,7 @@ msgstr "QCODE"
 
 #: include/ext/amortis/include/class_amortissement_material_pdf.php:33
 #: include/ext/amortis/include/amortissement_material_pdf.class.php:33
+#: include/template/card_multiple_result.php:17
 msgid "QCode"
 msgstr "Code"
 
@@ -17188,7 +18494,9 @@ msgstr "Quantity"
 #: include/class/fiche.class.php:1758 include/class/fiche.class.php:1760
 #: include/class/acc_ledger_fin.class.php:753
 #: include/class/fiche.class.php:1778 include/class/fiche.class.php:1779
-#: include/database.item.php:167
+#: include/database.item.php:167 include/fiche.inc.php:415
+#: include/class/fiche.class.php:1805
+#: include/template/ledger_detail_bottom.php:94
 msgid "Quick Code"
 msgstr "Quick Code"
 
@@ -17225,6 +18533,9 @@ msgstr "QuickCode gold"
 #: include/export/export_ledger_csv.php:221
 #: include/class/print_ledger_detail_item.class.php:156
 #: include/class/acc_ledger_history_generic.class.php:772
+#: include/class/acc_account_ledger.class.php:386
+#: include/class/acc_ledger_history_generic.class.php:773
+#: include/export/export_ledger_csv.php:229
 msgid "QuickCode"
 msgstr "QuickCode"
 
@@ -17241,6 +18552,7 @@ msgstr "QuickCode"
 #: include/class/anc_listing.class.php:79
 #: include/class/anc_grandlivre.class.php:215
 #: include/class/anc_listing.class.php:81
+#: include/class/anc_grandlivre.class.php:227
 msgid "Quick_code"
 msgstr "Quick_code"
 
@@ -17276,7 +18588,7 @@ msgstr "Warning: by default, the accounting item Will Be"
 #: include/database.item.php:66 include/database.item.php:72
 #: include/database.item.php:70 include/database.item.php:69
 #: include/database.item.php:68 include/database.item.php:71
-#: include/database.item.php:65
+#: include/database.item.php:65 include/database.item.php:64
 msgid "Rapport"
 msgstr "Reporting"
 
@@ -17294,15 +18606,21 @@ msgstr "Advanced reporting"
 #: include/database.item.php:113 include/database.item.php:102
 #: include/database.item.php:110 include/database.item.php:101
 #: include/database.item.php:109 include/database.item.php:99
+#: include/database.item.php:98 include/database.item.php:106
 msgid "Rapprochement"
 msgstr "Reconciliation"
 
 #: include/database.item.php:97 include/database.item.php:100
 #: include/database.item.php:105 include/database.item.php:102
 #: include/database.item.php:101 include/database.item.php:99
+#: include/database.item.php:98
 msgid "Rapprochement bancaire"
 msgstr "Bank Reconciliation"
 
+#: include/template/follow_up_detail_display.php:194
+msgid "Recalculer"
+msgstr "recompute"
+
 #: html/ajax_card.php:328 html/ajax_poste.php:83 html/recherche.php:65
 #: include/adm.inc.php:81 include/ajax_anc_search.php:45
 #: include/ajax_anc_search.php:56 include/bank.inc.php:75
@@ -17374,6 +18692,16 @@ msgstr "Bank Reconciliation"
 #: include/ajax/ajax_search_operation.php:74 include/ajax/ajax_poste.php:63
 #: include/fiche.inc.php:86 include/class/acc_ledger_search.class.php:556
 #: include/ajax/ajax_card.php:386 include/database.item.php:57
+#: html/recherche.php:87 include/class/acc_ledger_search.class.php:642
+#: include/lettering.account.inc.php:107 include/ajax/ajax_card.php:419
+#: include/ajax/ajax_search_operation.php:67
+#: include/ajax/ajax_search_operation.php:75
+#: include/ajax/ajax_anc_search.php:61
+#: include/ajax/ajax_add_concerned_card.php:90
+#: include/template/action_button.php:35 include/database.item.php:96
+#: include/lettering.card.inc.php:104 include/lib/html_input.class.php:984
+#: include/lib/html_input.class.php:1004 include/lib/html_input.class.php:1021
+#: include/upgrade-plugin.php:55
 #, php-format
 msgid "Recherche"
 msgstr "Search"
@@ -17399,7 +18727,7 @@ msgstr "Advanced search"
 #: include/ajax/ajax_card.php:373 include/ajax/ajax_card.php:374
 #: include/ajax/ajax_card.php:375 include/ajax/ajax_card.php:408
 #: include/ajax/ajax_card.php:411 include/fiche.inc.php:93
-#: include/ajax/ajax_card.php:412
+#: include/ajax/ajax_card.php:412 include/ajax/ajax_card.php:466
 msgid "Recherche de fiche"
 msgstr "Search Card"
 
@@ -17441,9 +18769,14 @@ msgstr "Search Card"
 #: include/ext/rapport_avance/include/formulaire_param_detail.class.php:368
 #: include/ajax/ajax_card.php:506 include/class/acc_report.class.php:151
 #: include/ajax/ajax_card.php:510 include/ajax/ajax_card.php:511
+#: include/ajax/ajax_card.php:587
 msgid "Recherche poste"
 msgstr "Search accounting"
 
+#: include/class/card_attribut_mtable.class.php:43
+msgid "Recherche suivi"
+msgstr "search :"
+
 #: include/class_acc_ledger_fin.php:1037 include/class_acc_ledger.php:2842
 #: include/anc_great_ledger.inc.php:19 include/class_acc_ledger.php:2911
 #: include/class_anc_balance_double.php:342
@@ -17476,6 +18809,7 @@ msgstr "Search accounting"
 #: include/class/acc_ledger_search.class.php:560
 #: include/class/acc_ledger_fin.class.php:1087
 #: include/class/anc_balance_double.class.php:370
+#: include/class/acc_ledger_search.class.php:646
 msgid "Rechercher"
 msgstr "Search"
 
@@ -17513,21 +18847,25 @@ msgstr "Analytical group"
 
 #: include/database.item.php:74 include/database.item.php:77
 #: include/database.item.php:71 include/database.item.php:69
+#: include/database.item.php:70
 msgid "Regroupement des menus des journaux de trésorerie"
 msgstr "group for financial ledgers"
 
 #: include/database.item.php:119 include/database.item.php:122
 #: include/database.item.php:116 include/database.item.php:114
+#: include/database.item.php:115
 msgid "Regroupement des menus ventes et recettes"
 msgstr "Menu Sales and  Purchase"
 
 #: include/database.item.php:71 include/database.item.php:74
 #: include/database.item.php:68 include/database.item.php:66
+#: include/database.item.php:67
 msgid "Regroupement pour les menus d'achats(nouvelle opération, historique...)"
 msgstr "Group for purchase  (expense, fee notes, history, new operation)"
 
 #: include/database.item.php:117 include/database.item.php:120
 #: include/database.item.php:114 include/database.item.php:112
+#: include/database.item.php:113
 msgid ""
 "Regroupement pour les menus d'opérations diverses (nouvelle opération, "
 "historique...)"
@@ -17535,12 +18873,14 @@ msgstr "Group for miscellaneous operation (history, new operation)"
 
 #: include/database.item.php:124 include/database.item.php:127
 #: include/database.item.php:121 include/database.item.php:119
+#: include/database.item.php:120
 msgid ""
 "Regroupement pour les menus de trésorerie (nouvelle opération, historique...)"
 msgstr "Group for financial (history, new operation)"
 
 #: include/database.item.php:72 include/database.item.php:75
 #: include/database.item.php:69 include/database.item.php:67
+#: include/database.item.php:68
 msgid "Regroupement pour les menus et les profils"
 msgstr "Group for menus and profile"
 
@@ -17577,11 +18917,13 @@ msgstr "Successfull restore"
 
 #: include/user_menu.php:113 include/lib/user_menu.php:119
 #: include/lib/user_menu.php:120 include/lib/user_menu.php:77
+#: include/lib/user_menu.php:76
 msgid "Restaure"
 msgstr "Restore"
 
 #: include/user_menu.php:113 include/lib/user_menu.php:119
 #: include/lib/user_menu.php:120 include/lib/user_menu.php:77
+#: include/lib/user_menu.php:76
 msgid "Restaure une base de données"
 msgstr "Restore a folder"
 
@@ -17605,6 +18947,7 @@ msgid "Reste à amortir"
 msgstr "Rest cushion"
 
 #: include/compta_fin_rec.inc.php:306 include/compta_fin_rec.inc.php:307
+#: include/compta_fin_rec.inc.php:348
 msgid "Reste à selectionner"
 msgstr "Remain to select"
 
@@ -17647,11 +18990,13 @@ msgstr "Late"
 #: include/modele.inc.php:403 include/modele.inc.php:443
 #: include/ajax/ajax_display_letter.php:39 include/cfgledger.inc.php:141
 #: include/ext/tva/ajax.php:35 html/do.php:312 html/do.php:281
-#: include/modele.inc.php:404 include/modele.inc.php:444
+#: include/modele.inc.php:404 include/modele.inc.php:444 html/do.php:283
+#: include/ajax/ajax_display_letter.php:53
 msgid "Retour"
 msgstr "Return"
 
 #: include/action.inc.php:26 include/action.inc.php:25
+#: include/action.inc.php:27
 msgid "Retour liste"
 msgstr "Return to list"
 
@@ -17668,6 +19013,7 @@ msgstr "Back to home"
 #: include/ajax_fiche_def_detail.php:40
 #: include/ajax/ajax_fiche_def_detail.php:40 include/param_sec.inc.php:135
 #: include/param_sec.inc.php:141 include/ajax/ajax_fiche_def_detail.php:41
+#: include/param_sec.inc.php:146
 msgid "Retour à la liste"
 msgstr "Return to list"
 
@@ -17703,7 +19049,7 @@ msgid "Rue"
 msgstr "Street"
 
 #: include/company.inc.php:103 include/company.inc.php:122
-#: include/company.inc.php:126
+#: include/company.inc.php:126 include/company.inc.php:134
 msgid "Rue "
 msgstr "Street"
 
@@ -17716,7 +19062,7 @@ msgstr "Summary Accounting class"
 #: include/database.item.php:199 include/database.item.php:206
 #: include/database.item.php:183 include/database.item.php:184
 #: include/database.item.php:187 include/database.item.php:195
-#: include/database.item.php:200
+#: include/database.item.php:200 include/database.item.php:193
 msgid "Réception commande Client"
 msgstr "reception of customer order"
 
@@ -17724,7 +19070,7 @@ msgstr "reception of customer order"
 #: include/database.item.php:200 include/database.item.php:205
 #: include/database.item.php:182 include/database.item.php:183
 #: include/database.item.php:186 include/database.item.php:194
-#: include/database.item.php:199
+#: include/database.item.php:199 include/database.item.php:192
 msgid "Réception commande Fournisseur"
 msgstr "Command reception Supplier"
 
@@ -17732,7 +19078,7 @@ msgstr "Command reception Supplier"
 #: include/database.item.php:202 include/database.item.php:207
 #: include/database.item.php:184 include/database.item.php:185
 #: include/database.item.php:188 include/database.item.php:196
-#: include/database.item.php:201
+#: include/database.item.php:201 include/database.item.php:194
 msgid "Réception magazine"
 msgstr "Front magazine"
 
@@ -17745,6 +19091,7 @@ msgstr "Reconciliation"
 #: include/class/acc_ledger.class.php:981
 #: include/class/acc_ledger.class.php:986
 #: include/class/acc_ledger.class.php:1002
+#: include/class/acc_ledger.class.php:994
 #, php-format
 msgid "Réconciliation/rapprochements : %s"
 msgstr "Reconciliation %s"
@@ -17753,11 +19100,15 @@ msgstr "Reconciliation %s"
 msgid "Réel"
 msgstr "Real"
 
+#: include/class/follow_up.class.php:624
+msgid "Réf."
+msgstr "Ref"
+
 #: include/template/action_search.php:82 include/template/action_search.php:96
 #: include/export/export_gl_csv.php:95 include/export/export_gl_csv.php:90
 #: include/template/action_search.php:133 include/export/export_gl_csv.php:96
 #: include/export/export_gl_pdf.php:88 include/template/action_search.php:115
-#: include/template/action_show.php:38
+#: include/template/action_show.php:38 include/template/action_search.php:116
 msgid "Référence"
 msgstr "Reference"
 
@@ -17771,6 +19122,7 @@ msgstr "Key distribution"
 
 #: html/admin/template_config_form.php:33
 #: include/template/template_config_form.php:33
+#: include/template/template_config_form.php:34
 msgid "Répertoire temporaire"
 msgstr "Temporary folder"
 
@@ -17808,6 +19160,7 @@ msgstr "One day for closing"
 #: include/ext/importbank/include/template/confirm_transfer.php:285
 #: include/verif_bilan.inc.php:152 include/verif_bilan.inc.php:214
 #: include/verif_bilan.inc.php:217 include/verif_bilan.inc.php:219
+#: include/verif_bilan.inc.php:150
 msgid "Résultat"
 msgstr "Result"
 
@@ -17826,7 +19179,7 @@ msgid "Résultat limité à %d , %d nombre de fiches trouvées"
 msgstr "List limited to %d, %d cards found"
 
 #: html/fid_card.php:164 html/fid_card.php:165 html/fid_card.php:170
-#: html/fid_card.php:169
+#: html/fid_card.php:169 html/fid_card.php:171
 #, php-format
 msgid "Résultat limité à 12"
 msgstr "Limited to 12"
@@ -17836,6 +19189,7 @@ msgid "Résultat recherche"
 msgstr "Search result"
 
 #: include/template/account_result.php:6 include/template/card_result.php:6
+#: include/template/card_multiple_result.php:7
 msgid "Résultats"
 msgstr "Results"
 
@@ -17850,6 +19204,7 @@ msgstr "Summary"
 #: include/balance.inc.php:465 include/export/export_balance_pdf.php:341
 #: include/export/export_balance_pdf.php:336
 #: include/export/export_balance_pdf.php:337
+#: include/export/export_balance_pdf.php:338
 msgid "Résumé Exercice courant"
 msgstr "Summary previous "
 
@@ -17858,18 +19213,22 @@ msgstr "Summary previous "
 #: include/balance.inc.php:458 include/export/export_balance_pdf.php:334
 #: include/export/export_balance_pdf.php:329
 #: include/export/export_balance_pdf.php:330
+#: include/export/export_balance_pdf.php:331
 msgid "Résumé Exercice précédent"
 msgstr "Summary current"
 
 #: include/export/export_printtva_pdf.php:49 include/database.item.php:141
+#: include/export/export_printtva_pdf.php:51 include/database.item.php:140
 msgid "Résumé TVA"
 msgstr "Summary VAT"
 
 #: include/export/export_printtva_pdf.php:301
+#: include/export/export_printtva_pdf.php:315
 msgid "Résumé TVA Achat"
 msgstr "Summary VAT Purchase"
 
 #: include/export/export_printtva_pdf.php:160
+#: include/export/export_printtva_pdf.php:164
 msgid "Résumé TVA vente"
 msgstr "Summary VAT Sales"
 
@@ -17894,6 +19253,7 @@ msgstr "Meeting"
 #: include/class/follow_up.class.php:1782
 #: include/class/follow_up.class.php:1780
 #: include/class/follow_up.class.php:1781
+#: include/class/follow_up.class.php:1731
 msgid "SECURITE : Ajout impossible"
 msgstr "Security : unauthorized"
 
@@ -17954,7 +19314,9 @@ msgstr "new line"
 #: include/template/dashboard.php:350 include/ajax/ajax_card.php:203
 #: include/ajax/ajax_card.php:517 include/ajax/ajax_mod_predf_op.php:54
 #: include/cfgledger.inc.php:137 include/ajax/ajax_card.php:204
-#: include/ajax/ajax_card.php:518
+#: include/ajax/ajax_card.php:518 include/ajax/ajax_mod_predf_op.php:67
+#: include/ajax/ajax_card.php:207 include/ajax/ajax_card.php:594
+#: include/company.inc.php:163
 msgid "Sauve"
 msgstr "Save"
 
@@ -18052,6 +19414,10 @@ msgstr "Save template %s"
 #: include/template/stock_inv.php:107 include/class/acc_ledger.class.php:2028
 #: include/template/ledger_detail_bottom.php:315 include/ajax/ajax_card.php:165
 #: include/class/acc_ledger.class.php:2044
+#: include/class/acc_ledger.class.php:2063
+#: include/ajax/ajax_display_letter.php:226 include/ajax/ajax_card.php:168
+#: include/template/ledger_detail_bottom.php:333
+#: include/template/card_multiple_display_option.php:114
 msgid "Sauver"
 msgstr "Save"
 
@@ -18082,6 +19448,7 @@ msgstr "Save the settings"
 #: include/class_fiche_def.php:776 include/class_fiche_def.php:788
 #: include/class/class_fiche_def.php:787 include/operation_ods_new.inc.php:95
 #: include/class/fiche_def.class.php:788 include/operation_ods_new.inc.php:98
+#: include/operation_ods_new.inc.php:99
 msgid "Sauvez"
 msgstr "Save"
 
@@ -18098,7 +19465,7 @@ msgstr "Saved"
 #: include/lib/ac_common.php:810 include/lib/ac_common.php:817
 #: include/lib/ac_common.php:828 include/lib/ac_common.php:829
 #: include/lib/ac_common.php:841 include/lib/ac_common.php:843
-#: include/lib/ac_common.php:859
+#: include/lib/ac_common.php:859 include/lib/ac_common.php:869
 msgid "Se reconnecter pour revenir ici"
 msgstr "Reconnect to be back here"
 
@@ -18122,6 +19489,7 @@ msgstr "Section-Financial"
 #: include/class_follow_up.php:129 include/class/class_follow_up.php:128
 #: include/class/class_follow_up.php:129 include/class/follow_up.class.php:128
 #: include/class/follow_up.class.php:129 include/class/follow_up.class.php:130
+#: include/class/follow_up.class.php:135 include/class/follow_up.class.php:136
 msgid "Securité"
 msgstr "Security"
 
@@ -18136,6 +19504,7 @@ msgstr "Security"
 #: include/class/acc_ledger_search.class.php:928
 #: include/class/acc_ledger_search.class.php:936
 #: include/class/acc_ledger_search.class.php:949
+#: include/class/acc_ledger_search.class.php:1038
 msgid "Selection"
 msgstr "Selection"
 
@@ -18165,12 +19534,12 @@ msgid "Selectionnez votre langue"
 msgstr "Select your language"
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
-#: include/class/periode.class.php:652
+#: include/class/periode.class.php:652 include/class/periode.class.php:653
 msgid "Septembre"
 msgstr "September"
 
 #: html/install.php:138 html/install.php:137 html/install.php:143
-#: html/install.php:150
+#: html/install.php:150 html/install.php:163
 msgid "Serveur postgresql"
 msgstr "Server Postgresql"
 
@@ -18184,11 +19553,13 @@ msgstr "Services intra-deferred perception"
 
 #: include/template/param_jrn.php:136 include/template/param_jrn.php:143
 #: include/template/param_jrn.php:145 include/template/param_jrn.php:190
+#: include/template/param_jrn.php:191
 msgid "Services, fournitures ou biens  achetés (D)"
 msgstr "Services, or good  purchased (D)"
 
 #: include/template/param_jrn.php:197 include/template/param_jrn.php:204
 #: include/template/param_jrn.php:206 include/template/param_jrn.php:251
+#: include/template/param_jrn.php:252
 msgid "Services, fournitures ou biens  vendus (C)"
 msgstr "Services, or   sold  good(D)"
 
@@ -18209,6 +19580,12 @@ msgstr ""
 "Set mode to D etailled all_ledgers result = Detailled Accounting from "
 "Acc_Ledger_History_Generic"
 
+#: html/user_login.php:132
+msgid ""
+"Si la redirection ne fonctionne pas, vous devez changer la valeur de "
+"NOALYSS_URL "
+msgstr "If the redirect doesn't work change in the setting NOALYSS_URL"
+
 #: include/lib/message_javascript.php:83 include/lib/message_javascript.php:85
 msgid "Si vous changez de page vous perdez les reconciliations, continuez ?"
 msgstr "If you change , you'll lost your selection"
@@ -18273,17 +19650,19 @@ msgstr "Situation"
 #: include/database.item.php:171 include/database.item.php:170
 #: include/database.item.php:169 include/database.item.php:173
 #: include/database.item.php:178 include/database.item.php:183
+#: include/template/card_multiple_result.php:18 include/database.item.php:179
 msgid "Société"
 msgstr "Company"
 
 #: include/contact.inc.php:90 include/contact.inc.php:94
-#: include/contact.inc.php:95
+#: include/contact.inc.php:95 include/contact.inc.php:96
 msgid "Société :"
 msgstr "Company"
 
 #: include/database.item.php:83 include/database.item.php:86
 #: include/database.item.php:91 include/database.item.php:88
 #: include/database.item.php:87 include/database.item.php:85
+#: include/database.item.php:84
 msgid "Sociétés"
 msgstr "Company"
 
@@ -18305,7 +19684,8 @@ msgstr "Company"
 #: include/class/anc_listing.class.php:120 include/class/fiche.class.php:1784
 #: include/class/anc_balance_double.class.php:101
 #: include/class/fiche.class.php:1785 include/export/export_balance_pdf.php:136
-#: include/class/pdfbalance_simple.class.php:58
+#: include/class/pdfbalance_simple.class.php:58 include/fiche.inc.php:420
+#: include/class/fiche.class.php:1811
 msgid "Solde"
 msgstr "Balance"
 
@@ -18334,18 +19714,25 @@ msgstr "Total N-1"
 msgid "Solde crédit"
 msgstr "Total credit"
 
-#: include/template/letter_all.php:117
+#: include/template/letter_all.php:117 include/export/export_balance_csv.php:79
 msgid "Solde créditeur"
 msgstr "Total credit"
 
+#: include/template/letter_all.php:128
+#, php-format
+msgid "Solde créditeur : %s"
+msgstr "Total credit : %s"
+
 #: include/database.item.php:98 include/database.item.php:101
 #: include/database.item.php:106 include/database.item.php:103
 #: include/database.item.php:102 include/database.item.php:100
+#: include/database.item.php:99
 msgid "Solde des comptes en banques, caisse..."
 msgstr "Balance of bank accounts, cash ..."
 
 #: include/database.item.php:103 include/database.item.php:106
 #: include/database.item.php:100 include/database.item.php:98
+#: include/database.item.php:99
 msgid ""
 "Solde des journaux de trésorerie cela concerne les comptes en banques, "
 "caisse , les chèques... "
@@ -18357,10 +19744,15 @@ msgstr ""
 msgid "Solde débit"
 msgstr "Debit saldo"
 
-#: include/template/letter_all.php:115
+#: include/template/letter_all.php:115 include/export/export_balance_csv.php:79
 msgid "Solde débiteur"
 msgstr "Debit Saldo"
 
+#: include/template/letter_all.php:126
+#, php-format
+msgid "Solde débiteur : %s"
+msgstr "Total debit : %s"
+
 #: include/template/form_ledger_fin.php:33
 msgid "Solde début"
 msgstr "Start balance"
@@ -18376,6 +19768,7 @@ msgstr "End balance"
 #: include/database.item.php:98 include/database.item.php:101
 #: include/database.item.php:106 include/database.item.php:103
 #: include/database.item.php:102 include/database.item.php:100
+#: include/database.item.php:99
 msgid "Soldes"
 msgstr "Sales"
 
@@ -18386,7 +19779,8 @@ msgstr "Sales"
 #: include/lib/user_menu.php:125 include/lib/user_menu.php:144
 #: include/database.item.php:107 include/database.item.php:101
 #: include/database.item.php:99 include/lib/user_menu.php:82
-#: include/lib/user_menu.php:101
+#: include/lib/user_menu.php:101 include/lib/user_menu.php:81
+#: include/lib/user_menu.php:100
 msgid "Sortie"
 msgstr "Logout"
 
@@ -18398,23 +19792,24 @@ msgid "Sortie &#9094"
 msgstr "Logout &#9094"
 
 #: include/class/periode.class.php:521 include/class/periode.class.php:523
-#: include/class/periode.class.php:525
+#: include/class/periode.class.php:525 include/class/periode.class.php:526
 msgid "Status"
 msgstr "Status"
 
 #: include/database.item.php:107 include/database.item.php:110
 #: include/database.item.php:116 include/database.item.php:113
 #: include/database.item.php:112 include/database.item.php:108
+#: include/database.item.php:109
 msgid "Stock"
 msgstr "Stock"
 
 #: include/user_menu.php:150 include/user_menu.php:154
 #: include/lib/user_menu.php:163 include/lib/user_menu.php:176
-#: include/lib/user_menu.php:134
+#: include/lib/user_menu.php:134 include/lib/user_menu.php:133
 msgid "Stock et commande"
 msgstr "Stock and Order"
 
-#: include/impress_jrn.inc.php:156
+#: include/impress_jrn.inc.php:156 include/impress_jrn.inc.php:170
 msgid "Style d'impression"
 msgstr "Printing type"
 
@@ -18423,12 +19818,12 @@ msgid "Suggestion"
 msgstr "Suggest"
 
 #: include/company.inc.php:120 include/company.inc.php:139
-#: include/company.inc.php:143
+#: include/company.inc.php:143 include/company.inc.php:157
 msgid "Suggérer la date"
 msgstr "Suggest the date"
 
 #: include/company.inc.php:119 include/company.inc.php:138
-#: include/company.inc.php:142
+#: include/company.inc.php:142 include/company.inc.php:156
 msgid "Suggérer le numéro de pièce justificative"
 msgstr "Suggest the receipt number"
 
@@ -18453,7 +19848,7 @@ msgstr "Followed Supplier, customer, bank, quote, order, mail"
 #: include/database.item.php:122 include/database.item.php:125
 #: include/database.item.php:131 include/database.item.php:127
 #: include/database.item.php:126 include/database.item.php:130
-#: include/database.item.php:124
+#: include/database.item.php:124 include/database.item.php:123
 msgid "Suivi administration, banque"
 msgstr "Followed administration, bank"
 
@@ -18461,16 +19856,19 @@ msgstr "Followed administration, bank"
 #: include/database.item.php:108 include/database.item.php:105
 #: include/database.item.php:104 include/database.item.php:21
 #: include/database.item.php:24 include/database.item.php:17
+#: include/database.item.php:16
 msgid "Suivi client"
 msgstr "Customer care"
 
 #: include/database.item.php:21 include/database.item.php:24
 #: include/database.item.php:17 include/database.item.php:15
+#: include/database.item.php:16
 msgid "Suivi client : devis, réunion, courrier, commande..."
 msgstr "Follow up, mail, invoice, ordering"
 
 #: include/database.item.php:130 include/database.item.php:133
 #: include/database.item.php:127 include/database.item.php:125
+#: include/database.item.php:126
 msgid ""
 "Suivi de vos salariés, managers ainsi que des administrateurs, pour les "
 "documents et les opérations comptables"
@@ -18478,24 +19876,26 @@ msgstr "Follow up of your employees , managers , for documents, expenses"
 
 #: include/database.item.php:127 include/database.item.php:130
 #: include/database.item.php:124 include/database.item.php:122
+#: include/database.item.php:123
 msgid "Suivi des administrations : courrrier, déclarations."
 msgstr "Follow up of administration : mail , tax return "
 
 #: include/database.item.php:16 include/database.item.php:19
 #: include/database.item.php:13 include/database.item.php:11
+#: include/database.item.php:12
 msgid "Suivi des fournisseurs : devis, lettres, email...."
 msgstr "Follow up of the suppliers : email, mail , cost estimate"
 
 #: include/database.item.php:125 include/database.item.php:128
 #: include/database.item.php:134 include/database.item.php:130
 #: include/database.item.php:129 include/database.item.php:133
-#: include/database.item.php:127
+#: include/database.item.php:127 include/database.item.php:126
 msgid "Suivi des gérants, administrateurs et salariés"
 msgstr "Monitoring of managers, directors and employees"
 
 #: include/database.item.php:11 include/database.item.php:14
 #: include/database.item.php:16 include/database.item.php:19
-#: include/database.item.php:13
+#: include/database.item.php:13 include/database.item.php:12
 msgid "Suivi fournisseur"
 msgstr "Follow up supplier"
 
@@ -18559,32 +19959,37 @@ msgstr "Deleted"
 #: html/ajax_misc.php:235 html/ajax_misc.php:313 html/ajax_misc.php:318
 #: html/ajax_misc.php:346 html/ajax_misc.php:458 html/ajax_misc.php:460
 #: html/ajax_misc.php:466 html/ajax_misc.php:468 html/ajax_misc.php:472
+#: html/ajax_misc.php:437
 msgid "Symbole"
 msgstr "Symbol"
 
-#: include/param_sec.inc.php:88
+#: include/param_sec.inc.php:88 include/param_sec.inc.php:89
 msgid "Séc. Action actif"
 msgstr "Security for action enable"
 
-#: include/param_sec.inc.php:87
+#: include/param_sec.inc.php:87 include/param_sec.inc.php:88
 msgid "Séc. Journaux actif"
 msgstr "Security for ledger enable"
 
 #: include/database.item.php:89 include/database.item.php:92
 #: include/database.item.php:97 include/database.item.php:94
 #: include/database.item.php:93 include/export/export_security_pdf.php:89
-#: include/database.item.php:91
+#: include/database.item.php:91 include/database.item.php:90
 msgid "Sécurité"
 msgstr "Security"
 
-#: include/param_sec.inc.php:298
+#: include/param_sec.inc.php:298 include/param_sec.inc.php:309
 msgid "Sécurité sur les actions"
 msgstr "Security on  actions"
 
-#: include/param_sec.inc.php:231
+#: include/param_sec.inc.php:231 include/param_sec.inc.php:234
 msgid "Sécurité sur les journaux"
 msgstr "security on  ledgers"
 
+#: include/lib/select_dialog.class.php:48
+msgid "Sélection"
+msgstr "Select"
+
 #: include/template/action_other_action.php:18
 msgid "Sélectionner les documents et l' action :"
 msgstr "Select the document and the action"
@@ -18683,6 +20088,8 @@ msgstr "Totals"
 #: include/template/acc_ledger_history_purchase_extended.php:129
 #: include/template/acc_ledger_history_sale_extended.php:130
 #: include/class/print_ledger_detail_item.class.php:164
+#: include/class/acc_ledger_history_sale.class.php:260
+#: include/tax_summary.inc.php:43 include/database.item.php:9
 msgid "TVA"
 msgstr "VAT"
 
@@ -18702,9 +20109,15 @@ msgstr "Tax Deductible"
 #: include/template/ledger_detail_ach.php:134
 #: include/template/ledger_detail_ach.php:135
 #: include/class/print_ledger_simple.class.php:114
+#: include/class/print_ledger_simple.class.php:111
+#: include/export/export_printtva_pdf.php:217
 msgid "TVA ND"
 msgstr "VAT ND"
 
+#: include/export/export_printtva_pdf.php:217
+msgid "TVA ND récup"
+msgstr "VAT not deductible"
+
 #: include/template/operation_detail_ach.php:53
 #: include/template/operation_detail_ven.php:45
 #: include/export/export_ledger_csv.php:248
@@ -18716,6 +20129,8 @@ msgstr "VAT ND"
 #: include/class/acc_ledger_history_purchase.class.php:260
 #: include/class/acc_ledger_history_purchase.class.php:264
 #: include/class/print_ledger_detail_item.class.php:162
+#: include/class/acc_ledger_history_purchase.class.php:275
+#: include/class/print_ledger_simple.class.php:113
 msgid "TVA NP"
 msgstr "VAT ND"
 
@@ -18731,6 +20146,7 @@ msgstr "VAT ND"
 #: include/class/acc_ledger_purchase.class.php:1853
 #: include/class/acc_ledger_purchase.class.php:1856
 #: include/class/acc_ledger_purchase.class.php:1862
+#: include/class/acc_ledger_purchase.class.php:1899
 msgid "TVA NP opération"
 msgstr "VAT NP Operation"
 
@@ -18738,6 +20154,7 @@ msgstr "VAT NP Operation"
 #: include/template/tax_summary_display.php:309
 #: include/export/export_printtva_csv.php:66
 #: include/export/export_printtva_pdf.php:213
+#: include/export/export_printtva_csv.php:78
 msgid "TVA Non Déd"
 msgstr "VAT Not Deductible"
 
@@ -18745,6 +20162,7 @@ msgstr "VAT Not Deductible"
 #: include/template/tax_summary_display.php:312
 #: include/export/export_printtva_csv.php:67
 #: include/export/export_printtva_pdf.php:213
+#: include/export/export_printtva_csv.php:79
 msgid "TVA Non Déd & récup"
 msgstr "TVA Ded"
 
@@ -18769,6 +20187,8 @@ msgstr "TVA Ded"
 #: include/class/acc_ledger_purchase.class.php:1845
 #: include/class/acc_ledger_sold.class.php:1425
 #: include/class/acc_ledger_purchase.class.php:1851
+#: include/class/acc_ledger_purchase.class.php:1888
+#: include/class/acc_ledger_sold.class.php:1410
 msgid "TVA Non Payé"
 msgstr "VAT Not paid"
 
@@ -18798,6 +20218,8 @@ msgstr "VAT Not paid"
 #: include/class/acc_ledger_purchase.class.php:1855
 #: include/class/acc_ledger_sold.class.php:1432
 #: include/class/acc_ledger_purchase.class.php:1861
+#: include/class/acc_ledger_purchase.class.php:1898
+#: include/class/acc_ledger_sold.class.php:1417
 msgid "TVA Opération"
 msgstr "VAT Operation"
 
@@ -18833,14 +20255,22 @@ msgstr "VAT Sale (C)"
 #: include/class/acc_ledger_history_sale.class.php:251
 #: include/class/acc_ledger_sold.class.php:1424
 #: include/class/acc_ledger_purchase.class.php:1850
+#: include/class/acc_ledger_history_sale.class.php:261
+#: include/class/acc_ledger_purchase.class.php:1887
+#: include/class/acc_ledger_sold.class.php:1409
 msgid "TVA annulée"
 msgstr "canceled VAT "
 
+#: include/lib/message_javascript.php:107
+msgid "TVA due ou récupérable quand l'opération est payée ou exécutée"
+msgstr "VAT due or deductible , when the operation is paid or executed "
+
 #: include/database.item.php:134 include/database.item.php:137
 #: include/database.item.php:177 include/database.item.php:181
 #: include/database.item.php:180 include/database.item.php:139
 #: include/database.item.php:140 include/database.item.php:141
 #: include/database.item.php:146 include/database.item.php:151
+#: include/database.item.php:147
 msgid "TVA non déductible"
 msgstr "Non-deductible VAT"
 
@@ -18849,6 +20279,7 @@ msgstr "Non-deductible VAT"
 #: include/database.item.php:181 include/database.item.php:140
 #: include/database.item.php:141 include/database.item.php:142
 #: include/database.item.php:147 include/database.item.php:152
+#: include/database.item.php:148
 msgid "TVA non déductible récupérable par l'impôt"
 msgstr "Non-deductible VAT recoverable by the Tax"
 
@@ -18866,6 +20297,7 @@ msgstr "Non-deductible VAT recoverable by the Tax"
 #: include/class/acc_ledger_purchase.class.php:1850
 #: include/class/acc_ledger_purchase.class.php:1853
 #: include/class/acc_ledger_purchase.class.php:1859
+#: include/class/acc_ledger_purchase.class.php:1896
 msgid "TVA récup."
 msgstr "TVA Ded"
 
@@ -18896,6 +20328,7 @@ msgstr "TVA Ded"
 #: include/template/acc_ledger_history_purchase_extended.php:131
 #: include/template/acc_ledger_history_sale_extended.php:132
 #: include/class/print_ledger_detail_item.class.php:165
+#: include/class/print_ledger_detail_item.class.php:64
 msgid "TVAC"
 msgstr "with VAT"
 
@@ -18905,12 +20338,14 @@ msgstr "with VAT"
 #: include/class/acc_ledger_history_sale.class.php:262
 #: include/class/acc_ledger_history_purchase.class.php:271
 #: include/class/acc_ledger_history_purchase.class.php:276
+#: include/class/acc_ledger_history_sale.class.php:272
+#: include/class/acc_ledger_history_purchase.class.php:287
 msgid "TVAC/TTC"
 msgstr "with VAT"
 
 #: include/database.item.php:5 include/database.item.php:8
 #: include/database.item.php:10 include/database.item.php:13
-#: include/database.item.php:7
+#: include/database.item.php:7 include/database.item.php:6
 msgid "Tableau"
 msgstr "Table"
 
@@ -18925,11 +20360,13 @@ msgstr "Table depreciation per year"
 #: include/database.item.php:116 include/database.item.php:119
 #: include/database.item.php:125 include/database.item.php:122
 #: include/database.item.php:121 include/database.item.php:117
+#: include/database.item.php:118
 msgid "Tableau de bord"
 msgstr "Dashboard"
 
 #: include/database.item.php:122 include/database.item.php:125
 #: include/database.item.php:119 include/database.item.php:117
+#: include/database.item.php:118
 msgid ""
 "Tableau de suivi, vous permet de voir en un coup d'oeil vos dernières "
 "opérations, un petit calendrier, une liste de chose à faire..."
@@ -18939,13 +20376,15 @@ msgstr ""
 
 #: include/database.item.php:5 include/database.item.php:8
 #: include/database.item.php:10 include/database.item.php:13
-#: include/database.item.php:7
+#: include/database.item.php:7 include/database.item.php:6
 msgid "Tableau lié à la comptabilité"
 msgstr "Table with accountancy"
 
 #: include/template/tag_list.php:11 include/template/tag_search_select.php:16
 #: include/template/tag_select.php:16 include/template/tag_list.php:12
 #: include/template/tag_search_select.php:18 include/template/tag_select.php:20
+#: include/template/tag_select.php:22 include/template/tag_search_select.php:21
+#: include/template/tag_list.php:13
 msgid "Tag"
 msgstr "Tag"
 
@@ -18957,6 +20396,7 @@ msgstr "Enable tag"
 #: include/card_attr.inc.php:96 include/dossier.inc.php:204
 #: include/dossier.inc.php:238 include/dossier.inc.php:239
 #: include/dossier.inc.php:242 include/dossier.inc.php:247
+#: include/class/card_attribut_mtable.class.php:41
 msgid "Taille"
 msgstr "Size"
 
@@ -18999,7 +20439,11 @@ msgstr ""
 #: include/export/export_printtva_csv.php:41
 #: include/export/export_printtva_csv.php:60
 #: include/export/export_printtva_pdf.php:57
-#: include/export/export_printtva_pdf.php:212
+#: include/export/export_printtva_pdf.php:212 html/ajax_misc.php:436
+#: include/export/export_printtva_pdf.php:59
+#: include/export/export_printtva_pdf.php:216
+#: include/export/export_printtva_csv.php:53
+#: include/export/export_printtva_csv.php:72
 msgid "Taux"
 msgstr "Spleen"
 
@@ -19026,6 +20470,7 @@ msgid "Taux de TVA"
 msgstr "VAT rate"
 
 #: include/class/tva_rate_mtable.class.php:215
+#: include/class/tva_rate_mtable.class.php:232
 msgid "Taux de TVA invalide"
 msgstr "Invalid VAT code"
 
@@ -19034,6 +20479,8 @@ msgid "Test Inplace_Edit"
 msgstr "Test Inplace_Edit"
 
 #: include/card_attr.inc.php:77 include/card_attr.inc.php:78
+#: include/class/card_attribut_mtable.class.php:51
+#: include/class/contact_option_ref_mtable.class.php:42
 msgid "Texte"
 msgstr "Text"
 
@@ -19091,6 +20538,14 @@ msgstr "Theme"
 #: include/class/fiche.class.php:1476 include/export/export_ledger_csv.php:214
 #: include/export/export_ledger_csv.php:222
 #: include/class/acc_ledger_history_generic.class.php:686
+#: include/class/acc_ledger_search.class.php:736
+#: include/class/print_ledger_misc.class.php:45
+#: include/class/fiche.class.php:1503
+#: include/class/acc_account_ledger.class.php:388
+#: include/class/acc_ledger_history_generic.class.php:687
+#: include/class/anc_grandlivre.class.php:229
+#: include/export/export_ledger_csv.php:230
+#: include/export/export_histo_csv.php:46
 msgid "Tiers"
 msgstr "Tiers"
 
@@ -19108,6 +20563,7 @@ msgstr "Tiers"
 #: include/template/detail-action.php:258 include/template/dashboard.php:348
 #: include/ext/invoicing/include/invoice_send_mail_input.inc.php:139
 #: include/template/action_show.php:40 include/template/dashboard.php:346
+#: include/class/follow_up.class.php:627
 msgid "Titre"
 msgstr "Title"
 
@@ -19126,18 +20582,21 @@ msgstr "Title 3"
 #: include/class_print_ledger_detail_item.php:61
 #: include/class/class_print_ledger_detail_item.php:61
 #: include/class/print_ledger_detail_item.class.php:61
+#: include/class/print_ledger_detail_item.class.php:60
 msgid "Tot HTVA"
 msgstr "Total VAT excluded"
 
 #: include/class_print_ledger_detail_item.php:64
 #: include/class/class_print_ledger_detail_item.php:64
 #: include/class/print_ledger_detail_item.class.php:64
+#: include/class/print_ledger_detail_item.class.php:63
 msgid "Tot TVA"
 msgstr "Total VAT"
 
 #: include/class_print_ledger_detail_item.php:62
 #: include/class/class_print_ledger_detail_item.php:62
 #: include/class/print_ledger_detail_item.class.php:62
+#: include/class/print_ledger_detail_item.class.php:61
 msgid "Tot TVA NP"
 msgstr "Total VAT NP"
 
@@ -19205,6 +20664,8 @@ msgstr "Total VAT NP"
 #: include/class/anc_listing.class.php:118
 #: include/class/anc_balance_double.class.php:83
 #: include/class/anc_balance_double.class.php:278
+#: include/template/form_ledger_detail.php:116
+#: include/template/predf_ledger_detail.php:80
 msgid "Total"
 msgstr "Total"
 
@@ -19215,6 +20676,7 @@ msgstr "Total"
 #: include/template/form_ledger_detail.php:79
 #: include/template/form_ledger_detail.php:83
 #: include/template/impress_reconciliation.php:65
+#: include/template/form_ledger_detail.php:86
 msgid "Total "
 msgstr "Total"
 
@@ -19279,6 +20741,10 @@ msgstr "Sum Debit"
 #: include/class/acc_ledger_purchase.class.php:1848
 #: include/class/acc_ledger_sold.class.php:1428
 #: include/class/acc_ledger_purchase.class.php:1854
+#: include/class/acc_ledger_purchase.class.php:1891
+#: include/class/acc_ledger_sold.class.php:1413
+#: include/template/form_ledger_detail.php:79
+#: include/template/predf_ledger_detail.php:76
 msgid "Total HTVA"
 msgstr "Total VAT excluded"
 
@@ -19306,6 +20772,9 @@ msgstr "Total VAT excluded"
 #: include/class/acc_ledger_purchase.class.php:1643
 #: include/class/acc_ledger_sold.class.php:900
 #: include/class/acc_ledger_purchase.class.php:1646
+#: include/class/acc_ledger_purchase.class.php:1659
+#: include/class/acc_ledger_sold.class.php:904
+#: include/template/predf_ledger_detail.php:77
 msgid "Total TVA"
 msgstr "Total VAT"
 
@@ -19333,6 +20802,9 @@ msgstr "Total VAT"
 #: include/class/acc_ledger_purchase.class.php:1644
 #: include/class/acc_ledger_sold.class.php:901
 #: include/class/acc_ledger_purchase.class.php:1647
+#: include/class/acc_ledger_purchase.class.php:1660
+#: include/class/acc_ledger_sold.class.php:905
+#: include/template/predf_ledger_detail.php:78
 msgid "Total TVAC"
 msgstr "Total VAT included"
 
@@ -19357,6 +20829,7 @@ msgstr "Total fee"
 #: include/class/class_fiche.php:1606 include/class/fiche.class.php:1760
 #: include/class/fiche.class.php:1763 include/class/fiche.class.php:1765
 #: include/class/fiche.class.php:1783 include/class/fiche.class.php:1784
+#: include/class/fiche.class.php:1810
 msgid "Total crédit"
 msgstr "Total credit"
 
@@ -19371,6 +20844,7 @@ msgstr "Accounting sum"
 #: include/class/class_fiche.php:1605 include/class/fiche.class.php:1759
 #: include/class/fiche.class.php:1762 include/class/fiche.class.php:1764
 #: include/class/fiche.class.php:1782 include/class/fiche.class.php:1783
+#: include/class/fiche.class.php:1809
 msgid "Total débit"
 msgstr "Total Debit"
 
@@ -19388,6 +20862,7 @@ msgstr "Total level"
 #: include/class/acc_ledger_history_generic.class.php:684
 #: include/class/acc_ledger_history_generic.class.php:685
 #: include/class/acc_ledger_history_generic.class.php:688
+#: include/class/acc_ledger_history_generic.class.php:689
 msgid "Total opération"
 msgstr "Total entries"
 
@@ -19477,10 +20952,25 @@ msgstr "Total to distribute"
 #: include/template/acc_ledger_history_purchase_extended.php:160
 #: include/template/acc_ledger_history_sale_extended.php:161
 #: include/class/acc_ledger_history_generic.class.php:741
-#: include/class/acc_ledger.class.php:740
+#: include/class/acc_ledger.class.php:740 include/fiche.inc.php:459
+#: include/class/fiche.class.php:1589
+#: include/class/acc_ledger_purchase.class.php:1601
+#: include/class/acc_ledger_sold.class.php:848
+#: include/class/acc_account_ledger.class.php:431
+#: include/class/acc_ledger_history_generic.class.php:742
 msgid "Totaux"
 msgstr "Total"
 
+#: include/export/export_balance_pdf.php:179
+#, php-format
+msgid "Totaux %s "
+msgstr "Total %s"
+
+#: include/class/acc_balance.class.php:279
+#, php-format
+msgid "Totaux %s %s"
+msgstr "Total %s %s"
+
 #: include/balance.inc.php:111 include/balance.inc.php:112
 #: include/balance.inc.php:118 include/balance.inc.php:119
 #: include/balance.inc.php:122
@@ -19491,6 +20981,7 @@ msgstr "Subtotal"
 #: include/user.inc.php:176 include/user.inc.php:178
 #: include/ext/importbank/include/import_bank.class.php:136
 #: include/template/tag_search_select.php:14
+#: include/template/tag_search_select.php:17
 msgid "Tous"
 msgstr "All"
 
@@ -19508,6 +20999,10 @@ msgstr "All"
 msgid "Tous les Etats"
 msgstr "All States"
 
+#: include/class/follow_up.class.php:1128
+msgid "Tous les actions ouvertes"
+msgstr "All open actions"
+
 #: include/ext/amortis/include/am_card.php:43
 msgid "Tous les biens y compris ceux qui sont complétement amortis"
 msgstr "All properties including those fully depreciated"
@@ -19542,6 +21037,7 @@ msgstr "All the depending accouting"
 #: include/class/follow_up.class.php:1245
 #: include/class/follow_up.class.php:1243
 #: include/class/follow_up.class.php:1244
+#: include/class/follow_up.class.php:1161
 msgid "Tous les profiles"
 msgstr "All profiles"
 
@@ -19556,6 +21052,7 @@ msgstr "All profiles"
 #: include/class/follow_up.class.php:1205
 #: include/class/follow_up.class.php:1203
 #: include/class/follow_up.class.php:1204
+#: include/class/follow_up.class.php:1121
 msgid "Tous les types"
 msgstr "Any type"
 
@@ -19580,7 +21077,8 @@ msgid "Tout est install&eacute;"
 msgstr "Everything is installed"
 
 #: html/install.php:632 html/install.php:592 html/install.php:639
-#: html/install.php:595 html/install.php:642
+#: html/install.php:595 html/install.php:642 html/install.php:645
+#: html/install.php:695
 msgid "Tout est installé"
 msgstr "Everything is installed"
 
@@ -19596,12 +21094,17 @@ msgstr "Update"
 msgid "Tout sélectionner"
 msgstr "Check all"
 
+#: include/class/acc_ledger_search.class.php:212
+msgid "Toutes"
+msgstr "Everything"
+
 #: include/param_sec.inc.php:320 include/param_sec.inc.php:260
-#: include/param_sec.inc.php:292
+#: include/param_sec.inc.php:292 include/template/security_list_action.php:8
 msgid "Toutes les actions"
 msgstr "All Actions"
 
 #: include/class/acc_plan_mtable.class.php:196
+#: include/class/acc_plan_mtable.class.php:213
 msgid "Toutes les fiches"
 msgstr "All cards"
 
@@ -19612,12 +21115,18 @@ msgstr "All sheets in PDF"
 #: include/category_card.inc.php:67 include/category_card.inc.php:68
 #: include/category_card.inc.php:71 include/impress_poste.inc.php:103
 #: include/category_card.inc.php:76 include/category_card.inc.php:78
+#: include/impress_jrn.inc.php:156
 msgid "Toutes les opérations"
 msgstr "All entries"
 
+#: include/template/action_search.php:149
+msgid "Toutes les étiquettes"
+msgstr "All tags"
+
 #: include/lettering.account.inc.php:84 include/lettering.card.inc.php:89
 #: include/lettering.gestion.inc.php:41 include/lettering.gestion.inc.php:40
-#: include/lettering.account.inc.php:92
+#: include/lettering.account.inc.php:92 include/lettering.account.inc.php:93
+#: include/lettering.card.inc.php:91
 msgid "Toutes opérations"
 msgstr "All operations"
 
@@ -19660,6 +21169,7 @@ msgstr "Transformation data into another format"
 #: include/template/detail-action.php:383
 #: include/template/detail-action.php:390
 #: include/template/detail-action.php:392
+#: include/template/follow_up_detail_display.php:203
 msgid "Transformer en facture"
 msgstr "Generate invoices"
 
@@ -19686,7 +21196,7 @@ msgstr "Quarter"
 #: include/database.item.php:119 include/database.item.php:122
 #: include/database.item.php:128 include/database.item.php:124
 #: include/database.item.php:123 include/database.item.php:127
-#: include/database.item.php:121
+#: include/database.item.php:121 include/database.item.php:120
 msgid "Trésorerie"
 msgstr "Financial"
 
@@ -19718,10 +21228,15 @@ msgstr "VAT ND"
 #: include/class/fiche.class.php:1463
 #: include/class/acc_ledger_search.class.php:1106
 #: include/class/fiche.class.php:1477 include/class/fiche.class.php:1478
+#: include/class/acc_ledger_search.class.php:1195
+#: include/class/fiche.class.php:1505
+#: include/class/card_attribut_mtable.class.php:40
+#: include/class/acc_account_ledger.class.php:390
 msgid "Type"
 msgstr "Type"
 
 #: include/param_pcmn.inc.php:57 include/param_pcmn.inc.php:58
+#: include/class/contact_option_ref_mtable.class.php:37
 msgid "Type "
 msgstr "Type"
 
@@ -19735,6 +21250,7 @@ msgstr "Type"
 #: include/class/follow_up.class.php:1696
 #: include/class/follow_up.class.php:1694
 #: include/class/follow_up.class.php:1695
+#: include/class/follow_up.class.php:1643
 msgid "Type action invalide"
 msgstr "Invalid options"
 
@@ -19757,11 +21273,13 @@ msgstr "Type of document"
 #: include/template/new_mod_payment.php:28 include/payment_middle.inc.php:121
 #: include/payment_middle.inc.php:122
 #: include/class/payment_method_mtable.class.php:40
+#: include/class/payment_method_mtable.class.php:41
 msgid "Type de fiche"
 msgstr "Type of card"
 
 #: include/template/param_jrn.php:78 include/template/param_jrn.php:85
 #: include/template/param_jrn.php:6
+#: include/class/operation_predef_mtable.class.php:53
 msgid "Type de journal"
 msgstr "Type of ledgers"
 
@@ -19784,11 +21302,14 @@ msgstr "Type of tiers"
 #: include/lib/http_input.class.php:65 include/lib/http_input.class.php:73
 #: include/ajax/ajax_gestion.php:81 include/lib/http_input.class.php:62
 #: include/lib/http_input.class.php:72 include/lib/http_input.class.php:80
+#: include/lib/http_input.class.php:92 include/lib/http_input.class.php:106
+#: include/lib/http_input.class.php:118
 msgid "Type invalide"
 msgstr "Invalid type"
 
 #: include/operation_ods_confirm.inc.php:54
 #: include/template/ledger_detail_bottom.php:155
+#: include/template/ledger_detail_bottom.php:160
 msgid "Type opération"
 msgstr "Type of entry"
 
@@ -19823,6 +21344,7 @@ msgstr "Download all invoices"
 #: include/template/stock_summary_list.php:42 include/company.inc.php:118
 #: include/ext/sav/include/template/sas_display_detail.php:115
 #: include/ajax/ajax_mod_stock_repo.php:71 include/company.inc.php:122
+#: include/company.inc.php:130
 msgid "Téléphone"
 msgstr "Phone"
 
@@ -19838,6 +21360,10 @@ msgstr "A moment"
 msgid "Un instant svp"
 msgstr "A moment please"
 
+#: include/lettering.account.inc.php:139
+msgid "Un instant..."
+msgstr "A moment"
+
 #: include/class_acc_ledger.php:3410 include/class_acc_ledger.php:3480
 #: include/class_acc_ledger.php:3479 include/class_acc_ledger.php:3495
 #: include/class_acc_ledger.php:3512 include/class_acc_ledger.php:3539
@@ -19851,11 +21377,14 @@ msgstr "A moment please"
 #: include/class/acc_ledger.class.php:2318
 #: include/class/acc_ledger.class.php:2327
 #: include/class/acc_ledger.class.php:2349
+#: include/class/acc_ledger.class.php:2373
 msgid "Un journal avec ce nom existe déjà"
 msgstr "This name is already used"
 
 #: include/class/payment_method_mtable.class.php:68
 #: include/class/payment_method_mtable.class.php:92
+#: include/class/payment_method_mtable.class.php:69
+#: include/class/payment_method_mtable.class.php:93
 msgid "Un libellé est obligatoire"
 msgstr "mandatory label"
 
@@ -19878,12 +21407,17 @@ msgstr "Undefined PCMN TYPE for poste:"
 msgid "Unicode"
 msgstr "unicode"
 
+#: include/template/action_document_type_mtable_input.php:115
+msgid "Unique"
+msgstr "Uniq"
+
 #: include/param_sec.inc.php:279 include/param_sec.inc.php:221
-#: include/param_sec.inc.php:225
+#: include/param_sec.inc.php:225 include/param_sec.inc.php:263
 msgid "Uniquement Lecture"
 msgstr "Read only"
 
 #: include/template/tag_search_select.php:13
+#: include/template/tag_search_select.php:16
 msgid "Uniquement actif"
 msgstr "Only assets"
 
@@ -19903,6 +21437,10 @@ msgstr "Only not balanced accounting"
 msgid "Uniquement des chiffres"
 msgstr "Only digits"
 
+#: include/company.inc.php:120
+msgid "Uniquement des chiffres séparés par des virgules"
+msgstr "Only digits with comma"
+
 #: include/class_document_modele.php:259
 #: include/template/modele_document.php:48
 #: include/class/class_document_modele.php:259
@@ -19927,7 +21465,8 @@ msgstr "Only ledger of sales"
 
 #: include/param_sec.inc.php:285 include/param_sec.inc.php:227
 #: include/param_sec.inc.php:280 include/param_sec.inc.php:258
-#: include/param_sec.inc.php:337
+#: include/param_sec.inc.php:337 include/param_sec.inc.php:269
+#: include/param_sec.inc.php:352
 msgid "Uniquement lecture"
 msgstr "Read only"
 
@@ -19939,10 +21478,22 @@ msgstr "Only not balanced accounting"
 msgid "Uniquement les opérations non lettrées"
 msgstr "Only unlettered actions"
 
-#: include/template/param_jrn.php:93
+#: include/impress_jrn.inc.php:158
+msgid "Uniquement non payées"
+msgstr "Only unpaid"
+
+#: include/template/param_jrn.php:93 include/template/param_jrn.php:94
 msgid "Uniquement note de débit ou crédit"
 msgstr "Only credit note"
 
+#: include/impress_jrn.inc.php:157
+msgid "Uniquement payées"
+msgstr "Only paid"
+
+#: include/impress_jrn.inc.php:162
+msgid "Uniquement pour journaux vente et achat"
+msgstr "Only ledger of sales and purchase"
+
 #: include/template/param_jrn.php:21 include/template/param_jrn.php:28
 #: include/template/param_jrn.php:31
 msgid ""
@@ -19954,7 +21505,7 @@ msgstr ""
 "it is aussi possible to use * to show the depending accounting : example : 4*"
 
 #: include/lib/http_input.class.php:78 include/lib/http_input.class.php:85
-#: include/lib/http_input.class.php:87
+#: include/lib/http_input.class.php:87 include/lib/http_input.class.php:125
 msgid "Unknown type"
 msgstr "Unknown type"
 
@@ -19976,7 +21527,7 @@ msgstr "Users"
 
 #: html/install.php:594 html/install.php:586 html/install.php:592
 #: html/install.php:554 html/install.php:544 html/install.php:550
-#: html/install.php:553
+#: html/install.php:553 html/install.php:603
 msgid "Utilisateur  administrateur"
 msgstr "Administrator user"
 
@@ -19986,12 +21537,13 @@ msgid "Utilisateur : %s"
 msgstr "User %s"
 
 #: include/param_sec.inc.php:91 include/param_sec.inc.php:95
-#: include/param_sec.inc.php:97
+#: include/param_sec.inc.php:97 include/param_sec.inc.php:98
 msgid "Utilisateur Normal"
 msgstr "Users"
 
 #: html/admin/template_config_form.php:47
 #: include/template/template_config_form.php:47
+#: include/template/template_config_form.php:48
 msgid "Utilisateur Postgresql"
 msgstr "Postgresql users"
 
@@ -20001,6 +21553,7 @@ msgstr "Postgresql users"
 #: html/install.php:610 html/install.php:634 html/install.php:214
 #: html/install.php:600 html/install.php:626 html/install.php:607
 #: html/install.php:633 html/install.php:217 html/install.php:636
+#: html/install.php:264 html/install.php:660 html/install.php:689
 msgid "Utilisateur administrateur"
 msgstr "Administrator user"
 
@@ -20010,7 +21563,7 @@ msgstr "Postgresql user"
 
 #: html/admin/setup.php:77 html/admin/setup.php:80 html/admin/setup.php:131
 #: html/install.php:133 html/install.php:132 html/install.php:138
-#: html/install.php:145
+#: html/install.php:145 html/install.php:158
 msgid "Utilisateur de la base de donnée postgresql"
 msgstr "Postgresql user"
 
@@ -20024,7 +21577,7 @@ msgstr "Name of Postgresql user"
 #: include/lib/ac_common.php:959 include/lib/ac_common.php:970
 #: include/lib/ac_common.php:971 include/lib/ac_common.php:972
 #: include/lib/ac_common.php:984 include/lib/ac_common.php:986
-#: include/lib/ac_common.php:1002
+#: include/lib/ac_common.php:1002 include/lib/ac_common.php:1012
 msgid ""
 "Utilisateur n'a pas de profil, votre administrateur doit en configurer un "
 "dans CFGSEC"
@@ -20040,6 +21593,7 @@ msgstr "This user has no profile, contact your administrator"
 #: include/user_detail.inc.php:169 include/user_detail.inc.php:165
 #: include/user_detail.inc.php:174 include/param_sec.inc.php:147
 #: include/export/export_security_pdf.php:66 include/param_sec.inc.php:153
+#: include/param_sec.inc.php:158
 msgid "Utilisateur normal"
 msgstr "Users"
 
@@ -20052,6 +21606,7 @@ msgstr "User or password incorrect"
 #: include/lib/user_menu.php:116 include/lib/user_menu.php:129
 #: include/lib/user_menu.php:117 include/lib/user_menu.php:140
 #: include/lib/user_menu.php:74 include/lib/user_menu.php:97
+#: include/lib/user_menu.php:73 include/lib/user_menu.php:96
 msgid "Utilisateurs"
 msgstr "Users"
 
@@ -20059,20 +21614,22 @@ msgstr "Users"
 #: include/lib/user_menu.php:121 include/lib/user_menu.php:130
 #: include/lib/user_menu.php:122 include/lib/user_menu.php:141
 #: include/lib/user_menu.php:79 include/lib/user_menu.php:98
+#: include/lib/user_menu.php:78 include/lib/user_menu.php:97
 msgid "Utilisateurs qui se sont connectés"
 msgstr "Connected users"
 
 #: include/class/payment_method_mtable.class.php:42
+#: include/class/payment_method_mtable.class.php:43
 msgid "Utilisation dans"
 msgstr "Used in "
 
 #: include/company.inc.php:114 include/company.inc.php:133
-#: include/company.inc.php:137
+#: include/company.inc.php:137 include/company.inc.php:145
 msgid "Utilisation de la compta. analytique"
 msgstr "Use of the analytic accountancy"
 
 #: include/company.inc.php:115 include/company.inc.php:134
-#: include/company.inc.php:138
+#: include/company.inc.php:138 include/company.inc.php:152
 msgid "Utilisation des stocks"
 msgstr "Use of stocks"
 
@@ -20083,12 +21640,13 @@ msgstr "Direct use"
 
 #: include/class/acc_ledger.class.php:1150
 #: include/class/acc_ledger.class.php:1166
+#: include/class/acc_ledger.class.php:1162
 #, php-format
 msgid "Utilisation directe interdite du poste comptable %s"
 msgstr "Forbidden use of the accounting %s"
 
 #: include/company.inc.php:117 include/company.inc.php:136
-#: include/company.inc.php:140
+#: include/company.inc.php:140 include/company.inc.php:154
 msgid "Utilisation du mode strict "
 msgstr "Use of the strict mode"
 
@@ -20101,7 +21659,7 @@ msgid "Utiliser un modèle d'import"
 msgstr "Select a import template"
 
 #: include/company.inc.php:122 include/company.inc.php:141
-#: include/company.inc.php:145
+#: include/company.inc.php:145 include/company.inc.php:159
 msgid "Utilisez des postes comptables alphanumérique"
 msgstr "Use alphanumeric accountancy"
 
@@ -20110,6 +21668,7 @@ msgid "Utilitaire"
 msgstr "Utility"
 
 #: html/install.php:629 html/install.php:636 html/install.php:639
+#: html/install.php:692
 #, php-format
 msgid "VOUS DEVEZ EFFACER CE FICHIER %s"
 msgstr "You must delete this file %s"
@@ -20122,9 +21681,17 @@ msgstr "Accounting system"
 #: include/class/user.class.php:1379 include/class/user.class.php:1408
 #: include/class/acc_ledger.class.php:2365
 #: include/lib/input_switch.class.php:56
+#: include/class/acc_ledger.class.php:2399 include/class/user.class.php:1402
+#: include/class/user.class.php:1431 include/lib/input_switch.class.php:57
+#: include/lib/input_checkbox.class.php:65
 msgid "Valeur invalide"
 msgstr "Invalid value"
 
+#: include/class/noalyss_parameter_folder.class.php:70
+#, php-format
+msgid "Valeur invalide %s"
+msgstr "invalid values %s "
+
 #: include/ext/amortis/include/template/listing_year.php:75
 #: include/ext/amortis/include/template/listing_year.php:119
 msgid "Valeur net "
@@ -20201,6 +21768,8 @@ msgstr "Validate ?"
 #: include/class/acc_ledger_search.class.php:1121
 #: include/class/acc_ledger_search.class.php:1134
 #: include/ajax/ajax_preference.php:280
+#: include/class/acc_ledger_search.class.php:1223
+#: include/ajax/ajax_preference.php:283
 msgid "Valider"
 msgstr "Validate"
 
@@ -20249,13 +21818,16 @@ msgstr "Friday"
 #: include/cfgledger.inc.php:173 include/class/acc_ledger_search.class.php:1084
 #: include/class/acc_ledger_search.class.php:1097
 #: include/template/tax_summary_display.php:29 include/database.item.php:234
-#: include/database.item.php:253
+#: include/database.item.php:253 include/class/acc_ledger_search.class.php:1186
+#: include/class/operation_predef_mtable.class.php:176
+#: include/database.item.php:10 include/database.item.php:218
 msgid "Vente"
 msgstr "Sale"
 
 #: include/database.item.php:113 include/database.item.php:116
 #: include/database.item.php:122 include/database.item.php:119
 #: include/database.item.php:118 include/database.item.php:114
+#: include/database.item.php:115
 msgid "Vente / Recette"
 msgstr "Sales"
 
@@ -20266,7 +21838,7 @@ msgid "Ventes"
 msgstr "Sales"
 
 #: include/impress_bilan.inc.php:64 include/impress_bilan.inc.php:71
-#: include/impress_bilan.inc.php:78
+#: include/impress_bilan.inc.php:78 include/impress_bilan.inc.php:81
 msgid "Verification comptabilite"
 msgstr "Check accountancy"
 
@@ -20284,10 +21856,15 @@ msgstr "Noalyss version"
 msgid "Version PHP trop basse , minimum 5.4"
 msgstr "PHP version to low, minimum 5.4"
 
+#: html/install.php:356
+msgid "Version PHP trop basse , minimum 7.0.33"
+msgstr "PHP version to low, minimum 7.0.33"
+
 #: html/admin/setup.php:395 html/install.php:459 html/install.php:458
 #: html/install.php:456 html/install.php:462 html/install.php:454
 #: html/install.php:460 html/install.php:424 html/install.php:399
 #: html/install.php:405 html/install.php:408 scenario/180209.php:18
+#: html/install.php:457
 msgid "Version base de données :"
 msgstr "Postgresql version"
 
@@ -20307,7 +21884,7 @@ msgstr "Please reconnect"
 #: include/lib/ac_common.php:806 include/lib/ac_common.php:813
 #: include/lib/ac_common.php:824 include/lib/ac_common.php:825
 #: include/lib/ac_common.php:837 include/lib/ac_common.php:839
-#: include/lib/ac_common.php:855
+#: include/lib/ac_common.php:855 include/lib/ac_common.php:865
 msgid ""
 "Veuillez vous reconnecter soit dans une autre fenêtre soit  en cliquant sur "
 "le lien"
@@ -20351,10 +21928,19 @@ msgstr "Visible Y or N\n"
 #: include/balance.inc.php:183 include/balance.inc.php:195
 #: include/balance.inc.php:196 include/impress_jrn.inc.php:146
 #: include/impress_rapport.inc.php:286 include/balance.inc.php:199
-#: include/impress_jrn.inc.php:160
+#: include/impress_jrn.inc.php:160 include/impress_jrn.inc.php:174
 msgid "Visualisation"
 msgstr "View"
 
+#: html/install.php:260
+msgid ""
+"Voici l'utilisateur et mot de passe de l'utilisateur administrateur de "
+"Noalyss ,  il a tous les droits et a accès à tout. Connectez-vous avec ses "
+"identifiants et changer le mot de passe dans préférence (en haut à droit)"
+msgstr ""
+"Here are the default user for the web interface of Noalyss, he is "
+"administrator and has all privileges. Connect and change your password "
+
 #: html/install.php:214
 msgid ""
 "Voici l'utilisateur et mot de passe de l'utilisateur administrateur de "
@@ -20368,6 +21954,7 @@ msgstr ""
 #: include/database.item.php:214 include/database.item.php:191
 #: include/database.item.php:192 include/database.item.php:195
 #: include/database.item.php:206 include/database.item.php:211
+#: include/database.item.php:201
 msgid "Voir les documents du suivi"
 msgstr "See documents monitoring"
 
@@ -20391,6 +21978,12 @@ msgstr "Your request is being processed"
 msgid "Votre version est à jour"
 msgstr "Your database is  updated"
 
+#: include/class/acc_operation.class.php:769
+#: include/class/acc_operation.class.php:779
+#, php-format
+msgid "Voulez-vous aller à %s pour dupliquer cette opération ?"
+msgstr "Do you want to got to %s to duplication this operation"
+
 #: include/ext/backup_noadmin/include/template/home.php:3
 msgid "Voulez-vous avoir une copie de ce dossier"
 msgstr "Do you have a copy of this issue"
@@ -20404,6 +21997,7 @@ msgstr "Do you have a copy of this issue"
 #: include/template/detail-action.php:278
 #: include/template/detail-action.php:247
 #: include/template/detail-action.php:249
+#: include/template/detail-action.php:336
 #, php-format
 msgid "Voulez-vous effacer ce commentaire"
 msgstr "Do you want to delete this comment"
@@ -20433,6 +22027,8 @@ msgstr "Do you want to delete this action ?"
 #: include/class/follow_up.class.php:2017
 #: include/class/follow_up.class.php:1954
 #: include/class/follow_up.class.php:2018
+#: include/class/follow_up.class.php:1906
+#: include/class/follow_up.class.php:1971
 #, php-format
 msgid "Voulez-vous effacer cette action "
 msgstr "Do you want to delete this action"
@@ -20449,7 +22045,7 @@ msgstr "Do you want to delete this transaction"
 #: include/lib/class_html_input.php:946 include/lib/class_html_input.php:972
 #: include/lib/html_input.class.php:1025 include/lib/html_input.class.php:1083
 #: include/lib/html_input.class.php:1084 include/lib/html_input.class.php:1099
-#: include/lib/html_input.class.php:1100
+#: include/lib/html_input.class.php:1100 include/lib/html_input.class.php:1133
 #, php-format
 msgid "Voulez-vous effacer cette relation "
 msgstr "Do you want to delete this relation"
@@ -20464,6 +22060,7 @@ msgstr "Do you want to delete this relation"
 #: include/template/detail-action.php:438
 #: include/template/detail-action.php:442
 #: include/template/detail-action.php:440
+#: include/template/detail-action.php:453
 #, php-format
 msgid "Voulez-vous effacer le document"
 msgstr "Would you remove this Document"
@@ -20482,11 +22079,12 @@ msgstr "Do you want to delete this transaction"
 #: include/contact.inc.php:53 include/customer.inc.php:53
 #: include/manager.inc.php:56 include/supplier.inc.php:55
 #: include/adm.inc.php:51 include/customer.inc.php:54
+#: include/contact.inc.php:54
 msgid "Vous  ne pouvez pas enlever de fiche"
 msgstr "You can not remove a card"
 
 #: html/do.php:44 html/popup.php:38 html/popup.php:35 html/do.php:47
-#: html/do.php:48 html/popup.php:37
+#: html/do.php:48 html/popup.php:37 html/recherche.php:33
 msgid "Vous  êtes déconnecté"
 msgstr "You are disconnected"
 
@@ -20505,6 +22103,7 @@ msgstr "You have defined more than once in the same column"
 #: include/ajax/ajax_plugin_detail.php:32
 #: include/class/class_document_type.php:83 include/ajax/ajax_add_menu.php:137
 #: include/ajax/ajax_add_menu.php:145 include/class/document_type.class.php:83
+#: include/class/document_type.class.php:85
 msgid "Vous confirmez"
 msgstr "Do you confirm"
 
@@ -20539,7 +22138,7 @@ msgstr "Do you confirm the removal"
 #: include/action.common.inc.php:187 include/action.common.inc.php:207
 #: include/action.common.inc.php:208 include/action.common.inc.php:213
 #: include/action.common.inc.php:215 include/action.common.inc.php:216
-#: include/action.common.inc.php:222
+#: include/action.common.inc.php:222 include/action.common.inc.php:244
 msgid "Vous confirmez l\\'effacement"
 msgstr "Removing the Confirm?"
 
@@ -20579,7 +22178,7 @@ msgstr "You must choose by file or by calculation"
 
 #: html/admin/setup.php:81 html/admin/setup.php:84 html/admin/setup.php:135
 #: html/install.php:137 html/install.php:136 html/install.php:142
-#: html/install.php:149
+#: html/install.php:149 html/install.php:162
 msgid ""
 "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"
@@ -20616,13 +22215,14 @@ msgid "Vous devez donner un fichier"
 msgstr "You must give a card"
 
 #: include/compta_ven.inc.php:80 include/compta_ach.inc.php:72
+#: include/compta_ach.inc.php:71
 msgid "Vous devez encore confirmer"
 msgstr "You must  confirm"
 
 #: html/admin/setup.php:419 html/install.php:483 html/install.php:482
 #: html/install.php:480 html/install.php:486 html/install.php:478
 #: html/install.php:484 html/install.php:446 html/install.php:421
-#: html/install.php:427 html/install.php:430
+#: html/install.php:427 html/install.php:430 html/install.php:479
 msgid ""
 "Vous devez installer le langage plpgsql pour permettre aux fonctions SQL de "
 "fonctionner."
@@ -20631,7 +22231,7 @@ msgstr "You must install plpgsql "
 #: html/admin/setup.php:261 html/admin/setup.php:279 html/admin/setup.php:281
 #: html/install.php:345 html/install.php:344 html/install.php:342
 #: html/install.php:348 html/install.php:354 html/install.php:318
-#: html/install.php:327 html/install.php:330
+#: html/install.php:327 html/install.php:330 html/install.php:379
 msgid "Vous devez installer ou activer l'extension"
 msgstr "You must set or activate the plugin"
 
@@ -20650,6 +22250,7 @@ msgstr "You must tell if it is a template or a folder"
 
 #: include/class/pre_operation.class.php:285
 #: include/class/pre_operation.class.php:286
+#: include/class/pre_operation.class.php:343
 msgid "Vous n'avez encore sauvé aucun modèle"
 msgstr "You don't have template"
 
@@ -20669,6 +22270,7 @@ msgstr "You have not enter any customer"
 #: include/class_acc_ledger_purchase.php:84
 #: include/class/class_acc_ledger_purchase.php:84
 #: include/class/acc_ledger_purchase.class.php:84
+#: include/class/acc_ledger_purchase.class.php:86
 msgid "Vous n'avez pas donné de fournisseur"
 msgstr "You have not give Any supplier"
 
@@ -20690,6 +22292,7 @@ msgid "Vous n\\'êtes pas administrateur"
 msgstr "You are not an administrator"
 
 #: include/class/tva_rate_mtable.class.php:273
+#: include/class/tva_rate_mtable.class.php:290
 msgid ""
 "Vous ne pouvez pas effacer tous les taux. Si votre société n'utilise pas la "
 "TVA, changer dans le menu société"
@@ -20707,6 +22310,7 @@ msgid ""
 msgstr "You cannot use this ledger, contact your administrator"
 
 #: include/operation_ods_new.inc.php:43 include/operation_ods_new.inc.php:44
+#: include/operation_ods_new.inc.php:45
 msgid ""
 "Vous ne pouvez pas écrire dans ce journal, contactez votre administrateur"
 msgstr "You cannot use this ledger, contact your administrator"
@@ -20730,6 +22334,7 @@ msgstr "Let you add new type of documents "
 
 #: include/database.item.php:7 include/database.item.php:10
 #: include/database.item.php:4 include/database.item.php:2
+#: include/database.item.php:3
 msgid ""
 "Vous permet d'encoder des achats, dépenses, des notes de frais ou des notes "
 "de crédits, vous pouvez spécifier un bénéficiaire ou un autre moyen de "
@@ -20743,7 +22348,7 @@ msgstr ""
 msgid "Vous pouvez aussi copier ce profil et puis le corriger"
 msgstr "You could also copy and customize this profil"
 
-#: include/cfgtags.inc.php:51
+#: include/cfgtags.inc.php:51 include/cfgtags.inc.php:66
 msgid ""
 "Vous pouvez utiliser ceci comme des étiquettes pour marquer des documents "
 "ou \n"
@@ -20762,6 +22367,7 @@ msgstr "You can use the % to show the parent accounting"
 #: html/admin/setup.php:259 html/install.php:323 html/install.php:322
 #: html/install.php:320 html/install.php:326 html/install.php:332
 #: html/install.php:283 html/install.php:290 html/install.php:293
+#: html/install.php:342
 msgid "Vous utilisez le domaine"
 msgstr "You are using the domain"
 
@@ -20785,6 +22391,7 @@ msgstr "You&#39;re using the strict mod and the last entry is one"
 
 #: include/class/acc_ledger.class.php:1079
 #: include/class/acc_ledger.class.php:1095
+#: include/class/acc_ledger.class.php:1091
 #, php-format
 msgid ""
 "Vous utilisez le mode strict la dernière operation est la date du %s\n"
@@ -20803,6 +22410,7 @@ msgstr ""
 #: include/class/acc_ledger_fin.class.php:126
 #: include/class/acc_ledger_fin.class.php:210
 #: include/class/acc_ledger_purchase.class.php:119
+#: include/class/acc_ledger_purchase.class.php:121
 msgid "Vous utilisez le mode strict la dernière operation est à la date du "
 msgstr "You&#39;re using the strict accounting entry is the last one"
 
@@ -20818,20 +22426,28 @@ msgstr "You are disconnected"
 #: include/database.item.php:85 include/database.item.php:88
 #: include/database.item.php:93 include/database.item.php:90
 #: include/database.item.php:89 include/database.item.php:87
+#: include/database.item.php:86
 msgid "Vérification "
 msgstr "Verifying"
 
+#: include/template/ledger_detail_bottom.php:337
+msgid "Vérification CA"
+msgstr "Verify Analytic"
+
 #: include/database.item.php:85 include/database.item.php:88
 #: include/database.item.php:93 include/database.item.php:90
 #: include/database.item.php:89 include/database.item.php:87
+#: include/database.item.php:86
 msgid "Vérification de la comptabilité"
 msgstr "Verifying accountancy writing"
 
 #: include/verif_bilan.inc.php:84 include/verif_bilan.inc.php:111
+#: include/verif_bilan.inc.php:109
 msgid "Vérification des comptes"
 msgstr "Verifying accountancy"
 
 #: include/verif_bilan.inc.php:96 include/verif_bilan.inc.php:123
+#: include/verif_bilan.inc.php:121
 msgid "Vérification des fiches"
 msgstr "Verifying cards"
 
@@ -20841,6 +22457,7 @@ msgstr "Checking ledgers"
 
 #: include/database.item.php:90 include/database.item.php:93
 #: include/database.item.php:87 include/database.item.php:85
+#: include/database.item.php:86
 msgid ""
 "Vérifie que votre comptabilité ne contient pas d'erreur de base, tels que "
 "l'équilibre entre le passif et l'actif, l'utilisation des postes "
@@ -20857,6 +22474,7 @@ msgstr ""
 #: include/class/class_acc_ledger_sold.php:844
 #: include/class/acc_ledger_sold.class.php:867
 #: include/class/acc_ledger_sold.class.php:884
+#: include/class/acc_ledger_sold.class.php:888
 msgid "Vérifiez Imputation Analytique"
 msgstr "Verify analytic"
 
@@ -20872,6 +22490,7 @@ msgstr "Verify analytic"
 #: include/class/acc_ledger_purchase.class.php:1610
 #: include/class/acc_ledger_purchase.class.php:1627
 #: include/class/acc_ledger_purchase.class.php:1630
+#: include/class/acc_ledger_purchase.class.php:1643
 msgid "Vérifiez imputation analytique"
 msgstr "Verify analytic"
 
@@ -20880,6 +22499,7 @@ msgid "Y pour oui ou N pour non"
 msgstr "Y for yes or N for no"
 
 #: include/card_attr.inc.php:80 include/card_attr.inc.php:81
+#: include/class/card_attribut_mtable.class.php:56
 msgid "Zone de texte"
 msgstr "Text area"
 
@@ -20906,6 +22526,8 @@ msgstr "] Does not exist"
 #: include/class/acc_ledger_purchase.class.php:185
 #: include/class/acc_ledger_sold.class.php:176
 #: include/class/acc_ledger_sold.class.php:180
+#: include/class/acc_ledger_purchase.class.php:182
+#: include/class/acc_ledger_purchase.class.php:187
 msgid "a un code tva invalide"
 msgstr "Has an invalid VAT code"
 
@@ -20913,6 +22535,7 @@ msgstr "Has an invalid VAT code"
 #: include/class_acc_ledger_purchase.php:172
 #: include/class/class_acc_ledger_purchase.php:172
 #: include/class/acc_ledger_purchase.class.php:172
+#: include/class/acc_ledger_purchase.class.php:174
 msgid "a un montant invalide"
 msgstr "Has an invalid Amount"
 
@@ -20926,6 +22549,7 @@ msgstr "Has an invalid Amount"
 #: html/admin/setup.php:272 html/install.php:336 html/install.php:335
 #: html/install.php:333 html/install.php:339 html/install.php:345
 #: html/install.php:309 html/install.php:316 html/install.php:319
+#: html/install.php:368
 msgid "a une mauvaise valeur"
 msgstr "Has an invalid value"
 
@@ -20933,6 +22557,7 @@ msgstr "Has an invalid value"
 #: include/class_acc_ledger_purchase.php:174
 #: include/class/class_acc_ledger_purchase.php:174
 #: include/class/acc_ledger_purchase.class.php:174
+#: include/class/acc_ledger_purchase.class.php:176
 msgid "a une quantité invalide"
 msgstr "Has an invalid quantity"
 
@@ -20969,6 +22594,10 @@ msgstr "Accounting / Activity"
 msgid "appel incorrect"
 msgstr "Incorrect call"
 
+#: include/template/letter_all.php:53
+msgid "aucun lettrage"
+msgstr "no lettering"
+
 #: include/class_anc_grandlivre.php:136 include/class_anc_grandlivre.php:250
 #: include/class_anc_listing.php:77 include/class_anc_grandlivre.php:295
 #: include/ext/tools/include/class_anc_grandlivre_ext.php:96
@@ -20976,6 +22605,11 @@ msgstr "Incorrect call"
 msgid "aucune donnée"
 msgstr "no data"
 
+#: include/export/export_balance_csv.php:85
+#, php-format
+msgid "balance du %s au %s"
+msgstr "total between%s  and %s"
+
 #: include/lib/database_core.class.php:64
 #, php-format
 msgid "base de donnée  = %s"
@@ -20990,6 +22624,7 @@ msgid "calculé"
 msgstr "Computed"
 
 #: include/lib/inplace_edit.class.php:80 include/lib/inplace_edit.class.php:79
+#: include/lib/inplace_edit.class.php:82
 msgid "cancel"
 msgstr "Cancel"
 
@@ -20998,10 +22633,11 @@ msgstr "Cancel"
 #: include/class/class_acc_ledger_purchase.php:244
 #: include/class/acc_ledger_purchase.class.php:244
 #: include/class/acc_ledger_purchase.class.php:243
+#: include/class/acc_ledger_purchase.class.php:245
 msgid "ce code n'a pas de poste comptable, créez ce poste : ["
 msgstr "This Code Has No accounting, please create it ["
 
-#: include/class/document.class.php:1293
+#: include/class/document.class.php:1293 include/class/document.class.php:1576
 #, php-format
 msgid "chaine à remplacer [%s] contient un caractère interdit"
 msgstr "String to remplace [%s] contains a forbidden character"
@@ -21023,6 +22659,8 @@ msgstr "Choose"
 #: include/lib/html_input.class.php:1017 include/lib/html_input.class.php:1018
 #: include/class/acc_ledger_search.class.php:112
 #: include/lib/html_input.class.php:1033 include/lib/html_input.class.php:1034
+#: include/class/acc_ledger_search.class.php:114
+#: include/lib/html_input.class.php:1067
 msgid "choix des journaux"
 msgstr "Ledgers"
 
@@ -21040,6 +22678,7 @@ msgstr "Ledgers"
 #: include/class/acc_ledger.class.php:2483
 #: include/class/acc_ledger.class.php:2492
 #: include/class/acc_ledger.class.php:2523
+#: include/class/acc_ledger.class.php:2553
 msgid "choix du type de journal"
 msgstr "Select the type of ledger"
 
@@ -21064,7 +22703,7 @@ msgstr "Click here to update "
 #: include/class/pdf_operation.class.php:194
 #: include/class/pdf_operation.class.php:247 html/ajax_misc.php:456
 #: html/ajax_misc.php:458 html/ajax_misc.php:464 html/ajax_misc.php:466
-#: html/ajax_misc.php:470
+#: html/ajax_misc.php:470 html/ajax_misc.php:435
 msgid "code"
 msgstr "code"
 
@@ -21087,12 +22726,14 @@ msgstr "zip  code"
 #: include/export/export_ledger_csv.php:213
 #: include/export/export_ledger_csv.php:215
 #: include/export/export_ledger_csv.php:223
+#: include/export/export_ledger_csv.php:231
 msgid "commentaire"
 msgstr "Comment"
 
 #: include/database.item.php:89 include/database.item.php:92
 #: include/database.item.php:97 include/database.item.php:94
 #: include/database.item.php:93 include/database.item.php:91
+#: include/database.item.php:90
 msgid "configuration de la sécurité"
 msgstr "Security Configuration"
 
@@ -21111,6 +22752,7 @@ msgstr "Credit"
 #: include/database.item.php:212 include/database.item.php:189
 #: include/database.item.php:190 include/database.item.php:193
 #: include/database.item.php:204 include/database.item.php:209
+#: include/database.item.php:199
 msgid "création, modification et effacement de catégorie de fiche"
 msgstr "creation, modification and deletion of category record"
 
@@ -21149,6 +22791,7 @@ msgstr "delete_param : fail"
 #: include/template/ledger_detail_bottom.php:200
 #: include/template/ledger_detail_bottom.php:217
 #: include/template/ledger_detail_bottom.php:214
+#: include/template/ledger_detail_bottom.php:232
 msgid "delta"
 msgstr "Delta"
 
@@ -21161,6 +22804,7 @@ msgstr "Difference"
 #: include/class/follow_up.class.php:1950
 #: include/class/follow_up.class.php:1948
 #: include/class/follow_up.class.php:1949
+#: include/class/follow_up.class.php:1901
 msgid "direct parent "
 msgstr "Direct Parent"
 
@@ -21251,6 +22895,7 @@ msgstr "Between 61 and 90 days"
 #: include/template/ledger_detail_bottom.php:355
 #: include/template/ledger_detail_bottom.php:352
 #: include/ajax/ajax_ledger.php:545
+#: include/template/ledger_detail_bottom.php:380
 msgid "entrez une date"
 msgstr "Give a date"
 
@@ -21273,6 +22918,8 @@ msgstr "Error:"
 #: include/class/acc_bilan.class.php:706 include/class/acc_bilan.class.php:688
 #: include/class/acc_bilan.class.php:711 include/class/acc_bilan.class.php:374
 #: include/class/acc_bilan.class.php:690 include/class/acc_bilan.class.php:713
+#: include/class/acc_bilan.class.php:375 include/class/acc_bilan.class.php:695
+#: include/class/acc_bilan.class.php:718
 msgid "erreur Ouverture fichier"
 msgstr "Error opening file"
 
@@ -21284,6 +22931,7 @@ msgstr "Error opening file"
 #: include/ajax/ajax_history.php:58 include/ajax/ajax_history.php:141
 #: include/ajax/ajax_history.php:61 include/ajax/ajax_history.php:146
 #: include/ajax/ajax_history.php:147 include/ajax/ajax_history.php:148
+#: include/balance_card.inc.php:37
 msgid ""
 "erreur aucune période par défaut, allez dans préférence pour en choisir une"
 msgstr "Warning : no default period, choose one in your preference"
@@ -21293,6 +22941,7 @@ msgstr "Warning : no default period, choose one in your preference"
 #: include/class/class_acc_bilan.php:668 include/class/class_acc_bilan.php:685
 #: include/class/acc_bilan.class.php:686 include/class/acc_bilan.class.php:689
 #: include/class/acc_bilan.class.php:694 include/class/acc_bilan.class.php:696
+#: include/class/acc_bilan.class.php:701
 msgid "erreur écriture fichier"
 msgstr "Error writing file"
 
@@ -21312,6 +22961,7 @@ msgstr "Accessed is, first disconnect"
 #: include/template/ledger_search.php:25 include/template/ledger_search.php:33
 #: include/template/ledger_search.php:51 include/template/ledger_search.php:26
 #: include/template/ledger_search.php:35 include/template/ledger_search.php:54
+#: include/template/ledger_search.php:56
 msgid "et"
 msgstr "and"
 
@@ -21332,10 +22982,12 @@ msgstr ""
 #: include/ajax/ajax_mod_periode.php:60 include/ajax/ajax_mod_periode.php:78
 #: include/ajax/ajax_periode.php:176 include/class/periode.class.php:707
 #: include/class/periode.class.php:709 include/class/periode.class.php:711
+#: include/class/periode.class.php:712
 msgid "fermer"
 msgstr "close"
 
 #: include/export/export_fiche_csv.php:36
+#: include/export/export_fiche_csv.php:37
 msgid "fiche"
 msgstr "Card"
 
@@ -21352,6 +23004,10 @@ msgstr "card-balance"
 msgid "fiche_"
 msgstr "Card"
 
+#: include/ajax/ajax_card.php:430
+msgid "fiches inactives"
+msgstr "Disabled cards"
+
 #: include/ext/import_account/include/class_import_card.php:242
 msgid "fiches sont insérées dans la catégorie"
 msgstr "plugs are inserted in the category"
@@ -21380,6 +23036,8 @@ msgstr "Current file"
 #: include/class/acc_ledger.class.php:1496
 #: include/class/acc_ledger.class.php:1495
 #: include/class/acc_ledger.class.php:1512
+#: include/class/acc_ledger.class.php:1485
+#: include/class/acc_ledger.class.php:1502
 msgid "get_default_card p_ledger_side is invalide ["
 msgstr "get_default_card p_ledger_side is invalide ["
 
@@ -21414,11 +23072,12 @@ msgstr "id"
 #: include/class_fiche.php:557 include/class/class_fiche.php:557
 #: include/class/class_fiche.php:558 include/class/fiche.class.php:564
 #: include/class/fiche.class.php:566 include/class/fiche.class.php:565
+#: include/class/fiche.class.php:578
 msgid "id fiche"
 msgstr "card id"
 
 #: include/param_sec.inc.php:324 include/param_sec.inc.php:264
-#: include/param_sec.inc.php:321
+#: include/param_sec.inc.php:321 include/param_sec.inc.php:336
 msgid "imprime"
 msgstr "Print"
 
@@ -21441,6 +23100,8 @@ msgstr "inexistent"
 #: include/export/export_ledger_csv.php:216
 #: include/export/export_ledger_csv.php:224
 #: include/class/acc_ledger_history_generic.class.php:685
+#: include/class/acc_ledger_history_generic.class.php:686
+#: include/export/export_ledger_csv.php:232
 msgid "internal"
 msgstr "Internal"
 
@@ -21455,6 +23116,8 @@ msgstr "Internal"
 #: include/class/acc_ledger_history_sale.class.php:248
 #: include/class/acc_ledger_history_purchase.class.php:255
 #: include/class/acc_ledger_history_purchase.class.php:259
+#: include/class/acc_ledger_history_sale.class.php:258
+#: include/class/acc_ledger_history_purchase.class.php:270
 msgid "interne"
 msgstr "Internal"
 
@@ -21464,6 +23127,8 @@ msgstr "Internal"
 #: include/class/acc_ledger_history.class.php:122
 #: include/class/acc_ledger_history.class.php:110
 #: include/class/acc_ledger_history.class.php:123
+#: include/class/acc_ledger_history.class.php:138
+#: include/class/acc_ledger_history.class.php:151
 msgid "invalid parameter"
 msgstr "invalid parameter"
 
@@ -21483,6 +23148,10 @@ msgstr "invalid parameter"
 #: include/class/acc_ledger_history_purchase.class.php:240
 #: include/class/acc_ledger_history_purchase.class.php:244
 #: include/class/acc_ledger_history_generic.class.php:762
+#: include/class/acc_ledger_history_sale.class.php:243
+#: include/class/acc_ledger_history_purchase.class.php:255
+#: include/class/acc_ledger_history_generic.class.php:763
+#: include/export/export_ledger_csv.php:49
 msgid "journal"
 msgstr "Ledger"
 
@@ -21494,6 +23163,7 @@ msgstr "Unknown ledger"
 #: include/database.item.php:88 include/database.item.php:91
 #: include/database.item.php:96 include/database.item.php:93
 #: include/database.item.php:92 include/database.item.php:90
+#: include/database.item.php:89
 msgid "journaux"
 msgstr "ledgers"
 
@@ -21529,10 +23199,15 @@ msgstr "Label"
 msgid "latin1"
 msgstr "Latin"
 
+#: include/class/document.class.php:1229
+#, php-format
+msgid "le %s , %s écrit %s"
+msgstr "on %s , %s wrote %s "
+
 #: include/class_acc_bilan.php:249 include/class_acc_bilan.php:250
 #: include/class/class_acc_bilan.php:250 include/class/class_acc_bilan.php:266
 #: include/class/acc_bilan.class.php:266 include/class/acc_bilan.class.php:269
-#: include/class/acc_bilan.class.php:271
+#: include/class/acc_bilan.class.php:271 include/class/acc_bilan.class.php:272
 msgid "le formulaire id n'est pas donnee"
 msgstr "Form id not found"
 
@@ -21605,6 +23280,14 @@ msgstr "label"
 msgid "libellé"
 msgstr "Label"
 
+#: include/class/html_input_noalyss.class.php:56
+msgid "ligne à ajouter"
+msgstr "Row to add"
+
+#: include/ajax/ajax_add_concerned_card.php:71
+msgid "limité aux champs "
+msgstr "Limited to the attributes "
+
 #: include/ext/transform/include/template/listing_assujetti_representative.php:66
 msgid "listing id"
 msgstr "listing id"
@@ -21613,10 +23296,14 @@ msgstr "listing id"
 msgid "login"
 msgstr "login"
 
+#: html/install.php:165
+msgid "login administrateur"
+msgstr "Administrator"
+
 #: html/admin/setup.php:329 html/admin/setup.php:347 html/admin/setup.php:349
 #: html/install.php:413 html/install.php:412 html/install.php:410
 #: html/install.php:416 html/install.php:422 html/install.php:386
-#: html/install.php:353 html/install.php:356
+#: html/install.php:353 html/install.php:356 html/install.php:405
 msgid "max_execution_time devrait être de 60 minimum"
 msgstr "max_execution_time should be more than 60 "
 
@@ -21642,6 +23329,9 @@ msgstr "max_execution_time should be more than 60 "
 #: include/export/export_ledger_csv.php:217
 #: include/export/export_ledger_csv.php:225
 #: include/template/ledger_detail_bottom.php:213
+#: include/ajax/ajax_display_letter.php:69
+#: include/export/export_ledger_csv.php:233
+#: include/template/ledger_detail_bottom.php:231
 msgid "montant"
 msgstr "Amount"
 
@@ -21662,6 +23352,8 @@ msgstr "Amount"
 #: include/class/acc_ledger_sold.class.php:129
 #: include/class/acc_ledger_sold.class.php:171
 #: include/class/acc_ledger_purchase.class.php:200
+#: include/class/acc_ledger_purchase.class.php:132
+#: include/class/acc_ledger_purchase.class.php:202
 msgid "n'a pas de poste comptable"
 msgstr "Has No accounting entry"
 
@@ -21682,6 +23374,8 @@ msgstr "Has No accounting entry"
 #: include/class/acc_ledger_sold.class.php:152
 #: include/class/acc_ledger_sold.class.php:210
 #: include/class/acc_ledger_purchase.class.php:225
+#: include/class/acc_ledger_purchase.class.php:157
+#: include/class/acc_ledger_purchase.class.php:227
 msgid "n'est pas accessible à ce journal"
 msgstr "is not allowed for this ledger"
 
@@ -21710,24 +23404,34 @@ msgstr "Does not belong to this ledger"
 #: include/class/acc_ledger_purchase.class.php:220
 #: include/class/acc_ledger_sold.class.php:204
 #: include/class/acc_ledger_purchase.class.php:219
+#: include/class/acc_ledger_purchase.class.php:151
+#: include/class/acc_ledger_purchase.class.php:221
 msgid "n'existe pas"
 msgstr "does not exist"
 
 #: include/class/periode.class.php:520 include/class/periode.class.php:522
-#: include/class/periode.class.php:524
+#: include/class/periode.class.php:524 include/class/periode.class.php:525
 msgid "nb opérations"
 msgstr "Number of entries"
 
+#: include/export/export_balance_pdf.php:186
+#: include/export/export_balance_pdf.php:192
+#, php-format
+msgid "niveau %s"
+msgstr "Level %s"
+
 #: include/class/class_acc_reconciliation.php:470
 #: include/class/acc_reconciliation.class.php:495
 msgid "nom journal"
 msgstr "Name of the ledger"
 
 #: include/template/tag_search_select.php:45
+#: include/template/tag_search_select.php:48
 msgid "non actif"
 msgstr "Not asset"
 
 #: include/lib/manage_table_sql.class.php:965
+#: include/lib/manage_table_sql.class.php:1020
 msgid "non implémenté"
 msgstr "Not implemented"
 
@@ -21741,11 +23445,12 @@ msgid "non permis"
 msgstr "Not allowed"
 
 #: include/company.inc.php:37 include/company.inc.php:56
-#: include/company.inc.php:60
+#: include/company.inc.php:60 include/company.inc.php:64
 msgid "non utilisé"
 msgstr "not used"
 
 #: include/template/document_mod_change.php:56
+#: include/template/action_document_type_mtable_input.php:39
 msgid "numéro actuel"
 msgstr "current issue"
 
@@ -21778,6 +23483,7 @@ msgstr "No Room"
 
 #: include/class/acc_account_ledger.class.php:392
 #: include/class/acc_account_ledger.class.php:393
+#: include/class/acc_account_ledger.class.php:385
 msgid "n° de pièce"
 msgstr "receipt #"
 
@@ -21786,7 +23492,7 @@ msgstr "receipt #"
 #: include/class/class_fiche.php:1231 include/class/class_fiche.php:1234
 #: include/class/fiche.class.php:1378 include/class/fiche.class.php:1379
 #: include/class/fiche.class.php:1381 include/class/fiche.class.php:1395
-#: include/class/fiche.class.php:1396
+#: include/class/fiche.class.php:1396 include/class/fiche.class.php:1423
 msgid "n° de pièce / Code interne"
 msgstr "Internal code"
 
@@ -21802,6 +23508,7 @@ msgstr "Internal code"
 #: include/class/acc_ledger_search.class.php:681
 #: include/class/acc_ledger_search.class.php:699
 #: include/class/acc_ledger_fin.class.php:753
+#: include/class/acc_ledger_search.class.php:785
 msgid "n° interne"
 msgstr "internal code"
 
@@ -21811,6 +23518,8 @@ msgstr "No online"
 
 #: include/class/acc_ledger_history_purchase.class.php:280
 #: include/class/acc_ledger_history_sale.class.php:266
+#: include/class/acc_ledger_history_sale.class.php:276
+#: include/class/acc_ledger_history_purchase.class.php:292
 msgid "n° opération"
 msgstr "No operation"
 
@@ -21829,15 +23538,18 @@ msgstr "No operation"
 #: include/class/acc_ledger_history_generic.class.php:681
 #: include/class/fiche.class.php:1473
 #: include/class/acc_ledger_history_generic.class.php:684
+#: include/class/fiche.class.php:1500
+#: include/class/acc_ledger_history_generic.class.php:685
 msgid "n° pièce"
 msgstr "receipt #"
 
 #: include/company.inc.php:35 include/company.inc.php:54
-#: include/company.inc.php:58
+#: include/company.inc.php:58 include/company.inc.php:62
 msgid "obligatoire"
 msgstr "mandatory"
 
 #: include/lib/inplace_edit.class.php:79 include/lib/inplace_edit.class.php:78
+#: include/lib/inplace_edit.class.php:81
 msgid "ok"
 msgstr "ok"
 
@@ -21847,7 +23559,7 @@ msgstr "ok"
 msgid "op. concernée"
 msgstr "Concerned op"
 
-#: html/install.php:370 html/install.php:373
+#: html/install.php:370 html/install.php:373 html/install.php:422
 msgid "open_basedir empêche certaines fonctions de Noalyss,mettez-le à vide "
 msgstr "open_basedir must be empty or set properly"
 
@@ -21872,11 +23584,15 @@ msgstr "open_basedir must be empty or set properly"
 #: include/export/export_ledger_csv.php:218
 #: include/class/acc_ledger_history_purchase.class.php:255
 #: include/class/acc_ledger_history_generic.class.php:767
+#: include/class/acc_ledger_history_sale.class.php:254
+#: include/class/acc_ledger_history_purchase.class.php:266
+#: include/class/acc_ledger_history_generic.class.php:768
+#: include/export/export_ledger_csv.php:226
 msgid "operation"
 msgstr "Operation"
 
 #: include/company.inc.php:36 include/company.inc.php:55
-#: include/company.inc.php:59
+#: include/company.inc.php:59 include/company.inc.php:63
 msgid "optionnel"
 msgstr "optional"
 
@@ -21886,6 +23602,7 @@ msgstr "Entry"
 
 #: include/class/fiche.class.php:1047 include/class/fiche.class.php:1049
 #: include/class/fiche.class.php:1063 include/class/fiche.class.php:1064
+#: include/class/fiche.class.php:1091
 msgid "opération annulée"
 msgstr "Entry canceled"
 
@@ -21938,6 +23655,7 @@ msgstr "or QuickCode"
 #: include/class/acc_ledger_purchase.class.php:1729
 #: include/class/acc_ledger_purchase.class.php:1732
 #: include/class/acc_ledger_purchase.class.php:1738
+#: include/class/acc_ledger_purchase.class.php:1762
 msgid "ou générer un document"
 msgstr "or generate a paper"
 
@@ -21950,12 +23668,14 @@ msgstr "or generate a paper"
 #: include/class/acc_ledger_sold.class.php:966
 #: include/class/acc_ledger_sold.class.php:983
 #: include/class/acc_ledger_sold.class.php:992
+#: include/class/acc_ledger_sold.class.php:996
 msgid "ou générer une facture"
 msgstr "or generate an invoice"
 
 #: include/class/acc_ledger_history.class.php:46
 #: include/class/acc_ledger_history.class.php:47
 #: include/class/acc_ledger_history.class.php:48
+#: include/class/acc_ledger_history.class.php:59
 msgid "pa_ledger doit être un tableau"
 msgstr "pa_ledger must be an array"
 
@@ -21966,6 +23686,7 @@ msgstr "For example, do not change customer by supplier"
 
 #: include/lib/ac_common.php:567 include/lib/ac_common.php:568
 #: include/lib/ac_common.php:570 include/lib/ac_common.php:586
+#: include/lib/ac_common.php:596
 msgid "paramètre invalide"
 msgstr "Invalid parameter"
 
@@ -21991,7 +23712,7 @@ msgstr "php is not  properly configured"
 #: html/admin/setup.php:375 html/install.php:439 html/install.php:438
 #: html/install.php:436 html/install.php:442 html/install.php:434
 #: html/install.php:440 html/install.php:404 html/install.php:379
-#: html/install.php:382
+#: html/install.php:382 html/install.php:431
 msgid "php mal configuré "
 msgstr "php is not  properly configured"
 
@@ -22002,7 +23723,7 @@ msgstr "php.ini corretly configured"
 #: html/admin/setup.php:373 html/install.php:437 html/install.php:436
 #: html/install.php:434 html/install.php:440 html/install.php:432
 #: html/install.php:438 html/install.php:402 html/install.php:377
-#: html/install.php:380
+#: html/install.php:380 html/install.php:429
 msgid "php.ini est bien configuré "
 msgstr "php.ini corretly configured"
 
@@ -22047,6 +23768,7 @@ msgstr "Accounting / Activity"
 #: include/class/acc_ledger_history_purchase.class.php:256
 #: include/class/acc_ledger_history_purchase.class.php:257
 #: include/class/acc_ledger_history_purchase.class.php:261
+#: include/class/acc_ledger_history_purchase.class.php:272
 msgid "privé"
 msgstr "Private"
 
@@ -22068,6 +23790,8 @@ msgstr "Private"
 #: include/class/acc_ledger_purchase.class.php:1439
 #: include/class/acc_ledger_sold.class.php:720
 #: include/class/acc_ledger_purchase.class.php:1442
+#: include/class/acc_ledger_purchase.class.php:1453
+#: include/class/acc_ledger_sold.class.php:723
 msgid "prix"
 msgstr "price"
 
@@ -22081,6 +23805,8 @@ msgstr "price"
 #: include/template/detail-action.php:314
 #: include/template/detail-action.php:318
 #: include/template/detail-action.php:317
+#: include/template/follow_up_detail_display.php:52
+#: include/template/newEmptyPHP_NOALYSS.php:37
 msgid "prix unitaire"
 msgstr "Price unit"
 
@@ -22088,6 +23814,7 @@ msgstr "Price unit"
 #: include/template/predf_ledger_detail.php:26
 #: include/template/form_ledger_detail.php:77
 #: include/template/form_ledger_detail.php:81
+#: include/template/form_ledger_detail.php:84
 msgid "prix/unité "
 msgstr "price / unit"
 
@@ -22095,14 +23822,15 @@ msgstr "price / unit"
 #: include/template/predf_ledger_detail.php:19
 #: include/template/form_ledger_detail.php:70
 #: include/template/form_ledger_detail.php:74
+#: include/template/form_ledger_detail.php:77
 msgid "prix/unité htva"
 msgstr "price / unit without vat"
 
-#: include/param_sec.inc.php:86
+#: include/param_sec.inc.php:86 include/param_sec.inc.php:87
 msgid "profil"
 msgstr "Profile"
 
-#: include/param_sec.inc.php:85
+#: include/param_sec.inc.php:85 include/param_sec.inc.php:86
 msgid "prénom"
 msgstr "First Name"
 
@@ -22113,6 +23841,7 @@ msgstr "period between% s [% s] and [% s]"
 
 #: include/ext/amortis/raw.php:100 include/export/export_histo_csv.php:41
 #: include/export/export_histo_csv.php:42
+#: include/export/export_histo_csv.php:45
 msgid "qcode"
 msgstr "QCode"
 
@@ -22176,6 +23905,13 @@ msgstr "QCode"
 #: include/class/acc_ledger_purchase.class.php:1849
 #: include/class/acc_ledger_sold.class.php:1429
 #: include/class/acc_ledger_purchase.class.php:1855
+#: include/class/acc_ledger_purchase.class.php:1454
+#: include/class/acc_ledger_purchase.class.php:1892
+#: include/class/acc_ledger_sold.class.php:724
+#: include/class/acc_ledger_sold.class.php:1414
+#: include/template/follow_up_detail_display.php:53
+#: include/template/form_ledger_detail.php:85
+#: include/template/newEmptyPHP_NOALYSS.php:38
 msgid "quantité"
 msgstr "quantity"
 
@@ -22200,9 +23936,14 @@ msgstr "Reconciliation"
 #: include/contact.inc.php:98 include/manager.inc.php:105
 #: include/template/action_search.php:152 include/customer.inc.php:103
 #: include/template/action_search.php:148 scenario/select-box-test.php:62
+#: include/template/action_search.php:161 include/contact.inc.php:99
 msgid "recherche"
 msgstr "Search"
 
+#: include/template/card_multiple_result.php:10
+msgid "recherche rapide"
+msgstr "Search"
+
 #: include/export_fiche_balance_csv.php:140 include/fiche.inc.php:438
 #: include/fiche.inc.php:443 include/fiche.inc.php:445
 #: include/fiche.inc.php:513 include/fiche.inc.php:516
@@ -22210,13 +23951,15 @@ msgstr "Search"
 #: include/export/export_fiche_balance_csv.php:153
 #: include/export/export_fiche_balance_csv.php:154 include/fiche.inc.php:517
 #: include/fiche.inc.php:519 include/fiche.inc.php:528
-#: include/class/print_ledger_simple.class.php:101
+#: include/class/print_ledger_simple.class.php:101 include/fiche.inc.php:541
+#: include/class/print_ledger_simple.class.php:98
 msgid "ref"
 msgstr "Ref"
 
 #: html/admin/setup.php:357 html/install.php:421 html/install.php:420
 #: html/install.php:418 html/install.php:424 html/install.php:430
 #: html/install.php:394 html/install.php:361 html/install.php:364
+#: html/install.php:413
 msgid "register_globals doit être à off"
 msgstr "register_globals must be set to off"
 
@@ -22227,6 +23970,7 @@ msgid "report"
 msgstr "Reporting"
 
 #: include/param_sec.inc.php:135 include/param_sec.inc.php:141
+#: include/category_followup.inc.php:50 include/param_sec.inc.php:146
 msgid "retour"
 msgstr "Return"
 
@@ -22243,9 +23987,14 @@ msgstr "new line"
 #: include/ajax_mod_periode.php:59 include/ajax/ajax_mod_periode.php:59
 #: include/ajax/ajax_periode.php:175 include/class/periode.class.php:706
 #: include/class/periode.class.php:708 include/class/periode.class.php:710
+#: include/class/periode.class.php:711
 msgid "sauver"
 msgstr "Save"
 
+#: include/lib/iconcerned.class.php:99
+msgid "setSingleOperation failed"
+msgstr "setSingleOperation failed"
+
 #: include/fiche_def.inc.php:69
 #: include/class/template_card_category.class.php:105
 msgid ""
@@ -22258,7 +24007,7 @@ msgstr ""
 #: html/admin/setup.php:539 html/install.php:603 html/install.php:604
 #: html/install.php:611 html/install.php:627 html/install.php:619
 #: html/install.php:625 html/install.php:587 html/install.php:577
-#: html/install.php:583 html/install.php:586
+#: html/install.php:583 html/install.php:586 html/install.php:636
 msgid ""
 "soit noalyss/contrib/mono-dossier/mono-belge.sql pour la comptabilité belge"
 msgstr "or noalyss/contrib/mono-dossier/mono-belge.sql for belgian accountancy"
@@ -22266,7 +24015,7 @@ msgstr "or noalyss/contrib/mono-dossier/mono-belge.sql for belgian accountancy"
 #: html/admin/setup.php:538 html/install.php:602 html/install.php:603
 #: html/install.php:610 html/install.php:626 html/install.php:618
 #: html/install.php:624 html/install.php:586 html/install.php:576
-#: html/install.php:582 html/install.php:585
+#: html/install.php:582 html/install.php:585 html/install.php:635
 msgid ""
 "soit noalyss/contrib/mono-dossier/mono-france.sql pour la comptabilité "
 "française"
@@ -22275,16 +24024,17 @@ msgstr "or noalyss/contrib/mono-dossier/mono-france.sql for french accountancy"
 #: html/admin/setup.php:540 html/install.php:604 html/install.php:605
 #: html/install.php:612 html/install.php:628 html/install.php:620
 #: html/install.php:626 html/install.php:588 html/install.php:578
-#: html/install.php:584 html/install.php:587
+#: html/install.php:584 html/install.php:587 html/install.php:637
 msgid "soit y restaurer un backup ou un modèle"
 msgstr "or restore un backup or a template"
 
 #: include/export/export_fiche_balance_csv.php:57 include/fiche.inc.php:587
-#: include/fiche.inc.php:596
+#: include/fiche.inc.php:596 include/fiche.inc.php:609
 msgid "solde"
 msgstr "Balance"
 
 #: include/fiche.inc.php:592 include/fiche.inc.php:601
+#: include/fiche.inc.php:614
 msgid "solde crediteur"
 msgstr "Total credit"
 
@@ -22298,12 +24048,15 @@ msgstr "Total credit"
 #: include/class/fiche.class.php:1407 include/class/fiche.class.php:1536
 #: include/class/fiche.class.php:1421 include/class/fiche.class.php:1552
 #: include/class/fiche.class.php:1422 include/class/fiche.class.php:1553
+#: include/class/fiche.class.php:1449 include/class/fiche.class.php:1579
+#: include/class/acc_account_ledger.class.php:467
 msgid "solde créditeur"
 msgstr "Total credit"
 
 #: include/class/acc_ledger_history_generic.class.php:668
 #: include/class/acc_ledger_history_generic.class.php:669
 #: include/class/acc_ledger_history_generic.class.php:672
+#: include/class/acc_ledger_history_generic.class.php:673
 msgid "solde créditeur:"
 msgstr "Sum credit"
 
@@ -22318,12 +24071,16 @@ msgstr "Sum credit"
 #: include/fiche.inc.php:590 include/class/fiche.class.php:1421
 #: include/class/fiche.class.php:1552 include/fiche.inc.php:599
 #: include/class/fiche.class.php:1422 include/class/fiche.class.php:1553
+#: include/fiche.inc.php:612 include/class/fiche.class.php:1449
+#: include/class/fiche.class.php:1579
+#: include/class/acc_account_ledger.class.php:467
 msgid "solde débiteur"
 msgstr "Total debit"
 
 #: include/class/acc_ledger_history_generic.class.php:667
 #: include/class/acc_ledger_history_generic.class.php:668
 #: include/class/acc_ledger_history_generic.class.php:671
+#: include/class/acc_ledger_history_generic.class.php:672
 msgid "solde débiteur:"
 msgstr "Sum debit"
 
@@ -22365,6 +24122,7 @@ msgstr "text"
 #: include/class/acc_ledger.class.php:202
 #: include/class/acc_ledger.class.php:203
 #: include/class/acc_ledger.class.php:221
+#: include/class/acc_ledger.class.php:220
 msgid "this->jr_id is not set ou opération inconnue"
 msgstr "Unknown operation"
 
@@ -22376,6 +24134,7 @@ msgstr "Unknown operation"
 #: include/class/acc_ledger_search.class.php:938
 #: include/class/acc_ledger_search.class.php:946
 #: include/class/acc_ledger_search.class.php:959
+#: include/class/acc_ledger_search.class.php:1048
 msgid "tiers"
 msgstr "Tiers"
 
@@ -22383,6 +24142,7 @@ msgstr "Tiers"
 #: include/template/predf_ledger_detail.php:23
 #: include/template/form_ledger_detail.php:74
 #: include/template/form_ledger_detail.php:78
+#: include/template/form_ledger_detail.php:81
 msgid "tot.tva"
 msgstr "tot. vat"
 
@@ -22413,7 +24173,7 @@ msgstr "Total"
 msgid "totaux"
 msgstr "Total"
 
-#: include/database.item.php:141
+#: include/database.item.php:141 include/database.item.php:140
 msgid "totaux  par TVA et par journal"
 msgstr "Total VAT by ledger"
 
@@ -22443,6 +24203,9 @@ msgstr "all_cards.pdf"
 #: include/class/acc_ledger_purchase.class.php:1444
 #: include/class/acc_ledger_sold.class.php:725
 #: include/class/acc_ledger_purchase.class.php:1447
+#: include/class/acc_ledger_purchase.class.php:1458
+#: include/class/acc_ledger_sold.class.php:728
+#: include/template/form_ledger_detail.php:80
 msgid "tva"
 msgstr "vat"
 
@@ -22453,7 +24216,8 @@ msgstr "vat"
 #: html/ajax_misc.php:405 html/ajax_misc.php:512 html/ajax_misc.php:517
 #: html/ajax_misc.php:514 html/ajax_misc.php:519 html/ajax_misc.php:520
 #: html/ajax_misc.php:525 html/ajax_misc.php:522 html/ajax_misc.php:527
-#: html/ajax_misc.php:526 html/ajax_misc.php:531
+#: html/ajax_misc.php:526 html/ajax_misc.php:531 html/ajax_misc.php:491
+#: html/ajax_misc.php:496
 msgid "tva inconnue"
 msgstr "VAT unknown"
 
@@ -22464,6 +24228,7 @@ msgstr "VAT unknown"
 #: include/class/acc_ledger_history_purchase.class.php:258
 #: include/class/acc_ledger_history_purchase.class.php:259
 #: include/class/acc_ledger_history_purchase.class.php:263
+#: include/class/acc_ledger_history_purchase.class.php:274
 msgid "tva non ded."
 msgstr "TVA not deductible"
 
@@ -22471,6 +24236,7 @@ msgstr "TVA not deductible"
 #: include/template/predf_ledger_detail.php:24
 #: include/template/form_ledger_detail.php:75
 #: include/template/form_ledger_detail.php:79
+#: include/template/form_ledger_detail.php:82
 msgid "tvac"
 msgstr "VAT included"
 
@@ -22502,6 +24268,10 @@ msgstr "unknown type of ledger"
 msgid "téléphone "
 msgstr "phone"
 
+#: unit-test/include/class/tax_summary.Test.php:110
+msgid "unknow jrn_type"
+msgstr "Unknown type"
+
 #: include/ajax/ajax_preference.php:219 include/ajax/ajax_preference.php:230
 msgid "utf8"
 msgstr "utf8"
@@ -22549,6 +24319,7 @@ msgstr "Do you confirm"
 #: include/template/ledger_detail_bottom.php:178
 #: include/template/ledger_detail_bottom.php:195
 #: include/template/ledger_detail_bottom.php:192
+#: include/template/ledger_detail_bottom.php:211
 msgid "vous confirmez?"
 msgstr "Do you confirm"
 
@@ -22770,9 +24541,6 @@ msgstr "Step 4"
 #~ msgid "Impression catégorie de fiches"
 #~ msgstr "Print category of card"
 
-#~ msgid "Interdit"
-#~ msgstr "Forbidden"
-
 #~ msgid "Journal de vente, produit et recette"
 #~ msgstr "Ledger of sale"
 
@@ -22828,9 +24596,6 @@ msgstr "Step 4"
 #~ msgid "Liste vente non payées"
 #~ msgstr "List unpaid sales"
 
-#~ msgid "Liste ventes"
-#~ msgstr "List Sales"
-
 #~ msgid "Listing des opérations"
 #~ msgstr "Listing of operation"
 
@@ -22915,9 +24680,6 @@ msgstr "Step 4"
 #~ msgid "Recette"
 #~ msgstr "Income"
 
-#~ msgid "Recherche :"
-#~ msgstr "search :"
-
 #~ msgid "Retour au tableau de bord"
 #~ msgstr "return to the dashboard"
 
diff --git a/html/lang/messages.po b/html/lang/messages.po
index dfd0d16a1..2eec06ba0 100644
--- a/html/lang/messages.po
+++ b/html/lang/messages.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: include/database.item.php:126
+#: include/database.item.php:125
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-26 13:23+0200\n"
+"POT-Creation-Date: 2020-11-04 17:42+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -32,7 +32,7 @@ msgstr ""
 #: include/ext/importbank/include/import_bank.class.php:490
 #: include/ajax/ajax_card.php:148 include/class/fiche.class.php:661
 #: include/class/fiche.class.php:663 include/class/fiche.class.php:662
-#: include/ajax/ajax_card.php:148 include/class/fiche.class.php:663
+#: include/class/fiche.class.php:681 include/ajax/ajax_card.php:151
 msgid "Fiche non trouvée"
 msgstr ""
 
@@ -52,8 +52,9 @@ msgstr ""
 #: include/database.item.php:11 include/ajax/ajax_card.php:166
 #: include/database.item.php:5 include/database.item.php:98
 #: include/ext/import-winbook/index.php:66 include/fiche.inc.php:65
-#: include/ajax/ajax_card.php:167 include/database.item.php:5
-#: include/database.item.php:98 include/fiche.inc.php:65
+#: include/ajax/ajax_card.php:167 include/fiche.inc.php:65
+#: include/ajax/ajax_card.php:170 include/database.item.php:4
+#: include/database.item.php:97
 msgid "Historique"
 msgstr ""
 
@@ -61,6 +62,7 @@ msgstr ""
 #: html/ajax_card.php:192 include/ajax/ajax_card.php:172
 #: include/ajax/ajax_card.php:173 include/ajax/ajax_card.php:176
 #: include/ajax/ajax_card.php:182 include/ajax/ajax_card.php:183
+#: include/ajax/ajax_card.php:186
 msgid "Aucune fiche demandée"
 msgstr ""
 
@@ -90,6 +92,10 @@ msgstr ""
 #: include/ajax/ajax_card.php:214 include/ajax/ajax_card.php:369
 #: include/ajax/ajax_card.php:527 include/ajax/ajax_card.php:582
 #: include/ajax/ajax_card.php:594 include/ajax/ajax_card.php:624
+#: include/ajax/ajax_card.php:220 include/ajax/ajax_card.php:402
+#: include/ajax/ajax_card.php:603 include/ajax/ajax_card.php:658
+#: include/ajax/ajax_card.php:673 include/ajax/ajax_card.php:702
+#: include/ajax/ajax_card.php:738
 msgid "Action interdite"
 msgstr ""
 
@@ -101,7 +107,8 @@ msgstr ""
 #: include/ajax/ajax_card.php:377 include/ajax/ajax_card.php:261
 #: include/ajax/ajax_card.php:410 include/ajax/ajax_card.php:264
 #: include/ajax/ajax_card.php:413 include/ajax/ajax_card.php:265
-#: include/ajax/ajax_card.php:414
+#: include/ajax/ajax_card.php:414 include/ajax/ajax_card.php:271
+#: include/ajax/ajax_card.php:468
 msgid ""
 "Aucune catégorie de fiche ne correspond à votre demande, le journal pourrait "
 "n'avoir accès à aucune fiche"
@@ -111,6 +118,7 @@ msgstr ""
 #: html/ajax_card.php:286 include/ajax/ajax_card.php:266
 #: include/ajax/ajax_card.php:267 include/ajax/ajax_card.php:273
 #: include/ajax/ajax_card.php:275 include/ajax/ajax_card.php:276
+#: include/ajax/ajax_card.php:282
 msgid "Aucune catégorie de fiche ne correspond  à votre demande"
 msgstr ""
 
@@ -121,7 +129,7 @@ msgstr ""
 #: include/ajax/ajax_card.php:347 include/ajax/ajax_add_concerned_card.php:50
 #: include/ajax/ajax_card.php:380 include/ajax/ajax_add_concerned_card.php:54
 #: include/ajax/ajax_card.php:383 include/ajax/ajax_card.php:384
-#: include/ajax/ajax_add_concerned_card.php:54
+#: include/ajax/ajax_card.php:417 include/ajax/ajax_add_concerned_card.php:64
 msgid "Fiche contenant"
 msgstr ""
 
@@ -195,21 +203,24 @@ msgstr ""
 #: include/ajax/ajax_search_operation.php:66
 #: include/ajax/ajax_search_operation.php:74 include/ajax/ajax_poste.php:63
 #: include/fiche.inc.php:86 include/class/acc_ledger_search.class.php:556
-#: html/recherche.php:82 include/template/action_show.php:33
+#: include/ajax/ajax_card.php:386 include/database.item.php:57
+#: html/recherche.php:87 include/fiche.inc.php:86
+#: include/anc_acc_table.inc.php:15 include/anc_group_balance.inc.php:16
+#: include/class/acc_ledger_search.class.php:642
+#: include/lettering.account.inc.php:107 include/ajax/ajax_card.php:419
+#: include/ajax/ajax_admin.php:144 include/ajax/ajax_search_operation.php:67
+#: include/ajax/ajax_search_operation.php:75
+#: include/ajax/ajax_anc_search.php:49 include/ajax/ajax_anc_search.php:61
+#: include/ajax/ajax_poste.php:63 include/ajax/ajax_add_concerned_card.php:90
+#: include/template/action_button.php:35 include/template/action_show.php:33
 #: include/template/stock_histo_search.php:30
 #: include/template/stock_histo_search.php:68
-#: include/template/action_button.php:39 include/anc_acc_balance.inc.php:15
-#: include/anc_group_balance.inc.php:16 include/anc_acc_table.inc.php:15
-#: include/ajax/ajax_card.php:386 include/ajax/ajax_admin.php:144
-#: include/ajax/ajax_add_concerned_card.php:56
-#: include/ajax/ajax_search_operation.php:66
-#: include/ajax/ajax_search_operation.php:74 include/ajax/ajax_poste.php:63
-#: include/ajax/ajax_anc_search.php:49 include/ajax/ajax_anc_search.php:58
-#: include/menu.inc.php:140 include/menu.inc.php:143
-#: include/database.item.php:57 include/database.item.php:97
-#: include/lettering.gestion.inc.php:53 include/fiche.inc.php:86
-#: include/class/acc_ledger_search.class.php:556
-#: include/lettering.account.inc.php:105 include/lettering.card.inc.php:102
+#: include/lettering.gestion.inc.php:53 include/database.item.php:56
+#: include/database.item.php:96 include/lettering.card.inc.php:104
+#: include/anc_acc_balance.inc.php:15 include/lib/html_input.class.php:984
+#: include/lib/html_input.class.php:1004 include/lib/html_input.class.php:1021
+#: include/upgrade-plugin.php:55 include/menu.inc.php:140
+#: include/menu.inc.php:143
 #, php-format
 msgid "Recherche"
 msgstr ""
@@ -227,6 +238,7 @@ msgstr ""
 #: include/ajax/ajax_card.php:375 include/ajax/ajax_card.php:408
 #: include/ajax/ajax_card.php:411 include/fiche.inc.php:93
 #: include/ajax/ajax_card.php:412 include/fiche.inc.php:93
+#: include/ajax/ajax_card.php:466
 msgid "Recherche de fiche"
 msgstr ""
 
@@ -235,6 +247,7 @@ msgstr ""
 #: include/ajax/ajax_card.php:439 include/ajax/ajax_card.php:440
 #: include/ajax/ajax_card.php:441 include/ajax/ajax_card.php:474
 #: include/ajax/ajax_card.php:478 include/ajax/ajax_card.php:479
+#: include/ajax/ajax_card.php:555
 msgid " de clients"
 msgstr ""
 
@@ -243,6 +256,7 @@ msgstr ""
 #: include/ajax/ajax_card.php:443 include/ajax/ajax_card.php:444
 #: include/ajax/ajax_card.php:445 include/ajax/ajax_card.php:478
 #: include/ajax/ajax_card.php:482 include/ajax/ajax_card.php:483
+#: include/ajax/ajax_card.php:559
 msgid " de fournisseurs"
 msgstr ""
 
@@ -251,6 +265,7 @@ msgstr ""
 #: include/ajax/ajax_card.php:447 include/ajax/ajax_card.php:448
 #: include/ajax/ajax_card.php:449 include/ajax/ajax_card.php:482
 #: include/ajax/ajax_card.php:486 include/ajax/ajax_card.php:487
+#: include/ajax/ajax_card.php:563
 msgid " d'administration"
 msgstr ""
 
@@ -292,7 +307,7 @@ msgstr ""
 #: include/ext/rapport_avance/include/formulaire_param_detail.class.php:368
 #: include/ajax/ajax_card.php:506 include/class/acc_report.class.php:151
 #: include/ajax/ajax_card.php:510 include/ajax/ajax_card.php:511
-#: include/class/acc_report.class.php:151
+#: include/class/acc_report.class.php:151 include/ajax/ajax_card.php:587
 msgid "Recherche poste"
 msgstr ""
 
@@ -335,13 +350,14 @@ msgstr ""
 #: include/class/fiche_def.class.php:812 include/cfgledger.inc.php:134
 #: include/template/dashboard.php:350 include/ajax/ajax_card.php:203
 #: include/ajax/ajax_card.php:517 include/ajax/ajax_mod_predf_op.php:54
-#: include/cfgledger.inc.php:137 include/template/pcmn_update.php:53
-#: include/template/dashboard.php:350
-#: include/template/todo_list_display.php:105 include/cfgledger.inc.php:137
-#: include/compta_fin.inc.php:149 include/ajax/ajax_mod_predf_op.php:54
-#: include/ajax/ajax_card.php:204 include/ajax/ajax_card.php:518
+#: include/cfgledger.inc.php:137 include/ajax/ajax_card.php:204
+#: include/ajax/ajax_card.php:518 include/class/fiche_def.class.php:812
+#: include/ajax/ajax_mod_predf_op.php:67 include/ajax/ajax_card.php:207
+#: include/ajax/ajax_card.php:594 include/compta_fin.inc.php:149
+#: include/template/todo_list_display.php:105
+#: include/template/pcmn_update.php:53 include/template/dashboard.php:350
 #: include/report.inc.php:88 include/report.inc.php:103
-#: include/company.inc.php:149 include/class/fiche_def.class.php:812
+#: include/company.inc.php:163 include/cfgledger.inc.php:137
 msgid "Sauve"
 msgstr ""
 
@@ -350,7 +366,7 @@ msgstr ""
 #: html/ajax_card.php:530 html/ajax_card.php:529 include/ajax/ajax_card.php:509
 #: include/ajax/ajax_card.php:510 include/ajax/ajax_card.php:511
 #: include/ajax/ajax_card.php:544 include/ajax/ajax_card.php:548
-#: include/ajax/ajax_card.php:563
+#: include/ajax/ajax_card.php:563 include/ajax/ajax_card.php:639
 msgid "Catégorie existe déjà"
 msgstr ""
 
@@ -359,7 +375,7 @@ msgstr ""
 #: html/ajax_card.php:532 html/ajax_card.php:531 include/ajax/ajax_card.php:511
 #: include/ajax/ajax_card.php:512 include/ajax/ajax_card.php:513
 #: include/ajax/ajax_card.php:546 include/ajax/ajax_card.php:550
-#: include/ajax/ajax_card.php:567
+#: include/ajax/ajax_card.php:567 include/ajax/ajax_card.php:643
 msgid "Catégorie sauvée"
 msgstr ""
 
@@ -375,7 +391,8 @@ msgstr ""
 #: include/ajax/ajax_card.php:539 include/ajax/ajax_card.php:540
 #: include/ajax/ajax_card.php:573 include/ajax/ajax_card.php:577
 #: include/ajax/ajax_card.php:607 include/ajax/ajax_card.php:600
-#: include/ajax/ajax_card.php:630
+#: include/ajax/ajax_card.php:630 include/ajax/ajax_card.php:679
+#: include/ajax/ajax_card.php:708 include/ajax/ajax_card.php:744
 msgid "Fiche non valide"
 msgstr ""
 
@@ -386,14 +403,17 @@ msgstr ""
 #: include/ajax/ajax_ledger.php:96 include/ajax/ajax_ledger.php:118
 #: include/ajax/ajax_ledger.php:103 include/ajax/ajax_ledger.php:125
 #: include/template/ledger_detail_bottom.php:37 include/ext/tva/ajax.php:101
-#: include/ext/tva/ajax.php:200 include/template/ledger_detail_bottom.php:37
-#: include/ajax/ajax_ledger.php:104 include/ajax/ajax_ledger.php:126
+#: include/ext/tva/ajax.php:200 include/ajax/ajax_ledger.php:104
+#: include/ajax/ajax_ledger.php:126 include/ajax/ajax_ledger.php:104
+#: include/ajax/ajax_ledger.php:126
+#: include/template/ledger_detail_bottom.php:42
 msgid "Information"
 msgstr ""
 
 #: html/ajax_ledger.php:156 html/ajax_ledger.php:174 html/ajax_ledger.php:175
 #: include/ajax/ajax_ledger.php:152 include/ajax/ajax_ledger.php:155
 #: include/ajax/ajax_ledger.php:159 include/ajax/ajax_ledger.php:160
+#: include/ajax/ajax_ledger.php:160
 msgid "Opération Effacée"
 msgstr ""
 
@@ -401,7 +421,7 @@ msgstr ""
 #: html/ajax_ledger.php:223 html/ajax_ledger.php:225
 #: include/ajax/ajax_ledger.php:202 include/ajax/ajax_ledger.php:205
 #: include/ajax/ajax_ledger.php:207 include/ajax/ajax_ledger.php:211
-#: include/ajax/ajax_ledger.php:212
+#: include/ajax/ajax_ledger.php:212 include/ajax/ajax_ledger.php:212
 msgid "Désolé il y a une erreur"
 msgstr ""
 
@@ -409,7 +429,7 @@ msgstr ""
 #: html/ajax_ledger.php:277 html/ajax_ledger.php:279
 #: include/ajax/ajax_ledger.php:256 include/ajax/ajax_ledger.php:259
 #: include/ajax/ajax_ledger.php:261 include/ajax/ajax_ledger.php:265
-#: include/ajax/ajax_ledger.php:266
+#: include/ajax/ajax_ledger.php:266 include/ajax/ajax_ledger.php:266
 msgid "Aucun fichier"
 msgstr ""
 
@@ -443,12 +463,14 @@ msgstr ""
 #: include/template/ledger_detail_bottom.php:39
 #: include/class/acc_ledger_search.class.php:702
 #: include/class/acc_ledger_search.class.php:696
-#: include/class/acc_ledger_search.class.php:709
-#: include/template/ledger_detail_bottom.php:39 include/compta_ven.inc.php:186
+#: include/class/acc_ledger_search.class.php:709 include/compta_ven.inc.php:186
 #: include/ajax/ajax_ledger.php:323 include/ajax/ajax_ledger.php:352
-#: include/database.item.php:89 include/class/document.class.php:172
-#: include/class/acc_ledger_search.class.php:709 include/compta_ach.inc.php:174
-#: include/operation_ods_confirm.inc.php:52
+#: include/compta_ach.inc.php:174 include/compta_ven.inc.php:186
+#: include/class/document.class.php:177
+#: include/class/acc_ledger_search.class.php:795
+#: include/ajax/ajax_ledger.php:323 include/ajax/ajax_ledger.php:352
+#: include/compta_ach.inc.php:173 include/template/ledger_detail_bottom.php:44
+#: include/database.item.php:88 include/operation_ods_confirm.inc.php:52
 msgid "Document"
 msgstr ""
 
@@ -462,7 +484,8 @@ msgstr ""
 #: include/ajax/ajax_ledger.php:504 include/ajax/ajax_ledger.php:508
 #: include/anc_od.inc.php:121 include/ajax/ajax_ledger.php:509
 #: include/ext/modop/modop_save.php:165 include/ajax/ajax_ledger.php:510
-#: include/anc_od.inc.php:121 include/stock_inv.inc.php:40
+#: include/ajax/ajax_ledger.php:510 include/stock_inv.inc.php:40
+#: include/anc_od.inc.php:121
 msgid "Opération sauvée"
 msgstr ""
 
@@ -470,7 +493,7 @@ msgstr ""
 #: html/ajax_ledger.php:522 html/ajax_ledger.php:529 html/ajax_ledger.php:531
 #: include/ajax/ajax_ledger.php:508 include/ajax/ajax_ledger.php:511
 #: include/ajax/ajax_ledger.php:515 include/ajax/ajax_ledger.php:516
-#: include/ajax/ajax_ledger.php:517
+#: include/ajax/ajax_ledger.php:517 include/ajax/ajax_ledger.php:517
 msgid ""
 "Changement impossible: on ne peut pas changer la date dans une période fermée"
 msgstr ""
@@ -479,7 +502,7 @@ msgstr ""
 #: html/ajax_ledger.php:564 html/ajax_ledger.php:576 html/ajax_ledger.php:578
 #: include/ajax/ajax_ledger.php:555 include/ajax/ajax_ledger.php:558
 #: include/ajax/ajax_ledger.php:563 include/ajax/ajax_ledger.php:568
-#: include/ajax/ajax_ledger.php:569
+#: include/ajax/ajax_ledger.php:569 include/ajax/ajax_ledger.php:569
 msgid "Opération extournée"
 msgstr ""
 
@@ -492,7 +515,8 @@ msgstr ""
 #: include/class/pdf_operation.class.php:194
 #: include/class/pdf_operation.class.php:247 html/ajax_misc.php:456
 #: html/ajax_misc.php:458 html/ajax_misc.php:464 html/ajax_misc.php:466
-#: html/ajax_misc.php:470 include/class/pdf_operation.class.php:149
+#: html/ajax_misc.php:470 html/ajax_misc.php:435
+#: include/class/pdf_operation.class.php:149
 #: include/class/pdf_operation.class.php:194
 #: include/class/pdf_operation.class.php:247
 msgid "code"
@@ -509,7 +533,15 @@ msgstr ""
 #: include/export/export_printtva_csv.php:41
 #: include/export/export_printtva_csv.php:60
 #: include/export/export_printtva_pdf.php:57
-#: include/export/export_printtva_pdf.php:212
+#: include/export/export_printtva_pdf.php:212 html/ajax_misc.php:436
+#: include/export/export_printtva_pdf.php:59
+#: include/export/export_printtva_pdf.php:216
+#: include/export/export_printtva_csv.php:53
+#: include/export/export_printtva_csv.php:72
+#: include/template/tax_summary_display.php:61
+#: include/template/tax_summary_display.php:119
+#: include/template/tax_summary_display.php:209
+#: include/template/tax_summary_display.php:291
 msgid "Taux"
 msgstr ""
 
@@ -517,6 +549,7 @@ msgstr ""
 #: html/ajax_misc.php:235 html/ajax_misc.php:313 html/ajax_misc.php:318
 #: html/ajax_misc.php:346 html/ajax_misc.php:458 html/ajax_misc.php:460
 #: html/ajax_misc.php:466 html/ajax_misc.php:468 html/ajax_misc.php:472
+#: html/ajax_misc.php:437
 msgid "Symbole"
 msgstr ""
 
@@ -524,6 +557,7 @@ msgstr ""
 #: html/ajax_misc.php:236 html/ajax_misc.php:314 html/ajax_misc.php:319
 #: html/ajax_misc.php:347 html/ajax_misc.php:459 html/ajax_misc.php:461
 #: html/ajax_misc.php:467 html/ajax_misc.php:469 html/ajax_misc.php:473
+#: html/ajax_misc.php:438
 msgid "Explication"
 msgstr ""
 
@@ -534,7 +568,8 @@ msgstr ""
 #: html/ajax_misc.php:405 html/ajax_misc.php:512 html/ajax_misc.php:517
 #: html/ajax_misc.php:514 html/ajax_misc.php:519 html/ajax_misc.php:520
 #: html/ajax_misc.php:525 html/ajax_misc.php:522 html/ajax_misc.php:527
-#: html/ajax_misc.php:526 html/ajax_misc.php:531
+#: html/ajax_misc.php:526 html/ajax_misc.php:531 html/ajax_misc.php:491
+#: html/ajax_misc.php:496
 msgid "tva inconnue"
 msgstr ""
 
@@ -571,14 +606,15 @@ msgstr ""
 #: html/do.php:302 html/user_login.php:71 include/cfgledger.inc.php:138
 #: include/modele.inc.php:403 include/modele.inc.php:443
 #: include/ajax/ajax_display_letter.php:39 include/cfgledger.inc.php:141
-#: include/ext/tva/ajax.php:35 html/do.php:312 html/do.php:281 html/do.php:281
-#: html/user_login.php:71 include/cfgledger.inc.php:141
-#: include/dossier.inc.php:383 include/dossier.inc.php:426
-#: include/ajax/ajax_get_profile.php:50 include/ajax/ajax_display_letter.php:39
+#: include/ext/tva/ajax.php:35 html/do.php:312 html/do.php:281
+#: include/modele.inc.php:404 include/modele.inc.php:444 html/user_login.php:71
+#: html/do.php:283 include/opening.inc.php:177
+#: include/ajax/ajax_display_letter.php:53 include/ajax/ajax_get_profile.php:50
 #: include/modele.inc.php:72 include/modele.inc.php:404
-#: include/modele.inc.php:444 include/report.inc.php:129
-#: include/forecast.inc.php:351 include/opening.inc.php:177
-#: include/restore.inc.php:51
+#: include/modele.inc.php:444 include/forecast.inc.php:351
+#: include/restore.inc.php:51 include/dossier.inc.php:383
+#: include/dossier.inc.php:426 include/report.inc.php:129
+#: include/cfgledger.inc.php:141
 msgid "Retour"
 msgstr ""
 
@@ -594,10 +630,10 @@ msgstr ""
 #: include/export/export_gl_csv.php:90 include/template/letter_prop.php:65
 #: include/category_card.inc.php:79 include/export/export_gl_csv.php:96
 #: include/database.item.php:74 include/ajax/ajax_display_letter.php:49
-#: include/category_card.inc.php:81 include/template/letter_prop.php:22
-#: include/template/letter_prop.php:65 include/template/letter_all.php:20
-#: include/export/export_gl_csv.php:96 include/category_card.inc.php:81
-#: include/ajax/ajax_display_letter.php:49 include/database.item.php:74
+#: include/category_card.inc.php:81 include/ajax/ajax_display_letter.php:63
+#: include/export/export_gl_csv.php:96 include/template/letter_all.php:20
+#: include/template/letter_prop.php:22 include/template/letter_prop.php:65
+#: include/database.item.php:73 include/category_card.inc.php:81
 msgid "Lettrage"
 msgstr ""
 
@@ -605,7 +641,7 @@ msgstr ""
 #: html/ajax_misc.php:355 html/ajax_misc.php:433
 #: include/ajax/ajax_display_letter.php:69
 #: include/ajax/ajax_display_letter.php:74
-#: include/ajax/ajax_display_letter.php:74
+#: include/ajax/ajax_display_letter.php:89
 msgid "Montant min. "
 msgstr ""
 
@@ -613,7 +649,7 @@ msgstr ""
 #: html/ajax_misc.php:362 html/ajax_misc.php:440
 #: include/ajax/ajax_display_letter.php:76
 #: include/ajax/ajax_display_letter.php:81
-#: include/ajax/ajax_display_letter.php:81
+#: include/ajax/ajax_display_letter.php:96
 msgid "Montant max. "
 msgstr ""
 
@@ -624,8 +660,8 @@ msgstr ""
 #: include/ajax/ajax_display_letter.php:105
 #: include/ajax/ajax_display_letter.php:96
 #: include/ajax/ajax_display_letter.php:110
-#: include/ajax/ajax_display_letter.php:96
-#: include/ajax/ajax_display_letter.php:110
+#: include/ajax/ajax_display_letter.php:112
+#: include/ajax/ajax_display_letter.php:128
 msgid "Date malformée"
 msgstr ""
 
@@ -639,8 +675,9 @@ msgstr ""
 #: include/ext/tools/include/anc_grandlivre_ext.class.php:126
 #: include/export/export_poste_detail_pdf.php:102
 #: include/ajax/ajax_display_letter.php:122 include/fiche.inc.php:576
-#: include/fiche.inc.php:585 include/export/export_poste_detail_pdf.php:102
-#: include/ajax/ajax_display_letter.php:122 include/fiche.inc.php:585
+#: include/fiche.inc.php:585 include/fiche.inc.php:598
+#: include/ajax/ajax_display_letter.php:140
+#: include/export/export_poste_detail_pdf.php:102
 msgid "Debit"
 msgstr ""
 
@@ -654,8 +691,9 @@ msgstr ""
 #: include/ext/tools/include/anc_grandlivre_ext.class.php:127
 #: include/export/export_poste_detail_pdf.php:104
 #: include/ajax/ajax_display_letter.php:123 include/fiche.inc.php:580
-#: include/fiche.inc.php:589 include/export/export_poste_detail_pdf.php:104
-#: include/ajax/ajax_display_letter.php:123 include/fiche.inc.php:589
+#: include/fiche.inc.php:589 include/fiche.inc.php:602
+#: include/ajax/ajax_display_letter.php:141
+#: include/export/export_poste_detail_pdf.php:104
 msgid "Credit"
 msgstr ""
 
@@ -663,7 +701,7 @@ msgstr ""
 #: html/ajax_misc.php:405 html/ajax_misc.php:483
 #: include/ajax/ajax_display_letter.php:119
 #: include/ajax/ajax_display_letter.php:124
-#: include/ajax/ajax_display_letter.php:124
+#: include/ajax/ajax_display_letter.php:142
 msgid "Les 2"
 msgstr ""
 
@@ -748,21 +786,22 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2019
 #: include/template/ledger_detail_bottom.php:318
 #: include/template/stock_inv.php:107 include/class/acc_ledger.class.php:2028
-#: include/template/user_sec_profile.php:58
-#: include/template/modele_document.php:119
-#: include/template/ledger_detail_bottom.php:315
-#: include/template/document_mod_change.php:86
-#: include/template/anc_key_input.php:205 include/template/stock_inv.php:107
-#: include/template/profile_sec_repository.php:59 include/cfgledger.inc.php:157
-#: include/default_menu.inc.php:45 include/ajax/ajax_mod_stock_repo.php:79
-#: include/ajax/ajax_create_menu.php:16 include/ajax/ajax_card.php:165
-#: include/ajax/ajax_display_letter.php:219 include/ajax/ajax_mod_menu.php:18
+#: include/template/ledger_detail_bottom.php:315 include/ajax/ajax_card.php:165
 #: include/class/acc_ledger.class.php:2044
-#: include/class/fiche_def.class.php:775 include/forecast.inc.php:262
+#: include/class/fiche_def.class.php:775
+#: include/class/acc_ledger.class.php:2063
+#: include/ajax/ajax_display_letter.php:226 include/ajax/ajax_card.php:168
+#: include/ajax/ajax_mod_stock_repo.php:79 include/ajax/ajax_create_menu.php:16
+#: include/ajax/ajax_mod_menu.php:18 include/stock_cfg.inc.php:164
+#: include/default_menu.inc.php:45 include/template/modele_document.php:119
+#: include/template/ledger_detail_bottom.php:333
+#: include/template/stock_inv.php:107 include/template/user_sec_profile.php:58
+#: include/template/profile_sec_repository.php:59
+#: include/template/card_multiple_display_option.php:114
+#: include/template/anc_key_input.php:205 include/forecast.inc.php:262
 #: include/forecast.inc.php:277 include/forecast.inc.php:297
 #: include/forecast.inc.php:321 include/forecast.inc.php:368
-#: include/card_attr.inc.php:163 include/anc_od.inc.php:145
-#: include/stock_cfg.inc.php:164
+#: include/anc_od.inc.php:145 include/cfgledger.inc.php:157
 msgid "Sauver"
 msgstr ""
 
@@ -798,18 +837,19 @@ msgstr ""
 #: include/class/acc_plan_mtable.class.php:45 include/class/fiche.class.php:470
 #: include/class/fiche.class.php:469
 #: include/class/pdfbalance_simple.class.php:55
-#: include/template/fiche_list.php:41
+#: include/class/pdfbalance_simple.class.php:55
+#: include/class/fiche.class.php:470 include/class/acc_plan_mtable.class.php:45
+#: include/ajax/ajax_poste.php:65 include/balance.inc.php:306
 #: include/template/ledger_detail_misc.php:99
-#: include/template/ledger_detail_bottom.php:88
-#: include/template/operation_detail_misc.php:32 include/ajax/ajax_poste.php:65
-#: include/database.item.php:178 include/balance.inc.php:306
-#: include/class/acc_plan_mtable.class.php:45 include/class/fiche.class.php:469
-#: include/class/pdfbalance_simple.class.php:55 include/card_attr.inc.php:82
+#: include/template/operation_detail_misc.php:32
+#: include/template/ledger_detail_bottom.php:93
+#: include/template/fiche_list.php:41 include/database.item.php:174
 msgid "Poste Comptable"
 msgstr ""
 
 #: html/do.php:44 html/popup.php:38 html/popup.php:35 html/do.php:47
 #: html/do.php:48 html/popup.php:37 html/popup.php:37 html/do.php:47
+#: html/recherche.php:33
 msgid "Vous  êtes déconnecté"
 msgstr ""
 
@@ -817,7 +857,7 @@ msgstr ""
 #: html/do.php:93 html/user_login.php:67 html/do.php:121 html/do.php:134
 #: html/do.php:136 html/do.php:154 html/do.php:178 html/user_login.php:69
 #: html/do.php:186 html/user_login.php:70 html/do.php:196 html/do.php:165
-#: html/do.php:165 html/user_login.php:70
+#: html/user_login.php:70 html/do.php:165
 msgid "Base de donnée invalide"
 msgstr ""
 
@@ -834,7 +874,7 @@ msgstr ""
 #: html/do.php:104 html/user_login.php:76 html/do.php:132 html/do.php:145
 #: html/do.php:147 html/do.php:165 html/do.php:189 html/user_login.php:78
 #: html/do.php:203 html/user_login.php:79 html/user_login.php:85
-#: html/do.php:213 html/do.php:182 html/do.php:182 html/user_login.php:85
+#: html/do.php:213 html/do.php:182 html/user_login.php:85 html/do.php:182
 msgid "Votre base de données n'est pas à jour"
 msgstr ""
 
@@ -842,7 +882,7 @@ msgstr ""
 #: html/do.php:105 html/user_login.php:77 html/do.php:133 html/do.php:146
 #: html/do.php:148 html/do.php:166 html/do.php:190 html/user_login.php:79
 #: html/do.php:204 html/user_login.php:80 html/user_login.php:86
-#: html/do.php:214 html/do.php:183 html/do.php:183 html/user_login.php:86
+#: html/do.php:214 html/do.php:183 html/user_login.php:86 html/do.php:183
 msgid "cliquez ici pour appliquer le patch"
 msgstr ""
 
@@ -881,7 +921,7 @@ msgstr ""
 #: include/database.item.php:81 include/ajax/ajax_preference.php:31
 #: html/user_login.php:169 include/database.item.php:79 html/user_login.php:146
 #: include/ajax/ajax_preference.php:69 html/user_login.php:146
-#: include/ajax/ajax_preference.php:69 include/database.item.php:81
+#: include/ajax/ajax_preference.php:69 include/database.item.php:80
 msgid "Préférence"
 msgstr ""
 
@@ -939,11 +979,12 @@ msgstr ""
 #: include/balance.inc.php:101 include/modele.inc.php:278
 #: include/class/acc_ledger_search.class.php:565 html/recherche.php:83
 #: include/class/acc_ledger_search.class.php:553
-#: include/class/acc_ledger_search.class.php:562 html/recherche.php:83
+#: include/class/acc_ledger_search.class.php:562 include/modele.inc.php:279
+#: html/recherche.php:88 include/class/acc_ledger_search.class.php:648
 #: include/cfgplugin.inc.php:110 include/ajax/ajax_search_filter.php:128
-#: include/modele.inc.php:279 include/menu.inc.php:146
-#: include/balance.inc.php:101 include/class/acc_ledger_search.class.php:562
-#: include/forecast.inc.php:386
+#: include/modele.inc.php:279 include/balance.inc.php:101
+#: include/forecast.inc.php:386 include/lettering.card.inc.php:98
+#: include/menu.inc.php:146
 msgid "Filtre"
 msgstr ""
 
@@ -956,8 +997,8 @@ msgstr ""
 #: include/lib/ac_common.php:431 include/action.common.inc.php:129
 #: include/lib/ac_common.php:432 include/action.common.inc.php:131
 #: include/action.common.inc.php:165 include/lib/ac_common.php:434
-#: include/lib/ac_common.php:450 include/action.common.inc.php:131
-#: include/action.common.inc.php:165 include/lib/ac_common.php:450
+#: include/lib/ac_common.php:450 include/action.common.inc.php:133
+#: include/action.common.inc.php:167 include/lib/ac_common.php:460
 msgid "Cette action ne vous est pas autorisée Contactez votre responsable"
 msgstr ""
 
@@ -967,7 +1008,7 @@ msgstr ""
 #: include/lib/ac_common.php:434 include/lib/ac_common.php:435
 #: include/lib/ac_common.php:436 include/lib/ac_common.php:437
 #: include/lib/ac_common.php:438 include/lib/ac_common.php:440
-#: include/lib/ac_common.php:456 include/lib/ac_common.php:456
+#: include/lib/ac_common.php:456 include/lib/ac_common.php:466
 msgid " Cette action ne vous est pas autorisée Contactez votre responsable"
 msgstr ""
 
@@ -982,7 +1023,7 @@ msgstr ""
 #: include/lib/ac_common.php:881 include/class/extension.class.php:122
 #: include/lib/ac_common.php:893 include/class/extension.class.php:138
 #: include/lib/ac_common.php:895 include/lib/ac_common.php:911
-#: include/class/extension.class.php:138 include/lib/ac_common.php:911
+#: include/class/extension.class.php:138 include/lib/ac_common.php:921
 msgid "Module inexistant"
 msgstr ""
 
@@ -1010,15 +1051,15 @@ msgstr ""
 #: include/action.common.inc.php:316 include/compta_ven.inc.php:332
 #: include/action.common.inc.php:191 include/action.common.inc.php:325
 #: include/compta_ach.inc.php:298 include/compta_ven.inc.php:340
-#: include/action.common.inc.php:191 include/action.common.inc.php:325
 #: include/compta_ven.inc.php:338 include/compta_ach.inc.php:296
+#: include/compta_ven.inc.php:330 include/compta_ach.inc.php:297
+#: include/action.common.inc.php:205 include/action.common.inc.php:361
 msgid "Enregistrer"
 msgstr ""
 
 #: include/action.common.inc.php:161 include/action.common.inc.php:178
 #: include/action.common.inc.php:183 include/action.common.inc.php:185
 #: include/action.common.inc.php:186 include/action.common.inc.php:192
-#: include/action.common.inc.php:192
 msgid "Génère le document"
 msgstr ""
 
@@ -1033,7 +1074,7 @@ msgstr ""
 #: include/action.common.inc.php:187 include/action.common.inc.php:207
 #: include/action.common.inc.php:208 include/action.common.inc.php:213
 #: include/action.common.inc.php:215 include/action.common.inc.php:216
-#: include/action.common.inc.php:222 include/action.common.inc.php:222
+#: include/action.common.inc.php:222 include/action.common.inc.php:244
 msgid "Vous confirmez l\\'effacement"
 msgstr ""
 
@@ -1043,27 +1084,27 @@ msgstr ""
 #: include/ajax/ajax_view_action.php:55 include/action.common.inc.php:223
 #: include/action.common.inc.php:225 include/ajax/ajax_view_action.php:56
 #: include/ajax/ajax_view_action.php:52 include/action.common.inc.php:226
-#: include/action.common.inc.php:232 include/action.common.inc.php:232
-#: include/ajax/ajax_view_action.php:52
+#: include/action.common.inc.php:232 include/ajax/ajax_view_action.php:52
+#: include/action.common.inc.php:257
 msgid "Ce document n'est pas accessible"
 msgstr ""
 
 #: include/action.common.inc.php:218 include/action.common.inc.php:238
 #: include/action.common.inc.php:239 include/action.common.inc.php:244
 #: include/action.common.inc.php:246 include/action.common.inc.php:247
-#: include/action.common.inc.php:253 include/action.common.inc.php:253
+#: include/action.common.inc.php:253 include/action.common.inc.php:278
 msgid "Action "
 msgstr ""
 
 #: include/action.common.inc.php:218 include/action.common.inc.php:238
 #: include/action.common.inc.php:239 include/action.common.inc.php:244
 #: include/action.common.inc.php:246 include/action.common.inc.php:247
-#: include/action.common.inc.php:253 include/action.common.inc.php:253
+#: include/action.common.inc.php:253 include/action.common.inc.php:278
 msgid " effacée"
 msgstr ""
 
 #: include/action.inc.php:26 include/action.inc.php:25
-#: include/action.inc.php:25
+#: include/action.inc.php:27
 msgid "Retour liste"
 msgstr ""
 
@@ -1076,9 +1117,9 @@ msgstr ""
 #: include/customer.inc.php:89 include/manager.inc.php:92
 #: include/supplier.inc.php:92 include/contact.inc.php:86
 #: include/manager.inc.php:93 include/customer.inc.php:90
-#: include/contact.inc.php:86 include/customer.inc.php:90
-#: include/manager.inc.php:93 include/supplier.inc.php:92
-#: include/bank.inc.php:86 include/adm.inc.php:90
+#: include/bank.inc.php:86 include/adm.inc.php:90 include/supplier.inc.php:92
+#: include/contact.inc.php:87 include/customer.inc.php:90
+#: include/manager.inc.php:93
 msgid "Catégorie :"
 msgstr ""
 
@@ -1094,10 +1135,10 @@ msgstr ""
 #: include/contact.inc.php:98 include/manager.inc.php:105
 #: include/template/action_search.php:152 include/customer.inc.php:103
 #: include/template/action_search.php:148 scenario/select-box-test.php:62
-#: scenario/select-box-test.php:62 include/template/action_search.php:148
-#: include/contact.inc.php:98 include/customer.inc.php:103
-#: include/manager.inc.php:105 include/supplier.inc.php:104
-#: include/bank.inc.php:99 include/adm.inc.php:100
+#: scenario/select-box-test.php:62 include/bank.inc.php:99
+#: include/adm.inc.php:100 include/template/action_search.php:161
+#: include/supplier.inc.php:104 include/contact.inc.php:99
+#: include/customer.inc.php:103 include/manager.inc.php:105
 msgid "recherche"
 msgstr ""
 
@@ -1187,16 +1228,17 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2435
 #: include/class/follow_up.class.php:297 include/category_card.inc.php:162
 #: include/class/acc_ledger.class.php:2436 include/fiche.inc.php:116
-#: include/class/acc_ledger.class.php:2445 include/category_card.inc.php:162
-#: include/contact.inc.php:129 include/customer.inc.php:127
-#: include/fiche.inc.php:116 include/class/acc_ledger.class.php:2476
-#: include/class/pre_op_ach.class.php:174
-#: include/class/pre_op_ach.class.php:182 include/class/follow_up.class.php:297
-#: include/class/pre_op_advanced.class.php:173
-#: include/class/pre_op_ven.class.php:178
-#: include/class/pre_op_ven.class.php:185 include/manager.inc.php:131
-#: include/supplier.inc.php:129 include/bank.inc.php:124
-#: include/adm.inc.php:125
+#: include/class/acc_ledger.class.php:2445
+#: include/class/acc_ledger.class.php:2476 include/fiche.inc.php:116
+#: include/fiche.inc.php:241 include/class/pre_op_ach.class.php:177
+#: include/class/pre_op_ach.class.php:184 include/class/follow_up.class.php:304
+#: include/class/pre_op_ven.class.php:173
+#: include/class/pre_op_ven.class.php:180
+#: include/class/acc_ledger.class.php:2505
+#: include/class/pre_op_advanced.class.php:177 include/bank.inc.php:125
+#: include/adm.inc.php:125 include/supplier.inc.php:130
+#: include/contact.inc.php:131 include/customer.inc.php:128
+#: include/manager.inc.php:131 include/category_card.inc.php:162
 msgid "Créer une nouvelle fiche"
 msgstr ""
 
@@ -1210,9 +1252,9 @@ msgstr ""
 #: include/manager.inc.php:140 include/supplier.inc.php:139
 #: include/contact.inc.php:138 include/manager.inc.php:141
 #: include/adm.inc.php:136 include/customer.inc.php:138
-#: include/contact.inc.php:138 include/customer.inc.php:138
-#: include/manager.inc.php:141 include/supplier.inc.php:139
-#: include/bank.inc.php:134 include/adm.inc.php:136
+#: include/bank.inc.php:135 include/adm.inc.php:136
+#: include/supplier.inc.php:140 include/contact.inc.php:140
+#: include/customer.inc.php:139 include/manager.inc.php:141
 msgid "Ajout d'une catégorie"
 msgstr ""
 
@@ -1290,25 +1332,32 @@ msgstr ""
 #: include/class/acc_ledger_fin.class.php:549
 #: include/class/acc_ledger_fin.class.php:754
 #: include/class/fiche.class.php:1780 include/class/fiche.class.php:1781
-#: include/param_sec.inc.php:58 include/user.inc.php:82
-#: include/user.inc.php:126 include/template/fiche_list.php:38
-#: include/template/document_mod_change.php:34 include/template/profile.php:33
-#: include/template/forecast_cat.php:15
-#: include/export/export_anc_axis_csv.php:44
-#: include/export/export_fiche_balance_csv.php:57 include/profile.inc.php:359
-#: include/dossier.inc.php:227 include/ajax/ajax_mod_stock_repo.php:39
-#: include/ajax/ajax_get_profile.php:55 include/ajax/ajax_admin.php:229
-#: include/upgrade-template.php:51 include/modele.inc.php:248
-#: include/modele.inc.php:359 include/database.item.php:157
-#: include/class/acc_ledger_search.class.php:1104
+#: include/modele.inc.php:248 include/modele.inc.php:359
+#: include/database.item.php:157
+#: include/class/template_card_category.class.php:42
+#: include/class/acc_ledger_search.class.php:1193
+#: include/class/tag_group_mtable.class.php:40
+#: include/class/operation_predef_mtable.class.php:52
+#: include/class/document_modele.class.php:67
+#: include/class/fiche.class.php:1807
+#: include/class/card_attribut_mtable.class.php:39
+#: include/class/action_document_type_mtable.class.php:48
 #: include/class/acc_ledger_fin.class.php:549
 #: include/class/acc_ledger_fin.class.php:754
-#: include/class/template_card_category.class.php:42
-#: include/class/anc_plan.class.php:137 include/class/anc_plan.class.php:153
-#: include/class/fiche.class.php:1781 include/class/user.class.php:988
-#: include/class/balance_age.class.php:145
-#: include/class/document_modele.class.php:67 include/upgrade-plugin.php:59
-#: include/stock_cfg.inc.php:65
+#: include/class/anc_plan.class.php:138 include/class/anc_plan.class.php:154
+#: include/class/contact_option_ref_mtable.class.php:36
+#: include/class/user.class.php:991 include/class/balance_age.class.php:145
+#: include/ajax/ajax_get_profile.php:55 include/ajax/ajax_admin.php:229
+#: include/ajax/ajax_mod_stock_repo.php:39 include/modele.inc.php:248
+#: include/modele.inc.php:359 include/stock_cfg.inc.php:65
+#: include/upgrade-template.php:51 include/export/export_anc_axis_csv.php:44
+#: include/export/export_fiche_balance_csv.php:57
+#: include/template/profile.php:33 include/template/forecast_cat.php:15
+#: include/template/card_multiple_result.php:19
+#: include/template/fiche_list.php:38 include/user.inc.php:82
+#: include/user.inc.php:126 include/database.item.php:153
+#: include/dossier.inc.php:227 include/profile.inc.php:359
+#: include/upgrade-plugin.php:62 include/param_sec.inc.php:58
 msgid "Nom"
 msgstr ""
 
@@ -1326,7 +1375,7 @@ msgstr ""
 
 #: include/ajax_get_profile.php:43 include/ajax_get_profile.php:48
 #: include/ajax_get_profile.php:55 include/ajax/ajax_get_profile.php:55
-#: include/ajax/ajax_get_profile.php:58 include/ajax/ajax_get_profile.php:58
+#: include/ajax/ajax_get_profile.php:58
 msgid "Action Gestion"
 msgstr ""
 
@@ -1387,10 +1436,13 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1826
 #: include/class/acc_ledger_sold.class.php:1400
 #: include/class/acc_ledger_purchase.class.php:1829
-#: include/ajax/ajax_preference.php:150 include/template/forecast_result.php:25
-#: include/ajax/ajax_preference.php:150 include/database.item.php:86
+#: include/ajax/ajax_preference.php:150
 #: include/class/acc_ledger_sold.class.php:1409
 #: include/class/acc_ledger_purchase.class.php:1835
+#: include/class/acc_ledger_purchase.class.php:1872
+#: include/class/acc_ledger_sold.class.php:1394
+#: include/ajax/ajax_preference.php:150 include/template/forecast_result.php:25
+#: include/database.item.php:85
 msgid "Période"
 msgstr ""
 
@@ -1457,7 +1509,8 @@ msgstr ""
 #: html/test_class.php:219 include/ajax_preference.php:173
 #: include/ajax/ajax_preference.php:173 include/ajax/ajax_preference.php:252
 #: dev/test/test_class.php:215 include/ajax/ajax_preference.php:263
-#: dev/test/test_class.php:215 include/ajax/ajax_preference.php:263
+#: dev-2/test/test_class.php:215 include/ajax/ajax_preference.php:263
+#: dev/test/test_class.php:215
 msgid "Français"
 msgstr ""
 
@@ -1465,7 +1518,8 @@ msgstr ""
 #: html/test_class.php:220 include/ajax_preference.php:174
 #: include/ajax/ajax_preference.php:174 include/ajax/ajax_preference.php:253
 #: dev/test/test_class.php:216 include/ajax/ajax_preference.php:264
-#: dev/test/test_class.php:216 include/ajax/ajax_preference.php:264
+#: dev-2/test/test_class.php:216 include/ajax/ajax_preference.php:264
+#: dev/test/test_class.php:216
 msgid "Anglais"
 msgstr ""
 
@@ -1473,7 +1527,8 @@ msgstr ""
 #: html/test_class.php:221 include/ajax_preference.php:175
 #: include/ajax/ajax_preference.php:175 include/ajax/ajax_preference.php:254
 #: dev/test/test_class.php:217 include/ajax/ajax_preference.php:265
-#: dev/test/test_class.php:217 include/ajax/ajax_preference.php:265
+#: dev-2/test/test_class.php:217 include/ajax/ajax_preference.php:265
+#: dev/test/test_class.php:217
 msgid "Néerlandais"
 msgstr ""
 
@@ -1519,15 +1574,15 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:1113
 #: include/class/acc_ledger_search.class.php:1121
 #: include/class/acc_ledger_search.class.php:1134
-#: include/ajax/ajax_preference.php:280 include/cfgplugin.inc.php:171
+#: include/ajax/ajax_preference.php:280
+#: include/class/acc_ledger_search.class.php:1223 include/cfgplugin.inc.php:171
+#: include/ajax/ajax_add_menu.php:171 include/ajax/ajax_add_menu.php:217
+#: include/ajax/ajax_preference.php:283
+#: include/ajax/ajax_get_menu_detail.php:77 include/balance_age.inc.php:54
 #: include/template/action_display_short.php:126
 #: include/template/action_other_action.php:60
-#: include/stock_inv_histo.inc.php:69 include/ajax/ajax_add_menu.php:171
-#: include/ajax/ajax_add_menu.php:217 include/ajax/ajax_get_menu_detail.php:77
-#: include/ajax/ajax_preference.php:280 include/balance_card_ageing.inc.php:60
-#: include/balance_age.inc.php:54
-#: include/class/acc_ledger_search.class.php:1134
-#: include/lib/html_input.class.php:409
+#: include/stock_inv_histo.inc.php:69 include/lib/html_input.class.php:409
+#: include/balance_card_ageing.inc.php:60
 msgid "Valider"
 msgstr ""
 
@@ -1552,8 +1607,8 @@ msgstr ""
 #: include/ext/importbank/include/import_bank.class.php:137
 #: include/ajax/ajax_add_menu.php:143 include/class/anticipation.class.php:261
 #: include/class/follow_up.class.php:163 include/class/follow_up.class.php:164
-#: include/ajax/ajax_add_menu.php:143 include/class/follow_up.class.php:164
-#: include/class/anticipation.class.php:261 include/anc_od.inc.php:58
+#: include/class/anticipation.class.php:261 include/ajax/ajax_add_menu.php:143
+#: include/anc_od.inc.php:58
 msgid "Nouveau"
 msgstr ""
 
@@ -1582,9 +1637,9 @@ msgstr ""
 #: include/ajax/ajax_card.php:551 include/class/forecast.class.php:70
 #: include/ajax/ajax_card.php:555
 #: include/class/template_card_category.class.php:73
-#: include/cat_document.inc.php:63 include/ajax/ajax_card.php:574
-#: include/class/forecast.class.php:70
+#: include/ajax/ajax_card.php:574 include/class/forecast.class.php:70
 #: include/class/template_card_category.class.php:73
+#: include/ajax/ajax_card.php:650
 msgid "Le nom ne peut pas être vide"
 msgstr ""
 
@@ -1618,12 +1673,14 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:248
 #: include/class/acc_ledger_search.class.php:250
 #: include/lib/manage_table_sql.class.php:616
-#: include/lib/manage_table_sql.class.php:655 include/template/dashboard.php:21
-#: include/user_detail.inc.php:245 include/cat_document.inc.php:85
-#: include/class/anc_key.class.php:352
-#: include/class/acc_ledger_search.class.php:250
-#: include/lib/manage_table_sql.class.php:616
-#: include/lib/manage_table_sql.class.php:655
+#: include/lib/manage_table_sql.class.php:655 include/user_detail.inc.php:245
+#: include/class/anc_key.class.php:353
+#: include/class/acc_ledger_search.class.php:264
+#: include/class/tag_group_mtable.class.php:91
+#: include/class/operation_predef_mtable.class.php:170
+#: include/template/followup-show-action-add.php:61
+#: include/template/dashboard.php:21 include/lib/manage_table_sql.class.php:663
+#: include/lib/manage_table_sql.class.php:704
 msgid "Ajout"
 msgstr ""
 
@@ -1663,18 +1720,18 @@ msgstr ""
 #: include/database.item.php:110 include/category_card.inc.php:75
 #: include/template/stock_inv.php:67
 #: include/class/payment_method_mtable.class.php:41
-#: include/template/stock_histo_search.php:39
-#: include/template/detail-action.php:317
-#: include/template/form_ledger_fin.php:41
-#: include/template/security_list_action.php:55
-#: include/template/stock_inv.php:67
+#: include/class/payment_method_mtable.class.php:42
+#: include/class/anc_group_operation.class.php:122
+#: include/class/card_attribut_mtable.class.php:55
+#: include/class/acc_plan_mtable.class.php:49
+#: include/ajax/ajax_anc_detail_operation.php:54
 #: include/export/export_stock_histo_csv.php:43
-#: include/category_card.inc.php:75
-#: include/ajax/ajax_anc_detail_operation.php:54 include/database.item.php:80
-#: include/database.item.php:112
-#: include/class/payment_method_mtable.class.php:41
-#: include/class/anc_group_operation.class.php:121
-#: include/class/acc_plan_mtable.class.php:49 include/card_attr.inc.php:83
+#: include/template/follow_up_detail_display.php:50
+#: include/template/form_ledger_fin.php:41
+#: include/template/security_list_action.php:56
+#: include/template/stock_inv.php:67 include/template/stock_histo_search.php:39
+#: include/template/newEmptyPHP_NOALYSS.php:35 include/database.item.php:79
+#: include/database.item.php:111 include/category_card.inc.php:75
 msgid "Fiche"
 msgstr ""
 
@@ -1692,9 +1749,9 @@ msgstr ""
 #: include/template/dashboard.php:293 include/template/dashboard.php:302
 #: include/category_card.inc.php:74
 #: include/template/security_list_action.php:60
-#: include/category_card.inc.php:76 include/template/action_show.php:31
-#: include/template/dashboard.php:302
-#: include/template/security_list_action.php:60
+#: include/category_card.inc.php:76
+#: include/template/security_list_action.php:61
+#: include/template/action_show.php:31 include/template/dashboard.php:302
 #: include/category_card.inc.php:76
 msgid "Suivi"
 msgstr ""
@@ -1712,8 +1769,9 @@ msgstr ""
 #: include/database.item.php:148 include/database.item.php:147
 #: include/database.item.php:57 include/category_card.inc.php:75
 #: include/database.item.php:60 include/database.item.php:52
-#: include/category_card.inc.php:77 include/template/detail-action.php:49
 #: include/category_card.inc.php:77 include/database.item.php:53
+#: include/template/detail-action.php:49 include/database.item.php:52
+#: include/category_card.inc.php:77
 msgid "Contact"
 msgstr ""
 
@@ -1736,7 +1794,8 @@ msgstr ""
 #: include/category_card.inc.php:67 include/category_card.inc.php:68
 #: include/category_card.inc.php:71 include/impress_poste.inc.php:103
 #: include/category_card.inc.php:76 include/category_card.inc.php:78
-#: include/category_card.inc.php:78 include/impress_poste.inc.php:103
+#: include/impress_jrn.inc.php:156 include/impress_poste.inc.php:103
+#: include/category_card.inc.php:78
 msgid "Toutes les opérations"
 msgstr ""
 
@@ -1750,9 +1809,9 @@ msgstr ""
 #: include/database.item.php:70 include/category_card.inc.php:77
 #: include/database.item.php:73 include/database.item.php:67
 #: include/database.item.php:101 include/category_card.inc.php:79
-#: include/fiche.inc.php:70 include/category_card.inc.php:79
-#: include/database.item.php:67 include/database.item.php:102
-#: include/fiche.inc.php:70
+#: include/fiche.inc.php:70 include/database.item.php:102
+#: include/fiche.inc.php:70 include/database.item.php:66
+#: include/database.item.php:101 include/category_card.inc.php:79
 msgid "Balance"
 msgstr ""
 
@@ -1798,9 +1857,9 @@ msgstr ""
 #: include/template/dashboard.php:353 include/template/pcmn_update.php:54
 #: include/ext/amortis/include/template/material_add.php:88
 #: include/ajax/ajax_card.php:304 include/template/dashboard.php:351
-#: include/ajax/ajax_mod_predf_op.php:55 include/template/pcmn_update.php:54
-#: include/template/dashboard.php:351 include/ajax/ajax_mod_predf_op.php:55
-#: include/category_detail.inc.php:68
+#: include/ajax/ajax_mod_predf_op.php:55 include/ajax/ajax_mod_predf_op.php:68
+#: include/category_detail.inc.php:68 include/template/pcmn_update.php:54
+#: include/template/dashboard.php:351
 msgid "Annuler"
 msgstr ""
 
@@ -1967,46 +2026,55 @@ msgstr ""
 #: include/class/acc_ledger_history_generic.class.php:770
 #: include/export/export_balance_pdf.php:127
 #: include/class/payment_method_mtable.class.php:38
-#: include/template/balance_aged_result.php:50
-#: include/template/operation_detail_fin.php:33
-#: include/template/acc_ledger_history_financial_oneline.php:35
-#: include/template/ledger_detail_fin.php:54
-#: include/template/ledger_detail_misc.php:46
-#: include/template/ledger_detail_misc.php:101
-#: include/template/ledger_detail_bottom.php:90
 #: include/template/ledger_detail_bottom.php:356
-#: include/template/new_mod_payment.php:19
-#: include/template/ledger_detail_ven.php:80
-#: include/template/forecast-detail.php:14
-#: include/template/form_ledger_detail.php:56
-#: include/template/impress_reconciliation.php:19
-#: include/template/operation_detail_misc.php:34
-#: include/template/account_result.php:14
-#: include/template/ledger_detail_ach.php:72
-#: include/export/export_gl_pdf.php:88
-#: include/export/export_poste_detail_pdf.php:98
-#: include/export/export_balance_pdf.php:127
-#: include/export/export_gl_csv.php:96 include/balance.inc.php:307
-#: include/class/payment_method_mtable.class.php:38
-#: include/class/print_ledger_detail_item.class.php:60
 #: include/class/print_ledger_detail_item.class.php:158
 #: include/class/acc_ledger_history_generic.class.php:773
-#: include/class/acc_ledger_sold.class.php:703
 #: include/class/acc_ledger_sold.class.php:1410
 #: include/class/acc_ledger.class.php:621
 #: include/class/acc_ledger.class.php:628
-#: include/class/acc_ledger.class.php:881
 #: include/class/acc_ledger.class.php:903
-#: include/class/acc_ledger_fin.class.php:754
-#: include/class/acc_plan_mtable.class.php:47
+#: include/class/acc_ledger_purchase.class.php:1836 include/fiche.inc.php:416
+#: include/class/payment_method_mtable.class.php:39
 #: include/class/anc_operation.class.php:298
-#: include/class/pre_op_advanced.class.php:197
-#: include/class/acc_ledger_purchase.class.php:1425
-#: include/class/acc_ledger_purchase.class.php:1836
+#: include/class/acc_ledger.class.php:605
+#: include/class/acc_ledger.class.php:612
+#: include/class/acc_ledger.class.php:869
+#: include/class/acc_ledger.class.php:891
+#: include/class/acc_ledger_purchase.class.php:1436
+#: include/class/acc_ledger_purchase.class.php:1873
+#: include/class/acc_ledger_sold.class.php:706
+#: include/class/acc_ledger_sold.class.php:1395
+#: include/class/acc_ledger_fin.class.php:754
+#: include/class/pre_op_advanced.class.php:200
+#: include/class/print_ledger_detail_item.class.php:59
+#: include/class/print_ledger_detail_item.class.php:158
+#: include/class/acc_ledger_history_generic.class.php:774
+#: include/class/acc_plan_mtable.class.php:47
 #: include/class/pdf_operation.class.php:150
 #: include/class/pdf_operation.class.php:195
 #: include/class/pdf_operation.class.php:248
-#: include/class/anc_grandlivre.class.php:216
+#: include/class/anc_grandlivre.class.php:228
+#: include/export/export_ledger_csv.php:149
+#: include/export/export_poste_detail_pdf.php:98
+#: include/export/export_gl_csv.php:96
+#: include/export/export_balance_pdf.php:127
+#: include/export/export_gl_pdf.php:88 include/balance.inc.php:307
+#: include/template/ledger_detail_misc.php:46
+#: include/template/ledger_detail_misc.php:101
+#: include/template/form_ledger_detail.php:59
+#: include/template/operation_detail_fin.php:33
+#: include/template/operation_detail_misc.php:34
+#: include/template/ledger_detail_bottom.php:95
+#: include/template/ledger_detail_bottom.php:384
+#: include/template/ledger_detail_ven.php:80
+#: include/template/balance_aged_result.php:50
+#: include/template/acc_ledger_history_financial_oneline.php:35
+#: include/template/account_result.php:14
+#: include/template/forecast-detail.php:14
+#: include/template/ledger_detail_ach.php:72
+#: include/template/new_mod_payment.php:19
+#: include/template/ledger_detail_fin.php:54
+#: include/template/impress_reconciliation.php:19
 #, php-format
 msgid "Libellé"
 msgstr ""
@@ -2025,10 +2093,10 @@ msgstr ""
 #: include/ext/bilan_interne/acc_bilaninterne.class.php:274
 #: include/class/acc_bilan.class.php:70 include/class/anc_print.class.php:142
 #: include/balance.inc.php:77 include/impress_jrn.inc.php:132
-#: include/impress_gl_comptes.inc.php:62
+#: include/class/acc_bilan.class.php:70 include/class/anc_print.class.php:142
+#: include/balance.inc.php:77 include/impress_gl_comptes.inc.php:62
 #: include/template/impress_cat_card.php:14 include/impress_jrn.inc.php:132
-#: include/balance.inc.php:77 include/class/acc_bilan.class.php:70
-#: include/class/anc_print.class.php:142 include/impress_poste.inc.php:86
+#: include/impress_poste.inc.php:86
 msgid "Depuis"
 msgstr ""
 
@@ -2056,10 +2124,11 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:80
 #: include/class/acc_ledger_sold.class.php:80
 #: include/class/acc_ledger.class.php:1039
-#: include/class/acc_ledger_sold.class.php:80
 #: include/class/acc_ledger.class.php:1055
+#: include/class/acc_ledger.class.php:1047
+#: include/class/acc_ledger_purchase.class.php:82
+#: include/class/acc_ledger_sold.class.php:80
 #: include/class/acc_ledger_fin.class.php:70
-#: include/class/acc_ledger_purchase.class.php:80
 msgid "Double Encodage"
 msgstr ""
 
@@ -2091,13 +2160,14 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1028 include/ext/modop/modop_save.php:247
 #: html/recherche.php:58 include/ajax/ajax_todo_list.php:203
 #: include/ajax/ajax_todo_list.php:266 include/class/acc_ledger.class.php:1029
-#: include/class/acc_ledger.class.php:1034 html/export.php:45
-#: html/recherche.php:58 include/ajax/ajax_history.php:26
-#: include/ajax/ajax_todo_list.php:203 include/ajax/ajax_todo_list.php:266
+#: include/class/acc_ledger.class.php:1034
+#: include/class/acc_ledger.class.php:1050 html/export.php:45
+#: html/recherche.php:63 include/class/acc_ledger.class.php:1042
+#: include/class/acc_ledger_purchase.class.php:77
 #: include/class/acc_ledger_sold.class.php:84
-#: include/class/acc_ledger.class.php:1050
 #: include/class/acc_ledger_fin.class.php:74
-#: include/class/acc_ledger_purchase.class.php:75
+#: include/ajax/ajax_todo_list.php:203 include/ajax/ajax_todo_list.php:266
+#: include/ajax/ajax_history.php:26
 msgid "Accès interdit"
 msgstr ""
 
@@ -2123,11 +2193,12 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1054
 #: include/class/acc_ledger.class.php:1055
 #: include/class/acc_ledger.class.php:1060
-#: include/class/acc_ledger_sold.class.php:104
 #: include/class/acc_ledger.class.php:1076
+#: include/class/acc_ledger.class.php:1072
+#: include/class/acc_ledger_purchase.class.php:106
+#: include/class/acc_ledger_sold.class.php:104
 #: include/class/acc_ledger_fin.class.php:110
 #: include/class/acc_ledger_fin.class.php:194
-#: include/class/acc_ledger_purchase.class.php:104
 msgid "Date et periode ne correspondent pas"
 msgstr ""
 
@@ -2147,11 +2218,12 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:109
 #: include/class/acc_ledger_sold.class.php:113
 #: include/class/acc_ledger.class.php:1068
-#: include/class/acc_ledger_sold.class.php:113
 #: include/class/acc_ledger.class.php:1084
+#: include/class/acc_ledger.class.php:1080
+#: include/class/acc_ledger_purchase.class.php:111
+#: include/class/acc_ledger_sold.class.php:113
 #: include/class/acc_ledger_fin.class.php:116
 #: include/class/acc_ledger_fin.class.php:200
-#: include/class/acc_ledger_purchase.class.php:109
 msgid "Periode fermee"
 msgstr ""
 
@@ -2165,9 +2237,9 @@ msgstr ""
 #: include/class/acc_ledger_fin.class.php:126
 #: include/class/acc_ledger_fin.class.php:210
 #: include/class/acc_ledger_purchase.class.php:119
+#: include/class/acc_ledger_purchase.class.php:121
 #: include/class/acc_ledger_fin.class.php:126
 #: include/class/acc_ledger_fin.class.php:210
-#: include/class/acc_ledger_purchase.class.php:119
 msgid "Vous utilisez le mode strict la dernière operation est à la date du "
 msgstr ""
 
@@ -2232,14 +2304,15 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:738
 #: include/class/acc_ledger_purchase.class.php:1462
 #: include/class/acc_ledger.class.php:622
-#: include/template/ledger_detail_fin.php:107
+#: include/class/acc_ledger.class.php:638
+#: include/class/acc_ledger.class.php:622
+#: include/class/acc_ledger_purchase.class.php:1473
+#: include/class/acc_ledger_sold.class.php:741
+#: include/class/acc_ledger_fin.class.php:561
 #: include/template/ledger_detail_misc.php:109
 #: include/template/ledger_detail_ven.php:160
 #: include/template/ledger_detail_ach.php:158
-#: include/class/acc_ledger_sold.class.php:738
-#: include/class/acc_ledger.class.php:638
-#: include/class/acc_ledger_fin.class.php:561
-#: include/class/acc_ledger_purchase.class.php:1462
+#: include/template/ledger_detail_fin.php:107
 msgid "Compt. Analytique"
 msgstr ""
 
@@ -2281,13 +2354,13 @@ msgstr ""
 #: include/class/acc_ledger.class.php:773 include/compta_ods.inc.php:51
 #: include/compta_fin.inc.php:49 include/class/acc_ledger.class.php:774
 #: include/class/acc_ledger_fin.class.php:1052 include/compta_ven.inc.php:251
-#: include/compta_ods.inc.php:51 include/compta_fin.inc.php:49
 #: include/class/acc_ledger_sold.class.php:1132
-#: include/class/acc_ledger.class.php:790
-#: include/class/acc_ledger_fin.class.php:314
-#: include/class/acc_ledger_fin.class.php:1052
-#: include/class/acc_ledger_purchase.class.php:1072
-#: include/compta_ach.inc.php:236
+#: include/class/acc_ledger.class.php:790 include/compta_ach.inc.php:236
+#: include/compta_ven.inc.php:251 include/class/acc_ledger.class.php:777
+#: include/class/acc_ledger_purchase.class.php:1083
+#: include/class/acc_ledger_sold.class.php:1099
+#: include/class/acc_ledger_fin.class.php:314 include/compta_ods.inc.php:51
+#: include/compta_ach.inc.php:235 include/compta_fin.inc.php:49
 msgid "Pas de journal disponible"
 msgstr ""
 
@@ -2299,7 +2372,6 @@ msgstr ""
 #: include/class/acc_ledger_fin.class.php:1041
 #: include/class/acc_ledger_fin.class.php:1040
 #: include/class/acc_ledger_fin.class.php:1057
-#: include/class/acc_ledger_fin.class.php:1057
 msgid "Tous les journaux financiers"
 msgstr ""
 
@@ -2335,12 +2407,11 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:560
 #: include/class/acc_ledger_fin.class.php:1087
 #: include/class/anc_balance_double.class.php:370
-#: include/ajax/ajax_admin.php:149 include/anc_great_ledger.inc.php:23
+#: include/class/acc_ledger_search.class.php:646
+#: include/class/anc_listing.class.php:42
 #: include/class/anc_balance_double.class.php:370
 #: include/class/anc_balance_simple.class.php:193
-#: include/class/acc_ledger_search.class.php:560
-#: include/class/acc_ledger_fin.class.php:1087
-#: include/class/anc_listing.class.php:42
+#: include/ajax/ajax_admin.php:149 include/anc_great_ledger.inc.php:23
 msgid "Rechercher"
 msgstr ""
 
@@ -2389,15 +2460,18 @@ msgstr ""
 #: include/class/follow_up.class.php:1700
 #: include/class/acc_ledger.class.php:207
 #: include/class/anc_acc_list.class.php:334
-#: include/class/acc_ledger.class.php:1044 include/ajax/ajax_gestion.php:69
-#: include/class/acc_ledger_sold.class.php:92
+#: include/class/acc_ledger.class.php:1044
 #: include/class/acc_ledger.class.php:225
 #: include/class/acc_ledger.class.php:1060
-#: include/class/follow_up.class.php:1698
-#: include/class/follow_up.class.php:1700
-#: include/class/acc_ledger_purchase.class.php:89
+#: include/class/follow_up.class.php:1646
+#: include/class/follow_up.class.php:1648
 #: include/class/anc_acc_list.class.php:334
-#: include/class/anc_table.class.php:242 include/anc_od.inc.php:156
+#: include/class/acc_ledger.class.php:224
+#: include/class/acc_ledger.class.php:1052
+#: include/class/acc_ledger_purchase.class.php:91
+#: include/class/acc_ledger_sold.class.php:92
+#: include/class/anc_table.class.php:242 include/ajax/ajax_gestion.php:69
+#: include/anc_od.inc.php:156
 msgid "Date invalide"
 msgstr ""
 
@@ -2415,6 +2489,8 @@ msgstr ""
 #: include/class/acc_ledger.class.php:221
 #: include/class/acc_ledger.class.php:235
 #: include/class/acc_ledger.class.php:239
+#: include/class/acc_ledger.class.php:234
+#: include/class/acc_ledger.class.php:238
 msgid "Cette opération n'existe pas"
 msgstr ""
 
@@ -2426,6 +2502,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:228
 #: include/class/acc_ledger.class.php:229
 #: include/class/acc_ledger.class.php:247
+#: include/class/acc_ledger.class.php:246
 msgid "PERIODE FERMEE"
 msgstr ""
 
@@ -2449,9 +2526,9 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:930
 #: include/class/acc_ledger_search.class.php:677
 #: include/class/acc_ledger_search.class.php:943
-#: include/class/acc_ledger_search.class.php:677
-#: include/class/acc_ledger_search.class.php:943
-#: include/class/follow_up.class.php:775
+#: include/class/follow_up.class.php:775 include/class/follow_up.class.php:688
+#: include/class/acc_ledger_search.class.php:763
+#: include/class/acc_ledger_search.class.php:1032
 msgid "Aucun enregistrement trouvé"
 msgstr ""
 
@@ -2476,8 +2553,8 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:950
 #: include/class/acc_ledger_search.class.php:708
 #: include/class/acc_ledger_search.class.php:963
-#: include/class/acc_ledger_search.class.php:708
-#: include/class/acc_ledger_search.class.php:963
+#: include/class/acc_ledger_search.class.php:794
+#: include/class/acc_ledger_search.class.php:1052
 msgid "Concerne"
 msgstr ""
 
@@ -2504,9 +2581,9 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:864
 #: include/class/acc_ledger_search.class.php:706
 #: include/class/acc_ledger_search.class.php:877
+#: include/class/acc_ledger_search.class.php:792
+#: include/class/acc_ledger_search.class.php:966
 #: include/template/ledger_detail_ven.php:86
-#: include/class/acc_ledger_search.class.php:706
-#: include/class/acc_ledger_search.class.php:877
 msgid "Payé"
 msgstr ""
 
@@ -2518,6 +2595,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:427
 #: include/class/acc_ledger.class.php:428
 #: include/class/acc_ledger.class.php:443
+#: include/class/acc_ledger.class.php:442
 msgid "Parametres journaux non trouves"
 msgstr ""
 
@@ -2736,71 +2814,80 @@ msgstr ""
 #: include/class/acc_ledger_history_purchase.class.php:249
 #: include/export/export_ledger_csv.php:219
 #: include/class/acc_ledger_history_purchase.class.php:253
-#: include/audit_log.php:37 include/template/letter_prop.php:25
-#: include/template/letter_prop.php:68
-#: include/template/print_ledger_simple.php:7
-#: include/template/acc_ledger_history_financial_oneline.php:31
-#: include/template/ledger_detail_fin.php:25
-#: include/template/ledger_detail_misc.php:34
-#: include/template/acc_ledger_history_sale_detail.php:34
-#: include/template/action_display_short.php:86
-#: include/template/acc_ledger_history_purchase_detail.php:33
-#: include/template/dashboard.php:345 include/template/ledger_detail_ven.php:32
-#: include/template/acc_ledger_history_purchase_oneline.php:35
-#: include/template/form_ledger_detail.php:22
-#: include/template/todo_list_display.php:44
-#: include/template/impress_reconciliation.php:10
-#: include/template/detail-action.php:95
-#: include/template/acc_ledger_history_sale_oneline.php:32
-#: include/template/acc_ledger_history_purchase_extended.php:31
-#: include/template/acc_ledger_history_sale_extended.php:31
-#: include/template/form_ledger_fin.php:20
-#: include/template/form_ledger_fin.php:39 include/template/letter_all.php:23
-#: include/template/stock_inv.php:37
-#: include/template/action_search_result.php:44
-#: include/template/ledger_detail_ach.php:24
-#: include/export/export_gl_pdf.php:88
-#: include/export/export_stock_histo_csv.php:40
-#: include/export/export_fiche_balance_csv.php:153
-#: include/export/export_poste_detail_csv.php:78
-#: include/export/export_poste_detail_csv.php:198
-#: include/export/export_poste_detail_pdf.php:92
-#: include/export/export_ledger_csv.php:219
 #: include/export/export_printtva_pdf.php:45
-#: include/export/export_histo_csv.php:38
-#: include/export/export_fiche_detail_csv.php:70
-#: include/export/export_gl_csv.php:96 include/stock_inv_histo.inc.php:75
-#: include/ajax/ajax_display_letter.php:54
-#: include/balance_card_ageing.inc.php:58 include/fiche.inc.php:527
-#: include/class/print_ledger_simple.class.php:100
-#: include/class/print_ledger_detail_item.class.php:57
 #: include/class/acc_ledger_history_generic.class.php:683
 #: include/class/acc_ledger_history_generic.class.php:770
-#: include/class/acc_ledger_sold.class.php:687
 #: include/class/acc_ledger_sold.class.php:1406
 #: include/class/acc_ledger.class.php:617
 #: include/class/acc_ledger.class.php:830
-#: include/class/acc_ledger_history_purchase.class.php:253
-#: include/class/acc_ledger_search.class.php:638
-#: include/class/acc_ledger_search.class.php:957
+#: include/class/acc_ledger_purchase.class.php:1832 include/fiche.inc.php:540
+#: include/class/acc_ledger_history_sale.class.php:252
+#: include/class/anc_operation.class.php:297
 #: include/class/anc_group_operation.class.php:111
-#: include/class/acc_ledger_fin.class.php:548
-#: include/class/acc_ledger_fin.class.php:753
-#: include/class/print_ledger_misc.class.php:43
-#: include/class/anc_listing.class.php:79
 #: include/class/acc_reconciliation.class.php:483
 #: include/class/acc_reconciliation.class.php:491
 #: include/class/acc_reconciliation.class.php:507
-#: include/class/acc_ledger_history_sale.class.php:242
-#: include/class/anc_operation.class.php:297
-#: include/class/acc_account_ledger.class.php:392
-#: include/class/fiche.class.php:1397 include/class/fiche.class.php:1472
-#: include/class/acc_ledger_purchase.class.php:1407
-#: include/class/acc_ledger_purchase.class.php:1832
+#: include/class/acc_ledger_search.class.php:724
+#: include/class/acc_ledger_search.class.php:1046
+#: include/class/acc_ledger_history_purchase.class.php:264
+#: include/class/acc_ledger.class.php:601
+#: include/class/acc_ledger.class.php:818
+#: include/class/print_ledger_misc.class.php:42
+#: include/class/fiche.class.php:1424 include/class/fiche.class.php:1499
+#: include/class/anc_listing.class.php:79
+#: include/class/card_attribut_mtable.class.php:52
+#: include/class/acc_ledger_purchase.class.php:1418
+#: include/class/acc_ledger_purchase.class.php:1869
+#: include/class/acc_ledger_sold.class.php:690
+#: include/class/acc_ledger_sold.class.php:1391
+#: include/class/acc_ledger_fin.class.php:548
+#: include/class/acc_ledger_fin.class.php:753
+#: include/class/print_ledger_simple.class.php:97
+#: include/class/contact_option_ref_mtable.class.php:45
+#: include/class/acc_account_ledger.class.php:384
+#: include/class/print_ledger_detail_item.class.php:56
+#: include/class/acc_ledger_history_generic.class.php:684
+#: include/class/acc_ledger_history_generic.class.php:771
+#: include/class/balance_age.class.php:147
 #: include/class/pdf_operation.class.php:67
-#: include/class/anc_grandlivre.class.php:213
-#: include/class/balance_age.class.php:147 include/lib/ac_common.php:1210
-#: include/card_attr.inc.php:80
+#: include/class/anc_grandlivre.class.php:225 include/audit_log.php:37
+#: include/ajax/ajax_display_letter.php:68
+#: include/export/export_printtva_pdf.php:47
+#: include/export/export_ledger_csv.php:227
+#: include/export/export_poste_detail_pdf.php:92
+#: include/export/export_gl_csv.php:96
+#: include/export/export_poste_detail_csv.php:78
+#: include/export/export_poste_detail_csv.php:198
+#: include/export/export_gl_pdf.php:88
+#: include/export/export_fiche_detail_csv.php:70
+#: include/export/export_stock_histo_csv.php:40
+#: include/export/export_histo_csv.php:41
+#: include/export/export_fiche_balance_csv.php:153
+#: include/template/ledger_detail_misc.php:34
+#: include/template/print_ledger_simple.php:7
+#: include/template/form_ledger_detail.php:25
+#: include/template/todo_list_display.php:44
+#: include/template/acc_ledger_history_purchase_extended.php:31
+#: include/template/action_display_short.php:86
+#: include/template/form_ledger_fin.php:20
+#: include/template/form_ledger_fin.php:39
+#: include/template/acc_ledger_history_sale_detail.php:34
+#: include/template/ledger_detail_ven.php:32
+#: include/template/detail-action.php:102
+#: include/template/acc_ledger_history_purchase_oneline.php:35
+#: include/template/letter_all.php:23
+#: include/template/acc_ledger_history_sale_oneline.php:32
+#: include/template/acc_ledger_history_financial_oneline.php:31
+#: include/template/acc_ledger_history_purchase_detail.php:33
+#: include/template/stock_inv.php:37
+#: include/template/action_search_result.php:44
+#: include/template/acc_ledger_history_sale_extended.php:31
+#: include/template/ledger_detail_ach.php:24
+#: include/template/letter_prop.php:25 include/template/letter_prop.php:68
+#: include/template/dashboard.php:345 include/template/ledger_detail_fin.php:25
+#: include/template/impress_reconciliation.php:10
+#: include/stock_inv_histo.inc.php:75 include/lib/ac_common.php:1220
+#: include/balance_card_ageing.inc.php:58
 #, php-format
 msgid "Date"
 msgstr ""
@@ -2827,9 +2914,10 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:693
 #: include/class/acc_ledger_purchase.class.php:1415
 #: include/class/acc_ledger.class.php:604
-#: include/class/acc_ledger_sold.class.php:693
 #: include/class/acc_ledger.class.php:620
-#: include/class/acc_ledger_purchase.class.php:1415
+#: include/class/acc_ledger.class.php:604
+#: include/class/acc_ledger_purchase.class.php:1426
+#: include/class/acc_ledger_sold.class.php:696
 msgid "Période Comptable"
 msgstr ""
 
@@ -2841,6 +2929,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:605
 #: include/class/acc_ledger.class.php:606
 #: include/class/acc_ledger.class.php:622
+#: include/class/acc_ledger.class.php:606
 msgid "PJ Num"
 msgstr ""
 
@@ -2852,6 +2941,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:609
 #: include/class/acc_ledger.class.php:610
 #: include/class/acc_ledger.class.php:626
+#: include/class/acc_ledger.class.php:610
 msgid "Quick Code ou "
 msgstr ""
 
@@ -2936,23 +3026,29 @@ msgstr ""
 #: include/class/anc_listing.class.php:80 include/class/fiche.class.php:1473
 #: include/class/acc_ledger_history_generic.class.php:768
 #: include/class/fiche.class.php:1474
-#: include/template/ledger_detail_ven.php:154
-#: include/template/ledger_detail_ach.php:152
-#: include/export/export_poste_detail_csv.php:79
-#: include/export/export_poste_detail_csv.php:194
-#: include/export/export_fiche_detail_csv.php:69
-#: include/ajax/ajax_display_letter.php:50 include/database.item.php:64
-#: include/database.item.php:79
 #: include/class/print_ledger_detail_item.class.php:157
 #: include/class/acc_ledger_history_generic.class.php:771
 #: include/class/acc_ledger_sold.class.php:1414
 #: include/class/acc_ledger.class.php:627
 #: include/class/acc_ledger.class.php:902
-#: include/class/anc_listing.class.php:80 include/class/fiche.class.php:1474
-#: include/class/pre_op_advanced.class.php:196
-#: include/class/acc_ledger_purchase.class.php:1840
-#: include/class/anc_grandlivre.class.php:214
+#: include/class/acc_ledger_purchase.class.php:1840 include/fiche.inc.php:417
+#: include/class/acc_ledger.class.php:611
+#: include/class/acc_ledger.class.php:890 include/class/fiche.class.php:1501
+#: include/class/anc_listing.class.php:80
+#: include/class/acc_ledger_purchase.class.php:1877
+#: include/class/acc_ledger_sold.class.php:1399
+#: include/class/pre_op_advanced.class.php:199
 #: include/class/anc_table.class.php:441
+#: include/class/print_ledger_detail_item.class.php:157
+#: include/class/acc_ledger_history_generic.class.php:772
+#: include/class/anc_grandlivre.class.php:226
+#: include/ajax/ajax_display_letter.php:64
+#: include/export/export_poste_detail_csv.php:79
+#: include/export/export_poste_detail_csv.php:194
+#: include/export/export_fiche_detail_csv.php:69
+#: include/template/ledger_detail_ven.php:154
+#: include/template/ledger_detail_ach.php:152 include/database.item.php:63
+#: include/database.item.php:78
 msgid "Poste"
 msgstr ""
 
@@ -3043,30 +3139,35 @@ msgstr ""
 #: include/class/acc_ledger_history_generic.class.php:771
 #: include/class/fiche.class.php:1479
 #: include/class/pdfbalance_simple.class.php:56
-#: include/impress_gl_comptes.inc.php:216 include/template/letter_prop.php:37
-#: include/template/letter_prop.php:80
-#: include/template/ledger_detail_misc.php:102
-#: include/template/ledger_detail_bottom.php:91
-#: include/template/anc_balance_group.php:49
-#: include/template/operation_detail_misc.php:35
-#: include/template/letter_all.php:35 include/export/export_gl_pdf.php:88
-#: include/export/export_fiche_balance_csv.php:157
-#: include/export/export_poste_detail_csv.php:88
-#: include/export/export_poste_detail_pdf.php:247
-#: include/export/export_fiche_detail_csv.php:77
-#: include/export/export_gl_csv.php:96 include/verif_bilan.inc.php:74
-#: include/operation_ods_new.inc.php:84 include/balance.inc.php:315
-#: include/class/anc_balance_double.class.php:99
 #: include/class/acc_ledger_history_generic.class.php:774
 #: include/class/acc_ledger.class.php:629
-#: include/class/acc_ledger.class.php:905
-#: include/class/anc_group_operation.class.php:137
-#: include/class/acc_account_ledger.class.php:399
-#: include/class/fiche.class.php:1479
-#: include/class/pre_op_advanced.class.php:199
-#: include/class/anc_grandlivre.class.php:220
+#: include/class/acc_ledger.class.php:905 include/fiche.inc.php:418
+#: include/class/anticipation.class.php:420
+#: include/class/anc_group_operation.class.php:138
+#: include/class/acc_ledger.class.php:613
+#: include/class/acc_ledger.class.php:893
 #: include/class/pdfbalance_simple.class.php:56
-#: include/class/anticipation.class.php:420 include/anc_od.inc.php:148
+#: include/class/fiche.class.php:1506
+#: include/class/anc_balance_double.class.php:99
+#: include/class/acc_account_ledger.class.php:391
+#: include/class/pre_op_advanced.class.php:202
+#: include/class/acc_ledger_history_generic.class.php:775
+#: include/class/anc_grandlivre.class.php:233
+#: include/export/export_balance_csv.php:79
+#: include/export/export_poste_detail_pdf.php:247
+#: include/export/export_gl_csv.php:96
+#: include/export/export_poste_detail_csv.php:88
+#: include/export/export_gl_pdf.php:88
+#: include/export/export_fiche_detail_csv.php:77
+#: include/export/export_fiche_balance_csv.php:157 include/balance.inc.php:315
+#: include/impress_gl_comptes.inc.php:216
+#: include/template/ledger_detail_misc.php:102
+#: include/template/operation_detail_misc.php:35
+#: include/template/ledger_detail_bottom.php:96
+#: include/template/letter_all.php:35 include/template/anc_balance_group.php:49
+#: include/template/letter_prop.php:37 include/template/letter_prop.php:80
+#: include/operation_ods_new.inc.php:85 include/anc_od.inc.php:148
+#: include/verif_bilan.inc.php:74
 msgid "Débit"
 msgstr ""
 
@@ -3138,25 +3239,29 @@ msgstr ""
 #: include/class/acc_ledger_history_generic.class.php:772
 #: include/class/fiche.class.php:1480
 #: include/class/pdfbalance_simple.class.php:57
-#: include/impress_gl_comptes.inc.php:215 include/template/letter_prop.php:40
-#: include/template/letter_prop.php:83
-#: include/template/ledger_detail_misc.php:103
-#: include/template/ledger_detail_bottom.php:92
-#: include/template/operation_detail_misc.php:36
-#: include/template/letter_all.php:38 include/export/export_gl_pdf.php:88
-#: include/export/export_poste_detail_csv.php:89
-#: include/export/export_poste_detail_pdf.php:250
-#: include/export/export_fiche_detail_csv.php:78
-#: include/export/export_gl_csv.php:96 include/verif_bilan.inc.php:74
-#: include/operation_ods_new.inc.php:85 include/balance.inc.php:316
-#: include/class/anc_balance_double.class.php:100
 #: include/class/acc_ledger_history_generic.class.php:775
-#: include/class/acc_ledger.class.php:630
-#: include/class/acc_account_ledger.class.php:400
-#: include/class/fiche.class.php:1480
-#: include/class/anc_grandlivre.class.php:221
+#: include/class/acc_ledger.class.php:630 include/fiche.inc.php:419
+#: include/class/anticipation.class.php:421
+#: include/class/acc_ledger.class.php:614
 #: include/class/pdfbalance_simple.class.php:57
-#: include/class/anticipation.class.php:421 include/anc_od.inc.php:149
+#: include/class/fiche.class.php:1507
+#: include/class/anc_balance_double.class.php:100
+#: include/class/acc_account_ledger.class.php:392
+#: include/class/acc_ledger_history_generic.class.php:776
+#: include/class/anc_grandlivre.class.php:234
+#: include/export/export_balance_csv.php:79
+#: include/export/export_poste_detail_pdf.php:250
+#: include/export/export_gl_csv.php:96
+#: include/export/export_poste_detail_csv.php:89
+#: include/export/export_gl_pdf.php:88
+#: include/export/export_fiche_detail_csv.php:78 include/balance.inc.php:316
+#: include/impress_gl_comptes.inc.php:215
+#: include/template/ledger_detail_misc.php:103
+#: include/template/operation_detail_misc.php:36
+#: include/template/ledger_detail_bottom.php:97
+#: include/template/letter_all.php:38 include/template/letter_prop.php:40
+#: include/template/letter_prop.php:83 include/operation_ods_new.inc.php:86
+#: include/anc_od.inc.php:149 include/verif_bilan.inc.php:74
 msgid "Crédit"
 msgstr ""
 
@@ -3215,22 +3320,23 @@ msgstr ""
 #: include/template/acc_ledger_history_sale_oneline.php:121
 #: include/template/acc_ledger_history_purchase_extended.php:160
 #: include/template/acc_ledger_history_sale_extended.php:161
+#: include/class/acc_ledger_history_generic.class.php:741
+#: include/class/acc_ledger.class.php:740 include/fiche.inc.php:459
+#: include/class/acc_ledger.class.php:724 include/class/fiche.class.php:1589
+#: include/class/acc_ledger_purchase.class.php:1601
+#: include/class/acc_ledger_sold.class.php:848
+#: include/class/acc_account_ledger.class.php:431
+#: include/class/acc_ledger_history_generic.class.php:742
+#: include/class/balance_age.class.php:234
+#: include/export/export_fiche_balance_pdf.php:153
 #: include/template/print_ledger_simple.php:143
+#: include/template/acc_ledger_history_purchase_extended.php:160
 #: include/template/acc_ledger_history_sale_detail.php:155
-#: include/template/acc_ledger_history_purchase_detail.php:168
 #: include/template/acc_ledger_history_purchase_oneline.php:141
 #: include/template/acc_ledger_history_sale_oneline.php:121
-#: include/template/acc_ledger_history_purchase_extended.php:160
+#: include/template/acc_ledger_history_purchase_detail.php:168
 #: include/template/acc_ledger_history_sale_extended.php:161
 #: include/template/forecast_result.php:31
-#: include/export/export_fiche_balance_pdf.php:153 include/fiche.inc.php:447
-#: include/class/acc_ledger_history_generic.class.php:741
-#: include/class/acc_ledger_sold.class.php:844
-#: include/class/acc_ledger.class.php:740
-#: include/class/acc_account_ledger.class.php:439
-#: include/class/fiche.class.php:1564
-#: include/class/acc_ledger_purchase.class.php:1588
-#: include/class/balance_age.class.php:234
 msgid "Totaux"
 msgstr ""
 
@@ -3242,6 +3348,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:727
 #: include/class/acc_ledger.class.php:728
 #: include/class/acc_ledger.class.php:744
+#: include/class/acc_ledger.class.php:728
 msgid "verifie Imputation Analytique"
 msgstr ""
 
@@ -3280,8 +3387,10 @@ msgstr ""
 #: include/class/acc_ledger.class.php:837
 #: include/class/acc_ledger_sold.class.php:1112
 #: include/class/acc_ledger.class.php:853
+#: include/class/acc_ledger.class.php:841
+#: include/class/acc_ledger_purchase.class.php:1057
+#: include/class/acc_ledger_sold.class.php:1079
 #: include/class/acc_ledger_fin.class.php:294
-#: include/class/acc_ledger_purchase.class.php:1046
 msgid "Aucune période ouverte"
 msgstr ""
 
@@ -3318,7 +3427,9 @@ msgstr ""
 #: include/class/acc_ledger.class.php:842
 #: include/class/acc_ledger_sold.class.php:1116
 #: include/class/acc_ledger.class.php:858
-#: include/class/acc_ledger_purchase.class.php:1052
+#: include/class/acc_ledger.class.php:846
+#: include/class/acc_ledger_purchase.class.php:1063
+#: include/class/acc_ledger_sold.class.php:1083
 msgid "Période comptable"
 msgstr ""
 
@@ -3417,30 +3528,33 @@ msgstr ""
 #: include/class/print_ledger_simple.class.php:99
 #: include/class/acc_ledger_history_purchase.class.php:252
 #: include/class/acc_ledger_history_purchase.class.php:256
-#: include/template/balance_aged_result.php:47
-#: include/template/print_ledger_simple.php:6
-#: include/template/acc_ledger_history_financial_oneline.php:33
-#: include/template/ledger_detail_fin.php:66
+#: include/class/acc_ledger_sold.class.php:1411
+#: include/class/acc_ledger.class.php:874
+#: include/class/acc_ledger_purchase.class.php:1837
+#: include/class/acc_ledger_history_sale.class.php:255
+#: include/class/acc_ledger_search.class.php:732
+#: include/class/acc_ledger_search.class.php:1047
+#: include/class/acc_ledger_history_purchase.class.php:267
+#: include/class/acc_ledger.class.php:862
+#: include/class/acc_ledger_purchase.class.php:1874
+#: include/class/acc_ledger_sold.class.php:1396
+#: include/class/print_ledger_simple.class.php:96
+#: include/class/pdf_operation.class.php:79
+#: include/class/anc_grandlivre.class.php:231
+#: include/export/export_gl_csv.php:96 include/export/export_gl_pdf.php:88
 #: include/template/ledger_detail_misc.php:62
+#: include/template/print_ledger_simple.php:6
+#: include/template/acc_ledger_history_purchase_extended.php:37
 #: include/template/acc_ledger_history_sale_detail.php:33
-#: include/template/acc_ledger_history_purchase_detail.php:32
 #: include/template/ledger_detail_ven.php:71
 #: include/template/acc_ledger_history_purchase_oneline.php:41
 #: include/template/acc_ledger_history_sale_oneline.php:38
-#: include/template/acc_ledger_history_purchase_extended.php:37
+#: include/template/balance_aged_result.php:47
+#: include/template/acc_ledger_history_financial_oneline.php:33
+#: include/template/acc_ledger_history_purchase_detail.php:32
 #: include/template/acc_ledger_history_sale_extended.php:37
 #: include/template/ledger_detail_ach.php:63
-#: include/export/export_gl_pdf.php:88 include/export/export_gl_csv.php:96
-#: include/class/print_ledger_simple.class.php:99
-#: include/class/acc_ledger_sold.class.php:1411
-#: include/class/acc_ledger.class.php:874
-#: include/class/acc_ledger_history_purchase.class.php:256
-#: include/class/acc_ledger_search.class.php:646
-#: include/class/acc_ledger_search.class.php:958
-#: include/class/acc_ledger_history_sale.class.php:245
-#: include/class/acc_ledger_purchase.class.php:1837
-#: include/class/pdf_operation.class.php:79
-#: include/class/anc_grandlivre.class.php:218 include/lib/ac_common.php:1212
+#: include/template/ledger_detail_fin.php:66 include/lib/ac_common.php:1222
 msgid "Pièce"
 msgstr ""
 
@@ -3552,32 +3666,33 @@ msgstr ""
 #: include/class/acc_ledger_fin.class.php:754
 #: include/class/anc_listing.class.php:86 include/class/fiche.class.php:1398
 #: include/lib/ac_common.php:1215 include/fiche.inc.php:531
-#: include/class/fiche.class.php:1399
-#: include/template/operation_detail_fin.php:34
-#: include/template/acc_ledger_history_financial_oneline.php:36
-#: include/template/ledger_detail_misc.php:54
-#: include/template/ledger_detail_ven.php:157
-#: include/template/forecast-detail.php:15
-#: include/template/impress_reconciliation.php:22
-#: include/template/form_ledger_fin.php:43
-#: include/template/ledger_detail_ach.php:155
-#: include/export/export_anc_axis_csv.php:46
-#: include/export/export_poste_detail_csv.php:201
-#: include/export/export_form_csv.php:72
-#: include/ajax/ajax_anc_detail_operation.php:56 include/fiche.inc.php:531
-#: include/class/acc_ledger_sold.class.php:730
-#: include/class/acc_ledger.class.php:904
-#: include/class/acc_ledger_search.class.php:652
-#: include/class/acc_ledger_search.class.php:962
-#: include/class/anc_group_operation.class.php:136
+#: include/class/fiche.class.php:1399 include/class/acc_ledger.class.php:904
+#: include/fiche.inc.php:544 include/class/anc_group_operation.class.php:137
+#: include/class/acc_ledger_search.class.php:738
+#: include/class/acc_ledger_search.class.php:1051
+#: include/class/acc_ledger.class.php:892
+#: include/class/print_ledger_misc.class.php:47
+#: include/class/fiche.class.php:1426 include/class/anc_listing.class.php:86
+#: include/class/acc_ledger_purchase.class.php:1463
+#: include/class/acc_ledger_sold.class.php:733
 #: include/class/acc_ledger_fin.class.php:551
 #: include/class/acc_ledger_fin.class.php:754
-#: include/class/print_ledger_misc.class.php:48
-#: include/class/anc_listing.class.php:86 include/class/fiche.class.php:1399
-#: include/class/pre_op_advanced.class.php:198
-#: include/class/acc_ledger_purchase.class.php:1452
+#: include/class/pre_op_advanced.class.php:201
 #: include/class/pdf_operation.class.php:249
-#: include/class/pdf_operation.class.php:283 include/lib/ac_common.php:1215
+#: include/class/pdf_operation.class.php:283
+#: include/ajax/ajax_anc_detail_operation.php:56
+#: include/export/export_anc_axis_csv.php:46
+#: include/export/export_form_csv.php:72
+#: include/export/export_poste_detail_csv.php:201
+#: include/template/ledger_detail_misc.php:54
+#: include/template/operation_detail_fin.php:34
+#: include/template/form_ledger_fin.php:43
+#: include/template/ledger_detail_ven.php:157
+#: include/template/acc_ledger_history_financial_oneline.php:36
+#: include/template/forecast-detail.php:15
+#: include/template/ledger_detail_ach.php:155
+#: include/template/impress_reconciliation.php:22
+#: include/lib/ac_common.php:1225
 msgid "Montant"
 msgstr ""
 
@@ -3624,6 +3739,8 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1252
 #: include/class/acc_ledger.class.php:1125
 #: include/class/acc_ledger.class.php:1268
+#: include/class/acc_ledger.class.php:1121
+#: include/class/acc_ledger.class.php:1264
 #, php-format
 msgid "La fiche %s n'a pas de poste comptable"
 msgstr ""
@@ -3638,6 +3755,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1107
 #: include/class/acc_ledger.class.php:1114
 #: include/class/acc_ledger.class.php:1130
+#: include/class/acc_ledger.class.php:1126
 msgid "Poste Inexistant pour la fiche ["
 msgstr ""
 
@@ -3673,6 +3791,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1119
 #: include/class/acc_ledger.class.php:1128
 #: include/class/acc_ledger.class.php:1144
+#: include/class/acc_ledger.class.php:1140
 msgid "Poste invalide ["
 msgstr ""
 
@@ -3686,6 +3805,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1122
 #: include/class/acc_ledger.class.php:1131
 #: include/class/acc_ledger.class.php:1147
+#: include/class/acc_ledger.class.php:1143
 msgid "Poste Inexistant ["
 msgstr ""
 
@@ -3699,6 +3819,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1149
 #: include/class/acc_ledger.class.php:1158
 #: include/class/acc_ledger.class.php:1174
+#: include/class/acc_ledger.class.php:1170
 msgid "Balance incorrecte "
 msgstr ""
 
@@ -3737,6 +3858,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2205
 #: include/class/acc_ledger.class.php:2214
 #: include/class/acc_ledger.class.php:2230
+#: include/class/acc_ledger.class.php:2249
 msgid "Journal n'existe pas"
 msgstr ""
 
@@ -3759,8 +3881,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1698
 #: include/class/acc_ledger_purchase.class.php:1701
 #: include/class/print_ledger_simple.class.php:274
-#: include/class/print_ledger_simple.class.php:274
-#: include/class/acc_ledger_purchase.class.php:1701
+#: include/class/acc_ledger_purchase.class.php:1722
+#: include/class/print_ledger_simple.class.php:297
 msgid "Payé par"
 msgstr ""
 
@@ -3768,7 +3890,7 @@ msgstr ""
 #: include/class_acc_ledger_purchase.php:84
 #: include/class/class_acc_ledger_purchase.php:84
 #: include/class/acc_ledger_purchase.class.php:84
-#: include/class/acc_ledger_purchase.class.php:84
+#: include/class/acc_ledger_purchase.class.php:86
 msgid "Vous n'avez pas donné de fournisseur"
 msgstr ""
 
@@ -3776,7 +3898,7 @@ msgstr ""
 #: include/class_acc_ledger_purchase.php:120
 #: include/class/class_acc_ledger_purchase.php:120
 #: include/class/acc_ledger_purchase.class.php:120
-#: include/class/acc_ledger_purchase.class.php:120
+#: include/class/acc_ledger_purchase.class.php:122
 msgid " vous ne pouvez pas encoder à une  date antérieure dans ce journal"
 msgstr ""
 
@@ -3844,6 +3966,14 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:210
 #: include/class/acc_ledger_purchase.class.php:200
 #: include/class/acc_ledger_purchase.class.php:225
+#: include/class/acc_ledger_purchase.class.php:132
+#: include/class/acc_ledger_purchase.class.php:157
+#: include/class/acc_ledger_purchase.class.php:174
+#: include/class/acc_ledger_purchase.class.php:176
+#: include/class/acc_ledger_purchase.class.php:182
+#: include/class/acc_ledger_purchase.class.php:187
+#: include/class/acc_ledger_purchase.class.php:202
+#: include/class/acc_ledger_purchase.class.php:227
 #: include/class/acc_ledger_sold.class.php:129
 #: include/class/acc_ledger_sold.class.php:152
 #: include/class/acc_ledger_sold.class.php:164
@@ -3852,14 +3982,6 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:176
 #: include/class/acc_ledger_sold.class.php:180
 #: include/class/acc_ledger_sold.class.php:210
-#: include/class/acc_ledger_purchase.class.php:130
-#: include/class/acc_ledger_purchase.class.php:155
-#: include/class/acc_ledger_purchase.class.php:172
-#: include/class/acc_ledger_purchase.class.php:174
-#: include/class/acc_ledger_purchase.class.php:180
-#: include/class/acc_ledger_purchase.class.php:185
-#: include/class/acc_ledger_purchase.class.php:200
-#: include/class/acc_ledger_purchase.class.php:225
 msgid "La fiche "
 msgstr ""
 
@@ -3880,10 +4002,10 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:129
 #: include/class/acc_ledger_sold.class.php:171
 #: include/class/acc_ledger_purchase.class.php:200
+#: include/class/acc_ledger_purchase.class.php:132
+#: include/class/acc_ledger_purchase.class.php:202
 #: include/class/acc_ledger_sold.class.php:129
 #: include/class/acc_ledger_sold.class.php:171
-#: include/class/acc_ledger_purchase.class.php:130
-#: include/class/acc_ledger_purchase.class.php:200
 msgid "n'a pas de poste comptable"
 msgstr ""
 
@@ -3904,10 +4026,10 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:145
 #: include/class/acc_ledger_sold.class.php:204
 #: include/class/acc_ledger_purchase.class.php:219
+#: include/class/acc_ledger_purchase.class.php:151
+#: include/class/acc_ledger_purchase.class.php:221
 #: include/class/acc_ledger_sold.class.php:145
 #: include/class/acc_ledger_sold.class.php:204
-#: include/class/acc_ledger_purchase.class.php:149
-#: include/class/acc_ledger_purchase.class.php:219
 msgid "Pour la fiche "
 msgstr ""
 
@@ -3923,9 +4045,9 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:149
 #: include/class/acc_ledger_sold.class.php:145
 #: include/class/acc_ledger_sold.class.php:204
+#: include/class/acc_ledger_purchase.class.php:151
 #: include/class/acc_ledger_sold.class.php:145
 #: include/class/acc_ledger_sold.class.php:204
-#: include/class/acc_ledger_purchase.class.php:149
 msgid " le poste comptable ["
 msgstr ""
 
@@ -3943,9 +4065,9 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:220
 #: include/class/acc_ledger_sold.class.php:204
 #: include/class/acc_ledger_purchase.class.php:219
+#: include/class/acc_ledger_purchase.class.php:151
+#: include/class/acc_ledger_purchase.class.php:221
 #: include/class/acc_ledger_sold.class.php:204
-#: include/class/acc_ledger_purchase.class.php:149
-#: include/class/acc_ledger_purchase.class.php:219
 msgid "n'existe pas"
 msgstr ""
 
@@ -3966,10 +4088,10 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:152
 #: include/class/acc_ledger_sold.class.php:210
 #: include/class/acc_ledger_purchase.class.php:225
+#: include/class/acc_ledger_purchase.class.php:157
+#: include/class/acc_ledger_purchase.class.php:227
 #: include/class/acc_ledger_sold.class.php:152
 #: include/class/acc_ledger_sold.class.php:210
-#: include/class/acc_ledger_purchase.class.php:155
-#: include/class/acc_ledger_purchase.class.php:225
 msgid "n'est pas accessible à ce journal"
 msgstr ""
 
@@ -3977,7 +4099,7 @@ msgstr ""
 #: include/class_acc_ledger_purchase.php:172
 #: include/class/class_acc_ledger_purchase.php:172
 #: include/class/acc_ledger_purchase.class.php:172
-#: include/class/acc_ledger_purchase.class.php:172
+#: include/class/acc_ledger_purchase.class.php:174
 msgid "a un montant invalide"
 msgstr ""
 
@@ -3985,7 +4107,7 @@ msgstr ""
 #: include/class_acc_ledger_purchase.php:174
 #: include/class/class_acc_ledger_purchase.php:174
 #: include/class/acc_ledger_purchase.class.php:174
-#: include/class/acc_ledger_purchase.class.php:174
+#: include/class/acc_ledger_purchase.class.php:176
 msgid "a une quantité invalide"
 msgstr ""
 
@@ -4005,10 +4127,10 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:185
 #: include/class/acc_ledger_sold.class.php:176
 #: include/class/acc_ledger_sold.class.php:180
+#: include/class/acc_ledger_purchase.class.php:182
+#: include/class/acc_ledger_purchase.class.php:187
 #: include/class/acc_ledger_sold.class.php:176
 #: include/class/acc_ledger_sold.class.php:180
-#: include/class/acc_ledger_purchase.class.php:180
-#: include/class/acc_ledger_purchase.class.php:185
 msgid "a un code tva invalide"
 msgstr ""
 
@@ -4022,8 +4144,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:194
 #: include/class/acc_ledger_sold.class.php:190
 #: include/class/acc_ledger_purchase.class.php:193
+#: include/class/acc_ledger_purchase.class.php:195
 #: include/class/acc_ledger_sold.class.php:190
-#: include/class/acc_ledger_purchase.class.php:193
 msgid " La TVA "
 msgstr ""
 
@@ -4032,7 +4154,7 @@ msgstr ""
 #: include/class/class_acc_ledger_purchase.php:220
 #: include/class/acc_ledger_purchase.class.php:220
 #: include/class/acc_ledger_purchase.class.php:219
-#: include/class/acc_ledger_purchase.class.php:219
+#: include/class/acc_ledger_purchase.class.php:221
 msgid " le poste comptable"
 msgstr ""
 
@@ -4041,7 +4163,7 @@ msgstr ""
 #: include/class/class_acc_ledger_purchase.php:244
 #: include/class/acc_ledger_purchase.class.php:244
 #: include/class/acc_ledger_purchase.class.php:243
-#: include/class/acc_ledger_purchase.class.php:243
+#: include/class/acc_ledger_purchase.class.php:245
 msgid "ce code n'a pas de poste comptable, créez ce poste : ["
 msgstr ""
 
@@ -4050,7 +4172,7 @@ msgstr ""
 #: include/class/class_acc_ledger_purchase.php:254
 #: include/class/acc_ledger_purchase.class.php:254
 #: include/class/acc_ledger_purchase.class.php:253
-#: include/class/acc_ledger_purchase.class.php:253
+#: include/class/acc_ledger_purchase.class.php:255
 #, php-format
 msgid "Pour la fiche %s, le compte contrepartie %s n'existe pas"
 msgstr ""
@@ -4065,8 +4187,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:266
 #: include/class/acc_ledger_sold.class.php:214
 #: include/class/acc_ledger_purchase.class.php:265
+#: include/class/acc_ledger_purchase.class.php:267
 #: include/class/acc_ledger_sold.class.php:214
-#: include/class/acc_ledger_purchase.class.php:265
 msgid "Il n'y a aucune marchandise"
 msgstr ""
 
@@ -4090,8 +4212,9 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1433
 #: include/class/acc_ledger_purchase.class.php:1008
 #: include/class/acc_ledger_purchase.class.php:1436
-#: include/class/acc_ledger_purchase.class.php:1008
-#: include/class/acc_ledger_purchase.class.php:1436
+#: include/class/pre_op_ach.class.php:263
+#: include/class/acc_ledger_purchase.class.php:1019
+#: include/class/acc_ledger_purchase.class.php:1447
 msgid "Détail articles achetés"
 msgstr ""
 
@@ -4110,8 +4233,7 @@ msgstr ""
 #: include/class/pre_op_ach.class.php:231
 #: include/class/acc_ledger_purchase.class.php:1130
 #: include/class/acc_ledger_purchase.class.php:1133
-#: include/class/pre_op_ach.class.php:231
-#: include/class/acc_ledger_purchase.class.php:1133
+#: include/class/acc_ledger_purchase.class.php:1144
 msgid "Fournisseur "
 msgstr ""
 
@@ -4157,17 +4279,15 @@ msgstr ""
 #: include/class/print_ledger_simple.class.php:105
 #: include/class/acc_ledger_history_purchase.class.php:253
 #: include/class/acc_ledger_history_purchase.class.php:257
+#: include/class/acc_ledger_history_sale.class.php:256
+#: include/class/acc_ledger_history_purchase.class.php:268
+#: include/class/acc_ledger_purchase.class.php:1314
+#: include/class/acc_ledger_purchase.class.php:1441
+#: include/class/print_ledger_simple.class.php:102
+#: include/class/pdf_operation.class.php:100 include/balance_age.inc.php:36
 #: include/template/print_ledger_simple.php:10
 #: include/template/acc_ledger_history_purchase_detail.php:36
-#: include/template/ledger_detail_ach.php:51 include/database.item.php:13
-#: include/balance_age.inc.php:36
-#: include/class/print_ledger_simple.class.php:105
-#: include/class/acc_ledger_history_purchase.class.php:257
-#: include/class/pre_op_ach.class.php:397
-#: include/class/acc_ledger_history_sale.class.php:246
-#: include/class/acc_ledger_purchase.class.php:1303
-#: include/class/acc_ledger_purchase.class.php:1430
-#: include/class/pdf_operation.class.php:100
+#: include/template/ledger_detail_ach.php:51 include/database.item.php:12
 msgid "Fournisseur"
 msgstr ""
 
@@ -4210,10 +4330,7 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1324
 #: include/class/acc_ledger_sold.class.php:1358
 #: include/class/acc_ledger_purchase.class.php:1327
-#: include/compta_fin.inc.php:148 include/class/acc_ledger_sold.class.php:1367
-#: include/class/pre_op_ach.class.php:406
-#: include/class/acc_ledger_purchase.class.php:1327
-#: include/class/pre_op_ven.class.php:410
+#: include/class/acc_ledger_sold.class.php:1367
 msgid "Ajout article"
 msgstr ""
 
@@ -4234,8 +4351,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1382
 #: include/class/acc_ledger_sold.class.php:664
 #: include/class/acc_ledger_purchase.class.php:1385
-#: include/class/acc_ledger_sold.class.php:664
-#: include/class/acc_ledger_purchase.class.php:1385
+#: include/class/acc_ledger_purchase.class.php:1396
+#: include/class/acc_ledger_sold.class.php:667
 msgid "Détail opération "
 msgstr ""
 
@@ -4286,13 +4403,13 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:682
 #: include/class/acc_ledger_purchase.class.php:1395
 #: include/class/acc_ledger_purchase.class.php:1403
-#: include/template/form_ledger_detail.php:48
-#: include/class/acc_ledger_sold.class.php:674
-#: include/class/acc_ledger_sold.class.php:679
+#: include/class/acc_ledger_purchase.class.php:1406
+#: include/class/acc_ledger_purchase.class.php:1411
+#: include/class/acc_ledger_purchase.class.php:1414
+#: include/class/acc_ledger_sold.class.php:677
 #: include/class/acc_ledger_sold.class.php:682
-#: include/class/acc_ledger_purchase.class.php:1395
-#: include/class/acc_ledger_purchase.class.php:1400
-#: include/class/acc_ledger_purchase.class.php:1403
+#: include/class/acc_ledger_sold.class.php:685
+#: include/template/form_ledger_detail.php:51
 msgid "Numéro Pièce"
 msgstr ""
 
@@ -4318,9 +4435,10 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:680
 #: include/ext/modop/modop_save.php:170
 #: include/class/acc_ledger_purchase.class.php:1401
-#: include/compta_ods.inc.php:99 include/compta_ods.inc.php:99
-#: include/class/acc_ledger_sold.class.php:680
-#: include/class/acc_ledger_purchase.class.php:1401 include/opening.inc.php:87
+#: include/compta_ods.inc.php:99
+#: include/class/acc_ledger_purchase.class.php:1412
+#: include/class/acc_ledger_sold.class.php:683 include/opening.inc.php:87
+#: include/compta_ods.inc.php:99
 msgid "Attention numéro pièce existante, elle a du être adaptée"
 msgstr ""
 
@@ -4356,13 +4474,13 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1410
 #: include/class/acc_ledger_search.class.php:629
 #: include/class/acc_ledger_search.class.php:642
+#: include/class/acc_ledger_search.class.php:728
+#: include/class/acc_ledger_purchase.class.php:1421
+#: include/class/acc_ledger_sold.class.php:693
+#: include/export/export_histo_csv.php:42
+#: include/template/form_ledger_detail.php:33
 #: include/template/ledger_detail_ven.php:40
-#: include/template/form_ledger_detail.php:30
 #: include/template/ledger_detail_ach.php:31
-#: include/export/export_histo_csv.php:39
-#: include/class/acc_ledger_sold.class.php:690
-#: include/class/acc_ledger_search.class.php:642
-#: include/class/acc_ledger_purchase.class.php:1410
 msgid "Echeance"
 msgstr ""
 
@@ -4404,16 +4522,26 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1422
 #: include/class/acc_ledger_search.class.php:941
 #: include/class/acc_ledger_search.class.php:954
-#: include/template/form_ledger_detail.php:11
-#: include/export/export_poste_detail_pdf.php:96
 #: include/export/export_printtva_csv.php:39
 #: include/export/export_printtva_csv.php:58
-#: include/export/export_histo_csv.php:37
-#: include/export/export_ledger_pdf.php:83 include/compta_fin_saldo.inc.php:49
-#: include/verif_bilan.inc.php:74 include/class/acc_ledger_sold.class.php:700
-#: include/class/acc_ledger_search.class.php:954
-#: include/class/acc_ledger_purchase.class.php:1422
+#: unit-test/include/class/print_ledger_detail.classTest.php:75
+#: unit-test/include/class/print_ledger_fin.classTest.php:72
+#: unit-test/include/class/print_ledger_fin.classTest.php:83
+#: unit-test/include/class/print_ledger_fin.classTest.php:95
+#: unit-test/include/class/print_ledger_fin.classTest.php:106
+#: include/compta_fin_saldo.inc.php:49
+#: include/class/acc_ledger_search.class.php:1043
+#: include/class/operation_predef_mtable.class.php:51
+#: include/class/acc_ledger_purchase.class.php:1433
+#: include/class/acc_ledger_sold.class.php:703
 #: include/class/pdf_operation.class.php:62
+#: include/export/export_poste_detail_pdf.php:96
+#: include/export/export_printtva_csv.php:51
+#: include/export/export_printtva_csv.php:70
+#: include/export/export_ledger_pdf.php:84
+#: include/export/export_histo_csv.php:40
+#: include/template/form_ledger_detail.php:11
+#: include/template/pre_operation_display.php:38 include/verif_bilan.inc.php:74
 msgid "Journal"
 msgstr ""
 
@@ -4459,16 +4587,17 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1437
 #: include/class/acc_ledger_sold.class.php:718
 #: include/class/acc_ledger_purchase.class.php:1440
-#: include/upgrade-plugin.php:68 include/template/ledger_detail_ven.php:151
-#: include/template/stock_summary_list.php:45
-#: include/template/ledger_detail_ach.php:149 include/anc_group.inc.php:62
-#: include/ajax/ajax_add_menu.php:156 include/ajax/ajax_add_menu.php:211
-#: include/ajax/ajax_get_menu_detail.php:60
-#: include/ajax/ajax_plugin_detail.php:39 include/menu.inc.php:108
-#: include/class/print_ledger_detail_item.class.php:59
-#: include/class/acc_ledger_sold.class.php:718
-#: include/class/acc_ledger_purchase.class.php:1440
 #: include/upgrade-plugin.php:68
+#: include/class/acc_ledger_purchase.class.php:1451
+#: include/class/acc_ledger_sold.class.php:721
+#: include/class/print_ledger_detail_item.class.php:58
+#: include/ajax/ajax_add_menu.php:156 include/ajax/ajax_add_menu.php:211
+#: include/ajax/ajax_plugin_detail.php:39
+#: include/ajax/ajax_get_menu_detail.php:60 include/anc_group.inc.php:62
+#: include/template/stock_summary_list.php:45
+#: include/template/ledger_detail_ven.php:151
+#: include/template/ledger_detail_ach.php:149 include/upgrade-plugin.php:71
+#: include/menu.inc.php:108
 msgid "Code"
 msgstr ""
 
@@ -4494,10 +4623,10 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1438
 #: include/class/acc_ledger_sold.class.php:719
 #: include/class/acc_ledger_purchase.class.php:1441
-#: include/template/form_ledger_detail.php:72
+#: include/class/acc_ledger_purchase.class.php:1452
+#: include/class/acc_ledger_sold.class.php:722
+#: include/template/form_ledger_detail.php:75
 #: include/template/predf_ledger_detail.php:17
-#: include/class/acc_ledger_sold.class.php:719
-#: include/class/acc_ledger_purchase.class.php:1441
 msgid "Dénomination"
 msgstr ""
 
@@ -4519,8 +4648,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1439
 #: include/class/acc_ledger_sold.class.php:720
 #: include/class/acc_ledger_purchase.class.php:1442
-#: include/class/acc_ledger_sold.class.php:720
-#: include/class/acc_ledger_purchase.class.php:1442
+#: include/class/acc_ledger_purchase.class.php:1453
+#: include/class/acc_ledger_sold.class.php:723
 msgid "prix"
 msgstr ""
 
@@ -4582,15 +4711,18 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:1420
 #: include/class/acc_ledger_purchase.class.php:1443
 #: include/class/acc_ledger_purchase.class.php:1849
-#: include/template/form_ledger_detail.php:75
-#: include/template/form_ledger_detail.php:82
+#: include/class/acc_ledger_sold.class.php:1429
+#: include/class/acc_ledger_purchase.class.php:1855
+#: include/class/acc_ledger_purchase.class.php:1454
+#: include/class/acc_ledger_purchase.class.php:1892
+#: include/class/acc_ledger_sold.class.php:724
+#: include/class/acc_ledger_sold.class.php:1414
+#: include/template/follow_up_detail_display.php:53
+#: include/template/form_ledger_detail.php:78
+#: include/template/form_ledger_detail.php:85
 #: include/template/predf_ledger_detail.php:20
 #: include/template/predf_ledger_detail.php:27
-#: include/template/detail-action.php:320
-#: include/class/acc_ledger_sold.class.php:721
-#: include/class/acc_ledger_sold.class.php:1429
-#: include/class/acc_ledger_purchase.class.php:1443
-#: include/class/acc_ledger_purchase.class.php:1855
+#: include/template/newEmptyPHP_NOALYSS.php:38
 msgid "quantité"
 msgstr ""
 
@@ -4616,10 +4748,10 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1444
 #: include/class/acc_ledger_sold.class.php:725
 #: include/class/acc_ledger_purchase.class.php:1447
-#: include/template/form_ledger_detail.php:77
+#: include/class/acc_ledger_purchase.class.php:1458
+#: include/class/acc_ledger_sold.class.php:728
+#: include/template/form_ledger_detail.php:80
 #: include/template/predf_ledger_detail.php:22
-#: include/class/acc_ledger_sold.class.php:725
-#: include/class/acc_ledger_purchase.class.php:1447
 msgid "tva"
 msgstr ""
 
@@ -4678,7 +4810,6 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:1418
 #: include/class/acc_ledger_purchase.class.php:1448
 #: include/class/acc_ledger_purchase.class.php:1847
-#: include/template/detail-action.php:322
 #: include/template/tax_summary_display.php:63
 #: include/template/tax_summary_display.php:125
 #: include/template/tax_summary_display.php:212
@@ -4687,12 +4818,24 @@ msgstr ""
 #: include/export/export_printtva_csv.php:63
 #: include/export/export_printtva_pdf.php:57
 #: include/export/export_printtva_pdf.php:212
-#: include/class/acc_ledger_sold.class.php:726
 #: include/class/acc_ledger_sold.class.php:1427
-#: include/class/acc_ledger_purchase.class.php:1448
 #: include/class/acc_ledger_purchase.class.php:1853
+#: include/class/acc_ledger_purchase.class.php:1459
+#: include/class/acc_ledger_purchase.class.php:1890
+#: include/class/acc_ledger_sold.class.php:729
+#: include/class/acc_ledger_sold.class.php:1412
 #: include/class/pdf_operation.class.php:153
 #: include/class/pdf_operation.class.php:198
+#: include/export/export_printtva_pdf.php:59
+#: include/export/export_printtva_pdf.php:216
+#: include/export/export_printtva_csv.php:55
+#: include/export/export_printtva_csv.php:75
+#: include/template/follow_up_detail_display.php:55
+#: include/template/tax_summary_display.php:63
+#: include/template/tax_summary_display.php:125
+#: include/template/tax_summary_display.php:212
+#: include/template/tax_summary_display.php:300
+#: include/template/newEmptyPHP_NOALYSS.php:40
 msgid "Montant TVA"
 msgstr ""
 
@@ -4718,8 +4861,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1446
 #: include/class/acc_ledger_sold.class.php:727
 #: include/class/acc_ledger_purchase.class.php:1449
-#: include/class/acc_ledger_sold.class.php:727
-#: include/class/acc_ledger_purchase.class.php:1449
+#: include/class/acc_ledger_purchase.class.php:1460
+#: include/class/acc_ledger_sold.class.php:730
 #: include/class/pdf_operation.class.php:151
 #: include/class/pdf_operation.class.php:196
 msgid "Montant HTVA"
@@ -4751,9 +4894,10 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1447
 #: include/class/acc_ledger_sold.class.php:728
 #: include/class/acc_ledger_purchase.class.php:1450
-#: include/template/detail-action.php:323
-#: include/class/acc_ledger_sold.class.php:728
-#: include/class/acc_ledger_purchase.class.php:1450
+#: include/class/acc_ledger_purchase.class.php:1461
+#: include/class/acc_ledger_sold.class.php:731
+#: include/template/follow_up_detail_display.php:56
+#: include/template/newEmptyPHP_NOALYSS.php:41
 msgid "Montant TVAC"
 msgstr ""
 
@@ -4779,8 +4923,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1546
 #: include/class/acc_ledger_sold.class.php:804
 #: include/class/acc_ledger_purchase.class.php:1549
-#: include/class/acc_ledger_sold.class.php:804
-#: include/class/acc_ledger_purchase.class.php:1549
+#: include/class/acc_ledger_purchase.class.php:1560
+#: include/class/acc_ledger_sold.class.php:807
 #: include/lib/message_javascript.php:59
 msgid "Attention Différence entre TVA calculée et donnée"
 msgstr ""
@@ -4797,7 +4941,7 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1610
 #: include/class/acc_ledger_purchase.class.php:1627
 #: include/class/acc_ledger_purchase.class.php:1630
-#: include/class/acc_ledger_purchase.class.php:1630
+#: include/class/acc_ledger_purchase.class.php:1643
 msgid "Vérifiez imputation analytique"
 msgstr ""
 
@@ -4825,9 +4969,9 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1643
 #: include/class/acc_ledger_sold.class.php:900
 #: include/class/acc_ledger_purchase.class.php:1646
-#: include/template/predf_ledger_detail.php:75
-#: include/class/acc_ledger_sold.class.php:900
-#: include/class/acc_ledger_purchase.class.php:1646
+#: include/class/acc_ledger_purchase.class.php:1659
+#: include/class/acc_ledger_sold.class.php:904
+#: include/template/predf_ledger_detail.php:77
 msgid "Total TVA"
 msgstr ""
 
@@ -4855,9 +4999,9 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1644
 #: include/class/acc_ledger_sold.class.php:901
 #: include/class/acc_ledger_purchase.class.php:1647
-#: include/template/predf_ledger_detail.php:76
-#: include/class/acc_ledger_sold.class.php:901
-#: include/class/acc_ledger_purchase.class.php:1647
+#: include/class/acc_ledger_purchase.class.php:1660
+#: include/class/acc_ledger_sold.class.php:905
+#: include/template/predf_ledger_detail.php:78
 msgid "Total TVAC"
 msgstr ""
 
@@ -4884,7 +5028,8 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:944
 #: include/class/acc_ledger_purchase.class.php:1702
 #: include/class/acc_ledger_sold.class.php:946
-#: include/class/acc_ledger_purchase.class.php:1702
+#: include/class/acc_ledger_purchase.class.php:1724
+#: include/class/acc_ledger_sold.class.php:950
 msgid "Déduction acompte "
 msgstr ""
 
@@ -4911,7 +5056,8 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:945
 #: include/class/acc_ledger_purchase.class.php:1703
 #: include/class/acc_ledger_sold.class.php:947
-#: include/class/acc_ledger_purchase.class.php:1703
+#: include/class/acc_ledger_purchase.class.php:1725
+#: include/class/acc_ledger_sold.class.php:951
 msgid "Libellé :"
 msgstr ""
 
@@ -4941,6 +5087,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1726
 #: include/class/acc_ledger_sold.class.php:986
 #: include/class/acc_ledger_purchase.class.php:1732
+#: include/class/acc_ledger_purchase.class.php:1756
+#: include/class/acc_ledger_sold.class.php:990
 #: include/operation_ods_confirm.inc.php:76
 msgid "Ajoutez une pièce justificative "
 msgstr ""
@@ -4959,6 +5107,7 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1729
 #: include/class/acc_ledger_purchase.class.php:1732
 #: include/class/acc_ledger_purchase.class.php:1738
+#: include/class/acc_ledger_purchase.class.php:1762
 msgid "ou générer un document"
 msgstr ""
 
@@ -4986,6 +5135,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1743
 #: include/class/acc_ledger_sold.class.php:1003
 #: include/class/acc_ledger_purchase.class.php:1749
+#: include/class/acc_ledger_purchase.class.php:1773
+#: include/class/acc_ledger_sold.class.php:1007
 msgid "Numero de bon de commande : "
 msgstr ""
 
@@ -5013,6 +5164,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1744
 #: include/class/acc_ledger_sold.class.php:1004
 #: include/class/acc_ledger_purchase.class.php:1750
+#: include/class/acc_ledger_purchase.class.php:1774
+#: include/class/acc_ledger_sold.class.php:1008
 msgid "Autre information : "
 msgstr ""
 
@@ -5040,6 +5193,7 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1776
 #: include/class/acc_ledger_sold.class.php:1035
 #: include/class/acc_ledger_purchase.class.php:1782
+#: include/class/acc_ledger_purchase.class.php:1806
 msgid "Echeance dépassée"
 msgstr ""
 
@@ -5067,6 +5221,7 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1778
 #: include/class/acc_ledger_sold.class.php:1037
 #: include/class/acc_ledger_purchase.class.php:1784
+#: include/class/acc_ledger_purchase.class.php:1808
 msgid "Non Payée"
 msgstr ""
 
@@ -5097,7 +5252,8 @@ msgstr ""
 #: include/history_operation.inc.php:150 include/history_operation.inc.php:156
 #: include/class/acc_ledger_sold.class.php:1046
 #: include/class/acc_ledger_purchase.class.php:1793
-#: include/history_operation.inc.php:156
+#: include/history_operation.inc.php:168
+#: include/class/acc_ledger_purchase.class.php:1817
 msgid "Mise à jour paiement"
 msgstr ""
 
@@ -5190,20 +5346,23 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:1074
 #: include/class/acc_ledger_sold.class.php:1330
 #: include/class/print_ledger_simple.class.php:103
+#: include/class/acc_ledger_sold.class.php:1083
+#: include/class/acc_ledger_sold.class.php:1339
+#: include/class/pre_op_ach.class.php:394
+#: include/class/pre_op_ven.class.php:392
+#: include/class/acc_ledger_sold.class.php:710
+#: include/class/acc_ledger_sold.class.php:1050
+#: include/class/acc_ledger_sold.class.php:1306
+#: include/class/print_ledger_simple.class.php:100
+#: include/class/pdf_operation.class.php:103 include/balance_age.inc.php:35
 #: include/template/print_ledger_simple.php:10
+#: include/template/acc_ledger_history_purchase_extended.php:43
 #: include/template/acc_ledger_history_sale_detail.php:37
 #: include/template/ledger_detail_ven.php:59
 #: include/template/acc_ledger_history_purchase_oneline.php:47
 #: include/template/acc_ledger_history_sale_oneline.php:44
-#: include/template/acc_ledger_history_purchase_extended.php:43
 #: include/template/acc_ledger_history_sale_extended.php:43
-#: include/database.item.php:17 include/balance_age.inc.php:35
-#: include/class/print_ledger_simple.class.php:103
-#: include/class/acc_ledger_sold.class.php:707
-#: include/class/acc_ledger_sold.class.php:1083
-#: include/class/acc_ledger_sold.class.php:1339
-#: include/class/pdf_operation.class.php:103
-#: include/class/pre_op_ven.class.php:397
+#: include/database.item.php:16
 msgid "Client"
 msgstr ""
 
@@ -5229,9 +5388,10 @@ msgstr ""
 #: include/class/pre_op_ven.class.php:266
 #: include/class/acc_ledger_sold.class.php:714
 #: include/class/acc_ledger_sold.class.php:1206
-#: include/class/acc_ledger_sold.class.php:714
 #: include/class/acc_ledger_sold.class.php:1215
-#: include/class/pre_op_ven.class.php:266
+#: include/class/pre_op_ven.class.php:261
+#: include/class/acc_ledger_sold.class.php:717
+#: include/class/acc_ledger_sold.class.php:1182
 msgid "Détail articles vendus"
 msgstr ""
 
@@ -5243,7 +5403,7 @@ msgstr ""
 #: include/class/class_acc_ledger_sold.php:844
 #: include/class/acc_ledger_sold.class.php:867
 #: include/class/acc_ledger_sold.class.php:884
-#: include/class/acc_ledger_sold.class.php:884
+#: include/class/acc_ledger_sold.class.php:888
 msgid "Vérifiez Imputation Analytique"
 msgstr ""
 
@@ -5256,6 +5416,7 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:966
 #: include/class/acc_ledger_sold.class.php:983
 #: include/class/acc_ledger_sold.class.php:992
+#: include/class/acc_ledger_sold.class.php:996
 msgid "ou générer une facture"
 msgstr ""
 
@@ -5272,6 +5433,7 @@ msgstr ""
 #: include/class/pdf_operation.class.php:70
 #: include/class/acc_ledger_sold.class.php:1081
 #: include/class/acc_ledger_sold.class.php:1090
+#: include/class/acc_ledger_sold.class.php:1057
 #: include/class/pdf_operation.class.php:70
 msgid "Echéance"
 msgstr ""
@@ -5488,51 +5650,62 @@ msgstr ""
 #: include/template/param_jrn.php:85 include/class/fiche.class.php:1398
 #: include/class/fiche.class.php:1477
 #: include/class/print_ledger_simple.class.php:108
-#: include/cfgplugin.inc.php:115 include/template/letter_prop.php:34
-#: include/template/letter_prop.php:77 include/template/category_of_card.php:28
-#: include/template/print_ledger_simple.php:11
-#: include/template/param_jrn.php:129 include/template/pcmn_update.php:38
-#: include/template/menu_detail.php:43
-#: include/template/acc_ledger_history_sale_detail.php:38
-#: include/template/action_display_short.php:114
-#: include/template/acc_ledger_history_purchase_detail.php:37
-#: include/template/dashboard.php:347 include/template/profile.php:37
-#: include/template/ledger_detail_ven.php:127
-#: include/template/acc_ledger_history_purchase_oneline.php:50
-#: include/template/operation_detail_ven.php:36
-#: include/template/detail-action.php:243
-#: include/template/detail-action.php:318
-#: include/template/detail-action.php:471
-#: include/template/acc_ledger_history_sale_oneline.php:47
-#: include/template/acc_ledger_history_purchase_extended.php:46
-#: include/template/operation_detail_ach.php:36
-#: include/template/acc_ledger_history_sale_extended.php:46
-#: include/template/tag_search_select.php:21 include/template/tag_select.php:23
-#: include/template/letter_all.php:32 include/template/tag_detail.php:24
-#: include/template/ledger_detail_ach.php:119 include/template/tag_list.php:15
-#: include/anc_group.inc.php:62 include/export/export_anc_axis_csv.php:45
+#: include/template/param_jrn.php:129 include/modele.inc.php:249
+#: include/modele.inc.php:363 include/database.item.php:160
+#: include/compta_fin_saldo.inc.php:50
+#: include/class/tva_rate_mtable.class.php:50
+#: include/class/anc_account_table.class.php:49
+#: include/class/acc_ledger_search.class.php:740
+#: include/class/acc_ledger_search.class.php:1049
+#: include/class/acc_ledger_search.class.php:1194
+#: include/class/operation_predef_mtable.class.php:54
+#: include/class/fiche.class.php:1425 include/class/fiche.class.php:1504
+#: include/class/anc_listing.class.php:83 include/class/anc_plan.class.php:139
+#: include/class/anc_plan.class.php:155
+#: include/class/print_ledger_simple.class.php:105
+#: include/class/user.class.php:994
+#: include/class/acc_account_ledger.class.php:389
+#: include/class/anc_table.class.php:442 include/cfgplugin.inc.php:115
+#: include/ajax/ajax_plugin_detail.php:43 include/ajax/ajax_admin.php:234
+#: include/ajax/ajax_boxcard_search.php:59 include/modele.inc.php:249
+#: include/modele.inc.php:363 include/upgrade-template.php:51
+#: include/export/export_anc_axis_csv.php:45
+#: include/export/export_form_csv.php:71
 #: include/export/export_poste_detail_csv.php:87
 #: include/export/export_poste_detail_csv.php:200
-#: include/export/export_form_csv.php:71 include/export/export_histo_csv.php:44
-#: include/export/export_fiche_detail_csv.php:76 include/profile.inc.php:361
+#: include/export/export_fiche_detail_csv.php:76
+#: include/export/export_histo_csv.php:47 include/anc_group.inc.php:62
+#: include/template/print_ledger_simple.php:11
+#: include/template/follow_up_detail_display.php:51
+#: include/template/tag_select.php:25
+#: include/template/operation_detail_ach.php:36
+#: include/template/acc_ledger_history_purchase_extended.php:46
+#: include/template/action_display_short.php:114
+#: include/template/acc_ledger_history_sale_detail.php:38
+#: include/template/ledger_detail_ven.php:127
+#: include/template/detail-action.php:260
+#: include/template/detail-action.php:280
+#: include/template/detail-action.php:287
+#: include/template/detail-action.php:330
+#: include/template/detail-action.php:486 include/template/profile.php:37
+#: include/template/tag_search_select.php:24
+#: include/template/acc_ledger_history_purchase_oneline.php:50
+#: include/template/letter_all.php:32 include/template/menu_detail.php:43
+#: include/template/pcmn_update.php:38
+#: include/template/acc_ledger_history_sale_oneline.php:47
+#: include/template/acc_ledger_history_purchase_detail.php:37
+#: include/template/category_of_card.php:28 include/template/tag_detail.php:24
+#: include/template/tag_list.php:16
+#: include/template/acc_ledger_history_sale_extended.php:46
+#: include/template/ledger_detail_ach.php:119
+#: include/template/letter_prop.php:34 include/template/letter_prop.php:77
+#: include/template/param_jrn.php:130 include/template/dashboard.php:347
+#: include/template/newEmptyPHP_NOALYSS.php:36
+#: include/template/card_multiple_result.php:20
+#: include/template/operation_detail_ven.php:36 include/database.item.php:156
 #: include/dossier.inc.php:228 include/dossier.inc.php:342
-#: include/compta_fin_saldo.inc.php:50 include/ajax/ajax_admin.php:234
-#: include/ajax/ajax_boxcard_search.php:59
-#: include/ajax/ajax_plugin_detail.php:43 include/upgrade-template.php:51
-#: include/modele.inc.php:249 include/modele.inc.php:363
-#: include/menu.inc.php:110 include/database.item.php:160
-#: include/class/print_ledger_simple.class.php:108
-#: include/class/tva_rate_mtable.class.php:50
-#: include/class/acc_ledger_search.class.php:654
-#: include/class/acc_ledger_search.class.php:960
-#: include/class/acc_ledger_search.class.php:1105
-#: include/class/anc_listing.class.php:83
-#: include/class/acc_account_ledger.class.php:397
-#: include/class/anc_plan.class.php:138 include/class/anc_plan.class.php:154
-#: include/class/fiche.class.php:1398 include/class/fiche.class.php:1477
-#: include/class/user.class.php:991 include/class/anc_table.class.php:442
-#: include/class/anc_account_table.class.php:49 include/lib/ac_common.php:1213
-#: include/upgrade-plugin.php:62 include/card_attr.inc.php:95
+#: include/profile.inc.php:361 include/lib/ac_common.php:1223
+#: include/upgrade-plugin.php:65 include/menu.inc.php:110
 msgid "Description"
 msgstr ""
 
@@ -5553,8 +5726,12 @@ msgstr ""
 #: include/class/class_anc_account.php:290 include/database.item.php:15
 #: include/class/anc_account_table.class.php:50 include/database.item.php:9
 #: include/database.item.php:51 include/export/export_anc_axis_csv.php:47
-#: include/export/export_anc_axis_csv.php:47 include/database.item.php:9
-#: include/database.item.php:52 include/class/anc_account_table.class.php:50
+#: include/database.item.php:52 include/class/follow_up.class.php:625
+#: include/class/anc_account_table.class.php:50
+#: include/export/export_anc_axis_csv.php:47
+#: include/template/tag_search_select.php:64
+#: include/template/tag_search_select.php:70 include/database.item.php:8
+#: include/database.item.php:51
 msgid "Groupe"
 msgstr ""
 
@@ -5590,7 +5767,7 @@ msgstr ""
 #: include/class/anc_grandlivre.class.php:215
 #: include/class/anc_listing.class.php:81
 #: include/class/anc_listing.class.php:81
-#: include/class/anc_grandlivre.class.php:215
+#: include/class/anc_grandlivre.class.php:227
 msgid "Quick_code"
 msgstr ""
 
@@ -5638,9 +5815,9 @@ msgstr ""
 #: include/class/class_anc_group_operation.php:190
 #: include/class/anc_group_operation.class.php:207
 #: include/class/anticipation.class.php:431 include/template/stock_inv.php:106
-#: include/template/detail-action.php:374 include/template/stock_inv.php:106
-#: include/class/anc_group_operation.class.php:207
 #: include/class/anticipation.class.php:431
+#: include/class/anc_group_operation.class.php:208
+#: include/template/stock_inv.php:106
 msgid "Ajouter une ligne"
 msgstr ""
 
@@ -5670,13 +5847,13 @@ msgstr ""
 #: include/class/anc_listing.class.php:85
 #: include/class/pdf_operation.class.php:250
 #: include/class/anc_listing.class.php:87
+#: include/class/pdfbalance_simple.class.php:59 include/fiche.inc.php:421
 #: include/class/pdfbalance_simple.class.php:59
-#: include/export/export_fiche_balance_csv.php:160
-#: include/export/export_poste_detail_csv.php:202
-#: include/ajax/ajax_anc_detail_operation.php:57
 #: include/class/anc_listing.class.php:87
 #: include/class/pdf_operation.class.php:250
-#: include/class/pdfbalance_simple.class.php:59
+#: include/ajax/ajax_anc_detail_operation.php:57
+#: include/export/export_poste_detail_csv.php:202
+#: include/export/export_fiche_balance_csv.php:160
 msgid "D/C"
 msgstr ""
 
@@ -5747,9 +5924,9 @@ msgstr ""
 #: include/ajax/ajax_admin.php:272 include/ajax/ajax_admin.php:279
 #: include/ajax/ajax_admin.php:220 include/ajax/ajax_admin.php:300
 #: include/class/anticipation.class.php:203 include/ajax/ajax_admin.php:224
-#: include/ajax/ajax_admin.php:304 include/ajax/ajax_admin.php:224
-#: include/ajax/ajax_admin.php:304 include/ajax/ajax_plugin_detail.php:29
-#: include/class/anticipation.class.php:203
+#: include/ajax/ajax_admin.php:304 include/class/anticipation.class.php:203
+#: include/ajax/ajax_plugin_detail.php:29 include/ajax/ajax_admin.php:224
+#: include/ajax/ajax_admin.php:304
 msgid "Modification"
 msgstr ""
 
@@ -5778,9 +5955,10 @@ msgstr ""
 #: include/class/anticipation.class.php:293 include/database.item.php:71
 #: include/template/acc_ledger_history_financial_oneline.php:31
 #: include/template/acc_ledger_history_financial_oneline.php:32
-#: include/template/acc_ledger_history_financial_oneline.php:32
-#: include/template/form_ledger_fin.php:25 include/database.item.php:71
 #: include/class/anticipation.class.php:293
+#: include/template/form_ledger_fin.php:25
+#: include/template/acc_ledger_history_financial_oneline.php:32
+#: include/database.item.php:70
 msgid "Banque"
 msgstr ""
 
@@ -5806,7 +5984,7 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:948
 #: include/class/acc_ledger_search.class.php:961
 #: include/class/calendar.class.php:136
-#: include/class/acc_ledger_search.class.php:961
+#: include/class/acc_ledger_search.class.php:1050
 msgid "Notes"
 msgstr ""
 
@@ -5905,9 +6083,10 @@ msgstr ""
 #: include/class/fiche.class.php:562 include/lib/html_input.class.php:386
 #: include/class/fiche.class.php:434 include/class/fiche.class.php:564
 #: include/class/fiche.class.php:433 include/class/fiche.class.php:563
-#: include/template/fiche_list.php:45 include/template/forecast-detail.php:11
-#: include/class/fiche.class.php:433 include/class/fiche.class.php:563
-#: include/class/document_modele.class.php:68
+#: include/class/document_modele.class.php:68 include/class/fiche.class.php:434
+#: include/class/fiche.class.php:576
+#: include/ajax/ajax_add_concerned_card.php:81
+#: include/template/forecast-detail.php:11 include/template/fiche_list.php:45
 #: include/lib/html_input.class.php:386
 msgid "Catégorie"
 msgstr ""
@@ -5927,9 +6106,9 @@ msgstr ""
 #: include/class/class_document_modele.php:69
 #: include/class/class_document_modele.php:70
 #: include/class/document_modele.class.php:70
-#: include/template/modele_document.php:61
-#: include/ajax/ajax_plugin_detail.php:47 include/menu.inc.php:112
 #: include/class/document_modele.class.php:70
+#: include/ajax/ajax_plugin_detail.php:47
+#: include/template/modele_document.php:61 include/menu.inc.php:112
 msgid "Fichier"
 msgstr ""
 
@@ -6009,18 +6188,18 @@ msgstr ""
 #: include/template/ledger_detail_bottom.php:328
 #: include/class/periode.class.php:596 include/class/periode.class.php:601
 #: include/lib/manage_table_sql.class.php:768
-#: include/template/ledger_detail_bottom.php:325
-#: include/template/anc_key_input.php:212 include/preod.inc.php:112
-#: include/anc_group.inc.php:88 include/dossier.inc.php:281
-#: include/dossier.inc.php:290 include/compta_fin.inc.php:150
-#: include/ajax/ajax_admin.php:268 include/ajax/ajax_admin.php:293
-#: include/ajax/ajax_view_mod_stock.php:55 include/modele.inc.php:317
-#: include/class/document_type.class.php:82
-#: include/class/anc_operation.class.php:317
+#: include/template/ledger_detail_bottom.php:325 include/modele.inc.php:317
 #: include/class/periode.class.php:598 include/class/periode.class.php:603
+#: include/class/anc_operation.class.php:317
 #: include/class/document_modele.class.php:71
-#: include/lib/manage_table_sql.class.php:768 include/forecast.inc.php:347
-#: include/card_attr.inc.php:110
+#: include/class/document_type.class.php:84 include/class/periode.class.php:599
+#: include/class/periode.class.php:604 include/ajax/ajax_view_mod_stock.php:55
+#: include/ajax/ajax_admin.php:268 include/ajax/ajax_admin.php:293
+#: include/modele.inc.php:317 include/compta_fin.inc.php:150
+#: include/anc_group.inc.php:88 include/template/ledger_detail_bottom.php:344
+#: include/template/anc_key_input.php:212 include/forecast.inc.php:347
+#: include/dossier.inc.php:281 include/dossier.inc.php:290
+#: include/lib/manage_table_sql.class.php:820
 msgid "Effacer"
 msgstr ""
 
@@ -6032,8 +6211,8 @@ msgstr ""
 #: include/class/class_document_modele.php:258
 #: include/class/document_modele.class.php:258
 #: include/class/document_modele.class.php:261
-#: include/template/modele_document.php:40
 #: include/class/document_modele.class.php:261
+#: include/template/modele_document.php:40
 msgid "Affectation"
 msgstr ""
 
@@ -6045,8 +6224,8 @@ msgstr ""
 #: include/class/class_document_modele.php:262
 #: include/class/document_modele.class.php:262
 #: include/class/document_modele.class.php:265
-#: include/template/modele_document.php:48
 #: include/class/document_modele.class.php:265
+#: include/template/modele_document.php:48
 msgid "Uniquement journaux achat"
 msgstr ""
 
@@ -6058,8 +6237,8 @@ msgstr ""
 #: include/class/class_document_modele.php:263
 #: include/class/document_modele.class.php:263
 #: include/class/document_modele.class.php:266
-#: include/template/modele_document.php:49
 #: include/class/document_modele.class.php:266
+#: include/template/modele_document.php:49
 msgid "Uniquement journaux vente"
 msgstr ""
 
@@ -6071,8 +6250,8 @@ msgstr ""
 #: include/class/class_document_modele.php:264
 #: include/class/document_modele.class.php:264
 #: include/class/document_modele.class.php:267
-#: include/template/modele_document.php:50
 #: include/class/document_modele.class.php:267
+#: include/template/modele_document.php:50
 msgid "Partie gestion"
 msgstr ""
 
@@ -6118,7 +6297,7 @@ msgstr ""
 #: include/ext/rapport_avance/include/rapav_declaration.class.php:361
 #: include/ext/rapport_avance/include/rapav_declaration.class.php:434
 #: include/class/document.class.php:311 include/class/document.class.php:285
-#: include/class/document.class.php:285
+#: include/class/document.class.php:290
 msgid "Ne peut pas sauver "
 msgstr ""
 
@@ -6152,12 +6331,13 @@ msgstr ""
 #: include/class/anc_operation.class.php:324
 #: include/class/anc_operation.class.php:318
 #: include/class/anc_operation.class.php:319
-#: include/lib/manage_table_sql.class.php:755 include/dossier.inc.php:283
-#: include/ajax/ajax_get_profile.php:90 include/ajax/ajax_view_action.php:47
-#: include/class/document_type.class.php:75
+#: include/lib/manage_table_sql.class.php:755
 #: include/class/anc_operation.class.php:319
 #: include/class/document_modele.class.php:92
-#: include/lib/manage_table_sql.class.php:755 include/stock_cfg.inc.php:110
+#: include/class/document_type.class.php:77
+#: include/ajax/ajax_get_profile.php:90 include/ajax/ajax_view_action.php:47
+#: include/stock_cfg.inc.php:110 include/dossier.inc.php:283
+#: include/lib/manage_table_sql.class.php:807
 msgid "Modifier"
 msgstr ""
 
@@ -6169,9 +6349,9 @@ msgstr ""
 #: include/ajax/ajax_plugin_detail.php:32
 #: include/class/class_document_type.php:83 include/ajax/ajax_add_menu.php:137
 #: include/ajax/ajax_add_menu.php:145 include/class/document_type.class.php:83
-#: include/ajax/ajax_add_menu.php:145 include/ajax/ajax_get_menu_detail.php:53
+#: include/class/document_type.class.php:85 include/ajax/ajax_add_menu.php:145
 #: include/ajax/ajax_plugin_detail.php:32
-#: include/class/document_type.class.php:83
+#: include/ajax/ajax_get_menu_detail.php:53
 msgid "Vous confirmez"
 msgstr ""
 
@@ -6194,9 +6374,10 @@ msgstr ""
 #: include/class_fiche_def.php:452 include/ajax/ajax_plugin_detail.php:35
 #: include/class/class_fiche_def.php:452
 #: include/class/anc_account_table.class.php:48
-#: include/class/fiche_def.class.php:453 include/ajax/ajax_plugin_detail.php:35
-#: include/class/fiche_def.class.php:453
+#: include/class/fiche_def.class.php:453 include/class/fiche_def.class.php:453
 #: include/class/anc_account_table.class.php:48
+#: include/class/document_state_mtable.php:43
+#: include/ajax/ajax_plugin_detail.php:35
 msgid "Label"
 msgstr ""
 
@@ -6226,7 +6407,7 @@ msgstr ""
 #: include/class_fiche_def.php:776 include/class_fiche_def.php:788
 #: include/class/class_fiche_def.php:787 include/operation_ods_new.inc.php:95
 #: include/class/fiche_def.class.php:788 include/operation_ods_new.inc.php:98
-#: include/operation_ods_new.inc.php:98 include/class/fiche_def.class.php:788
+#: include/class/fiche_def.class.php:788 include/operation_ods_new.inc.php:99
 msgid "Sauvez"
 msgstr ""
 
@@ -6253,9 +6434,9 @@ msgstr ""
 #: include/class/fiche_def.class.php:791 include/class/fiche_def.class.php:796
 #: include/ajax/ajax_create_menu.php:13 include/template/stock_inv.php:33
 #: include/lib/message_javascript.php:78 include/lib/message_javascript.php:80
-#: include/template/fiche_list.php:30 include/template/stock_inv.php:33
-#: include/ajax/ajax_create_menu.php:13 include/ajax/ajax_add_menu.php:200
 #: include/class/fiche_def.class.php:791 include/class/fiche_def.class.php:796
+#: include/ajax/ajax_add_menu.php:200 include/ajax/ajax_create_menu.php:13
+#: include/template/stock_inv.php:33 include/template/fiche_list.php:30
 #: include/lib/message_javascript.php:80
 msgid "Vous confirmez ?"
 msgstr ""
@@ -6281,19 +6462,19 @@ msgstr ""
 
 #: include/class_fiche.php:406 include/class/class_fiche.php:406
 #: include/class/fiche.class.php:408 include/class/fiche.class.php:410
-#: include/class/fiche.class.php:409 include/class/fiche.class.php:409
+#: include/class/fiche.class.php:409 include/class/fiche.class.php:410
 msgid "Cette categorie de card n'existe pas"
 msgstr ""
 
 #: include/class_fiche.php:451 include/class/class_fiche.php:451
 #: include/class/fiche.class.php:453 include/class/fiche.class.php:455
-#: include/class/fiche.class.php:454 include/class/fiche.class.php:454
+#: include/class/fiche.class.php:454 include/class/fiche.class.php:455
 msgid "Rappel: Poste créé automatiquement à partir de "
 msgstr ""
 
 #: include/class_fiche.php:459 include/class/class_fiche.php:459
 #: include/class/fiche.class.php:461 include/class/fiche.class.php:463
-#: include/class/fiche.class.php:462 include/class/fiche.class.php:462
+#: include/class/fiche.class.php:462 include/class/fiche.class.php:463
 msgid "Rappel: Poste par défaut sera "
 msgstr ""
 
@@ -6311,11 +6492,12 @@ msgstr ""
 #: include/class/fiche.class.php:1472
 #: include/class/acc_ledger_history_generic.class.php:681
 #: include/class/fiche.class.php:1473
-#: include/template/impress_reconciliation.php:16
+#: include/class/acc_ledger_history_generic.class.php:684
+#: include/class/fiche.class.php:1500
+#: include/class/acc_ledger_history_generic.class.php:685
 #: include/export/export_poste_detail_csv.php:80
 #: include/export/export_fiche_detail_csv.php:71
-#: include/class/acc_ledger_history_generic.class.php:684
-#: include/class/fiche.class.php:1473
+#: include/template/impress_reconciliation.php:16
 msgid "n° pièce"
 msgstr ""
 
@@ -6327,8 +6509,8 @@ msgstr ""
 #: include/class/fiche.class.php:1457
 #: include/class/acc_account_ledger.class.php:395
 #: include/class/fiche.class.php:1458 include/class/fiche.class.php:1460
+#: include/class/acc_account_ledger.class.php:387
 #: include/export/export_fiche_detail_csv.php:72
-#: include/class/acc_account_ledger.class.php:395
 msgid "Code interne"
 msgstr ""
 
@@ -6367,17 +6549,18 @@ msgstr ""
 #: include/class/fiche.class.php:1758 include/class/fiche.class.php:1760
 #: include/class/acc_ledger_fin.class.php:753
 #: include/class/fiche.class.php:1778 include/class/fiche.class.php:1779
-#: include/template/fiche_list.php:34
+#: include/database.item.php:167 include/fiche.inc.php:415
+#: include/class/fiche.class.php:1805
+#: include/class/acc_ledger_fin.class.php:753
+#: include/ajax/ajax_boxcard_search.php:50
 #: include/template/ledger_detail_misc.php:100
-#: include/template/ledger_detail_bottom.php:89
-#: include/template/ledger_detail_ven.php:126
-#: include/template/operation_detail_ven.php:35
 #: include/template/operation_detail_misc.php:33
 #: include/template/operation_detail_ach.php:35
+#: include/template/ledger_detail_bottom.php:94
+#: include/template/ledger_detail_ven.php:126
 #: include/template/ledger_detail_ach.php:118
-#: include/ajax/ajax_boxcard_search.php:50 include/database.item.php:167
-#: include/class/acc_ledger_fin.class.php:753
-#: include/class/fiche.class.php:1779
+#: include/template/fiche_list.php:34
+#: include/template/operation_detail_ven.php:35 include/database.item.php:163
 msgid "Quick Code"
 msgstr ""
 
@@ -6392,11 +6575,10 @@ msgstr ""
 #: include/class/class_fiche.php:1601 include/class/class_fiche.php:1604
 #: include/class/fiche.class.php:1758 include/class/fiche.class.php:1761
 #: include/class/fiche.class.php:1763 include/class/fiche.class.php:1781
-#: include/class/fiche.class.php:1782 include/audit_log.php:38
+#: include/class/fiche.class.php:1782 include/class/fiche.class.php:1808
+#: include/audit_log.php:38 include/ajax/ajax_mod_stock_repo.php:47
+#: include/stock_cfg.inc.php:66 include/export/export_stock_resume_list.php:38
 #: include/template/stock_summary_list.php:39
-#: include/export/export_stock_resume_list.php:38
-#: include/ajax/ajax_mod_stock_repo.php:47 include/class/fiche.class.php:1782
-#: include/stock_cfg.inc.php:66
 msgid "Adresse"
 msgstr ""
 
@@ -6407,7 +6589,7 @@ msgstr ""
 #: include/class/class_fiche.php:1605 include/class/fiche.class.php:1759
 #: include/class/fiche.class.php:1762 include/class/fiche.class.php:1764
 #: include/class/fiche.class.php:1782 include/class/fiche.class.php:1783
-#: include/class/fiche.class.php:1783
+#: include/class/fiche.class.php:1809
 msgid "Total débit"
 msgstr ""
 
@@ -6418,7 +6600,7 @@ msgstr ""
 #: include/class/class_fiche.php:1606 include/class/fiche.class.php:1760
 #: include/class/fiche.class.php:1763 include/class/fiche.class.php:1765
 #: include/class/fiche.class.php:1783 include/class/fiche.class.php:1784
-#: include/class/fiche.class.php:1784
+#: include/class/fiche.class.php:1810
 msgid "Total crédit"
 msgstr ""
 
@@ -6440,16 +6622,16 @@ msgstr ""
 #: include/class/anc_listing.class.php:120 include/class/fiche.class.php:1784
 #: include/class/anc_balance_double.class.php:101
 #: include/class/fiche.class.php:1785 include/export/export_balance_pdf.php:136
+#: include/class/pdfbalance_simple.class.php:58 include/fiche.inc.php:420
+#: include/class/acc_bilan.class.php:176
 #: include/class/pdfbalance_simple.class.php:58
+#: include/class/fiche.class.php:1811 include/class/anc_listing.class.php:120
+#: include/class/anc_balance_double.class.php:101
+#: include/export/export_gl_csv.php:96
+#: include/export/export_balance_pdf.php:136
+#: include/export/export_gl_pdf.php:88 include/balance.inc.php:317
 #: include/template/anc_balance_group.php:51
 #: include/template/anc_balance_group.php:72
-#: include/export/export_gl_pdf.php:88
-#: include/export/export_balance_pdf.php:136
-#: include/export/export_gl_csv.php:96 include/balance.inc.php:317
-#: include/class/anc_balance_double.class.php:101
-#: include/class/acc_bilan.class.php:176
-#: include/class/anc_listing.class.php:120 include/class/fiche.class.php:1785
-#: include/class/pdfbalance_simple.class.php:58
 msgid "Solde"
 msgstr ""
 
@@ -6457,7 +6639,7 @@ msgstr ""
 #: include/class_follow_up.php:418 include/class_follow_up.php:420
 #: include/class_follow_up.php:421 include/class/class_follow_up.php:421
 #: include/class/class_follow_up.php:411 include/class/follow_up.class.php:411
-#: include/class/follow_up.class.php:412 include/class/follow_up.class.php:412
+#: include/class/follow_up.class.php:412 include/class/follow_up.class.php:419
 msgid "Génére le document"
 msgstr ""
 
@@ -6472,7 +6654,7 @@ msgstr ""
 #: include/class/follow_up.class.php:1205
 #: include/class/follow_up.class.php:1203
 #: include/class/follow_up.class.php:1204
-#: include/class/follow_up.class.php:1204
+#: include/class/follow_up.class.php:1121
 msgid "Tous les types"
 msgstr ""
 
@@ -6487,7 +6669,6 @@ msgstr ""
 #: include/class/follow_up.class.php:1212
 #: include/class/follow_up.class.php:1210
 #: include/class/follow_up.class.php:1211
-#: include/class/follow_up.class.php:1211
 msgid "Tous les Etats"
 msgstr ""
 
@@ -6502,7 +6683,7 @@ msgstr ""
 #: include/class/follow_up.class.php:1221
 #: include/class/follow_up.class.php:1219
 #: include/class/follow_up.class.php:1220
-#: include/class/follow_up.class.php:1220
+#: include/class/follow_up.class.php:1137
 msgid "Aucun"
 msgstr ""
 
@@ -6517,7 +6698,7 @@ msgstr ""
 #: include/class/follow_up.class.php:1245
 #: include/class/follow_up.class.php:1243
 #: include/class/follow_up.class.php:1244
-#: include/class/follow_up.class.php:1244
+#: include/class/follow_up.class.php:1161
 msgid "Tous les profiles"
 msgstr ""
 
@@ -6527,7 +6708,7 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:1069
 #: include/class/acc_ledger_search.class.php:1077
 #: include/class/acc_ledger_search.class.php:1090
-#: include/class/acc_ledger_search.class.php:1090
+#: include/class/acc_ledger_search.class.php:1179
 msgid "Filtre "
 msgstr ""
 
@@ -6602,14 +6783,16 @@ msgstr ""
 #: include/lib/html_input.class.php:434 include/lib/html_input.class.php:449
 #: include/ajax/ajax_card.php:312 include/class/extension.class.php:270
 #: html/user_login.php:106 html/recherche.php:87 html/recherche.php:132
-#: include/template/ledger_detail_bottom.php:303 html/user_login.php:106
-#: html/recherche.php:87 html/recherche.php:132 include/user.inc.php:88
+#: include/template/ledger_detail_bottom.php:303
 #: include/template/ledger_detail_bottom.php:299
-#: include/template/ledger_detail_bottom.php:300
+#: include/template/ledger_detail_bottom.php:300 include/ajax/ajax_card.php:313
+#: html/user_login.php:106 html/recherche.php:92 html/recherche.php:144
+#: include/class/extension.class.php:276 include/ajax/ajax_card.php:319
+#: include/template/ledger_detail_bottom.php:317
+#: include/template/ledger_detail_bottom.php:318
 #: include/template/ledger_detail_top.php:16
-#: include/template/action_search.php:156 include/ajax/ajax_card.php:313
-#: include/class/extension.class.php:270 include/lib/html_input.class.php:434
-#: include/lib/html_input.class.php:449
+#: include/template/action_search.php:169 include/user.inc.php:88
+#: include/lib/html_input.class.php:434 include/lib/html_input.class.php:449
 #, php-format
 msgid "Fermer"
 msgstr ""
@@ -6618,7 +6801,7 @@ msgstr ""
 #: include/class_html_input.php:332 include/lib/class_html_input.php:332
 #: include/lib/class_ibutton.php:63 include/compta_fin_rec.inc.php:221
 #: include/lib/class_html_input.php:333 include/lib/class_html_input.php:334
-#: include/lib/ibutton.class.php:63 include/compta_fin_rec.inc.php:221
+#: include/lib/ibutton.class.php:63 include/compta_fin_rec.inc.php:258
 #: include/lib/ibutton.class.php:63
 msgid "Inverser la sélection"
 msgstr ""
@@ -6654,9 +6837,9 @@ msgstr ""
 #: include/class/anc_account_table.class.php:87
 #: include/class/anc_key.class.php:153 include/lib/itva_popup.class.php:139
 #: include/ajax/ajax_anc_plan.php:51 include/ajax/ajax_anc_plan.php:52
-#: include/ajax/ajax_anc_plan.php:52 include/class/anc_key.class.php:153
+#: include/class/anc_key.class.php:153
 #: include/class/anc_account_table.class.php:87
-#: include/lib/itva_popup.class.php:139
+#: include/ajax/ajax_anc_plan.php:52 include/lib/itva_popup.class.php:139
 msgid "Le nom ne peut être vide"
 msgstr ""
 
@@ -6694,7 +6877,7 @@ msgstr ""
 #: include/class/class_pre_op_ach.php:196
 #: include/class/class_pre_op_ach.php:197
 #: include/class/pre_op_ach.class.php:197
-#: include/class/pre_op_ach.class.php:197
+#: include/class/pre_op_ach.class.php:200
 msgid "En-tête facture fournisseur"
 msgstr ""
 
@@ -6703,7 +6886,6 @@ msgstr ""
 #: include/class/class_pre_op_ach.php:197
 #: include/class/class_pre_op_ach.php:198
 #: include/class/pre_op_ach.class.php:198
-#: include/class/pre_op_ach.class.php:198
 msgid "Détail articles acheté"
 msgstr ""
 
@@ -6712,7 +6894,7 @@ msgstr ""
 #: include/class/class_pre_op_ven.php:193
 #: include/class/class_pre_op_ven.php:201
 #: include/class/pre_op_ven.class.php:201
-#: include/class/pre_op_ven.class.php:201
+#: include/class/pre_op_ven.class.php:196
 msgid "En-tête facture client"
 msgstr ""
 
@@ -6725,9 +6907,9 @@ msgstr ""
 #: include/export/export_security_pdf.php:137
 #: include/class/profile_menu.class.php:246
 #: include/class/profile_menu.class.php:271
-#: include/export/export_security_pdf.php:137
 #: include/class/profile_menu.class.php:246
-#: include/class/profile_menu.class.php:271
+#: include/class/profile_menu.class.php:272
+#: include/export/export_security_pdf.php:137
 msgid "Lecture"
 msgstr ""
 
@@ -6740,9 +6922,9 @@ msgstr ""
 #: include/export/export_security_pdf.php:147
 #: include/class/profile_menu.class.php:247
 #: include/class/profile_menu.class.php:272
+#: include/class/profile_menu.class.php:248
+#: include/class/profile_menu.class.php:273
 #: include/export/export_security_pdf.php:147
-#: include/class/profile_menu.class.php:247
-#: include/class/profile_menu.class.php:272
 msgid "Ecriture"
 msgstr ""
 
@@ -6758,10 +6940,10 @@ msgstr ""
 #: include/class/profile_menu.class.php:248
 #: include/class/profile_menu.class.php:273 include/param_sec.inc.php:149
 #: include/param_sec.inc.php:226 include/param_sec.inc.php:260
-#: include/param_sec.inc.php:339 include/param_sec.inc.php:149
-#: include/param_sec.inc.php:226 include/param_sec.inc.php:260
-#: include/param_sec.inc.php:339 include/class/profile_menu.class.php:248
-#: include/class/profile_menu.class.php:273
+#: include/param_sec.inc.php:339 include/class/profile_menu.class.php:249
+#: include/class/profile_menu.class.php:274 include/param_sec.inc.php:154
+#: include/param_sec.inc.php:264 include/param_sec.inc.php:271
+#: include/param_sec.inc.php:354
 msgid "Aucun accès"
 msgstr ""
 
@@ -6788,7 +6970,7 @@ msgstr ""
 #: include/class_user.php:932 include/class_user.php:933
 #: include/class/class_user.php:933 include/class/class_user.php:921
 #: include/class/user.class.php:921 include/class/user.class.php:945
-#: include/class/user.class.php:945
+#: include/class/user.class.php:948
 msgid "Dossier non accessible"
 msgstr ""
 
@@ -6797,22 +6979,22 @@ msgstr ""
 #: include/class/class_user.php:1212 include/class/class_user.php:1200
 #: include/class/class_user.php:1238 include/class/class_user.php:1236
 #: include/class/user.class.php:1236 include/class/user.class.php:1261
-#: include/class/user.class.php:1261
+#: include/class/user.class.php:1284
 msgid "Les mots de passe ne correspondent pas. Mot de passe inchangé"
 msgstr ""
 
 #: include/company.inc.php:35 include/company.inc.php:54
-#: include/company.inc.php:58 include/company.inc.php:58
+#: include/company.inc.php:58 include/company.inc.php:62
 msgid "obligatoire"
 msgstr ""
 
 #: include/company.inc.php:36 include/company.inc.php:55
-#: include/company.inc.php:59 include/company.inc.php:59
+#: include/company.inc.php:59 include/company.inc.php:63
 msgid "optionnel"
 msgstr ""
 
 #: include/company.inc.php:37 include/company.inc.php:56
-#: include/company.inc.php:60 include/company.inc.php:60
+#: include/company.inc.php:60 include/company.inc.php:64
 msgid "non utilisé"
 msgstr ""
 
@@ -6829,11 +7011,11 @@ msgstr ""
 #: include/template/profile_menu_display_submenu.php:65
 #: include/user_detail.inc.php:158
 #: include/template/profile_menu_display_module.php:81
-#: include/template/profile_menu_display_module.php:81
+#: include/user_detail.inc.php:158 include/class/tva_rate_mtable.class.php:56
 #: include/template/profile_menu_display_submenu.php:65
-#: include/user_detail.inc.php:158 include/company.inc.php:63
-#: include/company.inc.php:67 include/company.inc.php:70
-#: include/company.inc.php:108
+#: include/template/profile_menu_display_module.php:81
+#: include/company.inc.php:67 include/company.inc.php:71
+#: include/company.inc.php:74 include/company.inc.php:112
 msgid "Non"
 msgstr ""
 
@@ -6851,17 +7033,18 @@ msgstr ""
 #: include/user_detail.inc.php:159
 #: include/template/profile_menu_display_module.php:81
 #: include/class/acc_plan_mtable.class.php:59
-#: include/class/acc_plan_mtable.class.php:65
-#: include/template/profile_menu_display_module.php:81
+#: include/class/acc_plan_mtable.class.php:65 include/user_detail.inc.php:159
+#: include/class/tva_rate_mtable.class.php:57
+#: include/class/acc_plan_mtable.class.php:66
 #: include/template/profile_menu_display_submenu.php:65
-#: include/user_detail.inc.php:159 include/company.inc.php:64
-#: include/company.inc.php:68 include/company.inc.php:71
-#: include/company.inc.php:109 include/class/acc_plan_mtable.class.php:65
+#: include/template/profile_menu_display_module.php:81
+#: include/company.inc.php:68 include/company.inc.php:72
+#: include/company.inc.php:75 include/company.inc.php:113
 msgid "Oui"
 msgstr ""
 
 #: include/company.inc.php:97 include/company.inc.php:116
-#: include/company.inc.php:120 include/company.inc.php:120
+#: include/company.inc.php:120 include/company.inc.php:128
 msgid "Nom société"
 msgstr ""
 
@@ -6872,9 +7055,8 @@ msgstr ""
 #: include/template/stock_summary_list.php:42 include/company.inc.php:118
 #: include/ext/sav/include/template/sas_display_detail.php:115
 #: include/ajax/ajax_mod_stock_repo.php:71 include/company.inc.php:122
-#: include/template/stock_summary_list.php:42
-#: include/ajax/ajax_mod_stock_repo.php:71 include/company.inc.php:122
-#: include/stock_cfg.inc.php:69
+#: include/ajax/ajax_mod_stock_repo.php:71 include/stock_cfg.inc.php:69
+#: include/template/stock_summary_list.php:42 include/company.inc.php:130
 msgid "Téléphone"
 msgstr ""
 
@@ -6884,27 +7066,27 @@ msgstr ""
 #: include/database.item.php:164 include/database.item.php:157
 #: include/database.item.php:158 include/company.inc.php:124
 #: include/database.item.php:166 include/database.item.php:169
-#: include/company.inc.php:124
+#: include/database.item.php:165 include/company.inc.php:132
 msgid "Fax"
 msgstr ""
 
 #: include/company.inc.php:103 include/company.inc.php:122
-#: include/company.inc.php:126 include/company.inc.php:126
+#: include/company.inc.php:126 include/company.inc.php:134
 msgid "Rue "
 msgstr ""
 
 #: include/company.inc.php:105 include/company.inc.php:124
-#: include/company.inc.php:128 include/company.inc.php:128
+#: include/company.inc.php:128 include/company.inc.php:136
 msgid "Numéro"
 msgstr ""
 
 #: include/company.inc.php:107 include/company.inc.php:126
-#: include/company.inc.php:130 include/company.inc.php:130
+#: include/company.inc.php:130 include/company.inc.php:138
 msgid "Code Postal"
 msgstr ""
 
 #: include/company.inc.php:109 include/company.inc.php:128
-#: include/company.inc.php:132 include/company.inc.php:132
+#: include/company.inc.php:132 include/company.inc.php:140
 msgid "Commune"
 msgstr ""
 
@@ -6914,60 +7096,59 @@ msgstr ""
 #: include/ext/sav/include/template/sas_display_detail.php:107
 #: include/ajax/ajax_mod_stock_repo.php:63 include/company.inc.php:134
 #: include/export/export_stock_resume_list.php:38
-#: include/template/stock_summary_list.php:41
+#: include/ajax/ajax_mod_stock_repo.php:63 include/stock_cfg.inc.php:68
 #: include/export/export_stock_resume_list.php:38
-#: include/ajax/ajax_mod_stock_repo.php:63 include/company.inc.php:134
-#: include/stock_cfg.inc.php:68
+#: include/template/stock_summary_list.php:41 include/company.inc.php:142
 msgid "Pays"
 msgstr ""
 
 #: include/company.inc.php:113 include/company.inc.php:132
-#: include/company.inc.php:136 include/company.inc.php:136
+#: include/company.inc.php:136 include/company.inc.php:144
 msgid "Numéro de Tva"
 msgstr ""
 
 #: include/company.inc.php:114 include/company.inc.php:133
-#: include/company.inc.php:137 include/company.inc.php:137
+#: include/company.inc.php:137 include/company.inc.php:145
 msgid "Utilisation de la compta. analytique"
 msgstr ""
 
 #: include/company.inc.php:115 include/company.inc.php:134
-#: include/company.inc.php:138 include/company.inc.php:138
+#: include/company.inc.php:138 include/company.inc.php:152
 msgid "Utilisation des stocks"
 msgstr ""
 
 #: include/company.inc.php:117 include/company.inc.php:136
-#: include/company.inc.php:140 include/company.inc.php:140
+#: include/company.inc.php:140 include/company.inc.php:154
 msgid "Utilisation du mode strict "
 msgstr ""
 
 #: include/company.inc.php:118 include/company.inc.php:137
-#: include/company.inc.php:141 include/company.inc.php:141
+#: include/company.inc.php:141 include/company.inc.php:155
 msgid "Assujetti à la tva"
 msgstr ""
 
 #: include/company.inc.php:119 include/company.inc.php:138
-#: include/company.inc.php:142 include/company.inc.php:142
+#: include/company.inc.php:142 include/company.inc.php:156
 msgid "Suggérer le numéro de pièce justificative"
 msgstr ""
 
 #: include/company.inc.php:120 include/company.inc.php:139
-#: include/company.inc.php:143 include/company.inc.php:143
+#: include/company.inc.php:143 include/company.inc.php:157
 msgid "Suggérer la date"
 msgstr ""
 
 #: include/company.inc.php:121 include/company.inc.php:140
-#: include/company.inc.php:144 include/company.inc.php:144
+#: include/company.inc.php:144 include/company.inc.php:158
 msgid "Afficher la période comptable pour éviter les erreurs de date"
 msgstr ""
 
 #: include/company.inc.php:122 include/company.inc.php:141
-#: include/company.inc.php:145 include/company.inc.php:145
+#: include/company.inc.php:145 include/company.inc.php:159
 msgid "Utilisez des postes comptables alphanumérique"
 msgstr ""
 
 #: include/company.inc.php:123 include/company.inc.php:142
-#: include/company.inc.php:146 include/company.inc.php:146
+#: include/company.inc.php:146 include/company.inc.php:160
 msgid "Changer le libellé des détails"
 msgstr ""
 
@@ -6981,8 +7162,9 @@ msgstr ""
 #: include/compta_ven.inc.php:118 include/compta_ach.inc.php:114
 #: include/compta_ach.inc.php:167 include/compta_ven.inc.php:122
 #: include/ext/tva/ajax.php:111 include/compta_ven.inc.php:120
-#: include/compta_fin.inc.php:116 include/compta_ach.inc.php:112
-#: include/compta_ach.inc.php:165
+#: include/compta_ach.inc.php:112 include/compta_ach.inc.php:165
+#: include/compta_ven.inc.php:120 include/compta_ach.inc.php:111
+#: include/compta_ach.inc.php:164 include/compta_fin.inc.php:116
 msgid "Enregistrement"
 msgstr ""
 
@@ -6995,8 +7177,9 @@ msgstr ""
 #: include/compta_ach.inc.php:109 include/compta_ach.inc.php:111
 #: include/compta_ven.inc.php:119 include/compta_ach.inc.php:115
 #: include/compta_ven.inc.php:123 include/operation_ods_confirm.inc.php:90
-#: include/compta_ven.inc.php:121 include/compta_fin.inc.php:85
-#: include/compta_ach.inc.php:113 include/operation_ods_confirm.inc.php:90
+#: include/compta_ven.inc.php:121 include/compta_ach.inc.php:113
+#: include/compta_ven.inc.php:121 include/compta_ach.inc.php:112
+#: include/compta_fin.inc.php:85 include/operation_ods_confirm.inc.php:90
 msgid "Corriger"
 msgstr ""
 
@@ -7021,10 +7204,10 @@ msgstr ""
 #: include/template/detail-action.php:371 include/compta_ach.inc.php:293
 #: include/compta_ven.inc.php:328 include/compta_ven.inc.php:331
 #: include/template/form_ledger_detail.php:128 include/compta_ach.inc.php:296
-#: include/compta_ven.inc.php:339 include/template/form_ledger_detail.php:128
-#: include/template/predf_ledger_detail.php:57
-#: include/template/detail-action.php:373 include/compta_ven.inc.php:337
-#: include/compta_ach.inc.php:294
+#: include/compta_ven.inc.php:339 include/compta_ven.inc.php:337
+#: include/compta_ach.inc.php:294 include/compta_ven.inc.php:329
+#: include/compta_ach.inc.php:295 include/template/form_ledger_detail.php:131
+#: include/template/predf_ledger_detail.php:59
 msgid "Actualiser"
 msgstr ""
 
@@ -7039,6 +7222,7 @@ msgstr ""
 #: include/compta_ven.inc.php:330 include/compta_ven.inc.php:333
 #: include/compta_ach.inc.php:299 include/compta_ven.inc.php:341
 #: include/compta_ven.inc.php:339 include/compta_ach.inc.php:297
+#: include/compta_ven.inc.php:331 include/compta_ach.inc.php:298
 msgid "Effacer "
 msgstr ""
 
@@ -7058,15 +7242,15 @@ msgstr ""
 #: include/bank.inc.php:49 include/bank.inc.php:48 include/adm.inc.php:54
 #: include/contact.inc.php:53 include/customer.inc.php:53
 #: include/manager.inc.php:56 include/supplier.inc.php:55
-#: include/adm.inc.php:51 include/customer.inc.php:54
-#: include/contact.inc.php:53 include/customer.inc.php:54
-#: include/manager.inc.php:56 include/supplier.inc.php:55
-#: include/bank.inc.php:48 include/adm.inc.php:51
+#: include/adm.inc.php:51 include/customer.inc.php:54 include/bank.inc.php:48
+#: include/adm.inc.php:51 include/supplier.inc.php:55
+#: include/contact.inc.php:54 include/customer.inc.php:54
+#: include/manager.inc.php:56
 msgid "Vous  ne pouvez pas enlever de fiche"
 msgstr ""
 
 #: include/contact.inc.php:90 include/contact.inc.php:94
-#: include/contact.inc.php:95 include/contact.inc.php:95
+#: include/contact.inc.php:95 include/contact.inc.php:96
 msgid "Société :"
 msgstr ""
 
@@ -7093,64 +7277,66 @@ msgstr ""
 #: include/database.item.php:208 include/database.item.php:222
 #: include/cfgledger.inc.php:171 include/class/acc_ledger_search.class.php:1086
 #: include/class/acc_ledger_search.class.php:1099
-#: include/template/tax_summary_display.php:176 include/cfgledger.inc.php:171
-#: include/database.item.php:4 include/database.item.php:68
-#: include/database.item.php:235 include/database.item.php:254
-#: include/class/acc_ledger_search.class.php:1099
+#: include/template/tax_summary_display.php:176 include/database.item.php:235
+#: include/database.item.php:254 include/class/acc_ledger_search.class.php:1188
+#: include/class/operation_predef_mtable.class.php:172
+#: include/template/tax_summary_display.php:176 include/database.item.php:3
+#: include/database.item.php:67 include/database.item.php:219
+#: include/database.item.php:231 include/cfgledger.inc.php:171
 msgid "Achat"
 msgstr ""
 
 #: include/database.item.php:2 include/database.item.php:5
 #: include/database.item.php:7 include/database.item.php:10
-#: include/database.item.php:4 include/database.item.php:4
+#: include/database.item.php:4 include/database.item.php:3
 msgid "Nouvel achat ou dépense"
 msgstr ""
 
 #: include/database.item.php:3 include/database.item.php:6
 #: include/database.item.php:8 include/database.item.php:11
-#: include/database.item.php:5 include/database.item.php:5
+#: include/database.item.php:5 include/database.item.php:4
 msgid "Historique des imputations analytiques"
 msgstr ""
 
 #: include/database.item.php:4 include/database.item.php:7
 #: include/database.item.php:9 include/database.item.php:12
-#: include/database.item.php:6 include/database.item.php:6
+#: include/database.item.php:6 include/database.item.php:5
 msgid "Balance simple"
 msgstr ""
 
 #: include/database.item.php:4 include/database.item.php:7
 #: include/database.item.php:9 include/database.item.php:12
-#: include/database.item.php:6 include/database.item.php:6
+#: include/database.item.php:6 include/database.item.php:5
 msgid "Balance simple des imputations analytiques"
 msgstr ""
 
 #: include/database.item.php:5 include/database.item.php:8
 #: include/database.item.php:10 include/database.item.php:13
-#: include/database.item.php:7 include/database.item.php:7
+#: include/database.item.php:7 include/database.item.php:6
 msgid "Tableau"
 msgstr ""
 
 #: include/database.item.php:5 include/database.item.php:8
 #: include/database.item.php:10 include/database.item.php:13
-#: include/database.item.php:7 include/database.item.php:7
+#: include/database.item.php:7 include/database.item.php:6
 msgid "Tableau lié à la comptabilité"
 msgstr ""
 
 #: include/database.item.php:6 include/database.item.php:9
 #: include/database.item.php:11 include/database.item.php:14
-#: include/database.item.php:8 include/database.item.php:8
+#: include/database.item.php:8 include/database.item.php:7
 msgid "Balance Analytique/comptabilité"
 msgstr ""
 
 #: include/database.item.php:6 include/database.item.php:9
 #: include/database.item.php:11 include/database.item.php:14
-#: include/database.item.php:8 include/database.item.php:8
+#: include/database.item.php:8 include/database.item.php:7
 msgid "Lien entre comptabilité et Comptabilité analytique"
 msgstr ""
 
 #: include/database.item.php:7 include/database.item.php:10
 #: include/database.item.php:12 include/database.item.php:15
-#: include/database.item.php:9 include/database.item.php:9
+#: include/database.item.php:9 include/database.item.php:8
 msgid "Balance par groupe"
 msgstr ""
 
@@ -7183,27 +7369,29 @@ msgstr ""
 #: include/class/acc_ledger_history_sale.class.php:250
 #: include/template/acc_ledger_history_purchase_extended.php:129
 #: include/template/acc_ledger_history_sale_extended.php:130
-#: include/template/impress_reconciliation_detail.php:19
-#: include/template/ledger_detail_ven.php:137
-#: include/template/acc_ledger_history_purchase_oneline.php:59
-#: include/template/operation_detail_ven.php:46
-#: include/template/acc_ledger_history_sale_oneline.php:53
-#: include/template/acc_ledger_history_purchase_extended.php:52
-#: include/template/acc_ledger_history_purchase_extended.php:129
-#: include/template/operation_detail_ach.php:54
-#: include/template/acc_ledger_history_sale_extended.php:52
-#: include/template/acc_ledger_history_sale_extended.php:130
-#: include/template/ledger_detail_ach.php:135 include/database.item.php:10
 #: include/class/print_ledger_detail_item.class.php:164
-#: include/class/acc_ledger_history_sale.class.php:250
+#: include/class/acc_ledger_history_sale.class.php:260
+#: include/class/print_ledger_detail_item.class.php:164
 #: include/class/pdf_operation.class.php:152
 #: include/class/pdf_operation.class.php:197
+#: include/template/operation_detail_ach.php:54
+#: include/template/acc_ledger_history_purchase_extended.php:52
+#: include/template/acc_ledger_history_purchase_extended.php:129
+#: include/template/ledger_detail_ven.php:137
+#: include/template/acc_ledger_history_purchase_oneline.php:59
+#: include/template/acc_ledger_history_sale_oneline.php:53
+#: include/template/impress_reconciliation_detail.php:19
+#: include/template/acc_ledger_history_sale_extended.php:52
+#: include/template/acc_ledger_history_sale_extended.php:130
+#: include/template/ledger_detail_ach.php:135
+#: include/template/operation_detail_ven.php:46 include/tax_summary.inc.php:43
+#: include/database.item.php:9
 msgid "TVA"
 msgstr ""
 
 #: include/database.item.php:8 include/database.item.php:11
 #: include/database.item.php:13 include/database.item.php:16
-#: include/database.item.php:10 include/database.item.php:10
+#: include/database.item.php:10 include/database.item.php:9
 msgid "Config. de la tva"
 msgstr ""
 
@@ -7220,33 +7408,36 @@ msgstr ""
 #: include/database.item.php:211 include/database.item.php:221
 #: include/cfgledger.inc.php:173 include/class/acc_ledger_search.class.php:1084
 #: include/class/acc_ledger_search.class.php:1097
-#: include/template/tax_summary_display.php:29 include/cfgledger.inc.php:173
-#: include/database.item.php:11 include/database.item.php:234
-#: include/database.item.php:253 include/class/acc_ledger_search.class.php:1097
+#: include/template/tax_summary_display.php:29 include/database.item.php:234
+#: include/database.item.php:253 include/class/acc_ledger_search.class.php:1186
+#: include/class/operation_predef_mtable.class.php:176
+#: include/template/tax_summary_display.php:29 include/database.item.php:10
+#: include/database.item.php:218 include/database.item.php:230
+#: include/cfgledger.inc.php:173
 msgid "Vente"
 msgstr ""
 
 #: include/database.item.php:9 include/database.item.php:12
 #: include/database.item.php:14 include/database.item.php:17
-#: include/database.item.php:11 include/database.item.php:11
+#: include/database.item.php:11 include/database.item.php:10
 msgid "Nouvelle vente ou recette"
 msgstr ""
 
 #: include/database.item.php:10 include/database.item.php:13
 #: include/database.item.php:15 include/database.item.php:18
-#: include/database.item.php:12 include/database.item.php:12
+#: include/database.item.php:12 include/database.item.php:11
 msgid "Config. Menu"
 msgstr ""
 
 #: include/database.item.php:10 include/database.item.php:13
 #: include/database.item.php:15 include/database.item.php:18
-#: include/database.item.php:12 include/database.item.php:12
+#: include/database.item.php:12 include/database.item.php:11
 msgid "Configuration des menus et plugins"
 msgstr ""
 
 #: include/database.item.php:11 include/database.item.php:14
 #: include/database.item.php:16 include/database.item.php:19
-#: include/database.item.php:13 include/database.item.php:13
+#: include/database.item.php:13 include/database.item.php:12
 msgid "Suivi fournisseur"
 msgstr ""
 
@@ -7255,27 +7446,27 @@ msgstr ""
 #: include/database.item.php:120 include/database.item.php:117
 #: include/database.item.php:116 include/database.item.php:17
 #: include/database.item.php:20 include/database.item.php:14
-#: include/database.item.php:112 include/database.item.php:14
-#: include/database.item.php:114
+#: include/database.item.php:112 include/database.item.php:13
+#: include/database.item.php:113
 msgid "Opérations diverses"
 msgstr ""
 
 #: include/database.item.php:12 include/database.item.php:15
 #: include/database.item.php:17 include/database.item.php:20
-#: include/database.item.php:14 include/database.item.php:14
+#: include/database.item.php:14 include/database.item.php:13
 msgid "OD analytique"
 msgstr ""
 
 #: include/database.item.php:13 include/database.item.php:16
 #: include/database.item.php:18 include/database.item.php:21
-#: include/database.item.php:15 include/database.item.php:15
+#: include/database.item.php:15 include/database.item.php:14
 msgid "Création de rapport"
 msgstr ""
 
 #: include/database.item.php:14 include/database.item.php:17
 #: include/database.item.php:15 include/database.item.php:20
 #: include/database.item.php:23 include/database.item.php:16
-#: include/database.item.php:16
+#: include/database.item.php:15
 msgid "saut de ligne"
 msgstr ""
 
@@ -7288,14 +7479,14 @@ msgstr ""
 #: include/database.item.php:108 include/database.item.php:105
 #: include/database.item.php:104 include/database.item.php:21
 #: include/database.item.php:24 include/database.item.php:17
-#: include/database.item.php:17
+#: include/database.item.php:16
 msgid "Suivi client"
 msgstr ""
 
 #: include/database.item.php:16 include/database.item.php:19
 #: include/database.item.php:23 include/database.item.php:22
 #: include/database.item.php:25 include/database.item.php:18
-#: include/database.item.php:18
+#: include/database.item.php:17
 msgid "Historique stock"
 msgstr ""
 
@@ -7307,7 +7498,7 @@ msgstr ""
 #: include/database.item.php:17 include/database.item.php:20
 #: include/database.item.php:24 include/database.item.php:23
 #: include/database.item.php:26 include/database.item.php:19
-#: include/database.item.php:19
+#: include/database.item.php:18
 msgid "Export Historique"
 msgstr ""
 
@@ -7316,7 +7507,7 @@ msgstr ""
 #: include/database.item.php:25 include/database.item.php:26
 #: include/database.item.php:24 include/database.item.php:27
 #: include/database.item.php:28 include/database.item.php:20
-#: include/database.item.php:20 include/database.item.php:21
+#: include/database.item.php:19 include/database.item.php:20
 msgid "Export Journaux"
 msgstr ""
 
@@ -7325,7 +7516,7 @@ msgstr ""
 #: include/database.item.php:27 include/database.item.php:28
 #: include/database.item.php:26 include/database.item.php:29
 #: include/database.item.php:30 include/database.item.php:22
-#: include/database.item.php:22 include/database.item.php:23
+#: include/database.item.php:21 include/database.item.php:22
 msgid "Export Poste détail"
 msgstr ""
 
@@ -7334,7 +7525,7 @@ msgstr ""
 #: include/database.item.php:29 include/database.item.php:30
 #: include/database.item.php:28 include/database.item.php:31
 #: include/database.item.php:32 include/database.item.php:24
-#: include/database.item.php:24 include/database.item.php:25
+#: include/database.item.php:23 include/database.item.php:24
 msgid "Export Fiche détail"
 msgstr ""
 
@@ -7343,7 +7534,7 @@ msgstr ""
 #: include/database.item.php:31 include/database.item.php:32
 #: include/database.item.php:30 include/database.item.php:33
 #: include/database.item.php:34 include/database.item.php:26
-#: include/database.item.php:26 include/database.item.php:27
+#: include/database.item.php:25 include/database.item.php:26
 msgid "Export Fiche balance"
 msgstr ""
 
@@ -7352,7 +7543,7 @@ msgstr ""
 #: include/database.item.php:33 include/database.item.php:34
 #: include/database.item.php:32 include/database.item.php:35
 #: include/database.item.php:36 include/database.item.php:28
-#: include/database.item.php:28 include/database.item.php:29
+#: include/database.item.php:27 include/database.item.php:28
 msgid "Export report"
 msgstr ""
 
@@ -7361,7 +7552,7 @@ msgstr ""
 #: include/database.item.php:35 include/database.item.php:36
 #: include/database.item.php:34 include/database.item.php:37
 #: include/database.item.php:38 include/database.item.php:30
-#: include/database.item.php:30 include/database.item.php:31
+#: include/database.item.php:29 include/database.item.php:30
 msgid "Export Fiche"
 msgstr ""
 
@@ -7370,14 +7561,14 @@ msgstr ""
 #: include/database.item.php:37 include/database.item.php:38
 #: include/database.item.php:36 include/database.item.php:39
 #: include/database.item.php:40 include/database.item.php:32
-#: include/database.item.php:32 include/database.item.php:33
+#: include/database.item.php:31 include/database.item.php:32
 msgid "Export Grand Livre"
 msgstr ""
 
 #: include/database.item.php:32 include/database.item.php:35
 #: include/database.item.php:39 include/database.item.php:38
 #: include/database.item.php:41 include/database.item.php:34
-#: include/database.item.php:34
+#: include/database.item.php:33
 msgid "Export Sécurité"
 msgstr ""
 
@@ -7386,14 +7577,14 @@ msgstr ""
 #: include/database.item.php:40 include/database.item.php:42
 #: include/database.item.php:39 include/database.item.php:41
 #: include/database.item.php:44 include/database.item.php:37
-#: include/database.item.php:35 include/database.item.php:37
+#: include/database.item.php:34 include/database.item.php:36
 msgid "Export Comptabilité analytique"
 msgstr ""
 
 #: include/database.item.php:34 include/database.item.php:37
 #: include/database.item.php:41 include/database.item.php:40
 #: include/database.item.php:43 include/database.item.php:36
-#: include/database.item.php:36
+#: include/database.item.php:35
 msgid "Export Comptabilité analytique balance simple"
 msgstr ""
 
@@ -7402,7 +7593,7 @@ msgstr ""
 #: include/database.item.php:43 include/database.item.php:44
 #: include/database.item.php:42 include/database.item.php:45
 #: include/database.item.php:46 include/database.item.php:38
-#: include/database.item.php:38 include/database.item.php:39
+#: include/database.item.php:37 include/database.item.php:38
 msgid "Export Comptabilité analytique balance double"
 msgstr ""
 
@@ -7411,70 +7602,70 @@ msgstr ""
 #: include/database.item.php:45 include/database.item.php:46
 #: include/database.item.php:44 include/database.item.php:47
 #: include/database.item.php:48 include/database.item.php:40
-#: include/database.item.php:40 include/database.item.php:41
+#: include/database.item.php:39 include/database.item.php:40
 msgid "Export Balance comptable"
 msgstr ""
 
 #: include/database.item.php:40 include/database.item.php:43
 #: include/database.item.php:47 include/database.item.php:46
 #: include/database.item.php:49 include/database.item.php:42
-#: include/database.item.php:42
+#: include/database.item.php:41
 msgid "Export Tableau Analytique"
 msgstr ""
 
 #: include/database.item.php:41 include/database.item.php:44
 #: include/database.item.php:48 include/database.item.php:47
 #: include/database.item.php:50 include/database.item.php:43
-#: include/database.item.php:43
+#: include/database.item.php:42
 msgid "Export Historique Compt. Analytique"
 msgstr ""
 
 #: include/database.item.php:42 include/database.item.php:45
 #: include/database.item.php:49 include/database.item.php:48
 #: include/database.item.php:51 include/database.item.php:44
-#: include/database.item.php:44
+#: include/database.item.php:43
 msgid "Export Balance groupe analytique"
 msgstr ""
 
 #: include/database.item.php:43 include/database.item.php:46
 #: include/database.item.php:50 include/database.item.php:49
 #: include/database.item.php:52 include/database.item.php:45
-#: include/database.item.php:45
+#: include/database.item.php:44
 msgid "Export Bilan"
 msgstr ""
 
 #: include/database.item.php:44 include/database.item.php:47
 #: include/database.item.php:51 include/database.item.php:50
 #: include/database.item.php:53 include/database.item.php:46
-#: include/database.item.php:46
+#: include/database.item.php:45
 msgid "Impression Grand-Livre"
 msgstr ""
 
 #: include/database.item.php:45 include/database.item.php:48
 #: include/database.item.php:52 include/database.item.php:51
 #: include/database.item.php:54 include/database.item.php:47
-#: include/database.item.php:47
+#: include/database.item.php:46
 msgid "Export définition d'un raport"
 msgstr ""
 
 #: include/database.item.php:46 include/database.item.php:49
 #: include/database.item.php:53 include/database.item.php:52
 #: include/database.item.php:55 include/database.item.php:48
-#: include/database.item.php:48
+#: include/database.item.php:47
 msgid "Export Action Gestion"
 msgstr ""
 
 #: include/database.item.php:47 include/database.item.php:50
 #: include/database.item.php:54 include/database.item.php:53
 #: include/database.item.php:56 include/database.item.php:49
-#: include/database.item.php:49
+#: include/database.item.php:48
 msgid "Export Historique mouvement stock"
 msgstr ""
 
 #: include/database.item.php:48 include/database.item.php:51
 #: include/database.item.php:55 include/database.item.php:54
 #: include/database.item.php:57 include/database.item.php:50
-#: include/database.item.php:50
+#: include/database.item.php:49
 msgid "Export Résumé list stock"
 msgstr ""
 
@@ -7482,6 +7673,7 @@ msgstr ""
 #: include/database.item.php:61 include/database.item.php:58
 #: include/database.item.php:57 include/database.item.php:55
 #: include/database.item.php:50 include/database.item.php:51
+#: include/database.item.php:50
 msgid "Plan Compt. analytique"
 msgstr ""
 
@@ -7489,6 +7681,7 @@ msgstr ""
 #: include/database.item.php:61 include/database.item.php:58
 #: include/database.item.php:57 include/database.item.php:55
 #: include/database.item.php:50 include/database.item.php:51
+#: include/database.item.php:50
 msgid "Plan analytique"
 msgstr ""
 
@@ -7496,13 +7689,14 @@ msgstr ""
 #: include/database.item.php:62 include/database.item.php:59
 #: include/database.item.php:58 include/database.item.php:56
 #: include/database.item.php:51 include/database.item.php:52
+#: include/database.item.php:51
 msgid "Groupe analytique"
 msgstr ""
 
 #: include/database.item.php:51 include/database.item.php:54
 #: include/database.item.php:58 include/database.item.php:57
 #: include/database.item.php:60 include/database.item.php:52
-#: include/database.item.php:53
+#: include/database.item.php:53 include/database.item.php:52
 msgid "Liste des contacts"
 msgstr ""
 
@@ -7515,8 +7709,8 @@ msgstr ""
 #: include/cfgplugin.inc.php:113 include/database.item.php:22
 #: include/database.item.php:51 include/upgrade.inc.php:35
 #: include/ajax/ajax_navigator.php:106 include/database.item.php:49
-#: include/cfgplugin.inc.php:113 include/upgrade.inc.php:35
-#: include/ajax/ajax_navigator.php:106 include/database.item.php:62
+#: include/cfgplugin.inc.php:113 include/ajax/ajax_navigator.php:106
+#: include/database.item.php:61 include/upgrade.inc.php:35
 msgid "Extension"
 msgstr ""
 
@@ -7524,7 +7718,7 @@ msgstr ""
 #: include/database.item.php:59 include/database.item.php:62
 #: include/database.item.php:61 include/database.item.php:19
 #: include/database.item.php:22 include/database.item.php:51
-#: include/database.item.php:49 include/database.item.php:62
+#: include/database.item.php:49 include/database.item.php:61
 msgid "Extensions (plugins)"
 msgstr ""
 
@@ -7532,6 +7726,7 @@ msgstr ""
 #: include/database.item.php:60 include/database.item.php:57
 #: include/database.item.php:58 include/database.item.php:61
 #: include/database.item.php:55 include/database.item.php:54
+#: include/database.item.php:53
 msgid "Ecriture prédefinie"
 msgstr ""
 
@@ -7539,6 +7734,7 @@ msgstr ""
 #: include/database.item.php:60 include/database.item.php:57
 #: include/database.item.php:58 include/database.item.php:61
 #: include/database.item.php:55 include/database.item.php:54
+#: include/database.item.php:53
 msgid "Gestion des opérations prédéfinifies"
 msgstr ""
 
@@ -7549,8 +7745,10 @@ msgstr ""
 #: include/database.item.php:225 include/cfgledger.inc.php:167
 #: include/database.item.php:56 include/database.item.php:248
 #: include/database.item.php:223 include/cfgledger.inc.php:172
-#: include/cfgledger.inc.php:172 include/database.item.php:55
-#: include/database.item.php:255
+#: include/database.item.php:55 include/database.item.php:255
+#: include/class/operation_predef_mtable.class.php:180
+#: include/database.item.php:54 include/database.item.php:232
+#: include/cfgledger.inc.php:172
 msgid "Opérations Diverses"
 msgstr ""
 
@@ -7558,7 +7756,7 @@ msgstr ""
 #: include/database.item.php:64 include/database.item.php:61
 #: include/database.item.php:60 include/database.item.php:59
 #: include/database.item.php:62 include/database.item.php:56
-#: include/database.item.php:55
+#: include/database.item.php:55 include/database.item.php:54
 msgid "Nouvelle opérations diverses"
 msgstr ""
 
@@ -7566,6 +7764,7 @@ msgstr ""
 #: include/database.item.php:65 include/database.item.php:63
 #: include/database.item.php:62 include/database.item.php:60
 #: include/database.item.php:57 include/database.item.php:56
+#: include/database.item.php:55
 msgid "Nouvel extrait"
 msgstr ""
 
@@ -7573,6 +7772,7 @@ msgstr ""
 #: include/database.item.php:65 include/database.item.php:63
 #: include/database.item.php:62 include/database.item.php:60
 #: include/database.item.php:57 include/database.item.php:56
+#: include/database.item.php:55
 msgid "Nouvel extrait bancaire"
 msgstr ""
 
@@ -7583,15 +7783,15 @@ msgstr ""
 #: include/template/menu_detail.php:75 include/menu.inc.php:114
 #: include/database.item.php:59 include/database.item.php:62
 #: include/ext/syndicat_tools/index.php:37 include/database.item.php:65
-#: include/template/menu_detail.php:75 include/menu.inc.php:114
-#: include/database.item.php:58 include/card_attr.inc.php:98
+#: include/database.item.php:58 include/template/menu_detail.php:75
+#: include/database.item.php:57 include/menu.inc.php:114
 msgid "Paramètre"
 msgstr ""
 
 #: include/database.item.php:57 include/database.item.php:60
 #: include/database.item.php:63 include/database.item.php:59
 #: include/database.item.php:62 include/database.item.php:65
-#: include/database.item.php:58
+#: include/database.item.php:58 include/database.item.php:57
 msgid "Module paramètre"
 msgstr ""
 
@@ -7599,7 +7799,7 @@ msgstr ""
 #: include/database.item.php:67 include/database.item.php:65
 #: include/database.item.php:64 include/database.item.php:63
 #: include/database.item.php:66 include/database.item.php:60
-#: include/database.item.php:59
+#: include/database.item.php:59 include/database.item.php:58
 msgid "Catégorie de documents"
 msgstr ""
 
@@ -7607,7 +7807,7 @@ msgstr ""
 #: include/database.item.php:67 include/database.item.php:65
 #: include/database.item.php:64 include/database.item.php:63
 #: include/database.item.php:66 include/database.item.php:60
-#: include/database.item.php:59
+#: include/database.item.php:59 include/database.item.php:58
 msgid "Config. catégorie de documents"
 msgstr ""
 
@@ -7615,7 +7815,7 @@ msgstr ""
 #: include/database.item.php:68 include/database.item.php:66
 #: include/database.item.php:65 include/database.item.php:64
 #: include/database.item.php:67 include/database.item.php:61
-#: include/database.item.php:60
+#: include/database.item.php:60 include/database.item.php:59
 msgid "Lettrage par Fiche"
 msgstr ""
 
@@ -7623,7 +7823,7 @@ msgstr ""
 #: include/database.item.php:68 include/database.item.php:66
 #: include/database.item.php:65 include/database.item.php:64
 #: include/database.item.php:67 include/database.item.php:61
-#: include/database.item.php:60
+#: include/database.item.php:60 include/database.item.php:59
 msgid "Lettrage par fiche"
 msgstr ""
 
@@ -7631,7 +7831,7 @@ msgstr ""
 #: include/database.item.php:69 include/database.item.php:67
 #: include/database.item.php:66 include/database.item.php:65
 #: include/database.item.php:68 include/database.item.php:62
-#: include/database.item.php:61
+#: include/database.item.php:61 include/database.item.php:60
 msgid "Historique achat"
 msgstr ""
 
@@ -7639,7 +7839,7 @@ msgstr ""
 #: include/database.item.php:70 include/database.item.php:68
 #: include/database.item.php:67 include/database.item.php:66
 #: include/database.item.php:69 include/database.item.php:63
-#: include/database.item.php:63
+#: include/database.item.php:62
 msgid "Historique opérations diverses"
 msgstr ""
 
@@ -7647,7 +7847,7 @@ msgstr ""
 #: include/database.item.php:71 include/database.item.php:69
 #: include/database.item.php:68 include/database.item.php:67
 #: include/database.item.php:70 include/database.item.php:64
-#: include/database.item.php:64
+#: include/database.item.php:63
 msgid "Impression du détail d'un poste comptable"
 msgstr ""
 
@@ -7655,7 +7855,7 @@ msgstr ""
 #: include/database.item.php:66 include/database.item.php:72
 #: include/database.item.php:70 include/database.item.php:69
 #: include/database.item.php:68 include/database.item.php:71
-#: include/database.item.php:65 include/database.item.php:65
+#: include/database.item.php:65 include/database.item.php:64
 msgid "Rapport"
 msgstr ""
 
@@ -7663,7 +7863,7 @@ msgstr ""
 #: include/database.item.php:72 include/database.item.php:70
 #: include/database.item.php:69 include/database.item.php:68
 #: include/database.item.php:71 include/database.item.php:65
-#: include/database.item.php:65
+#: include/database.item.php:64
 msgid "Impression de rapport"
 msgstr ""
 
@@ -7676,8 +7876,9 @@ msgstr ""
 #: include/class/class_acc_ledger.php:352 include/database.item.php:72
 #: include/class/acc_ledger.class.php:364 include/database.item.php:66
 #: include/class/acc_ledger.class.php:372
-#: include/class/acc_ledger.class.php:373 include/database.item.php:66
+#: include/class/acc_ledger.class.php:373
 #: include/class/acc_ledger.class.php:391
+#: include/class/acc_ledger.class.php:390 include/database.item.php:65
 msgid "Grand Livre"
 msgstr ""
 
@@ -7685,7 +7886,7 @@ msgstr ""
 #: include/database.item.php:73 include/database.item.php:71
 #: include/database.item.php:70 include/database.item.php:69
 #: include/database.item.php:72 include/database.item.php:66
-#: include/database.item.php:66
+#: include/database.item.php:65
 msgid "Impression du grand livre"
 msgstr ""
 
@@ -7693,7 +7894,7 @@ msgstr ""
 #: include/database.item.php:74 include/database.item.php:72
 #: include/database.item.php:71 include/database.item.php:70
 #: include/database.item.php:73 include/database.item.php:67
-#: include/database.item.php:67
+#: include/database.item.php:66
 msgid "Impression des balances comptables"
 msgstr ""
 
@@ -7701,7 +7902,7 @@ msgstr ""
 #: include/database.item.php:75 include/database.item.php:73
 #: include/database.item.php:72 include/database.item.php:71
 #: include/database.item.php:74 include/database.item.php:68
-#: include/database.item.php:68
+#: include/database.item.php:67
 msgid "Menu achat"
 msgstr ""
 
@@ -7709,7 +7910,7 @@ msgstr ""
 #: include/database.item.php:76 include/database.item.php:74
 #: include/database.item.php:73 include/database.item.php:72
 #: include/database.item.php:75 include/database.item.php:69
-#: include/database.item.php:69
+#: include/database.item.php:68
 msgid "Menu et profil"
 msgstr ""
 
@@ -7717,7 +7918,7 @@ msgstr ""
 #: include/database.item.php:76 include/database.item.php:74
 #: include/database.item.php:73 include/database.item.php:72
 #: include/database.item.php:75 include/database.item.php:69
-#: include/database.item.php:69
+#: include/database.item.php:68
 msgid "Menu "
 msgstr ""
 
@@ -7733,10 +7934,9 @@ msgstr ""
 #: include/database.item.php:73 include/ajax/ajax_get_profile.php:114
 #: include/database.item.php:76 include/ajax/ajax_get_profile.php:120
 #: include/database.item.php:70 include/database.item.php:115
-#: include/template/menu_detail.php:18
-#: include/template/action_other_action.php:22
-#: include/ajax/ajax_get_profile.php:120 include/menu.inc.php:127
-#: include/database.item.php:70 include/database.item.php:117
+#: include/ajax/ajax_get_profile.php:119 include/template/menu_detail.php:18
+#: include/template/action_other_action.php:22 include/database.item.php:69
+#: include/database.item.php:116 include/menu.inc.php:127
 msgid "Impression"
 msgstr ""
 
@@ -7744,7 +7944,7 @@ msgstr ""
 #: include/database.item.php:77 include/database.item.php:75
 #: include/database.item.php:74 include/database.item.php:73
 #: include/database.item.php:76 include/database.item.php:70
-#: include/database.item.php:70
+#: include/database.item.php:69
 msgid "Menu impression"
 msgstr ""
 
@@ -7752,7 +7952,7 @@ msgstr ""
 #: include/database.item.php:78 include/database.item.php:76
 #: include/database.item.php:75 include/database.item.php:74
 #: include/database.item.php:77 include/database.item.php:71
-#: include/database.item.php:71
+#: include/database.item.php:70
 msgid "Information Banque"
 msgstr ""
 
@@ -7760,7 +7960,7 @@ msgstr ""
 #: include/database.item.php:79 include/database.item.php:77
 #: include/database.item.php:76 include/database.item.php:75
 #: include/database.item.php:78 include/database.item.php:72
-#: include/database.item.php:72
+#: include/database.item.php:71
 msgid "Grand'Livre"
 msgstr ""
 
@@ -7768,21 +7968,21 @@ msgstr ""
 #: include/database.item.php:79 include/database.item.php:77
 #: include/database.item.php:76 include/database.item.php:75
 #: include/database.item.php:78 include/database.item.php:72
-#: include/database.item.php:72
+#: include/database.item.php:71
 msgid "Grand livre analytique"
 msgstr ""
 
 #: include/database.item.php:71 include/database.item.php:74
 #: include/database.item.php:14 include/database.item.php:76
 #: include/database.item.php:79 include/database.item.php:73
-#: include/database.item.php:73
+#: include/database.item.php:72
 msgid "Gestion"
 msgstr ""
 
 #: include/database.item.php:71 include/database.item.php:74
 #: include/database.item.php:14 include/database.item.php:76
 #: include/database.item.php:79 include/database.item.php:73
-#: include/database.item.php:73
+#: include/database.item.php:72
 msgid "Module gestion"
 msgstr ""
 
@@ -7793,8 +7993,8 @@ msgstr ""
 #: include/lib/user_menu.php:131 include/lib/user_menu.php:124
 #: include/lib/user_menu.php:143 include/database.item.php:75
 #: include/lib/user_menu.php:81 include/lib/user_menu.php:100
-#: include/database.item.php:75 include/lib/user_menu.php:81
-#: include/lib/user_menu.php:100
+#: include/database.item.php:74 include/lib/user_menu.php:80
+#: include/lib/user_menu.php:99
 msgid "Accueil"
 msgstr ""
 
@@ -7805,15 +8005,15 @@ msgstr ""
 #: include/template/security_list_action.php:63
 #: include/class/pdf_operation.class.php:371 include/database.item.php:76
 #: include/template/security_list_action.php:66
-#: include/template/security_list_action.php:66 include/database.item.php:76
 #: include/class/pdf_operation.class.php:371
+#: include/template/security_list_action.php:67 include/database.item.php:75
 msgid "Comptabilité"
 msgstr ""
 
 #: include/database.item.php:74 include/database.item.php:77
 #: include/database.item.php:82 include/database.item.php:80
 #: include/database.item.php:79 include/database.item.php:76
-#: include/database.item.php:76
+#: include/database.item.php:75
 msgid "Module comptabilité"
 msgstr ""
 
@@ -7825,15 +8025,15 @@ msgstr ""
 #: include/database.item.php:192 include/database.item.php:80
 #: include/database.item.php:190 include/database.item.php:180
 #: include/database.item.php:181 include/database.item.php:184
-#: include/database.item.php:77 include/database.item.php:77
-#: include/database.item.php:197
+#: include/database.item.php:77 include/database.item.php:197
+#: include/database.item.php:76 include/database.item.php:190
 msgid "Divers"
 msgstr ""
 
 #: include/database.item.php:75 include/database.item.php:78
 #: include/database.item.php:83 include/database.item.php:81
 #: include/database.item.php:80 include/database.item.php:77
-#: include/database.item.php:77
+#: include/database.item.php:76
 msgid "Paramètres divers"
 msgstr ""
 
@@ -7844,8 +8044,8 @@ msgstr ""
 #: include/lib/user_menu.php:125 include/lib/user_menu.php:144
 #: include/database.item.php:107 include/database.item.php:101
 #: include/database.item.php:99 include/lib/user_menu.php:82
-#: include/lib/user_menu.php:101 include/database.item.php:104
-#: include/lib/user_menu.php:82 include/lib/user_menu.php:101
+#: include/lib/user_menu.php:101 include/database.item.php:103
+#: include/lib/user_menu.php:81 include/lib/user_menu.php:100
 msgid "Sortie"
 msgstr ""
 
@@ -7863,9 +8063,9 @@ msgstr ""
 #: include/template/action_search.php:56 include/database.item.php:84
 #: include/param_sec.inc.php:217 include/database.item.php:78
 #: include/param_sec.inc.php:221 include/template/action_search.php:52
-#: include/database.item.php:76 include/param_sec.inc.php:221
-#: include/template/user_sec_profile.php:35
-#: include/template/action_search.php:52 include/database.item.php:78
+#: include/database.item.php:76 include/template/user_sec_profile.php:35
+#: include/template/action_search.php:52 include/database.item.php:77
+#: include/param_sec.inc.php:226
 msgid "Profil"
 msgstr ""
 
@@ -7873,7 +8073,7 @@ msgstr ""
 #: include/database.item.php:85 include/database.item.php:82
 #: include/database.item.php:81 include/database.item.php:84
 #: include/database.item.php:78 include/database.item.php:76
-#: include/database.item.php:78
+#: include/database.item.php:77
 msgid "Configuration profil"
 msgstr ""
 
@@ -7881,7 +8081,7 @@ msgstr ""
 #: include/database.item.php:86 include/database.item.php:83
 #: include/database.item.php:82 include/database.item.php:85
 #: include/database.item.php:79 include/database.item.php:77
-#: include/database.item.php:79
+#: include/database.item.php:78
 msgid "Config. poste comptable de base"
 msgstr ""
 
@@ -7889,7 +8089,7 @@ msgstr ""
 #: include/database.item.php:87 include/database.item.php:84
 #: include/database.item.php:83 include/database.item.php:86
 #: include/database.item.php:80 include/database.item.php:78
-#: include/database.item.php:80
+#: include/database.item.php:79
 msgid "Liste,Balance,Historique par fiche"
 msgstr ""
 
@@ -7897,7 +8097,7 @@ msgstr ""
 #: include/database.item.php:89 include/database.item.php:86
 #: include/database.item.php:85 include/database.item.php:88
 #: include/database.item.php:82 include/database.item.php:80
-#: include/database.item.php:82
+#: include/database.item.php:81
 msgid "Configuration étiquette"
 msgstr ""
 
@@ -7905,91 +8105,91 @@ msgstr ""
 #: include/database.item.php:89 include/database.item.php:86
 #: include/database.item.php:85 include/database.item.php:88
 #: include/database.item.php:82 include/database.item.php:80
-#: include/database.item.php:82
+#: include/database.item.php:81
 msgid "Configuration des tags"
 msgstr ""
 
 #: include/database.item.php:82 include/database.item.php:85
 #: include/database.item.php:90 include/database.item.php:87
 #: include/database.item.php:86 include/database.item.php:84
-#: include/database.item.php:84
+#: include/database.item.php:83
 msgid "Balance croisée double"
 msgstr ""
 
 #: include/database.item.php:82 include/database.item.php:85
 #: include/database.item.php:90 include/database.item.php:87
 #: include/database.item.php:86 include/database.item.php:84
-#: include/database.item.php:84
+#: include/database.item.php:83
 msgid "Balance double croisées des imputations analytiques"
 msgstr ""
 
 #: include/database.item.php:83 include/database.item.php:86
 #: include/database.item.php:91 include/database.item.php:88
 #: include/database.item.php:87 include/database.item.php:85
-#: include/database.item.php:85
+#: include/database.item.php:84
 msgid "Sociétés"
 msgstr ""
 
 #: include/database.item.php:83 include/database.item.php:86
 #: include/database.item.php:91 include/database.item.php:88
 #: include/database.item.php:87 include/database.item.php:85
-#: include/database.item.php:85
+#: include/database.item.php:84
 msgid "Parametre societe"
 msgstr ""
 
 #: include/database.item.php:84 include/database.item.php:87
 #: include/database.item.php:92 include/database.item.php:89
 #: include/database.item.php:88 include/database.item.php:86
-#: include/database.item.php:86
+#: include/database.item.php:85
 msgid "Gestion des périodes"
 msgstr ""
 
 #: include/database.item.php:85 include/database.item.php:88
 #: include/database.item.php:93 include/database.item.php:90
 #: include/database.item.php:89 include/database.item.php:87
-#: include/database.item.php:87
+#: include/database.item.php:86
 msgid "Vérification "
 msgstr ""
 
 #: include/database.item.php:85 include/database.item.php:88
 #: include/database.item.php:93 include/database.item.php:90
 #: include/database.item.php:89 include/database.item.php:87
-#: include/database.item.php:87
+#: include/database.item.php:86
 msgid "Vérification de la comptabilité"
 msgstr ""
 
 #: include/database.item.php:86 include/database.item.php:89
 #: include/database.item.php:94 include/database.item.php:91
 #: include/database.item.php:90 include/database.item.php:88
-#: include/database.item.php:88
+#: include/database.item.php:87
 msgid "Ecriture Ouverture"
 msgstr ""
 
 #: include/database.item.php:86 include/database.item.php:89
 #: include/database.item.php:94 include/database.item.php:91
 #: include/database.item.php:90 include/database.item.php:88
-#: include/database.item.php:88
+#: include/database.item.php:87
 msgid "Ecriture d'ouverture"
 msgstr ""
 
 #: include/database.item.php:87 include/database.item.php:90
 #: include/database.item.php:95 include/database.item.php:92
 #: include/database.item.php:91 include/database.item.php:89
-#: include/database.item.php:89
+#: include/database.item.php:88
 msgid "Config. modèle de document"
 msgstr ""
 
 #: include/database.item.php:88 include/database.item.php:91
 #: include/database.item.php:96 include/database.item.php:93
 #: include/database.item.php:92 include/database.item.php:90
-#: include/database.item.php:90
+#: include/database.item.php:89
 msgid "journaux"
 msgstr ""
 
 #: include/database.item.php:88 include/database.item.php:91
 #: include/database.item.php:96 include/database.item.php:93
 #: include/database.item.php:92 include/database.item.php:90
-#: include/database.item.php:90
+#: include/database.item.php:89
 msgid "Configuration des journaux"
 msgstr ""
 
@@ -7997,63 +8197,63 @@ msgstr ""
 #: include/database.item.php:97 include/database.item.php:94
 #: include/database.item.php:93 include/export/export_security_pdf.php:89
 #: include/database.item.php:91 include/export/export_security_pdf.php:89
-#: include/database.item.php:91
+#: include/database.item.php:90
 msgid "Sécurité"
 msgstr ""
 
 #: include/database.item.php:89 include/database.item.php:92
 #: include/database.item.php:97 include/database.item.php:94
 #: include/database.item.php:93 include/database.item.php:91
-#: include/database.item.php:91
+#: include/database.item.php:90
 msgid "configuration de la sécurité"
 msgstr ""
 
 #: include/database.item.php:90 include/database.item.php:93
 #: include/database.item.php:98 include/database.item.php:95
 #: include/database.item.php:94 include/database.item.php:92
-#: include/database.item.php:92
+#: include/database.item.php:91
 msgid "Attribut de fiche"
 msgstr ""
 
 #: include/database.item.php:90 include/database.item.php:93
 #: include/database.item.php:98 include/database.item.php:95
 #: include/database.item.php:94 include/database.item.php:92
-#: include/database.item.php:92
+#: include/database.item.php:91
 msgid "Gestion des attributs de fiches "
 msgstr ""
 
 #: include/database.item.php:91 include/database.item.php:94
 #: include/database.item.php:99 include/database.item.php:96
 #: include/database.item.php:95 include/database.item.php:93
-#: include/database.item.php:93
+#: include/database.item.php:92
 msgid "Etat des stock"
 msgstr ""
 
 #: include/database.item.php:92 include/database.item.php:95
 #: include/database.item.php:100 include/database.item.php:97
 #: include/database.item.php:96 include/database.item.php:94
-#: include/database.item.php:94
+#: include/database.item.php:93
 msgid "Modification Stocks"
 msgstr ""
 
 #: include/database.item.php:92 include/database.item.php:95
 #: include/database.item.php:100 include/database.item.php:97
 #: include/database.item.php:96 include/database.item.php:94
-#: include/database.item.php:94
+#: include/database.item.php:93
 msgid "Modification des stocks (inventaire)"
 msgstr ""
 
 #: include/database.item.php:93 include/database.item.php:96
 #: include/database.item.php:101 include/database.item.php:98
 #: include/database.item.php:97 include/database.item.php:95
-#: include/database.item.php:95
+#: include/database.item.php:94
 msgid "Histo. Changement"
 msgstr ""
 
 #: include/database.item.php:93 include/database.item.php:96
 #: include/database.item.php:101 include/database.item.php:98
 #: include/database.item.php:97 include/database.item.php:95
-#: include/database.item.php:95
+#: include/database.item.php:94
 msgid "Liste des changements manuels des stocks"
 msgstr ""
 
@@ -8062,14 +8262,14 @@ msgstr ""
 #: include/database.item.php:99 include/database.item.php:98
 #: include/ajax/ajax_navigator.php:23 include/database.item.php:96
 #: include/ajax/ajax_navigator.php:28 include/ajax/ajax_navigator.php:28
-#: include/database.item.php:96
+#: include/database.item.php:95
 msgid "Navigateur"
 msgstr ""
 
 #: include/database.item.php:94 include/database.item.php:97
 #: include/database.item.php:102 include/database.item.php:99
 #: include/database.item.php:98 include/database.item.php:96
-#: include/database.item.php:96
+#: include/database.item.php:95
 msgid "Menu simplifié pour retrouver rapidement un menu"
 msgstr ""
 
@@ -8079,28 +8279,28 @@ msgstr ""
 #: include/database.item.php:113 include/database.item.php:102
 #: include/database.item.php:110 include/database.item.php:101
 #: include/database.item.php:109 include/database.item.php:99
-#: include/database.item.php:99 include/database.item.php:107
+#: include/database.item.php:98 include/database.item.php:106
 msgid "Rapprochement"
 msgstr ""
 
 #: include/database.item.php:97 include/database.item.php:100
 #: include/database.item.php:105 include/database.item.php:102
 #: include/database.item.php:101 include/database.item.php:99
-#: include/database.item.php:99
+#: include/database.item.php:98
 msgid "Rapprochement bancaire"
 msgstr ""
 
 #: include/database.item.php:98 include/database.item.php:101
 #: include/database.item.php:106 include/database.item.php:103
 #: include/database.item.php:102 include/database.item.php:100
-#: include/database.item.php:100
+#: include/database.item.php:99
 msgid "Soldes"
 msgstr ""
 
 #: include/database.item.php:98 include/database.item.php:101
 #: include/database.item.php:106 include/database.item.php:103
 #: include/database.item.php:102 include/database.item.php:100
-#: include/database.item.php:100
+#: include/database.item.php:99
 msgid "Solde des comptes en banques, caisse..."
 msgstr ""
 
@@ -8108,7 +8308,7 @@ msgstr ""
 #: include/database.item.php:107 include/database.item.php:104
 #: include/database.item.php:103 include/database.item.php:105
 #: include/database.item.php:108 include/database.item.php:100
-#: include/database.item.php:101
+#: include/database.item.php:101 include/database.item.php:100
 msgid "Lettrage par Poste"
 msgstr ""
 
@@ -8116,91 +8316,91 @@ msgstr ""
 #: include/database.item.php:107 include/database.item.php:104
 #: include/database.item.php:103 include/database.item.php:105
 #: include/database.item.php:108 include/database.item.php:100
-#: include/database.item.php:101
+#: include/database.item.php:101 include/database.item.php:100
 msgid "lettrage par poste comptable"
 msgstr ""
 
 #: include/database.item.php:100 include/database.item.php:103
 #: include/database.item.php:109 include/database.item.php:106
 #: include/database.item.php:105 include/database.item.php:101
-#: include/database.item.php:102
+#: include/database.item.php:102 include/database.item.php:101
 msgid "Balance par catégorie de fiche"
 msgstr ""
 
 #: include/database.item.php:101 include/database.item.php:104
 #: include/database.item.php:110 include/database.item.php:107
 #: include/database.item.php:106 include/database.item.php:102
-#: include/database.item.php:103
+#: include/database.item.php:103 include/database.item.php:102
 msgid "Plan Comptable"
 msgstr ""
 
 #: include/database.item.php:101 include/database.item.php:104
 #: include/database.item.php:110 include/database.item.php:107
 #: include/database.item.php:106 include/database.item.php:102
-#: include/database.item.php:103
+#: include/database.item.php:103 include/database.item.php:102
 msgid "Config. du plan comptable"
 msgstr ""
 
 #: include/database.item.php:102 include/database.item.php:105
 #: include/database.item.php:111 include/database.item.php:108
 #: include/database.item.php:107 include/database.item.php:103
-#: include/database.item.php:105
+#: include/database.item.php:104
 msgid "Historique vente"
 msgstr ""
 
 #: include/database.item.php:102 include/database.item.php:105
 #: include/database.item.php:111 include/database.item.php:108
 #: include/database.item.php:107 include/database.item.php:103
-#: include/database.item.php:105
+#: include/database.item.php:104
 msgid "Historique des ventes"
 msgstr ""
 
 #: include/database.item.php:103 include/database.item.php:106
 #: include/database.item.php:112 include/database.item.php:109
 #: include/database.item.php:108 include/database.item.php:104
-#: include/database.item.php:106
+#: include/database.item.php:105
 msgid "Historique financier"
 msgstr ""
 
 #: include/database.item.php:104 include/database.item.php:107
 #: include/database.item.php:113 include/database.item.php:110
 #: include/database.item.php:109 include/database.item.php:105
-#: include/database.item.php:107
+#: include/database.item.php:106
 msgid "Impression des rapprochements"
 msgstr ""
 
 #: include/database.item.php:105 include/database.item.php:108
 #: include/database.item.php:114 include/database.item.php:111
 #: include/database.item.php:110 include/database.item.php:106
-#: include/database.item.php:108
+#: include/database.item.php:107
 msgid "Bilan"
 msgstr ""
 
 #: include/database.item.php:105 include/database.item.php:108
 #: include/database.item.php:114 include/database.item.php:111
 #: include/database.item.php:110 include/database.item.php:106
-#: include/database.item.php:108
+#: include/database.item.php:107
 msgid "Impression de bilan"
 msgstr ""
 
 #: include/database.item.php:106 include/database.item.php:109
 #: include/database.item.php:115 include/database.item.php:112
 #: include/database.item.php:111 include/database.item.php:107
-#: include/database.item.php:109
+#: include/database.item.php:108
 msgid "Configuration des dépôts"
 msgstr ""
 
 #: include/database.item.php:106 include/database.item.php:109
 #: include/database.item.php:115 include/database.item.php:112
 #: include/database.item.php:111 include/database.item.php:107
-#: include/database.item.php:109
+#: include/database.item.php:108
 msgid "Configuration dépôts"
 msgstr ""
 
 #: include/database.item.php:107 include/database.item.php:110
 #: include/database.item.php:116 include/database.item.php:113
 #: include/database.item.php:112 include/database.item.php:108
-#: include/database.item.php:110
+#: include/database.item.php:109
 msgid "Stock"
 msgstr ""
 
@@ -8217,91 +8417,91 @@ msgstr ""
 #: include/ext/import_card/include/template/input_file.php:36
 #: include/ext/import_card/include/template/input_format.php:25
 #: include/database.item.php:109 include/template/fiche_def_input.php:6
-#: include/database.item.php:111
+#: include/database.item.php:110
 msgid "Catégorie de fiche"
 msgstr ""
 
 #: include/database.item.php:108 include/database.item.php:111
 #: include/database.item.php:117 include/database.item.php:114
 #: include/database.item.php:113 include/database.item.php:109
-#: include/database.item.php:111
+#: include/database.item.php:110
 msgid "Gestion catégorie de fiche"
 msgstr ""
 
 #: include/database.item.php:109 include/database.item.php:112
 #: include/database.item.php:118 include/database.item.php:115
 #: include/database.item.php:114 include/database.item.php:110
-#: include/database.item.php:112
+#: include/database.item.php:111
 msgid "Configuration de catégorie de fiches"
 msgstr ""
 
 #: include/database.item.php:110 include/database.item.php:113
 #: include/database.item.php:119 include/database.item.php:116
 #: include/database.item.php:115 include/database.item.php:111
-#: include/database.item.php:113
+#: include/database.item.php:112
 msgid "Etat des documents"
 msgstr ""
 
 #: include/database.item.php:111 include/database.item.php:114
 #: include/database.item.php:120 include/database.item.php:117
 #: include/database.item.php:116 include/database.item.php:112
-#: include/database.item.php:114
+#: include/database.item.php:113
 msgid "Menu opérations diverses"
 msgstr ""
 
 #: include/database.item.php:112 include/database.item.php:115
 #: include/database.item.php:121 include/database.item.php:118
 #: include/database.item.php:117 include/database.item.php:113
-#: include/database.item.php:115
+#: include/database.item.php:114
 msgid "Impression Journaux"
 msgstr ""
 
 #: include/database.item.php:112 include/database.item.php:115
 #: include/database.item.php:121 include/database.item.php:118
 #: include/database.item.php:117 include/database.item.php:113
-#: include/database.item.php:115
+#: include/database.item.php:114
 msgid "Impression des journaux"
 msgstr ""
 
 #: include/database.item.php:113 include/database.item.php:116
 #: include/database.item.php:122 include/database.item.php:119
 #: include/database.item.php:118 include/database.item.php:114
-#: include/database.item.php:116
+#: include/database.item.php:115
 msgid "Vente / Recette"
 msgstr ""
 
 #: include/database.item.php:113 include/database.item.php:116
 #: include/database.item.php:122 include/database.item.php:119
 #: include/database.item.php:118 include/database.item.php:114
-#: include/database.item.php:116
+#: include/database.item.php:115
 msgid "Menu ventes et recettes"
 msgstr ""
 
 #: include/database.item.php:114 include/database.item.php:117
 #: include/database.item.php:123 include/database.item.php:120
 #: include/database.item.php:119 include/database.item.php:115
-#: include/database.item.php:117
+#: include/database.item.php:116
 msgid "Impression compta. analytique"
 msgstr ""
 
 #: include/database.item.php:115 include/database.item.php:118
 #: include/database.item.php:124 include/database.item.php:121
 #: include/database.item.php:120 include/database.item.php:116
-#: include/database.item.php:118
+#: include/database.item.php:117
 msgid "Compta Analytique"
 msgstr ""
 
 #: include/database.item.php:115 include/database.item.php:118
 #: include/database.item.php:124 include/database.item.php:121
 #: include/database.item.php:120 include/database.item.php:116
-#: include/database.item.php:118
+#: include/database.item.php:117
 msgid "Module comptabilité analytique"
 msgstr ""
 
 #: include/database.item.php:116 include/database.item.php:119
 #: include/database.item.php:125 include/database.item.php:122
 #: include/database.item.php:121 include/database.item.php:117
-#: include/database.item.php:119
+#: include/database.item.php:118
 msgid "Tableau de bord"
 msgstr ""
 
@@ -8310,14 +8510,14 @@ msgstr ""
 #: include/database.item.php:123 include/database.item.php:122
 #: include/balance.inc.php:92 include/balance.inc.php:93
 #: include/balance.inc.php:96 include/database.item.php:118
-#: include/database.item.php:120 include/balance.inc.php:96
+#: include/balance.inc.php:96 include/database.item.php:119
 msgid "Avancé"
 msgstr ""
 
 #: include/database.item.php:117 include/database.item.php:120
 #: include/database.item.php:126 include/database.item.php:123
 #: include/database.item.php:122 include/database.item.php:118
-#: include/database.item.php:120
+#: include/database.item.php:119
 msgid "Menu avancé"
 msgstr ""
 
@@ -8330,49 +8530,49 @@ msgstr ""
 #: include/database.item.php:127 include/database.item.php:141
 #: include/database.item.php:140 include/database.item.php:132
 #: include/database.item.php:133 include/database.item.php:136
-#: include/database.item.php:131 include/database.item.php:133
+#: include/database.item.php:131 include/database.item.php:132
 msgid "Raccourci vers vos menus préférés"
 msgstr ""
 
 #: include/database.item.php:119 include/database.item.php:122
 #: include/database.item.php:128 include/database.item.php:124
 #: include/database.item.php:123 include/database.item.php:127
-#: include/database.item.php:121 include/database.item.php:121
+#: include/database.item.php:121 include/database.item.php:120
 msgid "Trésorerie"
 msgstr ""
 
 #: include/database.item.php:119 include/database.item.php:122
 #: include/database.item.php:128 include/database.item.php:124
 #: include/database.item.php:123 include/database.item.php:127
-#: include/database.item.php:121 include/database.item.php:121
+#: include/database.item.php:121 include/database.item.php:120
 msgid "Menu Financier"
 msgstr ""
 
 #: include/database.item.php:120 include/database.item.php:123
 #: include/database.item.php:129 include/database.item.php:125
 #: include/database.item.php:124 include/database.item.php:128
-#: include/database.item.php:122 include/database.item.php:122
+#: include/database.item.php:122 include/database.item.php:121
 msgid "Liste Suivi"
 msgstr ""
 
 #: include/database.item.php:120 include/database.item.php:123
 #: include/database.item.php:129 include/database.item.php:125
 #: include/database.item.php:124 include/database.item.php:128
-#: include/database.item.php:122 include/database.item.php:122
+#: include/database.item.php:122 include/database.item.php:121
 msgid "Document de suivi sous forme de liste"
 msgstr ""
 
 #: include/database.item.php:121 include/database.item.php:124
 #: include/database.item.php:130 include/database.item.php:126
 #: include/database.item.php:125 include/database.item.php:129
-#: include/database.item.php:123 include/database.item.php:123
+#: include/database.item.php:123 include/database.item.php:122
 msgid "Moyen de paiement"
 msgstr ""
 
 #: include/database.item.php:121 include/database.item.php:124
 #: include/database.item.php:130 include/database.item.php:126
 #: include/database.item.php:125 include/database.item.php:129
-#: include/database.item.php:123 include/database.item.php:123
+#: include/database.item.php:123 include/database.item.php:122
 msgid "Config. des méthodes de paiement"
 msgstr ""
 
@@ -8385,35 +8585,35 @@ msgstr ""
 #: html/user_login.php:160 include/admin_repo.inc.php:65
 #: include/database.item.php:124 html/user_login.php:166
 #: html/user_login.php:143 html/user_login.php:143
-#: include/admin_repo.inc.php:65 include/database.item.php:124
+#: include/admin_repo.inc.php:65 include/database.item.php:123
 msgid "Administration"
 msgstr ""
 
 #: include/database.item.php:122 include/database.item.php:125
 #: include/database.item.php:131 include/database.item.php:127
 #: include/database.item.php:126 include/database.item.php:130
-#: include/database.item.php:124 include/database.item.php:124
+#: include/database.item.php:124 include/database.item.php:123
 msgid "Suivi administration, banque"
 msgstr ""
 
 #: include/database.item.php:123 include/database.item.php:126
 #: include/database.item.php:132 include/database.item.php:128
 #: include/database.item.php:127 include/database.item.php:131
-#: include/database.item.php:125 include/database.item.php:125
+#: include/database.item.php:125 include/database.item.php:124
 msgid "Prévision"
 msgstr ""
 
 #: include/database.item.php:124 include/database.item.php:127
 #: include/database.item.php:133 include/database.item.php:129
 #: include/database.item.php:128 include/database.item.php:132
-#: include/database.item.php:126 include/database.item.php:126
+#: include/database.item.php:126 include/database.item.php:125
 msgid "Export opérations rapprochées"
 msgstr ""
 
 #: include/database.item.php:124 include/database.item.php:127
 #: include/database.item.php:133 include/database.item.php:129
 #: include/database.item.php:128 include/database.item.php:132
-#: include/database.item.php:126 include/database.item.php:126
+#: include/database.item.php:126 include/database.item.php:125
 msgid "Export opérations rapprochées en CSV"
 msgstr ""
 
@@ -8429,17 +8629,17 @@ msgstr ""
 #: include/user.inc.php:173 include/export/export_security_pdf.php:112
 #: html/user_login.php:109 include/database.item.php:127
 #: include/param_sec.inc.php:99 include/param_sec.inc.php:158
-#: html/user_login.php:115 html/user_login.php:115 include/param_sec.inc.php:99
-#: include/param_sec.inc.php:158 include/user.inc.php:173
+#: html/user_login.php:115 html/user_login.php:115
 #: include/user_detail.inc.php:175 include/export/export_security_pdf.php:112
-#: include/database.item.php:127
+#: include/user.inc.php:173 include/database.item.php:126
+#: include/param_sec.inc.php:100 include/param_sec.inc.php:163
 msgid "Administrateur"
 msgstr ""
 
 #: include/database.item.php:125 include/database.item.php:128
 #: include/database.item.php:134 include/database.item.php:130
 #: include/database.item.php:129 include/database.item.php:133
-#: include/database.item.php:127 include/database.item.php:127
+#: include/database.item.php:127 include/database.item.php:126
 msgid "Suivi des gérants, administrateurs et salariés"
 msgstr ""
 
@@ -8451,21 +8651,21 @@ msgstr ""
 #: include/ajax/ajax_get_menu_detail.php:71 include/ajax/ajax_add_menu.php:157
 #: include/database.item.php:134 include/ajax/ajax_add_menu.php:165
 #: include/database.item.php:128 include/ajax/ajax_add_menu.php:165
-#: include/ajax/ajax_get_menu_detail.php:71 include/database.item.php:128
+#: include/ajax/ajax_get_menu_detail.php:71 include/database.item.php:127
 msgid "Menu par défaut"
 msgstr ""
 
 #: include/database.item.php:126 include/database.item.php:129
 #: include/database.item.php:135 include/database.item.php:131
 #: include/database.item.php:130 include/database.item.php:134
-#: include/database.item.php:128 include/database.item.php:128
+#: include/database.item.php:128 include/database.item.php:127
 msgid "Configuration des menus par défaut"
 msgstr ""
 
 #: include/database.item.php:127 include/database.item.php:130
 #: include/database.item.php:136 include/database.item.php:132
 #: include/database.item.php:131 include/database.item.php:135
-#: include/database.item.php:129 include/database.item.php:129
+#: include/database.item.php:129 include/database.item.php:128
 msgid "Agenda"
 msgstr ""
 
@@ -8474,6 +8674,8 @@ msgstr ""
 #: include/database.item.php:171 include/database.item.php:135
 #: include/database.item.php:136 include/database.item.php:146
 #: include/database.item.php:151 include/database.item.php:181
+#: include/template/action_document_type_mtable_input.php:75
+#: include/database.item.php:177
 msgid "Prix vente"
 msgstr ""
 
@@ -8482,6 +8684,8 @@ msgstr ""
 #: include/database.item.php:172 include/database.item.php:136
 #: include/database.item.php:137 include/database.item.php:147
 #: include/database.item.php:152 include/database.item.php:182
+#: include/template/action_document_type_mtable_input.php:76
+#: include/database.item.php:178
 msgid "Prix achat"
 msgstr ""
 
@@ -8490,6 +8694,7 @@ msgstr ""
 #: include/database.item.php:178 include/database.item.php:137
 #: include/database.item.php:138 include/database.item.php:139
 #: include/database.item.php:144 include/database.item.php:149
+#: include/database.item.php:145
 msgid "Durée Amortissement"
 msgstr ""
 
@@ -8498,6 +8703,7 @@ msgstr ""
 #: include/database.item.php:179 include/database.item.php:138
 #: include/database.item.php:139 include/database.item.php:140
 #: include/database.item.php:145 include/database.item.php:150
+#: include/database.item.php:146
 msgid "Montant initial"
 msgstr ""
 
@@ -8506,6 +8712,7 @@ msgstr ""
 #: include/database.item.php:180 include/database.item.php:139
 #: include/database.item.php:140 include/database.item.php:141
 #: include/database.item.php:146 include/database.item.php:151
+#: include/database.item.php:147
 msgid "TVA non déductible"
 msgstr ""
 
@@ -8514,6 +8721,7 @@ msgstr ""
 #: include/database.item.php:181 include/database.item.php:140
 #: include/database.item.php:141 include/database.item.php:142
 #: include/database.item.php:147 include/database.item.php:152
+#: include/database.item.php:148
 msgid "TVA non déductible récupérable par l'impôt"
 msgstr ""
 
@@ -8522,6 +8730,7 @@ msgstr ""
 #: include/database.item.php:182 include/database.item.php:141
 #: include/database.item.php:142 include/database.item.php:143
 #: include/database.item.php:148 include/database.item.php:153
+#: include/database.item.php:149
 msgid "Partie fiscalement non déductible"
 msgstr ""
 
@@ -8530,6 +8739,7 @@ msgstr ""
 #: include/database.item.php:183 include/database.item.php:142
 #: include/database.item.php:143 include/database.item.php:144
 #: include/database.item.php:149 include/database.item.php:154
+#: include/database.item.php:150
 msgid "Dépense  charge du grant (partie privé) "
 msgstr ""
 
@@ -8538,6 +8748,7 @@ msgstr ""
 #: include/database.item.php:184 include/database.item.php:143
 #: include/database.item.php:144 include/database.item.php:145
 #: include/database.item.php:150 include/database.item.php:155
+#: include/database.item.php:151
 msgid "Compte bancaire"
 msgstr ""
 
@@ -8549,8 +8760,8 @@ msgstr ""
 #: include/database.item.php:152 include/database.item.php:151
 #: include/database.item.php:144 include/database.item.php:145
 #: include/database.item.php:153 include/database.item.php:156
-#: include/lettering.gestion.inc.php:27 include/lettering.account.inc.php:73
-#: include/lettering.card.inc.php:69
+#: include/lettering.account.inc.php:82 include/lettering.gestion.inc.php:27
+#: include/database.item.php:152 include/lettering.card.inc.php:78
 msgid "Date début"
 msgstr ""
 
@@ -8564,10 +8775,11 @@ msgstr ""
 #: include/database.item.php:150 include/template/ledger_detail_ven.php:131
 #: include/database.item.php:154 include/database.item.php:153
 #: include/database.item.php:146 include/database.item.php:147
-#: include/database.item.php:155 include/template/ledger_detail_ven.php:131
-#: include/template/operation_detail_ven.php:40
+#: include/database.item.php:155 include/database.item.php:158
 #: include/template/operation_detail_ach.php:39
-#: include/template/ledger_detail_ach.php:122 include/database.item.php:158
+#: include/template/ledger_detail_ven.php:131
+#: include/template/ledger_detail_ach.php:122
+#: include/template/operation_detail_ven.php:40 include/database.item.php:154
 msgid "Taux TVA"
 msgstr ""
 
@@ -8575,7 +8787,7 @@ msgstr ""
 #: include/database.item.php:151 include/database.item.php:155
 #: include/database.item.php:154 include/database.item.php:147
 #: include/database.item.php:148 include/database.item.php:156
-#: include/database.item.php:159
+#: include/database.item.php:159 include/database.item.php:155
 msgid "Nom de la banque"
 msgstr ""
 
@@ -8583,7 +8795,7 @@ msgstr ""
 #: include/database.item.php:153 include/database.item.php:157
 #: include/database.item.php:156 include/database.item.php:149
 #: include/database.item.php:150 include/database.item.php:158
-#: include/database.item.php:161
+#: include/database.item.php:161 include/database.item.php:157
 msgid "Personne de contact "
 msgstr ""
 
@@ -8591,7 +8803,7 @@ msgstr ""
 #: include/database.item.php:154 include/database.item.php:158
 #: include/database.item.php:157 include/database.item.php:150
 #: include/database.item.php:151 include/database.item.php:159
-#: include/database.item.php:162
+#: include/database.item.php:162 include/database.item.php:158
 msgid "numéro de tva "
 msgstr ""
 
@@ -8599,7 +8811,7 @@ msgstr ""
 #: include/database.item.php:155 include/database.item.php:159
 #: include/database.item.php:158 include/database.item.php:151
 #: include/database.item.php:152 include/database.item.php:160
-#: include/database.item.php:163
+#: include/database.item.php:163 include/database.item.php:159
 msgid "Adresse "
 msgstr ""
 
@@ -8607,7 +8819,7 @@ msgstr ""
 #: include/database.item.php:156 include/database.item.php:160
 #: include/database.item.php:159 include/database.item.php:152
 #: include/database.item.php:153 include/database.item.php:161
-#: include/database.item.php:164
+#: include/database.item.php:164 include/database.item.php:160
 msgid "pays "
 msgstr ""
 
@@ -8615,7 +8827,7 @@ msgstr ""
 #: include/database.item.php:157 include/database.item.php:161
 #: include/database.item.php:160 include/database.item.php:153
 #: include/database.item.php:154 include/database.item.php:162
-#: include/database.item.php:165
+#: include/database.item.php:165 include/database.item.php:161
 msgid "téléphone "
 msgstr ""
 
@@ -8623,7 +8835,7 @@ msgstr ""
 #: include/database.item.php:158 include/database.item.php:162
 #: include/database.item.php:161 include/database.item.php:154
 #: include/database.item.php:155 include/database.item.php:163
-#: include/database.item.php:166
+#: include/database.item.php:166 include/database.item.php:162
 msgid "email "
 msgstr ""
 
@@ -8637,10 +8849,10 @@ msgstr ""
 #: include/database.item.php:164 include/database.item.php:163
 #: include/database.item.php:156 include/ajax/ajax_mod_stock_repo.php:55
 #: include/database.item.php:157 include/export/export_stock_resume_list.php:38
-#: include/database.item.php:165 include/template/stock_summary_list.php:40
+#: include/database.item.php:165 include/database.item.php:168
+#: include/ajax/ajax_mod_stock_repo.php:55 include/stock_cfg.inc.php:67
 #: include/export/export_stock_resume_list.php:38
-#: include/ajax/ajax_mod_stock_repo.php:55 include/database.item.php:168
-#: include/stock_cfg.inc.php:67
+#: include/template/stock_summary_list.php:40 include/database.item.php:164
 msgid "Ville"
 msgstr ""
 
@@ -8650,6 +8862,7 @@ msgstr ""
 #: include/database.item.php:166 include/database.item.php:165
 #: include/database.item.php:158 include/database.item.php:159
 #: include/database.item.php:167 include/database.item.php:170
+#: include/database.item.php:166
 msgid "GSM"
 msgstr ""
 
@@ -8657,7 +8870,7 @@ msgstr ""
 #: include/database.item.php:163 include/database.item.php:167
 #: include/database.item.php:166 include/database.item.php:159
 #: include/database.item.php:160 include/database.item.php:168
-#: include/database.item.php:171
+#: include/database.item.php:171 include/database.item.php:167
 msgid "code postal"
 msgstr ""
 
@@ -8665,7 +8878,7 @@ msgstr ""
 #: include/database.item.php:164 include/database.item.php:168
 #: include/database.item.php:167 include/database.item.php:160
 #: include/database.item.php:161 include/database.item.php:169
-#: include/database.item.php:172
+#: include/database.item.php:172 include/database.item.php:168
 msgid "Numero de client"
 msgstr ""
 
@@ -8679,9 +8892,10 @@ msgstr ""
 #: include/database.item.php:162 include/class/class_balance_age.php:146
 #: include/database.item.php:165 include/user.inc.php:81
 #: include/user.inc.php:145 include/class/balance_age.class.php:146
-#: include/database.item.php:170 include/user.inc.php:81
-#: include/user.inc.php:145 include/template/todo_list_list_user.php:43
-#: include/database.item.php:173 include/class/balance_age.class.php:146
+#: include/database.item.php:170 include/database.item.php:173
+#: include/class/balance_age.class.php:146
+#: include/template/todo_list_list_user.php:43 include/user.inc.php:81
+#: include/user.inc.php:145 include/database.item.php:169
 msgid "Prénom"
 msgstr ""
 
@@ -8689,7 +8903,7 @@ msgstr ""
 #: include/database.item.php:170 include/database.item.php:174
 #: include/database.item.php:173 include/database.item.php:162
 #: include/database.item.php:163 include/database.item.php:166
-#: include/database.item.php:171 include/database.item.php:174
+#: include/database.item.php:171 include/database.item.php:170
 msgid "Contrepartie pour TVA récup par impot"
 msgstr ""
 
@@ -8697,7 +8911,7 @@ msgstr ""
 #: include/database.item.php:171 include/database.item.php:175
 #: include/database.item.php:174 include/database.item.php:163
 #: include/database.item.php:164 include/database.item.php:167
-#: include/database.item.php:172 include/database.item.php:175
+#: include/database.item.php:172 include/database.item.php:171
 msgid "Contrepartie pour TVA non Ded."
 msgstr ""
 
@@ -8705,7 +8919,7 @@ msgstr ""
 #: include/database.item.php:172 include/database.item.php:176
 #: include/database.item.php:175 include/database.item.php:164
 #: include/database.item.php:165 include/database.item.php:168
-#: include/database.item.php:173 include/database.item.php:176
+#: include/database.item.php:173 include/database.item.php:172
 msgid "Contrepartie pour dépense à charge du gérant"
 msgstr ""
 
@@ -8713,7 +8927,7 @@ msgstr ""
 #: include/database.item.php:173 include/database.item.php:177
 #: include/database.item.php:176 include/database.item.php:165
 #: include/database.item.php:166 include/database.item.php:169
-#: include/database.item.php:174 include/database.item.php:177
+#: include/database.item.php:174 include/database.item.php:173
 msgid "Contrepartie pour dépense fiscal. non déd."
 msgstr ""
 
@@ -8726,10 +8940,10 @@ msgstr ""
 #: include/database.item.php:171 include/database.item.php:176
 #: include/ajax/ajax_display_letter.php:116 include/class/periode.class.php:518
 #: include/class/periode_ledger_table.class.php:99
-#: include/class/periode.class.php:520 include/ajax/ajax_display_letter.php:116
-#: include/database.item.php:179
+#: include/class/periode.class.php:520 include/database.item.php:179
+#: include/class/periode.class.php:522 include/class/periode.class.php:523
 #: include/class/periode_ledger_table.class.php:99
-#: include/class/periode.class.php:522
+#: include/ajax/ajax_display_letter.php:134 include/database.item.php:175
 msgid "Date Fin"
 msgstr ""
 
@@ -8737,6 +8951,7 @@ msgstr ""
 #: include/database.item.php:170 include/database.item.php:169
 #: include/database.item.php:168 include/database.item.php:172
 #: include/database.item.php:177 include/database.item.php:180
+#: include/database.item.php:176
 msgid "Gestion stock"
 msgstr ""
 
@@ -8744,6 +8959,7 @@ msgstr ""
 #: include/database.item.php:171 include/database.item.php:170
 #: include/database.item.php:169 include/database.item.php:173
 #: include/database.item.php:178 include/database.item.php:183
+#: include/template/card_multiple_result.php:18 include/database.item.php:179
 msgid "Société"
 msgstr ""
 
@@ -8752,6 +8968,7 @@ msgstr ""
 #: include/database.item.php:192 include/database.item.php:172
 #: include/database.item.php:173 include/database.item.php:176
 #: include/database.item.php:184 include/database.item.php:189
+#: include/database.item.php:182
 msgid "Document Interne"
 msgstr ""
 
@@ -8760,6 +8977,7 @@ msgstr ""
 #: include/database.item.php:196 include/database.item.php:173
 #: include/database.item.php:174 include/database.item.php:177
 #: include/database.item.php:185 include/database.item.php:190
+#: include/database.item.php:183
 msgid "Bons de commande client"
 msgstr ""
 
@@ -8768,6 +8986,7 @@ msgstr ""
 #: include/database.item.php:195 include/database.item.php:174
 #: include/database.item.php:175 include/database.item.php:178
 #: include/database.item.php:186 include/database.item.php:191
+#: include/database.item.php:184
 msgid "Bon de commande Fournisseur"
 msgstr ""
 
@@ -8782,8 +9001,8 @@ msgstr ""
 #: include/ext/invoicing/include/invoice_to_zip.inc.php:76
 #: include/compta_ach.inc.php:89 include/compta_ven.inc.php:96
 #: include/database.item.php:179 include/database.item.php:187
-#: include/compta_ven.inc.php:94 include/database.item.php:192
-#: include/compta_ach.inc.php:87
+#: include/database.item.php:192 include/compta_ven.inc.php:94
+#: include/compta_ach.inc.php:86 include/database.item.php:185
 msgid "Facture"
 msgstr ""
 
@@ -8791,7 +9010,7 @@ msgstr ""
 #: include/database.item.php:198 include/database.item.php:201
 #: include/database.item.php:176 include/database.item.php:177
 #: include/database.item.php:180 include/database.item.php:188
-#: include/database.item.php:193
+#: include/database.item.php:193 include/database.item.php:186
 msgid "Lettre de rappel"
 msgstr ""
 
@@ -8799,7 +9018,7 @@ msgstr ""
 #: include/database.item.php:207 include/database.item.php:204
 #: include/database.item.php:177 include/database.item.php:178
 #: include/database.item.php:181 include/database.item.php:189
-#: include/database.item.php:194
+#: include/database.item.php:194 include/database.item.php:187
 msgid "Courrier"
 msgstr ""
 
@@ -8807,7 +9026,7 @@ msgstr ""
 #: include/database.item.php:205 include/database.item.php:202
 #: include/database.item.php:178 include/database.item.php:179
 #: include/database.item.php:182 include/database.item.php:190
-#: include/database.item.php:195
+#: include/database.item.php:195 include/database.item.php:188
 msgid "Proposition"
 msgstr ""
 
@@ -8820,8 +9039,8 @@ msgstr ""
 #: include/database.item.php:180 include/database.item.php:183
 #: include/user.inc.php:84 include/database.item.php:191
 #: include/ajax/ajax_preference.php:74 include/ajax/ajax_preference.php:85
-#: include/user.inc.php:84 include/ajax/ajax_preference.php:85
-#: include/database.item.php:196
+#: include/database.item.php:196 include/ajax/ajax_preference.php:85
+#: include/user.inc.php:84 include/database.item.php:189
 msgid "Email"
 msgstr ""
 
@@ -8829,7 +9048,7 @@ msgstr ""
 #: include/database.item.php:192 include/database.item.php:195
 #: include/database.item.php:193 include/database.item.php:181
 #: include/database.item.php:182 include/database.item.php:185
-#: include/database.item.php:198
+#: include/database.item.php:198 include/database.item.php:191
 msgid "Note de frais"
 msgstr ""
 
@@ -8837,7 +9056,7 @@ msgstr ""
 #: include/database.item.php:200 include/database.item.php:205
 #: include/database.item.php:182 include/database.item.php:183
 #: include/database.item.php:186 include/database.item.php:194
-#: include/database.item.php:199
+#: include/database.item.php:199 include/database.item.php:192
 msgid "Réception commande Fournisseur"
 msgstr ""
 
@@ -8845,7 +9064,7 @@ msgstr ""
 #: include/database.item.php:199 include/database.item.php:206
 #: include/database.item.php:183 include/database.item.php:184
 #: include/database.item.php:187 include/database.item.php:195
-#: include/database.item.php:200
+#: include/database.item.php:200 include/database.item.php:193
 msgid "Réception commande Client"
 msgstr ""
 
@@ -8853,7 +9072,7 @@ msgstr ""
 #: include/database.item.php:202 include/database.item.php:207
 #: include/database.item.php:184 include/database.item.php:185
 #: include/database.item.php:188 include/database.item.php:196
-#: include/database.item.php:201
+#: include/database.item.php:201 include/database.item.php:194
 msgid "Réception magazine"
 msgstr ""
 
@@ -8861,6 +9080,7 @@ msgstr ""
 #: include/database.item.php:210 include/database.item.php:187
 #: include/database.item.php:188 include/database.item.php:191
 #: include/database.item.php:202 include/database.item.php:207
+#: include/database.item.php:197
 msgid "Ajout de fiche"
 msgstr ""
 
@@ -8868,6 +9088,7 @@ msgstr ""
 #: include/database.item.php:211 include/database.item.php:188
 #: include/database.item.php:189 include/database.item.php:192
 #: include/database.item.php:203 include/database.item.php:208
+#: include/database.item.php:198
 msgid "Création, modification et effacement de fiche"
 msgstr ""
 
@@ -8875,6 +9096,7 @@ msgstr ""
 #: include/database.item.php:212 include/database.item.php:189
 #: include/database.item.php:190 include/database.item.php:193
 #: include/database.item.php:204 include/database.item.php:209
+#: include/database.item.php:199
 msgid "création, modification et effacement de catégorie de fiche"
 msgstr ""
 
@@ -8882,6 +9104,7 @@ msgstr ""
 #: include/database.item.php:213 include/database.item.php:190
 #: include/database.item.php:191 include/database.item.php:194
 #: include/database.item.php:205 include/database.item.php:210
+#: include/database.item.php:200
 msgid "Effacer les documents du suivi"
 msgstr ""
 
@@ -8889,6 +9112,7 @@ msgstr ""
 #: include/database.item.php:214 include/database.item.php:191
 #: include/database.item.php:192 include/database.item.php:195
 #: include/database.item.php:206 include/database.item.php:211
+#: include/database.item.php:201
 msgid "Voir les documents du suivi"
 msgstr ""
 
@@ -8896,6 +9120,7 @@ msgstr ""
 #: include/database.item.php:215 include/database.item.php:192
 #: include/database.item.php:193 include/database.item.php:196
 #: include/database.item.php:207 include/database.item.php:212
+#: include/database.item.php:202
 msgid "Modifier le type de document"
 msgstr ""
 
@@ -8906,7 +9131,7 @@ msgstr ""
 #: include/database.item.php:202 include/database.item.php:201
 #: include/database.item.php:203 include/database.item.php:204
 #: include/database.item.php:206 include/database.item.php:220
-#: include/database.item.php:223 include/database.item.php:225
+#: include/database.item.php:210 include/database.item.php:212
 msgid "Caisse"
 msgstr ""
 
@@ -8914,7 +9139,7 @@ msgstr ""
 #: include/database.item.php:219 include/database.item.php:224
 #: include/database.item.php:201 include/database.item.php:202
 #: include/database.item.php:205 include/database.item.php:203
-#: include/database.item.php:224
+#: include/database.item.php:211
 msgid "Paiement électronique"
 msgstr ""
 
@@ -8923,7 +9148,7 @@ msgstr ""
 #: include/database.item.php:226 include/database.item.php:203
 #: include/database.item.php:204 include/database.item.php:207
 #: include/database.item.php:221 include/database.item.php:205
-#: include/database.item.php:226
+#: include/database.item.php:213
 msgid "Par gérant ou administrateur"
 msgstr ""
 
@@ -8939,9 +9164,10 @@ msgstr ""
 #: include/database.item.php:220 include/cfgledger.inc.php:170
 #: include/class/acc_ledger_search.class.php:1082
 #: include/class/acc_ledger_search.class.php:1095 include/lib/user_menu.php:136
-#: include/cfgledger.inc.php:170 include/database.item.php:233
-#: include/database.item.php:252 include/class/acc_ledger_search.class.php:1095
-#: include/lib/user_menu.php:136
+#: include/database.item.php:233 include/database.item.php:252
+#: include/class/acc_ledger_search.class.php:1184 include/database.item.php:217
+#: include/database.item.php:229 include/lib/user_menu.php:135
+#: include/cfgledger.inc.php:170
 msgid "Financier"
 msgstr ""
 
@@ -8950,7 +9176,7 @@ msgstr ""
 #: include/database.item.php:231 include/database.item.php:208
 #: include/database.item.php:209 include/database.item.php:212
 #: include/database.item.php:229 include/database.item.php:210
-#: include/database.item.php:232
+#: include/database.item.php:232 include/database.item.php:216
 msgid "Opération Diverses"
 msgstr ""
 
@@ -8959,7 +9185,7 @@ msgstr ""
 #: include/database.item.php:235 include/database.item.php:212
 #: include/database.item.php:213 include/database.item.php:216
 #: include/database.item.php:236 include/database.item.php:214
-#: include/database.item.php:245
+#: include/database.item.php:245 include/database.item.php:226
 msgid ""
 "Concerne tous les achats, factures reçues, notes de crédit reçues et notes "
 "de frais"
@@ -8969,7 +9195,7 @@ msgstr ""
 #: include/database.item.php:236 include/database.item.php:213
 #: include/database.item.php:214 include/database.item.php:217
 #: include/database.item.php:237 include/database.item.php:215
-#: include/database.item.php:243
+#: include/database.item.php:243 include/database.item.php:224
 msgid ""
 "Concerne tous les mouvements financiers (comptes en banque, caisses, visa...)"
 msgstr ""
@@ -8979,7 +9205,7 @@ msgstr ""
 #: include/database.item.php:237 include/database.item.php:214
 #: include/database.item.php:215 include/database.item.php:218
 #: include/database.item.php:238 include/database.item.php:216
-#: include/database.item.php:242
+#: include/database.item.php:242 include/database.item.php:223
 msgid ""
 "Concerne toutes les opérations comme les amortissements, les comptes TVA, ..."
 msgstr ""
@@ -8989,11 +9215,11 @@ msgstr ""
 #: include/database.item.php:238 include/database.item.php:215
 #: include/database.item.php:216 include/database.item.php:219
 #: include/database.item.php:239 include/database.item.php:217
-#: include/database.item.php:244
+#: include/database.item.php:244 include/database.item.php:225
 msgid "Concerne toutes les ventes, notes de crédit envoyées"
 msgstr ""
 
-#: include/doc_state.inc.php:57 include/doc_state.inc.php:57
+#: include/doc_state.inc.php:57
 msgid "Ferme l'action"
 msgstr ""
 
@@ -9007,7 +9233,7 @@ msgstr ""
 #: include/dossier.inc.php:74 include/dossier.inc.php:80
 #: include/modele.inc.php:65 include/dossier.inc.php:82
 #: include/dossier.inc.php:87 include/modele.inc.php:66
-#: include/dossier.inc.php:87 include/modele.inc.php:66
+#: include/modele.inc.php:66 include/dossier.inc.php:87
 msgid "Désolé vous devez migrer ce modèle en unicode"
 msgstr ""
 
@@ -9027,7 +9253,7 @@ msgstr ""
 #: include/dossier.inc.php:77 include/dossier.inc.php:83
 #: include/modele.inc.php:71 include/modele.inc.php:69
 #: include/dossier.inc.php:85 include/dossier.inc.php:90
-#: include/dossier.inc.php:90 include/modele.inc.php:70
+#: include/modele.inc.php:70 include/dossier.inc.php:90
 msgid ""
 "Pour le passer en unicode, faites-en un backup puis restaurez le fichier reçu"
 msgstr ""
@@ -9072,8 +9298,9 @@ msgstr ""
 #: include/modele.inc.php:254 include/modele.inc.php:278
 #: include/dossier.inc.php:214 include/modele.inc.php:261
 #: include/dossier.inc.php:217 include/dossier.inc.php:222
-#: include/modele.inc.php:262 include/anc_group.inc.php:81
-#: include/dossier.inc.php:222 include/modele.inc.php:263
+#: include/modele.inc.php:262 include/modele.inc.php:263
+#: include/ajax/ajax_add_concerned_card.php:138 include/modele.inc.php:263
+#: include/anc_group.inc.php:81 include/dossier.inc.php:222
 msgid "Ajouter"
 msgstr ""
 
@@ -9084,8 +9311,8 @@ msgstr ""
 #: include/dossier.inc.php:268 include/upgrade.inc.php:78
 #: include/upgrade.inc.php:79 include/dossier.inc.php:271
 #: include/dossier.inc.php:276 include/upgrade.inc.php:80
-#: include/class/dossier.class.php:379 include/dossier.inc.php:276
-#: include/class/dossier.class.php:379
+#: include/class/dossier.class.php:379 include/class/dossier.class.php:385
+#: include/dossier.inc.php:276
 msgid "Dossier inexistant"
 msgstr ""
 
@@ -9095,8 +9322,8 @@ msgstr ""
 #: include/modele.inc.php:331 include/dossier.inc.php:278
 #: include/modele.inc.php:314 include/dossier.inc.php:281
 #: include/dossier.inc.php:286 include/modele.inc.php:315
-#: include/modele.inc.php:320 include/dossier.inc.php:286
-#: include/modele.inc.php:321
+#: include/modele.inc.php:320 include/modele.inc.php:321
+#: include/modele.inc.php:321 include/dossier.inc.php:286
 msgid "Backup"
 msgstr ""
 
@@ -9122,8 +9349,8 @@ msgstr ""
 #: include/dossier.inc.php:353 include/compta_ach.inc.php:89
 #: include/compta_ach.inc.php:91 include/compta_ven.inc.php:98
 #: include/dossier.inc.php:358 include/upgrade.inc.php:36
-#: include/compta_ven.inc.php:96 include/upgrade.inc.php:36
-#: include/dossier.inc.php:358 include/compta_ach.inc.php:89
+#: include/compta_ven.inc.php:96 include/compta_ach.inc.php:88
+#: include/dossier.inc.php:358 include/upgrade.inc.php:36
 #: include/operation_ods_confirm.inc.php:51
 msgid "Modèle"
 msgstr ""
@@ -9145,9 +9372,9 @@ msgstr ""
 #: include/ajax/ajax_admin.php:297 include/modele.inc.php:313
 #: include/ajax/ajax_admin.php:240 include/ajax/ajax_admin.php:318
 #: include/modele.inc.php:318 include/ajax/ajax_admin.php:244
-#: include/ajax/ajax_admin.php:322 include/template/list_mod_payment.php:79
+#: include/ajax/ajax_admin.php:322 include/modele.inc.php:319
 #: include/ajax/ajax_admin.php:244 include/ajax/ajax_admin.php:322
-#: include/modele.inc.php:319
+#: include/modele.inc.php:319 include/template/list_mod_payment.php:79
 msgid "Modifie"
 msgstr ""
 
@@ -9173,8 +9400,8 @@ msgstr ""
 #: include/modele.inc.php:413 include/dossier.inc.php:361
 #: include/modele.inc.php:396 include/dossier.inc.php:377
 #: include/dossier.inc.php:382 include/modele.inc.php:397
-#: include/modele.inc.php:402 include/dossier.inc.php:382
-#: include/modele.inc.php:403
+#: include/modele.inc.php:402 include/modele.inc.php:403
+#: include/modele.inc.php:403 include/dossier.inc.php:382
 msgid "Désolé, vous n'avez pas coché la case"
 msgstr ""
 
@@ -9199,9 +9426,9 @@ msgstr ""
 #: include/export/export_fiche_balance_csv.php:153
 #: include/export/export_fiche_balance_csv.php:154 include/fiche.inc.php:517
 #: include/fiche.inc.php:519 include/fiche.inc.php:528
-#: include/class/print_ledger_simple.class.php:101
-#: include/export/export_fiche_balance_csv.php:154 include/fiche.inc.php:528
-#: include/class/print_ledger_simple.class.php:101
+#: include/class/print_ledger_simple.class.php:101 include/fiche.inc.php:541
+#: include/class/print_ledger_simple.class.php:98
+#: include/export/export_fiche_balance_csv.php:154
 msgid "ref"
 msgstr ""
 
@@ -9260,23 +9487,26 @@ msgstr ""
 #: include/class/fiche.class.php:1474 include/fiche.inc.php:529
 #: include/class/acc_ledger_history_generic.class.php:766
 #: include/class/fiche.class.php:1475
-#: include/template/balance_aged_result.php:53
-#: include/template/acc_ledger_history_purchase_oneline.php:44
-#: include/template/acc_ledger_history_sale_oneline.php:41
-#: include/template/acc_ledger_history_purchase_extended.php:40
-#: include/template/acc_ledger_history_sale_extended.php:40
-#: include/template/letter_all.php:29
-#: include/export/export_fiche_balance_csv.php:155
-#: include/export/export_poste_detail_csv.php:85
-#: include/export/export_poste_detail_csv.php:197 include/fiche.inc.php:529
 #: include/class/acc_ledger_history_generic.class.php:769
 #: include/class/acc_ledger_sold.class.php:1412
-#: include/class/print_ledger_misc.class.php:45
+#: include/class/acc_ledger_purchase.class.php:1838 include/fiche.inc.php:542
 #: include/class/acc_reconciliation.class.php:492
-#: include/class/fiche.class.php:1475
-#: include/class/acc_ledger_purchase.class.php:1838
-#: include/class/anc_grandlivre.class.php:219
+#: include/class/print_ledger_misc.class.php:44
+#: include/class/fiche.class.php:1502
+#: include/class/acc_ledger_purchase.class.php:1875
+#: include/class/acc_ledger_sold.class.php:1397
+#: include/class/acc_ledger_history_generic.class.php:770
 #: include/class/balance_age.class.php:149
+#: include/class/anc_grandlivre.class.php:232
+#: include/export/export_poste_detail_csv.php:85
+#: include/export/export_poste_detail_csv.php:197
+#: include/export/export_fiche_balance_csv.php:155
+#: include/template/acc_ledger_history_purchase_extended.php:40
+#: include/template/acc_ledger_history_purchase_oneline.php:44
+#: include/template/letter_all.php:29
+#: include/template/acc_ledger_history_sale_oneline.php:41
+#: include/template/balance_aged_result.php:53
+#: include/template/acc_ledger_history_sale_extended.php:40
 msgid "Interne"
 msgstr ""
 
@@ -9287,7 +9517,7 @@ msgstr ""
 #: include/export/export_fiche_balance_csv.php:155
 #: include/export/export_fiche_balance_csv.php:156 include/fiche.inc.php:519
 #: include/fiche.inc.php:521 include/fiche.inc.php:530
-#: include/export/export_fiche_balance_csv.php:156 include/fiche.inc.php:530
+#: include/fiche.inc.php:543 include/export/export_fiche_balance_csv.php:156
 msgid "Comm"
 msgstr ""
 
@@ -9296,8 +9526,8 @@ msgstr ""
 #: include/export/export_fiche_balance_csv.php:144
 #: include/export/export_fiche_balance_csv.php:157
 #: include/export/export_fiche_balance_csv.php:158
-#: include/template/anc_balance_group.php:50
 #: include/export/export_fiche_balance_csv.php:158
+#: include/template/anc_balance_group.php:50
 msgid "Crébit"
 msgstr ""
 
@@ -9315,10 +9545,11 @@ msgstr ""
 #: include/export/export_poste_detail_csv.php:90
 #: include/class/anc_grandlivre.class.php:221
 #: include/class/anc_grandlivre.class.php:222 include/fiche.inc.php:523
-#: include/fiche.inc.php:532 include/export/export_fiche_balance_csv.php:159
+#: include/fiche.inc.php:532 include/fiche.inc.php:545
+#: include/class/anc_grandlivre.class.php:235
 #: include/export/export_poste_detail_csv.php:90
-#: include/export/export_fiche_detail_csv.php:79 include/fiche.inc.php:532
-#: include/class/anc_grandlivre.class.php:222
+#: include/export/export_fiche_detail_csv.php:79
+#: include/export/export_fiche_balance_csv.php:159
 msgid "Prog."
 msgstr ""
 
@@ -9331,9 +9562,10 @@ msgstr ""
 #: include/export/export_fiche_balance_csv.php:161 include/fiche.inc.php:522
 #: include/export/export_fiche_detail_csv.php:80
 #: include/export/export_poste_detail_csv.php:91 include/fiche.inc.php:524
-#: include/fiche.inc.php:533 include/export/export_fiche_balance_csv.php:161
+#: include/fiche.inc.php:533 include/fiche.inc.php:546
 #: include/export/export_poste_detail_csv.php:91
-#: include/export/export_fiche_detail_csv.php:80 include/fiche.inc.php:533
+#: include/export/export_fiche_detail_csv.php:80
+#: include/export/export_fiche_balance_csv.php:161
 msgid "Let."
 msgstr ""
 
@@ -9393,8 +9625,8 @@ msgstr ""
 #: include/fiche.inc.php:63 include/ext/rapport_avance/index.php:58
 #: include/template/calendar.php:10 include/ext/rapport_avance/index.php:60
 #: include/ext/listing/index.php:60 include/ext/listing/index.php:58
-#: include/fiche.inc.php:64 include/template/calendar.php:10
-#: include/fiche.inc.php:64
+#: include/fiche.inc.php:64 include/fiche.inc.php:64
+#: include/template/calendar.php:10
 msgid "Liste"
 msgstr ""
 
@@ -9425,14 +9657,14 @@ msgstr ""
 #: include/fiche.inc.php:175 include/fiche.inc.php:179
 #: include/fiche.inc.php:181 include/fiche.inc.php:182
 #: include/fiche.inc.php:183 include/fiche.inc.php:184
-#: include/fiche.inc.php:184
+#: include/fiche.inc.php:185
 msgid "Fiche non effacées"
 msgstr ""
 
 #: include/fiche.inc.php:176 include/fiche.inc.php:180
 #: include/fiche.inc.php:182 include/fiche.inc.php:183
 #: include/fiche.inc.php:184 include/fiche.inc.php:185
-#: include/fiche.inc.php:185
+#: include/fiche.inc.php:186
 msgid " Ces fiches n'ont pas été effacées  "
 msgstr ""
 
@@ -9441,15 +9673,15 @@ msgstr ""
 #: include/fiche.inc.php:383 include/fiche.inc.php:386
 #: include/fiche.inc.php:133 include/fiche.inc.php:387
 #: include/fiche.inc.php:134 include/fiche.inc.php:388
-#: include/fiche.inc.php:395 include/fiche.inc.php:134
-#: include/fiche.inc.php:395
+#: include/fiche.inc.php:395 include/fiche.inc.php:135
+#: include/fiche.inc.php:405
 msgid "Aucune fiche trouvée"
 msgstr ""
 
 #: include/fiche.inc.php:312 include/fiche.inc.php:317
 #: include/fiche.inc.php:390 include/fiche.inc.php:393
 #: include/fiche.inc.php:394 include/fiche.inc.php:395
-#: include/fiche.inc.php:402 include/fiche.inc.php:402
+#: include/fiche.inc.php:402 include/fiche.inc.php:412
 msgid "Filtre rapide:"
 msgstr ""
 
@@ -9504,7 +9736,7 @@ msgid "Vous devez corriger"
 msgstr ""
 
 #: include/impress_bilan.inc.php:64 include/impress_bilan.inc.php:71
-#: include/impress_bilan.inc.php:78 include/impress_bilan.inc.php:78
+#: include/impress_bilan.inc.php:78 include/impress_bilan.inc.php:81
 msgid "Verification comptabilite"
 msgstr ""
 
@@ -9541,15 +9773,15 @@ msgstr ""
 #: include/balance.inc.php:183 include/balance.inc.php:195
 #: include/balance.inc.php:196 include/impress_jrn.inc.php:146
 #: include/impress_rapport.inc.php:286 include/balance.inc.php:199
-#: include/impress_jrn.inc.php:160 include/impress_gl_comptes.inc.php:100
-#: include/impress_rapport.inc.php:286 include/impress_jrn.inc.php:160
-#: include/impress_rec.inc.php:79 include/balance.inc.php:199
+#: include/impress_jrn.inc.php:160 include/balance.inc.php:199
+#: include/impress_gl_comptes.inc.php:100 include/impress_jrn.inc.php:174
+#: include/impress_rec.inc.php:79 include/impress_rapport.inc.php:286
 #: include/impress_poste.inc.php:114
 msgid "Visualisation"
 msgstr ""
 
 #: include/lettering.account.inc.php:47 include/lettering.account.inc.php:53
-#: include/lettering.account.inc.php:53
+#: include/lettering.account.inc.php:55
 msgid "Lettrage pour le poste comptable "
 msgstr ""
 
@@ -9558,9 +9790,8 @@ msgstr ""
 #: include/lettering.card.inc.php:76 include/lettering.gestion.inc.php:74
 #: include/lettering.gestion.inc.php:73 include/lettering.account.inc.php:67
 #: include/lettering.account.inc.php:80 include/lettering.account.inc.php:124
-#: include/lettering.gestion.inc.php:73 include/lettering.account.inc.php:67
-#: include/lettering.account.inc.php:80 include/lettering.account.inc.php:124
-#: include/lettering.card.inc.php:62 include/lettering.card.inc.php:76
+#: include/lettering.account.inc.php:76 include/lettering.gestion.inc.php:73
+#: include/lettering.card.inc.php:71
 msgid "Date malformée, désolé"
 msgstr ""
 
@@ -9568,40 +9799,40 @@ msgstr ""
 #: include/lettering.gestion.inc.php:34
 #: include/ext/tools/include/export_operation.inc.php:33
 #: include/lettering.gestion.inc.php:33 include/lettering.account.inc.php:85
-#: include/lettering.gestion.inc.php:33 include/lettering.account.inc.php:85
-#: include/lettering.card.inc.php:82
+#: include/lettering.account.inc.php:86 include/lettering.gestion.inc.php:33
+#: include/lettering.card.inc.php:84
 msgid "Date fin"
 msgstr ""
 
 #: include/lettering.account.inc.php:84 include/lettering.card.inc.php:89
 #: include/lettering.gestion.inc.php:41 include/lettering.gestion.inc.php:40
-#: include/lettering.account.inc.php:92 include/lettering.gestion.inc.php:40
-#: include/lettering.account.inc.php:92 include/lettering.card.inc.php:89
+#: include/lettering.account.inc.php:92 include/lettering.account.inc.php:93
+#: include/lettering.gestion.inc.php:40 include/lettering.card.inc.php:91
 msgid "Toutes opérations"
 msgstr ""
 
 #: include/lettering.account.inc.php:85 include/lettering.card.inc.php:90
 #: include/lettering.gestion.inc.php:42 include/lettering.gestion.inc.php:41
 #: include/lettering.account.inc.php:93 include/impress_poste.inc.php:104
-#: include/lettering.gestion.inc.php:41 include/lettering.account.inc.php:93
-#: include/impress_poste.inc.php:104 include/lettering.card.inc.php:90
+#: include/lettering.account.inc.php:94 include/lettering.gestion.inc.php:41
+#: include/lettering.card.inc.php:92 include/impress_poste.inc.php:104
 msgid "Opérations lettrées"
 msgstr ""
 
 #: include/lettering.account.inc.php:86 include/lettering.card.inc.php:91
-#: include/lettering.account.inc.php:94 include/lettering.account.inc.php:94
-#: include/lettering.card.inc.php:91
+#: include/lettering.account.inc.php:94 include/lettering.account.inc.php:95
+#: include/lettering.card.inc.php:93
 msgid "Opérations lettrées montants différents"
 msgstr ""
 
 #: include/lettering.account.inc.php:87 include/lettering.card.inc.php:92
 #: include/lettering.gestion.inc.php:43 include/lettering.gestion.inc.php:42
-#: include/lettering.account.inc.php:95 include/lettering.gestion.inc.php:42
-#: include/lettering.account.inc.php:95 include/lettering.card.inc.php:92
+#: include/lettering.account.inc.php:95 include/lettering.account.inc.php:96
+#: include/lettering.gestion.inc.php:42 include/lettering.card.inc.php:94
 msgid "Opérations NON lettrées"
 msgstr ""
 
-#: include/lettering.card.inc.php:50 include/lettering.card.inc.php:50
+#: include/lettering.card.inc.php:50 include/lettering.card.inc.php:51
 msgid "Lettrage pour la fiche "
 msgstr ""
 
@@ -9626,8 +9857,8 @@ msgstr ""
 #: include/ext/coprop/include/coprop_appel_fond.class.php:252
 #: include/operation_ods_new.inc.php:86
 #: include/class/acc_ledger_fin.class.php:645
-#: include/operation_ods_new.inc.php:86
-#: include/class/acc_ledger_fin.class.php:645 include/anc_od.inc.php:150
+#: include/class/acc_ledger_fin.class.php:645
+#: include/operation_ods_new.inc.php:87 include/anc_od.inc.php:150
 msgid "Difference"
 msgstr ""
 
@@ -9644,7 +9875,7 @@ msgstr ""
 #: include/ext/coprop/include/appel_fond.inc.php:83
 #: include/ext/coprop/include/appel_fond.inc.php:153
 #: include/ext/coprop/include/coprop_appel_fond.class.php:247
-#: include/operation_ods_new.inc.php:97 include/operation_ods_new.inc.php:97
+#: include/operation_ods_new.inc.php:97
 msgid "Ajout d'une ligne"
 msgstr ""
 
@@ -9661,10 +9892,11 @@ msgstr ""
 #: include/class/fiche.class.php:1756 include/class/pdf_operation.class.php:246
 #: include/ajax/ajax_boxcard_search.php:65 include/class/fiche.class.php:1759
 #: include/class/fiche.class.php:1761 include/class/fiche.class.php:1779
-#: include/class/fiche.class.php:1780 include/template/pcmn_update.php:28
-#: include/template/pcmn_update.php:36 include/template/account_result.php:13
-#: include/ajax/ajax_boxcard_search.php:65 include/class/fiche.class.php:1780
+#: include/class/fiche.class.php:1780 include/class/fiche.class.php:1806
+#: include/class/card_attribut_mtable.class.php:58
 #: include/class/pdf_operation.class.php:246
+#: include/ajax/ajax_boxcard_search.php:65 include/template/pcmn_update.php:28
+#: include/template/pcmn_update.php:36 include/template/account_result.php:13
 msgid "Poste comptable"
 msgstr ""
 
@@ -9675,6 +9907,7 @@ msgid "Parent"
 msgstr ""
 
 #: include/param_pcmn.inc.php:57 include/param_pcmn.inc.php:58
+#: include/class/contact_option_ref_mtable.class.php:37
 msgid "Type "
 msgstr ""
 
@@ -9691,8 +9924,9 @@ msgstr ""
 #: include/ajax/ajax_admin.php:276 include/cfgledger.inc.php:136
 #: include/ajax/ajax_admin.php:254 include/ajax/ajax_admin.php:280
 #: include/ajax/ajax_card.php:171 include/cfgledger.inc.php:139
-#: include/cfgledger.inc.php:139 include/ajax/ajax_card.php:172
+#: include/ajax/ajax_card.php:172 include/ajax/ajax_card.php:175
 #: include/ajax/ajax_admin.php:254 include/ajax/ajax_admin.php:280
+#: include/cfgledger.inc.php:139
 msgid "Efface"
 msgstr ""
 
@@ -9760,7 +9994,7 @@ msgstr ""
 #: include/lib/user_menu.php:116 include/lib/user_menu.php:129
 #: include/lib/user_menu.php:117 include/lib/user_menu.php:140
 #: include/lib/user_menu.php:74 include/lib/user_menu.php:97
-#: include/lib/user_menu.php:74 include/lib/user_menu.php:97
+#: include/lib/user_menu.php:73 include/lib/user_menu.php:96
 msgid "Utilisateurs"
 msgstr ""
 
@@ -9768,19 +10002,19 @@ msgstr ""
 #: include/lib/user_menu.php:116 include/lib/user_menu.php:129
 #: include/lib/user_menu.php:117 include/lib/user_menu.php:140
 #: include/lib/user_menu.php:74 include/lib/user_menu.php:97
-#: include/lib/user_menu.php:74 include/lib/user_menu.php:97
+#: include/lib/user_menu.php:73 include/lib/user_menu.php:96
 msgid "Gestion des utilisateurs"
 msgstr ""
 
 #: include/user_menu.php:111 include/lib/user_menu.php:117
 #: include/lib/user_menu.php:118 include/lib/user_menu.php:75
-#: include/lib/user_menu.php:75
+#: include/lib/user_menu.php:74
 msgid "Dossiers"
 msgstr ""
 
 #: include/user_menu.php:111 include/lib/user_menu.php:117
 #: include/lib/user_menu.php:118 include/lib/user_menu.php:75
-#: include/lib/user_menu.php:75
+#: include/lib/user_menu.php:74
 msgid "Gestion des dossiers"
 msgstr ""
 
@@ -9789,25 +10023,25 @@ msgstr ""
 #: include/modele.inc.php:274 include/lib/user_menu.php:119
 #: include/modele.inc.php:257 include/modele.inc.php:258
 #: include/lib/user_menu.php:76 include/modele.inc.php:259
-#: include/lib/user_menu.php:76
+#: include/modele.inc.php:259 include/lib/user_menu.php:75
 msgid "Modèles"
 msgstr ""
 
 #: include/user_menu.php:112 include/lib/user_menu.php:118
 #: include/lib/user_menu.php:119 include/lib/user_menu.php:76
-#: include/lib/user_menu.php:76
+#: include/lib/user_menu.php:75
 msgid "Gestion des modèles"
 msgstr ""
 
 #: include/user_menu.php:113 include/lib/user_menu.php:119
 #: include/lib/user_menu.php:120 include/lib/user_menu.php:77
-#: include/lib/user_menu.php:77
+#: include/lib/user_menu.php:76
 msgid "Restaure"
 msgstr ""
 
 #: include/user_menu.php:113 include/lib/user_menu.php:119
 #: include/lib/user_menu.php:120 include/lib/user_menu.php:77
-#: include/lib/user_menu.php:77
+#: include/lib/user_menu.php:76
 msgid "Restaure une base de données"
 msgstr ""
 
@@ -9815,7 +10049,7 @@ msgstr ""
 #: include/lib/user_menu.php:121 include/lib/user_menu.php:130
 #: include/lib/user_menu.php:122 include/lib/user_menu.php:141
 #: include/lib/user_menu.php:79 include/lib/user_menu.php:98
-#: include/lib/user_menu.php:79 include/lib/user_menu.php:98
+#: include/lib/user_menu.php:78 include/lib/user_menu.php:97
 msgid "Audit"
 msgstr ""
 
@@ -9823,49 +10057,49 @@ msgstr ""
 #: include/lib/user_menu.php:121 include/lib/user_menu.php:130
 #: include/lib/user_menu.php:122 include/lib/user_menu.php:141
 #: include/lib/user_menu.php:79 include/lib/user_menu.php:98
-#: include/lib/user_menu.php:79 include/lib/user_menu.php:98
+#: include/lib/user_menu.php:78 include/lib/user_menu.php:97
 msgid "Utilisateurs qui se sont connectés"
 msgstr ""
 
 #: include/user_menu.php:147 include/user_menu.php:151
 #: include/lib/user_menu.php:160 include/lib/user_menu.php:173
-#: include/lib/user_menu.php:131 include/lib/user_menu.php:131
+#: include/lib/user_menu.php:131 include/lib/user_menu.php:130
 msgid " Hors Bilan"
 msgstr ""
 
 #: include/user_menu.php:148 include/user_menu.php:152
 #: include/lib/user_menu.php:161 include/lib/user_menu.php:174
-#: include/lib/user_menu.php:132 include/lib/user_menu.php:132
+#: include/lib/user_menu.php:132 include/lib/user_menu.php:131
 msgid " Immobilisé"
 msgstr ""
 
 #: include/user_menu.php:149 include/user_menu.php:153
 #: include/lib/user_menu.php:162 include/lib/user_menu.php:175
-#: include/lib/user_menu.php:133 include/lib/user_menu.php:133
+#: include/lib/user_menu.php:133 include/lib/user_menu.php:132
 msgid "Actif a un an au plus"
 msgstr ""
 
 #: include/user_menu.php:150 include/user_menu.php:154
 #: include/lib/user_menu.php:163 include/lib/user_menu.php:176
-#: include/lib/user_menu.php:134 include/lib/user_menu.php:134
+#: include/lib/user_menu.php:134 include/lib/user_menu.php:133
 msgid "Stock et commande"
 msgstr ""
 
 #: include/user_menu.php:151 include/user_menu.php:155
 #: include/lib/user_menu.php:164 include/lib/user_menu.php:177
-#: include/lib/user_menu.php:135 include/lib/user_menu.php:135
+#: include/lib/user_menu.php:135 include/lib/user_menu.php:134
 msgid "Compte tiers"
 msgstr ""
 
 #: include/user_menu.php:153 include/user_menu.php:157
 #: include/lib/user_menu.php:166 include/lib/user_menu.php:179
-#: include/lib/user_menu.php:137 include/lib/user_menu.php:137
+#: include/lib/user_menu.php:137 include/lib/user_menu.php:136
 msgid "Charges"
 msgstr ""
 
 #: include/user_menu.php:154 include/user_menu.php:158
 #: include/lib/user_menu.php:167 include/lib/user_menu.php:180
-#: include/lib/user_menu.php:138 include/lib/user_menu.php:138
+#: include/lib/user_menu.php:138 include/lib/user_menu.php:137
 msgid "Produits"
 msgstr ""
 
@@ -9874,12 +10108,13 @@ msgstr ""
 #: include/lib/user_menu.php:168 include/lib/user_menu.php:169
 #: include/lib/user_menu.php:181 include/lib/user_menu.php:182
 #: include/lib/user_menu.php:139 include/lib/user_menu.php:140
-#: include/lib/user_menu.php:139 include/lib/user_menu.php:140
+#: include/lib/user_menu.php:138 include/lib/user_menu.php:139
 msgid "Hors Comptabilité"
 msgstr ""
 
 #: include/template/account_result.php:6 include/template/card_result.php:6
 #: include/template/card_result.php:6 include/template/account_result.php:6
+#: include/template/card_multiple_result.php:7
 msgid "Résultats"
 msgstr ""
 
@@ -9892,7 +10127,7 @@ msgstr ""
 msgid "Partie du poste comptable ou du libellé"
 msgstr ""
 
-#: include/template/action_button.php:35 include/template/action_button.php:35
+#: include/template/action_button.php:35
 msgid "Ajout Action"
 msgstr ""
 
@@ -9904,8 +10139,9 @@ msgstr ""
 #: include/template/action_search.php:67 include/template/tag_choose.php:5
 #: include/template/action_search.php:81 include/template/action_search.php:115
 #: include/template/action_search.php:129 include/class/tag.class.php:85
-#: include/template/action_search.php:129 include/template/tag_choose.php:5
-#: include/class/tag.class.php:85
+#: include/class/follow_up.class.php:623 include/class/tag.class.php:90
+#: include/template/tag_choose.php:5 include/template/action_search.php:130
+#: include/cfgtags.inc.php:38
 msgid "Etiquette"
 msgstr ""
 
@@ -9919,10 +10155,10 @@ msgstr ""
 #: include/template/action_search.php:51
 #: include/template/action_display_short.php:97
 #: include/template/action_search.php:47 include/template/action_show.php:39
-#: include/template/action_show.php:39
 #: include/template/action_display_short.php:97
-#: include/template/action_search.php:47 include/template/detail-action.php:40
+#: include/template/detail-action.php:40
 #: include/template/action_search_result.php:53
+#: include/template/action_show.php:39 include/template/action_search.php:47
 msgid "Destinataire"
 msgstr ""
 
@@ -9934,20 +10170,21 @@ msgstr ""
 #: include/ext/sav/include/template/sas_display_detail.php:145
 #: include/template/detail-action.php:124
 #: include/template/detail-action.php:123 include/template/action_search.php:60
-#: include/template/action_search.php:56 include/template/action_search.php:56
-#: include/template/detail-action.php:123
+#: include/template/action_search.php:56 include/class/follow_up.class.php:628
+#: include/template/detail-action.php:130 include/template/ledger_search.php:83
+#: include/template/action_search.php:56
 msgid "Etat"
 msgstr ""
 
 #: include/template/action_search.php:107
 #: include/template/action_search.php:121 include/template/action_search.php:64
-#: include/template/action_search.php:60 include/template/action_search.php:60
+#: include/template/action_search.php:60 include/template/action_search.php:64
 msgid "Exclure Etat"
 msgstr ""
 
 #: include/template/action_search.php:110
 #: include/template/action_search.php:124 include/template/action_search.php:67
-#: include/template/action_search.php:63 include/template/action_search.php:63
+#: include/template/action_search.php:63 include/template/action_search.php:67
 #, php-format
 msgid "contenant le mot"
 msgstr ""
@@ -9955,28 +10192,26 @@ msgstr ""
 #: include/template/action_search.php:114
 #: include/template/document_mod_change.php:25
 #: include/template/action_search.php:128 include/template/action_search.php:71
-#: include/template/action_search.php:67
-#: include/template/document_mod_change.php:25
-#: include/template/action_search.php:67
+#: include/template/action_search.php:67 include/template/action_search.php:71
 msgid "Type de document"
 msgstr ""
 
 #: include/template/action_search.php:119 include/template/action_search.php:52
 #: include/template/action_search.php:86 include/template/action_search.php:82
-#: include/template/action_search.php:82
+#: include/template/action_search.php:86
 #, php-format
 msgid "Après le "
 msgstr ""
 
 #: include/template/action_search.php:126 include/template/action_search.php:59
 #: include/template/action_search.php:93 include/template/action_search.php:89
-#: include/template/action_search.php:89
+#: include/template/action_search.php:93
 msgid "Avant le"
 msgstr ""
 
 #: include/template/action_search.php:133
 #: include/template/action_search.php:134 include/template/action_search.php:77
-#: include/template/action_search.php:73 include/template/action_search.php:73
+#: include/template/action_search.php:73 include/template/action_search.php:77
 msgid "Uniquement actions internes"
 msgstr ""
 
@@ -10035,9 +10270,9 @@ msgstr ""
 #: include/ajax/ajax_calendar_zoom.php:26 include/lib/html_input.class.php:991
 #: include/ajax/ajax_calendar_zoom.php:32 include/lib/html_input.class.php:992
 #: include/lib/html_input.class.php:1007 include/lib/html_input.class.php:1008
-#: include/template/dashboard.php:6 include/template/calendar-list.php:34
-#: include/impress_rapport.inc.php:234 include/ajax/ajax_calendar_zoom.php:32
-#: include/lib/html_input.class.php:1008
+#: include/ajax/ajax_calendar_zoom.php:32 include/template/calendar-list.php:34
+#: include/template/dashboard.php:6 include/impress_rapport.inc.php:234
+#: include/lib/html_input.class.php:1041
 msgid "Calendrier"
 msgstr ""
 
@@ -10085,9 +10320,10 @@ msgstr ""
 #: include/template/detail-action.php:258 include/template/dashboard.php:348
 #: include/ext/invoicing/include/invoice_send_mail_input.inc.php:139
 #: include/template/action_show.php:40 include/template/dashboard.php:346
-#: include/template/action_show.php:40 include/template/dashboard.php:346
+#: include/class/follow_up.class.php:627
 #: include/template/todo_list_display.php:54
 #: include/template/action_search_result.php:50
+#: include/template/action_show.php:40 include/template/dashboard.php:346
 msgid "Titre"
 msgstr ""
 
@@ -10112,7 +10348,7 @@ msgstr ""
 #: include/template/action_display_short.php:88
 #: include/template/action_display_short.php:89
 #: include/template/action_display_short.php:89
-#: include/template/detail-action.php:104
+#: include/template/detail-action.php:111
 msgid "Heure"
 msgstr ""
 
@@ -10120,7 +10356,7 @@ msgstr ""
 #: include/template/detail-action.php:110
 #: include/template/detail-action.php:115
 #: include/template/detail-action.php:114
-#: include/template/detail-action.php:114
+#: include/template/detail-action.php:121
 msgid "Date limite"
 msgstr ""
 
@@ -10148,15 +10384,17 @@ msgstr ""
 #: include/class/fiche.class.php:1463
 #: include/class/acc_ledger_search.class.php:1106
 #: include/class/fiche.class.php:1477 include/class/fiche.class.php:1478
-#: include/user.inc.php:147 include/template/pcmn_update.php:42
-#: include/template/menu_detail.php:51 include/template/impress_cat_card.php:10
-#: include/template/detail-action.php:29
-#: include/template/action_search_result.php:56 include/user_detail.inc.php:168
-#: include/export/export_gl_csv.php:96 include/menu.inc.php:111
-#: include/class/acc_ledger_search.class.php:1106
+#: include/user_detail.inc.php:168
+#: include/class/acc_ledger_search.class.php:1195
+#: include/class/fiche.class.php:1505
+#: include/class/card_attribut_mtable.class.php:40
+#: include/class/acc_account_ledger.class.php:390
 #: include/class/acc_plan_mtable.class.php:46
-#: include/class/acc_account_ledger.class.php:398
-#: include/class/fiche.class.php:1478 include/card_attr.inc.php:96
+#: include/export/export_gl_csv.php:96 include/template/detail-action.php:29
+#: include/template/menu_detail.php:51 include/template/pcmn_update.php:42
+#: include/template/action_search_result.php:56
+#: include/template/impress_cat_card.php:10 include/user.inc.php:147
+#: include/menu.inc.php:111
 msgid "Type"
 msgstr ""
 
@@ -10168,7 +10406,7 @@ msgstr ""
 #: include/template/action_display_short.php:99
 #: include/template/action_display_short.php:100
 #: include/template/action_display_short.php:100
-#: include/template/detail-action.php:133
+#: include/template/detail-action.php:140
 msgid "Priorité"
 msgstr ""
 
@@ -10196,8 +10434,8 @@ msgstr ""
 #: include/class/follow_up.class.php:2017
 #: include/class/follow_up.class.php:1954
 #: include/class/follow_up.class.php:2018
-#: include/class/follow_up.class.php:1954
-#: include/class/follow_up.class.php:2018
+#: include/class/follow_up.class.php:1906
+#: include/class/follow_up.class.php:1971
 #, php-format
 msgid "Voulez-vous effacer cette action "
 msgstr ""
@@ -10249,16 +10487,21 @@ msgstr ""
 #: include/class/print_ledger_misc.class.php:47
 #: include/class/acc_ledger_fin.class.php:550
 #: include/class/acc_ledger_history_generic.class.php:684
-#: include/template/detail-action.php:245
-#: include/template/form_ledger_fin.php:42
-#: include/export/export_stock_histo_csv.php:44
-#: include/stock_inv_histo.inc.php:78
 #: include/class/acc_ledger_history_generic.class.php:687
 #: include/class/acc_ledger_sold.class.php:1415
-#: include/class/acc_ledger_fin.class.php:550
-#: include/class/print_ledger_misc.class.php:47
 #: include/class/acc_ledger_purchase.class.php:1841
+#: include/class/print_ledger_misc.class.php:46
+#: include/class/acc_ledger_purchase.class.php:1878
+#: include/class/acc_ledger_sold.class.php:1400
+#: include/class/acc_ledger_fin.class.php:550
+#: include/class/acc_ledger_history_generic.class.php:688
 #: include/class/pdf_operation.class.php:82
+#: include/export/export_stock_histo_csv.php:44
+#: include/template/action_document_type_mtable_input.php:113
+#: include/template/form_ledger_fin.php:42
+#: include/template/detail-action.php:297
+#: include/template/detail-action.php:327
+#: include/template/detail-action.php:332 include/stock_inv_histo.inc.php:78
 msgid "Commentaire"
 msgstr ""
 
@@ -10282,7 +10525,8 @@ msgstr ""
 #: include/template/detail-action.php:314
 #: include/template/detail-action.php:318
 #: include/template/detail-action.php:317
-#: include/template/detail-action.php:319
+#: include/template/follow_up_detail_display.php:52
+#: include/template/newEmptyPHP_NOALYSS.php:37
 msgid "prix unitaire"
 msgstr ""
 
@@ -10324,9 +10568,6 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1846
 #: include/template/acc_ledger_history_purchase_extended.php:130
 #: include/template/acc_ledger_history_sale_extended.php:131
-#: include/template/detail-action.php:321
-#: include/template/acc_ledger_history_purchase_extended.php:130
-#: include/template/acc_ledger_history_sale_extended.php:131
 #: include/template/tax_summary_display.php:60
 #: include/template/tax_summary_display.php:116
 #: include/template/tax_summary_display.php:208
@@ -10336,6 +10577,19 @@ msgstr ""
 #: include/class/print_ledger_detail_item.class.php:163
 #: include/class/acc_ledger_sold.class.php:1426
 #: include/class/acc_ledger_purchase.class.php:1852
+#: include/class/acc_ledger_purchase.class.php:1889
+#: include/class/acc_ledger_sold.class.php:1411
+#: include/class/print_ledger_detail_item.class.php:163
+#: include/export/export_printtva_pdf.php:59
+#: include/export/export_printtva_pdf.php:216
+#: include/template/follow_up_detail_display.php:54
+#: include/template/acc_ledger_history_purchase_extended.php:130
+#: include/template/tax_summary_display.php:60
+#: include/template/tax_summary_display.php:116
+#: include/template/tax_summary_display.php:208
+#: include/template/tax_summary_display.php:288
+#: include/template/acc_ledger_history_sale_extended.php:131
+#: include/template/newEmptyPHP_NOALYSS.php:39
 msgid "Code TVA"
 msgstr ""
 
@@ -10349,7 +10603,6 @@ msgstr ""
 #: include/template/detail-action.php:345
 #: include/template/detail-action.php:349
 #: include/template/detail-action.php:348
-#: include/template/detail-action.php:350
 msgid "Montrer les détails"
 msgstr ""
 
@@ -10363,7 +10616,6 @@ msgstr ""
 #: include/template/detail-action.php:346
 #: include/template/detail-action.php:350
 #: include/template/detail-action.php:349
-#: include/template/detail-action.php:351
 msgid "Cacher les détails"
 msgstr ""
 
@@ -10381,7 +10633,7 @@ msgstr ""
 #: include/template/detail-action.php:377
 #: include/template/detail-action.php:379
 #: include/ext/invoicing/include/invoicing.inc.php:100
-#: include/template/detail-action.php:379
+#: include/template/detail-action.php:411
 msgid "Document à générer"
 msgstr ""
 
@@ -10395,7 +10647,7 @@ msgstr ""
 #: include/template/detail-action.php:403
 #: include/template/detail-action.php:407
 #: include/template/detail-action.php:405
-#: include/template/detail-action.php:407
+#: include/template/detail-action.php:401
 msgid "Pièces attachées"
 msgstr ""
 
@@ -10409,7 +10661,7 @@ msgstr ""
 #: include/template/detail-action.php:438
 #: include/template/detail-action.php:442
 #: include/template/detail-action.php:440
-#: include/template/detail-action.php:438
+#: include/template/detail-action.php:453
 #, php-format
 msgid "Voulez-vous effacer le document"
 msgstr ""
@@ -10424,22 +10676,21 @@ msgstr ""
 #: include/template/detail-action.php:461
 #: include/template/detail-action.php:465
 #: include/template/detail-action.php:463
-#: include/template/detail-action.php:461
+#: include/template/detail-action.php:476
 msgid "Je ne peux pas ajouter de fichier"
 msgstr ""
 
-#: include/template/document_mod_change.php:45
 #: include/template/document_mod_change.php:45
 msgid "Préfixe"
 msgstr ""
 
 #: include/template/document_mod_change.php:56
-#: include/template/document_mod_change.php:56
+#: include/template/action_document_type_mtable_input.php:39
 msgid "numéro actuel"
 msgstr ""
 
 #: include/template/document_mod_change.php:71
-#: include/template/document_mod_change.php:71
+#: include/template/action_document_type_mtable_input.php:36
 msgid "Prochain numéro"
 msgstr ""
 
@@ -10513,7 +10764,7 @@ msgstr ""
 #: include/template/predf_ledger_detail.php:19
 #: include/template/form_ledger_detail.php:70
 #: include/template/form_ledger_detail.php:74
-#: include/template/form_ledger_detail.php:74
+#: include/template/form_ledger_detail.php:77
 #: include/template/predf_ledger_detail.php:19
 msgid "prix/unité htva"
 msgstr ""
@@ -10549,11 +10800,13 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1845
 #: include/class/acc_ledger_sold.class.php:1419
 #: include/class/acc_ledger_purchase.class.php:1848
-#: include/template/form_ledger_detail.php:76
-#: include/template/predf_ledger_detail.php:21
-#: include/template/predf_ledger_detail.php:74
 #: include/class/acc_ledger_sold.class.php:1428
 #: include/class/acc_ledger_purchase.class.php:1854
+#: include/class/acc_ledger_purchase.class.php:1891
+#: include/class/acc_ledger_sold.class.php:1413
+#: include/template/form_ledger_detail.php:79
+#: include/template/predf_ledger_detail.php:21
+#: include/template/predf_ledger_detail.php:76
 msgid "Total HTVA"
 msgstr ""
 
@@ -10561,7 +10814,7 @@ msgstr ""
 #: include/template/predf_ledger_detail.php:23
 #: include/template/form_ledger_detail.php:74
 #: include/template/form_ledger_detail.php:78
-#: include/template/form_ledger_detail.php:78
+#: include/template/form_ledger_detail.php:81
 #: include/template/predf_ledger_detail.php:23
 msgid "tot.tva"
 msgstr ""
@@ -10570,7 +10823,7 @@ msgstr ""
 #: include/template/predf_ledger_detail.php:24
 #: include/template/form_ledger_detail.php:75
 #: include/template/form_ledger_detail.php:79
-#: include/template/form_ledger_detail.php:79
+#: include/template/form_ledger_detail.php:82
 #: include/template/predf_ledger_detail.php:24
 msgid "tvac"
 msgstr ""
@@ -10579,7 +10832,7 @@ msgstr ""
 #: include/template/predf_ledger_detail.php:26
 #: include/template/form_ledger_detail.php:77
 #: include/template/form_ledger_detail.php:81
-#: include/template/form_ledger_detail.php:81
+#: include/template/form_ledger_detail.php:84
 #: include/template/predf_ledger_detail.php:26
 msgid "prix/unité "
 msgstr ""
@@ -10591,7 +10844,7 @@ msgstr ""
 #: include/template/form_ledger_detail.php:79
 #: include/template/form_ledger_detail.php:83
 #: include/template/impress_reconciliation.php:65
-#: include/template/form_ledger_detail.php:83
+#: include/template/form_ledger_detail.php:86
 #: include/template/predf_ledger_detail.php:28
 #: include/template/impress_reconciliation.php:65
 msgid "Total "
@@ -10661,32 +10914,31 @@ msgstr ""
 #: include/class/anc_listing.class.php:118
 #: include/class/anc_balance_double.class.php:83
 #: include/class/anc_balance_double.class.php:278
-#: include/template/letter_prop.php:169
-#: include/template/stock_summary_table.php:41
-#: include/template/ledger_detail_ven.php:140
-#: include/template/ledger_detail_ven.php:250
-#: include/template/ledger_detail_ven.php:252
-#: include/template/form_ledger_detail.php:113
-#: include/template/predf_ledger_detail.php:78
-#: include/template/operation_detail_ven.php:49
-#: include/template/operation_detail_ven.php:101
-#: include/template/operation_detail_ven.php:103
-#: include/template/operation_detail_ach.php:57
-#: include/template/operation_detail_ach.php:118
-#: include/template/operation_detail_ach.php:120
-#: include/template/anc_key_input.php:141
-#: include/template/ledger_detail_ach.php:138
-#: include/template/ledger_detail_ach.php:252
-#: include/template/ledger_detail_ach.php:254
-#: include/export/export_gl_csv.php:157 include/export/export_gl_csv.php:219
-#: include/class/anc_balance_double.class.php:83
-#: include/class/anc_balance_double.class.php:278
-#: include/class/anc_balance_simple.class.php:170
 #: include/class/anc_listing.class.php:115
 #: include/class/anc_listing.class.php:117
 #: include/class/anc_listing.class.php:118
+#: include/class/anc_balance_double.class.php:83
+#: include/class/anc_balance_double.class.php:278
+#: include/class/anc_balance_simple.class.php:170
 #: include/class/pdf_operation.class.php:154
 #: include/class/pdf_operation.class.php:199
+#: include/export/export_gl_csv.php:157 include/export/export_gl_csv.php:219
+#: include/template/form_ledger_detail.php:116
+#: include/template/operation_detail_ach.php:57
+#: include/template/operation_detail_ach.php:118
+#: include/template/operation_detail_ach.php:120
+#: include/template/ledger_detail_ven.php:140
+#: include/template/ledger_detail_ven.php:250
+#: include/template/ledger_detail_ven.php:252
+#: include/template/stock_summary_table.php:41
+#: include/template/predf_ledger_detail.php:80
+#: include/template/ledger_detail_ach.php:138
+#: include/template/ledger_detail_ach.php:252
+#: include/template/ledger_detail_ach.php:254
+#: include/template/letter_prop.php:169 include/template/anc_key_input.php:141
+#: include/template/operation_detail_ven.php:49
+#: include/template/operation_detail_ven.php:101
+#: include/template/operation_detail_ven.php:103
 msgid "Total"
 msgstr ""
 
@@ -10694,8 +10946,8 @@ msgstr ""
 #: include/ext/modop/template_ledger_fin.php:10
 #: include/ext/modop/template_ledger_fin.php:14
 #: include/class/acc_ledger_fin.class.php:527
-#: include/template/form_ledger_fin.php:31
 #: include/class/acc_ledger_fin.class.php:527
+#: include/template/form_ledger_fin.php:31
 msgid "Extrait de compte"
 msgstr ""
 
@@ -10719,16 +10971,16 @@ msgstr ""
 #: include/template/form_ledger_fin.php:45
 #: include/template/form_ledger_fin.php:44
 #: include/class/acc_ledger_fin.class.php:552
-#: include/template/form_ledger_fin.php:44
 #: include/class/acc_ledger_fin.class.php:552
+#: include/template/form_ledger_fin.php:44
 msgid "Op. Concernée(s)"
 msgstr ""
 
 #: include/template/impress_cat_card.php:6 include/ajax_boxcard_search.php:57
 #: include/ajax/ajax_boxcard_search.php:57
 #: include/ajax/ajax_boxcard_search.php:56
-#: include/template/impress_cat_card.php:6
 #: include/ajax/ajax_boxcard_search.php:56
+#: include/template/impress_cat_card.php:6
 msgid "Categorie"
 msgstr ""
 
@@ -10736,9 +10988,9 @@ msgstr ""
 #: include/template/stock_histo_search.php:47 include/class_anc_print.php:159
 #: include/class/class_anc_print.php:159 include/class/class_anc_print.php:161
 #: include/class/anc_print.class.php:155 include/class/anc_print.class.php:153
-#: include/impress_jrn.inc.php:143 include/template/stock_histo_search.php:47
-#: include/template/impress_cat_card.php:18 include/impress_jrn.inc.php:143
-#: include/class/anc_print.class.php:153
+#: include/impress_jrn.inc.php:143 include/class/anc_print.class.php:153
+#: include/template/impress_cat_card.php:18
+#: include/template/stock_histo_search.php:47 include/impress_jrn.inc.php:143
 msgid "Jusque"
 msgstr ""
 
@@ -10767,12 +11019,12 @@ msgstr ""
 #: include/stock_inv_histo.inc.php:107
 #: include/ajax/ajax_anc_detail_operation.php:44
 #: include/class/pdf_operation.class.php:405
-#: include/template/stock_summary_list.php:46
-#: include/template/detail-action.php:303
-#: include/template/result_cat_card_summary.php:14
-#: include/stock_inv_histo.inc.php:107
-#: include/ajax/ajax_anc_detail_operation.php:44
 #: include/class/pdf_operation.class.php:405
+#: include/ajax/ajax_anc_detail_operation.php:44
+#: include/template/action_document_type_mtable_input.php:66
+#: include/template/result_cat_card_summary.php:14
+#: include/template/stock_summary_list.php:46
+#: include/stock_inv_histo.inc.php:107
 msgid "Détail"
 msgstr ""
 
@@ -10801,13 +11053,13 @@ msgstr ""
 #: include/template/stock_inv.php:71
 #: include/template/acc_ledger_history_purchase_extended.php:127
 #: include/template/acc_ledger_history_sale_extended.php:128
-#: include/template/ledger_detail_ven.php:129
-#: include/template/operation_detail_ven.php:38
-#: include/template/acc_ledger_history_purchase_extended.php:127
-#: include/template/operation_detail_ach.php:46
-#: include/template/acc_ledger_history_sale_extended.php:128
-#: include/template/stock_inv.php:71 include/template/ledger_detail_ach.php:128
 #: include/export/export_stock_histo_csv.php:45
+#: include/template/operation_detail_ach.php:46
+#: include/template/acc_ledger_history_purchase_extended.php:127
+#: include/template/ledger_detail_ven.php:129 include/template/stock_inv.php:71
+#: include/template/acc_ledger_history_sale_extended.php:128
+#: include/template/ledger_detail_ach.php:128
+#: include/template/operation_detail_ven.php:38
 msgid "Quantité"
 msgstr ""
 
@@ -10815,8 +11067,8 @@ msgstr ""
 #: include/template/operation_detail_ach.php:48
 #: include/template/ledger_detail_ach.php:130
 #: include/template/acc_ledger_history_purchase_oneline.php:56
-#: include/template/acc_ledger_history_purchase_oneline.php:56
 #: include/template/operation_detail_ach.php:48
+#: include/template/acc_ledger_history_purchase_oneline.php:56
 #: include/template/ledger_detail_ach.php:129
 msgid "Non ded"
 msgstr ""
@@ -10847,28 +11099,30 @@ msgstr ""
 #: include/class/print_ledger_simple.class.php:110
 #: include/class/acc_ledger_history_purchase.class.php:256
 #: include/class/acc_ledger_history_purchase.class.php:260
-#: include/template/ledger_detail_ven.php:136
-#: include/template/acc_ledger_history_purchase_oneline.php:53
-#: include/template/operation_detail_ven.php:44
-#: include/template/acc_ledger_history_sale_oneline.php:50
+#: include/class/print_ledger_detail_item.class.php:161
+#: include/class/acc_ledger_history_sale.class.php:259
+#: include/class/acc_ledger_history_purchase.class.php:271
+#: include/class/print_ledger_simple.class.php:107
+#: include/class/print_ledger_detail_item.class.php:161
+#: include/template/operation_detail_ach.php:52
 #: include/template/acc_ledger_history_purchase_extended.php:49
 #: include/template/acc_ledger_history_purchase_extended.php:128
-#: include/template/operation_detail_ach.php:52
+#: include/template/ledger_detail_ven.php:136
+#: include/template/acc_ledger_history_purchase_oneline.php:53
+#: include/template/acc_ledger_history_sale_oneline.php:50
 #: include/template/acc_ledger_history_sale_extended.php:49
 #: include/template/acc_ledger_history_sale_extended.php:129
 #: include/template/ledger_detail_ach.php:133
-#: include/class/print_ledger_simple.class.php:110
-#: include/class/print_ledger_detail_item.class.php:161
-#: include/class/acc_ledger_history_purchase.class.php:260
-#: include/class/acc_ledger_history_sale.class.php:249
+#: include/template/operation_detail_ven.php:44
 msgid "HTVA"
 msgstr ""
 
 #: include/template/ledger_detail_ach.php:134
 #: include/template/ledger_detail_ach.php:135
 #: include/class/print_ledger_simple.class.php:114
+#: include/class/print_ledger_simple.class.php:111
+#: include/export/export_printtva_pdf.php:217
 #: include/template/ledger_detail_ach.php:134
-#: include/class/print_ledger_simple.class.php:114
 msgid "TVA ND"
 msgstr ""
 
@@ -10898,19 +11152,20 @@ msgstr ""
 #: include/template/acc_ledger_history_sale_oneline.php:56
 #: include/template/acc_ledger_history_purchase_extended.php:131
 #: include/template/acc_ledger_history_sale_extended.php:132
-#: include/template/impress_reconciliation_detail.php:28
-#: include/template/ledger_detail_ven.php:138
-#: include/template/acc_ledger_history_purchase_oneline.php:63
-#: include/template/operation_detail_ven.php:47
-#: include/template/acc_ledger_history_sale_oneline.php:56
+#: include/class/print_ledger_detail_item.class.php:165
+#: include/class/print_ledger_detail_item.class.php:64
+#: include/class/print_ledger_detail_item.class.php:165
+#: include/template/operation_detail_ach.php:55
 #: include/template/acc_ledger_history_purchase_extended.php:55
 #: include/template/acc_ledger_history_purchase_extended.php:131
-#: include/template/operation_detail_ach.php:55
+#: include/template/ledger_detail_ven.php:138
+#: include/template/acc_ledger_history_purchase_oneline.php:63
+#: include/template/acc_ledger_history_sale_oneline.php:56
+#: include/template/impress_reconciliation_detail.php:28
 #: include/template/acc_ledger_history_sale_extended.php:55
 #: include/template/acc_ledger_history_sale_extended.php:132
 #: include/template/ledger_detail_ach.php:136
-#: include/class/print_ledger_detail_item.class.php:65
-#: include/class/print_ledger_detail_item.class.php:165
+#: include/template/operation_detail_ven.php:47
 msgid "TVAC"
 msgstr ""
 
@@ -10953,6 +11208,7 @@ msgstr ""
 #: include/template/ledger_detail_bottom.php:349
 #: include/template/ledger_detail_bottom.php:333
 #: include/template/ledger_detail_bottom.php:346
+#: include/template/ledger_detail_bottom.php:374
 msgid "Extourner"
 msgstr ""
 
@@ -10980,7 +11236,7 @@ msgstr ""
 #: include/template/ledger_search.php:51 include/template/ledger_search.php:26
 #: include/template/ledger_search.php:35 include/template/ledger_search.php:54
 #: include/template/ledger_search.php:26 include/template/ledger_search.php:35
-#: include/template/ledger_search.php:54
+#: include/template/ledger_search.php:56
 msgid "et"
 msgstr ""
 
@@ -11000,22 +11256,21 @@ msgid "Et compris entre les montants"
 msgstr ""
 
 #: include/template/ledger_search.php:56 include/template/ledger_search.php:59
-#: include/template/ledger_search.php:59
+#: include/template/ledger_search.php:63
 msgid "Et utilisant la fiche (quick code)"
 msgstr ""
 
 #: include/template/ledger_search.php:64 include/template/ledger_search.php:67
-#: include/template/ledger_search.php:67
+#: include/template/ledger_search.php:71
 msgid "Et utilisant le poste comptable"
 msgstr ""
 
 #: include/template/ledger_search.php:74 include/template/ledger_search.php:77
-#: include/template/ledger_search.php:77
 msgid "Et uniquement non payées"
 msgstr ""
 
 #: include/template/letter_all.php:13 include/template/letter_prop.php:11
-#: include/template/letter_prop.php:11 include/template/letter_all.php:13
+#: include/template/letter_all.php:13 include/template/letter_prop.php:11
 msgid "Désolé aucun résultat trouvé"
 msgstr ""
 
@@ -11027,20 +11282,20 @@ msgstr ""
 #: include/export/export_poste_detail_pdf.php:94
 #: include/template/acc_ledger_history_purchase_detail.php:35
 #: include/template/acc_ledger_history_sale_detail.php:36
-#: include/template/letter_prop.php:28 include/template/letter_prop.php:71
+#: include/export/export_poste_detail_pdf.php:94
 #: include/template/print_ledger_simple.php:9
 #: include/template/acc_ledger_history_sale_detail.php:36
-#: include/template/acc_ledger_history_purchase_detail.php:35
 #: include/template/letter_all.php:26
+#: include/template/acc_ledger_history_purchase_detail.php:35
 #: include/template/action_search_result.php:47
-#: include/export/export_poste_detail_pdf.php:94
+#: include/template/letter_prop.php:28 include/template/letter_prop.php:71
 msgid "Ref"
 msgstr ""
 
 #: include/template/letter_all.php:41 include/template/letter_prop.php:40
 #: include/template/letter_prop.php:80 include/template/letter_prop.php:43
-#: include/template/letter_prop.php:86 include/template/letter_prop.php:43
 #: include/template/letter_prop.php:86 include/template/letter_all.php:41
+#: include/template/letter_prop.php:43 include/template/letter_prop.php:86
 msgid "Op. concernée"
 msgstr ""
 
@@ -11062,8 +11317,8 @@ msgstr ""
 #: include/template/new_mod_payment.php:28 include/payment_middle.inc.php:121
 #: include/payment_middle.inc.php:122
 #: include/class/payment_method_mtable.class.php:40
+#: include/class/payment_method_mtable.class.php:41
 #: include/template/new_mod_payment.php:28
-#: include/class/payment_method_mtable.class.php:40
 msgid "Type de fiche"
 msgstr ""
 
@@ -11087,19 +11342,20 @@ msgstr ""
 #: include/export/export_fiche_detail_csv.php:74
 #: include/export/export_poste_detail_csv.php:81
 #: include/export/export_poste_detail_csv.php:82
-#: include/template/param_jrn.php:14 include/template/param_jrn.php:14
+#: include/template/param_jrn.php:14
 #: include/export/export_poste_detail_csv.php:82
 #: include/export/export_fiche_detail_csv.php:74
+#: include/template/param_jrn.php:14
 msgid "Nom journal"
 msgstr ""
 
 #: include/template/param_jrn.php:15 include/template/param_jrn.php:22
-#: include/template/param_jrn.php:25
+#: include/template/param_jrn.php:25 include/template/param_jrn.php:25
 msgid "Postes utilisables journal (débit/crédit) "
 msgstr ""
 
 #: include/template/param_jrn.php:21 include/template/param_jrn.php:28
-#: include/template/param_jrn.php:31
+#: include/template/param_jrn.php:31 include/template/param_jrn.php:31
 msgid ""
 "Uniquement pour les journaux d'Opérations Diverses, les valeurs sont "
 "séparées par des espaces, on peut aussi\n"
@@ -11107,7 +11363,7 @@ msgid ""
 msgstr ""
 
 #: include/template/param_jrn.php:33 include/template/param_jrn.php:40
-#: include/template/param_jrn.php:46
+#: include/template/param_jrn.php:46 include/template/param_jrn.php:46
 msgid "Numérotation de chaque opération"
 msgstr ""
 
@@ -11115,10 +11371,9 @@ msgstr ""
 #: include/template/operation_detail_fin.php:31
 #: include/template/ledger_detail_fin.php:35
 #: include/compta_fin_saldo.inc.php:48 include/template/param_jrn.php:48
-#: include/template/param_jrn.php:54
+#: include/template/param_jrn.php:54 include/compta_fin_saldo.inc.php:48
 #: include/template/operation_detail_fin.php:31
-#: include/template/ledger_detail_fin.php:35
-#: include/compta_fin_saldo.inc.php:48
+#: include/template/param_jrn.php:54 include/template/ledger_detail_fin.php:35
 msgid "Compte en banque"
 msgstr ""
 
@@ -11128,17 +11383,21 @@ msgid ""
 msgstr ""
 
 #: include/template/param_jrn.php:78 include/template/param_jrn.php:85
-#: include/template/param_jrn.php:6 include/template/param_jrn.php:6
+#: include/template/param_jrn.php:6
+#: include/class/operation_predef_mtable.class.php:53
+#: include/template/param_jrn.php:6
 msgid "Type de journal"
 msgstr ""
 
 #: include/template/param_jrn.php:84 include/template/param_jrn.php:91
 #: include/template/param_jrn.php:93 include/template/param_jrn.php:137
+#: include/template/param_jrn.php:138
 msgid "Préfixe code interne"
 msgstr ""
 
 #: include/template/param_jrn.php:88 include/template/param_jrn.php:95
 #: include/template/param_jrn.php:97 include/template/param_jrn.php:141
+#: include/template/param_jrn.php:142
 msgid "Préfixe pièce justificative"
 msgstr ""
 
@@ -11155,13 +11414,13 @@ msgstr ""
 
 #: include/template/param_jrn.php:102 include/template/param_jrn.php:99
 #: include/template/param_jrn.php:106 include/template/param_jrn.php:108
-#: include/template/param_jrn.php:152
+#: include/template/param_jrn.php:152 include/template/param_jrn.php:153
 msgid "Dernière pièce numérotée"
 msgstr ""
 
 #: include/template/param_jrn.php:110 include/template/param_jrn.php:108
 #: include/template/param_jrn.php:115 include/template/param_jrn.php:117
-#: include/template/param_jrn.php:161
+#: include/template/param_jrn.php:161 include/template/param_jrn.php:162
 msgid "N° pièce justificative"
 msgstr ""
 
@@ -11189,9 +11448,9 @@ msgstr ""
 #: include/template/security_list_action.php:8
 #: include/template/user_sec_profile.php:36
 #: include/export/export_security_pdf.php:180
+#: include/export/export_security_pdf.php:180
 #: include/template/user_sec_profile.php:36
 #: include/template/profile_sec_repository.php:36
-#: include/export/export_security_pdf.php:180
 msgid "Accès"
 msgstr ""
 
@@ -11281,7 +11540,7 @@ msgstr ""
 
 #: include/ext/amortis/raw.php:100 include/export/export_histo_csv.php:41
 #: include/export/export_histo_csv.php:42
-#: include/export/export_histo_csv.php:42
+#: include/export/export_histo_csv.php:45
 msgid "qcode"
 msgstr ""
 
@@ -11325,7 +11584,7 @@ msgstr ""
 #: include/ext/coprop/index.php:44 include/database.item.php:3
 #: include/database.item.php:143 include/database.item.php:139
 #: include/database.item.php:138 include/database.item.php:131
-#: include/database.item.php:129 include/database.item.php:131
+#: include/database.item.php:129 include/database.item.php:130
 msgid "Clef de répartition"
 msgstr ""
 
@@ -11429,7 +11688,8 @@ msgstr ""
 #: include/lib/http_input.class.php:121 include/class/acc_ledger.class.php:89
 #: include/lib/http_input.class.php:123 include/class/periode.class.php:237
 #: include/class/acc_ledger.class.php:91 include/class/periode.class.php:239
-#: include/lib/http_input.class.php:123
+#: include/class/acc_ledger.class.php:89 include/class/periode.class.php:239
+#: include/lib/http_input.class.php:161
 msgid "Paramètre invalide"
 msgstr ""
 
@@ -11476,8 +11736,9 @@ msgstr ""
 #: include/ext/importbank/include/template/confirm_transfer.php:275
 #: include/ext/importbank/include/template/confirm_transfer.php:285
 #: include/verif_bilan.inc.php:152 include/verif_bilan.inc.php:214
-#: include/verif_bilan.inc.php:217 include/audit_log.php:40
-#: include/verif_bilan.inc.php:152 include/verif_bilan.inc.php:219
+#: include/verif_bilan.inc.php:217 include/verif_bilan.inc.php:219
+#: include/audit_log.php:40 include/verif_bilan.inc.php:150
+#: include/verif_bilan.inc.php:217
 msgid "Résultat"
 msgstr ""
 
@@ -11568,7 +11829,7 @@ msgstr ""
 msgid "Paramètre pour la TVA"
 msgstr ""
 
-#: include/ext/tools/index.php:41
+#: include/ext/tools/index.php:41 include/tax_summary.inc.php:41
 msgid "Opération"
 msgstr ""
 
@@ -11591,15 +11852,15 @@ msgstr ""
 #: include/ajax/ajax_preference.php:131 include/class/periode.class.php:519
 #: include/class/periode_ledger_table.class.php:100
 #: include/template/stock_inv.php:126 include/ajax/ajax_preference.php:142
-#: include/class/periode.class.php:521
-#: include/template/periode_add_exercice.php:25
-#: include/template/stock_state_search.php:35
-#: include/template/stock_inv.php:126 include/impress_rapport.inc.php:207
-#: include/impress_jrn.inc.php:102 include/compta_fin_saldo.inc.php:43
+#: include/class/periode.class.php:521 include/class/periode.class.php:523
+#: include/compta_fin_saldo.inc.php:43 include/impress_bilan.inc.php:52
+#: include/class/periode.class.php:524
+#: include/class/periode_ledger_table.class.php:100 include/bank.inc.php:72
 #: include/ajax/ajax_preference.php:142
-#: include/class/periode_ledger_table.class.php:100
-#: include/class/periode.class.php:523 include/bank.inc.php:72
-#: include/impress_bilan.inc.php:49
+#: include/template/stock_state_search.php:35
+#: include/template/stock_inv.php:126
+#: include/template/periode_add_exercice.php:25 include/impress_jrn.inc.php:102
+#: include/impress_rapport.inc.php:207
 msgid "Exercice"
 msgstr ""
 
@@ -11644,7 +11905,8 @@ msgstr ""
 #: include/ext/tva/ext_list_assujetti.class.php:54
 #: include/ext/tva/ext_tvagen.class.php:114
 #: include/lib/message_javascript.php:94 include/lib/message_javascript.php:96
-#: include/tax_summary.inc.php:43 include/lib/message_javascript.php:96
+#: include/tax_summary.inc.php:43 include/tax_summary.inc.php:52
+#: include/lib/message_javascript.php:96
 msgid "Afficher"
 msgstr ""
 
@@ -11657,8 +11919,8 @@ msgstr ""
 #: include/class/class_pdf_operation.php:240 include/impress_jrn.inc.php:135
 #: include/ext/tva/ext_tva.class.php:340
 #: include/class/pdf_operation.class.php:240 include/impress_jrn.inc.php:148
-#: include/ext/tva/ext_tva.class.php:341 include/impress_jrn.inc.php:148
-#: include/class/pdf_operation.class.php:240
+#: include/ext/tva/ext_tva.class.php:341
+#: include/class/pdf_operation.class.php:240 include/impress_jrn.inc.php:148
 msgid "Ecriture comptable"
 msgstr ""
 
@@ -11924,8 +12186,9 @@ msgstr ""
 #: include/ajax/ajax_add_concerned_card.php:44 include/ajax/ajax_card.php:133
 #: include/ajax/ajax_card.php:375 include/export/export_fiche_detail_pdf.php:53
 #: include/ajax/ajax_add_concerned_card.php:48 include/ajax/ajax_card.php:378
-#: include/export/export_fiche_detail_pdf.php:53 include/ajax/ajax_card.php:133
-#: include/ajax/ajax_card.php:379 include/ajax/ajax_add_concerned_card.php:48
+#: include/ajax/ajax_card.php:379 include/ajax/ajax_card.php:113
+#: include/ajax/ajax_card.php:412 include/ajax/ajax_add_concerned_card.php:56
+#: include/export/export_fiche_detail_pdf.php:53
 msgid "Détail fiche"
 msgstr ""
 
@@ -11980,6 +12243,7 @@ msgstr ""
 #: include/ext/amortis/include/am_card.class.php:279
 #: include/class/acc_ledger.class.php:1105
 #: include/class/acc_ledger.class.php:1121
+#: include/class/acc_ledger.class.php:1117
 #: include/class/acc_compute.class.php:195
 msgid "Montant invalide"
 msgstr ""
@@ -11998,7 +12262,7 @@ msgstr ""
 
 #: include/ext/amortis/include/class_am_card.php:245 html/fid_card.php:169
 #: html/fid_card.php:170 html/fid_card.php:175 html/fid_card.php:174
-#: html/fid_card.php:174
+#: html/fid_card.php:176
 msgid "Non trouvé"
 msgstr ""
 
@@ -12050,7 +12314,7 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:681
 #: include/class/acc_ledger_search.class.php:699
 #: include/class/acc_ledger_fin.class.php:753
-#: include/class/acc_ledger_search.class.php:699
+#: include/class/acc_ledger_search.class.php:785
 #: include/class/acc_ledger_fin.class.php:753
 msgid "n° interne"
 msgstr ""
@@ -12083,7 +12347,7 @@ msgstr ""
 #: include/lib/manage_table_sql.class.php:1095
 #: include/lib/manage_table_sql.class.php:1092
 #: include/lib/manage_table_sql.class.php:1136
-#: include/lib/manage_table_sql.class.php:1136
+#: include/lib/manage_table_sql.class.php:1192
 msgid "Effacé"
 msgstr ""
 
@@ -12123,12 +12387,13 @@ msgstr ""
 #: include/class/fiche.class.php:2214 include/anc_pa.inc.php:123
 #: include/fiche.inc.php:242 include/fiche.inc.php:302
 #: include/fiche.inc.php:340 include/class/fiche.class.php:1620
-#: include/class/fiche.class.php:2215 html/popup.php:113
-#: include/balance_card_ageing.inc.php:53 include/fiche.inc.php:242
-#: include/fiche.inc.php:302 include/fiche.inc.php:340
-#: include/class/acc_account_ledger.class.php:735
-#: include/class/fiche.class.php:1620 include/class/fiche.class.php:2215
-#: include/class/tax_summary.class.php:334 include/anc_pa.inc.php:123
+#: include/class/fiche.class.php:2215 include/class/tax_summary.class.php:334
+#: html/popup.php:113 include/fiche.inc.php:252 include/fiche.inc.php:312
+#: include/fiche.inc.php:350 include/anc_pa.inc.php:123
+#: include/class/tax_summary.class.php:437 include/class/fiche.class.php:1646
+#: include/class/fiche.class.php:2242
+#: include/class/acc_account_ledger.class.php:727
+#: include/template/detail-action.php:88 include/balance_card_ageing.inc.php:53
 msgid "Export CSV"
 msgstr ""
 
@@ -12235,13 +12500,15 @@ msgstr ""
 #: include/class/acc_ledger_history_generic.class.php:769
 #: include/export/export_ledger_csv.php:213
 #: include/export/export_ledger_csv.php:221
-#: include/export/export_poste_detail_csv.php:83
-#: include/export/export_poste_detail_csv.php:196
-#: include/export/export_ledger_csv.php:221
 #: include/class/print_ledger_detail_item.class.php:156
 #: include/class/acc_ledger_history_generic.class.php:772
-#: include/class/acc_account_ledger.class.php:394
+#: include/class/acc_account_ledger.class.php:386
+#: include/class/print_ledger_detail_item.class.php:156
+#: include/class/acc_ledger_history_generic.class.php:773
 #: include/class/balance_age.class.php:144
+#: include/export/export_ledger_csv.php:229
+#: include/export/export_poste_detail_csv.php:83
+#: include/export/export_poste_detail_csv.php:196
 msgid "QuickCode"
 msgstr ""
 
@@ -12283,7 +12550,8 @@ msgstr ""
 #: include/ext/invoicing/include/template/recorded_message_display.php:27
 #: include/compta_ach.inc.php:111 include/compta_ven.inc.php:118
 #: include/operation_ods_confirm.inc.php:68 include/compta_ven.inc.php:116
-#: include/compta_ach.inc.php:109 include/operation_ods_confirm.inc.php:68
+#: include/compta_ach.inc.php:109 include/compta_ven.inc.php:116
+#: include/compta_ach.inc.php:108 include/operation_ods_confirm.inc.php:68
 msgid "Message"
 msgstr ""
 
@@ -12874,8 +13142,8 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:928
 #: include/class/acc_ledger_search.class.php:936
 #: include/class/acc_ledger_search.class.php:949
+#: include/class/acc_ledger_search.class.php:1038
 #: include/template/fiche_list.php:49
-#: include/class/acc_ledger_search.class.php:949 include/card_attr.inc.php:84
 msgid "Selection"
 msgstr ""
 
@@ -13024,7 +13292,7 @@ msgstr ""
 
 #: include/ext/rapport_avance/include/template/parameter_send_mail_input.php:23
 #: include/ext/rapport_avance/include/template/parameter_send_mail_input.php:27
-#: scenario/HtmlInput.test.php:89
+#: scenario/HtmlInput.test.php:89 scenario/HtmlInput.test.php:106
 msgid "Envoi"
 msgstr ""
 
@@ -13072,14 +13340,13 @@ msgstr ""
 
 #: html/ajax_card.php:106 html/ajax_card.php:124 html/ajax_card.php:125
 #: include/ajax/ajax_card.php:105 include/ajax/ajax_card.php:108
-#: include/ajax/ajax_card.php:108
 msgid "Parametre ad_id est invalide"
 msgstr ""
 
 #: html/ajax_card.php:182 html/ajax_card.php:200 html/ajax_card.php:201
 #: include/ajax/ajax_card.php:181 include/ajax/ajax_card.php:182
 #: include/ajax/ajax_card.php:185 include/ajax/ajax_card.php:191
-#: include/ajax/ajax_card.php:192
+#: include/ajax/ajax_card.php:192 include/ajax/ajax_card.php:195
 msgid "Nouvelle fiche"
 msgstr ""
 
@@ -13093,7 +13360,8 @@ msgstr ""
 #: include/ajax/ajax_card.php:259 include/ajax/ajax_card.php:269
 #: include/ajax/ajax_card.php:334 include/ajax/ajax_card.php:280
 #: include/ajax/ajax_card.php:337 include/ajax/ajax_card.php:281
-#: include/ajax/ajax_card.php:338
+#: include/ajax/ajax_card.php:338 include/ajax/ajax_card.php:287
+#: include/ajax/ajax_card.php:357
 msgid "Choix de la catégorie"
 msgstr ""
 
@@ -13106,6 +13374,7 @@ msgstr ""
 #: html/ajax_card.php:343 include/ajax/ajax_card.php:323
 #: include/ajax/ajax_card.php:324 include/ajax/ajax_card.php:342
 #: include/ajax/ajax_card.php:345 include/ajax/ajax_card.php:346
+#: include/ajax/ajax_card.php:358
 msgid "Fiche sauvée"
 msgstr ""
 
@@ -13113,7 +13382,7 @@ msgstr ""
 #: html/ajax_card.php:470 html/ajax_card.php:471 include/ajax/ajax_card.php:451
 #: include/ajax/ajax_card.php:452 include/ajax/ajax_card.php:453
 #: include/ajax/ajax_card.php:486 include/ajax/ajax_card.php:490
-#: include/ajax/ajax_card.php:491
+#: include/ajax/ajax_card.php:491 include/ajax/ajax_card.php:567
 msgid " de contacts"
 msgstr ""
 
@@ -13122,7 +13391,7 @@ msgstr ""
 #: html/ajax_card.php:563 include/ajax/ajax_card.php:543
 #: include/ajax/ajax_card.php:544 include/ajax/ajax_card.php:545
 #: include/ajax/ajax_card.php:578 include/ajax/ajax_card.php:582
-#: include/ajax/ajax_card.php:605
+#: include/ajax/ajax_card.php:605 include/ajax/ajax_card.php:684
 msgid "Détail fiche (sauvée)"
 msgstr ""
 
@@ -13133,8 +13402,9 @@ msgstr ""
 #: include/ajax/ajax_history.php:138 include/ajax/ajax_history.php:139
 #: include/ajax/ajax_history.php:58 include/ajax/ajax_history.php:141
 #: include/ajax/ajax_history.php:61 include/ajax/ajax_history.php:146
-#: include/ajax/ajax_history.php:147 include/ajax/ajax_history.php:61
-#: include/ajax/ajax_history.php:148 include/balance_card.inc.php:36
+#: include/ajax/ajax_history.php:147 include/ajax/ajax_history.php:148
+#: include/balance_card.inc.php:37 include/ajax/ajax_history.php:61
+#: include/ajax/ajax_history.php:148
 msgid ""
 "erreur aucune période par défaut, allez dans préférence pour en choisir une"
 msgstr ""
@@ -13152,6 +13422,7 @@ msgstr ""
 #: include/ajax/ajax_history.php:178 include/ajax/ajax_history.php:91
 #: include/ajax/ajax_history.php:97 include/ajax/ajax_history.php:177
 #: include/ajax/ajax_history.php:183 include/ajax/ajax_history.php:184
+#: include/ajax/ajax_history.php:179 include/ajax/ajax_history.php:185
 #: include/ajax/ajax_history.php:91 include/ajax/ajax_history.php:97
 #: include/ajax/ajax_history.php:179 include/ajax/ajax_history.php:185
 msgid "Autre exercice"
@@ -13165,8 +13436,9 @@ msgstr ""
 #: include/ajax/ajax_history.php:197 include/ajax/ajax_history.php:199
 #: include/ajax/ajax_history.php:117 include/ajax/ajax_history.php:202
 #: include/ajax/ajax_history.php:121 include/ajax/ajax_history.php:207
-#: include/ajax/ajax_history.php:208 include/ajax/ajax_history.php:121
-#: include/ajax/ajax_history.php:209 include/balance_card.inc.php:70
+#: include/ajax/ajax_history.php:208 include/ajax/ajax_history.php:209
+#: include/balance_card.inc.php:71 include/ajax/ajax_history.php:121
+#: include/ajax/ajax_history.php:209
 msgid "Aucune opération pour l'exercice courant"
 msgstr ""
 
@@ -13182,6 +13454,7 @@ msgstr ""
 #: include/ajax/ajax_ledger.php:239 include/ajax/ajax_ledger.php:352
 #: include/ajax/ajax_ledger.php:243 include/ajax/ajax_ledger.php:356
 #: include/ajax/ajax_ledger.php:244 include/ajax/ajax_ledger.php:357
+#: include/ajax/ajax_ledger.php:244 include/ajax/ajax_ledger.php:357
 msgid "Chargement"
 msgstr ""
 
@@ -13197,7 +13470,8 @@ msgstr ""
 #: include/ajax/ajax_ledger.php:544
 #: include/template/ledger_detail_bottom.php:355
 #: include/template/ledger_detail_bottom.php:352
-#: include/ajax/ajax_ledger.php:545
+#: include/ajax/ajax_ledger.php:545 include/ajax/ajax_ledger.php:545
+#: include/template/ledger_detail_bottom.php:380
 msgid "entrez une date"
 msgstr ""
 
@@ -13222,13 +13496,14 @@ msgstr ""
 #: include/export/export_ledger_csv.php:215
 #: include/export/export_ledger_csv.php:217
 #: include/export/export_ledger_csv.php:225
-#: include/template/ledger_detail_fin.php:60
 #: include/template/ledger_detail_bottom.php:213
-#: include/export/export_ledger_csv.php:225
-#: include/ajax/ajax_display_letter.php:55
 #: include/class/acc_reconciliation.class.php:489
 #: include/class/acc_reconciliation.class.php:497
 #: include/class/acc_reconciliation.class.php:513
+#: include/ajax/ajax_display_letter.php:69
+#: include/export/export_ledger_csv.php:233
+#: include/template/ledger_detail_bottom.php:231
+#: include/template/ledger_detail_fin.php:60
 msgid "montant"
 msgstr ""
 
@@ -13236,7 +13511,7 @@ msgstr ""
 #: html/ajax_misc.php:497 html/ajax_misc.php:575
 #: include/ajax/ajax_display_letter.php:211
 #: include/ajax/ajax_display_letter.php:216
-#: include/ajax/ajax_display_letter.php:216
+#: include/ajax/ajax_display_letter.php:223
 msgid "Mauvais type objet"
 msgstr ""
 
@@ -13245,7 +13520,7 @@ msgid "Vous n\\'êtes pas administrateur"
 msgstr ""
 
 #: html/fid_card.php:164 html/fid_card.php:165 html/fid_card.php:170
-#: html/fid_card.php:169 html/fid_card.php:169
+#: html/fid_card.php:169 html/fid_card.php:171
 #, php-format
 msgid "Résultat limité à 12"
 msgstr ""
@@ -13279,10 +13554,11 @@ msgstr ""
 #: html/popup.php:114 include/class/fiche.class.php:1586
 #: include/class/fiche.class.php:2213 include/class/fiche.class.php:1604
 #: include/class/fiche.class.php:2236 include/class/fiche.class.php:1605
-#: include/class/fiche.class.php:2237 html/popup.php:114
-#: include/class/acc_account_ledger.class.php:757
-#: include/class/fiche.class.php:1605 include/class/fiche.class.php:2237
-#: include/class/tax_summary.class.php:350
+#: include/class/fiche.class.php:2237 include/class/tax_summary.class.php:350
+#: html/popup.php:114 include/class/tax_summary.class.php:453
+#: include/class/fiche.class.php:1631 include/class/fiche.class.php:2264
+#: include/class/acc_account_ledger.class.php:749
+#: include/template/ledger_detail_bottom.php:359
 msgid "Export PDF"
 msgstr ""
 
@@ -13294,8 +13570,9 @@ msgstr ""
 #: include/admin_repo.inc.php:146 include/stock_inv_histo.inc.php:84
 #: include/user.inc.php:173 html/user_login.php:109
 #: include/admin_repo.inc.php:148 html/user_login.php:115
-#: html/user_login.php:115 include/audit_log.php:36 include/user.inc.php:173
-#: include/admin_repo.inc.php:148 include/stock_inv_histo.inc.php:84
+#: html/user_login.php:115 include/audit_log.php:36
+#: include/admin_repo.inc.php:148 include/user.inc.php:173
+#: include/stock_inv_histo.inc.php:84
 msgid "Utilisateur"
 msgstr ""
 
@@ -13310,7 +13587,7 @@ msgstr ""
 #: include/lib/ac_common.php:629 include/lib/ac_common.php:630
 #: include/lib/ac_common.php:641 include/lib/ac_common.php:642
 #: include/lib/ac_common.php:644 include/lib/ac_common.php:660
-#: include/lib/ac_common.php:660
+#: include/lib/ac_common.php:670
 #, php-format
 msgid ""
 "Attention periode \n"
@@ -13325,7 +13602,7 @@ msgstr ""
 #: include/lib/ac_common.php:812 include/lib/ac_common.php:823
 #: include/lib/ac_common.php:824 include/lib/ac_common.php:836
 #: include/lib/ac_common.php:838 include/lib/ac_common.php:854
-#: include/lib/ac_common.php:854
+#: include/lib/ac_common.php:864
 msgid "Données non disponibles"
 msgstr ""
 
@@ -13350,7 +13627,7 @@ msgstr ""
 #: include/lib/ac_common.php:1160 include/lib/ac_common.php:1171
 #: include/lib/ac_common.php:1172 include/lib/ac_common.php:1173
 #: include/lib/ac_common.php:1185 include/lib/ac_common.php:1187
-#: include/lib/ac_common.php:1211 include/lib/ac_common.php:1211
+#: include/lib/ac_common.php:1211 include/lib/ac_common.php:1221
 msgid "Code Interne"
 msgstr ""
 
@@ -13373,12 +13650,16 @@ msgstr ""
 #: include/template/tax_summary_display.php:105
 #: include/template/tax_summary_display.php:277
 #: include/export/export_fiche_detail_csv.php:60
-#: include/lib/message_javascript.php:102 include/lib/ac_common.php:1247
+#: include/template/tax_summary_display.php:105
+#: include/template/tax_summary_display.php:277
+#: include/template/ledger_detail_bottom.php:302 include/lib/ac_common.php:1257
+#: include/lib/message_javascript.php:102
 msgid "Aucune donnée"
 msgstr ""
 
 #: include/action.common.inc.php:277 include/action.common.inc.php:281
 #: include/action.common.inc.php:272 include/action.common.inc.php:276
+#: include/action.common.inc.php:315 include/action.common.inc.php:320
 msgid "Action Sauvée"
 msgstr ""
 
@@ -13403,17 +13684,19 @@ msgid "Recherche activité"
 msgstr ""
 
 #: include/ajax_anc_search.php:65 include/ajax/ajax_anc_search.php:65
-#: include/ajax/ajax_anc_search.php:67 include/ajax/ajax_anc_search.php:67
+#: include/ajax/ajax_anc_search.php:67 include/ajax/ajax_anc_search.php:70
 msgid "Ce plan n'existe pas"
 msgstr ""
 
 #: include/ajax_anc_search.php:74 include/ajax/ajax_anc_search.php:74
-#: include/ajax/ajax_anc_search.php:76 include/ajax/ajax_anc_search.php:76
+#: include/ajax/ajax_anc_search.php:76 include/ajax/ajax_anc_search.php:79
 msgid "Aucun poste trouvé"
 msgstr ""
 
 #: include/ajax_anc_search.php:78 include/ajax_anc_search.php:79
 #: include/ajax/ajax_anc_search.php:78 include/ajax/ajax_anc_search.php:79
+#: include/class/card_attribut_mtable.class.php:54
+#: include/class/contact_option_ref_mtable.class.php:44
 msgid "Choix"
 msgstr ""
 
@@ -13458,16 +13741,18 @@ msgstr ""
 #: include/export/export_gl_csv.php:84 include/export/export_gl_csv.php:90
 #: include/ajax/ajax_boxcard_search.php:70
 #: include/class/acc_ledger.class.php:577
-#: include/class/acc_ledger.class.php:578 include/template/dashboard.php:175
-#: include/export/export_gl_csv.php:90 include/ajax/ajax_boxcard_search.php:70
+#: include/class/acc_ledger.class.php:578
 #: include/class/acc_ledger.class.php:594
+#: include/class/acc_ledger.class.php:578
+#: include/ajax/ajax_boxcard_search.php:70 include/export/export_gl_csv.php:90
+#: include/template/dashboard.php:175
 msgid "Aucun résultat"
 msgstr ""
 
 #: include/ajax_fiche_def_detail.php:40
 #: include/ajax/ajax_fiche_def_detail.php:40 include/param_sec.inc.php:135
 #: include/param_sec.inc.php:141 include/ajax/ajax_fiche_def_detail.php:41
-#: include/param_sec.inc.php:141 include/ajax/ajax_fiche_def_detail.php:41
+#: include/ajax/ajax_fiche_def_detail.php:41 include/param_sec.inc.php:146
 msgid "Retour à la liste"
 msgstr ""
 
@@ -13512,7 +13797,7 @@ msgid "Effacer ce profil"
 msgstr ""
 
 #: include/ajax_mod_predf_op.php:32 include/ajax/ajax_mod_predf_op.php:32
-#: include/ajax/ajax_mod_predf_op.php:31 include/ajax/ajax_mod_predf_op.php:31
+#: include/ajax/ajax_mod_predf_op.php:31 include/ajax/ajax_mod_predf_op.php:44
 msgid "Modification du nom"
 msgstr ""
 
@@ -13522,8 +13807,9 @@ msgstr ""
 #: include/class/pre_operation.class.php:63
 #: include/ajax/ajax_mod_predf_op.php:43
 #: include/class/pre_operation.class.php:64
-#: include/ajax/ajax_mod_predf_op.php:43
-#: include/class/pre_operation.class.php:64
+#: include/class/pre_operation.class.php:74
+#: include/ajax/ajax_mod_predf_op.php:56
+#: include/template/pre_operation_display.php:34
 msgid "Description (max 50 car.)"
 msgstr ""
 
@@ -13603,9 +13889,9 @@ msgstr ""
 #: include/class/pre_operation.class.php:249
 #: include/class/pre_operation.class.php:248
 #: include/class/pre_operation.class.php:250
+#: include/class/pre_operation.class.php:312
+#: include/class/pre_operation.class.php:315
 #: include/ajax/ajax_update_predef.php:55
-#: include/class/pre_operation.class.php:248
-#: include/class/pre_operation.class.php:250
 msgid "Modèle d'opérations"
 msgstr ""
 
@@ -13643,7 +13929,7 @@ msgstr ""
 #: include/ext/import_card/include/import_card.class.php:340
 #: include/upgrade-plugin.php:101 include/upgrade-template.php:39
 #: include/upgrade-plugin.php:113 include/upgrade-template.php:51
-#: include/upgrade-template.php:51 include/upgrade-plugin.php:113
+#: include/upgrade-template.php:51 include/upgrade-plugin.php:116
 msgid "Mise à jour"
 msgstr ""
 
@@ -13659,7 +13945,6 @@ msgstr ""
 #: include/anc_pa.inc.php:175 include/anc_pa.inc.php:195
 #: include/anc_pa.inc.php:179 include/anc_pa.inc.php:199
 #: include/anc_pa.inc.php:174 include/anc_pa.inc.php:194
-#: include/anc_pa.inc.php:174 include/anc_pa.inc.php:194
 msgid "Ajout d'un plan comptable"
 msgstr ""
 
@@ -13716,21 +14001,20 @@ msgstr ""
 
 #: include/template/action_search.php:51 include/template/action_search.php:65
 #: include/template/action_search.php:99 include/template/action_search.php:95
-#: include/template/action_search.php:95
+#: include/template/action_search.php:99
 msgid "Date de rappel après"
 msgstr ""
 
 #: include/template/action_search.php:57 include/template/action_search.php:71
 #: include/template/action_search.php:105
 #: include/template/action_search.php:101
-#: include/template/action_search.php:101
+#: include/template/action_search.php:105
 msgid "Date de rappel avant"
 msgstr ""
 
 #: include/template/action_search.php:63 include/template/action_search.php:77
 #: include/template/action_search.php:111
-#: include/template/action_search.php:107
-#: include/template/action_search.php:107
+#: include/template/action_search.php:107 include/template/action_search.php:60
 msgid "Affiche aussi les actions fermées"
 msgstr ""
 
@@ -13742,10 +14026,10 @@ msgstr ""
 #: include/ajax/ajax_search_operation.php:132
 #: include/ajax/ajax_search_operation.php:129
 #: include/ajax/ajax_search_operation.php:134
+#: include/ajax/ajax_search_operation.php:135
+#: include/ajax/ajax_search_operation.php:140
 #: include/template/action_search_result.php:32
 #: include/template/action_search_result.php:88
-#: include/ajax/ajax_search_operation.php:129
-#: include/ajax/ajax_search_operation.php:134
 msgid "Mettre à jour"
 msgstr ""
 
@@ -13802,8 +14086,8 @@ msgstr ""
 #: include/balance.inc.php:90 include/balance.inc.php:171
 #: include/balance.inc.php:91 include/balance.inc.php:172
 #: include/impress_rapport.inc.php:267 include/balance.inc.php:94
+#: include/balance.inc.php:175 include/balance.inc.php:94
 #: include/balance.inc.php:175 include/impress_rapport.inc.php:267
-#: include/balance.inc.php:94 include/balance.inc.php:175
 msgid "jusque"
 msgstr ""
 
@@ -13820,17 +14104,19 @@ msgid "Avec la balance de l'année précédente"
 msgstr ""
 
 #: include/card_attr.inc.php:77 include/card_attr.inc.php:78
-#: include/card_attr.inc.php:78
+#: include/class/card_attribut_mtable.class.php:51
+#: include/class/contact_option_ref_mtable.class.php:42
 msgid "Texte"
 msgstr ""
 
 #: include/card_attr.inc.php:78 include/card_attr.inc.php:79
-#: include/card_attr.inc.php:79
+#: include/class/card_attribut_mtable.class.php:53
+#: include/class/contact_option_ref_mtable.class.php:43
 msgid "Nombre"
 msgstr ""
 
 #: include/card_attr.inc.php:80 include/card_attr.inc.php:81
-#: include/card_attr.inc.php:81
+#: include/class/card_attribut_mtable.class.php:56
 msgid "Zone de texte"
 msgstr ""
 
@@ -13841,8 +14127,8 @@ msgstr ""
 #: include/dossier.inc.php:218 include/modele.inc.php:245
 #: include/dossier.inc.php:221 include/dossier.inc.php:226
 #: include/modele.inc.php:246 include/class/tva_rate_mtable.class.php:47
-#: include/dossier.inc.php:226 include/modele.inc.php:247
-#: include/class/tva_rate_mtable.class.php:47 include/card_attr.inc.php:94
+#: include/modele.inc.php:247 include/class/tva_rate_mtable.class.php:47
+#: include/modele.inc.php:247 include/dossier.inc.php:226
 msgid "id"
 msgstr ""
 
@@ -13850,12 +14136,12 @@ msgstr ""
 #: include/card_attr.inc.php:96 include/dossier.inc.php:204
 #: include/dossier.inc.php:238 include/dossier.inc.php:239
 #: include/dossier.inc.php:242 include/dossier.inc.php:247
-#: include/dossier.inc.php:247 include/card_attr.inc.php:97
+#: include/class/card_attribut_mtable.class.php:41 include/dossier.inc.php:247
 msgid "Taille"
 msgstr ""
 
 #: include/card_attr.inc.php:124 include/card_attr.inc.php:125
-#: include/card_attr.inc.php:126 include/card_attr.inc.php:126
+#: include/card_attr.inc.php:126
 msgid "Attention : effacera les données qui y sont liées"
 msgstr ""
 
@@ -13873,7 +14159,7 @@ msgstr ""
 msgid "Journal inexistant"
 msgstr ""
 
-#: include/cfgtags.inc.php:51 include/cfgtags.inc.php:51
+#: include/cfgtags.inc.php:51 include/cfgtags.inc.php:66
 msgid ""
 "Vous pouvez utiliser ceci comme des étiquettes pour marquer des documents "
 "ou \n"
@@ -14027,7 +14313,7 @@ msgstr ""
 #: include/class_acc_bilan.php:256 include/class_acc_bilan.php:257
 #: include/class/class_acc_bilan.php:257 include/class/class_acc_bilan.php:273
 #: include/class/acc_bilan.class.php:273 include/class/acc_bilan.class.php:276
-#: include/class/acc_bilan.class.php:278 include/class/acc_bilan.class.php:278
+#: include/class/acc_bilan.class.php:278 include/class/acc_bilan.class.php:279
 msgid "Aucun enregistrement trouve"
 msgstr ""
 
@@ -14045,8 +14331,8 @@ msgstr ""
 #: include/class/acc_bilan.class.php:706 include/class/acc_bilan.class.php:688
 #: include/class/acc_bilan.class.php:711 include/class/acc_bilan.class.php:374
 #: include/class/acc_bilan.class.php:690 include/class/acc_bilan.class.php:713
-#: include/class/acc_bilan.class.php:374 include/class/acc_bilan.class.php:690
-#: include/class/acc_bilan.class.php:713
+#: include/class/acc_bilan.class.php:375 include/class/acc_bilan.class.php:695
+#: include/class/acc_bilan.class.php:718
 msgid "erreur Ouverture fichier"
 msgstr ""
 
@@ -14055,7 +14341,7 @@ msgstr ""
 #: include/class/class_acc_bilan.php:668 include/class/class_acc_bilan.php:685
 #: include/class/acc_bilan.class.php:686 include/class/acc_bilan.class.php:689
 #: include/class/acc_bilan.class.php:694 include/class/acc_bilan.class.php:696
-#: include/class/acc_bilan.class.php:696
+#: include/class/acc_bilan.class.php:701
 msgid "erreur écriture fichier"
 msgstr ""
 
@@ -14066,6 +14352,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:115
 #: include/class/acc_ledger.class.php:116
 #: include/class/acc_ledger.class.php:134
+#: include/class/acc_ledger.class.php:133
 msgid " Tous les journaux"
 msgstr ""
 
@@ -14077,6 +14364,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:202
 #: include/class/acc_ledger.class.php:203
 #: include/class/acc_ledger.class.php:221
+#: include/class/acc_ledger.class.php:220
 msgid "this->jr_id is not set ou opération inconnue"
 msgstr ""
 
@@ -14090,9 +14378,9 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:929
 #: include/class/acc_ledger_search.class.php:937
 #: include/class/acc_ledger_search.class.php:950
-#: include/template/letter_prop.php:31 include/template/letter_prop.php:74
-#: include/export/export_histo_csv.php:36
-#: include/class/acc_ledger_search.class.php:950
+#: include/class/acc_ledger_search.class.php:1039
+#: include/export/export_histo_csv.php:39 include/template/letter_prop.php:31
+#: include/template/letter_prop.php:74
 msgid "Internal"
 msgstr ""
 
@@ -14104,7 +14392,7 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:938
 #: include/class/acc_ledger_search.class.php:946
 #: include/class/acc_ledger_search.class.php:959
-#: include/class/acc_ledger_search.class.php:959
+#: include/class/acc_ledger_search.class.php:1048
 msgid "tiers"
 msgstr ""
 
@@ -14125,8 +14413,8 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:1045
 #: include/class/acc_ledger_search.class.php:850
 #: include/class/acc_ledger_search.class.php:1058
-#: include/class/acc_ledger_search.class.php:850
-#: include/class/acc_ledger_search.class.php:1058
+#: include/class/acc_ledger_search.class.php:939
+#: include/class/acc_ledger_search.class.php:1147
 msgid "Opération annulée"
 msgstr ""
 
@@ -14157,15 +14445,17 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:644
 #: include/class/acc_ledger_history_purchase.class.php:250
 #: include/class/acc_ledger_history_purchase.class.php:254
+#: include/class/acc_ledger.class.php:2452
+#: include/class/acc_ledger_history_sale.class.php:253
+#: include/class/acc_ledger_search.class.php:730
+#: include/class/acc_ledger_history_purchase.class.php:265
+#: include/class/acc_ledger.class.php:2480
+#: include/class/pdf_operation.class.php:73
+#: include/export/export_histo_csv.php:43
 #: include/template/print_ledger_simple.php:8
 #: include/template/acc_ledger_history_sale_detail.php:35
 #: include/template/acc_ledger_history_purchase_detail.php:34
-#: include/export/export_histo_csv.php:40
-#: include/class/acc_ledger.class.php:2452
-#: include/class/acc_ledger_history_purchase.class.php:254
-#: include/class/acc_ledger_search.class.php:644
-#: include/class/acc_ledger_history_sale.class.php:243
-#: include/class/pdf_operation.class.php:73
+#: include/tax_summary.inc.php:42
 msgid "Paiement"
 msgstr ""
 
@@ -14205,19 +14495,21 @@ msgstr ""
 #: include/class/acc_ledger_history_generic.class.php:683
 #: include/class/fiche.class.php:1476 include/export/export_ledger_csv.php:214
 #: include/export/export_ledger_csv.php:222
+#: include/class/acc_ledger_history_generic.class.php:686
+#: include/class/acc_ledger_search.class.php:736
+#: include/class/print_ledger_misc.class.php:45
+#: include/class/fiche.class.php:1503
+#: include/class/acc_account_ledger.class.php:388
+#: include/class/acc_ledger_history_generic.class.php:687
+#: include/class/anc_grandlivre.class.php:229
+#: include/export/export_ledger_csv.php:230
+#: include/export/export_poste_detail_csv.php:86
+#: include/export/export_poste_detail_csv.php:199
+#: include/export/export_fiche_detail_csv.php:75
+#: include/export/export_histo_csv.php:46
 #: include/template/operation_detail_fin.php:32
 #: include/template/acc_ledger_history_financial_oneline.php:34
 #: include/template/ledger_detail_fin.php:45
-#: include/export/export_poste_detail_csv.php:86
-#: include/export/export_poste_detail_csv.php:199
-#: include/export/export_ledger_csv.php:222
-#: include/export/export_histo_csv.php:43
-#: include/export/export_fiche_detail_csv.php:75
-#: include/class/acc_ledger_history_generic.class.php:686
-#: include/class/acc_ledger_search.class.php:650
-#: include/class/print_ledger_misc.class.php:46
-#: include/class/acc_account_ledger.class.php:396
-#: include/class/fiche.class.php:1476
 msgid "Tiers"
 msgstr ""
 
@@ -14229,7 +14521,7 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:860
 #: include/class/acc_ledger_search.class.php:868
 #: include/class/acc_ledger_search.class.php:881
-#: include/class/acc_ledger_search.class.php:881
+#: include/class/acc_ledger_search.class.php:970
 msgid "Non payé"
 msgstr ""
 
@@ -14241,6 +14533,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:597
 #: include/class/acc_ledger.class.php:598
 #: include/class/acc_ledger.class.php:614
+#: include/class/acc_ledger.class.php:598
 msgid "Attention : il vaut mieux utiliser les fiches que les postes comptables"
 msgstr ""
 
@@ -14254,6 +14547,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1198
 #: include/class/acc_ledger.class.php:1207
 #: include/class/acc_ledger.class.php:1223
+#: include/class/acc_ledger.class.php:1219
 msgid ""
 "Attention : il vaut mieux utiliser les fiches que les postes comptables "
 msgstr ""
@@ -14270,6 +14564,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1300
 #: include/class/acc_ledger.class.php:1309
 #: include/class/acc_ledger.class.php:1325
+#: include/class/acc_ledger.class.php:1321
 msgid "Balance incorrecte"
 msgstr ""
 
@@ -14284,6 +14579,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1342
 #: include/class/acc_ledger.class.php:1351
 #: include/class/acc_ledger.class.php:1367
+#: include/class/acc_ledger.class.php:1365
 msgid "OPERATION ANNULEE "
 msgstr ""
 
@@ -14298,6 +14594,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1665
 #: include/class/acc_ledger.class.php:1674
 #: include/class/acc_ledger.class.php:1690
+#: include/class/acc_ledger.class.php:1680
 msgid "Celui qui paie n' a pas de poste comptable"
 msgstr ""
 
@@ -14312,6 +14609,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1683
 #: include/class/acc_ledger.class.php:1692
 #: include/class/acc_ledger.class.php:1708
+#: include/class/acc_ledger.class.php:1698
 #, php-format
 msgid "Pour la fiche %s le poste comptable [%s] n'existe pas"
 msgstr ""
@@ -14328,6 +14626,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2109
 #: include/class/acc_ledger.class.php:2118
 #: include/class/acc_ledger.class.php:2134
+#: include/class/acc_ledger.class.php:2153
 msgid "Journaux de vente"
 msgstr ""
 
@@ -14368,6 +14667,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2313
 #: include/class/acc_ledger.class.php:2322
 #: include/class/acc_ledger.class.php:2344
+#: include/class/acc_ledger.class.php:2368
 msgid "Nombre de ligne incorrect"
 msgstr ""
 
@@ -14384,6 +14684,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2318
 #: include/class/acc_ledger.class.php:2327
 #: include/class/acc_ledger.class.php:2349
+#: include/class/acc_ledger.class.php:2373
 msgid "Un journal avec ce nom existe déjà"
 msgstr ""
 
@@ -14429,6 +14730,9 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2355
 #: include/class/acc_ledger.class.php:2428
 #: include/class/acc_ledger.class.php:2614
+#: include/class/acc_ledger.class.php:2381
+#: include/class/acc_ledger.class.php:2456
+#: include/class/acc_ledger.class.php:2638
 msgid "Aucun compte en banque n'est donné"
 msgstr ""
 
@@ -14446,6 +14750,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2483
 #: include/class/acc_ledger.class.php:2492
 #: include/class/acc_ledger.class.php:2523
+#: include/class/acc_ledger.class.php:2553
 msgid "choix du type de journal"
 msgstr ""
 
@@ -14463,6 +14768,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2584
 #: include/class/acc_ledger.class.php:2593
 #: include/class/acc_ledger.class.php:2632
+#: include/class/acc_ledger.class.php:2656
 msgid "Impossible d'effacer un journal qui contient des opérations"
 msgstr ""
 
@@ -14480,6 +14786,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2700
 #: include/class/acc_ledger.class.php:2709
 #: include/class/acc_ledger.class.php:2748
+#: include/class/acc_ledger.class.php:2772
 msgid "Action non accessible"
 msgstr ""
 
@@ -14487,16 +14794,16 @@ msgstr ""
 #: include/export/export_gl_csv.php:95 include/export/export_gl_csv.php:90
 #: include/template/action_search.php:133 include/export/export_gl_csv.php:96
 #: include/export/export_gl_pdf.php:88 include/template/action_search.php:115
-#: include/template/action_show.php:38 include/template/action_show.php:38
-#: include/template/action_search.php:115 include/export/export_gl_pdf.php:88
-#: include/export/export_gl_csv.php:96
+#: include/template/action_show.php:38 include/export/export_gl_csv.php:96
+#: include/export/export_gl_pdf.php:88 include/template/action_show.php:38
+#: include/template/action_search.php:116
 msgid "Référence"
 msgstr ""
 
 #: include/template/action_search.php:88 include/template/action_search.php:102
 #: include/template/action_search.php:139
 #: include/template/action_search.php:121
-#: include/template/action_search.php:121
+#: include/template/action_search.php:122
 msgid "Numéro document"
 msgstr ""
 
@@ -14516,7 +14823,8 @@ msgstr ""
 
 #: include/template/dashboard.php:105 include/template/dashboard.php:71
 #: include/template/dashboard.php:75 include/template/dashboard.php:54
-#: include/template/dashboard.php:54
+#: include/class/contact_option_ref_mtable.class.php:38
+#: include/class/document_state_mtable.php:44 include/template/dashboard.php:54
 msgid "Action"
 msgstr ""
 
@@ -14604,7 +14912,7 @@ msgstr ""
 #: include/template/detail-action.php:192
 #: include/template/detail-action.php:191
 #: include/template/detail-action.php:166
-#: include/template/detail-action.php:166
+#: include/template/detail-action.php:173
 msgid "Actions concernées"
 msgstr ""
 
@@ -14617,7 +14925,7 @@ msgstr ""
 #: include/template/detail-action.php:278
 #: include/template/detail-action.php:247
 #: include/template/detail-action.php:249
-#: include/template/detail-action.php:249
+#: include/template/detail-action.php:336
 #, php-format
 msgid "Voulez-vous effacer ce commentaire"
 msgstr ""
@@ -14632,7 +14940,7 @@ msgstr ""
 #: include/template/detail-action.php:476
 #: include/template/detail-action.php:480
 #: include/template/detail-action.php:478
-#: include/template/detail-action.php:476
+#: include/template/detail-action.php:491
 msgid "Ajouter un fichier"
 msgstr ""
 
@@ -14659,12 +14967,12 @@ msgid "Ajout d'une nouvelle catégorie"
 msgstr ""
 
 #: include/template/fiche_list.php:87 include/template/fiche_list.php:89
-#: include/template/fiche_list.php:91 include/template/fiche_list.php:89
+#: include/template/fiche_list.php:91 include/template/fiche_list.php:96
 msgid "Effacer la sélection "
 msgstr ""
 
 #: include/template/fiche_list.php:89 include/template/fiche_list.php:91
-#: include/template/fiche_list.php:93 include/template/fiche_list.php:91
+#: include/template/fiche_list.php:93 include/template/fiche_list.php:98
 msgid "Déplacer la sélection  vers"
 msgstr ""
 
@@ -14752,17 +15060,19 @@ msgstr ""
 #: include/export/export_ledger_csv.php:141
 #: include/class/acc_ledger_history_purchase.class.php:277
 #: include/class/acc_ledger_history_sale.class.php:263
+#: include/class/acc_ledger_sold.class.php:1407
+#: include/class/acc_ledger_purchase.class.php:1833
+#: include/class/acc_ledger_history_sale.class.php:273
+#: include/class/acc_ledger_history_purchase.class.php:288
+#: include/class/acc_ledger_purchase.class.php:1870
+#: include/class/acc_ledger_sold.class.php:1392
+#: include/export/export_ledger_csv.php:146
+#: include/template/acc_ledger_history_purchase_extended.php:34
 #: include/template/ledger_detail_ven.php:45
 #: include/template/acc_ledger_history_purchase_oneline.php:38
 #: include/template/acc_ledger_history_sale_oneline.php:35
-#: include/template/acc_ledger_history_purchase_extended.php:34
 #: include/template/acc_ledger_history_sale_extended.php:34
 #: include/template/ledger_detail_ach.php:37
-#: include/export/export_ledger_csv.php:141
-#: include/class/acc_ledger_sold.class.php:1407
-#: include/class/acc_ledger_history_purchase.class.php:277
-#: include/class/acc_ledger_history_sale.class.php:263
-#: include/class/acc_ledger_purchase.class.php:1833
 msgid "Date paiement"
 msgstr ""
 
@@ -14774,7 +15084,7 @@ msgstr ""
 #: include/template/ledger_detail_bottom.php:142
 #: include/template/ledger_detail_bottom.php:143
 #: include/template/ledger_detail_bottom.php:148
-#: include/template/ledger_detail_bottom.php:148
+#: include/template/ledger_detail_bottom.php:153
 msgid " Bon de commande"
 msgstr ""
 
@@ -14783,7 +15093,7 @@ msgstr ""
 #: include/ext/importbank/ajax.php:89 include/ext/importbank/ajax.php:90
 #: include/template/ledger_detail_bottom.php:146
 #: include/template/ledger_detail_bottom.php:151
-#: include/template/ledger_detail_bottom.php:151
+#: include/template/ledger_detail_bottom.php:156
 msgid "Autre information"
 msgstr ""
 
@@ -14813,27 +15123,27 @@ msgstr ""
 #: include/class/acc_ledger_history_sale.class.php:247
 #: include/class/acc_ledger_history_purchase.class.php:254
 #: include/class/acc_ledger_history_purchase.class.php:258
+#: include/class/acc_ledger_history_sale.class.php:257
+#: include/class/acc_ledger_history_purchase.class.php:269
+#: include/export/export_histo_csv.php:48
+#: include/template/security_list_action.php:73
 #: include/template/dashboard.php:344
-#: include/template/security_list_action.php:72
-#: include/export/export_histo_csv.php:45
-#: include/class/acc_ledger_history_purchase.class.php:258
-#: include/class/acc_ledger_history_sale.class.php:247
 msgid "Note"
 msgstr ""
 
-#: include/template/letter_all.php:108 include/template/letter_all.php:108
+#: include/template/letter_all.php:108
 msgid "Solde débit"
 msgstr ""
 
-#: include/template/letter_all.php:109 include/template/letter_all.php:109
+#: include/template/letter_all.php:109
 msgid "Solde crédit"
 msgstr ""
 
-#: include/template/letter_all.php:115 include/template/letter_all.php:115
+#: include/template/letter_all.php:115 include/export/export_balance_csv.php:79
 msgid "Solde débiteur"
 msgstr ""
 
-#: include/template/letter_all.php:117 include/template/letter_all.php:117
+#: include/template/letter_all.php:117 include/export/export_balance_csv.php:79
 msgid "Solde créditeur"
 msgstr ""
 
@@ -14864,8 +15174,7 @@ msgstr ""
 #: include/template/profile_menu_display_module.php:57
 #: include/ajax/ajax_get_profile.php:114 include/cfgplugin.inc.php:114
 #: include/template/menu_detail.php:19
-#: include/template/profile_menu_display_module.php:57
-#: include/ajax/ajax_get_profile.php:114 include/menu.inc.php:109
+#: include/template/profile_menu_display_module.php:57 include/menu.inc.php:109
 #: include/menu.inc.php:126
 msgid "Menu"
 msgstr ""
@@ -14926,8 +15235,8 @@ msgstr ""
 #: include/template/acc_ledger_history_sale_detail.php:56
 #: include/template/acc_ledger_history_financial_oneline.php:37
 #: include/template/print_ledger_simple.php:32
-#: include/template/acc_ledger_history_financial_oneline.php:37
 #: include/template/acc_ledger_history_sale_detail.php:56
+#: include/template/acc_ledger_history_financial_oneline.php:37
 #: include/template/acc_ledger_history_purchase_detail.php:58
 #: include/impress_rec.inc.php:60
 msgid "Opérations rapprochées"
@@ -14947,10 +15256,10 @@ msgstr ""
 #: include/export/export_stock_histo_csv.php:41
 #: include/export/export_stock_resume_list.php:38
 #: include/template/stock_inv.php:63
-#: include/template/stock_summary_table.php:33
-#: include/template/stock_histo_search.php:35 include/template/stock_inv.php:63
-#: include/export/export_stock_histo_csv.php:41
 #: include/export/export_stock_resume_list.php:38
+#: include/export/export_stock_histo_csv.php:41
+#: include/template/stock_summary_table.php:33
+#: include/template/stock_inv.php:63 include/template/stock_histo_search.php:35
 msgid "Code Stock"
 msgstr ""
 
@@ -14963,8 +15272,8 @@ msgstr ""
 #: include/compta_ven.inc.php:92 include/compta_ach.inc.php:86
 #: include/compta_ven.inc.php:95 include/compta_ach.inc.php:88
 #: include/compta_ach.inc.php:90 include/compta_ven.inc.php:97
-#: include/template/stock_histo_search.php:51 include/compta_ven.inc.php:95
-#: include/compta_ach.inc.php:88
+#: include/compta_ven.inc.php:95 include/compta_ach.inc.php:87
+#: include/template/stock_histo_search.php:51
 msgid "Dépôt"
 msgstr ""
 
@@ -14997,10 +15306,10 @@ msgstr ""
 #: include/template/stock_summary_table.php:73
 #: include/template/stock_summary_table.php:107
 #: include/export/export_stock_resume_list.php:38
+#: include/export/export_stock_resume_list.php:38
+#: include/template/stock_summary_list.php:47
 #: include/template/stock_summary_table.php:73
 #: include/template/stock_summary_table.php:107
-#: include/template/stock_summary_list.php:47
-#: include/export/export_stock_resume_list.php:38
 msgid "IN"
 msgstr ""
 
@@ -15008,10 +15317,10 @@ msgstr ""
 #: include/template/stock_summary_table.php:81
 #: include/template/stock_summary_table.php:115
 #: include/export/export_stock_resume_list.php:38
+#: include/export/export_stock_resume_list.php:38
+#: include/template/stock_summary_list.php:48
 #: include/template/stock_summary_table.php:81
 #: include/template/stock_summary_table.php:115
-#: include/template/stock_summary_list.php:48
-#: include/export/export_stock_resume_list.php:38
 msgid "OUT"
 msgstr ""
 
@@ -15034,8 +15343,8 @@ msgstr ""
 
 #: include/template/tag_choose.php:8 include/template/tag_search_select.php:8
 #: include/template/tag_select.php:8 include/template/tag_select.php:12
-#: include/template/tag_choose.php:8 include/template/tag_search_select.php:8
-#: include/template/tag_select.php:12
+#: include/template/tag_select.php:14 include/template/tag_choose.php:8
+#: include/template/tag_search_select.php:8
 msgid "Aucune étiquette disponible"
 msgstr ""
 
@@ -15051,8 +15360,8 @@ msgstr ""
 #: include/template/tag_list.php:11 include/template/tag_search_select.php:16
 #: include/template/tag_select.php:16 include/template/tag_list.php:12
 #: include/template/tag_search_select.php:18 include/template/tag_select.php:20
-#: include/template/tag_search_select.php:18 include/template/tag_select.php:20
-#: include/template/tag_list.php:12
+#: include/template/tag_select.php:22 include/template/tag_search_select.php:21
+#: include/template/tag_list.php:13
 msgid "Tag"
 msgstr ""
 
@@ -15069,8 +15378,8 @@ msgstr ""
 #: include/menu.inc.php:129 include/menu.inc.php:130 include/menu.inc.php:125
 #: include/cfgledger.inc.php:162 include/balance_card_ageing.inc.php:57
 #: include/cfgledger.inc.php:164 include/cfgledger.inc.php:169
-#: include/cfgledger.inc.php:169 include/menu.inc.php:125
-#: include/balance_card_ageing.inc.php:57
+#: include/menu.inc.php:125 include/balance_card_ageing.inc.php:57
+#: include/cfgledger.inc.php:169
 msgid "Tout"
 msgstr ""
 
@@ -15150,9 +15459,9 @@ msgstr ""
 #: include/ext/importbank/include/import_bank.class.php:140
 #: include/lib/ac_common.php:343 include/action.common.inc.php:144
 #: include/action.common.inc.php:295 include/lib/ac_common.php:345
-#: include/lib/ac_common.php:361 include/action.common.inc.php:144
-#: include/action.common.inc.php:295 include/lib/ac_common.php:361
-#: include/forecast.inc.php:359
+#: include/lib/ac_common.php:361 include/action.common.inc.php:146
+#: include/action.common.inc.php:324 include/forecast.inc.php:359
+#: include/lib/ac_common.php:371
 msgid "Erreur"
 msgstr ""
 
@@ -15161,8 +15470,8 @@ msgstr ""
 #: include/param_sec.inc.php:219 include/class/acc_ledger_search.class.php:1070
 #: include/param_sec.inc.php:223 include/class/acc_ledger_search.class.php:1065
 #: include/class/acc_ledger_search.class.php:1073
-#: include/class/acc_ledger_search.class.php:1086 include/param_sec.inc.php:223
 #: include/class/acc_ledger_search.class.php:1086
+#: include/class/acc_ledger_search.class.php:1175 include/param_sec.inc.php:228
 msgid "Journaux"
 msgstr ""
 
@@ -15187,8 +15496,8 @@ msgstr ""
 #: include/lib/html_input.class.php:1017 include/lib/html_input.class.php:1018
 #: include/class/acc_ledger_search.class.php:112
 #: include/lib/html_input.class.php:1033 include/lib/html_input.class.php:1034
-#: include/class/acc_ledger_search.class.php:112
-#: include/lib/html_input.class.php:1034
+#: include/class/acc_ledger_search.class.php:114
+#: include/lib/html_input.class.php:1067
 msgid "choix des journaux"
 msgstr ""
 
@@ -15216,7 +15525,7 @@ msgstr ""
 #: html/ajax_misc.php:400 html/ajax_misc.php:478
 #: include/ajax/ajax_display_letter.php:114
 #: include/ajax/ajax_display_letter.php:119
-#: include/ajax/ajax_display_letter.php:119
+#: include/ajax/ajax_display_letter.php:137
 msgid "Debit / Credit"
 msgstr ""
 
@@ -15225,7 +15534,7 @@ msgstr ""
 msgid "Appel invalide"
 msgstr ""
 
-#: html/export.php:53 html/export.php:53
+#: html/export.php:53 html/export.php:54
 msgid "Export impossible"
 msgstr ""
 
@@ -15244,9 +15553,9 @@ msgstr ""
 #: include/anc_great_ledger.inc.php:47 include/anc_balance_double.inc.php:27
 #: include/anc_balance_simple.inc.php:27 include/anc_great_ledger.inc.php:78
 #: include/anc_history.inc.php:34 include/anc_history.inc.php:37
-#: include/anc_balance_double.inc.php:26 include/anc_great_ledger.inc.php:78
+#: include/anc_balance_double.inc.php:26 include/anc_history.inc.php:37
 #: include/anc_balance_simple.inc.php:27 include/anc_balance_double.inc.php:26
-#: include/anc_history.inc.php:37
+#: include/anc_great_ledger.inc.php:78
 msgid "Aucune donnée trouvée"
 msgstr ""
 
@@ -15288,6 +15597,8 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1496
 #: include/class/acc_ledger.class.php:1495
 #: include/class/acc_ledger.class.php:1512
+#: include/class/acc_ledger.class.php:1485
+#: include/class/acc_ledger.class.php:1502
 msgid "get_default_card p_ledger_side is invalide ["
 msgstr ""
 
@@ -15318,6 +15629,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1825
 #: include/class/acc_ledger_sold.class.php:1405
 #: include/class/acc_ledger_purchase.class.php:1831
+#: include/class/acc_ledger_purchase.class.php:1868
+#: include/class/acc_ledger_sold.class.php:1390
 msgid "Numéro opération"
 msgstr ""
 
@@ -15347,6 +15660,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1828
 #: include/class/acc_ledger_sold.class.php:1408
 #: include/class/acc_ledger_purchase.class.php:1834
+#: include/class/acc_ledger_purchase.class.php:1871
+#: include/class/acc_ledger_sold.class.php:1393
 msgid "Date échéance"
 msgstr ""
 
@@ -15378,10 +15693,12 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1830
 #: include/class/acc_ledger_sold.class.php:1404
 #: include/class/acc_ledger_purchase.class.php:1833
-#: include/export/export_poste_detail_csv.php:81
-#: include/export/export_fiche_detail_csv.php:73
 #: include/class/acc_ledger_sold.class.php:1413
 #: include/class/acc_ledger_purchase.class.php:1839
+#: include/class/acc_ledger_purchase.class.php:1876
+#: include/class/acc_ledger_sold.class.php:1398
+#: include/export/export_poste_detail_csv.php:81
+#: include/export/export_fiche_detail_csv.php:73
 msgid "Code journal"
 msgstr ""
 
@@ -15411,6 +15728,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1836
 #: include/class/acc_ledger_sold.class.php:1416
 #: include/class/acc_ledger_purchase.class.php:1842
+#: include/class/acc_ledger_purchase.class.php:1879
+#: include/class/acc_ledger_sold.class.php:1401
 msgid "Code Item"
 msgstr ""
 
@@ -15440,6 +15759,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1837
 #: include/class/acc_ledger_sold.class.php:1417
 #: include/class/acc_ledger_purchase.class.php:1843
+#: include/class/acc_ledger_purchase.class.php:1880
+#: include/class/acc_ledger_sold.class.php:1402
 msgid "N° fiche"
 msgstr ""
 
@@ -15469,6 +15790,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1838
 #: include/class/acc_ledger_sold.class.php:1418
 #: include/class/acc_ledger_purchase.class.php:1844
+#: include/class/acc_ledger_purchase.class.php:1881
+#: include/class/acc_ledger_sold.class.php:1403
 msgid "Nom fiche"
 msgstr ""
 
@@ -15498,6 +15821,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1839
 #: include/class/acc_ledger_sold.class.php:1419
 #: include/class/acc_ledger_purchase.class.php:1845
+#: include/class/acc_ledger_purchase.class.php:1882
+#: include/class/acc_ledger_sold.class.php:1404
 msgid "N° fiche fournisseur"
 msgstr ""
 
@@ -15527,6 +15852,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1840
 #: include/class/acc_ledger_sold.class.php:1420
 #: include/class/acc_ledger_purchase.class.php:1846
+#: include/class/acc_ledger_purchase.class.php:1883
+#: include/class/acc_ledger_sold.class.php:1405
 msgid "Nom fournisseur"
 msgstr ""
 
@@ -15556,6 +15883,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1841
 #: include/class/acc_ledger_sold.class.php:1421
 #: include/class/acc_ledger_purchase.class.php:1847
+#: include/class/acc_ledger_purchase.class.php:1884
+#: include/class/acc_ledger_sold.class.php:1406
 msgid "Code fournisseur"
 msgstr ""
 
@@ -15585,6 +15914,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1842
 #: include/class/acc_ledger_sold.class.php:1422
 #: include/class/acc_ledger_purchase.class.php:1848
+#: include/class/acc_ledger_purchase.class.php:1885
+#: include/class/acc_ledger_sold.class.php:1407
 msgid "Nom TVA"
 msgstr ""
 
@@ -15614,6 +15945,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1843
 #: include/class/acc_ledger_sold.class.php:1423
 #: include/class/acc_ledger_purchase.class.php:1849
+#: include/class/acc_ledger_purchase.class.php:1886
+#: include/class/acc_ledger_sold.class.php:1408
 msgid "Commentaire TVA"
 msgstr ""
 
@@ -15644,8 +15977,10 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1844
 #: include/class/acc_ledger_history_sale.class.php:251
 #: include/class/acc_ledger_sold.class.php:1424
-#: include/class/acc_ledger_history_sale.class.php:251
 #: include/class/acc_ledger_purchase.class.php:1850
+#: include/class/acc_ledger_history_sale.class.php:261
+#: include/class/acc_ledger_purchase.class.php:1887
+#: include/class/acc_ledger_sold.class.php:1409
 msgid "TVA annulée"
 msgstr ""
 
@@ -15683,6 +16018,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1850
 #: include/class/acc_ledger_sold.class.php:1430
 #: include/class/acc_ledger_purchase.class.php:1856
+#: include/class/acc_ledger_purchase.class.php:1893
+#: include/class/acc_ledger_sold.class.php:1415
 msgid "PU"
 msgstr ""
 
@@ -15701,6 +16038,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1851
 #: include/export/export_printtva_csv.php:65
 #: include/class/acc_ledger_purchase.class.php:1857
+#: include/class/acc_ledger_purchase.class.php:1894
+#: include/export/export_printtva_csv.php:77
 msgid "Montant ND"
 msgstr ""
 
@@ -15718,6 +16057,7 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1849
 #: include/class/acc_ledger_purchase.class.php:1852
 #: include/class/acc_ledger_purchase.class.php:1858
+#: include/class/acc_ledger_purchase.class.php:1895
 msgid "Montant TVA ND"
 msgstr ""
 
@@ -15735,6 +16075,7 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1850
 #: include/class/acc_ledger_purchase.class.php:1853
 #: include/class/acc_ledger_purchase.class.php:1859
+#: include/class/acc_ledger_purchase.class.php:1896
 msgid "TVA récup."
 msgstr ""
 
@@ -15764,6 +16105,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1854
 #: include/class/acc_ledger_sold.class.php:1431
 #: include/class/acc_ledger_purchase.class.php:1860
+#: include/class/acc_ledger_purchase.class.php:1897
+#: include/class/acc_ledger_sold.class.php:1416
 msgid "HTVA Opération"
 msgstr ""
 
@@ -15793,6 +16136,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1855
 #: include/class/acc_ledger_sold.class.php:1432
 #: include/class/acc_ledger_purchase.class.php:1861
+#: include/class/acc_ledger_purchase.class.php:1898
+#: include/class/acc_ledger_sold.class.php:1417
 msgid "TVA Opération"
 msgstr ""
 
@@ -15807,8 +16152,8 @@ msgstr ""
 #: include/class/anc_grandlivre.class.php:169
 #: include/class/anc_grandlivre.class.php:162
 #: include/class/anc_grandlivre.class.php:170
-#: include/class/anc_grandlivre.class.php:162
-#: include/class/anc_grandlivre.class.php:170
+#: include/class/anc_grandlivre.class.php:174
+#: include/class/anc_grandlivre.class.php:182
 msgid "Export des pièces en PDF"
 msgstr ""
 
@@ -15854,14 +16199,14 @@ msgstr ""
 #: include/class_anc_key.php:335 include/class_anc_key.php:337
 #: include/class/class_anc_key.php:338 include/class/class_anc_key.php:339
 #: include/class/class_anc_key.php:340 include/class/anc_key.class.php:349
-#: include/class/anc_key.class.php:349
+#: include/class/anc_key.class.php:350
 msgid "Nouvelle clef"
 msgstr ""
 
 #: include/class_anc_key.php:336 include/class_anc_key.php:338
 #: include/class/class_anc_key.php:339 include/class/class_anc_key.php:340
 #: include/class/class_anc_key.php:341 include/class/anc_key.class.php:350
-#: include/class/anc_key.class.php:350
+#: include/class/anc_key.class.php:351
 msgid "Description de la nouvelle clef"
 msgstr ""
 
@@ -15947,12 +16292,11 @@ msgid " est vide"
 msgstr ""
 
 #: include/preod.inc.php:82 include/preod.inc.php:85 include/preod.inc.php:86
-#: include/preod.inc.php:86
 msgid "Aucun enregistrement"
 msgstr ""
 
 #: include/preod.inc.php:109 include/preod.inc.php:112
-#: include/preod.inc.php:113 include/preod.inc.php:113
+#: include/preod.inc.php:113
 msgid "Voulez-vous vraiment effacer cette operation ?"
 msgstr ""
 
@@ -15988,12 +16332,12 @@ msgstr ""
 #: include/class/pdf_operation.class.php:148
 #: include/class/pdf_operation.class.php:193
 #: include/class/pdf_operation.class.php:245
-#: include/template/anc_key_input.php:53
 #: include/class/acc_reconciliation.class.php:482
 #: include/class/acc_reconciliation.class.php:506
 #: include/class/pdf_operation.class.php:148
 #: include/class/pdf_operation.class.php:193
 #: include/class/pdf_operation.class.php:245
+#: include/template/anc_key_input.php:53
 msgid "n°"
 msgstr ""
 
@@ -16025,7 +16369,7 @@ msgstr ""
 #: include/template/detail-action.php:383
 #: include/template/detail-action.php:390
 #: include/template/detail-action.php:392
-#: include/template/detail-action.php:392
+#: include/template/follow_up_detail_display.php:203
 msgid "Transformer en facture"
 msgstr ""
 
@@ -16037,7 +16381,7 @@ msgstr ""
 #: include/template/ledger_detail_bottom.php:18
 #: include/template/ledger_detail_bottom.php:33
 #: include/template/ledger_detail_bottom.php:38
-#: include/template/ledger_detail_bottom.php:38
+#: include/template/ledger_detail_bottom.php:43
 msgid "Opérations liées"
 msgstr ""
 
@@ -16138,29 +16482,29 @@ msgstr ""
 
 #: include/ajax_mod_periode.php:55 include/ajax/ajax_mod_periode.php:55
 #: include/ajax/ajax_periode.php:171 include/class/periode.class.php:702
-#: include/class/periode.class.php:704 include/ajax/ajax_periode.php:171
-#: include/class/periode.class.php:706
+#: include/class/periode.class.php:704 include/class/periode.class.php:706
+#: include/class/periode.class.php:707 include/ajax/ajax_periode.php:171
 msgid " Début période : "
 msgstr ""
 
 #: include/ajax_mod_periode.php:56 include/ajax/ajax_mod_periode.php:56
 #: include/ajax/ajax_periode.php:172 include/class/periode.class.php:703
-#: include/class/periode.class.php:705 include/ajax/ajax_periode.php:172
-#: include/class/periode.class.php:707
+#: include/class/periode.class.php:705 include/class/periode.class.php:707
+#: include/class/periode.class.php:708 include/ajax/ajax_periode.php:172
 msgid " Fin période : "
 msgstr ""
 
 #: include/ajax_mod_periode.php:57 include/ajax/ajax_mod_periode.php:57
 #: include/ajax/ajax_periode.php:173 include/class/periode.class.php:704
-#: include/class/periode.class.php:706 include/ajax/ajax_periode.php:173
-#: include/class/periode.class.php:708
+#: include/class/periode.class.php:706 include/class/periode.class.php:708
+#: include/class/periode.class.php:709 include/ajax/ajax_periode.php:173
 msgid " Exercice : "
 msgstr ""
 
 #: include/ajax_mod_periode.php:59 include/ajax/ajax_mod_periode.php:59
 #: include/ajax/ajax_periode.php:175 include/class/periode.class.php:706
-#: include/class/periode.class.php:708 include/ajax/ajax_periode.php:175
-#: include/class/periode.class.php:710
+#: include/class/periode.class.php:708 include/class/periode.class.php:710
+#: include/class/periode.class.php:711 include/ajax/ajax_periode.php:175
 msgid "sauver"
 msgstr ""
 
@@ -16172,7 +16516,7 @@ msgstr ""
 #: include/ajax/ajax_search_operation.php:119
 #: include/ajax/ajax_search_operation.php:122
 #: include/ajax/ajax_search_operation.php:124
-#: include/ajax/ajax_search_operation.php:124
+#: include/ajax/ajax_search_operation.php:129
 msgid "Liste limitée à "
 msgstr ""
 
@@ -16180,7 +16524,7 @@ msgstr ""
 #: include/ajax/ajax_search_operation.php:119
 #: include/ajax/ajax_search_operation.php:122
 #: include/ajax/ajax_search_operation.php:124
-#: include/ajax/ajax_search_operation.php:124
+#: include/ajax/ajax_search_operation.php:129
 msgid " enregistrements. Le nombre d'enregistrements trouvés est de "
 msgstr ""
 
@@ -16204,7 +16548,7 @@ msgstr ""
 #: include/class_acc_bilan.php:249 include/class_acc_bilan.php:250
 #: include/class/class_acc_bilan.php:250 include/class/class_acc_bilan.php:266
 #: include/class/acc_bilan.class.php:266 include/class/acc_bilan.class.php:269
-#: include/class/acc_bilan.class.php:271 include/class/acc_bilan.class.php:271
+#: include/class/acc_bilan.class.php:271 include/class/acc_bilan.class.php:272
 msgid "le formulaire id n'est pas donnee"
 msgstr ""
 
@@ -16212,7 +16556,7 @@ msgstr ""
 #: include/class/class_acc_bilan.php:637 include/class/class_acc_bilan.php:654
 #: include/class/acc_bilan.class.php:655 include/class/acc_bilan.class.php:658
 #: include/class/acc_bilan.class.php:663 include/class/acc_bilan.class.php:665
-#: include/class/acc_bilan.class.php:665
+#: include/class/acc_bilan.class.php:670
 msgid "Ouverture fichier impossible"
 msgstr ""
 
@@ -16225,13 +16569,12 @@ msgstr ""
 #: include/class/anc_operation.class.php:294 include/fiche.inc.php:94
 #: include/class/acc_ledger_search.class.php:588
 #: include/class/anc_operation.class.php:295 include/fiche.inc.php:94
-#: include/class/acc_ledger_search.class.php:588
 #: include/class/anc_operation.class.php:295
+#: include/class/acc_ledger_search.class.php:674
 msgid "Chercher"
 msgstr ""
 
 #: include/impress_bilan.inc.php:65 include/impress_bilan.inc.php:72
-#: include/impress_bilan.inc.php:72
 msgid ""
 "Attention : si le bilan n'est pas équilibré.<br> Vérifiez <ul>\n"
 "       <li>L'affectation du résultat est fait</li>\n"
@@ -16244,7 +16587,7 @@ msgid ""
 msgstr ""
 
 #: include/impress_bilan.inc.php:82 include/impress_bilan.inc.php:89
-#: include/impress_bilan.inc.php:89
+#: include/impress_bilan.inc.php:93
 msgid "Etape 2 :Impression"
 msgstr ""
 
@@ -16292,7 +16635,7 @@ msgstr ""
 #: html/ajax_card.php:295 html/ajax_card.php:297 html/ajax_card.php:298
 #: include/ajax/ajax_card.php:278 include/ajax/ajax_card.php:279
 #: include/ajax/ajax_card.php:285 include/ajax/ajax_card.php:287
-#: include/ajax/ajax_card.php:288
+#: include/ajax/ajax_card.php:288 include/ajax/ajax_card.php:294
 msgid "Choisissez une catégorie svp"
 msgstr ""
 
@@ -16300,7 +16643,7 @@ msgstr ""
 #: html/ajax_card.php:475 include/ajax/ajax_card.php:455
 #: include/ajax/ajax_card.php:456 include/ajax/ajax_card.php:457
 #: include/ajax/ajax_card.php:490 include/ajax/ajax_card.php:494
-#: include/ajax/ajax_card.php:495
+#: include/ajax/ajax_card.php:495 include/ajax/ajax_card.php:571
 msgid " Banque"
 msgstr ""
 
@@ -16383,8 +16726,8 @@ msgstr ""
 #: include/class/acc_bilan.class.php:373 include/class/acc_bilan.class.php:394
 #: include/class/acc_bilan.class.php:299 include/class/acc_bilan.class.php:311
 #: include/class/acc_bilan.class.php:375 include/class/acc_bilan.class.php:396
-#: include/class/acc_bilan.class.php:299 include/class/acc_bilan.class.php:311
-#: include/class/acc_bilan.class.php:375 include/class/acc_bilan.class.php:396
+#: include/class/acc_bilan.class.php:300 include/class/acc_bilan.class.php:312
+#: include/class/acc_bilan.class.php:376 include/class/acc_bilan.class.php:397
 msgid "Echec ouverture fichier "
 msgstr ""
 
@@ -16407,6 +16750,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2179
 #: include/class/acc_ledger.class.php:2188
 #: include/class/acc_ledger.class.php:2204
+#: include/class/acc_ledger.class.php:2223
 msgid "Ajout journal"
 msgstr ""
 
@@ -16423,6 +16767,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2770
 #: include/class/acc_ledger.class.php:2779
 #: include/class/acc_ledger.class.php:2818
+#: include/class/acc_ledger.class.php:2842
 msgid "Dans le dépôt"
 msgstr ""
 
@@ -16443,7 +16788,7 @@ msgstr ""
 #: include/class_document.php:199 include/class_document.php:200
 #: include/class/class_document.php:200 include/class/class_document.php:201
 #: include/class/class_document.php:207 include/class/document.class.php:207
-#: include/class/document.class.php:207
+#: include/class/document.class.php:212
 msgid "Ne peut pas créer le répertoire "
 msgstr ""
 
@@ -16456,49 +16801,49 @@ msgstr ""
 #: include/class_extension.php:239 include/class_extension.php:254
 #: include/class/class_extension.php:254 include/class/class_extension.php:262
 #: include/class/extension.class.php:262 include/class/extension.class.php:290
-#: include/class/extension.class.php:290
+#: include/class/extension.class.php:296
 msgid "Manque plugin"
 msgstr ""
 
 #: include/class_extension.php:244 include/class_extension.php:259
 #: include/class/class_extension.php:259 include/class/class_extension.php:267
 #: include/class/extension.class.php:267 include/class/extension.class.php:296
-#: include/class/extension.class.php:296
+#: include/class/extension.class.php:302
 msgid "Manque nom"
 msgstr ""
 
 #: include/class_extension.php:245 include/class_extension.php:260
 #: include/class/class_extension.php:260 include/class/class_extension.php:268
 #: include/class/extension.class.php:268 include/class/extension.class.php:298
-#: include/class/extension.class.php:298
+#: include/class/extension.class.php:304
 msgid "Manque description"
 msgstr ""
 
 #: include/class_extension.php:246 include/class_extension.php:261
 #: include/class/class_extension.php:261 include/class/class_extension.php:269
 #: include/class/extension.class.php:269 include/class/extension.class.php:300
-#: include/class/extension.class.php:300
+#: include/class/extension.class.php:306
 msgid "Manque code"
 msgstr ""
 
 #: include/class_extension.php:247 include/class_extension.php:262
 #: include/class/class_extension.php:262 include/class/class_extension.php:270
 #: include/class/extension.class.php:270 include/class/extension.class.php:302
-#: include/class/extension.class.php:302
+#: include/class/extension.class.php:308
 msgid "Manque auteur"
 msgstr ""
 
 #: include/class_extension.php:248 include/class_extension.php:263
 #: include/class/class_extension.php:263 include/class/class_extension.php:271
 #: include/class/extension.class.php:271 include/class/extension.class.php:304
-#: include/class/extension.class.php:304
+#: include/class/extension.class.php:310
 msgid "Manque répertoire racine"
 msgstr ""
 
 #: include/class_extension.php:249 include/class_extension.php:264
 #: include/class/class_extension.php:264 include/class/class_extension.php:272
 #: include/class/extension.class.php:272 include/class/extension.class.php:306
-#: include/class/extension.class.php:306
+#: include/class/extension.class.php:312
 msgid "Manque fichier à inclure"
 msgstr ""
 
@@ -16570,7 +16915,7 @@ msgstr ""
 #: include/class/follow_up.class.php:1696
 #: include/class/follow_up.class.php:1694
 #: include/class/follow_up.class.php:1695
-#: include/class/follow_up.class.php:1695
+#: include/class/follow_up.class.php:1643
 msgid "Type action invalide"
 msgstr ""
 
@@ -16581,7 +16926,7 @@ msgstr ""
 #: include/lib/class_html_input.php:946 include/lib/class_html_input.php:972
 #: include/lib/html_input.class.php:1025 include/lib/html_input.class.php:1083
 #: include/lib/html_input.class.php:1084 include/lib/html_input.class.php:1099
-#: include/lib/html_input.class.php:1100 include/lib/html_input.class.php:1100
+#: include/lib/html_input.class.php:1100 include/lib/html_input.class.php:1133
 #, php-format
 msgid "Voulez-vous effacer cette relation "
 msgstr ""
@@ -16593,14 +16938,15 @@ msgstr ""
 #: include/lib/class_html_input.php:958 include/lib/class_html_input.php:984
 #: include/lib/html_input.class.php:1037 include/lib/html_input.class.php:1095
 #: include/lib/html_input.class.php:1096 include/lib/html_input.class.php:1111
-#: include/lib/html_input.class.php:1112 include/lib/html_input.class.php:1112
+#: include/lib/html_input.class.php:1112 include/lib/html_input.class.php:1145
 msgid "Ajout autres"
 msgstr ""
 
 #: include/class_noalyss_sql.php:316 include/lib/class_noalyss_sql.php:316
 #: include/lib/data_sql.class.php:286 include/lib/noalyss_sql.class.php:391
-#: include/lib/data_sql.class.php:248 include/lib/noalyss_sql.class.php:391
 #: include/lib/data_sql.class.php:248 include/lib/database_core.class.php:168
+#: include/lib/database_core.class.php:170
+#: include/lib/noalyss_sql.class.php:379 include/lib/data_sql.class.php:278
 msgid "Erreur : exec_sql attend un array"
 msgstr ""
 
@@ -16615,8 +16961,6 @@ msgstr ""
 #: include/class/pre_operation.class.php:326
 #: include/class/pre_operation.class.php:316
 #: include/class/pre_operation.class.php:327
-#: include/class/pre_operation.class.php:316
-#: include/class/pre_operation.class.php:327
 msgid ":"
 msgstr ""
 
@@ -16624,8 +16968,9 @@ msgstr ""
 #: include/compta_ven.inc.php:76 include/operation_ods_confirm.inc.php:31
 #: include/compta_ach.inc.php:68 include/compta_ach.inc.php:70
 #: include/compta_ven.inc.php:78 include/compta_ven.inc.php:79
-#: include/compta_fin.inc.php:79 include/compta_ach.inc.php:70
-#: include/compta_ach.inc.php:71 include/operation_ods_confirm.inc.php:31
+#: include/compta_ach.inc.php:71 include/compta_ven.inc.php:79
+#: include/compta_ach.inc.php:70 include/compta_fin.inc.php:79
+#: include/operation_ods_confirm.inc.php:31
 msgid "Confirmation"
 msgstr ""
 
@@ -16642,14 +16987,14 @@ msgstr ""
 #: include/compta_ach.inc.php:82 include/compta_ach.inc.php:85
 #: include/compta_ven.inc.php:94 include/compta_ach.inc.php:87
 #: include/compta_ach.inc.php:89 include/compta_ven.inc.php:96
-#: include/compta_ven.inc.php:94 include/compta_ach.inc.php:87
+#: include/compta_ven.inc.php:94 include/compta_ach.inc.php:86
 msgid "Générer une facture ou charger un document"
 msgstr ""
 
 #: include/compta_ach.inc.php:83 include/compta_ach.inc.php:86
 #: include/compta_ven.inc.php:95 include/compta_ach.inc.php:88
 #: include/compta_ach.inc.php:90 include/compta_ven.inc.php:97
-#: include/compta_ven.inc.php:95 include/compta_ach.inc.php:88
+#: include/compta_ven.inc.php:95 include/compta_ach.inc.php:87
 msgid "Choix du dépôt"
 msgstr ""
 
@@ -16657,18 +17002,19 @@ msgstr ""
 #: include/compta_ven.inc.php:96 include/operation_ods_confirm.inc.php:51
 #: include/compta_ach.inc.php:89 include/compta_ach.inc.php:91
 #: include/compta_ven.inc.php:98 include/compta_ven.inc.php:96
-#: include/compta_ach.inc.php:89 include/operation_ods_confirm.inc.php:51
+#: include/compta_ach.inc.php:88 include/operation_ods_confirm.inc.php:51
 msgid "Modèle à sauver"
 msgstr ""
 
 #: include/fiche.inc.php:278 include/fiche.inc.php:279
+#: include/fiche.inc.php:293
 msgid "Date invalide !"
 msgstr ""
 
 #: include/fiche.inc.php:290 include/fiche.inc.php:363
 #: include/fiche.inc.php:366 include/fiche.inc.php:367
 #: include/fiche.inc.php:368 include/fiche.inc.php:375
-#: include/fiche.inc.php:375
+#: include/fiche.inc.php:385
 msgid "Cette catégorie n'ayant pas de poste comptable n'a pas de balance"
 msgstr ""
 
@@ -16758,42 +17104,45 @@ msgid "Vérification des journaux"
 msgstr ""
 
 #: include/verif_bilan.inc.php:78 include/verif_bilan.inc.php:105
-#: include/verif_bilan.inc.php:105
+#: include/verif_bilan.inc.php:103
 msgid "Grand livre"
 msgstr ""
 
 #: include/verif_bilan.inc.php:84 include/verif_bilan.inc.php:111
-#: include/verif_bilan.inc.php:111
+#: include/verif_bilan.inc.php:109
 msgid "Vérification des comptes"
 msgstr ""
 
 #: include/verif_bilan.inc.php:96 include/verif_bilan.inc.php:123
-#: include/verif_bilan.inc.php:123
+#: include/verif_bilan.inc.php:121
 msgid "Vérification des fiches"
 msgstr ""
 
 #: include/verif_bilan.inc.php:99 include/verif_bilan.inc.php:126
-#: include/verif_bilan.inc.php:126
+#: include/verif_bilan.inc.php:124
 msgid "Fiches ayant changé de poste comptable"
 msgstr ""
 
 #: include/verif_bilan.inc.php:117 include/verif_bilan.inc.php:153
-#: include/verif_bilan.inc.php:153
+#: include/verif_bilan.inc.php:151
 msgid "Attention "
 msgstr ""
 
 #: include/verif_bilan.inc.php:127 include/verif_bilan.inc.php:165
 #: include/verif_bilan.inc.php:168 include/verif_bilan.inc.php:169
+#: include/verif_bilan.inc.php:167
 msgid "Hist."
 msgstr ""
 
 #: include/verif_bilan.inc.php:149 include/verif_bilan.inc.php:186
 #: include/verif_bilan.inc.php:189 include/verif_bilan.inc.php:191
+#: include/verif_bilan.inc.php:189
 msgid "Poste comptable utilisé sans la fiche correspondante"
 msgstr ""
 
 #: include/verif_bilan.inc.php:151 include/verif_bilan.inc.php:188
 #: include/verif_bilan.inc.php:191 include/verif_bilan.inc.php:193
+#: include/verif_bilan.inc.php:191
 msgid ""
 "Cela pourrait causer des différences entre les balances par fiches et celle "
 "par postes comptables, utilisez le plugin \n"
@@ -16802,35 +17151,37 @@ msgstr ""
 
 #: include/verif_bilan.inc.php:186 include/verif_bilan.inc.php:223
 #: include/verif_bilan.inc.php:226 include/verif_bilan.inc.php:228
+#: include/verif_bilan.inc.php:226
 msgid "Poste comptable "
 msgstr ""
 
 #: include/verif_bilan.inc.php:186 include/verif_bilan.inc.php:223
 #: include/verif_bilan.inc.php:226 include/verif_bilan.inc.php:228
+#: include/verif_bilan.inc.php:226
 msgid " pour la fiche "
 msgstr ""
 
 #: include/template/detail-action.php:64 include/template/detail-action.php:67
 #: include/template/detail-action.php:72 include/template/detail-action.php:71
-#: include/template/detail-action.php:71
+#: include/template/detail-action.php:72
 msgid "Autres concernés"
 msgstr ""
 
 #: include/template/ledger_detail_bottom.php:31
 #: include/template/ledger_detail_bottom.php:36
-#: include/template/ledger_detail_bottom.php:36
+#: include/template/ledger_detail_bottom.php:41
 msgid "Ecriture Comptable"
 msgstr ""
 
 #: include/template/ledger_detail_bottom.php:35
 #: include/template/ledger_detail_bottom.php:40
-#: include/template/ledger_detail_bottom.php:40
+#: include/template/ledger_detail_bottom.php:45
 msgid "Actions Gestion"
 msgstr ""
 
 #: include/template/ledger_detail_bottom.php:36
 #: include/template/ledger_detail_bottom.php:41
-#: include/template/ledger_detail_bottom.php:41
+#: include/template/ledger_detail_bottom.php:46
 msgid "Comptabilité Analytique"
 msgstr ""
 
@@ -16842,6 +17193,7 @@ msgstr ""
 #: include/template/ledger_detail_bottom.php:291
 #: include/template/ledger_detail_bottom.php:292
 #: include/template/ledger_detail_bottom.php:289
+#: include/template/ledger_detail_bottom.php:307
 msgid "Non utilisée"
 msgstr ""
 
@@ -16864,6 +17216,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2328
 #: include/class/acc_ledger.class.php:2337
 #: include/class/acc_ledger.class.php:2359
+#: include/class/acc_ledger.class.php:2385
 msgid "Choix du type de journal est obligatoire"
 msgstr ""
 
@@ -16888,6 +17241,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1845
 #: include/class/acc_ledger_sold.class.php:1425
 #: include/class/acc_ledger_purchase.class.php:1851
+#: include/class/acc_ledger_purchase.class.php:1888
+#: include/class/acc_ledger_sold.class.php:1410
 msgid "TVA Non Payé"
 msgstr ""
 
@@ -16903,6 +17258,7 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1853
 #: include/class/acc_ledger_purchase.class.php:1856
 #: include/class/acc_ledger_purchase.class.php:1862
+#: include/class/acc_ledger_purchase.class.php:1899
 msgid "TVA NP opération"
 msgstr ""
 
@@ -16911,7 +17267,7 @@ msgstr ""
 #: include/class/class_pdf_operation.php:76
 #: include/class/pdf_operation.class.php:76
 #: include/class/print_ledger_detail_item.class.php:58
-#: include/class/print_ledger_detail_item.class.php:58
+#: include/class/print_ledger_detail_item.class.php:57
 #: include/class/pdf_operation.class.php:76
 msgid "Numéro interne"
 msgstr ""
@@ -16919,21 +17275,21 @@ msgstr ""
 #: include/class_print_ledger_detail_item.php:61
 #: include/class/class_print_ledger_detail_item.php:61
 #: include/class/print_ledger_detail_item.class.php:61
-#: include/class/print_ledger_detail_item.class.php:61
+#: include/class/print_ledger_detail_item.class.php:60
 msgid "Tot HTVA"
 msgstr ""
 
 #: include/class_print_ledger_detail_item.php:62
 #: include/class/class_print_ledger_detail_item.php:62
 #: include/class/print_ledger_detail_item.class.php:62
-#: include/class/print_ledger_detail_item.class.php:62
+#: include/class/print_ledger_detail_item.class.php:61
 msgid "Tot TVA NP"
 msgstr ""
 
 #: include/class_print_ledger_detail_item.php:64
 #: include/class/class_print_ledger_detail_item.php:64
 #: include/class/print_ledger_detail_item.class.php:64
-#: include/class/print_ledger_detail_item.class.php:64
+#: include/class/print_ledger_detail_item.class.php:63
 msgid "Tot TVA"
 msgstr ""
 
@@ -16989,7 +17345,7 @@ msgid "totaux"
 msgstr ""
 
 #: include/impress_bilan.inc.php:87 include/impress_bilan.inc.php:94
-#: include/impress_bilan.inc.php:94
+#: include/impress_bilan.inc.php:98
 msgid "Pour une vérification complète, allez dans "
 msgstr ""
 
@@ -17018,11 +17374,12 @@ msgstr ""
 #: include/class/print_ledger_simple.class.php:116
 #: include/class/acc_ledger_history_purchase.class.php:260
 #: include/class/acc_ledger_history_purchase.class.php:264
-#: include/template/operation_detail_ven.php:45
-#: include/template/operation_detail_ach.php:53
-#: include/class/print_ledger_simple.class.php:116
 #: include/class/print_ledger_detail_item.class.php:162
-#: include/class/acc_ledger_history_purchase.class.php:264
+#: include/class/acc_ledger_history_purchase.class.php:275
+#: include/class/print_ledger_simple.class.php:113
+#: include/class/print_ledger_detail_item.class.php:162
+#: include/template/operation_detail_ach.php:53
+#: include/template/operation_detail_ven.php:45
 msgid "TVA NP"
 msgstr ""
 
@@ -17104,14 +17461,14 @@ msgstr ""
 #: include/database.item.php:2 include/database.item.php:142
 #: include/database.item.php:138 include/database.item.php:137
 #: include/database.item.php:130 include/database.item.php:128
-#: include/database.item.php:130
+#: include/database.item.php:129
 msgid "Export pièce PDF"
 msgstr ""
 
 #: include/database.item.php:4 include/database.item.php:144
 #: include/database.item.php:140 include/database.item.php:139
 #: include/database.item.php:132 include/database.item.php:130
-#: include/database.item.php:132
+#: include/database.item.php:131
 msgid "Configuration extension"
 msgstr ""
 
@@ -17127,6 +17484,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2789
 #: include/class/acc_ledger.class.php:2798
 #: include/class/acc_ledger.class.php:2837
+#: include/class/acc_ledger.class.php:2861
 msgid "Nouvelle opération"
 msgstr ""
 
@@ -17158,6 +17516,7 @@ msgstr ""
 
 #: include/ext/amortis/include/class_amortissement_material_pdf.php:33
 #: include/ext/amortis/include/amortissement_material_pdf.class.php:33
+#: include/template/card_multiple_result.php:17
 msgid "QCode"
 msgstr ""
 
@@ -17305,7 +17664,6 @@ msgstr ""
 
 #: include/ajax_save_predf_op.php:52 include/ajax/ajax_save_predf_op.php:52
 #: include/ajax/ajax_save_predf_op.php:54
-#: include/ajax/ajax_save_predf_op.php:54
 msgid "Type de journal invalide"
 msgstr ""
 
@@ -17330,7 +17688,7 @@ msgstr ""
 #: html/ajax_card.php:291 html/ajax_card.php:293 html/ajax_card.php:294
 #: include/ajax/ajax_card.php:274 include/ajax/ajax_card.php:275
 #: include/ajax/ajax_card.php:283 include/ajax/ajax_card.php:285
-#: include/ajax/ajax_card.php:286
+#: include/ajax/ajax_card.php:286 include/ajax/ajax_card.php:292
 msgid ""
 "Choisissez la catégorie de fiche à laquelle vous aimeriez ajouter une fiche"
 msgstr ""
@@ -17352,8 +17710,8 @@ msgstr ""
 #: include/balance.inc.php:47 include/impress_bilan.inc.php:51
 #: include/impress_jrn.inc.php:86 include/ext/bilan_interne/index.php:56
 #: include/balance.inc.php:51 include/impress_jrn.inc.php:104
-#: include/impress_jrn.inc.php:104 include/balance.inc.php:51
-#: include/impress_bilan.inc.php:51
+#: include/impress_bilan.inc.php:54 include/balance.inc.php:51
+#: include/impress_jrn.inc.php:104
 msgid "Choisissez un autre exercice"
 msgstr ""
 
@@ -17387,7 +17745,7 @@ msgstr ""
 #: html/ajax_ledger.php:186 html/ajax_ledger.php:187
 #: include/ajax/ajax_ledger.php:164 include/ajax/ajax_ledger.php:167
 #: include/ajax/ajax_ledger.php:168 include/ajax/ajax_ledger.php:172
-#: include/ajax/ajax_ledger.php:173
+#: include/ajax/ajax_ledger.php:173 include/ajax/ajax_ledger.php:173
 msgid "Effacement refusé"
 msgstr ""
 
@@ -17448,27 +17806,27 @@ msgid "Erreur : paramètre invalide"
 msgstr ""
 
 #: html/test_class.php:213 dev/test/test_class.php:209
-#: dev/test/test_class.php:209
+#: dev-2/test/test_class.php:209 dev/test/test_class.php:209
 msgid "Bienvenu sur mon site"
 msgstr ""
 
 #: html/test_class.php:214 dev/test/test_class.php:210
-#: dev/test/test_class.php:210
+#: dev-2/test/test_class.php:210 dev/test/test_class.php:210
 msgid "Essayer de vous y amuser"
 msgstr ""
 
 #: html/test_class.php:218 dev/test/test_class.php:214
-#: dev/test/test_class.php:214
+#: dev-2/test/test_class.php:214 dev/test/test_class.php:214
 msgid "Choississez votre langue"
 msgstr ""
 
 #: html/test_class.php:231 dev/test/test_class.php:227
-#: dev/test/test_class.php:227
+#: dev-2/test/test_class.php:227 dev/test/test_class.php:227
 msgid "Change de langue"
 msgstr ""
 
 #: html/test_class.php:239 dev/test/test_class.php:235
-#: dev/test/test_class.php:235
+#: dev-2/test/test_class.php:235 dev/test/test_class.php:235
 msgid "Fin de programme"
 msgstr ""
 
@@ -17478,7 +17836,7 @@ msgstr ""
 #: include/lib/ac_common.php:959 include/lib/ac_common.php:970
 #: include/lib/ac_common.php:971 include/lib/ac_common.php:972
 #: include/lib/ac_common.php:984 include/lib/ac_common.php:986
-#: include/lib/ac_common.php:1002 include/lib/ac_common.php:1002
+#: include/lib/ac_common.php:1002 include/lib/ac_common.php:1012
 msgid ""
 "Utilisateur n'a pas de profil, votre administrateur doit en configurer un "
 "dans CFGSEC"
@@ -17499,10 +17857,10 @@ msgstr ""
 #: include/ajax/ajax_admin.php:196 include/class/dossier.class.php:116
 #: include/ajax/ajax_admin.php:69 include/ajax/ajax_admin.php:105
 #: include/ajax/ajax_admin.php:167 include/ajax/ajax_admin.php:195
-#: include/ajax/ajax_admin.php:201 include/ajax/ajax_admin.php:69
-#: include/ajax/ajax_admin.php:105 include/ajax/ajax_admin.php:167
-#: include/ajax/ajax_admin.php:195 include/ajax/ajax_admin.php:201
-#: include/class/dossier.class.php:116
+#: include/ajax/ajax_admin.php:201 include/class/dossier.class.php:116
+#: include/ajax/ajax_admin.php:69 include/ajax/ajax_admin.php:105
+#: include/ajax/ajax_admin.php:167 include/ajax/ajax_admin.php:195
+#: include/ajax/ajax_admin.php:201
 msgid "Erreur paramètre"
 msgstr ""
 
@@ -17581,8 +17939,8 @@ msgstr ""
 
 #: include/category_card.inc.php:73 include/fiche.inc.php:70
 #: include/category_card.inc.php:78 include/category_card.inc.php:80
-#: include/fiche.inc.php:71 include/category_card.inc.php:80
-#: include/fiche.inc.php:71
+#: include/fiche.inc.php:71 include/fiche.inc.php:71
+#: include/category_card.inc.php:80
 msgid "Balance âgée"
 msgstr ""
 
@@ -17631,8 +17989,8 @@ msgstr ""
 #: include/class/class_balance_age.php:148
 #: include/class/class_balance_age.php:154
 #: include/class/balance_age.class.php:154
-#: include/template/balance_aged_result.php:68
 #: include/class/balance_age.class.php:154
+#: include/template/balance_aged_result.php:68
 msgid "> 90 jours"
 msgstr ""
 
@@ -17640,7 +17998,7 @@ msgstr ""
 #: include/lib/class_html_input.php:726 include/lib/class_html_input.php:741
 #: include/lib/class_html_input.php:742 include/lib/class_html_input.php:768
 #: include/lib/html_input.class.php:811 include/lib/html_input.class.php:857
-#: include/lib/html_input.class.php:858 include/lib/html_input.class.php:858
+#: include/lib/html_input.class.php:858
 msgid "Paramètre invaide"
 msgstr ""
 
@@ -17649,8 +18007,9 @@ msgstr ""
 #: include/operation_ods_confirm.inc.php:53 include/compta_ach.inc.php:90
 #: include/compta_ach.inc.php:92 include/compta_ven.inc.php:99
 #: include/ajax/ajax_ledger.php:564 include/class/acc_operation.class.php:729
-#: include/compta_ven.inc.php:97 include/ajax/ajax_ledger.php:565
-#: include/class/acc_operation.class.php:729 include/compta_ach.inc.php:90
+#: include/ajax/ajax_ledger.php:565 include/compta_ven.inc.php:97
+#: include/class/acc_operation.class.php:729 include/ajax/ajax_ledger.php:565
+#: include/compta_ach.inc.php:89 include/template/ledger_detail_bottom.php:349
 #: include/operation_ods_confirm.inc.php:53
 msgid "Extourne"
 msgstr ""
@@ -17659,8 +18018,8 @@ msgstr ""
 #: include/operation_ods_confirm.inc.php:61
 #: include/operation_ods_confirm.inc.php:62 include/compta_ach.inc.php:104
 #: include/compta_ach.inc.php:106 include/compta_ven.inc.php:113
-#: include/compta_ven.inc.php:111 include/compta_ach.inc.php:104
-#: include/operation_ods_confirm.inc.php:62
+#: include/compta_ven.inc.php:111 include/compta_ven.inc.php:111
+#: include/compta_ach.inc.php:103 include/operation_ods_confirm.inc.php:62
 msgid "Extourne opération"
 msgstr ""
 
@@ -17668,7 +18027,8 @@ msgstr ""
 #: include/compta_ven.inc.php:200 include/compta_ods.inc.php:115
 #: include/compta_ven.inc.php:203 include/compta_ods.inc.php:116
 #: include/compta_ven.inc.php:208 include/compta_ods.inc.php:118
-#: include/compta_ven.inc.php:206 include/compta_ods.inc.php:118
+#: include/compta_ven.inc.php:206 include/compta_ven.inc.php:206
+#: include/compta_ods.inc.php:118
 msgid "Extourné au "
 msgstr ""
 
@@ -17678,7 +18038,8 @@ msgstr ""
 #: include/compta_ven.inc.php:209 include/compta_ach.inc.php:197
 #: include/compta_ods.inc.php:121 include/compta_ven.inc.php:214
 #: include/compta_ods.inc.php:123 include/compta_ven.inc.php:212
-#: include/compta_ods.inc.php:123 include/compta_ach.inc.php:195
+#: include/compta_ach.inc.php:195 include/compta_ven.inc.php:212
+#: include/compta_ods.inc.php:123 include/compta_ach.inc.php:194
 msgid "Opération non extournée"
 msgstr ""
 
@@ -17688,7 +18049,8 @@ msgstr ""
 #: include/compta_ven.inc.php:217 include/compta_ach.inc.php:205
 #: include/compta_ods.inc.php:130 include/compta_ven.inc.php:222
 #: include/compta_ods.inc.php:132 include/compta_ven.inc.php:220
-#: include/compta_ods.inc.php:132 include/compta_ach.inc.php:203
+#: include/compta_ach.inc.php:203 include/compta_ven.inc.php:220
+#: include/compta_ods.inc.php:132 include/compta_ach.inc.php:202
 msgid "Date invalide, opération non extournée"
 msgstr ""
 
@@ -17706,7 +18068,7 @@ msgstr ""
 #: include/modele.inc.php:245 include/modele.inc.php:259
 #: include/modele.inc.php:283 include/modele.inc.php:266
 #: include/modele.inc.php:267 include/modele.inc.php:272
-#: include/modele.inc.php:273
+#: include/modele.inc.php:273 include/modele.inc.php:273
 msgid "Aucun modèle disponible"
 msgstr ""
 
@@ -17716,15 +18078,16 @@ msgstr ""
 #: include/dossier.inc.php:239 include/modele.inc.php:280
 #: include/dossier.inc.php:242 include/dossier.inc.php:247
 #: include/modele.inc.php:281 include/modele.inc.php:286
-#: include/dossier.inc.php:247 include/modele.inc.php:287
+#: include/modele.inc.php:287 include/modele.inc.php:287
+#: include/dossier.inc.php:247
 msgid "Nom base de données"
 msgstr ""
 
 #: include/modele.inc.php:292 include/modele.inc.php:306
 #: include/modele.inc.php:345 include/modele.inc.php:328
 #: include/modele.inc.php:329 include/document_modele.inc.php:85
-#: include/modele.inc.php:334 include/document_modele.inc.php:85
-#: include/modele.inc.php:335
+#: include/modele.inc.php:334 include/modele.inc.php:335
+#: include/modele.inc.php:335 include/document_modele.inc.php:85
 msgid "Ajout d'un modèle"
 msgstr ""
 
@@ -17742,17 +18105,18 @@ msgstr ""
 #: include/user_detail.inc.php:152 include/user.inc.php:129
 #: include/class/acc_plan_mtable.class.php:49
 #: include/template/tag_detail.php:15
-#: include/class/acc_plan_mtable.class.php:55 include/user.inc.php:129
-#: include/template/tag_detail.php:15 include/user_detail.inc.php:152
+#: include/class/acc_plan_mtable.class.php:55 include/user_detail.inc.php:152
 #: include/class/acc_plan_mtable.class.php:55
+#: include/template/tag_detail.php:15 include/template/tag_list.php:20
+#: include/user.inc.php:129
 msgid "Actif"
 msgstr ""
 
 #: include/user_detail.inc.php:169 include/user_detail.inc.php:165
 #: include/user_detail.inc.php:174 include/param_sec.inc.php:147
 #: include/export/export_security_pdf.php:66 include/param_sec.inc.php:153
-#: include/param_sec.inc.php:153 include/user_detail.inc.php:174
-#: include/export/export_security_pdf.php:66
+#: include/user_detail.inc.php:174 include/export/export_security_pdf.php:66
+#: include/param_sec.inc.php:158
 msgid "Utilisateur normal"
 msgstr ""
 
@@ -17771,7 +18135,7 @@ msgstr ""
 #: html/install.php:593 html/install.php:208 html/install.php:555
 #: include/user.inc.php:83 html/install.php:215 html/install.php:545
 #: html/install.php:551 html/install.php:218 html/install.php:554
-#: html/install.php:218 html/install.php:554 include/user.inc.php:83
+#: html/install.php:265 html/install.php:604 include/user.inc.php:83
 msgid "Mot de passe"
 msgstr ""
 
@@ -17827,6 +18191,7 @@ msgstr ""
 #: include/template/ledger_detail_bottom.php:350
 #: include/template/ledger_detail_bottom.php:351
 #: include/template/ledger_detail_bottom.php:348
+#: include/template/ledger_detail_bottom.php:376
 msgid ""
 "Extourner une opération vous permet de l'annuler par son écriture inverse"
 msgstr ""
@@ -17845,8 +18210,8 @@ msgstr ""
 
 #: include/template/todo_list_list_user.php:37 include/user.inc.php:122
 #: include/user.inc.php:123 include/param_sec.inc.php:57
-#: include/user.inc.php:125 include/param_sec.inc.php:57
 #: include/user.inc.php:125 include/template/todo_list_list_user.php:37
+#: include/user.inc.php:125 include/param_sec.inc.php:57
 msgid "Login"
 msgstr ""
 
@@ -18012,9 +18377,10 @@ msgstr ""
 #: include/ajax/ajax_display_letter.php:98
 #: include/ajax/ajax_display_letter.php:103 include/class/periode.class.php:517
 #: include/class/periode_ledger_table.class.php:98
-#: include/class/periode.class.php:519 include/ajax/ajax_display_letter.php:103
+#: include/class/periode.class.php:519 include/class/periode.class.php:521
+#: include/class/periode.class.php:522
 #: include/class/periode_ledger_table.class.php:98
-#: include/class/periode.class.php:521
+#: include/ajax/ajax_display_letter.php:119
 msgid "Date Début"
 msgstr ""
 
@@ -18060,7 +18426,7 @@ msgstr ""
 #: include/class/class_fiche.php:1231 include/class/class_fiche.php:1234
 #: include/class/fiche.class.php:1378 include/class/fiche.class.php:1379
 #: include/class/fiche.class.php:1381 include/class/fiche.class.php:1395
-#: include/class/fiche.class.php:1396 include/class/fiche.class.php:1396
+#: include/class/fiche.class.php:1396 include/class/fiche.class.php:1423
 msgid "n° de pièce / Code interne"
 msgstr ""
 
@@ -18069,7 +18435,7 @@ msgstr ""
 #: include/class/class_fiche.php:1235 include/class/class_fiche.php:1238
 #: include/class/fiche.class.php:1382 include/class/fiche.class.php:1383
 #: include/class/fiche.class.php:1385 include/class/fiche.class.php:1399
-#: include/class/fiche.class.php:1400 include/class/fiche.class.php:1400
+#: include/class/fiche.class.php:1400 include/class/fiche.class.php:1427
 msgid "Débit/Crédit"
 msgstr ""
 
@@ -18084,8 +18450,9 @@ msgstr ""
 #: include/fiche.inc.php:590 include/class/fiche.class.php:1421
 #: include/class/fiche.class.php:1552 include/fiche.inc.php:599
 #: include/class/fiche.class.php:1422 include/class/fiche.class.php:1553
-#: include/fiche.inc.php:599 include/class/acc_account_ledger.class.php:475
-#: include/class/fiche.class.php:1422 include/class/fiche.class.php:1553
+#: include/fiche.inc.php:612 include/class/fiche.class.php:1449
+#: include/class/fiche.class.php:1579
+#: include/class/acc_account_ledger.class.php:467
 msgid "solde débiteur"
 msgstr ""
 
@@ -18099,8 +18466,8 @@ msgstr ""
 #: include/class/fiche.class.php:1407 include/class/fiche.class.php:1536
 #: include/class/fiche.class.php:1421 include/class/fiche.class.php:1552
 #: include/class/fiche.class.php:1422 include/class/fiche.class.php:1553
-#: include/class/acc_account_ledger.class.php:475
-#: include/class/fiche.class.php:1422 include/class/fiche.class.php:1553
+#: include/class/fiche.class.php:1449 include/class/fiche.class.php:1579
+#: include/class/acc_account_ledger.class.php:467
 msgid "solde créditeur"
 msgstr ""
 
@@ -18172,13 +18539,14 @@ msgstr ""
 #: include/modele.inc.php:240 include/modele.inc.php:254
 #: include/modele.inc.php:278 include/modele.inc.php:261
 #: include/modele.inc.php:262 include/modele.inc.php:263
+#: include/modele.inc.php:263
 msgid "Ajouter un modèle"
 msgstr ""
 
 #: include/modele.inc.php:284 include/modele.inc.php:298
 #: include/modele.inc.php:337 include/modele.inc.php:320
 #: include/modele.inc.php:321 include/modele.inc.php:265
-#: include/modele.inc.php:266
+#: include/modele.inc.php:266 include/modele.inc.php:266
 msgid ""
 "Si vous voulez r&eacute;cup&eacute;rer toutes les adaptations d'un dossier  "
 "dans un autre dossier, vous pouvez en faire un modèle. Seules les fiches, la "
@@ -18190,14 +18558,14 @@ msgstr ""
 #: include/modele.inc.php:324 include/modele.inc.php:338
 #: include/modele.inc.php:377 include/modele.inc.php:360
 #: include/modele.inc.php:361 include/modele.inc.php:366
-#: include/modele.inc.php:367
+#: include/modele.inc.php:367 include/modele.inc.php:367
 msgid "Bas&eacute; sur"
 msgstr ""
 
 #: include/modele.inc.php:328 include/modele.inc.php:342
 #: include/modele.inc.php:384 include/modele.inc.php:367
 #: include/modele.inc.php:368 include/modele.inc.php:373
-#: include/modele.inc.php:374
+#: include/modele.inc.php:374 include/modele.inc.php:374
 msgid ""
 "Nettoyage des Documents et courriers (ce qui  n'effacera pas les modèles de "
 "documents)"
@@ -18206,7 +18574,7 @@ msgstr ""
 #: include/modele.inc.php:331 include/modele.inc.php:345
 #: include/modele.inc.php:388 include/modele.inc.php:371
 #: include/modele.inc.php:372 include/modele.inc.php:377
-#: include/modele.inc.php:378
+#: include/modele.inc.php:378 include/modele.inc.php:378
 msgid ""
 "Nettoyage de toutes les fiches (ce qui effacera client,\n"
 "\top&eacute;rations pr&eacute;d&eacute;finies fournisseurs modèles de "
@@ -18216,7 +18584,7 @@ msgstr ""
 #: include/modele.inc.php:337 include/modele.inc.php:351
 #: include/modele.inc.php:393 include/modele.inc.php:376
 #: include/modele.inc.php:377 include/modele.inc.php:382
-#: include/modele.inc.php:383
+#: include/modele.inc.php:383 include/modele.inc.php:383
 msgid ""
 "Nettoyage de la comptabilit&eacute; analytique : effacement des plans et des "
 "postes, les op&eacute;rations\n"
@@ -18226,21 +18594,21 @@ msgstr ""
 #: include/modele.inc.php:342 include/modele.inc.php:356
 #: include/modele.inc.php:398 include/modele.inc.php:381
 #: include/modele.inc.php:382 include/modele.inc.php:387
-#: include/modele.inc.php:388
+#: include/modele.inc.php:388 include/modele.inc.php:388
 msgid "Effacement de toutes les donn&eacute;es des plugins"
 msgstr ""
 
 #: include/modele.inc.php:346 include/modele.inc.php:360
 #: include/modele.inc.php:401 include/modele.inc.php:384
 #: include/modele.inc.php:385 include/modele.inc.php:390
-#: include/modele.inc.php:391
+#: include/modele.inc.php:391 include/modele.inc.php:391
 msgid "Ajout d'un modele"
 msgstr ""
 
 #: include/modele.inc.php:378 include/modele.inc.php:392
 #: include/modele.inc.php:441 include/modele.inc.php:424
 #: include/modele.inc.php:428 include/modele.inc.php:433
-#: include/modele.inc.php:434
+#: include/modele.inc.php:434 include/modele.inc.php:434
 #, php-format
 msgid "Base de donnée %s mod %s est accèdée, déconnectez-vous d'abord"
 msgstr ""
@@ -18248,7 +18616,7 @@ msgstr ""
 #: include/modele.inc.php:386 include/modele.inc.php:400
 #: include/modele.inc.php:450 include/modele.inc.php:433
 #: include/modele.inc.php:437 include/modele.inc.php:442
-#: include/modele.inc.php:443
+#: include/modele.inc.php:443 include/modele.inc.php:443
 #, php-format
 msgid "Le modèle %s est effacé"
 msgstr ""
@@ -18301,12 +18669,12 @@ msgstr ""
 #: html/ajax_card.php:478 html/ajax_card.php:479 include/ajax/ajax_card.php:459
 #: include/ajax/ajax_card.php:460 include/ajax/ajax_card.php:461
 #: include/ajax/ajax_card.php:494 include/ajax/ajax_card.php:498
-#: include/ajax/ajax_card.php:499
+#: include/ajax/ajax_card.php:499 include/ajax/ajax_card.php:575
 msgid " Employé ou administrateur"
 msgstr ""
 
 #: include/param_sec.inc.php:91 include/param_sec.inc.php:95
-#: include/param_sec.inc.php:97 include/param_sec.inc.php:97
+#: include/param_sec.inc.php:97 include/param_sec.inc.php:98
 msgid "Utilisateur Normal"
 msgstr ""
 
@@ -18358,24 +18726,25 @@ msgstr ""
 #: html/ajax_misc.php:196 html/ajax_misc.php:274 html/ajax_misc.php:279
 #: html/ajax_misc.php:307 html/ajax_misc.php:399 html/ajax_misc.php:401
 #: html/ajax_misc.php:407 html/ajax_misc.php:409 html/ajax_misc.php:413
+#: include/class/action_document_type_mtable.class.php:149
 msgid "Des actions dépendent de cette catégorie"
 msgstr ""
 
 #: html/do.php:196 html/do.php:224 html/do.php:237 html/do.php:239
 #: html/do.php:236 html/do.php:273 html/do.php:285 html/do.php:295
-#: html/do.php:264 html/do.php:264
+#: html/do.php:264 html/do.php:266
 msgid "Erreur menu"
 msgstr ""
 
 #: html/do.php:210 html/do.php:211 html/do.php:239 html/do.php:252
 #: html/do.php:254 html/do.php:251 html/do.php:288 html/do.php:300
-#: html/do.php:310 html/do.php:279 html/do.php:279
+#: html/do.php:310 html/do.php:279 html/do.php:281
 msgid "Accès menu impossible"
 msgstr ""
 
 #: html/do.php:219 html/do.php:224 html/do.php:252 html/do.php:265
 #: html/do.php:268 html/do.php:270 html/do.php:307 html/do.php:319
-#: html/do.php:329 html/do.php:331 html/do.php:300 html/do.php:300
+#: html/do.php:329 html/do.php:331 html/do.php:300 html/do.php:302
 msgid "Aucun profil utilisateur"
 msgstr ""
 
@@ -18384,7 +18753,7 @@ msgstr ""
 #: include/lib/ac_common.php:806 include/lib/ac_common.php:813
 #: include/lib/ac_common.php:824 include/lib/ac_common.php:825
 #: include/lib/ac_common.php:837 include/lib/ac_common.php:839
-#: include/lib/ac_common.php:855 include/lib/ac_common.php:855
+#: include/lib/ac_common.php:855 include/lib/ac_common.php:865
 msgid ""
 "Veuillez vous reconnecter soit dans une autre fenêtre soit  en cliquant sur "
 "le lien"
@@ -18395,7 +18764,7 @@ msgstr ""
 #: include/lib/ac_common.php:810 include/lib/ac_common.php:817
 #: include/lib/ac_common.php:828 include/lib/ac_common.php:829
 #: include/lib/ac_common.php:841 include/lib/ac_common.php:843
-#: include/lib/ac_common.php:859 include/lib/ac_common.php:859
+#: include/lib/ac_common.php:859 include/lib/ac_common.php:869
 msgid "Se reconnecter pour revenir ici"
 msgstr ""
 
@@ -18404,19 +18773,19 @@ msgstr ""
 #: include/lib/ac_common.php:816 include/lib/ac_common.php:823
 #: include/lib/ac_common.php:834 include/lib/ac_common.php:835
 #: include/lib/ac_common.php:847 include/lib/ac_common.php:849
-#: include/lib/ac_common.php:865 include/lib/ac_common.php:865
+#: include/lib/ac_common.php:865 include/lib/ac_common.php:875
 msgid "Cliquez ici pour vous reconnecter dans une autre page"
 msgstr ""
 
 #: include/action.common.inc.php:207 include/action.common.inc.php:212
 #: include/action.common.inc.php:214 include/action.common.inc.php:215
-#: include/action.common.inc.php:221 include/action.common.inc.php:221
+#: include/action.common.inc.php:221
 msgid "Ajoute un événement à celui-ci"
 msgstr ""
 
 #: include/action.common.inc.php:208 include/action.common.inc.php:213
 #: include/action.common.inc.php:215 include/action.common.inc.php:216
-#: include/action.common.inc.php:222 include/action.common.inc.php:222
+#: include/action.common.inc.php:222 include/action.common.inc.php:243
 msgid "Efface cet événement "
 msgstr ""
 
@@ -18425,7 +18794,6 @@ msgstr ""
 #: include/action.common.inc.php:280 include/action.common.inc.php:284
 #: include/action.common.inc.php:281 include/action.common.inc.php:285
 #: include/action.common.inc.php:287 include/action.common.inc.php:291
-#: include/action.common.inc.php:287 include/action.common.inc.php:291
 msgid "Evènement Sauvée"
 msgstr ""
 
@@ -18440,8 +18808,8 @@ msgstr ""
 #: include/lib/http_input.class.php:65 include/lib/http_input.class.php:73
 #: include/ajax/ajax_gestion.php:81 include/lib/http_input.class.php:62
 #: include/lib/http_input.class.php:72 include/lib/http_input.class.php:80
-#: include/ajax/ajax_gestion.php:81 include/lib/http_input.class.php:62
-#: include/lib/http_input.class.php:72 include/lib/http_input.class.php:80
+#: include/ajax/ajax_gestion.php:81 include/lib/http_input.class.php:92
+#: include/lib/http_input.class.php:106 include/lib/http_input.class.php:118
 msgid "Type invalide"
 msgstr ""
 
@@ -18471,15 +18839,15 @@ msgid "Vous pouvez aussi copier ce profil et puis le corriger"
 msgstr ""
 
 #: include/ajax_get_profile.php:123 include/ajax/ajax_get_profile.php:123
-#: include/ajax/ajax_get_profile.php:129 include/ajax/ajax_get_profile.php:129
+#: include/ajax/ajax_get_profile.php:129 include/ajax/ajax_get_profile.php:128
 msgid "Dépôt de stock accessible"
 msgstr ""
 
 #: include/ajax_mod_periode.php:60 include/ajax_mod_periode.php:78
 #: include/ajax/ajax_mod_periode.php:60 include/ajax/ajax_mod_periode.php:78
 #: include/ajax/ajax_periode.php:176 include/class/periode.class.php:707
-#: include/class/periode.class.php:709 include/ajax/ajax_periode.php:176
-#: include/class/periode.class.php:711
+#: include/class/periode.class.php:709 include/class/periode.class.php:711
+#: include/class/periode.class.php:712 include/ajax/ajax_periode.php:176
 msgid "fermer"
 msgstr ""
 
@@ -18491,6 +18859,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2110
 #: include/class/acc_ledger.class.php:2119
 #: include/class/acc_ledger.class.php:2135
+#: include/class/acc_ledger.class.php:2154
 msgid "Journaux d'achat"
 msgstr ""
 
@@ -18502,6 +18871,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2111
 #: include/class/acc_ledger.class.php:2120
 #: include/class/acc_ledger.class.php:2136
+#: include/class/acc_ledger.class.php:2155
 msgid "Journaux Financier"
 msgstr ""
 
@@ -18513,6 +18883,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2112
 #: include/class/acc_ledger.class.php:2121
 #: include/class/acc_ledger.class.php:2137
+#: include/class/acc_ledger.class.php:2156
 msgid "Journaux d'Opérations diverses"
 msgstr ""
 
@@ -18526,7 +18897,7 @@ msgstr ""
 #: include/class_follow_up.php:129 include/class/class_follow_up.php:128
 #: include/class/class_follow_up.php:129 include/class/follow_up.class.php:128
 #: include/class/follow_up.class.php:129 include/class/follow_up.class.php:130
-#: include/class/follow_up.class.php:129 include/class/follow_up.class.php:130
+#: include/class/follow_up.class.php:135 include/class/follow_up.class.php:136
 msgid "Securité"
 msgstr ""
 
@@ -18538,7 +18909,7 @@ msgstr ""
 #: include/class/follow_up.class.php:1782
 #: include/class/follow_up.class.php:1780
 #: include/class/follow_up.class.php:1781
-#: include/class/follow_up.class.php:1781
+#: include/class/follow_up.class.php:1731
 msgid "SECURITE : Ajout impossible"
 msgstr ""
 
@@ -18553,7 +18924,7 @@ msgstr ""
 #: include/lib/html_input.class.php:1103 include/lib/html_input.class.php:1104
 #: include/lib/html_input.class.php:1119 include/lib/html_input.class.php:1120
 #: include/template/action_display_short.php:81
-#: include/lib/html_input.class.php:1120
+#: include/lib/html_input.class.php:1153
 msgid "Nouvel événement"
 msgstr ""
 
@@ -18562,22 +18933,22 @@ msgstr ""
 #: include/class/print_ledger.class.php:71
 #: include/class/print_ledger.class.php:109
 #: include/class/print_ledger.class.php:115
-#: include/class/print_ledger.class.php:71
-#: include/class/print_ledger.class.php:115
+#: include/class/print_ledger.class.php:150
+#: include/class/print_ledger.class.php:194
 msgid "Ce journal ne peut être imprimé en mode simple"
 msgstr ""
 
 #: include/class_user.php:973 include/class_user.php:974
 #: include/class/class_user.php:974 include/class/class_user.php:962
 #: include/class/class_user.php:961 include/class/user.class.php:961
-#: include/class/user.class.php:985 include/class/user.class.php:985
+#: include/class/user.class.php:985 include/class/user.class.php:988
 msgid "Id"
 msgstr ""
 
 #: include/class_user.php:985 include/class_user.php:986
 #: include/class/class_user.php:986 include/class/class_user.php:974
 #: include/class/class_user.php:973 include/class/user.class.php:973
-#: include/class/user.class.php:997 include/class/user.class.php:997
+#: include/class/user.class.php:997 include/class/user.class.php:1000
 msgid "Aucun dossier disponible"
 msgstr ""
 
@@ -18621,9 +18992,9 @@ msgstr ""
 #: include/template/action_display_short.php:57
 #: include/class/class_follow_up.php:261 include/class/follow_up.class.php:261
 #: include/template/action_display_short.php:58
-#: include/class/follow_up.class.php:262
+#: include/class/follow_up.class.php:262 include/class/document.class.php:1413
+#: include/class/follow_up.class.php:269 include/class/follow_up.class.php:725
 #: include/template/action_display_short.php:58
-#: include/class/follow_up.class.php:262
 msgid "Haute"
 msgstr ""
 
@@ -18632,9 +19003,8 @@ msgstr ""
 #: include/template/action_display_short.php:58
 #: include/class/class_follow_up.php:262 include/class/follow_up.class.php:262
 #: include/template/action_display_short.php:59
-#: include/class/follow_up.class.php:263
+#: include/class/follow_up.class.php:263 include/class/follow_up.class.php:728
 #: include/template/action_display_short.php:59
-#: include/class/follow_up.class.php:263
 msgid "Moyenne"
 msgstr ""
 
@@ -18643,9 +19013,9 @@ msgstr ""
 #: include/template/action_display_short.php:59
 #: include/class/class_follow_up.php:263 include/class/follow_up.class.php:263
 #: include/template/action_display_short.php:60
-#: include/class/follow_up.class.php:264
+#: include/class/follow_up.class.php:264 include/class/document.class.php:1413
+#: include/class/follow_up.class.php:271
 #: include/template/action_display_short.php:60
-#: include/class/follow_up.class.php:264
 msgid "Basse"
 msgstr ""
 
@@ -18656,8 +19026,8 @@ msgstr ""
 
 #: include/template/detail-action.php:139
 #: include/template/detail-action.php:144
-#: include/template/detail-action.php:143
-#: include/template/detail-action.php:143
+#: include/template/detail-action.php:143 include/ajax/ajax_get_profile.php:58
+#: include/template/detail-action.php:150
 msgid "Groupe Gestion"
 msgstr ""
 
@@ -18666,6 +19036,7 @@ msgstr ""
 #: include/template/ledger_detail_bottom.php:178
 #: include/template/ledger_detail_bottom.php:195
 #: include/template/ledger_detail_bottom.php:192
+#: include/template/ledger_detail_bottom.php:211
 msgid "vous confirmez?"
 msgstr ""
 
@@ -18679,8 +19050,8 @@ msgstr ""
 #: include/template/profile_menu_display_module.php:77
 #: include/template/profile_menu_display_submenu.php:62
 #: include/template/profile_menu_display_module.php:78
-#: include/template/profile_menu_display_module.php:78
 #: include/template/profile_menu_display_submenu.php:62
+#: include/template/profile_menu_display_module.php:78
 msgid "ordre apparition"
 msgstr ""
 
@@ -18689,8 +19060,8 @@ msgstr ""
 #: include/template/profile_menu_display_module.php:79
 #: include/template/profile_menu_display_submenu.php:64
 #: include/template/profile_menu_display_module.php:80
-#: include/template/profile_menu_display_module.php:80
 #: include/template/profile_menu_display_submenu.php:64
+#: include/template/profile_menu_display_module.php:80
 msgid "Default"
 msgstr ""
 
@@ -18704,8 +19075,8 @@ msgstr ""
 
 #: include/cfgfiche.inc.php:143 include/profile.inc.php:355
 #: include/cfgfiche.inc.php:158 include/profile.inc.php:336
-#: include/cfgfiche.inc.php:159 include/profile.inc.php:336
-#: include/cfgfiche.inc.php:159
+#: include/cfgfiche.inc.php:159 include/cfgfiche.inc.php:159
+#: include/class/card_attribut_mtable.class.php:169 include/profile.inc.php:336
 msgid "Doublon"
 msgstr ""
 
@@ -18752,8 +19123,8 @@ msgstr ""
 #: include/ext/importbank/include/class_import_bank.php:136
 #: include/user.inc.php:176 include/user.inc.php:178
 #: include/ext/importbank/include/import_bank.class.php:136
-#: include/template/tag_search_select.php:14 include/user.inc.php:178
 #: include/template/tag_search_select.php:14
+#: include/template/tag_search_select.php:17 include/user.inc.php:178
 msgid "Tous"
 msgstr ""
 
@@ -18837,7 +19208,7 @@ msgstr ""
 #: include/class_pre_operation.php:56 include/class/class_pre_operation.php:56
 #: include/class/pre_operation.class.php:56
 #: include/class/pre_operation.class.php:57
-#: include/class/pre_operation.class.php:57
+#: include/class/pre_operation.class.php:67
 msgid "Donnez un nom pour sauver cette opération comme modèle"
 msgstr ""
 
@@ -18868,7 +19239,7 @@ msgstr ""
 #: include/lib/class_database.php:429 include/lib/class_database.php:434
 #: include/lib/database.class.php:433 include/lib/database.class.php:442
 #: include/lib/database.class.php:443 include/class/database.class.php:125
-#: include/class/database.class.php:125
+#: include/class/database.class.php:128
 msgid "Base de donnée vide"
 msgstr ""
 
@@ -18894,14 +19265,14 @@ msgstr ""
 #: html/recherche.php:125 include/history_operation.inc.php:147
 #: html/recherche.php:126 html/recherche.php:129
 #: include/history_operation.inc.php:167 include/history_operation.inc.php:178
-#: html/recherche.php:129 include/history_operation.inc.php:178
+#: html/recherche.php:141 include/history_operation.inc.php:192
 msgid "Export vers CSV"
 msgstr ""
 
 #: include/class_fiche.php:557 include/class/class_fiche.php:557
 #: include/class/class_fiche.php:558 include/class/fiche.class.php:564
 #: include/class/fiche.class.php:566 include/class/fiche.class.php:565
-#: include/class/fiche.class.php:565
+#: include/class/fiche.class.php:578
 msgid "id fiche"
 msgstr ""
 
@@ -18909,21 +19280,21 @@ msgstr ""
 #: include/class/class_fiche.php:1024 include/class/class_fiche.php:1027
 #: include/class/fiche.class.php:1117 include/class/fiche.class.php:1119
 #: include/class/fiche.class.php:1133 include/class/fiche.class.php:1134
-#: include/class/fiche.class.php:1134
+#: include/class/fiche.class.php:1161
 msgid "Impossible cette fiche est utilisée dans un journal"
 msgstr ""
 
 #: include/database.item.php:141 include/database.item.php:140
 #: include/database.item.php:132 include/database.item.php:133
 #: include/database.item.php:136 include/database.item.php:131
-#: include/database.item.php:133
+#: include/database.item.php:132
 msgid "Favori &#9733 "
 msgstr ""
 
 #: include/database.item.php:142 include/database.item.php:141
 #: include/database.item.php:103 include/database.item.php:104
 #: include/database.item.php:107 include/database.item.php:101
-#: include/database.item.php:99 include/database.item.php:104
+#: include/database.item.php:99 include/database.item.php:103
 msgid "Sortie &#9094"
 msgstr ""
 
@@ -18931,14 +19302,14 @@ msgstr ""
 #: include/database.item.php:142 include/database.item.php:5
 #: include/database.item.php:6 include/database.item.php:134
 #: include/database.item.php:135 include/database.item.php:132
-#: include/database.item.php:133 include/database.item.php:134
-#: include/database.item.php:135
+#: include/database.item.php:133 include/database.item.php:133
+#: include/database.item.php:134
 msgid "Balance agée"
 msgstr ""
 
 #: include/database.item.php:144 include/database.item.php:143
 #: include/database.item.php:6 include/database.item.php:135
-#: include/database.item.php:133 include/database.item.php:135
+#: include/database.item.php:133 include/database.item.php:134
 msgid "Export Balance agée"
 msgstr ""
 
@@ -18973,30 +19344,35 @@ msgstr ""
 #: include/database.item.php:216 include/database.item.php:193
 #: include/database.item.php:194 include/database.item.php:197
 #: include/database.item.php:208 include/database.item.php:213
+#: include/database.item.php:203
 msgid "Enlever une pièce justificative"
 msgstr ""
 
 #: include/database.item.php:217 include/database.item.php:194
 #: include/database.item.php:195 include/database.item.php:198
 #: include/database.item.php:209 include/database.item.php:214
+#: include/database.item.php:204
 msgid "Effacer une opération "
 msgstr ""
 
 #: include/database.item.php:218 include/database.item.php:195
 #: include/database.item.php:196 include/database.item.php:199
 #: include/database.item.php:210 include/database.item.php:215
+#: include/database.item.php:205
 msgid "Partager une note"
 msgstr ""
 
 #: include/database.item.php:219 include/database.item.php:196
 #: include/database.item.php:197 include/database.item.php:200
 #: include/database.item.php:211 include/database.item.php:216
+#: include/database.item.php:206
 msgid "Créer une note publique"
 msgstr ""
 
 #: include/database.item.php:220 include/database.item.php:197
 #: include/database.item.php:198 include/database.item.php:201
 #: include/database.item.php:212 include/database.item.php:217
+#: include/database.item.php:207
 msgid "Effacer une note publique"
 msgstr ""
 
@@ -19011,12 +19387,14 @@ msgstr ""
 #: html/ajax_misc.php:571 html/ajax_misc.php:613 html/ajax_misc.php:408
 #: html/ajax_misc.php:434 html/ajax_misc.php:546 html/ajax_misc.php:548
 #: html/ajax_misc.php:554 html/ajax_misc.php:556 html/ajax_misc.php:560
+#: html/ajax_misc.php:525
 msgid "Ce plugin n'existe pas "
 msgstr ""
 
 #: html/ajax_misc.php:572 html/ajax_misc.php:614 html/ajax_misc.php:409
 #: html/ajax_misc.php:435 html/ajax_misc.php:547 html/ajax_misc.php:549
 #: html/ajax_misc.php:555 html/ajax_misc.php:557 html/ajax_misc.php:561
+#: html/ajax_misc.php:526
 msgid "Il y a une erreur, ce plugin n'existe pas"
 msgstr ""
 
@@ -19032,7 +19410,7 @@ msgstr ""
 #: html/install.php:300 html/install.php:264 html/install.php:306
 #: html/install.php:215 html/install.php:257 include/opening.inc.php:140
 #: include/opening.inc.php:174 html/install.php:222 html/install.php:225
-#: html/install.php:267 html/install.php:225 html/install.php:267
+#: html/install.php:267 html/install.php:272 html/install.php:315
 #: include/opening.inc.php:140 include/opening.inc.php:174
 msgid "Continuer"
 msgstr ""
@@ -19056,7 +19434,6 @@ msgstr ""
 #: include/template/detail-action.php:278
 #: include/template/detail-action.php:282
 #: include/template/detail-action.php:284
-#: include/template/detail-action.php:284
 msgid "Montrer articles"
 msgstr ""
 
@@ -19076,19 +19453,19 @@ msgstr ""
 
 #: html/admin/setup.php:75 html/admin/setup.php:78 html/admin/setup.php:129
 #: html/install.php:131 html/install.php:130 html/install.php:136
-#: html/install.php:143 html/install.php:143
+#: html/install.php:143 html/install.php:156
 msgid "Désactiver le changement de langue (requis pour MacOSX)"
 msgstr ""
 
 #: html/admin/setup.php:76 html/admin/setup.php:79 html/admin/setup.php:130
 #: html/install.php:132 html/install.php:131 html/install.php:137
-#: html/install.php:144 html/install.php:144
+#: html/install.php:144 html/install.php:157
 msgid "Le chemin vers le repertoire contenant psql, pg_dump..."
 msgstr ""
 
 #: html/admin/setup.php:77 html/admin/setup.php:80 html/admin/setup.php:131
 #: html/install.php:133 html/install.php:132 html/install.php:138
-#: html/install.php:145 html/install.php:145
+#: html/install.php:145 html/install.php:158
 msgid "Utilisateur de la base de donnée postgresql"
 msgstr ""
 
@@ -19103,14 +19480,14 @@ msgstr ""
 
 #: html/admin/setup.php:80 html/admin/setup.php:83 html/admin/setup.php:134
 #: html/install.php:136 html/install.php:135 html/install.php:141
-#: html/install.php:148 html/install.php:148
+#: html/install.php:148 html/install.php:161
 msgid ""
 "En version mono dossier, le nom de la base de données doit être mentionné"
 msgstr ""
 
 #: html/admin/setup.php:81 html/admin/setup.php:84 html/admin/setup.php:135
 #: html/install.php:137 html/install.php:136 html/install.php:142
-#: html/install.php:149 html/install.php:149
+#: html/install.php:149 html/install.php:162
 msgid ""
 "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"
@@ -19129,19 +19506,19 @@ msgstr ""
 #: html/admin/setup.php:193 html/admin/setup.php:211 html/admin/setup.php:213
 #: html/install.php:255 html/install.php:254 html/install.php:252
 #: html/install.php:257 html/install.php:263 html/install.php:214
-#: html/install.php:221 html/install.php:224 html/install.php:224
+#: html/install.php:221 html/install.php:224 html/install.php:271
 msgid "Les informations sont sauv&eacute;es vous pouvez continuer"
 msgstr ""
 
 #: html/admin/setup.php:199 html/admin/setup.php:217 html/admin/setup.php:219
 #: html/install.php:225 html/install.php:223 html/install.php:231
-#: html/install.php:182 html/install.php:189 html/install.php:189
+#: html/install.php:182 html/install.php:189 html/install.php:205
 msgid "Ecriture non possible"
 msgstr ""
 
 #: html/admin/setup.php:201 html/admin/setup.php:219 html/admin/setup.php:221
 #: html/install.php:227 html/install.php:225 html/install.php:233
-#: html/install.php:184 html/install.php:191 html/install.php:191
+#: html/install.php:184 html/install.php:191 html/install.php:207
 msgid ""
 "On ne peut pas écrire dans le répertoire de NOALYSS, changez-en les droits "
 msgstr ""
@@ -19149,7 +19526,7 @@ msgstr ""
 #: html/admin/setup.php:208 html/admin/setup.php:226 html/admin/setup.php:228
 #: html/install.php:290 html/install.php:289 html/install.php:287
 #: html/install.php:293 html/install.php:299 html/install.php:250
-#: html/install.php:257 html/install.php:260 html/install.php:260
+#: html/install.php:257 html/install.php:260 html/install.php:308
 msgid "Entrez les informations nécessaires à noalyss"
 msgstr ""
 
@@ -19160,7 +19537,7 @@ msgstr ""
 #: html/admin/setup.php:236 html/admin/setup.php:254 html/admin/setup.php:256
 #: html/install.php:320 html/install.php:319 html/install.php:317
 #: html/install.php:323 html/install.php:329 html/install.php:280
-#: html/install.php:287 html/install.php:290 html/install.php:290
+#: html/install.php:287 html/install.php:290 html/install.php:339
 msgid "Configuration"
 msgstr ""
 
@@ -19181,14 +19558,14 @@ msgstr ""
 #: html/install.php:429 html/install.php:384 html/install.php:393
 #: html/install.php:351 html/install.php:360 html/install.php:369
 #: html/install.php:354 html/install.php:363 html/install.php:372
-#: html/install.php:354 html/install.php:363 html/install.php:372
+#: html/install.php:403 html/install.php:412 html/install.php:421
 msgid "Avertissement"
 msgstr ""
 
 #: html/admin/setup.php:329 html/admin/setup.php:347 html/admin/setup.php:349
 #: html/install.php:413 html/install.php:412 html/install.php:410
 #: html/install.php:416 html/install.php:422 html/install.php:386
-#: html/install.php:353 html/install.php:356 html/install.php:356
+#: html/install.php:353 html/install.php:356 html/install.php:405
 msgid "max_execution_time devrait être de 60 minimum"
 msgstr ""
 
@@ -19196,7 +19573,7 @@ msgstr ""
 #: html/install.php:533 html/install.php:532 html/install.php:530
 #: html/install.php:536 html/install.php:528 html/install.php:534
 #: html/install.php:496 html/install.php:471 html/install.php:477
-#: html/install.php:480 html/install.php:480
+#: html/install.php:480 html/install.php:529
 msgid "Commencer la mise à jour ou l'installation"
 msgstr ""
 
@@ -19204,32 +19581,32 @@ msgstr ""
 #: include/upgrade.inc.php:106 include/upgrade.inc.php:101
 #: include/upgrade.inc.php:102 include/upgrade.inc.php:104
 #: include/upgrade.inc.php:105 include/class/dossier.class.php:404
-#: include/class/dossier.class.php:404
+#: include/class/dossier.class.php:410
 msgid "Modèle inexistant"
 msgstr ""
 
 #: html/admin/setup.php:261 html/admin/setup.php:279 html/admin/setup.php:281
 #: html/install.php:345 html/install.php:344 html/install.php:342
 #: html/install.php:348 html/install.php:354 html/install.php:318
-#: html/install.php:327 html/install.php:330 html/install.php:330
+#: html/install.php:327 html/install.php:330 html/install.php:379
 msgid "Vous devez installer ou activer l'extension"
 msgstr ""
 
 #: html/admin/template_config_form.php:33
 #: include/template/template_config_form.php:33
-#: include/template/template_config_form.php:33
+#: include/template/template_config_form.php:34
 msgid "Répertoire temporaire"
 msgstr ""
 
 #: html/admin/template_config_form.php:39
 #: include/template/template_config_form.php:39
-#: include/template/template_config_form.php:39
+#: include/template/template_config_form.php:40
 msgid "Changement de langue"
 msgstr ""
 
 #: html/admin/template_config_form.php:43
 #: include/template/template_config_form.php:43
-#: include/template/template_config_form.php:43
+#: include/template/template_config_form.php:44
 msgid "Chemin complet vers les executable de Postgresql"
 msgstr ""
 
@@ -19244,21 +19621,21 @@ msgstr ""
 #: html/admin/template_config_form.php:59
 #: include/template/template_config_form.php:63
 #: include/template/template_config_form.php:71
-#: include/template/template_config_form.php:71
+#: include/template/template_config_form.php:81
 msgid "Mode Serveur mutualisé"
 msgstr ""
 
 #: html/admin/template_config_form.php:64
 #: include/template/template_config_form.php:68
 #: include/template/template_config_form.php:76
-#: include/template/template_config_form.php:76
+#: include/template/template_config_form.php:86
 msgid "Nom base de donnée"
 msgstr ""
 
 #: html/admin/template_config_form.php:76
 #: include/template/template_config_form.php:80
 #: include/template/template_config_form.php:88
-#: include/template/template_config_form.php:88
+#: include/template/template_config_form.php:100
 msgid ""
 "Attention : si vous installez sous windows n'utilisez pas le \\ mais plutôt "
 "le / dans les nom de répertoire (càd les chemins ou path)"
@@ -19275,21 +19652,21 @@ msgstr ""
 #: html/admin/setup.php:259 html/install.php:323 html/install.php:322
 #: html/install.php:320 html/install.php:326 html/install.php:332
 #: html/install.php:283 html/install.php:290 html/install.php:293
-#: html/install.php:293
+#: html/install.php:342
 msgid "Vous utilisez le domaine"
 msgstr ""
 
 #: html/admin/setup.php:272 html/install.php:336 html/install.php:335
 #: html/install.php:333 html/install.php:339 html/install.php:345
 #: html/install.php:309 html/install.php:316 html/install.php:319
-#: html/install.php:319
+#: html/install.php:368
 msgid "a une mauvaise valeur"
 msgstr ""
 
 #: html/admin/setup.php:357 html/install.php:421 html/install.php:420
 #: html/install.php:418 html/install.php:424 html/install.php:430
 #: html/install.php:394 html/install.php:361 html/install.php:364
-#: html/install.php:364
+#: html/install.php:413
 msgid "register_globals doit être à off"
 msgstr ""
 
@@ -19305,7 +19682,7 @@ msgstr ""
 #: html/install.php:456 html/install.php:462 html/install.php:454
 #: html/install.php:460 html/install.php:424 html/install.php:399
 #: html/install.php:405 html/install.php:408 scenario/180209.php:18
-#: html/install.php:408
+#: html/install.php:457
 msgid "Version base de données :"
 msgstr ""
 
@@ -19325,14 +19702,14 @@ msgstr ""
 #: html/install.php:471 include/admin_repo.inc.php:125 html/install.php:477
 #: html/install.php:439 include/admin_repo.inc.php:127 html/install.php:414
 #: include/admin_repo.inc.php:129 html/install.php:420 html/install.php:423
-#: html/install.php:423 include/admin_repo.inc.php:129
+#: html/install.php:472 include/admin_repo.inc.php:129
 msgid "Paramètre base de données"
 msgstr ""
 
 #: html/admin/setup.php:419 html/install.php:483 html/install.php:482
 #: html/install.php:480 html/install.php:486 html/install.php:478
 #: html/install.php:484 html/install.php:446 html/install.php:421
-#: html/install.php:427 html/install.php:430 html/install.php:430
+#: html/install.php:427 html/install.php:430 html/install.php:479
 msgid ""
 "Vous devez installer le langage plpgsql pour permettre aux fonctions SQL de "
 "fonctionner."
@@ -19341,7 +19718,7 @@ msgstr ""
 #: html/admin/setup.php:420 html/install.php:484 html/install.php:483
 #: html/install.php:481 html/install.php:487 html/install.php:479
 #: html/install.php:485 html/install.php:447 html/install.php:422
-#: html/install.php:428 html/install.php:431 html/install.php:431
+#: html/install.php:428 html/install.php:431 html/install.php:480
 msgid ""
 "Pour cela, sur la ligne de commande en tant qu\\'utilisateur postgres, "
 "faites createlang plpgsql template1"
@@ -19360,7 +19737,7 @@ msgstr ""
 #: html/admin/setup.php:462 html/install.php:526 html/install.php:525
 #: html/install.php:523 html/install.php:529 html/install.php:521
 #: html/install.php:527 html/install.php:489 html/install.php:464
-#: html/install.php:470 html/install.php:473 html/install.php:473
+#: html/install.php:470 html/install.php:473 html/install.php:522
 #, php-format
 msgid "Il y a %s param&egrave;tre qui sont trop bas"
 msgstr ""
@@ -19368,14 +19745,14 @@ msgstr ""
 #: html/admin/setup.php:497 html/install.php:561 html/install.php:560
 #: html/install.php:558 html/install.php:569 html/install.php:567
 #: html/install.php:529 html/install.php:513 html/install.php:519
-#: html/install.php:522 html/install.php:522
+#: html/install.php:522 html/install.php:572
 msgid "Creation of Modele 1"
 msgstr ""
 
 #: html/admin/setup.php:510 html/install.php:574 html/install.php:573
 #: html/install.php:571 html/install.php:582 html/install.php:580
 #: html/install.php:542 html/install.php:532 html/install.php:538
-#: html/install.php:541 html/install.php:541
+#: html/install.php:541 html/install.php:591
 msgid "Creation of Modele 2"
 msgstr ""
 
@@ -19398,7 +19775,7 @@ msgstr ""
 #: html/admin/setup.php:538 html/install.php:602 html/install.php:603
 #: html/install.php:610 html/install.php:626 html/install.php:618
 #: html/install.php:624 html/install.php:586 html/install.php:576
-#: html/install.php:582 html/install.php:585 html/install.php:585
+#: html/install.php:582 html/install.php:585 html/install.php:635
 msgid ""
 "soit noalyss/contrib/mono-dossier/mono-france.sql pour la comptabilité "
 "française"
@@ -19407,7 +19784,7 @@ msgstr ""
 #: html/admin/setup.php:539 html/install.php:603 html/install.php:604
 #: html/install.php:611 html/install.php:627 html/install.php:619
 #: html/install.php:625 html/install.php:587 html/install.php:577
-#: html/install.php:583 html/install.php:586 html/install.php:586
+#: html/install.php:583 html/install.php:586 html/install.php:636
 msgid ""
 "soit noalyss/contrib/mono-dossier/mono-belge.sql pour la comptabilité belge"
 msgstr ""
@@ -19415,7 +19792,7 @@ msgstr ""
 #: html/admin/setup.php:540 html/install.php:604 html/install.php:605
 #: html/install.php:612 html/install.php:628 html/install.php:620
 #: html/install.php:626 html/install.php:588 html/install.php:578
-#: html/install.php:584 html/install.php:587 html/install.php:587
+#: html/install.php:584 html/install.php:587 html/install.php:637
 msgid "soit y restaurer un backup ou un modèle"
 msgstr ""
 
@@ -19437,7 +19814,7 @@ msgstr ""
 #: html/install.php:635 html/install.php:656 html/install.php:657
 #: html/install.php:683 html/install.php:676 html/install.php:655
 #: html/install.php:682 html/install.php:617 html/install.php:644
-#: html/install.php:607 html/install.php:614 html/install.php:617
+#: html/install.php:607 html/install.php:614 html/install.php:667
 msgid "Connectez-vous à NOALYSS"
 msgstr ""
 
@@ -19452,50 +19829,51 @@ msgstr ""
 #: include/upgrade.inc.php:68 include/upgrade.inc.php:96 html/install.php:392
 #: include/upgrade.inc.php:33 include/class/dossier.class.php:367
 #: include/class/dossier.class.php:395 html/install.php:398
-#: html/install.php:401 html/install.php:401 include/upgrade.inc.php:33
-#: include/class/dossier.class.php:367 include/class/dossier.class.php:395
+#: html/install.php:401 html/install.php:450
+#: include/class/dossier.class.php:373 include/class/dossier.class.php:401
+#: include/upgrade.inc.php:33
 msgid "Base de données"
 msgstr ""
 
 #: html/admin/setup.php:527 html/install.php:591 html/install.php:590
 #: html/install.php:588 html/install.php:601 html/install.php:593
 #: html/install.php:599 html/install.php:561 html/install.php:551
-#: html/install.php:557 html/install.php:560 html/install.php:560
+#: html/install.php:557 html/install.php:560 html/install.php:610
 msgid "Mise à jour du systeme"
 msgstr ""
 
 #: html/admin/setup.php:528 html/install.php:592 html/install.php:591
 #: html/install.php:589 html/install.php:602 html/install.php:594
 #: html/install.php:600 html/install.php:562 html/install.php:552
-#: html/install.php:558 html/install.php:561 html/install.php:561
+#: html/install.php:558 html/install.php:561 html/install.php:611
 msgid "Mise  à jour dossier"
 msgstr ""
 
 #: html/admin/setup.php:549 html/install.php:613 html/install.php:614
 #: html/install.php:621 html/install.php:637 html/install.php:629
 #: html/install.php:635 html/install.php:597 html/install.php:587
-#: html/install.php:594 html/install.php:597
+#: html/install.php:594 html/install.php:647
 msgid "Mise à jour Repository"
 msgstr ""
 
 #: html/admin/setup.php:373 html/install.php:437 html/install.php:436
 #: html/install.php:434 html/install.php:440 html/install.php:432
 #: html/install.php:438 html/install.php:402 html/install.php:377
-#: html/install.php:380 html/install.php:380
+#: html/install.php:380 html/install.php:429
 msgid "php.ini est bien configuré "
 msgstr ""
 
 #: html/admin/setup.php:375 html/install.php:439 html/install.php:438
 #: html/install.php:436 html/install.php:442 html/install.php:434
 #: html/install.php:440 html/install.php:404 html/install.php:379
-#: html/install.php:382 html/install.php:382
+#: html/install.php:382 html/install.php:431
 msgid "php mal configuré "
 msgstr ""
 
 #: html/admin/setup.php:442 html/install.php:506 html/install.php:505
 #: html/install.php:503 html/install.php:509 html/install.php:501
 #: html/install.php:507 html/install.php:469 html/install.php:444
-#: html/install.php:450 html/install.php:453 html/install.php:453
+#: html/install.php:450 html/install.php:453 html/install.php:502
 #, php-format
 msgid "Attention le paramètre effective_cache_size est de %s au lieu de 1000"
 msgstr ""
@@ -19503,7 +19881,7 @@ msgstr ""
 #: html/admin/setup.php:459 html/install.php:523 html/install.php:522
 #: html/install.php:520 html/install.php:526 html/install.php:518
 #: html/install.php:524 html/install.php:486 html/install.php:461
-#: html/install.php:467 html/install.php:470 html/install.php:470
+#: html/install.php:467 html/install.php:470 html/install.php:519
 msgid "La base de données est bien configurée "
 msgstr ""
 
@@ -19518,13 +19896,13 @@ msgstr ""
 #: include/database.item.php:5 include/database.item.php:6
 #: include/database.item.php:134 include/database.item.php:135
 #: include/database.item.php:132 include/database.item.php:133
-#: include/database.item.php:134 include/database.item.php:135
+#: include/database.item.php:133 include/database.item.php:134
 msgid "Balance agée pour les clients et fournisseurs"
 msgstr ""
 
 #: include/database.item.php:7 include/database.item.php:10
 #: include/database.item.php:4 include/database.item.php:2
-#: include/database.item.php:4
+#: include/database.item.php:3
 msgid ""
 "Vous permet d'encoder des achats, dépenses, des notes de frais ou des notes "
 "de crédits, vous pouvez spécifier un bénéficiaire ou un autre moyen de "
@@ -19533,7 +19911,7 @@ msgstr ""
 
 #: include/database.item.php:13 include/database.item.php:16
 #: include/database.item.php:10 include/database.item.php:8
-#: include/database.item.php:10
+#: include/database.item.php:9
 msgid ""
 "Permet d'ajouter des taux de TVA ou de les modifier ainsi que les postes "
 "comptables de ces TVA, ces TVA sont utilisables dans les menus de vente et "
@@ -19542,31 +19920,31 @@ msgstr ""
 
 #: include/database.item.php:14 include/database.item.php:17
 #: include/database.item.php:11 include/database.item.php:9
-#: include/database.item.php:11
+#: include/database.item.php:10
 msgid "Encodage de tous vos revenus ou vente"
 msgstr ""
 
 #: include/database.item.php:15 include/database.item.php:18
 #: include/database.item.php:12 include/database.item.php:10
-#: include/database.item.php:12
+#: include/database.item.php:11
 msgid "Ajout de menu ou de plugins"
 msgstr ""
 
 #: include/database.item.php:16 include/database.item.php:19
 #: include/database.item.php:13 include/database.item.php:11
-#: include/database.item.php:13
+#: include/database.item.php:12
 msgid "Suivi des fournisseurs : devis, lettres, email...."
 msgstr ""
 
 #: include/database.item.php:17 include/database.item.php:20
 #: include/database.item.php:14 include/database.item.php:12
-#: include/database.item.php:14
+#: include/database.item.php:13
 msgid "Opérations diverses en Analytique"
 msgstr ""
 
 #: include/database.item.php:18 include/database.item.php:21
 #: include/database.item.php:15 include/database.item.php:13
-#: include/database.item.php:15
+#: include/database.item.php:14
 msgid ""
 "Création de rapport sur mesure, comme les ratios, vous permet de créer des "
 "graphiques de vos données (vente, achat...)"
@@ -19574,37 +19952,37 @@ msgstr ""
 
 #: include/database.item.php:19 include/database.item.php:22
 #: include/database.item.php:51 include/database.item.php:49
-#: include/database.item.php:62
+#: include/database.item.php:62 include/database.item.php:61
 msgid "Menu regroupant les plugins"
 msgstr ""
 
 #: include/database.item.php:21 include/database.item.php:24
 #: include/database.item.php:17 include/database.item.php:15
-#: include/database.item.php:17
+#: include/database.item.php:16
 msgid "Suivi client : devis, réunion, courrier, commande..."
 msgstr ""
 
 #: include/database.item.php:55 include/database.item.php:58
 #: include/database.item.php:52 include/database.item.php:50
-#: include/database.item.php:51
+#: include/database.item.php:51 include/database.item.php:50
 msgid "Axe analytique"
 msgstr ""
 
 #: include/database.item.php:56 include/database.item.php:59
 #: include/database.item.php:53 include/database.item.php:51
-#: include/database.item.php:52
+#: include/database.item.php:52 include/database.item.php:51
 msgid "Regroupement de compte analytique"
 msgstr ""
 
 #: include/database.item.php:57 include/database.item.php:60
 #: include/database.item.php:54 include/database.item.php:52
-#: include/database.item.php:53
+#: include/database.item.php:53 include/database.item.php:52
 msgid "Liste de tous vos contacts"
 msgstr ""
 
 #: include/database.item.php:58 include/database.item.php:61
 #: include/database.item.php:55 include/database.item.php:53
-#: include/database.item.php:54
+#: include/database.item.php:54 include/database.item.php:53
 msgid ""
 "Les opérations prédéfinies sont des opérations que vous faites régulièrement "
 "(loyer, abonnement,...) "
@@ -19612,7 +19990,7 @@ msgstr ""
 
 #: include/database.item.php:59 include/database.item.php:62
 #: include/database.item.php:56 include/database.item.php:54
-#: include/database.item.php:55
+#: include/database.item.php:55 include/database.item.php:54
 msgid ""
 "Opération diverses tels que les amortissements, les augmentations de "
 "capital, les salaires, ..."
@@ -19620,13 +19998,13 @@ msgstr ""
 
 #: include/database.item.php:60 include/database.item.php:63
 #: include/database.item.php:57 include/database.item.php:55
-#: include/database.item.php:56
+#: include/database.item.php:56 include/database.item.php:55
 msgid "Encodage d'un extrait bancaire (=relevé bancaire)"
 msgstr ""
 
 #: include/database.item.php:61 include/database.item.php:64
 #: include/database.item.php:58 include/database.item.php:56
-#: include/database.item.php:57
+#: include/database.item.php:57 include/database.item.php:56
 msgid ""
 "Historique de toutes vos opérations un menu de recherche dans une nouvelle "
 "fenêtre, vous permettra de retrouver rapidement l'opération qui vous "
@@ -19635,13 +20013,13 @@ msgstr ""
 
 #: include/database.item.php:62 include/database.item.php:65
 #: include/database.item.php:59 include/database.item.php:57
-#: include/database.item.php:58
+#: include/database.item.php:58 include/database.item.php:57
 msgid "Module paramètres"
 msgstr ""
 
 #: include/database.item.php:63 include/database.item.php:66
 #: include/database.item.php:60 include/database.item.php:58
-#: include/database.item.php:59
+#: include/database.item.php:59 include/database.item.php:58
 msgid ""
 "Vous permet d'ajouter de nouveaux type de documents (bordereau de livraison, "
 "devis..)"
@@ -19649,7 +20027,7 @@ msgstr ""
 
 #: include/database.item.php:65 include/database.item.php:68
 #: include/database.item.php:62 include/database.item.php:60
-#: include/database.item.php:61
+#: include/database.item.php:61 include/database.item.php:60
 msgid ""
 "Historique de toutes vos opérations dans les journaux d'achats un menu de "
 "recherche, vous permettra de retrouver rapidement l'opération qui vous "
@@ -19658,7 +20036,7 @@ msgstr ""
 
 #: include/database.item.php:66 include/database.item.php:69
 #: include/database.item.php:63 include/database.item.php:61
-#: include/database.item.php:63
+#: include/database.item.php:62
 msgid ""
 "Historique de toutes vos opérations dans les journaux d'opérations diverses "
 "un menu de recherche, vous permettra de retrouver rapidement l'opération qui "
@@ -19667,7 +20045,7 @@ msgstr ""
 
 #: include/database.item.php:68 include/database.item.php:71
 #: include/database.item.php:65 include/database.item.php:63
-#: include/database.item.php:65
+#: include/database.item.php:64
 msgid ""
 "Impression de rapport personnalisé, il est aussi possible d'exporter en CSV "
 "afin de faire des graphiques"
@@ -19675,49 +20053,49 @@ msgstr ""
 
 #: include/database.item.php:71 include/database.item.php:74
 #: include/database.item.php:68 include/database.item.php:66
-#: include/database.item.php:68
+#: include/database.item.php:67
 msgid "Regroupement pour les menus d'achats(nouvelle opération, historique...)"
 msgstr ""
 
 #: include/database.item.php:72 include/database.item.php:75
 #: include/database.item.php:69 include/database.item.php:67
-#: include/database.item.php:69
+#: include/database.item.php:68
 msgid "Regroupement pour les menus et les profils"
 msgstr ""
 
 #: include/database.item.php:74 include/database.item.php:77
 #: include/database.item.php:71 include/database.item.php:69
-#: include/database.item.php:71
+#: include/database.item.php:70
 msgid "Regroupement des menus des journaux de trésorerie"
 msgstr ""
 
 #: include/database.item.php:75 include/database.item.php:78
 #: include/database.item.php:72 include/database.item.php:70
-#: include/database.item.php:72
+#: include/database.item.php:71
 msgid "Grand livre pour la comptabilité analytique"
 msgstr ""
 
 #: include/database.item.php:77 include/database.item.php:80
 #: include/database.item.php:74 include/database.item.php:72
-#: include/database.item.php:74
+#: include/database.item.php:73
 msgid "Menu Lettrage"
 msgstr ""
 
 #: include/database.item.php:78 include/database.item.php:81
 #: include/database.item.php:75 include/database.item.php:73
-#: include/database.item.php:75
+#: include/database.item.php:74
 msgid "Choix de votre dossier"
 msgstr ""
 
 #: include/database.item.php:80 include/database.item.php:83
 #: include/database.item.php:77 include/database.item.php:75
-#: include/database.item.php:77
+#: include/database.item.php:76
 msgid "Menu de différents paramètres"
 msgstr ""
 
 #: include/database.item.php:81 include/database.item.php:84
 #: include/database.item.php:78 include/database.item.php:76
-#: include/database.item.php:78
+#: include/database.item.php:77
 msgid ""
 "Configuration des profils des utilisateurs, permet de fixer les journaux, "
 "profils dans les documents et stock que  ce profil peut utiliser. Cela "
@@ -19726,7 +20104,7 @@ msgstr ""
 
 #: include/database.item.php:83 include/database.item.php:86
 #: include/database.item.php:80 include/database.item.php:78
-#: include/database.item.php:80
+#: include/database.item.php:79
 msgid ""
 "Permet d'avoir la balance de toutes vos fiches, les résumés exportables en "
 "CSV, les historiques avec ou sans lettrages"
@@ -19734,7 +20112,7 @@ msgstr ""
 
 #: include/database.item.php:84 include/database.item.php:87
 #: include/database.item.php:81 include/database.item.php:79
-#: include/database.item.php:81
+#: include/database.item.php:80
 msgid ""
 "Préférence de l'utilisateur, apparence de l'application pour l'utilisateur, "
 "période par défaut et mot de passe"
@@ -19742,7 +20120,7 @@ msgstr ""
 
 #: include/database.item.php:85 include/database.item.php:88
 #: include/database.item.php:82 include/database.item.php:80
-#: include/database.item.php:82
+#: include/database.item.php:81
 msgid ""
 "Configuration des tags ou dossiers, on l'appele tag ou dossier suivant la "
 "façon dont vous utilisez \n"
@@ -19751,7 +20129,7 @@ msgstr ""
 
 #: include/database.item.php:88 include/database.item.php:91
 #: include/database.item.php:85 include/database.item.php:83
-#: include/database.item.php:85
+#: include/database.item.php:84
 msgid ""
 "Information sur votre société : nom, adresse... utilisé lors de la "
 "génération de documents"
@@ -19759,7 +20137,7 @@ msgstr ""
 
 #: include/database.item.php:89 include/database.item.php:92
 #: include/database.item.php:86 include/database.item.php:84
-#: include/database.item.php:86
+#: include/database.item.php:85
 msgid ""
 "Gestion des périodes : clôture, ajout de période, afin de créer des périodes "
 "vous pouvez aussi utiliser le plugin outil comptable"
@@ -19767,7 +20145,7 @@ msgstr ""
 
 #: include/database.item.php:90 include/database.item.php:93
 #: include/database.item.php:87 include/database.item.php:85
-#: include/database.item.php:87
+#: include/database.item.php:86
 msgid ""
 "Vérifie que votre comptabilité ne contient pas d'erreur de base, tels que "
 "l'équilibre entre le passif et l'actif, l'utilisation des postes "
@@ -19776,7 +20154,7 @@ msgstr ""
 
 #: include/database.item.php:91 include/database.item.php:94
 #: include/database.item.php:88 include/database.item.php:86
-#: include/database.item.php:88
+#: include/database.item.php:87
 msgid ""
 "Ecriture d'ouverture ou écriture à nouveau, reporte les soldes des comptes "
 "de l'année passé du poste comptable 0xxx à 5xxxx sur l'année courante"
@@ -19790,7 +20168,7 @@ msgstr ""
 
 #: include/database.item.php:93 include/database.item.php:96
 #: include/database.item.php:90 include/database.item.php:88
-#: include/database.item.php:90
+#: include/database.item.php:89
 msgid ""
 "Création et modification des journaux, préfixe des pièces justificatives, "
 "numérotation, catégories de fiches accessibles à ce journal"
@@ -19798,7 +20176,7 @@ msgstr ""
 
 #: include/database.item.php:94 include/database.item.php:97
 #: include/database.item.php:91 include/database.item.php:89
-#: include/database.item.php:91
+#: include/database.item.php:90
 msgid ""
 "Configuration de la sécurité, vous permet de donner un profil à vos "
 "utilisateurs, cela leur permettra d'utiliser ce que vous souhaitez qu'ils "
@@ -19807,7 +20185,7 @@ msgstr ""
 
 #: include/database.item.php:95 include/database.item.php:98
 #: include/database.item.php:92 include/database.item.php:90
-#: include/database.item.php:92
+#: include/database.item.php:91
 msgid ""
 "Permet d'ajouter de nouveaux attributs que vous pourrez par la suite ajouter "
 "à des catégories de fiches"
@@ -19815,19 +20193,19 @@ msgstr ""
 
 #: include/database.item.php:96 include/database.item.php:99
 #: include/database.item.php:93 include/database.item.php:91
-#: include/database.item.php:93
+#: include/database.item.php:92
 msgid "Etat des stock de l'exercice indiqué"
 msgstr ""
 
 #: include/database.item.php:97 include/database.item.php:100
 #: include/database.item.php:94 include/database.item.php:92
-#: include/database.item.php:94
+#: include/database.item.php:93
 msgid "Modification des stocks, menu utilisé pour l'inventaire"
 msgstr ""
 
 #: include/database.item.php:98 include/database.item.php:101
 #: include/database.item.php:95 include/database.item.php:93
-#: include/database.item.php:95
+#: include/database.item.php:94
 msgid ""
 "Liste des changements manuels des stocks, inventaire, transfert de "
 "marchandises entre dépôts..."
@@ -19835,7 +20213,7 @@ msgstr ""
 
 #: include/database.item.php:99 include/database.item.php:102
 #: include/database.item.php:96 include/database.item.php:94
-#: include/database.item.php:96
+#: include/database.item.php:95
 msgid ""
 "Le navigateur vous présente une liste de menu auquel vous avez accès et vous "
 "permet d'accèder plus rapidement au menu que vous souhaitez"
@@ -19843,7 +20221,7 @@ msgstr ""
 
 #: include/database.item.php:100 include/database.item.php:103
 #: include/database.item.php:97 include/database.item.php:95
-#: include/database.item.php:97
+#: include/database.item.php:96
 msgid ""
 "Historique de toutes vos opérations dans tous  les journaux auquels vous "
 "avez accès, vous permettra de retrouver rapidement l'opération qui vous "
@@ -19852,7 +20230,7 @@ msgstr ""
 
 #: include/database.item.php:101 include/database.item.php:104
 #: include/database.item.php:98 include/database.item.php:96
-#: include/database.item.php:98
+#: include/database.item.php:97
 msgid ""
 "Historique de toutes vos opérations un menu de recherche, vous permettra de "
 "retrouver rapidement l'opération qui vous intéresse"
@@ -19860,7 +20238,7 @@ msgstr ""
 
 #: include/database.item.php:102 include/database.item.php:105
 #: include/database.item.php:99 include/database.item.php:97
-#: include/database.item.php:99
+#: include/database.item.php:98
 msgid ""
 "Permet de faire correspondre vos extraits bancaires avec les opérations de "
 "vente ou d'achat, le lettrage se fait automatiquement"
@@ -19868,7 +20246,7 @@ msgstr ""
 
 #: include/database.item.php:103 include/database.item.php:106
 #: include/database.item.php:100 include/database.item.php:98
-#: include/database.item.php:100
+#: include/database.item.php:99
 msgid ""
 "Solde des journaux de trésorerie cela concerne les comptes en banques, "
 "caisse , les chèques... "
@@ -19876,13 +20254,13 @@ msgstr ""
 
 #: include/database.item.php:104 include/database.item.php:107
 #: include/database.item.php:101 include/database.item.php:99
-#: include/database.item.php:104
+#: include/database.item.php:103
 msgid "Déconnexion "
 msgstr ""
 
 #: include/database.item.php:106 include/database.item.php:109
 #: include/database.item.php:103 include/database.item.php:101
-#: include/database.item.php:102
+#: include/database.item.php:102 include/database.item.php:101
 msgid ""
 "Balance par catégorie de fiche ou pour toutes les fiches ayant un poste "
 "comptable"
@@ -19890,7 +20268,7 @@ msgstr ""
 
 #: include/database.item.php:107 include/database.item.php:110
 #: include/database.item.php:104 include/database.item.php:102
-#: include/database.item.php:103
+#: include/database.item.php:103 include/database.item.php:102
 msgid ""
 "Modification de votre plan comptable, parfois il est plus rapide d'utiliser "
 "le plugin \"Poste Comptable\""
@@ -19898,7 +20276,7 @@ msgstr ""
 
 #: include/database.item.php:108 include/database.item.php:111
 #: include/database.item.php:105 include/database.item.php:103
-#: include/database.item.php:105
+#: include/database.item.php:104
 msgid ""
 "Historique de toutes vos opérations dans les journaux de vente un menu de "
 "recherche, vous permettra de retrouver rapidement l'opération qui vous "
@@ -19907,7 +20285,7 @@ msgstr ""
 
 #: include/database.item.php:109 include/database.item.php:112
 #: include/database.item.php:106 include/database.item.php:104
-#: include/database.item.php:106
+#: include/database.item.php:105
 msgid ""
 "Historique de toutes vos opérations dans les journaux de trésorerie un menu "
 "de recherche, vous permettra de retrouver rapidement l'opération qui vous "
@@ -19916,7 +20294,7 @@ msgstr ""
 
 #: include/database.item.php:110 include/database.item.php:113
 #: include/database.item.php:107 include/database.item.php:105
-#: include/database.item.php:107
+#: include/database.item.php:106
 msgid ""
 "Impression des rapprochements : opérations non rapprochées ou avec des "
 "montants différents"
@@ -19924,7 +20302,7 @@ msgstr ""
 
 #: include/database.item.php:111 include/database.item.php:114
 #: include/database.item.php:108 include/database.item.php:106
-#: include/database.item.php:108
+#: include/database.item.php:107
 msgid ""
 "Impression de bilan, ce module est basique, il est plus intéressant "
 "d'utiliser le plugin \"rapport avancés\""
@@ -19932,15 +20310,15 @@ msgstr ""
 
 #: include/database.item.php:112 include/database.item.php:115
 #: include/database.item.php:109 include/database.item.php:107
-#: include/database.item.php:109
+#: include/database.item.php:108
 msgid "Configuration des entrepots de dépôts"
 msgstr ""
 
 #: include/database.item.php:113 include/database.item.php:115
 #: include/database.item.php:116 include/database.item.php:118
 #: include/database.item.php:110 include/database.item.php:112
-#: include/database.item.php:108 include/database.item.php:110
-#: include/database.item.php:112
+#: include/database.item.php:108 include/database.item.php:109
+#: include/database.item.php:111
 msgid ""
 "Permet d'ajouter de nouvelles catégorie de fiche, d'ajouter des attributs à "
 "ces catégories (numéro de téléphone, gsm, email...)"
@@ -19948,13 +20326,13 @@ msgstr ""
 
 #: include/database.item.php:114 include/database.item.php:117
 #: include/database.item.php:111 include/database.item.php:109
-#: include/database.item.php:111
+#: include/database.item.php:110
 msgid "Permet de changer le poste comptable de base des catégories de fiches"
 msgstr ""
 
 #: include/database.item.php:116 include/database.item.php:119
 #: include/database.item.php:113 include/database.item.php:111
-#: include/database.item.php:113
+#: include/database.item.php:112
 msgid ""
 "Permet d'ajouter des état pour les documents utilisés dans le suivi (à "
 "faire, à suivre...)"
@@ -19962,7 +20340,7 @@ msgstr ""
 
 #: include/database.item.php:117 include/database.item.php:120
 #: include/database.item.php:114 include/database.item.php:112
-#: include/database.item.php:114
+#: include/database.item.php:113
 msgid ""
 "Regroupement pour les menus d'opérations diverses (nouvelle opération, "
 "historique...)"
@@ -19970,7 +20348,7 @@ msgstr ""
 
 #: include/database.item.php:118 include/database.item.php:121
 #: include/database.item.php:115 include/database.item.php:113
-#: include/database.item.php:115
+#: include/database.item.php:114
 msgid ""
 "Impression des journaux avec les détails pour les parties privés, la TVA et "
 "ce qui est non déductibles en ce qui concerne les journaux de vente et "
@@ -19979,13 +20357,13 @@ msgstr ""
 
 #: include/database.item.php:119 include/database.item.php:122
 #: include/database.item.php:116 include/database.item.php:114
-#: include/database.item.php:116
+#: include/database.item.php:115
 msgid "Regroupement des menus ventes et recettes"
 msgstr ""
 
 #: include/database.item.php:122 include/database.item.php:125
 #: include/database.item.php:119 include/database.item.php:117
-#: include/database.item.php:119
+#: include/database.item.php:118
 msgid ""
 "Tableau de suivi, vous permet de voir en un coup d'oeil vos dernières "
 "opérations, un petit calendrier, une liste de chose à faire..."
@@ -19993,21 +20371,21 @@ msgstr ""
 
 #: include/database.item.php:123 include/database.item.php:126
 #: include/database.item.php:120 include/database.item.php:118
-#: include/database.item.php:120
+#: include/database.item.php:119
 msgid ""
 "Menu regroupant la création de rapport, la vérification de la comptabilité..."
 msgstr ""
 
 #: include/database.item.php:124 include/database.item.php:127
 #: include/database.item.php:121 include/database.item.php:119
-#: include/database.item.php:121
+#: include/database.item.php:120
 msgid ""
 "Regroupement pour les menus de trésorerie (nouvelle opération, historique...)"
 msgstr ""
 
 #: include/database.item.php:125 include/database.item.php:128
 #: include/database.item.php:122 include/database.item.php:120
-#: include/database.item.php:122
+#: include/database.item.php:121
 msgid ""
 "Liste de vos suivis, en fait de tous les documents, réunions ... dont vous "
 "avez besoin afin de suivre vos clients, fournisseurs ou administrations. Il "
@@ -20017,7 +20395,7 @@ msgstr ""
 
 #: include/database.item.php:126 include/database.item.php:129
 #: include/database.item.php:123 include/database.item.php:121
-#: include/database.item.php:123
+#: include/database.item.php:122
 msgid ""
 "Configuration des moyens de paiements que vous voulez utiliser dans les "
 "journaux de type VEN ou ACH, les moyens de paiement permettent de générer "
@@ -20027,13 +20405,13 @@ msgstr ""
 
 #: include/database.item.php:127 include/database.item.php:130
 #: include/database.item.php:124 include/database.item.php:122
-#: include/database.item.php:124
+#: include/database.item.php:123
 msgid "Suivi des administrations : courrrier, déclarations."
 msgstr ""
 
 #: include/database.item.php:128 include/database.item.php:131
 #: include/database.item.php:125 include/database.item.php:123
-#: include/database.item.php:125
+#: include/database.item.php:124
 msgid ""
 "Prévision de vos achats, revenus, permet de suivre l'évolution de votre "
 "société. Vos prévisions sont des formules sur les postes comptables et vous "
@@ -20042,7 +20420,7 @@ msgstr ""
 
 #: include/database.item.php:130 include/database.item.php:133
 #: include/database.item.php:127 include/database.item.php:125
-#: include/database.item.php:127
+#: include/database.item.php:126
 msgid ""
 "Suivi de vos salariés, managers ainsi que des administrateurs, pour les "
 "documents et les opérations comptables"
@@ -20050,7 +20428,7 @@ msgstr ""
 
 #: include/database.item.php:131 include/database.item.php:134
 #: include/database.item.php:128 include/database.item.php:126
-#: include/database.item.php:128
+#: include/database.item.php:127
 msgid ""
 "Configuration des menus par défaut, ces menus sont appelés par des actions "
 "dans d'autres menus"
@@ -20058,29 +20436,29 @@ msgstr ""
 
 #: include/database.item.php:132 include/database.item.php:135
 #: include/database.item.php:129 include/database.item.php:127
-#: include/database.item.php:129
+#: include/database.item.php:128
 msgid "Agenda, présentation du suivi sous forme d'agenda "
 msgstr ""
 
 #: include/database.item.php:133 include/database.item.php:136
-#: include/database.item.php:131 include/database.item.php:133
+#: include/database.item.php:131 include/database.item.php:132
 msgid "Ce menu vous présente  un menu rapide de vos menus préférés"
 msgstr ""
 
 #: html/admin/setup.php:132 html/install.php:134 html/install.php:133
-#: html/install.php:139 html/install.php:146 html/install.php:146
+#: html/install.php:139 html/install.php:146 html/install.php:159
 msgid "Mot de passe de l'utilisateur de Postgresql"
 msgstr ""
 
 #: html/admin/template_config_form.php:47
 #: include/template/template_config_form.php:47
-#: include/template/template_config_form.php:47
+#: include/template/template_config_form.php:48
 msgid "Utilisateur Postgresql"
 msgstr ""
 
 #: html/admin/template_config_form.php:51
 #: include/template/template_config_form.php:51
-#: include/template/template_config_form.php:51
+#: include/template/template_config_form.php:52
 msgid "Mot de passe de l'utilisateur Postgresql"
 msgstr ""
 
@@ -20093,7 +20471,8 @@ msgid "Accès non autorisé"
 msgstr ""
 
 #: include/ajax/ajax_ledger.php:31 include/ajax/ajax_poste.php:35
-#: include/ajax/ajax_poste.php:35 include/ajax/ajax_ledger.php:32
+#: include/ajax/ajax_ledger.php:32 include/ajax/ajax_ledger.php:32
+#: include/ajax/ajax_poste.php:35
 msgid "Non authorisé"
 msgstr ""
 
@@ -20106,7 +20485,7 @@ msgstr ""
 #: include/class/class_acc_account_ledger.php:703
 #: include/class/acc_account_ledger.class.php:763
 #: include/class/acc_account_ledger.class.php:766
-#: include/class/acc_account_ledger.class.php:766
+#: include/class/acc_account_ledger.class.php:758
 msgid "Filtre rapide"
 msgstr ""
 
@@ -20119,13 +20498,13 @@ msgstr ""
 #: include/upgrade-plugin.php:25 include/upgrade-template.php:25
 #: include/ajax/ajax_remove_submenu.php:27
 #: include/ajax/ajax_user_security.php:39 html/ajax_misc.php:86
-#: html/ajax_misc.php:86 include/upgrade.inc.php:27
-#: include/admin_repo.inc.php:24 include/admin_repo.inc.php:25
-#: include/export/export_document.php:26 include/export/export_receipt.php:24
-#: include/backup.inc.php:22 include/ajax/ajax_user_security.php:39
+#: html/ajax_misc.php:86 include/upgrade-core.php:23
+#: include/ajax/ajax_user_security.php:39
 #: include/ajax/ajax_remove_submenu.php:27 include/upgrade-template.php:25
-#: include/upgrade-core.php:23 include/impress_poste.inc.php:20
-#: include/upgrade-plugin.php:25
+#: include/export/export_receipt.php:24 include/export/export_document.php:26
+#: include/admin_repo.inc.php:24 include/admin_repo.inc.php:25
+#: include/upgrade.inc.php:27 include/backup.inc.php:22
+#: include/upgrade-plugin.php:25 include/impress_poste.inc.php:20
 msgid "Non autorisé"
 msgstr ""
 
@@ -20134,12 +20513,12 @@ msgid "Le fichier "
 msgstr ""
 
 #: html/install.php:135 html/install.php:134 html/install.php:140
-#: html/install.php:147 html/install.php:147
+#: html/install.php:147 html/install.php:160
 msgid "Port pour postgresql"
 msgstr ""
 
 #: html/install.php:138 html/install.php:137 html/install.php:143
-#: html/install.php:150 html/install.php:150
+#: html/install.php:150 html/install.php:163
 msgid "Serveur postgresql"
 msgstr ""
 
@@ -20148,20 +20527,20 @@ msgstr ""
 #: include/ext/import_account/include/class_impacc_file.php:69
 #: html/install.php:269 html/install.php:220
 #: include/ext/import_account/include/impacc_file.class.php:69
-#: html/install.php:227 html/install.php:230 html/install.php:230
+#: html/install.php:227 html/install.php:230 html/install.php:277
 msgid "Fichier non sauvé"
 msgstr ""
 
 #: html/install.php:264 html/install.php:263 html/install.php:261
 #: html/install.php:266 html/install.php:272 html/install.php:223
-#: html/install.php:230 html/install.php:233 html/install.php:233
+#: html/install.php:230 html/install.php:233 html/install.php:280
 #, php-format
 msgid "Créez ce fichier %s avec les informations suivantes "
 msgstr ""
 
 #: html/install.php:268 html/install.php:267 html/install.php:265
 #: html/install.php:270 html/install.php:276 html/install.php:227
-#: html/install.php:234 html/install.php:237 html/install.php:237
+#: html/install.php:234 html/install.php:237 html/install.php:284
 msgid "Puis cliquez sur ce lien"
 msgstr ""
 
@@ -20170,14 +20549,14 @@ msgstr ""
 #: html/install.php:235 include/upgrade-plugin.php:113
 #: include/lib/user_menu.php:121 html/install.php:238
 #: include/upgrade-plugin.php:125 include/lib/user_menu.php:78
-#: html/install.php:238 include/lib/user_menu.php:78
-#: include/upgrade-plugin.php:125
+#: html/install.php:285 include/lib/user_menu.php:77
+#: include/upgrade-plugin.php:128
 msgid "Installation"
 msgstr ""
 
 #: html/install.php:278 html/install.php:277 html/install.php:275
 #: html/install.php:281 html/install.php:287 html/install.php:238
-#: html/install.php:245 html/install.php:248 html/install.php:248
+#: html/install.php:245 html/install.php:248 html/install.php:295
 msgid ""
 "Impossible de se connecter à Postgresql, vérifiez les informations de "
 "connection"
@@ -20197,8 +20576,9 @@ msgstr ""
 #: include/ext/importbank/index.php:141
 #: include/ext/importbank/include/import_bank.class.php:463
 #: include/ext/importbank/include/import_bank.class.php:484
-#: include/modele.inc.php:412 include/compta_fin_rec.inc.php:115
-#: include/compta_fin_rec.inc.php:122 include/modele.inc.php:413
+#: include/modele.inc.php:412 include/modele.inc.php:413
+#: include/class/acc_ledger_history.class.php:85 include/modele.inc.php:413
+#: include/compta_fin_rec.inc.php:152 include/compta_fin_rec.inc.php:159
 msgid "Donnée invalide"
 msgstr ""
 
@@ -20300,20 +20680,20 @@ msgstr ""
 
 #: include/upgrade.inc.php:50 include/upgrade.inc.php:45
 #: include/upgrade.inc.php:46 include/class/dossier.class.php:344
-#: include/class/dossier.class.php:344
+#: include/class/dossier.class.php:350
 msgid "Mise à jour de la base de données principale"
 msgstr ""
 
 #: include/upgrade.inc.php:65 include/upgrade.inc.php:60
 #: include/upgrade.inc.php:61 include/class/dossier.class.php:360
-#: include/class/dossier.class.php:360
+#: include/class/dossier.class.php:366
 msgid "Mise à jour dossiers"
 msgstr ""
 
 #: include/upgrade.inc.php:91 include/upgrade.inc.php:86
 #: include/upgrade.inc.php:87 include/upgrade.inc.php:88
 #: include/upgrade.inc.php:89 include/class/dossier.class.php:388
-#: include/class/dossier.class.php:388
+#: include/class/dossier.class.php:394
 msgid "Mise à jour modèles"
 msgstr ""
 
@@ -20324,13 +20704,13 @@ msgstr ""
 
 #: include/template/template_config_form.php:55
 #: include/template/template_config_form.php:63
-#: include/template/template_config_form.php:63
+#: include/template/template_config_form.php:73
 msgid "Adresse Serveur Postgresql"
 msgstr ""
 
 #: include/template/template_config_form.php:59
 #: include/template/template_config_form.php:67
-#: include/template/template_config_form.php:67
+#: include/template/template_config_form.php:77
 msgid "Port de Postgresql"
 msgstr ""
 
@@ -20340,8 +20720,8 @@ msgstr ""
 
 #: include/lib/user_menu.php:122 include/lib/user_menu.php:123
 #: include/lib/user_menu.php:142 include/lib/user_menu.php:80
-#: include/lib/user_menu.php:99 include/lib/user_menu.php:80
-#: include/lib/user_menu.php:99
+#: include/lib/user_menu.php:99 include/lib/user_menu.php:79
+#: include/lib/user_menu.php:98
 msgid "Information système"
 msgstr ""
 
@@ -20393,20 +20773,23 @@ msgstr ""
 #: include/class/anc_listing.class.php:76 include/class/fiche.class.php:2246
 #: html/user_login.php:158 html/ajax_misc.php:462
 #: include/class/fiche.class.php:2247 html/ajax_misc.php:464
-#: include/lib/manage_table_sql.class.php:634 html/user_login.php:158
-#: html/ajax_misc.php:468 include/user.inc.php:138
+#: include/lib/manage_table_sql.class.php:634 html/ajax_misc.php:468
+#: include/ajax/ajax_card.php:292 include/class/acc_ledger.class.php:2201
+#: html/ajax_misc.php:433 html/user_login.php:158
+#: include/compta_fin_saldo.inc.php:44
+#: include/class/pre_operation.class.php:346
+#: include/class/acc_ledger.class.php:2220 include/class/fiche.class.php:2274
+#: include/class/anc_listing.class.php:76 include/ajax/ajax_card.php:298
+#: include/ajax/ajax_navigator.php:46 include/ajax/ajax_boxcard_search.php:46
+#: include/compta_fin_rec.inc.php:263 include/balance.inc.php:302
+#: include/template/result_cat_card_summary.php:5
+#: include/template/tag_select.php:18
 #: include/template/todo_list_list_user.php:31
 #: include/template/anc_key_display_list.php:28
-#: include/template/tag_search_select.php:12 include/template/tag_select.php:16
-#: include/template/fiche_def_list.php:32
-#: include/template/result_cat_card_summary.php:5 include/dossier.inc.php:239
-#: include/compta_fin_saldo.inc.php:44 include/ajax/ajax_card.php:292
-#: include/ajax/ajax_navigator.php:46 include/ajax/ajax_boxcard_search.php:46
-#: include/compta_fin_rec.inc.php:226 include/report.inc.php:142
-#: include/balance.inc.php:302 include/class/pre_operation.class.php:289
-#: include/class/acc_ledger.class.php:2201
-#: include/class/anc_listing.class.php:76 include/class/fiche.class.php:2247
-#: include/lib/manage_table_sql.class.php:634
+#: include/template/tag_search_select.php:15
+#: include/template/fiche_def_list.php:32 include/user.inc.php:138
+#: include/dossier.inc.php:239 include/report.inc.php:142
+#: include/lib/manage_table_sql.class.php:681
 #, php-format
 msgid "Cherche"
 msgstr ""
@@ -20511,9 +20894,9 @@ msgstr ""
 #: include/adm.inc.php:81 include/bank.inc.php:74 include/contact.inc.php:77
 #: include/customer.inc.php:77 include/manager.inc.php:81
 #: include/supplier.inc.php:81 include/adm.inc.php:78
-#: include/customer.inc.php:78 include/contact.inc.php:77
+#: include/customer.inc.php:78 include/bank.inc.php:74 include/adm.inc.php:78
+#: include/supplier.inc.php:81 include/contact.inc.php:78
 #: include/customer.inc.php:78 include/manager.inc.php:81
-#: include/supplier.inc.php:81 include/bank.inc.php:74 include/adm.inc.php:78
 msgid "Cherche "
 msgstr ""
 
@@ -20952,13 +21335,13 @@ msgstr ""
 
 #: include/modele.inc.php:312 include/modele.inc.php:295
 #: include/modele.inc.php:296 include/modele.inc.php:301
-#: include/modele.inc.php:302
+#: include/modele.inc.php:302 include/modele.inc.php:302
 msgid "Inexistant"
 msgstr ""
 
 #: include/modele.inc.php:318 include/modele.inc.php:301
 #: include/modele.inc.php:302 include/modele.inc.php:307
-#: include/modele.inc.php:308
+#: include/modele.inc.php:308 include/modele.inc.php:308
 msgid "Invalide"
 msgstr ""
 
@@ -20967,46 +21350,46 @@ msgid " Utilisateur normal"
 msgstr ""
 
 #: include/param_sec.inc.php:228 include/param_sec.inc.php:162
-#: include/param_sec.inc.php:168 include/param_sec.inc.php:168
+#: include/param_sec.inc.php:168 include/param_sec.inc.php:173
 msgid "Cet utilisateur est administrateur, il a tous les droits"
 msgstr ""
 
 #: include/param_sec.inc.php:231 include/param_sec.inc.php:165
-#: include/param_sec.inc.php:171 include/param_sec.inc.php:171
+#: include/param_sec.inc.php:171 include/param_sec.inc.php:176
 msgid ""
 "Impossible de modifier cet utilisateur dans cet écran, il faut passer par\n"
 "\t\tl'écran administration -> utilisateur."
 msgstr ""
 
 #: include/param_sec.inc.php:242 include/param_sec.inc.php:176
-#: include/param_sec.inc.php:182 include/param_sec.inc.php:182
+#: include/param_sec.inc.php:182 include/param_sec.inc.php:187
 msgid "L'utilisateur n'a pas accès à ce dossier"
 msgstr ""
 
 #: include/param_sec.inc.php:244 include/param_sec.inc.php:178
-#: include/param_sec.inc.php:184 include/param_sec.inc.php:184
+#: include/param_sec.inc.php:184 include/param_sec.inc.php:189
 msgid ""
 "Impossible de modifier cet utilisateur dans cet écran, il faut passer par\n"
 "\t\t\tl'écran administration -> utilisateur."
 msgstr ""
 
 #: include/param_sec.inc.php:278 include/param_sec.inc.php:220
-#: include/param_sec.inc.php:224 include/param_sec.inc.php:224
+#: include/param_sec.inc.php:224 include/param_sec.inc.php:262
 msgid "Accès à tout"
 msgstr ""
 
 #: include/param_sec.inc.php:279 include/param_sec.inc.php:221
-#: include/param_sec.inc.php:225 include/param_sec.inc.php:225
+#: include/param_sec.inc.php:225 include/param_sec.inc.php:263
 msgid "Uniquement Lecture"
 msgstr ""
 
 #: include/param_sec.inc.php:320 include/param_sec.inc.php:260
-#: include/param_sec.inc.php:292 include/param_sec.inc.php:292
+#: include/param_sec.inc.php:292 include/template/security_list_action.php:8
 msgid "Toutes les actions"
 msgstr ""
 
 #: include/param_sec.inc.php:321 include/param_sec.inc.php:261
-#: include/param_sec.inc.php:293 include/param_sec.inc.php:293
+#: include/param_sec.inc.php:293 include/template/security_list_action.php:9
 msgid "Aucune action"
 msgstr ""
 
@@ -21040,7 +21423,7 @@ msgstr ""
 
 #: html/install.php:605 html/install.php:621 html/install.php:613
 #: html/install.php:619 html/install.php:581 html/install.php:571
-#: html/install.php:577 html/install.php:580 html/install.php:580
+#: html/install.php:577 html/install.php:580 html/install.php:630
 #, php-format
 msgid ""
 "La base de donnée %s est vide, \n"
@@ -21070,13 +21453,13 @@ msgid "credit"
 msgstr ""
 
 #: include/export/export_fiche_balance_csv.php:57 include/fiche.inc.php:587
-#: include/fiche.inc.php:596 include/export/export_fiche_balance_csv.php:57
-#: include/fiche.inc.php:596
+#: include/fiche.inc.php:596 include/fiche.inc.php:609
+#: include/export/export_fiche_balance_csv.php:57
 msgid "solde"
 msgstr ""
 
 #: include/export/export_fiche_csv.php:36
-#: include/export/export_fiche_csv.php:36
+#: include/export/export_fiche_csv.php:37
 msgid "fiche"
 msgstr ""
 
@@ -21094,15 +21477,15 @@ msgstr ""
 #: include/export/export_histo_csv.php:40
 #: include/export/export_histo_csv.php:41
 #: include/class/print_ledger_misc.class.php:44 include/compta_ods.inc.php:96
-#: include/compta_ods.inc.php:96 include/export/export_histo_csv.php:41
-#: include/class/print_ledger_misc.class.php:44
+#: include/class/print_ledger_misc.class.php:43 include/compta_ods.inc.php:96
+#: include/export/export_histo_csv.php:44
 msgid "Piece"
 msgstr ""
 
 #: include/export/export_histo_csv.php:44
 #: include/export/export_histo_csv.php:45
 #: include/export/export_histo_csv.php:46
-#: include/export/export_histo_csv.php:46
+#: include/export/export_histo_csv.php:49
 msgid "Montant opération"
 msgstr ""
 
@@ -21121,12 +21504,13 @@ msgstr ""
 #: include/class/acc_ledger_history_generic.class.php:759
 #: include/class/acc_ledger_history_purchase.class.php:240
 #: include/class/acc_ledger_history_purchase.class.php:244
-#: include/export/export_ledger_csv.php:46
 #: include/class/acc_ledger_history_generic.class.php:762
-#: include/class/acc_ledger_history_purchase.class.php:244
+#: include/class/acc_ledger_history_sale.class.php:243
 #: include/class/acc_reconciliation.class.php:487
 #: include/class/acc_reconciliation.class.php:511
-#: include/class/acc_ledger_history_sale.class.php:233
+#: include/class/acc_ledger_history_purchase.class.php:255
+#: include/class/acc_ledger_history_generic.class.php:763
+#: include/export/export_ledger_csv.php:49
 msgid "journal"
 msgstr ""
 
@@ -21150,10 +21534,11 @@ msgstr ""
 #: include/class/acc_ledger_history_purchase.class.php:251
 #: include/export/export_ledger_csv.php:218
 #: include/class/acc_ledger_history_purchase.class.php:255
-#: include/export/export_ledger_csv.php:218
 #: include/class/acc_ledger_history_generic.class.php:767
-#: include/class/acc_ledger_history_purchase.class.php:255
-#: include/class/acc_ledger_history_sale.class.php:244
+#: include/class/acc_ledger_history_sale.class.php:254
+#: include/class/acc_ledger_history_purchase.class.php:266
+#: include/class/acc_ledger_history_generic.class.php:768
+#: include/export/export_ledger_csv.php:226
 msgid "operation"
 msgstr ""
 
@@ -21168,8 +21553,9 @@ msgstr ""
 #: include/class/acc_ledger_history_generic.class.php:765
 #: include/export/export_ledger_csv.php:212
 #: include/export/export_ledger_csv.php:220
-#: include/export/export_ledger_csv.php:220
 #: include/class/acc_ledger_history_generic.class.php:768
+#: include/class/acc_ledger_history_generic.class.php:769
+#: include/export/export_ledger_csv.php:228
 msgid "N° Pièce"
 msgstr ""
 
@@ -21180,7 +21566,7 @@ msgstr ""
 #: include/export/export_ledger_csv.php:213
 #: include/export/export_ledger_csv.php:215
 #: include/export/export_ledger_csv.php:223
-#: include/export/export_ledger_csv.php:223
+#: include/export/export_ledger_csv.php:231
 msgid "commentaire"
 msgstr ""
 
@@ -21195,9 +21581,10 @@ msgstr ""
 #: include/class/acc_ledger_history_generic.class.php:682
 #: include/export/export_ledger_csv.php:216
 #: include/export/export_ledger_csv.php:224
-#: include/export/export_ledger_csv.php:224
 #: include/class/acc_ledger_history_generic.class.php:685
 #: include/class/acc_reconciliation.class.php:484
+#: include/class/acc_ledger_history_generic.class.php:686
+#: include/export/export_ledger_csv.php:232
 msgid "internal"
 msgstr ""
 
@@ -21218,9 +21605,9 @@ msgstr ""
 #: include/class/acc_ledger_history_sale.class.php:248
 #: include/class/acc_ledger_history_purchase.class.php:255
 #: include/class/acc_ledger_history_purchase.class.php:259
-#: include/class/acc_ledger_history_purchase.class.php:259
+#: include/class/acc_ledger_history_sale.class.php:258
 #: include/class/acc_reconciliation.class.php:508
-#: include/class/acc_ledger_history_sale.class.php:248
+#: include/class/acc_ledger_history_purchase.class.php:270
 msgid "interne"
 msgstr ""
 
@@ -21231,7 +21618,7 @@ msgstr ""
 #: include/class/acc_ledger_history_purchase.class.php:256
 #: include/class/acc_ledger_history_purchase.class.php:257
 #: include/class/acc_ledger_history_purchase.class.php:261
-#: include/class/acc_ledger_history_purchase.class.php:261
+#: include/class/acc_ledger_history_purchase.class.php:272
 msgid "privé"
 msgstr ""
 
@@ -21242,7 +21629,7 @@ msgstr ""
 #: include/class/acc_ledger_history_purchase.class.php:257
 #: include/class/acc_ledger_history_purchase.class.php:258
 #: include/class/acc_ledger_history_purchase.class.php:262
-#: include/class/acc_ledger_history_purchase.class.php:262
+#: include/class/acc_ledger_history_purchase.class.php:273
 msgid "DNA"
 msgstr ""
 
@@ -21253,7 +21640,7 @@ msgstr ""
 #: include/class/acc_ledger_history_purchase.class.php:258
 #: include/class/acc_ledger_history_purchase.class.php:259
 #: include/class/acc_ledger_history_purchase.class.php:263
-#: include/class/acc_ledger_history_purchase.class.php:263
+#: include/class/acc_ledger_history_purchase.class.php:274
 msgid "tva non ded."
 msgstr ""
 
@@ -21285,8 +21672,8 @@ msgstr ""
 
 #: include/export/export_stock_histo_csv.php:42
 #: include/export/export_stock_resume_list.php:38
-#: include/export/export_stock_histo_csv.php:42
 #: include/export/export_stock_resume_list.php:38
+#: include/export/export_stock_histo_csv.php:42
 msgid "Depot"
 msgstr ""
 
@@ -21302,8 +21689,8 @@ msgstr ""
 
 #: include/export/export_stock_resume_list.php:38
 #: include/template/impress_reconciliation.php:65
-#: include/template/impress_reconciliation.php:65
 #: include/export/export_stock_resume_list.php:38
+#: include/template/impress_reconciliation.php:65
 msgid "Delta"
 msgstr ""
 
@@ -21364,22 +21751,22 @@ msgstr ""
 msgid "nom journal"
 msgstr ""
 
-#: include/compta_fin_rec.inc.php:151 include/compta_fin_rec.inc.php:151
+#: include/compta_fin_rec.inc.php:151 include/compta_fin_rec.inc.php:188
 msgid "Attention : Fichier non chargé"
 msgstr ""
 
 #: include/compta_fin_rec.inc.php:299 include/compta_fin_rec.inc.php:300
-#: include/compta_fin_rec.inc.php:300
+#: include/compta_fin_rec.inc.php:341
 msgid "Différence relevé"
 msgstr ""
 
 #: include/compta_fin_rec.inc.php:303 include/compta_fin_rec.inc.php:304
-#: include/compta_fin_rec.inc.php:304
+#: include/compta_fin_rec.inc.php:345
 msgid "Montant sélectionné"
 msgstr ""
 
 #: include/compta_fin_rec.inc.php:306 include/compta_fin_rec.inc.php:307
-#: include/compta_fin_rec.inc.php:307
+#: include/compta_fin_rec.inc.php:348
 msgid "Reste à selectionner"
 msgstr ""
 
@@ -21439,8 +21826,8 @@ msgstr ""
 #: html/install.php:213 html/install.php:543 html/install.php:599
 #: html/install.php:625 html/install.php:549 html/install.php:606
 #: html/install.php:632 html/install.php:552 html/install.php:635
-#: html/install.php:213 html/install.php:552 html/install.php:609
-#: html/install.php:635
+#: html/install.php:259 html/install.php:602 html/install.php:659
+#: html/install.php:688 include/class/follow_up.class.php:731
 msgid "Important"
 msgstr ""
 
@@ -21450,43 +21837,42 @@ msgstr ""
 #: html/install.php:610 html/install.php:634 html/install.php:214
 #: html/install.php:600 html/install.php:626 html/install.php:607
 #: html/install.php:633 html/install.php:217 html/install.php:636
-#: html/install.php:217 html/install.php:610 html/install.php:636
+#: html/install.php:264 html/install.php:660 html/install.php:689
 msgid "Utilisateur administrateur"
 msgstr ""
 
 #: html/install.php:594 html/install.php:586 html/install.php:592
 #: html/install.php:554 html/install.php:544 html/install.php:550
-#: html/install.php:553 html/install.php:553
+#: html/install.php:553 html/install.php:603
 msgid "Utilisateur  administrateur"
 msgstr ""
 
 #: html/install.php:651 html/install.php:643 html/install.php:649
 #: html/install.php:611 html/install.php:601 html/install.php:608
-#: html/install.php:611
 msgid "Mot de passe par défaut à l'installation"
 msgstr ""
 
 #: include/param_sec.inc.php:285 include/param_sec.inc.php:227
 #: include/param_sec.inc.php:280 include/param_sec.inc.php:258
-#: include/param_sec.inc.php:337 include/param_sec.inc.php:258
-#: include/param_sec.inc.php:337
+#: include/param_sec.inc.php:337 include/param_sec.inc.php:269
+#: include/param_sec.inc.php:352
 msgid "Uniquement lecture"
 msgstr ""
 
 #: include/param_sec.inc.php:286 include/param_sec.inc.php:228
 #: include/param_sec.inc.php:278 include/param_sec.inc.php:259
-#: include/param_sec.inc.php:335 include/param_sec.inc.php:259
-#: include/param_sec.inc.php:335
+#: include/param_sec.inc.php:335 include/param_sec.inc.php:270
+#: include/param_sec.inc.php:350
 msgid "Lecture et écriture"
 msgstr ""
 
 #: include/param_sec.inc.php:319 include/param_sec.inc.php:259
-#: include/param_sec.inc.php:291 include/param_sec.inc.php:291
+#: include/param_sec.inc.php:291 include/param_sec.inc.php:303
 msgid "Actions"
 msgstr ""
 
 #: include/param_sec.inc.php:324 include/param_sec.inc.php:264
-#: include/param_sec.inc.php:321 include/param_sec.inc.php:321
+#: include/param_sec.inc.php:321 include/param_sec.inc.php:336
 msgid "imprime"
 msgstr ""
 
@@ -21495,22 +21881,24 @@ msgid "Annule"
 msgstr ""
 
 #: include/template/detail-action.php:167
-#: include/template/detail-action.php:167
+#: include/template/detail-action.php:174
 msgid "Opérations concernées"
 msgstr ""
 
 #: include/template/detail-action.php:168
-#: include/template/detail-action.php:168
+#: include/template/detail-action.php:175
 msgid "Dépendant"
 msgstr ""
 
 #: include/template/param_jrn.php:136 include/template/param_jrn.php:143
 #: include/template/param_jrn.php:145 include/template/param_jrn.php:190
+#: include/template/param_jrn.php:191
 msgid "Services, fournitures ou biens  achetés (D)"
 msgstr ""
 
 #: include/template/param_jrn.php:139 include/template/param_jrn.php:146
 #: include/template/param_jrn.php:148 include/template/param_jrn.php:193
+#: include/template/param_jrn.php:194
 msgid "Fournisseurs (C)"
 msgstr ""
 
@@ -21524,11 +21912,12 @@ msgstr ""
 
 #: include/template/param_jrn.php:251 include/template/param_jrn.php:258
 #: include/template/param_jrn.php:260 include/template/param_jrn.php:305
+#: include/template/param_jrn.php:306
 msgid "Fiches utilisables (D/C)"
 msgstr ""
 
 #: include/template/template_config_form.php:56
-#: include/template/template_config_form.php:56
+#: include/template/template_config_form.php:57
 msgid "Administrateur de noalyss"
 msgstr ""
 
@@ -21608,7 +21997,7 @@ msgstr ""
 #: include/class/follow_up.class.php:1923
 #: include/class/follow_up.class.php:1921
 #: include/class/follow_up.class.php:1922
-#: include/class/follow_up.class.php:1922
+#: include/class/follow_up.class.php:1871
 msgid "Principal"
 msgstr ""
 
@@ -21617,7 +22006,7 @@ msgstr ""
 #: include/class/follow_up.class.php:1950
 #: include/class/follow_up.class.php:1948
 #: include/class/follow_up.class.php:1949
-#: include/class/follow_up.class.php:1949
+#: include/class/follow_up.class.php:1901
 msgid "direct parent "
 msgstr ""
 
@@ -21733,7 +22122,7 @@ msgstr ""
 #: include/class/class_anc_grandlivre.php:146
 #: include/class/anc_grandlivre.class.php:167
 #: include/class/anc_grandlivre.class.php:168
-#: include/class/anc_grandlivre.class.php:168
+#: include/class/anc_grandlivre.class.php:180
 msgid ""
 "Les extensions CONVERT_GIF_PDF et PDFTK pour convertir en pdf ne sont pas "
 "installées "
@@ -21741,8 +22130,8 @@ msgstr ""
 
 #: include/dossier.inc.php:342 include/ajax/ajax_admin.php:213
 #: include/dossier.inc.php:347 include/ajax/ajax_admin.php:234
-#: include/ajax/ajax_admin.php:238 include/dossier.inc.php:347
-#: include/ajax/ajax_admin.php:238
+#: include/ajax/ajax_admin.php:238 include/ajax/ajax_admin.php:238
+#: include/dossier.inc.php:347
 msgid "Max. email / jour (-1 = illimité)"
 msgstr ""
 
@@ -21856,7 +22245,7 @@ msgstr ""
 #: include/lib/class_sendmail.php:96 include/lib/class_sendmail.php:97
 #: include/lib/class_sendmail.php:98 include/lib/sendmail.class.php:98
 #: include/lib/sendmail.class.php:102 include/lib/sendmail_core.class.php:105
-#: include/lib/sendmail_core.class.php:105
+#: include/lib/sendmail_core.class.php:106
 #, php-format
 msgid "%s est vide"
 msgstr ""
@@ -21964,6 +22353,7 @@ msgstr ""
 #: include/ext/import_account/include/class_impacc_export.php:104
 #: include/ext/import_account/include/impacc_export.class.php:104
 #: include/class/acc_ledger.class.php:2938
+#: include/class/acc_ledger.class.php:2962
 msgid "Journal invalide"
 msgstr ""
 
@@ -21994,6 +22384,7 @@ msgstr ""
 #: include/ext/import_account/include/class_impacc_tva.php:76
 #: include/ext/import_account/include/impacc_tva.class.php:64
 #: include/ext/import_account/include/impacc_tva.class.php:76
+#: include/template/ledger_detail_bottom.php:354
 msgid "Duplicate"
 msgstr ""
 
@@ -22042,7 +22433,7 @@ msgstr ""
 #: include/balance.inc.php:458 include/export/export_balance_pdf.php:334
 #: include/export/export_balance_pdf.php:329
 #: include/export/export_balance_pdf.php:330
-#: include/export/export_balance_pdf.php:330 include/balance.inc.php:458
+#: include/export/export_balance_pdf.php:331 include/balance.inc.php:458
 msgid "Résumé Exercice précédent"
 msgstr ""
 
@@ -22051,7 +22442,7 @@ msgstr ""
 #: include/balance.inc.php:465 include/export/export_balance_pdf.php:341
 #: include/export/export_balance_pdf.php:336
 #: include/export/export_balance_pdf.php:337
-#: include/export/export_balance_pdf.php:337 include/balance.inc.php:465
+#: include/export/export_balance_pdf.php:338 include/balance.inc.php:465
 msgid "Résumé Exercice courant"
 msgstr ""
 
@@ -22063,6 +22454,7 @@ msgstr ""
 
 #: include/compta_ach.inc.php:184 include/compta_ach.inc.php:186
 #: include/compta_ach.inc.php:191 include/compta_ach.inc.php:189
+#: include/compta_ach.inc.php:188
 #, php-format
 msgid "Extourné au %s"
 msgstr ""
@@ -22073,7 +22465,7 @@ msgstr ""
 
 #: include/lib/ac_common.php:567 include/lib/ac_common.php:568
 #: include/lib/ac_common.php:570 include/lib/ac_common.php:586
-#: include/lib/ac_common.php:586
+#: include/lib/ac_common.php:596
 msgid "paramètre invalide"
 msgstr ""
 
@@ -22087,7 +22479,7 @@ msgstr ""
 #: include/lib/manage_table_sql.class.php:1025
 #: include/lib/manage_table_sql.class.php:1022
 #: include/lib/manage_table_sql.class.php:1066
-#: include/lib/manage_table_sql.class.php:1066
+#: include/lib/manage_table_sql.class.php:1122
 msgid "OK"
 msgstr ""
 
@@ -22097,7 +22489,7 @@ msgstr ""
 #: include/lib/manage_table_sql.class.php:1028
 #: include/lib/manage_table_sql.class.php:1025
 #: include/lib/manage_table_sql.class.php:1069
-#: include/lib/manage_table_sql.class.php:1069
+#: include/lib/manage_table_sql.class.php:1125
 msgid "Cancel"
 msgstr ""
 
@@ -22151,6 +22543,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2826
 #: include/class/acc_ledger.class.php:2835
 #: include/class/acc_ledger.class.php:2874
+#: include/class/acc_ledger.class.php:2898
 msgid "Opération identique"
 msgstr ""
 
@@ -22180,6 +22573,8 @@ msgstr ""
 #: include/class/pdf_operation.class.php:422
 #: include/class/pdf_operation.class.php:421
 #: include/class/pdf_operation.class.php:422
+#: include/template/follow_up_detail_display.php:45
+#: include/template/action_document_type_mtable_input.php:73
 msgid "Détail opération"
 msgstr ""
 
@@ -22282,7 +22677,7 @@ msgstr ""
 msgid "Erreur ouverture fichier %s "
 msgstr ""
 
-#: include/card_attr.inc.php:155 include/card_attr.inc.php:155
+#: include/card_attr.inc.php:155
 msgid "Nouvel attribut"
 msgstr ""
 
@@ -22292,7 +22687,6 @@ msgid "Domaine"
 msgstr ""
 
 #: html/install.php:297 html/install.php:304 html/install.php:307
-#: html/install.php:307
 msgid "Version PHP trop basse , minimum 5.4"
 msgstr ""
 
@@ -22314,7 +22708,7 @@ msgstr ""
 msgid "Vous devez choisir au moins une ligne"
 msgstr ""
 
-#: include/compta_fin_rec.inc.php:339 include/compta_fin_rec.inc.php:339
+#: include/compta_fin_rec.inc.php:339 include/compta_fin_rec.inc.php:380
 msgid "Pièce justificative"
 msgstr ""
 
@@ -22339,17 +22733,17 @@ msgid "TOTAUX"
 msgstr ""
 
 #: include/database.item.php:7 include/database.item.php:136
-#: include/database.item.php:134 include/database.item.php:136
+#: include/database.item.php:134 include/database.item.php:135
 msgid "Exporte la pièce"
 msgstr ""
 
 #: include/database.item.php:8 include/database.item.php:137
-#: include/database.item.php:135 include/database.item.php:137
+#: include/database.item.php:135 include/database.item.php:136
 msgid "Export le document"
 msgstr ""
 
 #: include/database.item.php:9 include/database.item.php:138
-#: include/database.item.php:136 include/database.item.php:138
+#: include/database.item.php:136 include/database.item.php:137
 msgid "Exporte le modèle de document"
 msgstr ""
 
@@ -22368,7 +22762,7 @@ msgid "Avec Détails opérations "
 msgstr ""
 
 #: include/opening.inc.php:84 include/compta_ods.inc.php:96
-#: include/compta_ods.inc.php:96 include/opening.inc.php:84
+#: include/opening.inc.php:84 include/compta_ods.inc.php:96
 msgid "Opération enregistrée"
 msgstr ""
 
@@ -22409,7 +22803,7 @@ msgid "Ecriture d'ouverture %d"
 msgstr ""
 
 #: include/operation_ods_new.inc.php:43 include/operation_ods_new.inc.php:44
-#: include/operation_ods_new.inc.php:44
+#: include/operation_ods_new.inc.php:45
 msgid ""
 "Vous ne pouvez pas écrire dans ce journal, contactez votre administrateur"
 msgstr ""
@@ -22418,16 +22812,16 @@ msgstr ""
 msgid "Type d'utilisateur"
 msgstr ""
 
-#: include/param_sec.inc.php:85 include/param_sec.inc.php:85
+#: include/param_sec.inc.php:85 include/param_sec.inc.php:86
 msgid "prénom"
 msgstr ""
 
-#: include/param_sec.inc.php:86 include/param_sec.inc.php:86
+#: include/param_sec.inc.php:86 include/param_sec.inc.php:87
 msgid "profil"
 msgstr ""
 
 #: include/param_sec.inc.php:135 include/param_sec.inc.php:141
-#: include/param_sec.inc.php:141
+#: include/category_followup.inc.php:50 include/param_sec.inc.php:146
 msgid "retour"
 msgstr ""
 
@@ -22448,16 +22842,15 @@ msgid "Ajouter un dépôt"
 msgstr ""
 
 #: include/template/form_ledger_detail.php:15
-#: include/template/form_ledger_detail.php:15
+#: include/template/form_ledger_detail.php:18
 msgid "Modèle opération"
 msgstr ""
 
 #: include/template/impress_reconciliation_detail.php:25
 #: include/class/tva_rate_mtable.class.php:51
 #: include/class/tva_rate_mtable.class.php:57
-#: include/template/impress_reconciliation_detail.php:25
 #: include/class/tva_rate_mtable.class.php:51
-#: include/class/tva_rate_mtable.class.php:57
+#: include/template/impress_reconciliation_detail.php:25
 msgid "Autoliquidation"
 msgstr ""
 
@@ -22474,16 +22867,19 @@ msgstr ""
 #: include/template/ledger_detail_bottom.php:200
 #: include/template/ledger_detail_bottom.php:217
 #: include/template/ledger_detail_bottom.php:214
+#: include/template/ledger_detail_bottom.php:232
 msgid "delta"
 msgstr ""
 
 #: include/template/param_jrn.php:194 include/template/param_jrn.php:201
 #: include/template/param_jrn.php:203 include/template/param_jrn.php:248
+#: include/template/param_jrn.php:249
 msgid "Clients (D)"
 msgstr ""
 
 #: include/template/param_jrn.php:197 include/template/param_jrn.php:204
 #: include/template/param_jrn.php:206 include/template/param_jrn.php:251
+#: include/template/param_jrn.php:252
 msgid "Services, fournitures ou biens  vendus (C)"
 msgstr ""
 
@@ -22492,12 +22888,12 @@ msgid "Nouveau format"
 msgstr ""
 
 #: include/lib/http_input.class.php:78 include/lib/http_input.class.php:85
-#: include/lib/http_input.class.php:87 include/lib/http_input.class.php:87
+#: include/lib/http_input.class.php:87 include/lib/http_input.class.php:125
 msgid "Unknown type"
 msgstr ""
 
 #: include/lib/icard.class.php:222 include/lib/icard.class.php:223
-#: include/lib/icard.class.php:224 include/lib/icard.class.php:224
+#: include/lib/icard.class.php:224 include/lib/icard.class.php:225
 msgid "Le nom d une icard doit être donne"
 msgstr ""
 
@@ -22506,12 +22902,12 @@ msgid "Faites un choix"
 msgstr ""
 
 #: include/lib/inplace_edit.class.php:79 include/lib/inplace_edit.class.php:78
-#: include/lib/inplace_edit.class.php:78
+#: include/lib/inplace_edit.class.php:81
 msgid "ok"
 msgstr ""
 
 #: include/lib/inplace_edit.class.php:80 include/lib/inplace_edit.class.php:79
-#: include/lib/inplace_edit.class.php:79
+#: include/lib/inplace_edit.class.php:82
 msgid "cancel"
 msgstr ""
 
@@ -22528,16 +22924,17 @@ msgstr ""
 
 #: include/ajax/ajax_anc_plan.php:56 include/class/anc_plan.class.php:126
 #: include/ajax/ajax_anc_plan.php:59 include/ajax/ajax_anc_plan.php:60
-#: include/ajax/ajax_anc_plan.php:60 include/class/anc_plan.class.php:126
+#: include/class/anc_plan.class.php:127 include/ajax/ajax_anc_plan.php:60
 msgid "Aucune description"
 msgstr ""
 
 #: include/ajax/ajax_card.php:356 include/ajax/ajax_card.php:359
-#: include/ajax/ajax_card.php:360
+#: include/ajax/ajax_card.php:360 include/ajax/ajax_card.php:393
 msgid "Erreur sauvegarde"
 msgstr ""
 
 #: include/ajax/ajax_search_filter.php:73
+#: include/class/action_document_type_mtable.class.php:106
 #: include/ajax/ajax_search_filter.php:73
 msgid "Nom ne peut être vide"
 msgstr ""
@@ -22584,8 +22981,8 @@ msgstr ""
 
 #: include/export/export_gl_pdf.php:88
 #: include/export/export_poste_detail_pdf.php:100
-#: include/export/export_gl_pdf.php:88
 #: include/export/export_poste_detail_pdf.php:100
+#: include/export/export_gl_pdf.php:88
 msgid "Let"
 msgstr ""
 
@@ -22626,6 +23023,7 @@ msgid " Sécurité"
 msgstr ""
 
 #: include/export/export_security_pdf.php:104
+#: include/class/card_attribut_mtable.class.php:155
 #: include/export/export_security_pdf.php:104
 msgid "Bloqué"
 msgstr ""
@@ -22695,7 +23093,7 @@ msgstr ""
 
 #: include/class/acc_account_ledger.class.php:392
 #: include/class/acc_account_ledger.class.php:393
-#: include/class/acc_account_ledger.class.php:393
+#: include/class/acc_account_ledger.class.php:385
 msgid "n° de pièce"
 msgstr ""
 
@@ -22704,6 +23102,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:798
 #: include/class/acc_ledger.class.php:803
 #: include/class/acc_ledger.class.php:819
+#: include/class/acc_ledger.class.php:807
 msgid "Modèle d'opération"
 msgstr ""
 
@@ -22712,6 +23111,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:981
 #: include/class/acc_ledger.class.php:986
 #: include/class/acc_ledger.class.php:1002
+#: include/class/acc_ledger.class.php:994
 #, php-format
 msgid "Réconciliation/rapprochements : %s"
 msgstr ""
@@ -22723,7 +23123,7 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:259
 #: include/class/acc_ledger_search.class.php:246
 #: include/class/acc_ledger_search.class.php:248
-#: include/class/acc_ledger_search.class.php:248
+#: include/class/acc_ledger_search.class.php:262
 msgid "Nom du filtre"
 msgstr ""
 
@@ -22731,7 +23131,7 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:1070
 #: include/class/acc_ledger_search.class.php:1078
 #: include/class/acc_ledger_search.class.php:1091
-#: include/class/acc_ledger_search.class.php:1091
+#: include/class/acc_ledger_search.class.php:1180
 msgid "Inverser sel"
 msgstr ""
 
@@ -22739,7 +23139,7 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:1072
 #: include/class/acc_ledger_search.class.php:1080
 #: include/class/acc_ledger_search.class.php:1093
-#: include/class/acc_ledger_search.class.php:1093
+#: include/class/acc_ledger_search.class.php:1182
 msgid "Effacer sel"
 msgstr ""
 
@@ -22747,7 +23147,7 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:1080
 #: include/class/acc_ledger_search.class.php:1088
 #: include/class/acc_ledger_search.class.php:1101
-#: include/class/acc_ledger_search.class.php:1101
+#: include/class/acc_ledger_search.class.php:1190
 msgid "Op.Diverses"
 msgstr ""
 
@@ -22822,14 +23222,14 @@ msgstr ""
 #: include/class/acc_plan_mtable.class.php:127
 #: include/class/acc_plan_mtable.class.php:139
 #: include/class/acc_plan_mtable.class.php:163
-#: include/class/acc_plan_mtable.class.php:163
+#: include/class/acc_plan_mtable.class.php:167
 msgid "Poste comptable est unique"
 msgstr ""
 
 #: include/class/acc_plan_mtable.class.php:130
 #: include/class/acc_plan_mtable.class.php:142
 #: include/class/acc_plan_mtable.class.php:166
-#: include/class/acc_plan_mtable.class.php:166
+#: include/class/acc_plan_mtable.class.php:170
 msgid "Poste comptable ne peut être vide"
 msgstr ""
 
@@ -22846,25 +23246,25 @@ msgstr ""
 #: include/class/fiche.class.php:849 include/class/fiche.class.php:995
 #: include/class/fiche.class.php:996 include/class/fiche.class.php:1036
 #: include/class/fiche.class.php:850 include/class/fiche.class.php:997
-#: include/class/fiche.class.php:1037
-#: include/class/acc_plan_mtable.class.php:170
-#: include/class/fiche.class.php:819 include/class/fiche.class.php:849
-#: include/class/fiche.class.php:850 include/class/fiche.class.php:996
-#: include/class/fiche.class.php:997 include/class/fiche.class.php:1037
+#: include/class/fiche.class.php:1037 include/class/fiche.class.php:846
+#: include/class/fiche.class.php:876 include/class/fiche.class.php:877
+#: include/class/fiche.class.php:1023 include/class/fiche.class.php:1024
+#: include/class/fiche.class.php:1064
+#: include/class/acc_plan_mtable.class.php:174
 msgid "Poste comptable trop long"
 msgstr ""
 
 #: include/class/acc_plan_mtable.class.php:137
 #: include/class/acc_plan_mtable.class.php:149
 #: include/class/acc_plan_mtable.class.php:173
-#: include/class/acc_plan_mtable.class.php:173
+#: include/class/acc_plan_mtable.class.php:177
 msgid "Poste comptable dépendant ne peut pas être vide"
 msgstr ""
 
 #: include/class/acc_plan_mtable.class.php:145
 #: include/class/acc_plan_mtable.class.php:157
 #: include/class/acc_plan_mtable.class.php:181
-#: include/class/acc_plan_mtable.class.php:181
+#: include/class/acc_plan_mtable.class.php:185
 msgid "Compte parent n'existe pas"
 msgstr ""
 
@@ -22900,35 +23300,36 @@ msgstr ""
 msgid "Num Pièce"
 msgstr ""
 
-#: include/class/anc_table.class.php:233 include/class/anc_table.class.php:233
+#: include/class/anc_table.class.php:233 include/fiche.inc.php:285
+#: include/class/anc_table.class.php:233
 msgid "Export en CSV"
 msgstr ""
 
 #: include/class/fiche.class.php:838 include/class/fiche.class.php:840
 #: include/class/fiche.class.php:843 include/class/fiche.class.php:844
-#: include/class/fiche.class.php:844
+#: include/class/fiche.class.php:871
 msgid "Désolé, il y a trop de virgule dans le poste comptable "
 msgstr ""
 
 #: include/class/fiche.class.php:1047 include/class/fiche.class.php:1049
 #: include/class/fiche.class.php:1063 include/class/fiche.class.php:1064
-#: include/class/fiche.class.php:1064
+#: include/class/fiche.class.php:1091
 msgid "opération annulée"
 msgstr ""
 
 #: include/class/pre_operation.class.php:285
 #: include/class/pre_operation.class.php:286
-#: include/class/pre_operation.class.php:286
+#: include/class/pre_operation.class.php:343
 msgid "Vous n'avez encore sauvé aucun modèle"
 msgstr ""
 
 #: html/ajax_misc.php:288 html/ajax_misc.php:290 html/ajax_misc.php:296
-#: html/ajax_misc.php:298 html/ajax_misc.php:298
+#: html/ajax_misc.php:298 html/ajax_misc.php:313
 msgid "Invalide type"
 msgstr ""
 
 #: html/ajax_misc.php:452 html/ajax_misc.php:454 html/ajax_misc.php:460
-#: html/ajax_misc.php:462 html/ajax_misc.php:466
+#: html/ajax_misc.php:462 html/ajax_misc.php:466 html/ajax_misc.php:431
 msgid "Choisissez la TVA"
 msgstr ""
 
@@ -22936,18 +23337,17 @@ msgstr ""
 msgid "cliquez ici pour mettre à jour "
 msgstr ""
 
-#: html/install.php:142 html/install.php:142
+#: html/install.php:142 html/install.php:155
 msgid ""
 "Indiquez ici le répertoire où les documents temporaires peuvent être sauvés "
 "exemple c:/temp, /tmp"
 msgstr ""
 
-#: html/install.php:370 html/install.php:373 html/install.php:373
+#: html/install.php:370 html/install.php:373 html/install.php:422
 msgid "open_basedir empêche certaines fonctions de Noalyss,mettez-le à vide "
 msgstr ""
 
 #: html/install.php:404 html/install.php:410 html/install.php:413
-#: html/install.php:413
 msgid ""
 " Vous devez absolument utiliser au minimum une version 9.0 de PostGresql, si "
 "votre distribution n'en\n"
@@ -22957,19 +23357,19 @@ msgid ""
 msgstr ""
 
 #: html/install.php:629 html/install.php:636 html/install.php:639
-#: html/install.php:639
+#: html/install.php:692
 #, php-format
 msgid "VOUS DEVEZ EFFACER CE FICHIER %s"
 msgstr ""
 
 #: html/install.php:632 html/install.php:592 html/install.php:639
-#: html/install.php:595 html/install.php:642 html/install.php:595
-#: html/install.php:642
+#: html/install.php:595 html/install.php:642 html/install.php:645
+#: html/install.php:695
 msgid "Tout est installé"
 msgstr ""
 
 #: html/install.php:636 html/install.php:643 html/install.php:646
-#: html/install.php:646
+#: html/install.php:699
 msgid "Essai effacement install.php et se connecter à NOALYSS"
 msgstr ""
 
@@ -22997,8 +23397,8 @@ msgstr ""
 #: include/class/acc_operation.class.php:727
 #: include/export/export_balance_pdf.php:132
 #: include/export/export_balance_pdf.php:133
-#: include/export/export_balance_pdf.php:133 include/balance.inc.php:314
 #: include/class/acc_operation.class.php:727
+#: include/export/export_balance_pdf.php:133 include/balance.inc.php:314
 msgid "Ouverture"
 msgstr ""
 
@@ -23010,12 +23410,13 @@ msgstr ""
 
 #: include/compta_ach.inc.php:109 include/compta_ven.inc.php:116
 #: include/operation_ods_confirm.inc.php:67 include/compta_ven.inc.php:114
-#: include/compta_ach.inc.php:107 include/operation_ods_confirm.inc.php:67
+#: include/compta_ach.inc.php:107 include/compta_ven.inc.php:114
+#: include/compta_ach.inc.php:106 include/operation_ods_confirm.inc.php:67
 msgid "Message extourne"
 msgstr ""
 
 #: include/database.item.php:89 include/database.item.php:87
-#: include/database.item.php:89
+#: include/database.item.php:88
 msgid ""
 "Chargement de modèles de documents qui seront générés par NOALYSS, les "
 "formats utilisables sont libreoffice, html, text et rtf"
@@ -23035,10 +23436,12 @@ msgid "Détails TVA"
 msgstr ""
 
 #: include/modele.inc.php:269 include/modele.inc.php:270
+#: include/modele.inc.php:270
 msgid "Modèles locaux"
 msgstr ""
 
 #: include/modele.inc.php:326 include/modele.inc.php:327
+#: include/modele.inc.php:327
 msgid "Modèles disponibles dans le dépôt"
 msgstr ""
 
@@ -23052,51 +23455,51 @@ msgstr ""
 
 #: include/operation_ods_confirm.inc.php:54
 #: include/template/ledger_detail_bottom.php:155
-#: include/template/ledger_detail_bottom.php:155
+#: include/template/ledger_detail_bottom.php:160
 #: include/operation_ods_confirm.inc.php:54
 msgid "Type opération"
 msgstr ""
 
-#: include/param_sec.inc.php:87 include/param_sec.inc.php:87
+#: include/param_sec.inc.php:87 include/param_sec.inc.php:88
 msgid "Séc. Journaux actif"
 msgstr ""
 
-#: include/param_sec.inc.php:88 include/param_sec.inc.php:88
+#: include/param_sec.inc.php:88 include/param_sec.inc.php:89
 msgid "Séc. Action actif"
 msgstr ""
 
-#: include/param_sec.inc.php:231 include/param_sec.inc.php:231
+#: include/param_sec.inc.php:231 include/param_sec.inc.php:234
 msgid "Sécurité sur les journaux"
 msgstr ""
 
 #: include/param_sec.inc.php:237 include/param_sec.inc.php:302
-#: include/param_sec.inc.php:237 include/param_sec.inc.php:302
+#: include/param_sec.inc.php:240 include/param_sec.inc.php:313
 msgid "Les administrateurs NOALYSS ont toujours accès à tout"
 msgstr ""
 
-#: include/param_sec.inc.php:298 include/param_sec.inc.php:298
+#: include/param_sec.inc.php:298 include/param_sec.inc.php:309
 msgid "Sécurité sur les actions"
 msgstr ""
 
-#: include/periode.inc.php:88 include/periode.inc.php:88
+#: include/periode.inc.php:88 include/periode.inc.php:86
 msgid "Montrer l'exercice"
 msgstr ""
 
-#: include/periode.inc.php:94 include/periode.inc.php:94
+#: include/periode.inc.php:94 include/periode.inc.php:95
 msgid "Fermer les périodes sélectionnées"
 msgstr ""
 
-#: include/periode.inc.php:102 include/periode.inc.php:102
+#: include/periode.inc.php:102 include/periode.inc.php:103
 msgid "Ajout exercice"
 msgstr ""
 
 #: include/periode.inc.php:113 include/class/periode.class.php:687
-#: include/class/periode.class.php:689 include/periode.inc.php:113
-#: include/class/periode.class.php:691
+#: include/class/periode.class.php:689 include/class/periode.class.php:691
+#: include/class/periode.class.php:692 include/periode.inc.php:114
 msgid "Ajout période"
 msgstr ""
 
-#: include/periode.inc.php:126 include/periode.inc.php:126
+#: include/periode.inc.php:126 include/periode.inc.php:127
 msgid "Pour ajouter, effacer ou modifier une période, il faut choisir global"
 msgstr ""
 
@@ -23153,28 +23556,28 @@ msgid "Les extensions doivent être activées dans le dossier après installatio
 msgstr ""
 
 #: include/upgrade-plugin.php:53 include/upgrade-plugin.php:65
-#: include/upgrade-plugin.php:65
+#: include/upgrade-plugin.php:68
 msgid "Auteur"
 msgstr ""
 
 #: include/upgrade-plugin.php:91 include/upgrade-plugin.php:103
-#: include/upgrade-plugin.php:103
+#: include/upgrade-plugin.php:106
 msgid "MultiModule"
 msgstr ""
 
 #: include/upgrade-plugin.php:98 include/upgrade-plugin.php:110
-#: include/upgrade-plugin.php:110
+#: include/upgrade-plugin.php:113
 #, php-format
 msgid "Nouvelle version disponible %s , votre version %s"
 msgstr ""
 
 #: include/upgrade-plugin.php:105 include/upgrade-plugin.php:117
-#: include/upgrade-plugin.php:117
+#: include/upgrade-plugin.php:120
 msgid "Dernière version installée"
 msgstr ""
 
 #: include/upgrade-plugin.php:112 include/upgrade-plugin.php:124
-#: include/upgrade-plugin.php:124
+#: include/upgrade-plugin.php:127
 msgid "Non installée"
 msgstr ""
 
@@ -23204,7 +23607,7 @@ msgid "Date création"
 msgstr ""
 
 #: include/template/param_jrn.php:125 include/template/param_jrn.php:127
-#: include/template/param_jrn.php:171
+#: include/template/param_jrn.php:171 include/template/param_jrn.php:172
 msgid "Journal actif"
 msgstr ""
 
@@ -23273,12 +23676,12 @@ msgid "Tag actif"
 msgstr ""
 
 #: include/template/tag_search_select.php:13
-#: include/template/tag_search_select.php:13
+#: include/template/tag_search_select.php:16
 msgid "Uniquement actif"
 msgstr ""
 
 #: include/template/tag_search_select.php:45
-#: include/template/tag_search_select.php:45
+#: include/template/tag_search_select.php:48
 msgid "non actif"
 msgstr ""
 
@@ -23339,7 +23742,7 @@ msgid ""
 msgstr ""
 
 #: include/lib/ac_common.php:811 include/lib/ac_common.php:813
-#: include/lib/ac_common.php:829 include/lib/ac_common.php:829
+#: include/lib/ac_common.php:829 include/lib/ac_common.php:839
 msgid "Format Invalide"
 msgstr ""
 
@@ -23357,12 +23760,10 @@ msgid "Autoliquidation : Utilisé en même temps au crédit et au débit"
 msgstr ""
 
 #: include/lib/message_javascript.php:75 include/lib/message_javascript.php:77
-#: include/lib/message_javascript.php:77
 msgid "Ne donner pas ce poste comptable si ce code n'est pas utilisé à l'achat"
 msgstr ""
 
 #: include/lib/message_javascript.php:76 include/lib/message_javascript.php:78
-#: include/lib/message_javascript.php:78
 msgid ""
 "Ne donner pas ce poste comptable si ce code n'est pas utilisé  à la vente"
 msgstr ""
@@ -23373,7 +23774,7 @@ msgid "Encodage invalide"
 msgstr ""
 
 #: include/lib/user_menu.php:121 include/lib/user_menu.php:78
-#: include/lib/user_menu.php:78
+#: include/lib/user_menu.php:77
 msgid "Installation Mise à jour du système et des bases de données"
 msgstr ""
 
@@ -23393,6 +23794,7 @@ msgid "Modèle installé "
 msgstr ""
 
 #: include/ajax/ajax_card.php:619 include/ajax/ajax_card.php:642
+#: include/ajax/ajax_card.php:756
 msgid "Fiche non effacée"
 msgstr ""
 
@@ -23400,7 +23802,7 @@ msgstr ""
 msgid "Erreur exercice invalide"
 msgstr ""
 
-#: include/ajax/ajax_periode.php:291 include/ajax/ajax_periode.php:291
+#: include/ajax/ajax_periode.php:291 include/ajax/ajax_periode.php:261
 msgid "Invalid command"
 msgstr ""
 
@@ -23460,12 +23862,12 @@ msgid "Attribut déjà ajouté"
 msgstr ""
 
 #: include/ajax/ajax_template_cat_category.php:92
-#: include/ajax/ajax_template_cat_category.php:92
+#: include/ajax/ajax_template_cat_category.php:91
 msgid "Attribut déjà utilisé"
 msgstr ""
 
 #: include/ajax/ajax_template_cat_category.php:95
-#: include/ajax/ajax_template_cat_category.php:95
+#: include/ajax/ajax_template_cat_category.php:94
 msgid "Attribut obligatoire"
 msgstr ""
 
@@ -23500,6 +23902,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2274
 #: include/class/acc_ledger.class.php:2283
 #: include/class/acc_ledger.class.php:2299
+#: include/class/acc_ledger.class.php:2318
 msgid "Activé"
 msgstr ""
 
@@ -23507,6 +23910,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2275
 #: include/class/acc_ledger.class.php:2284
 #: include/class/acc_ledger.class.php:2300
+#: include/class/acc_ledger.class.php:2319
 msgid "Désactivé"
 msgstr ""
 
@@ -23514,13 +23918,14 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2871
 #: include/class/acc_ledger.class.php:2880
 #: include/class/acc_ledger.class.php:2919
+#: include/class/acc_ledger.class.php:2943
 msgid "Journal incorrect"
 msgstr ""
 
 #: include/class/acc_ledger_history.class.php:46
 #: include/class/acc_ledger_history.class.php:47
 #: include/class/acc_ledger_history.class.php:48
-#: include/class/acc_ledger_history.class.php:48
+#: include/class/acc_ledger_history.class.php:59
 msgid "pa_ledger doit être un tableau"
 msgstr ""
 
@@ -23530,26 +23935,29 @@ msgstr ""
 #: include/class/acc_ledger_history.class.php:122
 #: include/class/acc_ledger_history.class.php:110
 #: include/class/acc_ledger_history.class.php:123
-#: include/class/acc_ledger_history.class.php:110
-#: include/class/acc_ledger_history.class.php:123
+#: include/class/acc_ledger_history.class.php:138
+#: include/class/acc_ledger_history.class.php:151
 msgid "invalid parameter"
 msgstr ""
 
 #: include/class/acc_ledger_history_generic.class.php:667
 #: include/class/acc_ledger_history_generic.class.php:668
 #: include/class/acc_ledger_history_generic.class.php:671
+#: include/class/acc_ledger_history_generic.class.php:672
 msgid "solde débiteur:"
 msgstr ""
 
 #: include/class/acc_ledger_history_generic.class.php:668
 #: include/class/acc_ledger_history_generic.class.php:669
 #: include/class/acc_ledger_history_generic.class.php:672
+#: include/class/acc_ledger_history_generic.class.php:673
 msgid "solde créditeur:"
 msgstr ""
 
 #: include/class/acc_ledger_history_generic.class.php:684
 #: include/class/acc_ledger_history_generic.class.php:685
 #: include/class/acc_ledger_history_generic.class.php:688
+#: include/class/acc_ledger_history_generic.class.php:689
 msgid "Total opération"
 msgstr ""
 
@@ -23559,24 +23967,24 @@ msgstr ""
 #: include/class/acc_ledger_history_sale.class.php:262
 #: include/class/acc_ledger_history_purchase.class.php:271
 #: include/class/acc_ledger_history_purchase.class.php:276
-#: include/class/acc_ledger_history_purchase.class.php:276
-#: include/class/acc_ledger_history_sale.class.php:262
+#: include/class/acc_ledger_history_sale.class.php:272
+#: include/class/acc_ledger_history_purchase.class.php:287
 msgid "TVAC/TTC"
 msgstr ""
 
 #: include/class/acc_ledger_purchase.class.php:270
 #: include/class/acc_ledger_sold.class.php:225
 #: include/class/acc_ledger_purchase.class.php:269
+#: include/class/acc_ledger_purchase.class.php:271
 #: include/class/acc_ledger_sold.class.php:225
-#: include/class/acc_ledger_purchase.class.php:269
 msgid "Date de paiement invalide"
 msgstr ""
 
 #: include/class/acc_ledger_purchase.class.php:276
 #: include/class/acc_ledger_sold.class.php:232
 #: include/class/acc_ledger_purchase.class.php:275
+#: include/class/acc_ledger_purchase.class.php:277
 #: include/class/acc_ledger_sold.class.php:232
-#: include/class/acc_ledger_purchase.class.php:275
 msgid "Date échéance invalide"
 msgstr ""
 
@@ -23587,7 +23995,6 @@ msgstr ""
 
 #: include/class/acc_operation.class.php:726
 #: include/class/tva_rate_mtable.class.php:56
-#: include/class/tva_rate_mtable.class.php:56
 #: include/class/acc_operation.class.php:726
 msgid "Normal"
 msgstr ""
@@ -23649,147 +24056,147 @@ msgid "Installé le %s"
 msgstr ""
 
 #: include/class/periode.class.php:251 include/class/periode.class.php:253
-#: include/class/periode.class.php:255
+#: include/class/periode.class.php:255 include/class/periode.class.php:255
 msgid "Période chevauchant une autre"
 msgstr ""
 
 #: include/class/periode.class.php:421 include/class/periode.class.php:423
-#: include/class/periode.class.php:425
+#: include/class/periode.class.php:425 include/class/periode.class.php:426
 msgid "Exercice n'est pas un nombre"
 msgstr ""
 
 #: include/class/periode.class.php:424 include/class/periode.class.php:426
-#: include/class/periode.class.php:428
+#: include/class/periode.class.php:428 include/class/periode.class.php:429
 #, php-format
 msgid "Exercice doit être entre %s et %s "
 msgstr ""
 
 #: include/class/periode.class.php:427 include/class/periode.class.php:429
-#: include/class/periode.class.php:431
+#: include/class/periode.class.php:431 include/class/periode.class.php:432
 msgid "Année n'est pas un nombre"
 msgstr ""
 
 #: include/class/periode.class.php:430 include/class/periode.class.php:432
-#: include/class/periode.class.php:434
+#: include/class/periode.class.php:434 include/class/periode.class.php:435
 #, php-format
 msgid "Année doit être entre %s et %s "
 msgstr ""
 
 #: include/class/periode.class.php:434 include/class/periode.class.php:436
-#: include/class/periode.class.php:438
+#: include/class/periode.class.php:438 include/class/periode.class.php:439
 msgid "Nombre de mois n'est pas un nombre"
 msgstr ""
 
 #: include/class/periode.class.php:436 include/class/periode.class.php:438
-#: include/class/periode.class.php:440
+#: include/class/periode.class.php:440 include/class/periode.class.php:441
 msgid "Nombre de mois doit être compris entre 1 & 60 "
 msgstr ""
 
 #: include/class/periode.class.php:438 include/class/periode.class.php:440
-#: include/class/periode.class.php:442 include/class/periode.class.php:442
-#: include/class/periode.class.php:444
+#: include/class/periode.class.php:442 include/class/periode.class.php:444
+#: include/class/periode.class.php:443 include/class/periode.class.php:445
 msgid "Mois de début n'existe pas "
 msgstr ""
 
 #: include/class/periode.class.php:520 include/class/periode.class.php:522
-#: include/class/periode.class.php:524
+#: include/class/periode.class.php:524 include/class/periode.class.php:525
 msgid "nb opérations"
 msgstr ""
 
 #: include/class/periode.class.php:521 include/class/periode.class.php:523
-#: include/class/periode.class.php:525
+#: include/class/periode.class.php:525 include/class/periode.class.php:526
 msgid "Status"
 msgstr ""
 
 #: include/class/periode.class.php:585
 #: include/class/periode_ledger_table.class.php:142
-#: include/class/periode.class.php:587
+#: include/class/periode.class.php:587 include/class/periode.class.php:589
+#: include/class/periode.class.php:590
 #: include/class/periode_ledger_table.class.php:142
-#: include/class/periode.class.php:589
 msgid "Fermée"
 msgstr ""
 
 #: include/class/periode.class.php:585
 #: include/class/periode_ledger_table.class.php:142
 #: include/class/periode_ledger_table.class.php:144
-#: include/class/periode.class.php:587
+#: include/class/periode.class.php:587 include/class/periode.class.php:589
+#: include/class/periode.class.php:590
 #: include/class/periode_ledger_table.class.php:142
 #: include/class/periode_ledger_table.class.php:144
-#: include/class/periode.class.php:589
 msgid "Ouvert"
 msgstr ""
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
-#: include/class/periode.class.php:651
+#: include/class/periode.class.php:651 include/class/periode.class.php:652
 msgid "Janvier"
 msgstr ""
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
-#: include/class/periode.class.php:651
+#: include/class/periode.class.php:651 include/class/periode.class.php:652
 msgid "Février"
 msgstr ""
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
-#: include/class/periode.class.php:651
+#: include/class/periode.class.php:651 include/class/periode.class.php:652
 msgid "Mars"
 msgstr ""
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
-#: include/class/periode.class.php:651
+#: include/class/periode.class.php:651 include/class/periode.class.php:652
 msgid "Avril"
 msgstr ""
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
-#: include/class/periode.class.php:652
+#: include/class/periode.class.php:652 include/class/periode.class.php:653
 msgid "Mai"
 msgstr ""
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
-#: include/class/periode.class.php:652
+#: include/class/periode.class.php:652 include/class/periode.class.php:653
 msgid "Juin"
 msgstr ""
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
-#: include/class/periode.class.php:652
+#: include/class/periode.class.php:652 include/class/periode.class.php:653
 msgid "Juillet"
 msgstr ""
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
-#: include/class/periode.class.php:652
+#: include/class/periode.class.php:652 include/class/periode.class.php:653
 msgid "Août"
 msgstr ""
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
-#: include/class/periode.class.php:652
+#: include/class/periode.class.php:652 include/class/periode.class.php:653
 msgid "Septembre"
 msgstr ""
 
 #: include/class/periode.class.php:649 include/class/periode.class.php:651
-#: include/class/periode.class.php:653
+#: include/class/periode.class.php:653 include/class/periode.class.php:654
 msgid "Octobre"
 msgstr ""
 
 #: include/class/periode.class.php:649 include/class/periode.class.php:651
-#: include/class/periode.class.php:653
+#: include/class/periode.class.php:653 include/class/periode.class.php:654
 msgid "Novembre"
 msgstr ""
 
 #: include/class/periode.class.php:649 include/class/periode.class.php:651
-#: include/class/periode.class.php:653
+#: include/class/periode.class.php:653 include/class/periode.class.php:654
 msgid "Décembre"
 msgstr ""
 
 #: include/class/periode.class.php:673 include/class/periode.class.php:675
-#: include/class/periode.class.php:677
+#: include/class/periode.class.php:677 include/class/periode.class.php:678
 msgid "Effacement impossible"
 msgstr ""
 
 #: include/class/periode.class.php:688 include/class/periode.class.php:690
-#: include/class/periode.class.php:692
+#: include/class/periode.class.php:692 include/class/periode.class.php:693
 msgid "On ne peut ajouter une période que sur un exercice qui existe déjà"
 msgstr ""
 
-#: include/class/tag.class.php:60 include/class/tag.class.php:60
+#: include/class/tag.class.php:60 include/class/tag.class.php:65
 msgid "Ajout d'un dossier (ou tag)"
 msgstr ""
 
@@ -23829,7 +24236,7 @@ msgid "Catégorie utilisée, les attributs ne peuvent pas être modifiés"
 msgstr ""
 
 #: include/class/template_card_category.class.php:158
-#: include/class/template_card_category.class.php:158
+#: include/class/template_card_category.class.php:157
 msgid "Attribut à ajouter"
 msgstr ""
 
@@ -23855,56 +24262,59 @@ msgstr ""
 
 #: include/class/tva_rate_mtable.class.php:207
 #: include/class/tva_rate_mtable.class.php:209
-#: include/class/tva_rate_mtable.class.php:207
-#: include/class/tva_rate_mtable.class.php:209
+#: include/class/tva_rate_mtable.class.php:224
+#: include/class/tva_rate_mtable.class.php:226
 msgid "Les 2 postes comptables ne peuvent être nuls"
 msgstr ""
 
 #: include/class/tva_rate_mtable.class.php:215
-#: include/class/tva_rate_mtable.class.php:215
+#: include/class/tva_rate_mtable.class.php:232
 msgid "Taux de TVA invalide"
 msgstr ""
 
 #: include/class/tva_rate_mtable.class.php:223
-#: include/class/tva_rate_mtable.class.php:223
+#: include/class/tva_rate_mtable.class.php:240
 msgid "Ce nom est déjà utilisé"
 msgstr ""
 
 #: include/class/tva_rate_mtable.class.php:233
 #: include/class/tva_rate_mtable.class.php:243
-#: include/class/tva_rate_mtable.class.php:233
-#: include/class/tva_rate_mtable.class.php:243
+#: include/class/tva_rate_mtable.class.php:250
+#: include/class/tva_rate_mtable.class.php:260
 msgid "Poste comptable inexistant"
 msgstr ""
 
 #: include/class/tva_rate_mtable.class.php:250
-#: include/class/tva_rate_mtable.class.php:250
+#: include/class/tva_rate_mtable.class.php:267
 msgid "Choix incorrect"
 msgstr ""
 
 #: include/class/tva_rate_mtable.class.php:267
-#: include/class/tva_rate_mtable.class.php:267
+#: include/class/tva_rate_mtable.class.php:284
 msgid "Effacement interdit : TVA utilisée"
 msgstr ""
 
 #: include/class/tva_rate_mtable.class.php:273
-#: include/class/tva_rate_mtable.class.php:273
+#: include/class/tva_rate_mtable.class.php:290
 msgid ""
 "Vous ne pouvez pas effacer tous les taux. Si votre société n'utilise pas la "
 "TVA, changer dans le menu société"
 msgstr ""
 
 #: include/class/user.class.php:1379 include/class/user.class.php:1408
-#: include/class/acc_ledger.class.php:2365 include/class/user.class.php:1379
-#: include/class/user.class.php:1408 include/lib/input_switch.class.php:56
+#: include/class/acc_ledger.class.php:2365
+#: include/lib/input_switch.class.php:56
+#: include/class/acc_ledger.class.php:2399 include/class/user.class.php:1402
+#: include/class/user.class.php:1431 include/lib/input_switch.class.php:57
+#: include/lib/input_checkbox.class.php:65
 msgid "Valeur invalide"
 msgstr ""
 
-#: html/install.php:384 html/install.php:387 html/install.php:387
+#: html/install.php:384 html/install.php:387 html/install.php:436
 msgid "Module php-pgsql n'est pas installé"
 msgstr ""
 
-#: html/install.php:586 html/install.php:589 html/install.php:589
+#: html/install.php:586 html/install.php:589 html/install.php:639
 msgid ""
 "Puis refaites la procédure d'installation pour mettre la base de données à "
 "jour"
@@ -23926,11 +24336,11 @@ msgstr ""
 msgid "Modèle installé"
 msgstr ""
 
-#: include/ajax/ajax_tag_detail.php:16 include/ajax/ajax_tag_detail.php:16
+#: include/ajax/ajax_tag_detail.php:16 include/ajax/ajax_tag_detail.php:18
 msgid "Détail du dossier ou étiquette"
 msgstr ""
 
-#: html/install.php:214 html/install.php:214
+#: html/install.php:214
 msgid ""
 "Voici l'utilisateur et mot de passe de l'utilisateur administrateur de "
 "Noalyss , il a tous les droits et a accès à tout. Connectez-vous avec ses "
@@ -23967,21 +24377,21 @@ msgid "Période %s au %s "
 msgstr ""
 
 #: include/upgrade-core.php:41 include/upgrade-plugin.php:44
-#: include/upgrade-template.php:39 include/upgrade-template.php:39
-#: include/upgrade-core.php:41 include/upgrade-plugin.php:44
+#: include/upgrade-template.php:39 include/upgrade-core.php:41
+#: include/upgrade-template.php:39 include/upgrade-plugin.php:44
 #, php-format
 msgid "Désolé , impossible de se connecter au serveur %s"
 msgstr ""
 
 #: include/template/param_jrn.php:61 include/template/param_jrn.php:68
-#: include/template/param_jrn.php:74
+#: include/template/param_jrn.php:74 include/template/param_jrn.php:75
 msgid ""
 "Obligatoire pour les journaux FIN : donner ici la fiche du compte en banque "
 "utilisée"
 msgstr ""
 
 #: include/template/param_jrn.php:68 include/template/param_jrn.php:75
-#: include/template/param_jrn.php:119
+#: include/template/param_jrn.php:119 include/template/param_jrn.php:120
 msgid "Minimum de lignes à afficher"
 msgstr ""
 
@@ -23997,7 +24407,7 @@ msgstr ""
 msgid "delete_param : echec"
 msgstr ""
 
-#: include/lib/html_tab.class.php:99 include/lib/html_tab.class.php:99
+#: include/lib/html_tab.class.php:99 include/lib/html_tab.class.php:119
 msgid "Mode invalide"
 msgstr ""
 
@@ -24090,18 +24500,19 @@ msgstr ""
 msgid "Du %s au %s"
 msgstr ""
 
-#: include/operation_ods_new.inc.php:94 include/operation_ods_new.inc.php:94
+#: include/operation_ods_new.inc.php:94 include/operation_ods_new.inc.php:95
 #, php-format
 msgid "Opération rapprochée : %s"
 msgstr ""
 
 #: include/fiche.inc.php:592 include/fiche.inc.php:601
-#: include/fiche.inc.php:601
+#: include/fiche.inc.php:614
 msgid "solde crediteur"
 msgstr ""
 
 #: include/class/acc_ledger.class.php:1079
 #: include/class/acc_ledger.class.php:1095
+#: include/class/acc_ledger.class.php:1091
 #, php-format
 msgid ""
 "Vous utilisez le mode strict la dernière operation est la date du %s\n"
@@ -24110,23 +24521,26 @@ msgstr ""
 
 #: include/class/acc_ledger.class.php:1124
 #: include/class/acc_ledger.class.php:1140
+#: include/class/acc_ledger.class.php:1136
 #, php-format
 msgid "Le poste %s n'est pas dans ce journal"
 msgstr ""
 
 #: include/class/acc_ledger.class.php:1136
 #: include/class/acc_ledger.class.php:1152
+#: include/class/acc_ledger.class.php:1148
 #, php-format
 msgid " Le poste %s appartient à  fiche(s) dont : %s"
 msgstr ""
 
 #: include/class/acc_ledger.class.php:1150
 #: include/class/acc_ledger.class.php:1166
+#: include/class/acc_ledger.class.php:1162
 #, php-format
 msgid "Utilisation directe interdite du poste comptable %s"
 msgstr ""
 
-#: include/class/document.class.php:1293 include/class/document.class.php:1293
+#: include/class/document.class.php:1293 include/class/document.class.php:1576
 #, php-format
 msgid "chaine à remplacer [%s] contient un caractère interdit"
 msgstr ""
@@ -24162,7 +24576,7 @@ msgid "Ajoutez une pièce justificative"
 msgstr ""
 
 #: include/class/acc_plan_mtable.class.php:196
-#: include/class/acc_plan_mtable.class.php:196
+#: include/class/acc_plan_mtable.class.php:213
 msgid "Toutes les fiches"
 msgstr ""
 
@@ -24170,7 +24584,7 @@ msgstr ""
 msgid "Plan Analytique "
 msgstr ""
 
-#: include/lib/ac_common.php:1129 include/lib/ac_common.php:1129
+#: include/lib/ac_common.php:1129 include/lib/ac_common.php:1139
 msgid "Fichier non trouvé"
 msgstr ""
 
@@ -24288,7 +24702,7 @@ msgid ""
 msgstr ""
 
 #: include/class/pre_operation.class.php:149
-#: include/class/pre_operation.class.php:149
+#: include/class/pre_operation.class.php:550
 #, php-format
 msgid "Echec PreOperatoin chargement %s"
 msgstr ""
@@ -24361,46 +24775,46 @@ msgid "Erreur Connexion"
 msgstr ""
 
 #: include/lib/database_core.class.php:464
-#: include/lib/database_core.class.php:464
+#: include/lib/database_core.class.php:467
 msgid "Database:get_row retourne trop de lignes"
 msgstr ""
 
 #: include/class/payment_method_mtable.class.php:39
-#: include/class/payment_method_mtable.class.php:39
+#: include/class/payment_method_mtable.class.php:40
 msgid "Enregistrement dans"
 msgstr ""
 
 #: include/class/payment_method_mtable.class.php:42
-#: include/class/payment_method_mtable.class.php:42
+#: include/class/payment_method_mtable.class.php:43
 msgid "Utilisation dans"
 msgstr ""
 
 #: include/class/payment_method_mtable.class.php:68
 #: include/class/payment_method_mtable.class.php:92
-#: include/class/payment_method_mtable.class.php:68
-#: include/class/payment_method_mtable.class.php:92
+#: include/class/payment_method_mtable.class.php:69
+#: include/class/payment_method_mtable.class.php:93
 msgid "Un libellé est obligatoire"
 msgstr ""
 
 #: include/class/payment_method_mtable.class.php:77
 #: include/class/payment_method_mtable.class.php:87
-#: include/class/payment_method_mtable.class.php:77
-#: include/class/payment_method_mtable.class.php:87
+#: include/class/payment_method_mtable.class.php:78
+#: include/class/payment_method_mtable.class.php:88
 msgid "Choisissez un journal"
 msgstr ""
 
 #: include/class/payment_method_mtable.class.php:98
-#: include/class/payment_method_mtable.class.php:98
+#: include/class/payment_method_mtable.class.php:102
 msgid "Fiche inexistante"
 msgstr ""
 
 #: include/class/payment_method_mtable.class.php:115
-#: include/class/payment_method_mtable.class.php:115
+#: include/class/payment_method_mtable.class.php:120
 msgid "Choisissez un type de fiche"
 msgstr ""
 
 #: include/class/payment_method_mtable.class.php:140
-#: include/class/payment_method_mtable.class.php:140
+#: include/class/payment_method_mtable.class.php:145
 #, php-format
 msgid "Erreur key %s value %s"
 msgstr ""
@@ -24417,7 +24831,7 @@ msgid "Pour les journaux FIN, ce sera la fiche du journal"
 msgstr ""
 
 #: include/lib/manage_table_sql.class.php:965
-#: include/lib/manage_table_sql.class.php:965
+#: include/lib/manage_table_sql.class.php:1020
 msgid "non implémenté"
 msgstr ""
 
@@ -24426,51 +24840,51 @@ msgstr ""
 msgid "Lien"
 msgstr ""
 
-#: include/impress_jrn.inc.php:156 include/impress_jrn.inc.php:156
+#: include/impress_jrn.inc.php:156 include/impress_jrn.inc.php:170
 msgid "Style d'impression"
 msgstr ""
 
 #: include/class/print_ledger_simple.class.php:113
-#: include/class/print_ledger_simple.class.php:113
+#: include/class/print_ledger_simple.class.php:110
 msgid "Priv/DNA"
 msgstr ""
 
 #: include/export/export_ledger_csv.php:142
 #: include/class/acc_ledger_history_purchase.class.php:279
 #: include/class/acc_ledger_history_sale.class.php:265
-#: include/export/export_ledger_csv.php:142
-#: include/class/acc_ledger_history_purchase.class.php:279
-#: include/class/acc_ledger_history_sale.class.php:265
+#: include/class/acc_ledger_history_sale.class.php:275
+#: include/class/acc_ledger_history_purchase.class.php:291
+#: include/export/export_ledger_csv.php:147
 msgid "Montant paiement"
 msgstr ""
 
 #: include/export/export_ledger_csv.php:143
-#: include/export/export_ledger_csv.php:143
+#: include/export/export_ledger_csv.php:148
 msgid "Methode paiement"
 msgstr ""
 
 #: include/export/export_ledger_csv.php:144
-#: include/export/export_ledger_csv.php:144
+#: include/export/export_ledger_csv.php:150
 msgid "Opération paiement"
 msgstr ""
 
 #: include/class/print_ledger_detail_item.class.php:145
 #: include/class/print_ledger_detail_item.class.php:146
+#: include/class/print_ledger_detail_item.class.php:146
 #, php-format
 msgid "Paiement montant %s date %s methoded %s "
 msgstr ""
 
 #: include/class/acc_ledger_history_purchase.class.php:278
 #: include/class/acc_ledger_history_sale.class.php:264
-#: include/class/acc_ledger_history_purchase.class.php:278
-#: include/class/acc_ledger_history_sale.class.php:264
+#: include/class/acc_ledger_history_purchase.class.php:290
 msgid "Méthode paiement"
 msgstr ""
 
 #: include/class/acc_ledger_history_purchase.class.php:280
 #: include/class/acc_ledger_history_sale.class.php:266
-#: include/class/acc_ledger_history_purchase.class.php:280
-#: include/class/acc_ledger_history_sale.class.php:266
+#: include/class/acc_ledger_history_sale.class.php:276
+#: include/class/acc_ledger_history_purchase.class.php:292
 msgid "n° opération"
 msgstr ""
 
@@ -24481,11 +24895,11 @@ msgid ""
 "avec journaux OD"
 msgstr ""
 
-#: include/template/param_jrn.php:93
+#: include/template/param_jrn.php:93 include/template/param_jrn.php:94
 msgid "Uniquement note de débit ou crédit"
 msgstr ""
 
-#: include/template/param_jrn.php:106
+#: include/template/param_jrn.php:106 include/template/param_jrn.php:107
 msgid "Avertissement montant positif"
 msgstr ""
 
@@ -24497,6 +24911,14 @@ msgstr ""
 #: include/export/export_printtva_csv.php:61
 #: include/export/export_printtva_pdf.php:57
 #: include/export/export_printtva_pdf.php:212
+#: include/export/export_printtva_pdf.php:59
+#: include/export/export_printtva_pdf.php:216
+#: include/export/export_printtva_csv.php:54
+#: include/export/export_printtva_csv.php:73
+#: include/template/tax_summary_display.php:62
+#: include/template/tax_summary_display.php:122
+#: include/template/tax_summary_display.php:210
+#: include/template/tax_summary_display.php:294
 msgid "Montant HT"
 msgstr ""
 
@@ -24508,9 +24930,18 @@ msgstr ""
 #: include/export/export_printtva_csv.php:64
 #: include/export/export_printtva_pdf.php:58
 #: include/export/export_printtva_pdf.php:213
+#: include/export/export_printtva_pdf.php:60
+#: include/export/export_printtva_pdf.php:217
+#: include/export/export_printtva_csv.php:56
+#: include/export/export_printtva_csv.php:76
+#: include/template/tax_summary_display.php:64
+#: include/template/tax_summary_display.php:128
+#: include/template/tax_summary_display.php:213
+#: include/template/tax_summary_display.php:303
 msgid "Montant Autoliquidation"
 msgstr ""
 
+#: include/template/tax_summary_display.php:109
 #: include/template/tax_summary_display.php:109
 msgid "Résumé tous les journaux de vente"
 msgstr ""
@@ -24519,12 +24950,19 @@ msgstr ""
 #: include/template/tax_summary_display.php:297
 #: include/export/export_printtva_csv.php:62
 #: include/export/export_printtva_pdf.php:212
+#: include/export/export_printtva_pdf.php:216
+#: include/export/export_printtva_csv.php:74
+#: include/template/tax_summary_display.php:211
+#: include/template/tax_summary_display.php:297
 msgid "Privée"
 msgstr ""
 
 #: include/template/tax_summary_display.php:214
 #: include/template/tax_summary_display.php:306
 #: include/export/export_printtva_pdf.php:213
+#: include/export/export_printtva_pdf.php:217
+#: include/template/tax_summary_display.php:214
+#: include/template/tax_summary_display.php:306
 msgid "Montant Non Déd"
 msgstr ""
 
@@ -24532,6 +24970,9 @@ msgstr ""
 #: include/template/tax_summary_display.php:309
 #: include/export/export_printtva_csv.php:66
 #: include/export/export_printtva_pdf.php:213
+#: include/export/export_printtva_csv.php:78
+#: include/template/tax_summary_display.php:215
+#: include/template/tax_summary_display.php:309
 msgid "TVA Non Déd"
 msgstr ""
 
@@ -24539,84 +24980,100 @@ msgstr ""
 #: include/template/tax_summary_display.php:312
 #: include/export/export_printtva_csv.php:67
 #: include/export/export_printtva_pdf.php:213
+#: include/export/export_printtva_csv.php:79
+#: include/template/tax_summary_display.php:216
+#: include/template/tax_summary_display.php:312
 msgid "TVA Non Déd & récup"
 msgstr ""
 
+#: include/template/tax_summary_display.php:281
 #: include/template/tax_summary_display.php:281
 msgid "Résumé tous les journaux d'achat"
 msgstr ""
 
 #: include/compta_ven.inc.php:80 include/compta_ach.inc.php:72
+#: include/compta_ven.inc.php:80 include/compta_ach.inc.php:71
 msgid "Vous devez encore confirmer"
 msgstr ""
 
-#: include/tax_summary.inc.php:39
+#: include/tax_summary.inc.php:39 include/tax_summary.inc.php:48
 #, php-format
 msgid "Période du %s au %s"
 msgstr ""
 
 #: include/export/export_printtva_pdf.php:49 include/database.item.php:141
+#: include/export/export_printtva_pdf.php:51 include/database.item.php:140
 msgid "Résumé TVA"
 msgstr ""
 
 #: include/export/export_printtva_pdf.php:160
+#: include/export/export_printtva_pdf.php:164
 msgid "Résumé TVA vente"
 msgstr ""
 
 #: include/export/export_printtva_pdf.php:301
+#: include/export/export_printtva_pdf.php:315
 msgid "Résumé TVA Achat"
 msgstr ""
 
-#: include/database.item.php:139
+#: include/database.item.php:139 include/database.item.php:138
 msgid "Devises"
 msgstr ""
 
-#: include/database.item.php:139
+#: include/database.item.php:139 include/database.item.php:138
 msgid "Configuration des devises"
 msgstr ""
 
-#: include/database.item.php:139
+#: include/database.item.php:139 include/database.item.php:138
 msgid "Permet de configurer les devises"
 msgstr ""
 
-#: include/database.item.php:140
+#: include/database.item.php:140 include/database.item.php:139
 msgid "Export ANC"
 msgstr ""
 
-#: include/database.item.php:141
+#: include/database.item.php:141 include/database.item.php:140
 msgid "totaux  par TVA et par journal"
 msgstr ""
 
-#: include/database.item.php:141
+#: include/database.item.php:141 include/database.item.php:140
 msgid "Calcul des totaux  par TVA et par journal"
 msgstr ""
 
 #: include/database.item.php:142 include/database.item.php:143
+#: include/database.item.php:141 include/database.item.php:142
 msgid "Export Résumé TVA"
 msgstr ""
 
-#: include/database.item.php:236
+#: include/database.item.php:236 include/database.item.php:220
 msgid "Note de crédit"
 msgstr ""
 
+#: include/class/print_ledger_detail_item.class.php:159
 #: include/class/print_ledger_detail_item.class.php:159
 msgid "Prix/Unit"
 msgstr ""
 
+#: include/class/print_ledger_detail_item.class.php:160
 #: include/class/print_ledger_detail_item.class.php:160
 msgid "Quant."
 msgstr ""
 
 #: include/class/acc_ledger.class.php:2362
+#: include/class/acc_ledger.class.php:2393
 msgid "Avertissement ne peut être vide"
 msgstr ""
 
 #: include/class/acc_ledger.class.php:2555
+#: include/class/acc_ledger.class.php:2430
+#: include/class/acc_ledger.class.php:2585 include/database.item.php:233
 msgid "Attention, ce journal doit utiliser des montants négatifs"
 msgstr ""
 
 #: include/class/tax_summary.class.php:74
 #: include/class/tax_summary.class.php:93
+#: include/class/tax_summary.class.php:91
+#: include/class/tax_summary.class.php:111
 msgid "Format date invalide"
 msgstr ""
 
@@ -24625,8 +25082,568 @@ msgstr ""
 msgid "Aucune Donnée"
 msgstr ""
 
+#: include/lib/message_javascript.php:106
 #: include/lib/message_javascript.php:106
 msgid ""
 "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"
 msgstr ""
+
+#: scenario/select_dialog.test.php:32
+#: include/template/followup-show-action-add.php:30
+msgid "Ajout action"
+msgstr ""
+
+#: unit-test/include/class/print_ledger_misc.classTest.php:73
+msgid "Journal Opérations diverses "
+msgstr ""
+
+#: unit-test/include/class/print_ledger_misc.classTest.php:84
+msgid "Journal Opérations diverses"
+msgstr ""
+
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:78
+#: unit-test/include/class/print_ledger_simple.classTest.php:82
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:82
+msgid "Journal Achat Payé"
+msgstr ""
+
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:92
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:141
+#: unit-test/include/class/print_ledger_simple.classTest.php:96
+#: unit-test/include/class/print_ledger_simple.classTest.php:145
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:95
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:141
+msgid "Journal Non Payé"
+msgstr ""
+
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:107
+#: unit-test/include/class/print_ledger_simple.classTest.php:111
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:109
+msgid "Journal Achat tous"
+msgstr ""
+
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:127
+#: unit-test/include/class/print_ledger_simple.classTest.php:131
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:128
+msgid "Journal Vente Payé"
+msgstr ""
+
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:156
+#: unit-test/include/class/print_ledger_simple.classTest.php:160
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:155
+msgid "Journal Vente tous"
+msgstr ""
+
+#: unit-test/include/class/tax_summary.Test.php:110
+msgid "unknow jrn_type"
+msgstr ""
+
+#: html/install.php:164
+msgid ""
+"Mot de passe administrateur, il peut être changé ensuite dans les préférences"
+msgstr ""
+
+#: html/install.php:165
+msgid "login administrateur"
+msgstr ""
+
+#: html/install.php:226
+msgid "Le mot de passe du super admin et le login ne peuvent être vides"
+msgstr ""
+
+#: html/install.php:243
+msgid ""
+"Le mot de passe du super admin et le superadmin ne peut pas contenir des "
+"guillemets ou espaces, ni @mobile"
+msgstr ""
+
+#: html/install.php:260
+msgid ""
+"Voici l'utilisateur et mot de passe de l'utilisateur administrateur de "
+"Noalyss ,  il a tous les droits et a accès à tout. Connectez-vous avec ses "
+"identifiants et changer le mot de passe dans préférence (en haut à droit)"
+msgstr ""
+
+#: html/install.php:356
+msgid "Version PHP trop basse , minimum 7.0.33"
+msgstr ""
+
+#: html/install.php:462
+msgid ""
+" Vous devez absolument utiliser au minimum une version 9.5 de PostGresql, si "
+"votre distribution n'en\n"
+"offre pas, installez-en une en la compilant. Lisez attentivement la notice "
+"sur postgresql.org pour migrer\n"
+"vos bases de données"
+msgstr ""
+
+#: html/user_login.php:132
+msgid ""
+"Si la redirection ne fonctionne pas, vous devez changer la valeur de "
+"NOALYSS_URL "
+msgstr ""
+
+#: include/fiche.inc.php:272
+msgid "Export en PDF"
+msgstr ""
+
+#: include/anc_pa.inc.php:174 include/anc_pa.inc.php:194
+msgid "Ajout d'un plan analytique"
+msgstr ""
+
+#: include/balance_card.inc.php:61
+#, php-format
+msgid "Autre exercice %s"
+msgstr ""
+
+#: include/impress_bilan.inc.php:75
+msgid ""
+"Attention : si le bilan n'est pas équilibré.<br> Vérifiez <ul>\n"
+"           <li>L'affectation du résultat est fait</li>\n"
+"           <li>Vos comptes actifs ont  un solde débiteur (sauf les comptes "
+"dit inversés)</li>\n"
+"           <li> les comptes passifs ont un solde créditeur (sauf les comptes "
+"dit inversés) </li>\n"
+"           </ul>\n"
+"           Utilisez la balance des comptes pour vérifier."
+msgstr ""
+
+#: include/class/document.class.php:1229
+#, php-format
+msgid "le %s , %s écrit %s"
+msgstr ""
+
+#: include/class/document.class.php:1413 include/class/follow_up.class.php:270
+msgid "Normale"
+msgstr ""
+
+#: include/class/acc_ledger_history_sale.class.php:274
+#: include/class/acc_ledger_history_purchase.class.php:289
+msgid "Code paiement"
+msgstr ""
+
+#: include/class/follow_up.class.php:620
+msgid "Date Doc."
+msgstr ""
+
+#: include/class/follow_up.class.php:622
+msgid "Date Limite"
+msgstr ""
+
+#: include/class/follow_up.class.php:624
+msgid "Réf."
+msgstr ""
+
+#: include/class/follow_up.class.php:626
+msgid "Dest/Exp"
+msgstr ""
+
+#: include/class/follow_up.class.php:1128
+msgid "Tous les actions ouvertes"
+msgstr ""
+
+#: include/class/follow_up.class.php:1535
+msgid "Ajout étiquette"
+msgstr ""
+
+#: include/class/tax_summary.class.php:137
+#: include/class/tax_summary.class.php:154
+msgid "Données manquantes"
+msgstr ""
+
+#: include/class/tax_summary.class.php:232
+#: include/class/tax_summary.class.php:306
+msgid "Exig TVA invalide"
+msgstr ""
+
+#: include/class/anc_operation.class.php:658
+msgid "Efface détail"
+msgstr ""
+
+#: include/class/tva_rate_mtable.class.php:60
+msgid "Exigible achat"
+msgstr ""
+
+#: include/class/tva_rate_mtable.class.php:67
+msgid "Exigible vente"
+msgstr ""
+
+#: include/class/anc_account_table.class.php:120
+msgid "Effacement impossible : le poste est utilisé dans une période fermée"
+msgstr ""
+
+#: include/class/pre_operation.class.php:69
+msgid "Nom du modèle "
+msgstr ""
+
+#: include/class/acc_ledger_search.class.php:212
+msgid "Toutes"
+msgstr ""
+
+#: include/class/acc_ledger_search.class.php:213
+msgid "Non payées"
+msgstr ""
+
+#: include/class/acc_ledger_search.class.php:214
+msgid "Payées"
+msgstr ""
+
+#: include/class/acc_ledger_search.class.php:603
+msgid "ALS01 Etat inconnu"
+msgstr ""
+
+#: include/class/acc_operation.class.php:747
+msgid "Menu invalide"
+msgstr ""
+
+#: include/class/acc_operation.class.php:769
+#: include/class/acc_operation.class.php:779
+#, php-format
+msgid "Voulez-vous aller à %s pour dupliquer cette opération ?"
+msgstr ""
+
+#: include/class/acc_operation.class.php:798
+msgid "Dupliquer"
+msgstr ""
+
+#: include/class/acc_ledger_history.class.php:337
+#: include/class/acc_ledger_purchase.class.php:1845
+#: include/class/acc_ledger_sold.class.php:1368
+#: include/class/print_ledger.class.php:331
+msgid "Filtre invalide"
+msgstr ""
+
+#: include/class/acc_ledger_history.class.php:361
+#: include/class/pdf.class.php:151 include/class/print_ledger.class.php:103
+msgid "Filter invalide "
+msgstr ""
+
+#: include/class/acc_ledger.class.php:1063
+msgid "Période inexistante"
+msgstr ""
+
+#: include/class/fiche.class.php:1181
+msgid "Fiche n'existe pas"
+msgstr ""
+
+#: include/class/card_attribut_mtable.class.php:42
+msgid "Option sup."
+msgstr ""
+
+#: include/class/card_attribut_mtable.class.php:43
+msgid "Recherche suivi"
+msgstr ""
+
+#: include/class/card_attribut_mtable.class.php:57
+#: include/class/contact_option_ref_mtable.class.php:46
+msgid "Coche"
+msgstr ""
+
+#: include/class/card_attribut_mtable.class.php:176
+msgid "Description ne peut pas être vide"
+msgstr ""
+
+#: include/class/card_attribut_mtable.class.php:196
+msgid "Effacement bloqué : attribut utilisé"
+msgstr ""
+
+#: include/class/card_multiple.class.php:128
+msgid "CMCDO01Security"
+msgstr ""
+
+#: include/class/action_document_type_mtable.class.php:49
+msgid "Préfixe document"
+msgstr ""
+
+#: include/class/action_document_type_mtable.class.php:111
+msgid "Préfixe ne peut être vide"
+msgstr ""
+
+#: include/class/action_document_type_mtable.class.php:118
+msgid "Doublon, ce nom existe déjà "
+msgstr ""
+
+#: include/class/action_document_type_mtable.class.php:125
+msgid "Doublon, ce préfixe existe déjà "
+msgstr ""
+
+#: include/class/contact_option_ref_mtable.class.php:39
+msgid "Options"
+msgstr ""
+
+#: include/class/user.class.php:764
+msgid "Access invalid"
+msgstr ""
+
+#: include/class/noalyss_parameter_folder.class.php:70
+#, php-format
+msgid "Valeur invalide %s"
+msgstr ""
+
+#: include/class/noalyss_parameter_folder.class.php:73
+#, php-format
+msgid "Erreur Filtre analytique %s"
+msgstr ""
+
+#: include/class/profile_menu.class.php:247
+msgid "Ecriture et suppression"
+msgstr ""
+
+#: include/class/html_input_noalyss.class.php:46
+msgid "LAD46 Erreur type"
+msgstr ""
+
+#: include/class/html_input_noalyss.class.php:56
+msgid "ligne à ajouter"
+msgstr ""
+
+#: include/class/document_state_mtable.php:47
+msgid "Ferme"
+msgstr ""
+
+#: include/class/document_state_mtable.php:48
+msgid "Aucune"
+msgstr ""
+
+#: include/class/acc_balance.class.php:279
+#, php-format
+msgid "Totaux %s %s"
+msgstr ""
+
+#: include/class/acc_plan_mtable.class.php:197
+msgid "Poste utilisé"
+msgstr ""
+
+#: include/lettering.account.inc.php:139
+msgid "Un instant..."
+msgstr ""
+
+#: include/ajax/ajax_anc_key_clean.php:65
+msgid "Interdit"
+msgstr ""
+
+#: include/ajax/ajax_card.php:430
+msgid "fiches inactives"
+msgstr ""
+
+#: include/ajax/ajax_ledger.php:589
+msgid "Dupliquer une opération"
+msgstr ""
+
+#: include/ajax/ajax_display_card_option.php:42
+#: include/template/action_document_type_mtable_input.php:125
+msgid "Options contact"
+msgstr ""
+
+#: include/ajax/ajax_add_concerned_card.php:71
+msgid "limité aux champs "
+msgstr ""
+
+#: include/ajax/ajax_add_concerned_card.php:88
+msgid "Fiches inactives"
+msgstr ""
+
+#: include/preod.inc.php:50
+msgid "Filter par journal"
+msgstr ""
+
+#: include/export/export_printtva_pdf.php:217
+msgid "TVA ND récup"
+msgstr ""
+
+#: include/export/export_balance_csv.php:85
+#, php-format
+msgid "balance du %s au %s"
+msgstr ""
+
+#: include/export/export_balance_pdf.php:179
+#, php-format
+msgid "Totaux %s "
+msgstr ""
+
+#: include/export/export_balance_pdf.php:186
+#: include/export/export_balance_pdf.php:192
+#, php-format
+msgid "niveau %s"
+msgstr ""
+
+#: include/template/template_config_form.php:65
+msgid "Mot de passe administrateur de noalyss"
+msgstr ""
+
+#: include/template/template_config_form.php:91
+msgid "Aide"
+msgstr ""
+
+#: include/template/follow_up_detail_display.php:194
+msgid "Recalculer"
+msgstr ""
+
+#: include/template/action_document_type_mtable_input.php:86
+msgid "Contacts multiples"
+msgstr ""
+
+#: include/template/action_document_type_mtable_input.php:94
+msgid "Création de facture"
+msgstr ""
+
+#: include/template/action_document_type_mtable_input.php:105
+msgid "Description modifiable"
+msgstr ""
+
+#: include/template/action_document_type_mtable_input.php:115
+msgid "Unique"
+msgstr ""
+
+#: include/template/action_document_type_mtable_input.php:116
+msgid "Multiples"
+msgstr ""
+
+#: include/template/ledger_detail_bottom.php:16
+msgid "Autre action"
+msgstr ""
+
+#: include/template/ledger_detail_bottom.php:337
+msgid "Vérification CA"
+msgstr ""
+
+#: include/template/tag_search_select.php:12
+msgid "Etiquettes"
+msgstr ""
+
+#: include/template/letter_all.php:53
+msgid "aucun lettrage"
+msgstr ""
+
+#: include/template/letter_all.php:126
+#, php-format
+msgid "Solde débiteur : %s"
+msgstr ""
+
+#: include/template/letter_all.php:128
+#, php-format
+msgid "Solde créditeur : %s"
+msgstr ""
+
+#: include/template/pre_operation_display.php:32
+msgid "Nom du modèle"
+msgstr ""
+
+#: include/template/followup-show-action-add.php:34
+msgid "Choississez une action"
+msgstr ""
+
+#: include/template/fiche_def_input.php:26
+msgid "Modèles de catégorie"
+msgstr ""
+
+#: include/template/card_multiple_result.php:10
+msgid "recherche rapide"
+msgstr ""
+
+#: include/template/card_multiple_result.php:14
+#, php-format
+msgid "Nombre de fiches trouvées %d montrées %d"
+msgstr ""
+
+#: include/template/action_search.php:146
+msgid "Option étiquettes"
+msgstr ""
+
+#: include/template/action_search.php:149
+msgid "Toutes les étiquettes"
+msgstr ""
+
+#: include/template/action_search.php:150
+msgid "Au moins une étiquette"
+msgstr ""
+
+#: include/impress_jrn.inc.php:157
+msgid "Uniquement payées"
+msgstr ""
+
+#: include/impress_jrn.inc.php:158
+msgid "Uniquement non payées"
+msgstr ""
+
+#: include/impress_jrn.inc.php:162
+msgid "Uniquement pour journaux vente et achat"
+msgstr ""
+
+#: include/tax_summary.inc.php:46
+#, php-format
+msgid "Calcul d'après la date"
+msgstr ""
+
+#: include/lib/manage_table_sql.class.php:1107
+msgid "Donnée"
+msgstr ""
+
+#: include/lib/iconcerned.class.php:99
+msgid "setSingleOperation failed"
+msgstr ""
+
+#: include/lib/output_html_tab.class.php:71
+msgid "OUTPUTHTML070 Mode invalide"
+msgstr ""
+
+#: include/lib/message_javascript.php:77
+msgid "Ne donnez pas ce poste comptable si ce code n'est pas utilisé à l'achat"
+msgstr ""
+
+#: include/lib/message_javascript.php:78
+msgid ""
+"Ne donnez pas ce poste comptable si ce code n'est pas utilisé  à la vente"
+msgstr ""
+
+#: include/lib/message_javascript.php:107
+msgid "TVA due ou récupérable quand l'opération est payée ou exécutée"
+msgstr ""
+
+#: include/lib/message_javascript.php:108
+msgid "Journaux Achat ou vente en mode simple, TVA ou détaillé"
+msgstr ""
+
+#: include/lib/message_javascript.php:109
+msgid "Il est conseillé d'avoir un quickcode de moins de 9 car."
+msgstr ""
+
+#: include/lib/message_javascript.php:110
+msgid "Permet de chercher dans le suivi pour les contacts multiques"
+msgstr ""
+
+#: include/lib/select_dialog.class.php:48
+msgid "Sélection"
+msgstr ""
+
+#: include/param_sec.inc.php:120
+msgid "Erreur sécurité"
+msgstr ""
+
+#: include/param_sec.inc.php:253
+msgid ""
+"La sécurité sur les journaux, permet de limiter l'accès de l'utilisateur aux "
+"journaux, si cette  sécurité n'est pas activée , l'utilisateur a accès à "
+"tous les journaux en lecture et écriture"
+msgstr ""
+
+#: include/param_sec.inc.php:327
+msgid ""
+"La sécurité sur les actions permet de limiter ce que l'utilisateur peut "
+"faire, si  elle n'est pas active l'utilisateur a donc accès à toutes ces "
+"actions"
+msgstr ""
+
+#: include/company.inc.php:120
+msgid "Uniquement des chiffres séparés par des virgules"
+msgstr ""
+
+#: include/company.inc.php:146
+msgid ""
+"Opération analytique uniquement pour les postes comptables commençant par"
+msgstr ""
+
+#: include/cfgtags.inc.php:83
+msgid "Groupe étiquettes"
+msgstr ""
diff --git a/html/lang/nl_NL/LC_MESSAGES/messages.po b/html/lang/nl_NL/LC_MESSAGES/messages.po
index e8b2a2648..8133067d9 100644
--- a/html/lang/nl_NL/LC_MESSAGES/messages.po
+++ b/html/lang/nl_NL/LC_MESSAGES/messages.po
@@ -4,12 +4,12 @@
 #
 # dany <dany@alchimerys.be>, 2014.
 # Dany De Bontridder <danydb@noalyss.eu>, 2015, 2018, 2019.
-#: include/database.item.php:126
+#: include/database.item.php:125
 msgid ""
 msgstr ""
 "Project-Id-Version: NOALYSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-26 13:23+0200\n"
+"POT-Creation-Date: 2020-11-04 17:42+0100\n"
 "PO-Revision-Date: 2019-07-31 13:23+0100\n"
 "Last-Translator: dany <danydb@noalyss.eu>\n"
 "Language-Team: English <kde-i18n-doc@kde.org>\n"
@@ -81,7 +81,7 @@ msgstr ""
 #: html/ajax_card.php:475 include/ajax/ajax_card.php:455
 #: include/ajax/ajax_card.php:456 include/ajax/ajax_card.php:457
 #: include/ajax/ajax_card.php:490 include/ajax/ajax_card.php:494
-#: include/ajax/ajax_card.php:495
+#: include/ajax/ajax_card.php:495 include/ajax/ajax_card.php:571
 msgid " Banque"
 msgstr "Bank"
 
@@ -95,6 +95,7 @@ msgstr "Database"
 #: include/template/ledger_detail_bottom.php:142
 #: include/template/ledger_detail_bottom.php:143
 #: include/template/ledger_detail_bottom.php:148
+#: include/template/ledger_detail_bottom.php:153
 msgid " Bon de commande"
 msgstr "Bestelbon"
 
@@ -108,6 +109,7 @@ msgstr "C"
 #: include/fiche.inc.php:176 include/fiche.inc.php:180
 #: include/fiche.inc.php:182 include/fiche.inc.php:183
 #: include/fiche.inc.php:184 include/fiche.inc.php:185
+#: include/fiche.inc.php:186
 msgid " Ces fiches n'ont pas été effacées  "
 msgstr "Deze bestanden zijn niet verwijderd geweest"
 
@@ -117,7 +119,7 @@ msgstr "Deze bestanden zijn niet verwijderd geweest"
 #: include/lib/ac_common.php:434 include/lib/ac_common.php:435
 #: include/lib/ac_common.php:436 include/lib/ac_common.php:437
 #: include/lib/ac_common.php:438 include/lib/ac_common.php:440
-#: include/lib/ac_common.php:456
+#: include/lib/ac_common.php:456 include/lib/ac_common.php:466
 msgid " Cette action ne vous est pas autorisée Contactez votre responsable"
 msgstr "U bent niet bevoegd voor deze actie. Contacteer uw verantwoordelijke"
 
@@ -140,6 +142,7 @@ msgstr "D"
 #: include/ajax_mod_periode.php:55 include/ajax/ajax_mod_periode.php:55
 #: include/ajax/ajax_periode.php:171 include/class/periode.class.php:702
 #: include/class/periode.class.php:704 include/class/periode.class.php:706
+#: include/class/periode.class.php:707
 msgid " Début période : "
 msgstr "Begin"
 
@@ -150,7 +153,7 @@ msgstr ""
 #: html/ajax_card.php:478 html/ajax_card.php:479 include/ajax/ajax_card.php:459
 #: include/ajax/ajax_card.php:460 include/ajax/ajax_card.php:461
 #: include/ajax/ajax_card.php:494 include/ajax/ajax_card.php:498
-#: include/ajax/ajax_card.php:499
+#: include/ajax/ajax_card.php:499 include/ajax/ajax_card.php:575
 msgid " Employé ou administrateur"
 msgstr "Manager of bediende"
 
@@ -165,24 +168,26 @@ msgstr "Fout in de formula"
 #: include/ajax_mod_periode.php:57 include/ajax/ajax_mod_periode.php:57
 #: include/ajax/ajax_periode.php:173 include/class/periode.class.php:704
 #: include/class/periode.class.php:706 include/class/periode.class.php:708
+#: include/class/periode.class.php:709
 msgid " Exercice : "
 msgstr "Jaar"
 
 #: include/ajax_mod_periode.php:56 include/ajax/ajax_mod_periode.php:56
 #: include/ajax/ajax_periode.php:172 include/class/periode.class.php:703
 #: include/class/periode.class.php:705 include/class/periode.class.php:707
+#: include/class/periode.class.php:708
 msgid " Fin période : "
 msgstr "End "
 
 #: include/user_menu.php:147 include/user_menu.php:151
 #: include/lib/user_menu.php:160 include/lib/user_menu.php:173
-#: include/lib/user_menu.php:131
+#: include/lib/user_menu.php:131 include/lib/user_menu.php:130
 msgid " Hors Bilan"
 msgstr "Buiten de balansstelling"
 
 #: include/user_menu.php:148 include/user_menu.php:152
 #: include/lib/user_menu.php:161 include/lib/user_menu.php:174
-#: include/lib/user_menu.php:132
+#: include/lib/user_menu.php:132 include/lib/user_menu.php:131
 msgid " Immobilisé"
 msgstr "Vastleggen"
 
@@ -200,6 +205,7 @@ msgstr "Onmogelijk om op te slaan"
 #: include/class/acc_ledger_purchase.class.php:194
 #: include/class/acc_ledger_sold.class.php:190
 #: include/class/acc_ledger_purchase.class.php:193
+#: include/class/acc_ledger_purchase.class.php:195
 msgid " La TVA "
 msgstr "De BTW"
 
@@ -210,6 +216,7 @@ msgstr ""
 
 #: include/class/acc_ledger.class.php:1136
 #: include/class/acc_ledger.class.php:1152
+#: include/class/acc_ledger.class.php:1148
 #, php-format
 msgid " Le poste %s appartient à  fiche(s) dont : %s"
 msgstr ""
@@ -259,6 +266,7 @@ msgstr "BTW"
 #: include/class/acc_ledger.class.php:115
 #: include/class/acc_ledger.class.php:116
 #: include/class/acc_ledger.class.php:134
+#: include/class/acc_ledger.class.php:133
 msgid " Tous les journaux"
 msgstr "Alle dagboeken"
 
@@ -294,6 +302,15 @@ msgid ""
 "vos bases de données"
 msgstr ""
 
+#: html/install.php:462
+msgid ""
+" Vous devez absolument utiliser au minimum une version 9.5 de PostGresql, si "
+"votre distribution n'en\n"
+"offre pas, installez-en une en la compilant. Lisez attentivement la notice "
+"sur postgresql.org pour migrer\n"
+"vos bases de données"
+msgstr ""
+
 #: include/history_operation.inc.php:97 include/history_operation.inc.php:101
 #: include/history_operation.inc.php:93 include/history_operation.inc.php:94
 #: include/history_operation.inc.php:98
@@ -305,6 +322,7 @@ msgstr "tot"
 #: include/ajax/ajax_card.php:447 include/ajax/ajax_card.php:448
 #: include/ajax/ajax_card.php:449 include/ajax/ajax_card.php:482
 #: include/ajax/ajax_card.php:486 include/ajax/ajax_card.php:487
+#: include/ajax/ajax_card.php:563
 msgid " d'administration"
 msgstr "van de administratie"
 
@@ -313,6 +331,7 @@ msgstr "van de administratie"
 #: include/ajax/ajax_card.php:439 include/ajax/ajax_card.php:440
 #: include/ajax/ajax_card.php:441 include/ajax/ajax_card.php:474
 #: include/ajax/ajax_card.php:478 include/ajax/ajax_card.php:479
+#: include/ajax/ajax_card.php:555
 msgid " de clients"
 msgstr "van klanten"
 
@@ -320,7 +339,7 @@ msgstr "van klanten"
 #: html/ajax_card.php:470 html/ajax_card.php:471 include/ajax/ajax_card.php:451
 #: include/ajax/ajax_card.php:452 include/ajax/ajax_card.php:453
 #: include/ajax/ajax_card.php:486 include/ajax/ajax_card.php:490
-#: include/ajax/ajax_card.php:491
+#: include/ajax/ajax_card.php:491 include/ajax/ajax_card.php:567
 msgid " de contacts"
 msgstr "van contacten"
 
@@ -329,6 +348,7 @@ msgstr "van contacten"
 #: include/ajax/ajax_card.php:443 include/ajax/ajax_card.php:444
 #: include/ajax/ajax_card.php:445 include/ajax/ajax_card.php:478
 #: include/ajax/ajax_card.php:482 include/ajax/ajax_card.php:483
+#: include/ajax/ajax_card.php:559
 msgid " de fournisseurs"
 msgstr "van leveranciers"
 
@@ -352,7 +372,7 @@ msgstr "moet in een unicode worden omgezet"
 #: include/action.common.inc.php:218 include/action.common.inc.php:238
 #: include/action.common.inc.php:239 include/action.common.inc.php:244
 #: include/action.common.inc.php:246 include/action.common.inc.php:247
-#: include/action.common.inc.php:253
+#: include/action.common.inc.php:253 include/action.common.inc.php:278
 msgid " effacée"
 msgstr "wissen"
 
@@ -360,6 +380,7 @@ msgstr "wissen"
 #: include/ajax/ajax_search_operation.php:119
 #: include/ajax/ajax_search_operation.php:122
 #: include/ajax/ajax_search_operation.php:124
+#: include/ajax/ajax_search_operation.php:129
 msgid " enregistrements. Le nombre d'enregistrements trouvés est de "
 msgstr ""
 
@@ -403,6 +424,7 @@ msgstr "tot"
 #: include/class/class_acc_ledger_purchase.php:220
 #: include/class/acc_ledger_purchase.class.php:220
 #: include/class/acc_ledger_purchase.class.php:219
+#: include/class/acc_ledger_purchase.class.php:221
 msgid " le poste comptable"
 msgstr "de begrotingspost"
 
@@ -418,6 +440,7 @@ msgstr "de begrotingspost"
 #: include/class/acc_ledger_purchase.class.php:149
 #: include/class/acc_ledger_sold.class.php:145
 #: include/class/acc_ledger_sold.class.php:204
+#: include/class/acc_ledger_purchase.class.php:151
 msgid " le poste comptable ["
 msgstr "de begrotingspost ["
 
@@ -460,6 +483,7 @@ msgstr "Puts van rekening"
 #: include/class_acc_ledger_purchase.php:120
 #: include/class/class_acc_ledger_purchase.php:120
 #: include/class/acc_ledger_purchase.class.php:120
+#: include/class/acc_ledger_purchase.class.php:122
 msgid " vous ne pouvez pas encoder à une  date antérieure dans ce journal"
 msgstr "in dit dagboek mag u geen vroegere dagtekening invoeren"
 
@@ -503,6 +527,7 @@ msgstr "Je hebt% s% d maanden sinds% d /% d% d bij de oefening toegevoegd"
 #: include/lib/class_sendmail.php:96 include/lib/class_sendmail.php:97
 #: include/lib/class_sendmail.php:98 include/lib/sendmail.class.php:98
 #: include/lib/sendmail.class.php:102 include/lib/sendmail_core.class.php:105
+#: include/lib/sendmail_core.class.php:106
 #, fuzzy, php-format
 msgid "%s est vide"
 msgstr "is leeg"
@@ -724,6 +749,11 @@ msgstr "Vanaf"
 msgid "A partir du mois de"
 msgstr "Vanaf"
 
+#: include/class/acc_ledger_search.class.php:603
+#, fuzzy
+msgid "ALS01 Etat inconnu"
+msgstr "onbekend btw"
+
 #: include/lib/message_javascript.php:41
 msgid ""
 "ATTENTION changer le poste comptable d'une fiche <b>ne modifiera pas toutes "
@@ -745,6 +775,11 @@ msgstr "Ongeldige opties"
 msgid "Accepter"
 msgstr "Aanvaarden"
 
+#: include/class/user.class.php:764
+#, fuzzy
+msgid "Access invalid"
+msgstr "Ongeldig verzoek"
+
 #: include/database.item.php:73 include/user_menu.php:115
 #: include/user_menu.php:122 include/database.item.php:76
 #: include/database.item.php:81 include/database.item.php:79
@@ -752,6 +787,8 @@ msgstr "Aanvaarden"
 #: include/lib/user_menu.php:131 include/lib/user_menu.php:124
 #: include/lib/user_menu.php:143 include/database.item.php:75
 #: include/lib/user_menu.php:81 include/lib/user_menu.php:100
+#: include/database.item.php:74 include/lib/user_menu.php:80
+#: include/lib/user_menu.php:99
 msgid "Accueil"
 msgstr "Home"
 
@@ -808,7 +845,9 @@ msgstr "Foute toegang"
 #: html/recherche.php:58 include/ajax/ajax_todo_list.php:203
 #: include/ajax/ajax_todo_list.php:266 include/class/acc_ledger.class.php:1029
 #: include/class/acc_ledger.class.php:1034
-#: include/class/acc_ledger.class.php:1050
+#: include/class/acc_ledger.class.php:1050 html/recherche.php:63
+#: include/class/acc_ledger.class.php:1042
+#: include/class/acc_ledger_purchase.class.php:77
 msgid "Accès interdit"
 msgstr "Verboden toegang"
 
@@ -829,7 +868,7 @@ msgstr "Kranten"
 
 #: html/do.php:210 html/do.php:211 html/do.php:239 html/do.php:252
 #: html/do.php:254 html/do.php:251 html/do.php:288 html/do.php:300
-#: html/do.php:310 html/do.php:279
+#: html/do.php:310 html/do.php:279 html/do.php:281
 msgid "Accès menu impossible"
 msgstr ""
 
@@ -842,7 +881,7 @@ msgid "Accès non autorisé"
 msgstr "Bewerking Opgeslagen"
 
 #: include/param_sec.inc.php:278 include/param_sec.inc.php:220
-#: include/param_sec.inc.php:224
+#: include/param_sec.inc.php:224 include/param_sec.inc.php:262
 #, fuzzy
 msgid "Accès à tout"
 msgstr "Verboden toegang"
@@ -865,7 +904,10 @@ msgstr "Verboden toegang"
 #: include/cfgledger.inc.php:171 include/class/acc_ledger_search.class.php:1086
 #: include/class/acc_ledger_search.class.php:1099
 #: include/template/tax_summary_display.php:176 include/database.item.php:235
-#: include/database.item.php:254
+#: include/database.item.php:254 include/class/acc_ledger_search.class.php:1188
+#: include/class/operation_predef_mtable.class.php:172
+#: include/database.item.php:3 include/database.item.php:67
+#: include/database.item.php:219 include/database.item.php:231
 msgid "Achat"
 msgstr "Aankoop"
 
@@ -879,14 +921,14 @@ msgstr "Verwerving over heel het jaar"
 #: include/user_detail.inc.php:152 include/user.inc.php:129
 #: include/class/acc_plan_mtable.class.php:49
 #: include/template/tag_detail.php:15
-#: include/class/acc_plan_mtable.class.php:55
+#: include/class/acc_plan_mtable.class.php:55 include/template/tag_list.php:20
 #, fuzzy
 msgid "Actif"
 msgstr "Actie"
 
 #: include/user_menu.php:149 include/user_menu.php:153
 #: include/lib/user_menu.php:162 include/lib/user_menu.php:175
-#: include/lib/user_menu.php:133
+#: include/lib/user_menu.php:133 include/lib/user_menu.php:132
 msgid "Actif a un an au plus"
 msgstr "Activa van een jaar tot meer"
 
@@ -904,13 +946,15 @@ msgstr "Betreffende acties"
 
 #: include/template/dashboard.php:105 include/template/dashboard.php:71
 #: include/template/dashboard.php:75 include/template/dashboard.php:54
+#: include/class/contact_option_ref_mtable.class.php:38
+#: include/class/document_state_mtable.php:44
 msgid "Action"
 msgstr "Actie"
 
 #: include/action.common.inc.php:218 include/action.common.inc.php:238
 #: include/action.common.inc.php:239 include/action.common.inc.php:244
 #: include/action.common.inc.php:246 include/action.common.inc.php:247
-#: include/action.common.inc.php:253
+#: include/action.common.inc.php:253 include/action.common.inc.php:278
 msgid "Action "
 msgstr "Actie"
 
@@ -923,6 +967,7 @@ msgstr "Actie management"
 # Je suppose que Action = ce qu'il a fait et pas le terme de comptabilité = Aandelen
 #: include/action.common.inc.php:277 include/action.common.inc.php:281
 #: include/action.common.inc.php:272 include/action.common.inc.php:276
+#: include/action.common.inc.php:315 include/action.common.inc.php:320
 msgid "Action Sauvée"
 msgstr "Bewerking Opgeslagen"
 
@@ -958,6 +1003,10 @@ msgstr "Achterstallige actie"
 #: include/ajax/ajax_card.php:214 include/ajax/ajax_card.php:369
 #: include/ajax/ajax_card.php:527 include/ajax/ajax_card.php:582
 #: include/ajax/ajax_card.php:594 include/ajax/ajax_card.php:624
+#: include/ajax/ajax_card.php:220 include/ajax/ajax_card.php:402
+#: include/ajax/ajax_card.php:603 include/ajax/ajax_card.php:658
+#: include/ajax/ajax_card.php:673 include/ajax/ajax_card.php:702
+#: include/ajax/ajax_card.php:738
 msgid "Action interdite"
 msgstr "Verboden handeling"
 
@@ -975,6 +1024,7 @@ msgstr "Verboden handeling"
 #: include/class/acc_ledger.class.php:2700
 #: include/class/acc_ledger.class.php:2709
 #: include/class/acc_ledger.class.php:2748
+#: include/class/acc_ledger.class.php:2772
 msgid "Action non accessible"
 msgstr "Actie is ontoegankelijk"
 
@@ -995,13 +1045,14 @@ msgid "Action pour aujourd'hui"
 msgstr "Handeling voor vaandag"
 
 #: include/param_sec.inc.php:319 include/param_sec.inc.php:259
-#: include/param_sec.inc.php:291
+#: include/param_sec.inc.php:291 include/param_sec.inc.php:303
 #, fuzzy
 msgid "Actions"
 msgstr "Actie"
 
 #: include/template/ledger_detail_bottom.php:35
 #: include/template/ledger_detail_bottom.php:40
+#: include/template/ledger_detail_bottom.php:45
 #, fuzzy
 msgid "Actions Gestion"
 msgstr "Actie management"
@@ -1012,6 +1063,7 @@ msgstr "Actie management"
 #: include/template/detail-action.php:192
 #: include/template/detail-action.php:191
 #: include/template/detail-action.php:166
+#: include/template/detail-action.php:173
 msgid "Actions concernées"
 msgstr "Betreffende acties"
 
@@ -1034,6 +1086,7 @@ msgstr "rekening"
 #: include/class/acc_ledger.class.php:2274
 #: include/class/acc_ledger.class.php:2283
 #: include/class/acc_ledger.class.php:2299
+#: include/class/acc_ledger.class.php:2318
 #, fuzzy
 msgid "Activé"
 msgstr "Actie"
@@ -1060,7 +1113,9 @@ msgstr "Actie"
 #: include/compta_ven.inc.php:328 include/compta_ven.inc.php:331
 #: include/template/form_ledger_detail.php:128 include/compta_ach.inc.php:296
 #: include/compta_ven.inc.php:339 include/compta_ven.inc.php:337
-#: include/compta_ach.inc.php:294
+#: include/compta_ach.inc.php:294 include/compta_ven.inc.php:329
+#: include/compta_ach.inc.php:295 include/template/form_ledger_detail.php:131
+#: include/template/predf_ledger_detail.php:59
 msgid "Actualiser"
 msgstr "Updaten"
 
@@ -1076,11 +1131,13 @@ msgstr "Updaten"
 #: include/user.inc.php:173 include/export/export_security_pdf.php:112
 #: html/user_login.php:109 include/database.item.php:127
 #: include/param_sec.inc.php:99 include/param_sec.inc.php:158
-#: html/user_login.php:115
+#: html/user_login.php:115 include/database.item.php:126
+#: include/param_sec.inc.php:100 include/param_sec.inc.php:163
 msgid "Administrateur"
 msgstr "Beheerder"
 
 #: include/template/template_config_form.php:56
+#: include/template/template_config_form.php:57
 #, fuzzy
 msgid "Administrateur de noalyss"
 msgstr "Beheerder"
@@ -1093,7 +1150,7 @@ msgstr "Beheerder"
 #: include/admin_repo.inc.php:63 include/database.item.php:130
 #: html/user_login.php:160 include/admin_repo.inc.php:65
 #: include/database.item.php:124 html/user_login.php:166
-#: html/user_login.php:143
+#: html/user_login.php:143 include/database.item.php:123
 msgid "Administration"
 msgstr "Administratie"
 
@@ -1113,7 +1170,7 @@ msgstr "Globale Administratie"
 #: include/class/class_fiche.php:1601 include/class/class_fiche.php:1604
 #: include/class/fiche.class.php:1758 include/class/fiche.class.php:1761
 #: include/class/fiche.class.php:1763 include/class/fiche.class.php:1781
-#: include/class/fiche.class.php:1782
+#: include/class/fiche.class.php:1782 include/class/fiche.class.php:1808
 msgid "Adresse"
 msgstr "Adres"
 
@@ -1127,6 +1184,7 @@ msgstr "Adres"
 
 #: include/template/template_config_form.php:55
 #: include/template/template_config_form.php:63
+#: include/template/template_config_form.php:73
 #, fuzzy
 msgid "Adresse Serveur Postgresql"
 msgstr "Gebruiker toevoegen"
@@ -1155,7 +1213,7 @@ msgstr "Geaffecteerd"
 
 #: include/template/action_search.php:63 include/template/action_search.php:77
 #: include/template/action_search.php:111
-#: include/template/action_search.php:107
+#: include/template/action_search.php:107 include/template/action_search.php:60
 msgid "Affiche aussi les actions fermées"
 msgstr "Toon ook de gesloten acties"
 
@@ -1164,12 +1222,12 @@ msgstr "Toon ook de gesloten acties"
 #: include/ext/tva/ext_list_assujetti.class.php:54
 #: include/ext/tva/ext_tvagen.class.php:114
 #: include/lib/message_javascript.php:94 include/lib/message_javascript.php:96
-#: include/tax_summary.inc.php:43
+#: include/tax_summary.inc.php:43 include/tax_summary.inc.php:52
 msgid "Afficher"
 msgstr "Weergeven"
 
 #: include/company.inc.php:121 include/company.inc.php:140
-#: include/company.inc.php:144
+#: include/company.inc.php:144 include/company.inc.php:158
 msgid "Afficher la période comptable pour éviter les erreurs de date"
 msgstr "Toon de boekhoudperiode om fouten in data te voorkomen"
 
@@ -1183,15 +1241,20 @@ msgstr ""
 #: include/database.item.php:127 include/database.item.php:130
 #: include/database.item.php:136 include/database.item.php:132
 #: include/database.item.php:131 include/database.item.php:135
-#: include/database.item.php:129
+#: include/database.item.php:129 include/database.item.php:128
 msgid "Agenda"
 msgstr "Agenda"
 
 #: include/database.item.php:132 include/database.item.php:135
 #: include/database.item.php:129 include/database.item.php:127
+#: include/database.item.php:128
 msgid "Agenda, présentation du suivi sous forme d'agenda "
 msgstr ""
 
+#: include/template/template_config_form.php:91
+msgid "Aide"
+msgstr ""
+
 #: include/ajax_navigator.php:59 include/ajax/ajax_navigator.php:59
 #: include/ajax/ajax_navigator.php:63
 msgid "Aide sur le wiki"
@@ -1228,6 +1291,13 @@ msgstr "Hulp voor de wiki"
 #: include/class/acc_ledger_search.class.php:250
 #: include/lib/manage_table_sql.class.php:616
 #: include/lib/manage_table_sql.class.php:655
+#: include/class/anc_key.class.php:353
+#: include/class/acc_ledger_search.class.php:264
+#: include/class/tag_group_mtable.class.php:91
+#: include/class/operation_predef_mtable.class.php:170
+#: include/template/followup-show-action-add.php:61
+#: include/lib/manage_table_sql.class.php:663
+#: include/lib/manage_table_sql.class.php:704
 msgid "Ajout"
 msgstr "Toevoeging"
 
@@ -1251,6 +1321,12 @@ msgstr "Lijn toevoegen"
 msgid "Ajout Utilisateur"
 msgstr "Gebruiker toevoegen"
 
+#: scenario/select_dialog.test.php:32
+#: include/template/followup-show-action-add.php:30
+#, fuzzy
+msgid "Ajout action"
+msgstr "Actie Toevoegen"
+
 #: include/class_acc_ledger_purchase.php:1271
 #: include/class_acc_ledger_sold.php:1273 include/class_pre_op_ach.php:390
 #: include/class_pre_op_ven.php:384 include/compta_fin.inc.php:142
@@ -1301,7 +1377,7 @@ msgstr "Artikel toevoegen"
 #: include/lib/class_html_input.php:958 include/lib/class_html_input.php:984
 #: include/lib/html_input.class.php:1037 include/lib/html_input.class.php:1095
 #: include/lib/html_input.class.php:1096 include/lib/html_input.class.php:1111
-#: include/lib/html_input.class.php:1112
+#: include/lib/html_input.class.php:1112 include/lib/html_input.class.php:1145
 #, fuzzy
 msgid "Ajout autres"
 msgstr "Factuur toevoegen"
@@ -1325,7 +1401,7 @@ msgstr "Toevoeging van een af te betalen goed "
 msgid "Ajout d'un dossier"
 msgstr "Naam van de map"
 
-#: include/class/tag.class.php:60
+#: include/class/tag.class.php:60 include/class/tag.class.php:65
 #, fuzzy
 msgid "Ajout d'un dossier (ou tag)"
 msgstr "Naam van de map"
@@ -1366,6 +1442,11 @@ msgstr "Toevoeging van een menu"
 msgid "Ajout d'un modèle"
 msgstr "Toevoeging van een menu"
 
+#: include/anc_pa.inc.php:174 include/anc_pa.inc.php:194
+#, fuzzy
+msgid "Ajout d'un plan analytique"
+msgstr "Analytische groep"
+
 #: include/anc_pa.inc.php:248 include/anc_pa.inc.php:283
 #: include/anc_pa.inc.php:285 include/anc_pa.inc.php:267
 #: include/anc_pa.inc.php:269 include/anc_pa.inc.php:287
@@ -1404,6 +1485,8 @@ msgstr "Het toevoegen van een BTW-tarief"
 #: include/manager.inc.php:140 include/supplier.inc.php:139
 #: include/contact.inc.php:138 include/manager.inc.php:141
 #: include/adm.inc.php:136 include/customer.inc.php:138
+#: include/bank.inc.php:135 include/supplier.inc.php:140
+#: include/contact.inc.php:140 include/customer.inc.php:139
 msgid "Ajout d'une catégorie"
 msgstr "Een categorie toevoegen"
 
@@ -1457,6 +1540,7 @@ msgstr "Toevoeging van een label"
 #: include/database.item.php:210 include/database.item.php:187
 #: include/database.item.php:188 include/database.item.php:191
 #: include/database.item.php:202 include/database.item.php:207
+#: include/database.item.php:197
 msgid "Ajout de fiche"
 msgstr "Een dossier toevoegen"
 
@@ -1467,11 +1551,12 @@ msgstr "Artikel toevoegen"
 
 #: include/database.item.php:15 include/database.item.php:18
 #: include/database.item.php:12 include/database.item.php:10
+#: include/database.item.php:11
 #, fuzzy
 msgid "Ajout de menu ou de plugins"
 msgstr "Configuratie van de menu's en de plug-ins"
 
-#: include/periode.inc.php:102
+#: include/periode.inc.php:102 include/periode.inc.php:103
 #, fuzzy
 msgid "Ajout exercice"
 msgstr "Een andere oefening"
@@ -1498,6 +1583,7 @@ msgstr "Geen omslag"
 #: include/class/acc_ledger.class.php:2179
 #: include/class/acc_ledger.class.php:2188
 #: include/class/acc_ledger.class.php:2204
+#: include/class/acc_ledger.class.php:2223
 #, fuzzy
 msgid "Ajout journal"
 msgstr "Boek Naam"
@@ -1527,6 +1613,7 @@ msgstr "Raming toevoegen"
 
 #: include/periode.inc.php:113 include/class/periode.class.php:687
 #: include/class/periode.class.php:689 include/class/periode.class.php:691
+#: include/class/periode.class.php:692 include/periode.inc.php:114
 #, fuzzy
 msgid "Ajout période"
 msgstr "Artikel toevoegen"
@@ -1536,6 +1623,11 @@ msgstr "Artikel toevoegen"
 msgid "Ajout utilisateur"
 msgstr "Gebruiker toevoegen"
 
+#: include/class/follow_up.class.php:1535
+#, fuzzy
+msgid "Ajout étiquette"
+msgstr "Toevoeging van een label"
+
 #: include/action.common.inc.php:207 include/action.common.inc.php:212
 #: include/action.common.inc.php:214 include/action.common.inc.php:215
 #: include/action.common.inc.php:221
@@ -1554,6 +1646,7 @@ msgstr "Hierbij een actie toevoegen"
 #: include/dossier.inc.php:214 include/modele.inc.php:261
 #: include/dossier.inc.php:217 include/dossier.inc.php:222
 #: include/modele.inc.php:262 include/modele.inc.php:263
+#: include/ajax/ajax_add_concerned_card.php:138
 msgid "Ajouter"
 msgstr "Toevoegen"
 
@@ -1588,6 +1681,7 @@ msgstr "Geen enkel model"
 #: include/template/detail-action.php:476
 #: include/template/detail-action.php:480
 #: include/template/detail-action.php:478
+#: include/template/detail-action.php:491
 msgid "Ajouter un fichier"
 msgstr "Een bestand toevoegen"
 
@@ -1620,6 +1714,7 @@ msgstr "Een bestand toevoegen"
 #: include/class/class_anc_group_operation.php:190
 #: include/class/anc_group_operation.class.php:207
 #: include/class/anticipation.class.php:431 include/template/stock_inv.php:106
+#: include/class/anc_group_operation.class.php:208
 msgid "Ajouter une ligne"
 msgstr "Voeg een lijn"
 
@@ -1665,6 +1760,8 @@ msgstr "Voeg een kasstuk toe"
 #: include/class/acc_ledger_purchase.class.php:1726
 #: include/class/acc_ledger_sold.class.php:986
 #: include/class/acc_ledger_purchase.class.php:1732
+#: include/class/acc_ledger_purchase.class.php:1756
+#: include/class/acc_ledger_sold.class.php:990
 msgid "Ajoutez une pièce justificative "
 msgstr "Voeg een kasstuk toe"
 
@@ -1734,6 +1831,7 @@ msgstr "Niet gesoldeerd balans"
 #: html/test_class.php:220 include/ajax_preference.php:174
 #: include/ajax/ajax_preference.php:174 include/ajax/ajax_preference.php:253
 #: dev/test/test_class.php:216 include/ajax/ajax_preference.php:264
+#: dev-2/test/test_class.php:216
 msgid "Anglais"
 msgstr "Engels"
 
@@ -1766,7 +1864,7 @@ msgstr "Annuleren"
 #: include/template/dashboard.php:353 include/template/pcmn_update.php:54
 #: include/ext/amortis/include/template/material_add.php:88
 #: include/ajax/ajax_card.php:304 include/template/dashboard.php:351
-#: include/ajax/ajax_mod_predf_op.php:55
+#: include/ajax/ajax_mod_predf_op.php:55 include/ajax/ajax_mod_predf_op.php:68
 msgid "Annuler"
 msgstr "Annuleren"
 
@@ -1810,7 +1908,7 @@ msgid "Année d'achat"
 msgstr "Jaar van de aankoop"
 
 #: include/class/periode.class.php:430 include/class/periode.class.php:432
-#: include/class/periode.class.php:434
+#: include/class/periode.class.php:434 include/class/periode.class.php:435
 #, fuzzy, php-format
 msgid "Année doit être entre %s et %s "
 msgstr "Tussen de  data %s en %s"
@@ -1831,7 +1929,7 @@ msgid "Année invalide ["
 msgstr "Ongeldig jaar ["
 
 #: include/class/periode.class.php:427 include/class/periode.class.php:429
-#: include/class/periode.class.php:431
+#: include/class/periode.class.php:431 include/class/periode.class.php:432
 #, fuzzy
 msgid "Année n'est pas un nombre"
 msgstr "tarief is geen getal"
@@ -1842,7 +1940,7 @@ msgid "Anomalie pour le compte "
 msgstr "Belettering voor de boekhoudkundige positie"
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
-#: include/class/periode.class.php:652
+#: include/class/periode.class.php:652 include/class/periode.class.php:653
 msgid "Août"
 msgstr ""
 
@@ -1889,7 +1987,7 @@ msgid "Argument"
 msgstr "Laden"
 
 #: include/company.inc.php:118 include/company.inc.php:137
-#: include/company.inc.php:141
+#: include/company.inc.php:141 include/company.inc.php:155
 msgid "Assujetti à la tva"
 msgstr "Onderworpen aan de BTW"
 
@@ -1901,6 +1999,7 @@ msgid "Attente"
 msgstr "Actie"
 
 #: include/verif_bilan.inc.php:117 include/verif_bilan.inc.php:153
+#: include/verif_bilan.inc.php:151
 #, fuzzy
 msgid "Attention "
 msgstr "Actie"
@@ -1923,7 +2022,7 @@ msgstr "Opgelet % s bevat geen  11 kolommen"
 msgid "Attention , erreur Acc_Ledger_Fin::insert  , coche paiement"
 msgstr ""
 
-#: include/compta_fin_rec.inc.php:151
+#: include/compta_fin_rec.inc.php:151 include/compta_fin_rec.inc.php:188
 #, fuzzy
 msgid "Attention : Fichier non chargé"
 msgstr "Record niet gevonden"
@@ -1970,6 +2069,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1198
 #: include/class/acc_ledger.class.php:1207
 #: include/class/acc_ledger.class.php:1223
+#: include/class/acc_ledger.class.php:1219
 msgid ""
 "Attention : il vaut mieux utiliser les fiches que les postes comptables "
 msgstr ""
@@ -1980,6 +2080,29 @@ msgstr ""
 msgid "Attention : il y a %d enregistrements incorrects "
 msgstr "Let op: %d  van de records zijn onjuist"
 
+# les comptes dit inversés => niet gevonden in het NL dus de rekeningen genomen die tegengesteld zijn aan degene die er in de zin staan
+#: include/impress_bilan.inc.php:75
+#, fuzzy
+msgid ""
+"Attention : si le bilan n'est pas équilibré.<br> Vérifiez <ul>\n"
+"           <li>L'affectation du résultat est fait</li>\n"
+"           <li>Vos comptes actifs ont  un solde débiteur (sauf les comptes "
+"dit inversés)</li>\n"
+"           <li> les comptes passifs ont un solde créditeur (sauf les comptes "
+"dit inversés) </li>\n"
+"           </ul>\n"
+"           Utilisez la balance des comptes pour vérifier."
+msgstr ""
+"<span class=\"notice\"> Opgelet : indien het balans niet in evenwicht is."
+"<br> Kijk na <ul>\n"
+"       <li>Of de bestemming van het resultaat is overgedragen </li>\n"
+"       <li>Of uw actieve rekeningen een debetsaldo hebben (behalve de "
+"rekeningen met creditsaldo)</li>\n"
+"       <li> Of de passieve rekeningen een creditsaldo hebben (behalve de "
+"rekeningen met debetsaldo) </li>\n"
+"       </ul>\n"
+"       Gebruik de balans van de rekening als controle. </span>"
+
 # les comptes dit inversés => niet gevonden in het NL dus de rekeningen genomen die tegengesteld zijn aan degene die er in de zin staan
 #: include/impress_bilan.inc.php:65 include/impress_bilan.inc.php:72
 #, fuzzy
@@ -2006,6 +2129,7 @@ msgstr ""
 #: html/admin/template_config_form.php:76
 #: include/template/template_config_form.php:80
 #: include/template/template_config_form.php:88
+#: include/template/template_config_form.php:100
 msgid ""
 "Attention : si vous installez sous windows n'utilisez pas le \\ mais plutôt "
 "le / dans les nom de répertoire (càd les chemins ou path)"
@@ -2043,6 +2167,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1546
 #: include/class/acc_ledger_sold.class.php:804
 #: include/class/acc_ledger_purchase.class.php:1549
+#: include/class/acc_ledger_purchase.class.php:1560
+#: include/class/acc_ledger_sold.class.php:807
 msgid "Attention Différence entre TVA calculée et donnée"
 msgstr "Let op: Verschil tussen BTW en berekende gegevens"
 
@@ -2065,7 +2191,7 @@ msgstr ""
 #: html/admin/setup.php:442 html/install.php:506 html/install.php:505
 #: html/install.php:503 html/install.php:509 html/install.php:501
 #: html/install.php:507 html/install.php:469 html/install.php:444
-#: html/install.php:450 html/install.php:453
+#: html/install.php:450 html/install.php:453 html/install.php:502
 #, php-format
 msgid "Attention le paramètre effective_cache_size est de %s au lieu de 1000"
 msgstr ""
@@ -2093,6 +2219,8 @@ msgstr ""
 #: include/ext/modop/modop_save.php:170
 #: include/class/acc_ledger_purchase.class.php:1401
 #: include/compta_ods.inc.php:99
+#: include/class/acc_ledger_purchase.class.php:1412
+#: include/class/acc_ledger_sold.class.php:683
 msgid "Attention numéro pièce existante, elle a du être adaptée"
 msgstr "Opgelet: het bestaand bewijsnummer moest aangepast worden"
 
@@ -2109,6 +2237,7 @@ msgstr "Let op: geen categorie van bestanden die afgelost moeten worden"
 #: include/lib/ac_common.php:629 include/lib/ac_common.php:630
 #: include/lib/ac_common.php:641 include/lib/ac_common.php:642
 #: include/lib/ac_common.php:644 include/lib/ac_common.php:660
+#: include/lib/ac_common.php:670
 #, php-format
 msgid ""
 "Attention periode \n"
@@ -2124,6 +2253,8 @@ msgid ""
 msgstr ""
 
 #: include/class/acc_ledger.class.php:2555
+#: include/class/acc_ledger.class.php:2430
+#: include/class/acc_ledger.class.php:2585 include/database.item.php:233
 msgid "Attention, ce journal doit utiliser des montants négatifs"
 msgstr ""
 
@@ -2162,6 +2293,7 @@ msgstr ""
 #: include/database.item.php:90 include/database.item.php:93
 #: include/database.item.php:98 include/database.item.php:95
 #: include/database.item.php:94 include/database.item.php:92
+#: include/database.item.php:91
 msgid "Attribut de fiche"
 msgstr "Attribuut van het bestand"
 
@@ -2171,6 +2303,7 @@ msgid "Attribut déjà ajouté"
 msgstr "Deze favoriet is al toegevoegd geweest"
 
 #: include/ajax/ajax_template_cat_category.php:92
+#: include/ajax/ajax_template_cat_category.php:91
 msgid "Attribut déjà utilisé"
 msgstr ""
 
@@ -2180,15 +2313,22 @@ msgid "Attribut minimum pour les catégories de fiches"
 msgstr "Configuratie van de categorie van de bestanden "
 
 #: include/ajax/ajax_template_cat_category.php:95
+#: include/ajax/ajax_template_cat_category.php:94
 #, fuzzy
 msgid "Attribut obligatoire"
 msgstr "Verplicht"
 
 #: include/class/template_card_category.class.php:158
+#: include/class/template_card_category.class.php:157
 #, fuzzy
 msgid "Attribut à ajouter"
 msgstr "Attribuut van het bestand"
 
+#: include/template/action_search.php:150
+#, fuzzy
+msgid "Au moins une étiquette"
+msgstr "Toevoeging van een label"
+
 #: include/class_follow_up.php:1196 include/class_follow_up.php:1199
 #: include/class_follow_up.php:1200 include/class_follow_up.php:1211
 #: include/class_follow_up.php:1218 include/class_follow_up.php:1223
@@ -2200,6 +2340,7 @@ msgstr "Attribuut van het bestand"
 #: include/class/follow_up.class.php:1221
 #: include/class/follow_up.class.php:1219
 #: include/class/follow_up.class.php:1220
+#: include/class/follow_up.class.php:1137
 msgid "Aucun"
 msgstr "Geen"
 
@@ -2215,7 +2356,10 @@ msgstr "Geen"
 #: include/class/profile_menu.class.php:248
 #: include/class/profile_menu.class.php:273 include/param_sec.inc.php:149
 #: include/param_sec.inc.php:226 include/param_sec.inc.php:260
-#: include/param_sec.inc.php:339
+#: include/param_sec.inc.php:339 include/class/profile_menu.class.php:249
+#: include/class/profile_menu.class.php:274 include/param_sec.inc.php:154
+#: include/param_sec.inc.php:264 include/param_sec.inc.php:271
+#: include/param_sec.inc.php:354
 msgid "Aucun accès"
 msgstr "Geen toegang"
 
@@ -2278,6 +2422,9 @@ msgstr "Geen enkel BTW-code komt overeen met dit tarief"
 #: include/class/acc_ledger.class.php:2355
 #: include/class/acc_ledger.class.php:2428
 #: include/class/acc_ledger.class.php:2614
+#: include/class/acc_ledger.class.php:2381
+#: include/class/acc_ledger.class.php:2456
+#: include/class/acc_ledger.class.php:2638
 msgid "Aucun compte en banque n'est donné"
 msgstr "Geen enkele bankrekening is gegeven"
 
@@ -2297,7 +2444,7 @@ msgstr "Naam van de map"
 #: include/class_user.php:985 include/class_user.php:986
 #: include/class/class_user.php:986 include/class/class_user.php:974
 #: include/class/class_user.php:973 include/class/user.class.php:973
-#: include/class/user.class.php:997
+#: include/class/user.class.php:997 include/class/user.class.php:1000
 #, fuzzy
 msgid "Aucun dossier disponible"
 msgstr "Geen enkele sleutel beschikbaar"
@@ -2314,7 +2461,7 @@ msgstr "Geen enkele record"
 #: include/class_acc_bilan.php:256 include/class_acc_bilan.php:257
 #: include/class/class_acc_bilan.php:257 include/class/class_acc_bilan.php:273
 #: include/class/acc_bilan.class.php:273 include/class/acc_bilan.class.php:276
-#: include/class/acc_bilan.class.php:278
+#: include/class/acc_bilan.class.php:278 include/class/acc_bilan.class.php:279
 msgid "Aucun enregistrement trouve"
 msgstr "Geen enkele record gevonden"
 
@@ -2338,7 +2485,9 @@ msgstr "Geen enkele record gevonden"
 #: include/class/acc_ledger_search.class.php:930
 #: include/class/acc_ledger_search.class.php:677
 #: include/class/acc_ledger_search.class.php:943
-#: include/class/follow_up.class.php:775
+#: include/class/follow_up.class.php:775 include/class/follow_up.class.php:688
+#: include/class/acc_ledger_search.class.php:763
+#: include/class/acc_ledger_search.class.php:1032
 msgid "Aucun enregistrement trouvé"
 msgstr "Geen enkele record gevonden"
 
@@ -2415,13 +2564,13 @@ msgid "Aucun plan défini"
 msgstr "Geen bepaald plan"
 
 #: include/ajax_anc_search.php:74 include/ajax/ajax_anc_search.php:74
-#: include/ajax/ajax_anc_search.php:76
+#: include/ajax/ajax_anc_search.php:76 include/ajax/ajax_anc_search.php:79
 msgid "Aucun poste trouvé"
 msgstr "Geen enkele post gevonden "
 
 #: html/do.php:219 html/do.php:224 html/do.php:252 html/do.php:265
 #: html/do.php:268 html/do.php:270 html/do.php:307 html/do.php:319
-#: html/do.php:329 html/do.php:331 html/do.php:300
+#: html/do.php:329 html/do.php:331 html/do.php:300 html/do.php:302
 #, fuzzy
 msgid "Aucun profil utilisateur"
 msgstr "Gebruiker toevoegen"
@@ -2448,6 +2597,11 @@ msgstr "Geen resultaten"
 msgid "Aucun titre"
 msgstr "Geen enkele klant"
 
+#: include/class/document_state_mtable.php:48
+#, fuzzy
+msgid "Aucune"
+msgstr "Geen"
+
 #: include/class/tax_summary.class.php:116
 #: include/class/tax_summary.class.php:130
 #, fuzzy
@@ -2455,7 +2609,7 @@ msgid "Aucune Donnée"
 msgstr "Geen enkel gegeven"
 
 #: include/param_sec.inc.php:321 include/param_sec.inc.php:261
-#: include/param_sec.inc.php:293
+#: include/param_sec.inc.php:293 include/template/security_list_action.php:9
 #, fuzzy
 msgid "Aucune action"
 msgstr "Geen omslag"
@@ -2483,6 +2637,7 @@ msgstr "Geen filter, alle dagboeken"
 #: html/ajax_card.php:286 include/ajax/ajax_card.php:266
 #: include/ajax/ajax_card.php:267 include/ajax/ajax_card.php:273
 #: include/ajax/ajax_card.php:275 include/ajax/ajax_card.php:276
+#: include/ajax/ajax_card.php:282
 msgid "Aucune catégorie de fiche ne correspond  à votre demande"
 msgstr "Geen enkel bestandscategorie voldoet aan uw vraag"
 
@@ -2494,7 +2649,8 @@ msgstr "Geen enkel bestandscategorie voldoet aan uw vraag"
 #: include/ajax/ajax_card.php:377 include/ajax/ajax_card.php:261
 #: include/ajax/ajax_card.php:410 include/ajax/ajax_card.php:264
 #: include/ajax/ajax_card.php:413 include/ajax/ajax_card.php:265
-#: include/ajax/ajax_card.php:414
+#: include/ajax/ajax_card.php:414 include/ajax/ajax_card.php:271
+#: include/ajax/ajax_card.php:468
 msgid ""
 "Aucune catégorie de fiche ne correspond à votre demande, le journal pourrait "
 "n'avoir accès à aucune fiche"
@@ -2524,6 +2680,7 @@ msgstr "Toevoeging van een correspondentie/overeenkomst"
 
 #: include/ajax/ajax_anc_plan.php:56 include/class/anc_plan.class.php:126
 #: include/ajax/ajax_anc_plan.php:59 include/ajax/ajax_anc_plan.php:60
+#: include/class/anc_plan.class.php:127
 #, fuzzy
 msgid "Aucune description"
 msgstr "Beschrijving"
@@ -2546,6 +2703,7 @@ msgstr "Beschrijving"
 #: include/template/ledger_detail_bottom.php:284
 #: include/template/tax_summary_display.php:105
 #: include/template/tax_summary_display.php:277
+#: include/template/ledger_detail_bottom.php:302 include/lib/ac_common.php:1257
 msgid "Aucune donnée"
 msgstr "Geen enkel gegeven"
 
@@ -2566,6 +2724,7 @@ msgstr "Geen enkele extensie is beschikbaar"
 #: html/ajax_card.php:192 include/ajax/ajax_card.php:172
 #: include/ajax/ajax_card.php:173 include/ajax/ajax_card.php:176
 #: include/ajax/ajax_card.php:182 include/ajax/ajax_card.php:183
+#: include/ajax/ajax_card.php:186
 msgid "Aucune fiche demandée"
 msgstr "Geen bestand gevraag"
 
@@ -2574,7 +2733,8 @@ msgstr "Geen bestand gevraag"
 #: include/fiche.inc.php:383 include/fiche.inc.php:386
 #: include/fiche.inc.php:133 include/fiche.inc.php:387
 #: include/fiche.inc.php:134 include/fiche.inc.php:388
-#: include/fiche.inc.php:395
+#: include/fiche.inc.php:395 include/fiche.inc.php:135
+#: include/fiche.inc.php:405
 msgid "Aucune fiche trouvée"
 msgstr "Geen bestand gevonden"
 
@@ -2602,6 +2762,7 @@ msgstr "Geen enkele operatie in de huidige oefening"
 #: include/ajax/ajax_history.php:117 include/ajax/ajax_history.php:202
 #: include/ajax/ajax_history.php:121 include/ajax/ajax_history.php:207
 #: include/ajax/ajax_history.php:208 include/ajax/ajax_history.php:209
+#: include/balance_card.inc.php:71
 msgid "Aucune opération pour l'exercice courant"
 msgstr "Geen enkele operatie in de huidige oefening"
 
@@ -2663,6 +2824,9 @@ msgstr "Geen enkel stuk om te verzenden"
 #: include/class/acc_ledger.class.php:837
 #: include/class/acc_ledger_sold.class.php:1112
 #: include/class/acc_ledger.class.php:853
+#: include/class/acc_ledger.class.php:841
+#: include/class/acc_ledger_purchase.class.php:1057
+#: include/class/acc_ledger_sold.class.php:1079
 msgid "Aucune période ouverte"
 msgstr "Geen enkele periode open"
 
@@ -2684,6 +2848,7 @@ msgstr "Geen omslag"
 
 #: include/template/tag_choose.php:8 include/template/tag_search_select.php:8
 #: include/template/tag_select.php:8 include/template/tag_select.php:12
+#: include/template/tag_select.php:14
 msgid "Aucune étiquette disponible"
 msgstr "Geen label beschikbaar"
 
@@ -2691,10 +2856,12 @@ msgstr "Geen label beschikbaar"
 #: include/lib/user_menu.php:121 include/lib/user_menu.php:130
 #: include/lib/user_menu.php:122 include/lib/user_menu.php:141
 #: include/lib/user_menu.php:79 include/lib/user_menu.php:98
+#: include/lib/user_menu.php:78 include/lib/user_menu.php:97
 msgid "Audit"
 msgstr "Audit"
 
 #: include/upgrade-plugin.php:53 include/upgrade-plugin.php:65
+#: include/upgrade-plugin.php:68
 msgid "Auteur"
 msgstr ""
 
@@ -2717,6 +2884,11 @@ msgstr "Automatisch"
 msgid "Autre Journal ?"
 msgstr "Boek Naam"
 
+#: include/template/ledger_detail_bottom.php:16
+#, fuzzy
+msgid "Autre action"
+msgstr "Andere acties"
+
 #: html/ajax_history.php:90 html/ajax_history.php:96 html/ajax_history.php:161
 #: html/ajax_history.php:167 html/ajax_history.php:108
 #: html/ajax_history.php:114 html/ajax_history.php:179
@@ -2734,11 +2906,17 @@ msgstr "Boek Naam"
 msgid "Autre exercice"
 msgstr "Een andere oefening"
 
+#: include/balance_card.inc.php:61
+#, fuzzy, php-format
+msgid "Autre exercice %s"
+msgstr "Een andere oefening"
+
 #: include/template/ledger_detail_bottom.php:12
 #: include/template/ledger_detail_bottom.php:145
 #: include/ext/importbank/ajax.php:89 include/ext/importbank/ajax.php:90
 #: include/template/ledger_detail_bottom.php:146
 #: include/template/ledger_detail_bottom.php:151
+#: include/template/ledger_detail_bottom.php:156
 msgid "Autre information"
 msgstr "Andere informatie"
 
@@ -2766,6 +2944,8 @@ msgstr "Andere informatie"
 #: include/class/acc_ledger_purchase.class.php:1744
 #: include/class/acc_ledger_sold.class.php:1004
 #: include/class/acc_ledger_purchase.class.php:1750
+#: include/class/acc_ledger_purchase.class.php:1774
+#: include/class/acc_ledger_sold.class.php:1008
 msgid "Autre information : "
 msgstr "Andere informatie :"
 
@@ -2784,6 +2964,7 @@ msgstr "Betreffende acties"
 #: include/database.item.php:123 include/database.item.php:122
 #: include/balance.inc.php:92 include/balance.inc.php:93
 #: include/balance.inc.php:96 include/database.item.php:118
+#: include/database.item.php:119
 msgid "Avancé"
 msgstr "Gevorderd"
 
@@ -2845,22 +3026,24 @@ msgstr "Met het bestand"
 #: html/install.php:429 html/install.php:384 html/install.php:393
 #: html/install.php:351 html/install.php:360 html/install.php:369
 #: html/install.php:354 html/install.php:363 html/install.php:372
+#: html/install.php:403 html/install.php:412 html/install.php:421
 #, fuzzy
 msgid "Avertissement"
 msgstr "Aflossing"
 
-#: include/template/param_jrn.php:106
+#: include/template/param_jrn.php:106 include/template/param_jrn.php:107
 #, fuzzy
 msgid "Avertissement montant positif"
 msgstr "Aflossing"
 
 #: include/class/acc_ledger.class.php:2362
+#: include/class/acc_ledger.class.php:2393
 #, fuzzy
 msgid "Avertissement ne peut être vide"
 msgstr "De naam mag niet leeg zijn"
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
-#: include/class/periode.class.php:651
+#: include/class/periode.class.php:651 include/class/periode.class.php:652
 msgid "Avril"
 msgstr ""
 
@@ -2908,12 +3091,13 @@ msgstr "Gebruiker toevoegen"
 #: include/database.item.php:73 include/database.item.php:67
 #: include/database.item.php:101 include/category_card.inc.php:79
 #: include/fiche.inc.php:70 include/database.item.php:102
+#: include/database.item.php:66
 msgid "Balance"
 msgstr "Evenwicht"
 
 #: include/database.item.php:6 include/database.item.php:9
 #: include/database.item.php:11 include/database.item.php:14
-#: include/database.item.php:8
+#: include/database.item.php:8 include/database.item.php:7
 msgid "Balance Analytique/comptabilité"
 msgstr "Analytisch evenwicht / boekhouding"
 
@@ -2944,12 +3128,14 @@ msgstr "Export Accounting Balance"
 #: include/database.item.php:82 include/database.item.php:85
 #: include/database.item.php:90 include/database.item.php:87
 #: include/database.item.php:86 include/database.item.php:84
+#: include/database.item.php:83
 msgid "Balance croisée double"
 msgstr "Dubbel gecombineerd balans"
 
 #: include/database.item.php:82 include/database.item.php:85
 #: include/database.item.php:90 include/database.item.php:87
 #: include/database.item.php:86 include/database.item.php:84
+#: include/database.item.php:83
 msgid "Balance double croisées des imputations analytiques"
 msgstr "Dubbel gecombineerd balans van de analystische verrekeningen"
 
@@ -2975,6 +3161,7 @@ msgstr "Balans van de  leverancier"
 #: include/class/acc_ledger.class.php:1300
 #: include/class/acc_ledger.class.php:1309
 #: include/class/acc_ledger.class.php:1325
+#: include/class/acc_ledger.class.php:1321
 msgid "Balance incorrecte"
 msgstr "Foute balans"
 
@@ -2988,6 +3175,7 @@ msgstr "Foute balans"
 #: include/class/acc_ledger.class.php:1149
 #: include/class/acc_ledger.class.php:1158
 #: include/class/acc_ledger.class.php:1174
+#: include/class/acc_ledger.class.php:1170
 msgid "Balance incorrecte "
 msgstr "Foute balans"
 
@@ -3017,13 +3205,13 @@ msgstr ""
 
 #: include/database.item.php:7 include/database.item.php:10
 #: include/database.item.php:12 include/database.item.php:15
-#: include/database.item.php:9
+#: include/database.item.php:9 include/database.item.php:8
 msgid "Balance par groupe"
 msgstr "Balans per groep"
 
 #: include/database.item.php:4 include/database.item.php:7
 #: include/database.item.php:9 include/database.item.php:12
-#: include/database.item.php:6
+#: include/database.item.php:6 include/database.item.php:5
 msgid "Balance simple"
 msgstr "Eenvoudige balans"
 
@@ -3034,7 +3222,7 @@ msgstr "Eenvoudige balans"
 
 #: include/database.item.php:4 include/database.item.php:7
 #: include/database.item.php:9 include/database.item.php:12
-#: include/database.item.php:6
+#: include/database.item.php:6 include/database.item.php:5
 msgid "Balance simple des imputations analytiques"
 msgstr "Eenvoudige balans van de analytische verrekeningen"
 
@@ -3072,6 +3260,7 @@ msgstr "Dubbel gecombineerd balans"
 #: include/class/anticipation.class.php:293 include/database.item.php:71
 #: include/template/acc_ledger_history_financial_oneline.php:31
 #: include/template/acc_ledger_history_financial_oneline.php:32
+#: include/database.item.php:70
 msgid "Banque"
 msgstr "Bank"
 
@@ -3115,6 +3304,7 @@ msgstr "Ongeldige database"
 #: include/lib/class_database.php:429 include/lib/class_database.php:434
 #: include/lib/database.class.php:433 include/lib/database.class.php:442
 #: include/lib/database.class.php:443 include/class/database.class.php:125
+#: include/class/database.class.php:128
 #, fuzzy
 msgid "Base de donnée vide"
 msgstr "Ongeldige database"
@@ -3126,7 +3316,8 @@ msgstr "Ongeldige database"
 #: include/upgrade.inc.php:68 include/upgrade.inc.php:96 html/install.php:392
 #: include/upgrade.inc.php:33 include/class/dossier.class.php:367
 #: include/class/dossier.class.php:395 html/install.php:398
-#: html/install.php:401
+#: html/install.php:401 html/install.php:450
+#: include/class/dossier.class.php:373 include/class/dossier.class.php:401
 #, fuzzy
 msgid "Base de données"
 msgstr "Database"
@@ -3136,7 +3327,8 @@ msgstr "Database"
 #: include/template/action_display_short.php:59
 #: include/class/class_follow_up.php:263 include/class/follow_up.class.php:263
 #: include/template/action_display_short.php:60
-#: include/class/follow_up.class.php:264
+#: include/class/follow_up.class.php:264 include/class/document.class.php:1413
+#: include/class/follow_up.class.php:271
 msgid "Basse"
 msgstr ""
 
@@ -3165,6 +3357,7 @@ msgid "Biens amortissables"
 msgstr "Aflosbare goederen"
 
 #: html/test_class.php:213 dev/test/test_class.php:209
+#: dev-2/test/test_class.php:209
 #, fuzzy
 msgid "Bienvenu sur mon site"
 msgstr "Welkom"
@@ -3180,10 +3373,12 @@ msgstr "Welkom"
 #: include/database.item.php:105 include/database.item.php:108
 #: include/database.item.php:114 include/database.item.php:111
 #: include/database.item.php:110 include/database.item.php:106
+#: include/database.item.php:107
 msgid "Bilan"
 msgstr "Balans"
 
 #: include/export/export_security_pdf.php:104
+#: include/class/card_attribut_mtable.class.php:155
 msgid "Bloqué"
 msgstr ""
 
@@ -3192,6 +3387,7 @@ msgstr ""
 #: include/database.item.php:195 include/database.item.php:174
 #: include/database.item.php:175 include/database.item.php:178
 #: include/database.item.php:186 include/database.item.php:191
+#: include/database.item.php:184
 msgid "Bon de commande Fournisseur"
 msgstr "Bestelbon van de leverancier"
 
@@ -3200,6 +3396,7 @@ msgstr "Bestelbon van de leverancier"
 #: include/database.item.php:196 include/database.item.php:173
 #: include/database.item.php:174 include/database.item.php:177
 #: include/database.item.php:185 include/database.item.php:190
+#: include/database.item.php:183
 msgid "Bons de commande client"
 msgstr "Bestelbon van de klant"
 
@@ -3225,6 +3422,10 @@ msgstr "Budget"
 msgid "C"
 msgstr "D / C"
 
+#: include/class/card_multiple.class.php:128
+msgid "CMCDO01Security"
+msgstr ""
+
 #: include/class_document_export.php:198 include/class_document_export.php:208
 #: include/class/class_document_export.php:208
 #: include/class/class_document_export.php:207
@@ -3263,6 +3464,7 @@ msgstr "Details verbergen"
 #: include/database.item.php:202 include/database.item.php:201
 #: include/database.item.php:203 include/database.item.php:204
 #: include/database.item.php:206 include/database.item.php:220
+#: include/database.item.php:210 include/database.item.php:212
 msgid "Caisse"
 msgstr "Kas"
 
@@ -3272,7 +3474,12 @@ msgstr "Kas"
 msgid "Calcul automatique du poste comptable"
 msgstr "Automatisch aanmaken van de boekhoudkundige post"
 
-#: include/database.item.php:141
+#: include/tax_summary.inc.php:46
+#, php-format
+msgid "Calcul d'après la date"
+msgstr ""
+
+#: include/database.item.php:141 include/database.item.php:140
 msgid "Calcul des totaux  par TVA et par journal"
 msgstr ""
 
@@ -3307,6 +3514,7 @@ msgstr "Rekenmachine"
 #: include/ajax/ajax_calendar_zoom.php:26 include/lib/html_input.class.php:991
 #: include/ajax/ajax_calendar_zoom.php:32 include/lib/html_input.class.php:992
 #: include/lib/html_input.class.php:1007 include/lib/html_input.class.php:1008
+#: include/lib/html_input.class.php:1041
 msgid "Calendrier"
 msgstr "Kalender"
 
@@ -3321,6 +3529,7 @@ msgstr "Kalender"
 #: include/lib/manage_table_sql.class.php:1028
 #: include/lib/manage_table_sql.class.php:1025
 #: include/lib/manage_table_sql.class.php:1069
+#: include/lib/manage_table_sql.class.php:1125
 #, fuzzy
 msgid "Cancel"
 msgstr "Evenwicht"
@@ -3354,6 +3563,8 @@ msgstr "Categorie"
 #: include/class/fiche.class.php:562 include/lib/html_input.class.php:386
 #: include/class/fiche.class.php:434 include/class/fiche.class.php:564
 #: include/class/fiche.class.php:433 include/class/fiche.class.php:563
+#: include/class/fiche.class.php:576
+#: include/ajax/ajax_add_concerned_card.php:81
 msgid "Catégorie"
 msgstr "Categorie"
 
@@ -3366,6 +3577,7 @@ msgstr "Categorie"
 #: include/customer.inc.php:89 include/manager.inc.php:92
 #: include/supplier.inc.php:92 include/contact.inc.php:86
 #: include/manager.inc.php:93 include/customer.inc.php:90
+#: include/contact.inc.php:87
 msgid "Catégorie :"
 msgstr "Categorie :"
 
@@ -3393,7 +3605,7 @@ msgstr "Categorie van de documenten"
 #: include/ext/import_doli/include/template/test_file.php:27
 #: include/ext/import_card/include/template/input_file.php:36
 #: include/ext/import_card/include/template/input_format.php:25
-#: include/database.item.php:109
+#: include/database.item.php:109 include/database.item.php:110
 msgid "Catégorie de fiche"
 msgstr "Categorie van het bestand"
 
@@ -3418,7 +3630,7 @@ msgstr "Bestaande categorie"
 #: html/ajax_card.php:530 html/ajax_card.php:529 include/ajax/ajax_card.php:509
 #: include/ajax/ajax_card.php:510 include/ajax/ajax_card.php:511
 #: include/ajax/ajax_card.php:544 include/ajax/ajax_card.php:548
-#: include/ajax/ajax_card.php:563
+#: include/ajax/ajax_card.php:563 include/ajax/ajax_card.php:639
 msgid "Catégorie existe déjà"
 msgstr "De categorie bestaat al."
 
@@ -3433,7 +3645,7 @@ msgstr "Ongeldige code"
 #: html/ajax_card.php:532 html/ajax_card.php:531 include/ajax/ajax_card.php:511
 #: include/ajax/ajax_card.php:512 include/ajax/ajax_card.php:513
 #: include/ajax/ajax_card.php:546 include/ajax/ajax_card.php:550
-#: include/ajax/ajax_card.php:567
+#: include/ajax/ajax_card.php:567 include/ajax/ajax_card.php:643
 msgid "Catégorie sauvée"
 msgstr "Opgeslagen categorie"
 
@@ -3465,7 +3677,7 @@ msgstr "Dit plan bestaat niet"
 #: include/ajax/ajax_view_action.php:55 include/action.common.inc.php:223
 #: include/action.common.inc.php:225 include/ajax/ajax_view_action.php:56
 #: include/ajax/ajax_view_action.php:52 include/action.common.inc.php:226
-#: include/action.common.inc.php:232
+#: include/action.common.inc.php:232 include/action.common.inc.php:257
 msgid "Ce document n'est pas accessible"
 msgstr "Dit document is niet beschikbaar"
 
@@ -3487,11 +3699,13 @@ msgstr "Dit bestand bestaat niet"
 #: include/class/print_ledger.class.php:71
 #: include/class/print_ledger.class.php:109
 #: include/class/print_ledger.class.php:115
+#: include/class/print_ledger.class.php:150
+#: include/class/print_ledger.class.php:194
 msgid "Ce journal ne peut être imprimé en mode simple"
 msgstr ""
 
 #: include/database.item.php:133 include/database.item.php:136
-#: include/database.item.php:131
+#: include/database.item.php:131 include/database.item.php:132
 msgid "Ce menu vous présente  un menu rapide de vos menus préférés"
 msgstr ""
 
@@ -3502,18 +3716,20 @@ msgid "Ce n'est pas un fichier valide"
 msgstr "wordt niet in this journaal"
 
 #: include/class/tva_rate_mtable.class.php:223
+#: include/class/tva_rate_mtable.class.php:240
 #, fuzzy
 msgid "Ce nom est déjà utilisé"
 msgstr "De categorie bestaat al."
 
 #: include/ajax_anc_search.php:65 include/ajax/ajax_anc_search.php:65
-#: include/ajax/ajax_anc_search.php:67
+#: include/ajax/ajax_anc_search.php:67 include/ajax/ajax_anc_search.php:70
 msgid "Ce plan n'existe pas"
 msgstr "Dit plan bestaat niet"
 
 #: html/ajax_misc.php:571 html/ajax_misc.php:613 html/ajax_misc.php:408
 #: html/ajax_misc.php:434 html/ajax_misc.php:546 html/ajax_misc.php:548
 #: html/ajax_misc.php:554 html/ajax_misc.php:556 html/ajax_misc.php:560
+#: html/ajax_misc.php:525
 #, fuzzy
 msgid "Ce plugin n'existe pas "
 msgstr "Dit plan bestaat niet"
@@ -3548,11 +3764,12 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1665
 #: include/class/acc_ledger.class.php:1674
 #: include/class/acc_ledger.class.php:1690
+#: include/class/acc_ledger.class.php:1680
 msgid "Celui qui paie n' a pas de poste comptable"
 msgstr "De persoon die betaald heeft geen boekhoudkundige post"
 
 #: include/param_sec.inc.php:228 include/param_sec.inc.php:162
-#: include/param_sec.inc.php:168
+#: include/param_sec.inc.php:168 include/param_sec.inc.php:173
 msgid "Cet utilisateur est administrateur, il a tous les droits"
 msgstr ""
 
@@ -3570,7 +3787,8 @@ msgstr "Dit bestand bestaat niet"
 #: include/lib/ac_common.php:431 include/action.common.inc.php:129
 #: include/lib/ac_common.php:432 include/action.common.inc.php:131
 #: include/action.common.inc.php:165 include/lib/ac_common.php:434
-#: include/lib/ac_common.php:450
+#: include/lib/ac_common.php:450 include/action.common.inc.php:133
+#: include/action.common.inc.php:167 include/lib/ac_common.php:460
 msgid "Cette action ne vous est pas autorisée Contactez votre responsable"
 msgstr "U bent niet bevoegd voor deze actie. Contacteer uw verantwoordelijke"
 
@@ -3588,6 +3806,7 @@ msgstr "Deze categorie heeft geen toegewezen e-mail"
 #: include/fiche.inc.php:290 include/fiche.inc.php:363
 #: include/fiche.inc.php:366 include/fiche.inc.php:367
 #: include/fiche.inc.php:368 include/fiche.inc.php:375
+#: include/fiche.inc.php:385
 #, fuzzy
 msgid "Cette catégorie n'ayant pas de poste comptable n'a pas de balance"
 msgstr "Dit bestand heeft geen geldige boekhoudkundige post"
@@ -3651,6 +3870,8 @@ msgstr "Deze extensie bestaat niet"
 #: include/class/acc_ledger.class.php:221
 #: include/class/acc_ledger.class.php:235
 #: include/class/acc_ledger.class.php:239
+#: include/class/acc_ledger.class.php:234
+#: include/class/acc_ledger.class.php:238
 msgid "Cette opération n'existe pas"
 msgstr "Deze operatie bestaat niet"
 
@@ -3665,12 +3886,14 @@ msgid "Champ \"linetype\" vide mais autres valeurs présentes"
 msgstr ""
 
 #: html/test_class.php:231 dev/test/test_class.php:227
+#: dev-2/test/test_class.php:227
 #, fuzzy
 msgid "Change de langue"
 msgstr "Handmatige wijziging"
 
 #: html/admin/template_config_form.php:39
 #: include/template/template_config_form.php:39
+#: include/template/template_config_form.php:40
 #, fuzzy
 msgid "Changement de langue"
 msgstr "Handmatige wijziging"
@@ -3703,7 +3926,7 @@ msgid "Changer format"
 msgstr ""
 
 #: include/company.inc.php:123 include/company.inc.php:142
-#: include/company.inc.php:146
+#: include/company.inc.php:146 include/company.inc.php:160
 msgid "Changer le libellé des détails"
 msgstr "Verander de verwoording van de gegevens"
 
@@ -3739,6 +3962,7 @@ msgid "Chargement"
 msgstr "Laden"
 
 #: include/database.item.php:89 include/database.item.php:87
+#: include/database.item.php:88
 msgid ""
 "Chargement de modèles de documents qui seront générés par NOALYSS, les "
 "formats utilisables sont libreoffice, html, text et rtf"
@@ -3752,7 +3976,7 @@ msgstr ""
 
 #: include/user_menu.php:153 include/user_menu.php:157
 #: include/lib/user_menu.php:166 include/lib/user_menu.php:179
-#: include/lib/user_menu.php:137
+#: include/lib/user_menu.php:137 include/lib/user_menu.php:136
 msgid "Charges"
 msgstr "Kosten"
 
@@ -3765,6 +3989,7 @@ msgstr "Pad"
 
 #: html/admin/template_config_form.php:43
 #: include/template/template_config_form.php:43
+#: include/template/template_config_form.php:44
 msgid "Chemin complet vers les executable de Postgresql"
 msgstr ""
 
@@ -3818,6 +4043,11 @@ msgstr ""
 #: include/class/fiche.class.php:2247 html/ajax_misc.php:464
 #: include/lib/manage_table_sql.class.php:634 html/ajax_misc.php:468
 #: include/ajax/ajax_card.php:292 include/class/acc_ledger.class.php:2201
+#: html/ajax_misc.php:433 include/class/pre_operation.class.php:346
+#: include/class/acc_ledger.class.php:2220 include/class/fiche.class.php:2274
+#: include/ajax/ajax_card.php:298 include/compta_fin_rec.inc.php:263
+#: include/template/tag_select.php:18 include/template/tag_search_select.php:15
+#: include/lib/manage_table_sql.class.php:681
 #, fuzzy, php-format
 msgid "Cherche"
 msgstr "Vinden"
@@ -3826,7 +4056,7 @@ msgstr "Vinden"
 #: include/adm.inc.php:81 include/bank.inc.php:74 include/contact.inc.php:77
 #: include/customer.inc.php:77 include/manager.inc.php:81
 #: include/supplier.inc.php:81 include/adm.inc.php:78
-#: include/customer.inc.php:78
+#: include/customer.inc.php:78 include/contact.inc.php:78
 #, fuzzy
 msgid "Cherche "
 msgstr "Vinden"
@@ -3840,6 +4070,7 @@ msgstr "Vinden"
 #: include/class/anc_operation.class.php:294 include/fiche.inc.php:94
 #: include/class/acc_ledger_search.class.php:588
 #: include/class/anc_operation.class.php:295
+#: include/class/acc_ledger_search.class.php:674
 #, fuzzy
 msgid "Chercher"
 msgstr "Vinden"
@@ -3866,7 +4097,7 @@ msgid ""
 msgstr ""
 
 #: html/ajax_misc.php:452 html/ajax_misc.php:454 html/ajax_misc.php:460
-#: html/ajax_misc.php:462 html/ajax_misc.php:466
+#: html/ajax_misc.php:462 html/ajax_misc.php:466 html/ajax_misc.php:431
 #, fuzzy
 msgid "Choisissez la TVA"
 msgstr "Kies de BTW"
@@ -3880,7 +4111,7 @@ msgstr "Kies de BTW"
 #: html/ajax_card.php:291 html/ajax_card.php:293 html/ajax_card.php:294
 #: include/ajax/ajax_card.php:274 include/ajax/ajax_card.php:275
 #: include/ajax/ajax_card.php:283 include/ajax/ajax_card.php:285
-#: include/ajax/ajax_card.php:286
+#: include/ajax/ajax_card.php:286 include/ajax/ajax_card.php:292
 #, fuzzy
 msgid ""
 "Choisissez la catégorie de fiche à laquelle vous aimeriez ajouter une fiche"
@@ -3917,6 +4148,7 @@ msgstr "Boekhoudkundige post of fiche veranderen"
 #: include/balance.inc.php:47 include/impress_bilan.inc.php:51
 #: include/impress_jrn.inc.php:86 include/ext/bilan_interne/index.php:56
 #: include/balance.inc.php:51 include/impress_jrn.inc.php:104
+#: include/impress_bilan.inc.php:54
 #, fuzzy
 msgid "Choisissez un autre exercice"
 msgstr "Kies een andere oefening"
@@ -3928,6 +4160,8 @@ msgstr "Kies een dossier"
 
 #: include/class/payment_method_mtable.class.php:77
 #: include/class/payment_method_mtable.class.php:87
+#: include/class/payment_method_mtable.class.php:78
+#: include/class/payment_method_mtable.class.php:88
 #, fuzzy
 msgid "Choisissez un journal"
 msgstr "Kies uw dossier"
@@ -3945,6 +4179,7 @@ msgid "Choisissez un poste"
 msgstr "Kies een dossier"
 
 #: include/class/payment_method_mtable.class.php:115
+#: include/class/payment_method_mtable.class.php:120
 #, fuzzy
 msgid "Choisissez un type de fiche"
 msgstr "Kies een andere oefening"
@@ -3952,7 +4187,7 @@ msgstr "Kies een andere oefening"
 #: html/ajax_card.php:295 html/ajax_card.php:297 html/ajax_card.php:298
 #: include/ajax/ajax_card.php:278 include/ajax/ajax_card.php:279
 #: include/ajax/ajax_card.php:285 include/ajax/ajax_card.php:287
-#: include/ajax/ajax_card.php:288
+#: include/ajax/ajax_card.php:288 include/ajax/ajax_card.php:294
 #, fuzzy
 msgid "Choisissez une catégorie svp"
 msgstr "Kies een dossier"
@@ -3987,17 +4222,25 @@ msgstr "Kies een andere oefening"
 msgid "Choississez un dossier"
 msgstr "Kies een dossier"
 
+#: include/template/followup-show-action-add.php:34
+#, fuzzy
+msgid "Choississez une action"
+msgstr "Kies uw dossier"
+
 #: html/user_login.php:160
 msgid "Choississez votre dossier"
 msgstr "Kies uw dossier"
 
 #: html/test_class.php:218 dev/test/test_class.php:214
+#: dev-2/test/test_class.php:214
 #, fuzzy
 msgid "Choississez votre langue"
 msgstr "Kies uw dossier"
 
 #: include/ajax_anc_search.php:78 include/ajax_anc_search.php:79
 #: include/ajax/ajax_anc_search.php:78 include/ajax/ajax_anc_search.php:79
+#: include/class/card_attribut_mtable.class.php:54
+#: include/class/contact_option_ref_mtable.class.php:44
 msgid "Choix"
 msgstr "Keuze"
 
@@ -4033,12 +4276,14 @@ msgstr "Een sleutel kiezen"
 #: include/ajax/ajax_card.php:259 include/ajax/ajax_card.php:269
 #: include/ajax/ajax_card.php:334 include/ajax/ajax_card.php:280
 #: include/ajax/ajax_card.php:337 include/ajax/ajax_card.php:281
-#: include/ajax/ajax_card.php:338
+#: include/ajax/ajax_card.php:338 include/ajax/ajax_card.php:287
+#: include/ajax/ajax_card.php:357
 msgid "Choix de la catégorie"
 msgstr "Een categorie kiezen"
 
 #: include/database.item.php:78 include/database.item.php:81
 #: include/database.item.php:75 include/database.item.php:73
+#: include/database.item.php:74
 #, fuzzy
 msgid "Choix de votre dossier"
 msgstr "Kies uw dossier"
@@ -4063,6 +4308,7 @@ msgstr "Kies uw dossier"
 #: include/compta_ach.inc.php:83 include/compta_ach.inc.php:86
 #: include/compta_ven.inc.php:95 include/compta_ach.inc.php:88
 #: include/compta_ach.inc.php:90 include/compta_ven.inc.php:97
+#: include/compta_ach.inc.php:87
 #, fuzzy
 msgid "Choix du dépôt"
 msgstr "Configuratie van de deposito's "
@@ -4090,11 +4336,13 @@ msgstr "Keuze van het soort dagboek"
 #: include/class/acc_ledger.class.php:2328
 #: include/class/acc_ledger.class.php:2337
 #: include/class/acc_ledger.class.php:2359
+#: include/class/acc_ledger.class.php:2385
 #, fuzzy
 msgid "Choix du type de journal est obligatoire"
 msgstr "Keuze van het soort dagboek"
 
 #: include/class/tva_rate_mtable.class.php:250
+#: include/class/tva_rate_mtable.class.php:267
 #, fuzzy
 msgid "Choix incorrect"
 msgstr "Verkeerde klant"
@@ -4162,7 +4410,7 @@ msgstr "Sleutel"
 #: include/ext/coprop/index.php:44 include/database.item.php:3
 #: include/database.item.php:143 include/database.item.php:139
 #: include/database.item.php:138 include/database.item.php:131
-#: include/database.item.php:129
+#: include/database.item.php:129 include/database.item.php:130
 msgid "Clef de répartition"
 msgstr "Key distribution"
 
@@ -4221,6 +4469,12 @@ msgstr "Ongeldige sleutel"
 #: include/class/print_ledger_simple.class.php:103
 #: include/class/acc_ledger_sold.class.php:1083
 #: include/class/acc_ledger_sold.class.php:1339
+#: include/class/pre_op_ach.class.php:394
+#: include/class/pre_op_ven.class.php:392
+#: include/class/acc_ledger_sold.class.php:710
+#: include/class/acc_ledger_sold.class.php:1050
+#: include/class/acc_ledger_sold.class.php:1306
+#: include/class/print_ledger_simple.class.php:100 include/database.item.php:16
 msgid "Client"
 msgstr "Klant"
 
@@ -4247,6 +4501,7 @@ msgstr "Klant"
 
 #: include/template/param_jrn.php:194 include/template/param_jrn.php:201
 #: include/template/param_jrn.php:203 include/template/param_jrn.php:248
+#: include/template/param_jrn.php:249
 #, fuzzy
 msgid "Clients (D)"
 msgstr "Klant"
@@ -4273,7 +4528,7 @@ msgstr "Klik hier om uw voorkeuren bij te werken"
 #: include/lib/ac_common.php:816 include/lib/ac_common.php:823
 #: include/lib/ac_common.php:834 include/lib/ac_common.php:835
 #: include/lib/ac_common.php:847 include/lib/ac_common.php:849
-#: include/lib/ac_common.php:865
+#: include/lib/ac_common.php:865 include/lib/ac_common.php:875
 msgid "Cliquez ici pour vous reconnecter dans une autre page"
 msgstr ""
 
@@ -4307,6 +4562,12 @@ msgstr "Export is onmogelijk"
 msgid "Cloner"
 msgstr "Klonen"
 
+#: include/class/card_attribut_mtable.class.php:57
+#: include/class/contact_option_ref_mtable.class.php:46
+#, fuzzy
+msgid "Coche"
+msgstr "Alles aanvinken "
+
 #: include/param_pcmn.inc.php:65 include/template/pcmn_update.php:50
 #: include/template/pcmn_update.php:51
 #, fuzzy
@@ -4409,6 +4670,10 @@ msgstr "Vink aan om deze fiche te verwijderen "
 #: include/class/acc_ledger_sold.class.php:718
 #: include/class/acc_ledger_purchase.class.php:1440
 #: include/upgrade-plugin.php:68
+#: include/class/acc_ledger_purchase.class.php:1451
+#: include/class/acc_ledger_sold.class.php:721
+#: include/class/print_ledger_detail_item.class.php:58
+#: include/upgrade-plugin.php:71
 msgid "Code"
 msgstr "Code"
 
@@ -4421,7 +4686,7 @@ msgstr "Code"
 #: include/lib/ac_common.php:1160 include/lib/ac_common.php:1171
 #: include/lib/ac_common.php:1172 include/lib/ac_common.php:1173
 #: include/lib/ac_common.php:1185 include/lib/ac_common.php:1187
-#: include/lib/ac_common.php:1211
+#: include/lib/ac_common.php:1211 include/lib/ac_common.php:1221
 msgid "Code Interne"
 msgstr "Interne code"
 
@@ -4451,6 +4716,8 @@ msgstr "Interne code"
 #: include/class/acc_ledger_purchase.class.php:1836
 #: include/class/acc_ledger_sold.class.php:1416
 #: include/class/acc_ledger_purchase.class.php:1842
+#: include/class/acc_ledger_purchase.class.php:1879
+#: include/class/acc_ledger_sold.class.php:1401
 msgid "Code Item"
 msgstr "Item code"
 
@@ -4467,7 +4734,7 @@ msgid "Code Pays incorrect"
 msgstr "Verkeerde landcode"
 
 #: include/company.inc.php:107 include/company.inc.php:126
-#: include/company.inc.php:130
+#: include/company.inc.php:130 include/company.inc.php:138
 msgid "Code Postal"
 msgstr "Postcode"
 
@@ -4527,6 +4794,12 @@ msgstr "Stock code"
 #: include/class/print_ledger_detail_item.class.php:163
 #: include/class/acc_ledger_sold.class.php:1426
 #: include/class/acc_ledger_purchase.class.php:1852
+#: include/class/acc_ledger_purchase.class.php:1889
+#: include/class/acc_ledger_sold.class.php:1411
+#: include/export/export_printtva_pdf.php:59
+#: include/export/export_printtva_pdf.php:216
+#: include/template/follow_up_detail_display.php:54
+#: include/template/newEmptyPHP_NOALYSS.php:39
 msgid "Code TVA"
 msgstr "BTW-code"
 
@@ -4577,6 +4850,8 @@ msgstr "Menucode"
 #: include/class/acc_ledger_purchase.class.php:1841
 #: include/class/acc_ledger_sold.class.php:1421
 #: include/class/acc_ledger_purchase.class.php:1847
+#: include/class/acc_ledger_purchase.class.php:1884
+#: include/class/acc_ledger_sold.class.php:1406
 msgid "Code fournisseur"
 msgstr "Levernacierscode"
 
@@ -4588,6 +4863,7 @@ msgstr "Levernacierscode"
 #: include/class/fiche.class.php:1457
 #: include/class/acc_account_ledger.class.php:395
 #: include/class/fiche.class.php:1458 include/class/fiche.class.php:1460
+#: include/class/acc_account_ledger.class.php:387
 msgid "Code interne"
 msgstr "Interne code"
 
@@ -4629,6 +4905,8 @@ msgstr "Ongeldige code"
 #: include/class/acc_ledger_purchase.class.php:1833
 #: include/class/acc_ledger_sold.class.php:1413
 #: include/class/acc_ledger_purchase.class.php:1839
+#: include/class/acc_ledger_purchase.class.php:1876
+#: include/class/acc_ledger_sold.class.php:1398
 msgid "Code journal"
 msgstr "Code dagboek"
 
@@ -4637,6 +4915,12 @@ msgstr "Code dagboek"
 msgid "Code malformé dans le fichier "
 msgstr ""
 
+#: include/class/acc_ledger_history_sale.class.php:274
+#: include/class/acc_ledger_history_purchase.class.php:289
+#, fuzzy
+msgid "Code paiement"
+msgstr "Betaling"
+
 #: include/ext/transform/include/template/listing_assujetti_declarant.php:35
 #: include/ext/transform/include/template/listing_assujetti_representative.php:36
 #: include/ext/sav/include/template/sas_display_detail.php:99
@@ -4668,6 +4952,7 @@ msgstr "niet use of"
 #: include/export/export_fiche_balance_csv.php:155
 #: include/export/export_fiche_balance_csv.php:156 include/fiche.inc.php:519
 #: include/fiche.inc.php:521 include/fiche.inc.php:530
+#: include/fiche.inc.php:543
 msgid "Comm"
 msgstr "Comm"
 
@@ -4680,7 +4965,7 @@ msgstr "Onbekende post"
 #: html/install.php:533 html/install.php:532 html/install.php:530
 #: html/install.php:536 html/install.php:528 html/install.php:534
 #: html/install.php:496 html/install.php:471 html/install.php:477
-#: html/install.php:480
+#: html/install.php:480 html/install.php:529
 msgid "Commencer la mise à jour ou l'installation"
 msgstr ""
 
@@ -4734,6 +5019,14 @@ msgstr ""
 #: include/class/acc_ledger_history_generic.class.php:687
 #: include/class/acc_ledger_sold.class.php:1415
 #: include/class/acc_ledger_purchase.class.php:1841
+#: include/class/print_ledger_misc.class.php:46
+#: include/class/acc_ledger_purchase.class.php:1878
+#: include/class/acc_ledger_sold.class.php:1400
+#: include/class/acc_ledger_history_generic.class.php:688
+#: include/template/action_document_type_mtable_input.php:113
+#: include/template/detail-action.php:297
+#: include/template/detail-action.php:327
+#: include/template/detail-action.php:332
 msgid "Commentaire"
 msgstr "Commentaar"
 
@@ -4769,6 +5062,8 @@ msgstr "Commentaar"
 #: include/class/acc_ledger_purchase.class.php:1843
 #: include/class/acc_ledger_sold.class.php:1423
 #: include/class/acc_ledger_purchase.class.php:1849
+#: include/class/acc_ledger_purchase.class.php:1886
+#: include/class/acc_ledger_sold.class.php:1408
 msgid "Commentaire TVA"
 msgstr "Opmerking BTW"
 
@@ -4778,7 +5073,7 @@ msgid "Commentaire vide"
 msgstr "Commentaar"
 
 #: include/company.inc.php:109 include/company.inc.php:128
-#: include/company.inc.php:132
+#: include/company.inc.php:132 include/company.inc.php:140
 msgid "Commune"
 msgstr "Gemeente"
 
@@ -4828,12 +5123,15 @@ msgstr "Gemeente"
 #: include/class/acc_ledger_purchase.class.php:1462
 #: include/class/acc_ledger.class.php:622
 #: include/class/acc_ledger.class.php:638
+#: include/class/acc_ledger_purchase.class.php:1473
+#: include/class/acc_ledger_sold.class.php:741
 msgid "Compt. Analytique"
 msgstr "Analytischer ekening"
 
 #: include/database.item.php:115 include/database.item.php:118
 #: include/database.item.php:124 include/database.item.php:121
 #: include/database.item.php:120 include/database.item.php:116
+#: include/database.item.php:117
 msgid "Compta Analytique"
 msgstr "Analytische boekhouding"
 
@@ -4843,12 +5141,13 @@ msgstr "Analytische boekhouding"
 #: include/class/class_pdf_operation.php:371
 #: include/template/security_list_action.php:63
 #: include/class/pdf_operation.class.php:371 include/database.item.php:76
-#: include/template/security_list_action.php:66
+#: include/template/security_list_action.php:66 include/database.item.php:75
 msgid "Comptabilité"
 msgstr "Boekhouding"
 
 #: include/template/ledger_detail_bottom.php:36
 #: include/template/ledger_detail_bottom.php:41
+#: include/template/ledger_detail_bottom.php:46
 #, fuzzy
 msgid "Comptabilité Analytique"
 msgstr "Export Cost Accounting"
@@ -4858,6 +5157,7 @@ msgstr "Export Cost Accounting"
 #: include/database.item.php:184 include/database.item.php:143
 #: include/database.item.php:144 include/database.item.php:145
 #: include/database.item.php:150 include/database.item.php:155
+#: include/database.item.php:151
 msgid "Compte bancaire"
 msgstr "Bankrekening"
 
@@ -4913,13 +5213,14 @@ msgstr "????? : product met een creditsaldo"
 #: include/class/acc_plan_mtable.class.php:145
 #: include/class/acc_plan_mtable.class.php:157
 #: include/class/acc_plan_mtable.class.php:181
+#: include/class/acc_plan_mtable.class.php:185
 #, fuzzy
 msgid "Compte parent n'existe pas"
 msgstr "Dit plan bestaat niet"
 
 #: include/user_menu.php:151 include/user_menu.php:155
 #: include/lib/user_menu.php:164 include/lib/user_menu.php:177
-#: include/lib/user_menu.php:135
+#: include/lib/user_menu.php:135 include/lib/user_menu.php:134
 msgid "Compte tiers"
 msgstr "Derde rekening"
 
@@ -4957,6 +5258,8 @@ msgstr "Gewone rekeningen"
 #: include/class/acc_ledger_search.class.php:950
 #: include/class/acc_ledger_search.class.php:708
 #: include/class/acc_ledger_search.class.php:963
+#: include/class/acc_ledger_search.class.php:794
+#: include/class/acc_ledger_search.class.php:1052
 msgid "Concerne"
 msgstr "Wat betreft"
 
@@ -4965,7 +5268,7 @@ msgstr "Wat betreft"
 #: include/database.item.php:235 include/database.item.php:212
 #: include/database.item.php:213 include/database.item.php:216
 #: include/database.item.php:236 include/database.item.php:214
-#: include/database.item.php:245
+#: include/database.item.php:245 include/database.item.php:226
 msgid ""
 "Concerne tous les achats, factures reçues, notes de crédit reçues et notes "
 "de frais"
@@ -4977,7 +5280,7 @@ msgstr ""
 #: include/database.item.php:236 include/database.item.php:213
 #: include/database.item.php:214 include/database.item.php:217
 #: include/database.item.php:237 include/database.item.php:215
-#: include/database.item.php:243
+#: include/database.item.php:243 include/database.item.php:224
 msgid ""
 "Concerne tous les mouvements financiers (comptes en banque, caisses, visa...)"
 msgstr ""
@@ -4988,7 +5291,7 @@ msgstr ""
 #: include/database.item.php:237 include/database.item.php:214
 #: include/database.item.php:215 include/database.item.php:218
 #: include/database.item.php:238 include/database.item.php:216
-#: include/database.item.php:242
+#: include/database.item.php:242 include/database.item.php:223
 msgid ""
 "Concerne toutes les opérations comme les amortissements, les comptes TVA, ..."
 msgstr "Betreft alle handelingen als aflossingen, BTW-rekeningen ..."
@@ -4998,13 +5301,13 @@ msgstr "Betreft alle handelingen als aflossingen, BTW-rekeningen ..."
 #: include/database.item.php:238 include/database.item.php:215
 #: include/database.item.php:216 include/database.item.php:219
 #: include/database.item.php:239 include/database.item.php:217
-#: include/database.item.php:244
+#: include/database.item.php:244 include/database.item.php:225
 msgid "Concerne toutes les ventes, notes de crédit envoyées"
 msgstr "Wat betreft alle verkopen, gestuurde creditnota's "
 
 #: include/database.item.php:10 include/database.item.php:13
 #: include/database.item.php:15 include/database.item.php:18
-#: include/database.item.php:12
+#: include/database.item.php:12 include/database.item.php:11
 msgid "Config. Menu"
 msgstr "Config. Menu"
 
@@ -5018,14 +5321,14 @@ msgstr "Config. categorie van de documenten"
 
 #: include/database.item.php:8 include/database.item.php:11
 #: include/database.item.php:13 include/database.item.php:16
-#: include/database.item.php:10
+#: include/database.item.php:10 include/database.item.php:9
 msgid "Config. de la tva"
 msgstr "Config. van de BTW"
 
 #: include/database.item.php:121 include/database.item.php:124
 #: include/database.item.php:130 include/database.item.php:126
 #: include/database.item.php:125 include/database.item.php:129
-#: include/database.item.php:123
+#: include/database.item.php:123 include/database.item.php:122
 msgid "Config. des méthodes de paiement"
 msgstr "Config. van de betaalmiddelen"
 
@@ -5039,6 +5342,7 @@ msgstr "Config. van het boekhoudkundig plan"
 #: include/database.item.php:87 include/database.item.php:90
 #: include/database.item.php:95 include/database.item.php:92
 #: include/database.item.php:91 include/database.item.php:89
+#: include/database.item.php:88
 msgid "Config. modèle de document"
 msgstr "Config. van het model van het document"
 
@@ -5052,7 +5356,7 @@ msgstr "Config. van de basis van de boekhoudkundige post"
 #: html/admin/setup.php:236 html/admin/setup.php:254 html/admin/setup.php:256
 #: html/install.php:320 html/install.php:319 html/install.php:317
 #: html/install.php:323 html/install.php:329 html/install.php:280
-#: html/install.php:287 html/install.php:290
+#: html/install.php:287 html/install.php:290 html/install.php:339
 #, fuzzy
 msgid "Configuration"
 msgstr "Informatie"
@@ -5060,18 +5364,20 @@ msgstr "Informatie"
 #: include/database.item.php:109 include/database.item.php:112
 #: include/database.item.php:118 include/database.item.php:115
 #: include/database.item.php:114 include/database.item.php:110
+#: include/database.item.php:111
 msgid "Configuration de catégorie de fiches"
 msgstr "Configuratie van de categorie van de bestanden "
 
 #: include/database.item.php:94 include/database.item.php:97
 #: include/database.item.php:91 include/database.item.php:89
+#: include/database.item.php:90
 msgid ""
 "Configuration de la sécurité, vous permet de donner un profil à vos "
 "utilisateurs, cela leur permettra d'utiliser ce que vous souhaitez qu'ils "
 "puissent utiliser"
 msgstr ""
 
-#: include/database.item.php:139
+#: include/database.item.php:139 include/database.item.php:138
 #, fuzzy
 msgid "Configuration des devises"
 msgstr "Configuratie van de tags"
@@ -5079,11 +5385,13 @@ msgstr "Configuratie van de tags"
 #: include/database.item.php:106 include/database.item.php:109
 #: include/database.item.php:115 include/database.item.php:112
 #: include/database.item.php:111 include/database.item.php:107
+#: include/database.item.php:108
 msgid "Configuration des dépôts"
 msgstr "Configuratie van het deposito"
 
 #: include/database.item.php:112 include/database.item.php:115
 #: include/database.item.php:109 include/database.item.php:107
+#: include/database.item.php:108
 #, fuzzy
 msgid "Configuration des entrepots de dépôts"
 msgstr "Configuratie van het deposito"
@@ -5091,24 +5399,26 @@ msgstr "Configuratie van het deposito"
 #: include/database.item.php:88 include/database.item.php:91
 #: include/database.item.php:96 include/database.item.php:93
 #: include/database.item.php:92 include/database.item.php:90
+#: include/database.item.php:89
 msgid "Configuration des journaux"
 msgstr "Configuratie van de dagboeken"
 
 #: include/database.item.php:10 include/database.item.php:13
 #: include/database.item.php:15 include/database.item.php:18
-#: include/database.item.php:12
+#: include/database.item.php:12 include/database.item.php:11
 msgid "Configuration des menus et plugins"
 msgstr "Configuratie van de menu's en de plug-ins"
 
 #: include/database.item.php:126 include/database.item.php:129
 #: include/database.item.php:135 include/database.item.php:131
 #: include/database.item.php:130 include/database.item.php:134
-#: include/database.item.php:128
+#: include/database.item.php:128 include/database.item.php:127
 msgid "Configuration des menus par défaut"
 msgstr "Configuratie van het standaard menu"
 
 #: include/database.item.php:131 include/database.item.php:134
 #: include/database.item.php:128 include/database.item.php:126
+#: include/database.item.php:127
 msgid ""
 "Configuration des menus par défaut, ces menus sont appelés par des actions "
 "dans d'autres menus"
@@ -5116,6 +5426,7 @@ msgstr ""
 
 #: include/database.item.php:126 include/database.item.php:129
 #: include/database.item.php:123 include/database.item.php:121
+#: include/database.item.php:122
 msgid ""
 "Configuration des moyens de paiements que vous voulez utiliser dans les "
 "journaux de type VEN ou ACH, les moyens de paiement permettent de générer "
@@ -5125,6 +5436,7 @@ msgstr ""
 
 #: include/database.item.php:81 include/database.item.php:84
 #: include/database.item.php:78 include/database.item.php:76
+#: include/database.item.php:77
 msgid ""
 "Configuration des profils des utilisateurs, permet de fixer les journaux, "
 "profils dans les documents et stock que  ce profil peut utiliser. Cela "
@@ -5140,6 +5452,7 @@ msgstr "Configuratie van de tags"
 
 #: include/database.item.php:85 include/database.item.php:88
 #: include/database.item.php:82 include/database.item.php:80
+#: include/database.item.php:81
 msgid ""
 "Configuration des tags ou dossiers, on l'appele tag ou dossier suivant la "
 "façon dont vous utilisez \n"
@@ -5154,6 +5467,7 @@ msgstr "Configuratie van de menu's en de plug-ins"
 #: include/database.item.php:106 include/database.item.php:109
 #: include/database.item.php:115 include/database.item.php:112
 #: include/database.item.php:111 include/database.item.php:107
+#: include/database.item.php:108
 msgid "Configuration dépôts"
 msgstr "Configuratie van de deposito's "
 
@@ -5164,6 +5478,7 @@ msgstr "Configuratie en parameter"
 #: include/database.item.php:4 include/database.item.php:144
 #: include/database.item.php:140 include/database.item.php:139
 #: include/database.item.php:132 include/database.item.php:130
+#: include/database.item.php:131
 #, fuzzy
 msgid "Configuration extension"
 msgstr "Configuratie van de tags"
@@ -5244,7 +5559,7 @@ msgstr "U bent geen beheerder"
 #: html/install.php:635 html/install.php:656 html/install.php:657
 #: html/install.php:683 html/install.php:676 html/install.php:655
 #: html/install.php:682 html/install.php:617 html/install.php:644
-#: html/install.php:607 html/install.php:614
+#: html/install.php:607 html/install.php:614 html/install.php:667
 msgid "Connectez-vous à NOALYSS"
 msgstr ""
 
@@ -5259,6 +5574,10 @@ msgstr ""
 msgid "Contact"
 msgstr "Contact"
 
+#: include/template/action_document_type_mtable_input.php:86
+msgid "Contacts multiples"
+msgstr ""
+
 #: include/class/acc_plan_mtable.class.php:57
 #: include/class/acc_plan_mtable.class.php:63
 #, fuzzy
@@ -5272,7 +5591,7 @@ msgstr "Text"
 #: html/install.php:300 html/install.php:264 html/install.php:306
 #: html/install.php:215 html/install.php:257 include/opening.inc.php:140
 #: include/opening.inc.php:174 html/install.php:222 html/install.php:225
-#: html/install.php:267
+#: html/install.php:267 html/install.php:272 html/install.php:315
 #, fuzzy
 msgid "Continuer"
 msgstr "Contact"
@@ -5367,6 +5686,7 @@ msgstr "Boekhoudkundig schrijven aanmaken"
 #: include/compta_ven.inc.php:119 include/compta_ach.inc.php:115
 #: include/compta_ven.inc.php:123 include/operation_ods_confirm.inc.php:90
 #: include/compta_ven.inc.php:121 include/compta_ach.inc.php:113
+#: include/compta_ach.inc.php:112
 msgid "Corriger"
 msgstr "Verbeteren"
 
@@ -5374,7 +5694,7 @@ msgstr "Verbeteren"
 #: include/database.item.php:207 include/database.item.php:204
 #: include/database.item.php:177 include/database.item.php:178
 #: include/database.item.php:181 include/database.item.php:189
-#: include/database.item.php:194
+#: include/database.item.php:194 include/database.item.php:187
 msgid "Courrier"
 msgstr "Post"
 
@@ -5388,7 +5708,7 @@ msgstr "Dossier maken"
 #: html/admin/setup.php:497 html/install.php:561 html/install.php:560
 #: html/install.php:558 html/install.php:569 html/install.php:567
 #: html/install.php:529 html/install.php:513 html/install.php:519
-#: html/install.php:522
+#: html/install.php:522 html/install.php:572
 #, fuzzy
 msgid "Creation of Modele 1"
 msgstr "Dossier maken"
@@ -5396,7 +5716,7 @@ msgstr "Dossier maken"
 #: html/admin/setup.php:510 html/install.php:574 html/install.php:573
 #: html/install.php:571 html/install.php:582 html/install.php:580
 #: html/install.php:542 html/install.php:532 html/install.php:538
-#: html/install.php:541
+#: html/install.php:541 html/install.php:591
 #, fuzzy
 msgid "Creation of Modele 2"
 msgstr "Dossier maken"
@@ -5411,7 +5731,8 @@ msgstr "Dossier maken"
 #: include/ext/tools/include/anc_grandlivre_ext.class.php:127
 #: include/export/export_poste_detail_pdf.php:104
 #: include/ajax/ajax_display_letter.php:123 include/fiche.inc.php:580
-#: include/fiche.inc.php:589
+#: include/fiche.inc.php:589 include/fiche.inc.php:602
+#: include/ajax/ajax_display_letter.php:141
 msgid "Credit"
 msgstr "Credit"
 
@@ -5447,6 +5768,11 @@ msgstr ""
 msgid "Création d'avis et annonces pour les trésoriers"
 msgstr ""
 
+#: include/template/action_document_type_mtable_input.php:94
+#, fuzzy
+msgid "Création de facture"
+msgstr "Rapport aanmaken"
+
 #: include/ext/tva/class_ext_tva.php:340 include/ext/tva/ext_tva.class.php:340
 #: include/ext/tva/ext_tva.class.php:341
 msgid "Création de l'écriture comptable"
@@ -5454,7 +5780,7 @@ msgstr "Boekhoudkundig schrijven aanmaken"
 
 #: include/database.item.php:13 include/database.item.php:16
 #: include/database.item.php:18 include/database.item.php:21
-#: include/database.item.php:15
+#: include/database.item.php:15 include/database.item.php:14
 msgid "Création de rapport"
 msgstr "Rapport aanmaken"
 
@@ -5465,6 +5791,7 @@ msgstr "Rapport aanmaken"
 
 #: include/database.item.php:18 include/database.item.php:21
 #: include/database.item.php:15 include/database.item.php:13
+#: include/database.item.php:14
 msgid ""
 "Création de rapport sur mesure, comme les ratios, vous permet de créer des "
 "graphiques de vos données (vente, achat...)"
@@ -5486,6 +5813,7 @@ msgstr "Aanmaak van de afrekening van de storting"
 
 #: include/database.item.php:93 include/database.item.php:96
 #: include/database.item.php:90 include/database.item.php:88
+#: include/database.item.php:89
 msgid ""
 "Création et modification des journaux, préfixe des pièces justificatives, "
 "numérotation, catégories de fiches accessibles à ce journal"
@@ -5495,6 +5823,7 @@ msgstr ""
 #: include/database.item.php:211 include/database.item.php:188
 #: include/database.item.php:189 include/database.item.php:192
 #: include/database.item.php:203 include/database.item.php:208
+#: include/database.item.php:198
 msgid "Création, modification et effacement de fiche"
 msgstr "De fiche aanmaken, bewerken en verwijderen "
 
@@ -5589,7 +5918,14 @@ msgstr "Crébit"
 #: include/class/fiche.class.php:1480
 #: include/class/pdfbalance_simple.class.php:57
 #: include/class/acc_ledger_history_generic.class.php:775
-#: include/class/acc_ledger.class.php:630
+#: include/class/acc_ledger.class.php:630 include/fiche.inc.php:419
+#: include/class/fiche.class.php:1507
+#: include/class/acc_account_ledger.class.php:392
+#: include/class/acc_ledger_history_generic.class.php:776
+#: include/class/anc_grandlivre.class.php:234
+#: include/export/export_balance_csv.php:79
+#: include/template/ledger_detail_bottom.php:97
+#: include/operation_ods_new.inc.php:86
 msgid "Crédit"
 msgstr "Creditzijde"
 
@@ -5611,6 +5947,7 @@ msgstr "Gebruiker"
 #: include/database.item.php:219 include/database.item.php:196
 #: include/database.item.php:197 include/database.item.php:200
 #: include/database.item.php:211 include/database.item.php:216
+#: include/database.item.php:206
 #, fuzzy
 msgid "Créer une note publique"
 msgstr "Een nieuwe fiche aanmaken"
@@ -5702,13 +6039,21 @@ msgstr "Een nieuwe fiche aanmaken"
 #: include/class/follow_up.class.php:297 include/category_card.inc.php:162
 #: include/class/acc_ledger.class.php:2436 include/fiche.inc.php:116
 #: include/class/acc_ledger.class.php:2445
-#: include/class/acc_ledger.class.php:2476
+#: include/class/acc_ledger.class.php:2476 include/fiche.inc.php:241
+#: include/class/pre_op_ach.class.php:177
+#: include/class/pre_op_ach.class.php:184 include/class/follow_up.class.php:304
+#: include/class/pre_op_ven.class.php:173
+#: include/class/pre_op_ven.class.php:180
+#: include/class/acc_ledger.class.php:2505
+#: include/class/pre_op_advanced.class.php:177 include/bank.inc.php:125
+#: include/supplier.inc.php:130 include/contact.inc.php:131
+#: include/customer.inc.php:128
 msgid "Créer une nouvelle fiche"
 msgstr "Een nieuwe fiche aanmaken"
 
 #: html/install.php:264 html/install.php:263 html/install.php:261
 #: html/install.php:266 html/install.php:272 html/install.php:223
-#: html/install.php:230 html/install.php:233
+#: html/install.php:230 html/install.php:233 html/install.php:280
 #, php-format
 msgid "Créez ce fichier %s avec les informations suivantes "
 msgstr ""
@@ -5737,7 +6082,7 @@ msgstr "D / C"
 #: include/class/anc_listing.class.php:85
 #: include/class/pdf_operation.class.php:250
 #: include/class/anc_listing.class.php:87
-#: include/class/pdfbalance_simple.class.php:59
+#: include/class/pdfbalance_simple.class.php:59 include/fiche.inc.php:421
 msgid "D/C"
 msgstr "D / C"
 
@@ -5760,6 +6105,7 @@ msgstr "Diff"
 #: include/class/acc_ledger_history_purchase.class.php:257
 #: include/class/acc_ledger_history_purchase.class.php:258
 #: include/class/acc_ledger_history_purchase.class.php:262
+#: include/class/acc_ledger_history_purchase.class.php:273
 msgid "DNA"
 msgstr ""
 
@@ -5777,6 +6123,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2770
 #: include/class/acc_ledger.class.php:2779
 #: include/class/acc_ledger.class.php:2818
+#: include/class/acc_ledger.class.php:2842
 #, fuzzy
 msgid "Dans le dépôt"
 msgstr "Deposito"
@@ -5786,6 +6133,7 @@ msgid "Dans le journal"
 msgstr "In het dagboek"
 
 #: include/lib/database_core.class.php:464
+#: include/lib/database_core.class.php:467
 msgid "Database:get_row retourne trop de lignes"
 msgstr ""
 
@@ -6010,7 +6358,32 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:1406
 #: include/class/acc_ledger.class.php:617
 #: include/class/acc_ledger.class.php:830
-#: include/class/acc_ledger_purchase.class.php:1832
+#: include/class/acc_ledger_purchase.class.php:1832 include/fiche.inc.php:540
+#: include/class/acc_ledger_history_sale.class.php:252
+#: include/class/acc_ledger_search.class.php:724
+#: include/class/acc_ledger_search.class.php:1046
+#: include/class/acc_ledger_history_purchase.class.php:264
+#: include/class/acc_ledger.class.php:818
+#: include/class/print_ledger_misc.class.php:42
+#: include/class/fiche.class.php:1424 include/class/fiche.class.php:1499
+#: include/class/card_attribut_mtable.class.php:52
+#: include/class/acc_ledger_purchase.class.php:1418
+#: include/class/acc_ledger_purchase.class.php:1869
+#: include/class/acc_ledger_sold.class.php:690
+#: include/class/acc_ledger_sold.class.php:1391
+#: include/class/print_ledger_simple.class.php:97
+#: include/class/contact_option_ref_mtable.class.php:45
+#: include/class/acc_account_ledger.class.php:384
+#: include/class/print_ledger_detail_item.class.php:56
+#: include/class/acc_ledger_history_generic.class.php:684
+#: include/class/acc_ledger_history_generic.class.php:771
+#: include/class/anc_grandlivre.class.php:225
+#: include/ajax/ajax_display_letter.php:68
+#: include/export/export_printtva_pdf.php:47
+#: include/export/export_ledger_csv.php:227
+#: include/export/export_histo_csv.php:41
+#: include/template/form_ledger_detail.php:25
+#: include/template/detail-action.php:102 include/lib/ac_common.php:1220
 #, php-format
 msgid "Date"
 msgstr "Datum"
@@ -6039,11 +6412,17 @@ msgstr "Aankoopdatum"
 msgid "Date DMY"
 msgstr "Datum DMY"
 
+#: include/class/follow_up.class.php:620
+#, fuzzy
+msgid "Date Doc."
+msgstr "Datum"
+
 #: include/ext/sav/include/template/sas_display_detail.php:141
 #: include/ajax/ajax_display_letter.php:98
 #: include/ajax/ajax_display_letter.php:103 include/class/periode.class.php:517
 #: include/class/periode_ledger_table.class.php:98
 #: include/class/periode.class.php:519 include/class/periode.class.php:521
+#: include/class/periode.class.php:522 include/ajax/ajax_display_letter.php:119
 #, fuzzy
 msgid "Date Début"
 msgstr "Begindatum"
@@ -6058,10 +6437,16 @@ msgstr "Begindatum"
 #: include/ajax/ajax_display_letter.php:116 include/class/periode.class.php:518
 #: include/class/periode_ledger_table.class.php:99
 #: include/class/periode.class.php:520 include/database.item.php:179
-#: include/class/periode.class.php:522
+#: include/class/periode.class.php:522 include/class/periode.class.php:523
+#: include/ajax/ajax_display_letter.php:134 include/database.item.php:175
 msgid "Date Fin"
 msgstr "Einddatum"
 
+#: include/class/follow_up.class.php:622
+#, fuzzy
+msgid "Date Limite"
+msgstr "Uiterste datum"
+
 #: include/ext/amortis/include/class_amortissement_table_pdf.php:54
 #: include/ext/amortis/include/class_amortissement_material_pdf.php:35
 #: include/ext/amortis/include/class_amortissement_table_pdf.php:42
@@ -6108,6 +6493,7 @@ msgstr "Datum van de verrichting"
 #: include/class/acc_ledger_purchase.class.php:270
 #: include/class/acc_ledger_sold.class.php:225
 #: include/class/acc_ledger_purchase.class.php:269
+#: include/class/acc_ledger_purchase.class.php:271
 #, fuzzy
 msgid "Date de paiement invalide"
 msgstr "Datum van de betaling"
@@ -6131,6 +6517,7 @@ msgstr "Datum van herinnering voor"
 #: include/database.item.php:152 include/database.item.php:151
 #: include/database.item.php:144 include/database.item.php:145
 #: include/database.item.php:153 include/database.item.php:156
+#: include/lettering.account.inc.php:82 include/lettering.card.inc.php:78
 msgid "Date début"
 msgstr "Begindatum"
 
@@ -6162,6 +6549,8 @@ msgstr "Totaal afschrijvingen"
 #: include/class/acc_ledger.class.php:1055
 #: include/class/acc_ledger.class.php:1060
 #: include/class/acc_ledger.class.php:1076
+#: include/class/acc_ledger.class.php:1072
+#: include/class/acc_ledger_purchase.class.php:106
 msgid "Date et periode ne correspondent pas"
 msgstr "Datum en periode komen niet overeen"
 
@@ -6169,6 +6558,7 @@ msgstr "Datum en periode komen niet overeen"
 #: include/lettering.gestion.inc.php:34
 #: include/ext/tools/include/export_operation.inc.php:33
 #: include/lettering.gestion.inc.php:33 include/lettering.account.inc.php:85
+#: include/lettering.account.inc.php:86 include/lettering.card.inc.php:84
 msgid "Date fin"
 msgstr "Einddatum"
 
@@ -6228,6 +6618,11 @@ msgstr "Uiterste datum"
 #: include/class/acc_ledger.class.php:1044
 #: include/class/acc_ledger.class.php:225
 #: include/class/acc_ledger.class.php:1060
+#: include/class/follow_up.class.php:1646
+#: include/class/follow_up.class.php:1648
+#: include/class/acc_ledger.class.php:224
+#: include/class/acc_ledger.class.php:1052
+#: include/class/acc_ledger_purchase.class.php:91
 msgid "Date invalide"
 msgstr "Ongeldig datum"
 
@@ -6236,6 +6631,7 @@ msgid "Date invalide "
 msgstr "Ongeldig datum"
 
 #: include/fiche.inc.php:278 include/fiche.inc.php:279
+#: include/fiche.inc.php:293
 #, fuzzy
 msgid "Date invalide !"
 msgstr "Ongeldig datum"
@@ -6246,7 +6642,7 @@ msgstr "Ongeldig datum"
 #: include/compta_ven.inc.php:217 include/compta_ach.inc.php:205
 #: include/compta_ods.inc.php:130 include/compta_ven.inc.php:222
 #: include/compta_ods.inc.php:132 include/compta_ven.inc.php:220
-#: include/compta_ach.inc.php:203
+#: include/compta_ach.inc.php:203 include/compta_ach.inc.php:202
 #, fuzzy
 msgid "Date invalide, opération non extournée"
 msgstr "Handeling is niet gevonden"
@@ -6255,6 +6651,7 @@ msgstr "Handeling is niet gevonden"
 #: include/template/detail-action.php:110
 #: include/template/detail-action.php:115
 #: include/template/detail-action.php:114
+#: include/template/detail-action.php:121
 msgid "Date limite"
 msgstr "Uiterste datum"
 
@@ -6265,6 +6662,8 @@ msgstr "Uiterste datum"
 #: include/ajax/ajax_display_letter.php:105
 #: include/ajax/ajax_display_letter.php:96
 #: include/ajax/ajax_display_letter.php:110
+#: include/ajax/ajax_display_letter.php:112
+#: include/ajax/ajax_display_letter.php:128
 msgid "Date malformée"
 msgstr "Datum misvormd"
 
@@ -6273,6 +6672,7 @@ msgstr "Datum misvormd"
 #: include/lettering.card.inc.php:76 include/lettering.gestion.inc.php:74
 #: include/lettering.gestion.inc.php:73 include/lettering.account.inc.php:67
 #: include/lettering.account.inc.php:80 include/lettering.account.inc.php:124
+#: include/lettering.account.inc.php:76 include/lettering.card.inc.php:71
 msgid "Date malformée, désolé"
 msgstr "Datum misvormd, sorry"
 
@@ -6324,6 +6724,11 @@ msgstr "Datum van de verrichting"
 #: include/class/acc_ledger_history_sale.class.php:263
 #: include/class/acc_ledger_sold.class.php:1407
 #: include/class/acc_ledger_purchase.class.php:1833
+#: include/class/acc_ledger_history_sale.class.php:273
+#: include/class/acc_ledger_history_purchase.class.php:288
+#: include/class/acc_ledger_purchase.class.php:1870
+#: include/class/acc_ledger_sold.class.php:1392
+#: include/export/export_ledger_csv.php:146
 msgid "Date paiement"
 msgstr "Datum van de betaling"
 
@@ -6364,12 +6769,15 @@ msgstr "Aankoopdatum"
 #: include/class/acc_ledger_purchase.class.php:1828
 #: include/class/acc_ledger_sold.class.php:1408
 #: include/class/acc_ledger_purchase.class.php:1834
+#: include/class/acc_ledger_purchase.class.php:1871
+#: include/class/acc_ledger_sold.class.php:1393
 msgid "Date échéance"
 msgstr "Vervaldatum"
 
 #: include/class/acc_ledger_purchase.class.php:276
 #: include/class/acc_ledger_sold.class.php:232
 #: include/class/acc_ledger_purchase.class.php:275
+#: include/class/acc_ledger_purchase.class.php:277
 #, fuzzy
 msgid "Date échéance invalide"
 msgstr "Vervaldatum"
@@ -6384,7 +6792,8 @@ msgstr "Vervaldatum"
 #: include/ext/tools/include/anc_grandlivre_ext.class.php:126
 #: include/export/export_poste_detail_pdf.php:102
 #: include/ajax/ajax_display_letter.php:122 include/fiche.inc.php:576
-#: include/fiche.inc.php:585
+#: include/fiche.inc.php:585 include/fiche.inc.php:598
+#: include/ajax/ajax_display_letter.php:140
 msgid "Debit"
 msgstr "Debet"
 
@@ -6392,6 +6801,7 @@ msgstr "Debet"
 #: html/ajax_misc.php:400 html/ajax_misc.php:478
 #: include/ajax/ajax_display_letter.php:114
 #: include/ajax/ajax_display_letter.php:119
+#: include/ajax/ajax_display_letter.php:137
 msgid "Debit / Credit"
 msgstr "Debet / Credit"
 
@@ -6449,11 +6859,12 @@ msgstr "Het laatste nummer gebruikt voor dit type document"
 
 #: include/template/param_jrn.php:102 include/template/param_jrn.php:99
 #: include/template/param_jrn.php:106 include/template/param_jrn.php:108
-#: include/template/param_jrn.php:152
+#: include/template/param_jrn.php:152 include/template/param_jrn.php:153
 msgid "Dernière pièce numérotée"
 msgstr "Laatst genummerd stuk"
 
 #: include/upgrade-plugin.php:105 include/upgrade-plugin.php:117
+#: include/upgrade-plugin.php:120
 #, fuzzy
 msgid "Dernière version installée"
 msgstr "Laatst genummerd stuk"
@@ -6467,6 +6878,7 @@ msgstr "Laatste handelingen"
 #: html/ajax_misc.php:196 html/ajax_misc.php:274 html/ajax_misc.php:279
 #: html/ajax_misc.php:307 html/ajax_misc.php:399 html/ajax_misc.php:401
 #: html/ajax_misc.php:407 html/ajax_misc.php:409 html/ajax_misc.php:413
+#: include/class/action_document_type_mtable.class.php:149
 #, fuzzy
 msgid "Des actions dépendent de cette catégorie"
 msgstr "Kan dit bestand op te slaan"
@@ -6648,6 +7060,27 @@ msgstr "Kan dit bestand op te slaan"
 #: include/class/print_ledger_simple.class.php:108
 #: include/template/param_jrn.php:129 include/modele.inc.php:249
 #: include/modele.inc.php:363 include/database.item.php:160
+#: include/class/acc_ledger_search.class.php:740
+#: include/class/acc_ledger_search.class.php:1049
+#: include/class/acc_ledger_search.class.php:1194
+#: include/class/operation_predef_mtable.class.php:54
+#: include/class/fiche.class.php:1425 include/class/fiche.class.php:1504
+#: include/class/anc_plan.class.php:139 include/class/anc_plan.class.php:155
+#: include/class/print_ledger_simple.class.php:105
+#: include/class/user.class.php:994
+#: include/class/acc_account_ledger.class.php:389
+#: include/export/export_histo_csv.php:47
+#: include/template/follow_up_detail_display.php:51
+#: include/template/tag_select.php:25 include/template/detail-action.php:260
+#: include/template/detail-action.php:280
+#: include/template/detail-action.php:287
+#: include/template/detail-action.php:330
+#: include/template/detail-action.php:486
+#: include/template/tag_search_select.php:24 include/template/tag_list.php:16
+#: include/template/param_jrn.php:130
+#: include/template/newEmptyPHP_NOALYSS.php:36
+#: include/template/card_multiple_result.php:20 include/lib/ac_common.php:1223
+#: include/upgrade-plugin.php:65
 msgid "Description"
 msgstr "Beschrijving"
 
@@ -6657,6 +7090,9 @@ msgstr "Beschrijving"
 #: include/class/pre_operation.class.php:63
 #: include/ajax/ajax_mod_predf_op.php:43
 #: include/class/pre_operation.class.php:64
+#: include/class/pre_operation.class.php:74
+#: include/ajax/ajax_mod_predf_op.php:56
+#: include/template/pre_operation_display.php:34
 msgid "Description (max 50 car.)"
 msgstr "Beschrijving (max 50 tekens)"
 
@@ -6669,9 +7105,20 @@ msgstr "Volledige beschrijving"
 #: include/class_anc_key.php:336 include/class_anc_key.php:338
 #: include/class/class_anc_key.php:339 include/class/class_anc_key.php:340
 #: include/class/class_anc_key.php:341 include/class/anc_key.class.php:350
+#: include/class/anc_key.class.php:351
 msgid "Description de la nouvelle clef"
 msgstr "Beschrijving van de nieuwe sleutel"
 
+#: include/template/action_document_type_mtable_input.php:105
+#, fuzzy
+msgid "Description modifiable"
+msgstr "Beschrijving"
+
+#: include/class/card_attribut_mtable.class.php:176
+#, fuzzy
+msgid "Description ne peut pas être vide"
+msgstr "De naam mag niet leeg zijn"
+
 #: include/ext/sav/include/template/sas_display_detail.php:188
 #, fuzzy
 msgid "Description panne"
@@ -6687,6 +7134,10 @@ msgstr ""
 "Sorry het maken van dit dossier is mislukt, waarschijnlijk komt de naam van "
 "het dossier tweemaal voor"
 
+#: include/class/follow_up.class.php:626
+msgid "Dest/Exp"
+msgstr ""
+
 #: include/template/action_search.php:94 include/template/detail-action.php:65
 #: include/template/action_search_result.php:53
 #: include/template/detail-action.php:125 include/template/detail-action.php:40
@@ -6706,7 +7157,7 @@ msgstr "Ontvanger"
 msgid "Destinataire invalide"
 msgstr "Ongeldig jaar"
 
-#: include/database.item.php:139
+#: include/database.item.php:139 include/database.item.php:138
 msgid "Devises"
 msgstr ""
 
@@ -6742,6 +7193,7 @@ msgstr "Diff. cumulatie."
 #: include/ext/coprop/include/coprop_appel_fond.class.php:252
 #: include/operation_ods_new.inc.php:86
 #: include/class/acc_ledger_fin.class.php:645
+#: include/operation_ods_new.inc.php:87
 msgid "Difference"
 msgstr "Verschil"
 
@@ -6786,6 +7238,7 @@ msgstr ""
 "bedrag =%d'</h2>"
 
 #: include/compta_fin_rec.inc.php:299 include/compta_fin_rec.inc.php:300
+#: include/compta_fin_rec.inc.php:341
 #, fuzzy
 msgid "Différence relevé"
 msgstr "Verschil"
@@ -6824,6 +7277,7 @@ msgstr "Beschikbaar in de dagboeken"
 #: include/database.item.php:190 include/database.item.php:180
 #: include/database.item.php:181 include/database.item.php:184
 #: include/database.item.php:77 include/database.item.php:197
+#: include/database.item.php:76
 msgid "Divers"
 msgstr "Divers"
 
@@ -6859,7 +7313,9 @@ msgstr "Divers"
 #: include/class/acc_ledger_search.class.php:696
 #: include/class/acc_ledger_search.class.php:709 include/compta_ven.inc.php:186
 #: include/ajax/ajax_ledger.php:323 include/ajax/ajax_ledger.php:352
-#: include/compta_ach.inc.php:174
+#: include/compta_ach.inc.php:174 include/class/document.class.php:177
+#: include/class/acc_ledger_search.class.php:795 include/compta_ach.inc.php:173
+#: include/template/ledger_detail_bottom.php:44 include/database.item.php:88
 msgid "Document"
 msgstr "Document"
 
@@ -6868,13 +7324,14 @@ msgstr "Document"
 #: include/database.item.php:192 include/database.item.php:172
 #: include/database.item.php:173 include/database.item.php:176
 #: include/database.item.php:184 include/database.item.php:189
+#: include/database.item.php:182
 msgid "Document Interne"
 msgstr "Intern document"
 
 #: include/database.item.php:120 include/database.item.php:123
 #: include/database.item.php:129 include/database.item.php:125
 #: include/database.item.php:124 include/database.item.php:128
-#: include/database.item.php:122
+#: include/database.item.php:122 include/database.item.php:121
 msgid "Document de suivi sous forme de liste"
 msgstr "Zending als lijst"
 
@@ -6908,6 +7365,7 @@ msgstr ""
 #: include/template/detail-action.php:377
 #: include/template/detail-action.php:379
 #: include/ext/invoicing/include/invoicing.inc.php:100
+#: include/template/detail-action.php:411
 msgid "Document à générer"
 msgstr "Documenteer je Maken"
 
@@ -6949,6 +7407,7 @@ msgstr ""
 #: include/class_pre_operation.php:56 include/class/class_pre_operation.php:56
 #: include/class/pre_operation.class.php:56
 #: include/class/pre_operation.class.php:57
+#: include/class/pre_operation.class.php:67
 msgid "Donnez un nom pour sauver cette opération comme modèle"
 msgstr ""
 
@@ -6993,6 +7452,11 @@ msgstr "Een deel van de financieel administratieve post of etiket"
 msgid "Donnez une partie du quickcode, nom, description... pour filtrer"
 msgstr ""
 
+#: include/lib/manage_table_sql.class.php:1107
+#, fuzzy
+msgid "Donnée"
+msgstr "Jaar"
+
 #: include/action.common.inc.php:99 include/ajax/ajax_ledger.php:152
 #: include/ajax/ajax_remove_submenu.php:29 include/ext/importbank/index.php:146
 #: include/ext/importbank/include/class_import_bank.php:473
@@ -7008,6 +7472,8 @@ msgstr ""
 #: include/ext/importbank/include/import_bank.class.php:463
 #: include/ext/importbank/include/import_bank.class.php:484
 #: include/modele.inc.php:412 include/modele.inc.php:413
+#: include/class/acc_ledger_history.class.php:85
+#: include/compta_fin_rec.inc.php:152 include/compta_fin_rec.inc.php:159
 #, fuzzy
 msgid "Donnée invalide"
 msgstr "Ongeldig jaar"
@@ -7030,6 +7496,12 @@ msgstr "Algemeen Opties"
 msgid "Données invalides"
 msgstr "Ongeldig jaar"
 
+#: include/class/tax_summary.class.php:137
+#: include/class/tax_summary.class.php:154
+#, fuzzy
+msgid "Données manquantes"
+msgstr "Ongeldig jaar"
+
 #: include/ac_common.php:782 include/ac_common.php:783
 #: include/ac_common.php:784 include/ac_common.php:792
 #: include/ac_common.php:793 include/ac_common.php:803
@@ -7038,6 +7510,7 @@ msgstr "Ongeldig jaar"
 #: include/lib/ac_common.php:812 include/lib/ac_common.php:823
 #: include/lib/ac_common.php:824 include/lib/ac_common.php:836
 #: include/lib/ac_common.php:838 include/lib/ac_common.php:854
+#: include/lib/ac_common.php:864
 msgid "Données non disponibles"
 msgstr "Gegevens zijn niet beschikbaar"
 
@@ -7063,7 +7536,7 @@ msgstr "Map niet bestaat"
 #: include/dossier.inc.php:268 include/upgrade.inc.php:78
 #: include/upgrade.inc.php:79 include/dossier.inc.php:271
 #: include/dossier.inc.php:276 include/upgrade.inc.php:80
-#: include/class/dossier.class.php:379
+#: include/class/dossier.class.php:379 include/class/dossier.class.php:385
 msgid "Dossier inexistant"
 msgstr "Map niet bestaat"
 
@@ -7076,11 +7549,13 @@ msgstr "Ongeldige code"
 #: include/class_user.php:932 include/class_user.php:933
 #: include/class/class_user.php:933 include/class/class_user.php:921
 #: include/class/user.class.php:921 include/class/user.class.php:945
+#: include/class/user.class.php:948
 msgid "Dossier non accessible"
 msgstr "Folder niet Bereikbaar"
 
 #: include/user_menu.php:111 include/lib/user_menu.php:117
 #: include/lib/user_menu.php:118 include/lib/user_menu.php:75
+#: include/lib/user_menu.php:74
 msgid "Dossiers"
 msgstr "Archief"
 
@@ -7122,15 +7597,28 @@ msgstr "Staffing"
 #: include/class/acc_ledger_sold.class.php:80
 #: include/class/acc_ledger.class.php:1039
 #: include/class/acc_ledger.class.php:1055
+#: include/class/acc_ledger.class.php:1047
+#: include/class/acc_ledger_purchase.class.php:82
 msgid "Double Encodage"
 msgstr "Dubbel gecodeerd"
 
 #: include/cfgfiche.inc.php:143 include/profile.inc.php:355
 #: include/cfgfiche.inc.php:158 include/profile.inc.php:336
 #: include/cfgfiche.inc.php:159
+#: include/class/card_attribut_mtable.class.php:169
 msgid "Doublon"
 msgstr ""
 
+#: include/class/action_document_type_mtable.class.php:118
+#, fuzzy
+msgid "Doublon, ce nom existe déjà "
+msgstr "Een journaal met deze naam bestaat al"
+
+#: include/class/action_document_type_mtable.class.php:125
+#, fuzzy
+msgid "Doublon, ce préfixe existe déjà "
+msgstr "De categorie bestaat al."
+
 #: scenario/package_repository.test.php:71
 msgid "Download core"
 msgstr ""
@@ -7145,15 +7633,27 @@ msgstr "tot"
 #: include/ext/import_account/include/class_impacc_tva.php:76
 #: include/ext/import_account/include/impacc_tva.class.php:64
 #: include/ext/import_account/include/impacc_tva.class.php:76
+#: include/template/ledger_detail_bottom.php:354
 #, fuzzy
 msgid "Duplicate"
 msgstr "Uitleg"
 
+#: include/class/acc_operation.class.php:798
+#, fuzzy
+msgid "Dupliquer"
+msgstr "Analytisch"
+
+#: include/ajax/ajax_ledger.php:589
+#, fuzzy
+msgid "Dupliquer une opération"
+msgstr "Alle activiteiten"
+
 #: include/database.item.php:132 include/database.item.php:135
 #: include/database.item.php:175 include/database.item.php:179
 #: include/database.item.php:178 include/database.item.php:137
 #: include/database.item.php:138 include/database.item.php:139
 #: include/database.item.php:144 include/database.item.php:149
+#: include/database.item.php:145
 msgid "Durée Amortissement"
 msgstr "Afschrijvingstermijn"
 
@@ -7246,7 +7746,16 @@ msgstr "Afschrijvingstermijn"
 #: include/class/pdfbalance_simple.class.php:56
 #: include/class/acc_ledger_history_generic.class.php:774
 #: include/class/acc_ledger.class.php:629
-#: include/class/acc_ledger.class.php:905
+#: include/class/acc_ledger.class.php:905 include/fiche.inc.php:418
+#: include/class/anc_group_operation.class.php:138
+#: include/class/acc_ledger.class.php:893 include/class/fiche.class.php:1506
+#: include/class/acc_account_ledger.class.php:391
+#: include/class/pre_op_advanced.class.php:202
+#: include/class/acc_ledger_history_generic.class.php:775
+#: include/class/anc_grandlivre.class.php:233
+#: include/export/export_balance_csv.php:79
+#: include/template/ledger_detail_bottom.php:96
+#: include/operation_ods_new.inc.php:85
 msgid "Débit"
 msgstr "debiet"
 
@@ -7264,7 +7773,7 @@ msgstr "Debet of Credit"
 #: include/class/class_fiche.php:1235 include/class/class_fiche.php:1238
 #: include/class/fiche.class.php:1382 include/class/fiche.class.php:1383
 #: include/class/fiche.class.php:1385 include/class/fiche.class.php:1399
-#: include/class/fiche.class.php:1400
+#: include/class/fiche.class.php:1400 include/class/fiche.class.php:1427
 #, fuzzy
 msgid "Débit/Crédit"
 msgstr "Debet of Credit"
@@ -7274,7 +7783,7 @@ msgid "Débiteur"
 msgstr "schuldenaar"
 
 #: include/class/periode.class.php:649 include/class/periode.class.php:651
-#: include/class/periode.class.php:653
+#: include/class/periode.class.php:653 include/class/periode.class.php:654
 msgid "Décembre"
 msgstr ""
 
@@ -7317,6 +7826,7 @@ msgstr "Verbinding verbroken"
 
 #: include/database.item.php:104 include/database.item.php:107
 #: include/database.item.php:101 include/database.item.php:99
+#: include/database.item.php:103
 #, fuzzy
 msgid "Déconnexion "
 msgstr "Afmelden"
@@ -7344,6 +7854,8 @@ msgstr "Afmelden"
 #: include/class/acc_ledger_sold.class.php:944
 #: include/class/acc_ledger_purchase.class.php:1702
 #: include/class/acc_ledger_sold.class.php:946
+#: include/class/acc_ledger_purchase.class.php:1724
+#: include/class/acc_ledger_sold.class.php:950
 msgid "Déduction acompte "
 msgstr "Borg aftrek"
 
@@ -7387,6 +7899,9 @@ msgstr "Scheidingsteken"
 #: include/class/acc_ledger_purchase.class.php:1438
 #: include/class/acc_ledger_sold.class.php:719
 #: include/class/acc_ledger_purchase.class.php:1441
+#: include/class/acc_ledger_purchase.class.php:1452
+#: include/class/acc_ledger_sold.class.php:722
+#: include/template/form_ledger_detail.php:75
 msgid "Dénomination"
 msgstr "Beschrijving"
 
@@ -7397,6 +7912,7 @@ msgid "Dépend"
 msgstr "Afhankelijk van"
 
 #: include/template/detail-action.php:168
+#: include/template/detail-action.php:175
 #, fuzzy
 msgid "Dépendant"
 msgstr "Afhankelijk van"
@@ -7421,6 +7937,7 @@ msgstr "Uitgaven"
 #: include/database.item.php:183 include/database.item.php:142
 #: include/database.item.php:143 include/database.item.php:144
 #: include/database.item.php:149 include/database.item.php:154
+#: include/database.item.php:150
 msgid "Dépense  charge du grant (partie privé) "
 msgstr "Uitgaven ten laste van de subsidie ​​(private partij)"
 
@@ -7430,7 +7947,7 @@ msgid "Dépense  charge du gérant (partie privé) "
 msgstr "Uitgaven ten laste van de subsidie ​​(private partij)"
 
 #: include/template/fiche_list.php:89 include/template/fiche_list.php:91
-#: include/template/fiche_list.php:93
+#: include/template/fiche_list.php:93 include/template/fiche_list.php:98
 msgid "Déplacer la sélection  vers"
 msgstr "Selectie verplaatsen naar"
 
@@ -7447,11 +7964,12 @@ msgstr "Storting"
 #: include/compta_ven.inc.php:92 include/compta_ach.inc.php:86
 #: include/compta_ven.inc.php:95 include/compta_ach.inc.php:88
 #: include/compta_ach.inc.php:90 include/compta_ven.inc.php:97
+#: include/compta_ach.inc.php:87
 msgid "Dépôt"
 msgstr "Deposito"
 
 #: include/ajax_get_profile.php:123 include/ajax/ajax_get_profile.php:123
-#: include/ajax/ajax_get_profile.php:129
+#: include/ajax/ajax_get_profile.php:129 include/ajax/ajax_get_profile.php:128
 #, fuzzy
 msgid "Dépôt de stock accessible"
 msgstr "Folder niet Bereikbaar"
@@ -7470,7 +7988,7 @@ msgstr "Deposito"
 
 #: html/admin/setup.php:75 html/admin/setup.php:78 html/admin/setup.php:129
 #: html/install.php:131 html/install.php:130 html/install.php:136
-#: html/install.php:143
+#: html/install.php:143 html/install.php:156
 msgid "Désactiver le changement de langue (requis pour MacOSX)"
 msgstr ""
 
@@ -7478,6 +7996,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2275
 #: include/class/acc_ledger.class.php:2284
 #: include/class/acc_ledger.class.php:2300
+#: include/class/acc_ledger.class.php:2319
 msgid "Désactivé"
 msgstr ""
 
@@ -7527,6 +8046,7 @@ msgstr ""
 
 #: include/class/fiche.class.php:838 include/class/fiche.class.php:840
 #: include/class/fiche.class.php:843 include/class/fiche.class.php:844
+#: include/class/fiche.class.php:871
 msgid "Désolé, il y a trop de virgule dans le poste comptable "
 msgstr ""
 
@@ -7574,6 +8094,7 @@ msgstr ""
 #: include/stock_inv_histo.inc.php:107
 #: include/ajax/ajax_anc_detail_operation.php:44
 #: include/class/pdf_operation.class.php:405
+#: include/template/action_document_type_mtable_input.php:66
 msgid "Détail"
 msgstr "Detail"
 
@@ -7621,6 +8142,9 @@ msgstr "Detail gekochte Artikelen"
 #: include/class/acc_ledger_purchase.class.php:1433
 #: include/class/acc_ledger_purchase.class.php:1008
 #: include/class/acc_ledger_purchase.class.php:1436
+#: include/class/pre_op_ach.class.php:263
+#: include/class/acc_ledger_purchase.class.php:1019
+#: include/class/acc_ledger_purchase.class.php:1447
 msgid "Détail articles achetés"
 msgstr "Detail gekochte Artikelen"
 
@@ -7647,6 +8171,9 @@ msgstr "Detail gekochte Artikelen"
 #: include/class/acc_ledger_sold.class.php:714
 #: include/class/acc_ledger_sold.class.php:1206
 #: include/class/acc_ledger_sold.class.php:1215
+#: include/class/pre_op_ven.class.php:261
+#: include/class/acc_ledger_sold.class.php:717
+#: include/class/acc_ledger_sold.class.php:1182
 msgid "Détail articles vendus"
 msgstr "Detail VERKOCHT Artikelen"
 
@@ -7681,7 +8208,7 @@ msgstr "Retail operatie"
 msgid "Détail du dossier ou tag"
 msgstr "Detail map of label"
 
-#: include/ajax/ajax_tag_detail.php:16
+#: include/ajax/ajax_tag_detail.php:16 include/ajax/ajax_tag_detail.php:18
 #, fuzzy
 msgid "Détail du dossier ou étiquette"
 msgstr "Detail map of label"
@@ -7700,7 +8227,8 @@ msgstr "Extensie detail"
 #: include/ajax/ajax_add_concerned_card.php:44 include/ajax/ajax_card.php:133
 #: include/ajax/ajax_card.php:375 include/export/export_fiche_detail_pdf.php:53
 #: include/ajax/ajax_add_concerned_card.php:48 include/ajax/ajax_card.php:378
-#: include/ajax/ajax_card.php:379
+#: include/ajax/ajax_card.php:379 include/ajax/ajax_card.php:113
+#: include/ajax/ajax_card.php:412 include/ajax/ajax_add_concerned_card.php:56
 msgid "Détail fiche"
 msgstr "Detail van de fiche"
 
@@ -7709,7 +8237,7 @@ msgstr "Detail van de fiche"
 #: html/ajax_card.php:563 include/ajax/ajax_card.php:543
 #: include/ajax/ajax_card.php:544 include/ajax/ajax_card.php:545
 #: include/ajax/ajax_card.php:578 include/ajax/ajax_card.php:582
-#: include/ajax/ajax_card.php:605
+#: include/ajax/ajax_card.php:605 include/ajax/ajax_card.php:684
 msgid "Détail fiche (sauvée)"
 msgstr "Detail van de fiche (opgeslagen)"
 
@@ -7717,6 +8245,8 @@ msgstr "Detail van de fiche (opgeslagen)"
 #: include/class/class_pdf_operation.php:422
 #: include/class/pdf_operation.class.php:421
 #: include/class/pdf_operation.class.php:422
+#: include/template/follow_up_detail_display.php:45
+#: include/template/action_document_type_mtable_input.php:73
 #, fuzzy
 msgid "Détail opération"
 msgstr "Retail operatie"
@@ -7738,6 +8268,8 @@ msgstr "Retail operatie"
 #: include/class/acc_ledger_purchase.class.php:1382
 #: include/class/acc_ledger_sold.class.php:664
 #: include/class/acc_ledger_purchase.class.php:1385
+#: include/class/acc_ledger_purchase.class.php:1396
+#: include/class/acc_ledger_sold.class.php:667
 msgid "Détail opération "
 msgstr "Retail operatie"
 
@@ -7796,6 +8328,11 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1410
 #: include/class/acc_ledger_search.class.php:629
 #: include/class/acc_ledger_search.class.php:642
+#: include/class/acc_ledger_search.class.php:728
+#: include/class/acc_ledger_purchase.class.php:1421
+#: include/class/acc_ledger_sold.class.php:693
+#: include/export/export_histo_csv.php:42
+#: include/template/form_ledger_detail.php:33
 msgid "Echeance"
 msgstr "Termijn"
 
@@ -7823,6 +8360,7 @@ msgstr "Termijn"
 #: include/class/acc_ledger_purchase.class.php:1776
 #: include/class/acc_ledger_sold.class.php:1035
 #: include/class/acc_ledger_purchase.class.php:1782
+#: include/class/acc_ledger_purchase.class.php:1806
 msgid "Echeance dépassée"
 msgstr "termijn wordt overschreden"
 
@@ -7845,6 +8383,7 @@ msgid "Echec Ajout detail "
 msgstr ""
 
 #: include/class/pre_operation.class.php:149
+#: include/class/pre_operation.class.php:550
 #, php-format
 msgid "Echec PreOperatoin chargement %s"
 msgstr ""
@@ -7909,6 +8448,8 @@ msgstr "Bijwerken"
 #: include/class/acc_bilan.class.php:373 include/class/acc_bilan.class.php:394
 #: include/class/acc_bilan.class.php:299 include/class/acc_bilan.class.php:311
 #: include/class/acc_bilan.class.php:375 include/class/acc_bilan.class.php:396
+#: include/class/acc_bilan.class.php:300 include/class/acc_bilan.class.php:312
+#: include/class/acc_bilan.class.php:376 include/class/acc_bilan.class.php:397
 #, fuzzy
 msgid "Echec ouverture fichier "
 msgstr "fout bij het openen van het bestand"
@@ -7931,6 +8472,7 @@ msgstr "Aanmaken"
 #: include/class/pdf_operation.class.php:70
 #: include/class/acc_ledger_sold.class.php:1081
 #: include/class/acc_ledger_sold.class.php:1090
+#: include/class/acc_ledger_sold.class.php:1057
 msgid "Echéance"
 msgstr "Termijn"
 
@@ -7949,11 +8491,14 @@ msgstr "Termijn"
 #: include/export/export_security_pdf.php:147
 #: include/class/profile_menu.class.php:247
 #: include/class/profile_menu.class.php:272
+#: include/class/profile_menu.class.php:248
+#: include/class/profile_menu.class.php:273
 msgid "Ecriture"
 msgstr "Schrift"
 
 #: include/template/ledger_detail_bottom.php:31
 #: include/template/ledger_detail_bottom.php:36
+#: include/template/ledger_detail_bottom.php:41
 #, fuzzy
 msgid "Ecriture Comptable"
 msgstr "Boekhoudend schrijven"
@@ -7961,6 +8506,7 @@ msgstr "Boekhoudend schrijven"
 #: include/database.item.php:86 include/database.item.php:89
 #: include/database.item.php:94 include/database.item.php:91
 #: include/database.item.php:90 include/database.item.php:88
+#: include/database.item.php:87
 msgid "Ecriture Ouverture"
 msgstr "Opening Schrift"
 
@@ -7975,6 +8521,7 @@ msgstr "Boekhoudend schrijven"
 #: include/database.item.php:86 include/database.item.php:89
 #: include/database.item.php:94 include/database.item.php:91
 #: include/database.item.php:90 include/database.item.php:88
+#: include/database.item.php:87
 msgid "Ecriture d'ouverture"
 msgstr "Opening Schrift"
 
@@ -7985,14 +8532,20 @@ msgstr "Opening Schrift"
 
 #: include/database.item.php:91 include/database.item.php:94
 #: include/database.item.php:88 include/database.item.php:86
+#: include/database.item.php:87
 msgid ""
 "Ecriture d'ouverture ou écriture à nouveau, reporte les soldes des comptes "
 "de l'année passé du poste comptable 0xxx à 5xxxx sur l'année courante"
 msgstr ""
 
+#: include/class/profile_menu.class.php:247
+#, fuzzy
+msgid "Ecriture et suppression"
+msgstr "Opening Schrift"
+
 #: html/admin/setup.php:199 html/admin/setup.php:217 html/admin/setup.php:219
 #: html/install.php:225 html/install.php:223 html/install.php:231
-#: html/install.php:182 html/install.php:189
+#: html/install.php:182 html/install.php:189 html/install.php:205
 #, fuzzy
 msgid "Ecriture non possible"
 msgstr "Boekhoudend schrijven"
@@ -8023,7 +8576,7 @@ msgstr "Boekingen"
 #: include/ajax/ajax_admin.php:276 include/cfgledger.inc.php:136
 #: include/ajax/ajax_admin.php:254 include/ajax/ajax_admin.php:280
 #: include/ajax/ajax_card.php:171 include/cfgledger.inc.php:139
-#: include/ajax/ajax_card.php:172
+#: include/ajax/ajax_card.php:172 include/ajax/ajax_card.php:175
 msgid "Efface"
 msgstr "Wissen"
 
@@ -8035,7 +8588,7 @@ msgstr "Dit profiel verwijderen"
 
 #: include/action.common.inc.php:208 include/action.common.inc.php:213
 #: include/action.common.inc.php:215 include/action.common.inc.php:216
-#: include/action.common.inc.php:222
+#: include/action.common.inc.php:222 include/action.common.inc.php:243
 #, fuzzy
 msgid "Efface cet événement "
 msgstr "Voeg dit element toe"
@@ -8044,11 +8597,21 @@ msgstr "Voeg dit element toe"
 msgid "Efface cette action"
 msgstr "This Actie Wissen"
 
+#: include/class/anc_operation.class.php:658
+#, fuzzy
+msgid "Efface détail"
+msgstr "Details verbergen"
+
 #: include/report.inc.php:134 include/report.inc.php:120
 #: include/report.inc.php:119
 msgid "Effacement"
 msgstr "Erasure"
 
+#: include/class/card_attribut_mtable.class.php:196
+#, fuzzy
+msgid "Effacement bloqué : attribut utilisé"
+msgstr "Erasure"
+
 #: include/modele.inc.php:342 include/modele.inc.php:356
 #: include/modele.inc.php:398 include/modele.inc.php:381
 #: include/modele.inc.php:382 include/modele.inc.php:387
@@ -8062,7 +8625,7 @@ msgid "Effacement déclaration"
 msgstr "Deze verklaring verwijderen"
 
 #: include/class/periode.class.php:673 include/class/periode.class.php:675
-#: include/class/periode.class.php:677
+#: include/class/periode.class.php:677 include/class/periode.class.php:678
 #, fuzzy
 msgid "Effacement impossible"
 msgstr "Export is onmogelijk"
@@ -8071,7 +8634,15 @@ msgstr "Export is onmogelijk"
 msgid "Effacement impossible : catégorie utilisée"
 msgstr ""
 
+#: include/class/anc_account_table.class.php:120
+#, fuzzy
+msgid "Effacement impossible : le poste est utilisé dans une période fermée"
+msgstr ""
+"Aanpassingen onmogelijk: we kunnen de datum in een gesloten periode niet "
+"veranderen"
+
 #: include/class/tva_rate_mtable.class.php:267
+#: include/class/tva_rate_mtable.class.php:284
 #, fuzzy
 msgid "Effacement interdit : TVA utilisée"
 msgstr "Erasure"
@@ -8162,6 +8733,9 @@ msgstr "Erasure"
 #: include/lib/manage_table_sql.class.php:768
 #: include/template/ledger_detail_bottom.php:325 include/modele.inc.php:317
 #: include/class/periode.class.php:598 include/class/periode.class.php:603
+#: include/class/document_type.class.php:84 include/class/periode.class.php:604
+#: include/template/ledger_detail_bottom.php:344
+#: include/lib/manage_table_sql.class.php:820
 msgid "Effacer"
 msgstr "Wissen"
 
@@ -8176,6 +8750,7 @@ msgstr "Wissen"
 #: include/compta_ven.inc.php:330 include/compta_ven.inc.php:333
 #: include/compta_ach.inc.php:299 include/compta_ven.inc.php:341
 #: include/compta_ven.inc.php:339 include/compta_ach.inc.php:297
+#: include/compta_ven.inc.php:331 include/compta_ach.inc.php:298
 msgid "Effacer "
 msgstr "Wissen"
 
@@ -8205,7 +8780,7 @@ msgid "Effacer la sélection"
 msgstr "De selectie verwijderen"
 
 #: include/template/fiche_list.php:87 include/template/fiche_list.php:89
-#: include/template/fiche_list.php:91
+#: include/template/fiche_list.php:91 include/template/fiche_list.php:96
 msgid "Effacer la sélection "
 msgstr "De selectie verwijderen"
 
@@ -8217,6 +8792,7 @@ msgstr "De geselecteerde documenten verwijderen"
 #: include/database.item.php:213 include/database.item.php:190
 #: include/database.item.php:191 include/database.item.php:194
 #: include/database.item.php:205 include/database.item.php:210
+#: include/database.item.php:200
 msgid "Effacer les documents du suivi"
 msgstr "Duidelijke documentatie van de monitoring"
 
@@ -8224,6 +8800,7 @@ msgstr "Duidelijke documentatie van de monitoring"
 #: include/class/acc_ledger_search.class.php:1072
 #: include/class/acc_ledger_search.class.php:1080
 #: include/class/acc_ledger_search.class.php:1093
+#: include/class/acc_ledger_search.class.php:1182
 #, fuzzy
 msgid "Effacer sel"
 msgstr "Wissen"
@@ -8231,6 +8808,7 @@ msgstr "Wissen"
 #: include/database.item.php:220 include/database.item.php:197
 #: include/database.item.php:198 include/database.item.php:201
 #: include/database.item.php:212 include/database.item.php:217
+#: include/database.item.php:207
 #, fuzzy
 msgid "Effacer une note publique"
 msgstr "Zei blad Wissen"
@@ -8238,6 +8816,7 @@ msgstr "Zei blad Wissen"
 #: include/database.item.php:217 include/database.item.php:194
 #: include/database.item.php:195 include/database.item.php:198
 #: include/database.item.php:209 include/database.item.php:214
+#: include/database.item.php:204
 #, fuzzy
 msgid "Effacer une opération "
 msgstr "Alle activiteiten"
@@ -8250,6 +8829,7 @@ msgstr "Alle activiteiten"
 #: include/lib/manage_table_sql.class.php:1095
 #: include/lib/manage_table_sql.class.php:1092
 #: include/lib/manage_table_sql.class.php:1136
+#: include/lib/manage_table_sql.class.php:1192
 msgid "Effacé"
 msgstr "Verwijderen"
 
@@ -8268,7 +8848,7 @@ msgstr "Elementen"
 #: include/database.item.php:180 include/database.item.php:183
 #: include/user.inc.php:84 include/database.item.php:191
 #: include/ajax/ajax_preference.php:74 include/ajax/ajax_preference.php:85
-#: include/database.item.php:196
+#: include/database.item.php:196 include/database.item.php:189
 msgid "Email"
 msgstr "E-mail"
 
@@ -8336,7 +8916,7 @@ msgstr ""
 
 #: html/admin/setup.php:80 html/admin/setup.php:83 html/admin/setup.php:134
 #: html/install.php:136 html/install.php:135 html/install.php:141
-#: html/install.php:148
+#: html/install.php:148 html/install.php:161
 msgid ""
 "En version mono dossier, le nom de la base de données doit être mentionné"
 msgstr ""
@@ -8354,6 +8934,7 @@ msgstr ""
 #: include/class/class_pre_op_ven.php:193
 #: include/class/class_pre_op_ven.php:201
 #: include/class/pre_op_ven.class.php:201
+#: include/class/pre_op_ven.class.php:196
 msgid "En-tête facture client"
 msgstr "Hoofding"
 
@@ -8362,6 +8943,7 @@ msgstr "Hoofding"
 #: include/class/class_pre_op_ach.php:196
 #: include/class/class_pre_op_ach.php:197
 #: include/class/pre_op_ach.class.php:197
+#: include/class/pre_op_ach.class.php:200
 msgid "En-tête facture fournisseur"
 msgstr "Hoefdbrief Leverancier"
 
@@ -8387,6 +8969,7 @@ msgstr ""
 
 #: include/database.item.php:14 include/database.item.php:17
 #: include/database.item.php:11 include/database.item.php:9
+#: include/database.item.php:10
 msgid "Encodage de tous vos revenus ou vente"
 msgstr ""
 
@@ -8437,6 +9020,7 @@ msgstr "Verwijder alle tags geselecteerde documenten"
 #: include/database.item.php:216 include/database.item.php:193
 #: include/database.item.php:194 include/database.item.php:197
 #: include/database.item.php:208 include/database.item.php:213
+#: include/database.item.php:203
 #, fuzzy
 msgid "Enlever une pièce justificative"
 msgstr "Voeg een kasstuk toe"
@@ -8459,10 +9043,12 @@ msgstr "OPSLAAN"
 #: include/compta_ach.inc.php:167 include/compta_ven.inc.php:122
 #: include/ext/tva/ajax.php:111 include/compta_ven.inc.php:120
 #: include/compta_ach.inc.php:112 include/compta_ach.inc.php:165
+#: include/compta_ach.inc.php:111 include/compta_ach.inc.php:164
 msgid "Enregistrement"
 msgstr "Opgeslagen"
 
 #: include/class/payment_method_mtable.class.php:39
+#: include/class/payment_method_mtable.class.php:40
 #, fuzzy
 msgid "Enregistrement dans"
 msgstr "Opgeslagen"
@@ -8485,6 +9071,8 @@ msgstr "Opgeslagen"
 #: include/action.common.inc.php:191 include/action.common.inc.php:325
 #: include/compta_ach.inc.php:298 include/compta_ven.inc.php:340
 #: include/compta_ven.inc.php:338 include/compta_ach.inc.php:296
+#: include/compta_ven.inc.php:330 include/compta_ach.inc.php:297
+#: include/action.common.inc.php:205 include/action.common.inc.php:361
 msgid "Enregistrer"
 msgstr "OPSLAAN"
 
@@ -8525,13 +9113,13 @@ msgstr "Voer de datum van de verklaring"
 #: html/admin/setup.php:208 html/admin/setup.php:226 html/admin/setup.php:228
 #: html/install.php:290 html/install.php:289 html/install.php:287
 #: html/install.php:293 html/install.php:299 html/install.php:250
-#: html/install.php:257 html/install.php:260
+#: html/install.php:257 html/install.php:260 html/install.php:308
 msgid "Entrez les informations nécessaires à noalyss"
 msgstr ""
 
 #: include/ext/rapport_avance/include/template/parameter_send_mail_input.php:23
 #: include/ext/rapport_avance/include/template/parameter_send_mail_input.php:27
-#: scenario/HtmlInput.test.php:89
+#: scenario/HtmlInput.test.php:89 scenario/HtmlInput.test.php:106
 msgid "Envoi"
 msgstr "Verzending"
 
@@ -8608,7 +9196,8 @@ msgstr "E-mail verzonden door"
 #: include/ext/importbank/include/import_bank.class.php:140
 #: include/lib/ac_common.php:343 include/action.common.inc.php:144
 #: include/action.common.inc.php:295 include/lib/ac_common.php:345
-#: include/lib/ac_common.php:361
+#: include/lib/ac_common.php:361 include/action.common.inc.php:146
+#: include/action.common.inc.php:324 include/lib/ac_common.php:371
 msgid "Erreur"
 msgstr "Fout"
 
@@ -8629,6 +9218,8 @@ msgstr "Foute balans"
 #: include/class_noalyss_sql.php:316 include/lib/class_noalyss_sql.php:316
 #: include/lib/data_sql.class.php:286 include/lib/noalyss_sql.class.php:391
 #: include/lib/data_sql.class.php:248 include/lib/database_core.class.php:168
+#: include/lib/database_core.class.php:170
+#: include/lib/noalyss_sql.class.php:379 include/lib/data_sql.class.php:278
 msgid "Erreur : exec_sql attend un array"
 msgstr ""
 
@@ -8666,6 +9257,11 @@ msgstr "Afmelden"
 msgid "Erreur D/C"
 msgstr "Fout"
 
+#: include/class/noalyss_parameter_folder.class.php:73
+#, fuzzy, php-format
+msgid "Erreur Filtre analytique %s"
+msgstr "Grote analytische boek"
+
 #: include/ext/import_account/include/class_sql_impacc.php:36
 #: include/ext/import_account/include/class_sql_impacc.php:47
 #: include/class_acc_account.php:66 include/class_acc_account.php:77
@@ -8699,13 +9295,14 @@ msgid "Erreur exercice invalide"
 msgstr "Ongeldig datum"
 
 #: include/class/payment_method_mtable.class.php:140
+#: include/class/payment_method_mtable.class.php:145
 #, fuzzy, php-format
 msgid "Erreur key %s value %s"
 msgstr "Ongeldig datum"
 
 #: html/do.php:196 html/do.php:224 html/do.php:237 html/do.php:239
 #: html/do.php:236 html/do.php:273 html/do.php:285 html/do.php:295
-#: html/do.php:264
+#: html/do.php:264 html/do.php:266
 #, fuzzy
 msgid "Erreur menu"
 msgstr "Fout"
@@ -8736,16 +9333,23 @@ msgid "Erreur paramètre"
 msgstr "Module instellen"
 
 #: include/ajax/ajax_card.php:356 include/ajax/ajax_card.php:359
-#: include/ajax/ajax_card.php:360
+#: include/ajax/ajax_card.php:360 include/ajax/ajax_card.php:393
 #, fuzzy
 msgid "Erreur sauvegarde"
 msgstr "laatste back-up"
 
+#: include/param_sec.inc.php:120
+#, fuzzy
+msgid "Erreur sécurité"
+msgstr "Veiligheid"
+
 #: html/install.php:636 html/install.php:643 html/install.php:646
+#: html/install.php:699
 msgid "Essai effacement install.php et se connecter à NOALYSS"
 msgstr ""
 
 #: html/test_class.php:214 dev/test/test_class.php:210
+#: dev-2/test/test_class.php:210
 msgid "Essayer de vous y amuser"
 msgstr ""
 
@@ -8774,10 +9378,12 @@ msgid "Et uniquement non payées"
 msgstr "In Actie Alleen niet betalend"
 
 #: include/template/ledger_search.php:56 include/template/ledger_search.php:59
+#: include/template/ledger_search.php:63
 msgid "Et utilisant la fiche (quick code)"
 msgstr "Puts van blad (quick-code)"
 
 #: include/template/ledger_search.php:64 include/template/ledger_search.php:67
+#: include/template/ledger_search.php:71
 msgid "Et utilisant le poste comptable"
 msgstr "Puts van rekening"
 
@@ -8819,6 +9425,7 @@ msgid "Etape 2 : période"
 msgstr "Indruk"
 
 #: include/impress_bilan.inc.php:82 include/impress_bilan.inc.php:89
+#: include/impress_bilan.inc.php:93
 #, fuzzy
 msgid "Etape 2 :Impression"
 msgstr "Indruk"
@@ -8844,24 +9451,28 @@ msgstr ""
 #: include/ext/sav/include/template/sas_display_detail.php:145
 #: include/template/detail-action.php:124
 #: include/template/detail-action.php:123 include/template/action_search.php:60
-#: include/template/action_search.php:56
+#: include/template/action_search.php:56 include/class/follow_up.class.php:628
+#: include/template/detail-action.php:130 include/template/ledger_search.php:83
 msgid "Etat"
 msgstr "Toestand"
 
 #: include/database.item.php:110 include/database.item.php:113
 #: include/database.item.php:119 include/database.item.php:116
 #: include/database.item.php:115 include/database.item.php:111
+#: include/database.item.php:112
 msgid "Etat des documents"
 msgstr "Documenten staat"
 
 #: include/database.item.php:91 include/database.item.php:94
 #: include/database.item.php:99 include/database.item.php:96
 #: include/database.item.php:95 include/database.item.php:93
+#: include/database.item.php:92
 msgid "Etat des stock"
 msgstr "Toestand van het bestand"
 
 #: include/database.item.php:96 include/database.item.php:99
 #: include/database.item.php:93 include/database.item.php:91
+#: include/database.item.php:92
 msgid "Etat des stock de l'exercice indiqué"
 msgstr ""
 
@@ -8883,6 +9494,8 @@ msgstr "Bent u DAT u verwelkingsziekte Zeker Wissen"
 #: include/template/action_search.php:67 include/template/tag_choose.php:5
 #: include/template/action_search.php:81 include/template/action_search.php:115
 #: include/template/action_search.php:129 include/class/tag.class.php:85
+#: include/class/follow_up.class.php:623 include/class/tag.class.php:90
+#: include/template/action_search.php:130 include/cfgtags.inc.php:38
 msgid "Etiquette"
 msgstr "Etiquette"
 
@@ -8895,6 +9508,11 @@ msgstr "Label (tag)"
 msgid "Etiquette(tag) actif"
 msgstr "Label (tag)"
 
+#: include/template/tag_search_select.php:12
+#, fuzzy
+msgid "Etiquettes"
+msgstr "Etiquette"
+
 #: include/action.common.inc.php:273 include/action.common.inc.php:277
 #: include/action.common.inc.php:278 include/action.common.inc.php:282
 #: include/action.common.inc.php:280 include/action.common.inc.php:284
@@ -8921,6 +9539,7 @@ msgstr "Uitsluiten State"
 #: include/class/periode_ledger_table.class.php:100
 #: include/template/stock_inv.php:126 include/ajax/ajax_preference.php:142
 #: include/class/periode.class.php:521 include/class/periode.class.php:523
+#: include/impress_bilan.inc.php:52 include/class/periode.class.php:524
 msgid "Exercice"
 msgstr "Oefening"
 
@@ -8930,7 +9549,7 @@ msgid "Exercice comptable d'achat"
 msgstr "Boekhoudkundig aankoopjaar"
 
 #: include/class/periode.class.php:424 include/class/periode.class.php:426
-#: include/class/periode.class.php:428
+#: include/class/periode.class.php:428 include/class/periode.class.php:429
 #, php-format
 msgid "Exercice doit être entre %s et %s "
 msgstr ""
@@ -8941,15 +9560,32 @@ msgid "Exercice invalide"
 msgstr "Ongeldig datum"
 
 #: include/class/periode.class.php:421 include/class/periode.class.php:423
-#: include/class/periode.class.php:425
+#: include/class/periode.class.php:425 include/class/periode.class.php:426
 #, fuzzy
 msgid "Exercice n'est pas un nombre"
 msgstr "tarief is geen getal"
 
+#: include/class/tax_summary.class.php:232
+#: include/class/tax_summary.class.php:306
+#, fuzzy
+msgid "Exig TVA invalide"
+msgstr "Ongeldige code"
+
+#: include/class/tva_rate_mtable.class.php:60
+#, fuzzy
+msgid "Exigible achat"
+msgstr "Historische aankoop"
+
+#: include/class/tva_rate_mtable.class.php:67
+#, fuzzy
+msgid "Exigible vente"
+msgstr "Historische omzet"
+
 #: html/ajax_misc.php:197 html/ajax_misc.php:216 html/ajax_misc.php:230
 #: html/ajax_misc.php:236 html/ajax_misc.php:314 html/ajax_misc.php:319
 #: html/ajax_misc.php:347 html/ajax_misc.php:459 html/ajax_misc.php:461
 #: html/ajax_misc.php:467 html/ajax_misc.php:469 html/ajax_misc.php:473
+#: html/ajax_misc.php:438
 msgid "Explication"
 msgstr "Uitleg"
 
@@ -8958,7 +9594,7 @@ msgstr "Uitleg"
 msgid "Export"
 msgstr "Export"
 
-#: include/database.item.php:140
+#: include/database.item.php:140 include/database.item.php:139
 #, fuzzy
 msgid "Export ANC"
 msgstr "Export CSV"
@@ -8966,12 +9602,13 @@ msgstr "Export CSV"
 #: include/database.item.php:46 include/database.item.php:49
 #: include/database.item.php:53 include/database.item.php:52
 #: include/database.item.php:55 include/database.item.php:48
+#: include/database.item.php:47
 msgid "Export Action Gestion"
 msgstr "Export Management Actie"
 
 #: include/database.item.php:144 include/database.item.php:143
 #: include/database.item.php:6 include/database.item.php:135
-#: include/database.item.php:133
+#: include/database.item.php:133 include/database.item.php:134
 #, fuzzy
 msgid "Export Balance agée"
 msgstr "Export Accounting Balance"
@@ -8987,12 +9624,14 @@ msgstr "Export Accounting Balance"
 #: include/database.item.php:42 include/database.item.php:45
 #: include/database.item.php:49 include/database.item.php:48
 #: include/database.item.php:51 include/database.item.php:44
+#: include/database.item.php:43
 msgid "Export Balance groupe analytique"
 msgstr "Export Analytische balans groep"
 
 #: include/database.item.php:43 include/database.item.php:46
 #: include/database.item.php:50 include/database.item.php:49
 #: include/database.item.php:52 include/database.item.php:45
+#: include/database.item.php:44
 msgid "Export Bilan"
 msgstr "Balans export"
 
@@ -9022,6 +9661,11 @@ msgstr "Balans export"
 #: include/fiche.inc.php:242 include/fiche.inc.php:302
 #: include/fiche.inc.php:340 include/class/fiche.class.php:1620
 #: include/class/fiche.class.php:2215 include/class/tax_summary.class.php:334
+#: include/fiche.inc.php:252 include/fiche.inc.php:312
+#: include/fiche.inc.php:350 include/class/tax_summary.class.php:437
+#: include/class/fiche.class.php:1646 include/class/fiche.class.php:2242
+#: include/class/acc_account_ledger.class.php:727
+#: include/template/detail-action.php:88
 msgid "Export CSV"
 msgstr "Export CSV"
 
@@ -9030,6 +9674,7 @@ msgstr "Export CSV"
 #: include/database.item.php:40 include/database.item.php:42
 #: include/database.item.php:39 include/database.item.php:41
 #: include/database.item.php:44 include/database.item.php:37
+#: include/database.item.php:34
 msgid "Export Comptabilité analytique"
 msgstr "Export Cost Accounting"
 
@@ -9044,6 +9689,7 @@ msgstr "Export Cost Accounting dual balans"
 #: include/database.item.php:34 include/database.item.php:37
 #: include/database.item.php:41 include/database.item.php:40
 #: include/database.item.php:43 include/database.item.php:36
+#: include/database.item.php:35
 msgid "Export Comptabilité analytique balance simple"
 msgstr "Export Cost Accounting louter balans"
 
@@ -9082,18 +9728,21 @@ msgstr "Export Ledger"
 #: include/database.item.php:17 include/database.item.php:20
 #: include/database.item.php:24 include/database.item.php:23
 #: include/database.item.php:26 include/database.item.php:19
+#: include/database.item.php:18
 msgid "Export Historique"
 msgstr "Export Geschiedenis"
 
 #: include/database.item.php:41 include/database.item.php:44
 #: include/database.item.php:48 include/database.item.php:47
 #: include/database.item.php:50 include/database.item.php:43
+#: include/database.item.php:42
 msgid "Export Historique Compt. Analytique"
 msgstr "Export Geschiedenis Compt. Analytisch"
 
 #: include/database.item.php:47 include/database.item.php:50
 #: include/database.item.php:54 include/database.item.php:53
 #: include/database.item.php:56 include/database.item.php:49
+#: include/database.item.php:48
 msgid "Export Historique mouvement stock"
 msgstr "Export Achtergrond stock beweging"
 
@@ -9122,6 +9771,10 @@ msgstr "Export Kranten"
 #: include/class/fiche.class.php:2213 include/class/fiche.class.php:1604
 #: include/class/fiche.class.php:2236 include/class/fiche.class.php:1605
 #: include/class/fiche.class.php:2237 include/class/tax_summary.class.php:350
+#: include/class/tax_summary.class.php:453 include/class/fiche.class.php:1631
+#: include/class/fiche.class.php:2264
+#: include/class/acc_account_ledger.class.php:749
+#: include/template/ledger_detail_bottom.php:359
 msgid "Export PDF"
 msgstr "PDF exporteren"
 
@@ -9134,6 +9787,7 @@ msgid "Export Poste détail"
 msgstr "Export Item Detail"
 
 #: include/database.item.php:142 include/database.item.php:143
+#: include/database.item.php:141
 #, fuzzy
 msgid "Export Résumé TVA"
 msgstr "Samenvatting Export lijst voorraad"
@@ -9141,18 +9795,21 @@ msgstr "Samenvatting Export lijst voorraad"
 #: include/database.item.php:48 include/database.item.php:51
 #: include/database.item.php:55 include/database.item.php:54
 #: include/database.item.php:57 include/database.item.php:50
+#: include/database.item.php:49
 msgid "Export Résumé list stock"
 msgstr "Samenvatting Export lijst voorraad"
 
 #: include/database.item.php:32 include/database.item.php:35
 #: include/database.item.php:39 include/database.item.php:38
 #: include/database.item.php:41 include/database.item.php:34
+#: include/database.item.php:33
 msgid "Export Sécurité"
 msgstr "Export Beveiliging"
 
 #: include/database.item.php:40 include/database.item.php:43
 #: include/database.item.php:47 include/database.item.php:46
 #: include/database.item.php:49 include/database.item.php:42
+#: include/database.item.php:41
 msgid "Export Tableau Analytique"
 msgstr "Exporteer tabel Analytische"
 
@@ -9167,26 +9824,34 @@ msgstr "Exporteer tabel Analytische"
 #: include/class/anc_grandlivre.class.php:169
 #: include/class/anc_grandlivre.class.php:162
 #: include/class/anc_grandlivre.class.php:170
+#: include/class/anc_grandlivre.class.php:174
+#: include/class/anc_grandlivre.class.php:182
 msgid "Export des pièces en PDF"
 msgstr "De documenten in PDF exporteren"
 
 #: include/database.item.php:45 include/database.item.php:48
 #: include/database.item.php:52 include/database.item.php:51
 #: include/database.item.php:54 include/database.item.php:47
+#: include/database.item.php:46
 msgid "Export définition d'un raport"
 msgstr "Export definitie van Openingstijden"
 
-#: include/class/anc_table.class.php:233
+#: include/class/anc_table.class.php:233 include/fiche.inc.php:285
 #, fuzzy
 msgid "Export en CSV"
 msgstr "Export CSV"
 
-#: html/export.php:53
+#: include/fiche.inc.php:272
+#, fuzzy
+msgid "Export en PDF"
+msgstr "PDF exporteren"
+
+#: html/export.php:53 html/export.php:54
 msgid "Export impossible"
 msgstr "Export is onmogelijk"
 
 #: include/database.item.php:8 include/database.item.php:137
-#: include/database.item.php:135
+#: include/database.item.php:135 include/database.item.php:136
 #, fuzzy
 msgid "Export le document"
 msgstr "Documenten staat"
@@ -9194,20 +9859,21 @@ msgstr "Documenten staat"
 #: include/database.item.php:124 include/database.item.php:127
 #: include/database.item.php:133 include/database.item.php:129
 #: include/database.item.php:128 include/database.item.php:132
-#: include/database.item.php:126
+#: include/database.item.php:126 include/database.item.php:125
 msgid "Export opérations rapprochées"
 msgstr "Export dicht operaties"
 
 #: include/database.item.php:124 include/database.item.php:127
 #: include/database.item.php:133 include/database.item.php:129
 #: include/database.item.php:128 include/database.item.php:132
-#: include/database.item.php:126
+#: include/database.item.php:126 include/database.item.php:125
 msgid "Export opérations rapprochées en CSV"
 msgstr "Export CSV dicht operaties"
 
 #: include/database.item.php:2 include/database.item.php:142
 #: include/database.item.php:138 include/database.item.php:137
 #: include/database.item.php:130 include/database.item.php:128
+#: include/database.item.php:129
 #, fuzzy
 msgid "Export pièce PDF"
 msgstr "De documenten in PDF exporteren"
@@ -9224,6 +9890,7 @@ msgstr "Export rapport"
 #: html/recherche.php:125 include/history_operation.inc.php:147
 #: html/recherche.php:126 html/recherche.php:129
 #: include/history_operation.inc.php:167 include/history_operation.inc.php:178
+#: html/recherche.php:141 include/history_operation.inc.php:192
 #, fuzzy
 msgid "Export vers CSV"
 msgstr "Export CSV"
@@ -9235,13 +9902,13 @@ msgid "Exportation d'opérations "
 msgstr "Operaties invoegen"
 
 #: include/database.item.php:7 include/database.item.php:136
-#: include/database.item.php:134
+#: include/database.item.php:134 include/database.item.php:135
 #, fuzzy
 msgid "Exporte la pièce"
 msgstr "De documenten in PDF exporteren"
 
 #: include/database.item.php:9 include/database.item.php:138
-#: include/database.item.php:136
+#: include/database.item.php:136 include/database.item.php:137
 #, fuzzy
 msgid "Exporte le modèle de document"
 msgstr "Config. van het model van het document"
@@ -9298,7 +9965,8 @@ msgstr "Uitbreidingen (plugins)"
 #: include/operation_ods_confirm.inc.php:53 include/compta_ach.inc.php:90
 #: include/compta_ach.inc.php:92 include/compta_ven.inc.php:99
 #: include/ajax/ajax_ledger.php:564 include/class/acc_operation.class.php:729
-#: include/ajax/ajax_ledger.php:565
+#: include/ajax/ajax_ledger.php:565 include/compta_ach.inc.php:89
+#: include/template/ledger_detail_bottom.php:349
 #, fuzzy
 msgid "Extourne"
 msgstr "Extourner"
@@ -9307,7 +9975,7 @@ msgstr "Extourner"
 #: include/operation_ods_confirm.inc.php:61
 #: include/operation_ods_confirm.inc.php:62 include/compta_ach.inc.php:104
 #: include/compta_ach.inc.php:106 include/compta_ven.inc.php:113
-#: include/compta_ven.inc.php:111
+#: include/compta_ven.inc.php:111 include/compta_ach.inc.php:103
 #, fuzzy
 msgid "Extourne opération"
 msgstr "Alle activiteiten"
@@ -9331,6 +9999,7 @@ msgstr "Alle activiteiten"
 #: include/template/ledger_detail_bottom.php:349
 #: include/template/ledger_detail_bottom.php:333
 #: include/template/ledger_detail_bottom.php:346
+#: include/template/ledger_detail_bottom.php:374
 msgid "Extourner"
 msgstr "Extourner"
 
@@ -9341,6 +10010,7 @@ msgstr "Extourner"
 #: include/template/ledger_detail_bottom.php:350
 #: include/template/ledger_detail_bottom.php:351
 #: include/template/ledger_detail_bottom.php:348
+#: include/template/ledger_detail_bottom.php:376
 msgid ""
 "Extourner une opération vous permet de l'annuler par son écriture inverse"
 msgstr ""
@@ -9356,6 +10026,7 @@ msgstr "Export Kranten"
 
 #: include/compta_ach.inc.php:184 include/compta_ach.inc.php:186
 #: include/compta_ach.inc.php:191 include/compta_ach.inc.php:189
+#: include/compta_ach.inc.php:188
 #, fuzzy, php-format
 msgid "Extourné au %s"
 msgstr "Export Kranten"
@@ -9405,7 +10076,8 @@ msgstr ""
 #: include/ext/invoicing/include/invoice_to_zip.inc.php:76
 #: include/compta_ach.inc.php:89 include/compta_ven.inc.php:96
 #: include/database.item.php:179 include/database.item.php:187
-#: include/database.item.php:192
+#: include/database.item.php:192 include/compta_ach.inc.php:86
+#: include/database.item.php:185
 msgid "Facture"
 msgstr "Faktuur"
 
@@ -9435,9 +10107,15 @@ msgstr "Favorieten"
 #: include/database.item.php:164 include/database.item.php:157
 #: include/database.item.php:158 include/company.inc.php:124
 #: include/database.item.php:166 include/database.item.php:169
+#: include/company.inc.php:132
 msgid "Fax"
 msgstr "Fax"
 
+#: include/class/document_state_mtable.php:47
+#, fuzzy
+msgid "Ferme"
+msgstr "Dicht"
+
 #: include/doc_state.inc.php:57
 msgid "Ferme l'action"
 msgstr "Krachtdadig optreden"
@@ -9516,11 +10194,16 @@ msgstr "Krachtdadig optreden"
 #: include/template/ledger_detail_bottom.php:303
 #: include/template/ledger_detail_bottom.php:299
 #: include/template/ledger_detail_bottom.php:300 include/ajax/ajax_card.php:313
+#: html/recherche.php:92 html/recherche.php:144
+#: include/class/extension.class.php:276 include/ajax/ajax_card.php:319
+#: include/template/ledger_detail_bottom.php:317
+#: include/template/ledger_detail_bottom.php:318
+#: include/template/action_search.php:169
 #, php-format
 msgid "Fermer"
 msgstr "Dicht"
 
-#: include/periode.inc.php:94
+#: include/periode.inc.php:94 include/periode.inc.php:95
 #, fuzzy
 msgid "Fermer les périodes sélectionnées"
 msgstr "Geen enkele operatie in de huidige oefening"
@@ -9542,6 +10225,7 @@ msgstr "Dicht"
 #: include/class/periode.class.php:585
 #: include/class/periode_ledger_table.class.php:142
 #: include/class/periode.class.php:587 include/class/periode.class.php:589
+#: include/class/periode.class.php:590
 #, fuzzy
 msgid "Fermée"
 msgstr "Dicht"
@@ -9582,6 +10266,11 @@ msgstr "Dicht"
 #: include/database.item.php:110 include/category_card.inc.php:75
 #: include/template/stock_inv.php:67
 #: include/class/payment_method_mtable.class.php:41
+#: include/class/payment_method_mtable.class.php:42
+#: include/class/anc_group_operation.class.php:122
+#: include/class/card_attribut_mtable.class.php:55
+#: include/template/follow_up_detail_display.php:50
+#: include/template/newEmptyPHP_NOALYSS.php:35 include/database.item.php:111
 msgid "Fiche"
 msgstr "Blad"
 
@@ -9624,14 +10313,21 @@ msgstr "BTW fiche"
 #: include/ajax/ajax_card.php:347 include/ajax/ajax_add_concerned_card.php:50
 #: include/ajax/ajax_card.php:380 include/ajax/ajax_add_concerned_card.php:54
 #: include/ajax/ajax_card.php:383 include/ajax/ajax_card.php:384
+#: include/ajax/ajax_card.php:417 include/ajax/ajax_add_concerned_card.php:64
 msgid "Fiche contenant"
 msgstr "Blad Bevat"
 
 #: include/class/payment_method_mtable.class.php:98
+#: include/class/payment_method_mtable.class.php:102
 #, fuzzy
 msgid "Fiche inexistante"
 msgstr "Map niet bestaat"
 
+#: include/class/fiche.class.php:1181
+#, fuzzy
+msgid "Fiche n'existe pas"
+msgstr "] Doorsturingslijst is leeg niet"
+
 #: include/ext/import_account/include/class_impacc_csv.php:53
 #: include/ext/import_account/include/impacc_csv.class.php:53
 #, fuzzy
@@ -9639,6 +10335,7 @@ msgid "Fiche non disponible pour journal"
 msgstr "Geen enkele printer is beschikbaar om toegevoegd te worden"
 
 #: include/ajax/ajax_card.php:619 include/ajax/ajax_card.php:642
+#: include/ajax/ajax_card.php:756
 #, fuzzy
 msgid "Fiche non effacée"
 msgstr "Undeleted opnemen"
@@ -9646,6 +10343,7 @@ msgstr "Undeleted opnemen"
 #: include/fiche.inc.php:175 include/fiche.inc.php:179
 #: include/fiche.inc.php:181 include/fiche.inc.php:182
 #: include/fiche.inc.php:183 include/fiche.inc.php:184
+#: include/fiche.inc.php:185
 msgid "Fiche non effacées"
 msgstr "Undeleted opnemen"
 
@@ -9659,6 +10357,7 @@ msgstr "Undeleted opnemen"
 #: include/ext/importbank/include/import_bank.class.php:490
 #: include/ajax/ajax_card.php:148 include/class/fiche.class.php:661
 #: include/class/fiche.class.php:663 include/class/fiche.class.php:662
+#: include/class/fiche.class.php:681 include/ajax/ajax_card.php:151
 msgid "Fiche non trouvée"
 msgstr "Record niet gevonden"
 
@@ -9668,7 +10367,8 @@ msgstr "Record niet gevonden"
 #: include/ajax/ajax_card.php:539 include/ajax/ajax_card.php:540
 #: include/ajax/ajax_card.php:573 include/ajax/ajax_card.php:577
 #: include/ajax/ajax_card.php:607 include/ajax/ajax_card.php:600
-#: include/ajax/ajax_card.php:630
+#: include/ajax/ajax_card.php:630 include/ajax/ajax_card.php:679
+#: include/ajax/ajax_card.php:708 include/ajax/ajax_card.php:744
 msgid "Fiche non valide"
 msgstr "Ongeldige opnemen"
 
@@ -9680,6 +10380,7 @@ msgstr ""
 #: html/ajax_card.php:343 include/ajax/ajax_card.php:323
 #: include/ajax/ajax_card.php:324 include/ajax/ajax_card.php:342
 #: include/ajax/ajax_card.php:345 include/ajax/ajax_card.php:346
+#: include/ajax/ajax_card.php:358
 msgid "Fiche sauvée"
 msgstr "Opslagen fiche"
 
@@ -9699,12 +10400,19 @@ msgid "Fiches"
 msgstr "Fiches"
 
 #: include/verif_bilan.inc.php:99 include/verif_bilan.inc.php:126
+#: include/verif_bilan.inc.php:124
 #, fuzzy
 msgid "Fiches ayant changé de poste comptable"
 msgstr "De% s-plug heeft geen financieel administratieve post"
 
+#: include/ajax/ajax_add_concerned_card.php:88
+#, fuzzy
+msgid "Fiches inactives"
+msgstr "Map niet bestaat"
+
 #: include/template/param_jrn.php:251 include/template/param_jrn.php:258
 #: include/template/param_jrn.php:260 include/template/param_jrn.php:305
+#: include/template/param_jrn.php:306
 msgid "Fiches utilisables (D/C)"
 msgstr ""
 
@@ -9740,12 +10448,12 @@ msgstr "Verwijderde bestand"
 #: include/ext/import_account/include/class_impacc_file.php:69
 #: html/install.php:269 html/install.php:220
 #: include/ext/import_account/include/impacc_file.class.php:69
-#: html/install.php:227 html/install.php:230
+#: html/install.php:227 html/install.php:230 html/install.php:277
 #, fuzzy
 msgid "Fichier non sauvé"
 msgstr "Record niet gevonden"
 
-#: include/lib/ac_common.php:1129
+#: include/lib/ac_common.php:1129 include/lib/ac_common.php:1139
 #, fuzzy
 msgid "Fichier non trouvé"
 msgstr "Record niet gevonden"
@@ -9777,6 +10485,17 @@ msgstr "Dossier invoegen (vanuit de lijst include)"
 msgid "Filter"
 msgstr "Filter"
 
+#: include/class/acc_ledger_history.class.php:361
+#: include/class/pdf.class.php:151 include/class/print_ledger.class.php:103
+#, fuzzy
+msgid "Filter invalide "
+msgstr "Ongeldig datum"
+
+#: include/preod.inc.php:50
+#, fuzzy
+msgid "Filter par journal"
+msgstr "Gefilterd per dagboek"
+
 #: include/anc_od.inc.php:108
 #, fuzzy
 msgid "Filter par période"
@@ -9818,6 +10537,8 @@ msgstr "Gefilterd per categorie"
 #: include/class/acc_ledger_search.class.php:565 html/recherche.php:83
 #: include/class/acc_ledger_search.class.php:553
 #: include/class/acc_ledger_search.class.php:562 include/modele.inc.php:279
+#: html/recherche.php:88 include/class/acc_ledger_search.class.php:648
+#: include/lettering.card.inc.php:98
 msgid "Filtre"
 msgstr "Filter"
 
@@ -9827,6 +10548,7 @@ msgstr "Filter"
 #: include/class/acc_ledger_search.class.php:1069
 #: include/class/acc_ledger_search.class.php:1077
 #: include/class/acc_ledger_search.class.php:1090
+#: include/class/acc_ledger_search.class.php:1179
 msgid "Filtre "
 msgstr "Filter"
 
@@ -9834,6 +10556,14 @@ msgstr "Filter"
 msgid "Filtre :"
 msgstr "Filter:"
 
+#: include/class/acc_ledger_history.class.php:337
+#: include/class/acc_ledger_purchase.class.php:1845
+#: include/class/acc_ledger_sold.class.php:1368
+#: include/class/print_ledger.class.php:331
+#, fuzzy
+msgid "Filtre invalide"
+msgstr "Ongeldig datum"
+
 #: include/impress_rec.inc.php:42
 #, fuzzy
 msgid "Filtre par journal"
@@ -9844,6 +10574,7 @@ msgstr "Gefilterd per dagboek"
 #: include/class/class_acc_account_ledger.php:703
 #: include/class/acc_account_ledger.class.php:763
 #: include/class/acc_account_ledger.class.php:766
+#: include/class/acc_account_ledger.class.php:758
 #, fuzzy
 msgid "Filtre rapide"
 msgstr "Rapid filter:"
@@ -9858,7 +10589,7 @@ msgstr "Rapid filter:"
 #: include/fiche.inc.php:312 include/fiche.inc.php:317
 #: include/fiche.inc.php:390 include/fiche.inc.php:393
 #: include/fiche.inc.php:394 include/fiche.inc.php:395
-#: include/fiche.inc.php:402
+#: include/fiche.inc.php:402 include/fiche.inc.php:412
 msgid "Filtre rapide:"
 msgstr "Rapid filter:"
 
@@ -9908,6 +10639,7 @@ msgid "Fin"
 msgstr ""
 
 #: html/test_class.php:239 dev/test/test_class.php:235
+#: dev-2/test/test_class.php:235
 msgid "Fin de programme"
 msgstr ""
 
@@ -9928,6 +10660,8 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:1082
 #: include/class/acc_ledger_search.class.php:1095 include/lib/user_menu.php:136
 #: include/database.item.php:233 include/database.item.php:252
+#: include/class/acc_ledger_search.class.php:1184 include/database.item.php:217
+#: include/database.item.php:229 include/lib/user_menu.php:135
 msgid "Financier"
 msgstr "Financieel"
 
@@ -9937,13 +10671,15 @@ msgid "Format Export CSV"
 msgstr "Export CSV"
 
 #: include/lib/ac_common.php:811 include/lib/ac_common.php:813
-#: include/lib/ac_common.php:829
+#: include/lib/ac_common.php:829 include/lib/ac_common.php:839
 #, fuzzy
 msgid "Format Invalide"
 msgstr "act ongeldig"
 
 #: include/class/tax_summary.class.php:74
 #: include/class/tax_summary.class.php:93
+#: include/class/tax_summary.class.php:91
+#: include/class/tax_summary.class.php:111
 #, fuzzy
 msgid "Format date invalide"
 msgstr "act ongeldig"
@@ -10034,6 +10770,11 @@ msgstr "Formules"
 #: include/class/print_ledger_simple.class.php:105
 #: include/class/acc_ledger_history_purchase.class.php:253
 #: include/class/acc_ledger_history_purchase.class.php:257
+#: include/class/acc_ledger_history_sale.class.php:256
+#: include/class/acc_ledger_history_purchase.class.php:268
+#: include/class/acc_ledger_purchase.class.php:1314
+#: include/class/acc_ledger_purchase.class.php:1441
+#: include/class/print_ledger_simple.class.php:102 include/database.item.php:12
 msgid "Fournisseur"
 msgstr "Leverancier"
 
@@ -10052,11 +10793,13 @@ msgstr "Leverancier"
 #: include/class/pre_op_ach.class.php:231
 #: include/class/acc_ledger_purchase.class.php:1130
 #: include/class/acc_ledger_purchase.class.php:1133
+#: include/class/acc_ledger_purchase.class.php:1144
 msgid "Fournisseur "
 msgstr "Leverancier"
 
 #: include/template/param_jrn.php:139 include/template/param_jrn.php:146
 #: include/template/param_jrn.php:148 include/template/param_jrn.php:193
+#: include/template/param_jrn.php:194
 #, fuzzy
 msgid "Fournisseurs (C)"
 msgstr "Leverancier"
@@ -10077,11 +10820,12 @@ msgstr "Leverancier vandaag betalen"
 #: html/test_class.php:219 include/ajax_preference.php:173
 #: include/ajax/ajax_preference.php:173 include/ajax/ajax_preference.php:252
 #: dev/test/test_class.php:215 include/ajax/ajax_preference.php:263
+#: dev-2/test/test_class.php:215
 msgid "Français"
 msgstr "Frans"
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
-#: include/class/periode.class.php:651
+#: include/class/periode.class.php:651 include/class/periode.class.php:652
 msgid "Février"
 msgstr ""
 
@@ -10097,28 +10841,33 @@ msgstr "GSM"
 #: include/database.item.php:71 include/database.item.php:74
 #: include/database.item.php:14 include/database.item.php:76
 #: include/database.item.php:79 include/database.item.php:73
+#: include/database.item.php:72
 msgid "Gestion"
 msgstr "Beheer"
 
 #: include/database.item.php:108 include/database.item.php:111
 #: include/database.item.php:117 include/database.item.php:114
 #: include/database.item.php:113 include/database.item.php:109
+#: include/database.item.php:110
 msgid "Gestion catégorie de fiche"
 msgstr "Categorie record management"
 
 #: include/database.item.php:90 include/database.item.php:93
 #: include/database.item.php:98 include/database.item.php:95
 #: include/database.item.php:94 include/database.item.php:92
+#: include/database.item.php:91
 msgid "Gestion des attributs de fiches "
 msgstr "Beheer attributen vellen"
 
 #: include/user_menu.php:111 include/lib/user_menu.php:117
 #: include/lib/user_menu.php:118 include/lib/user_menu.php:75
+#: include/lib/user_menu.php:74
 msgid "Gestion des dossiers"
 msgstr "Records Management"
 
 #: include/user_menu.php:112 include/lib/user_menu.php:118
 #: include/lib/user_menu.php:119 include/lib/user_menu.php:76
+#: include/lib/user_menu.php:75
 msgid "Gestion des modèles"
 msgstr "Managementmodellen"
 
@@ -10132,11 +10881,13 @@ msgstr "Operations Management prédéfinifies"
 #: include/database.item.php:84 include/database.item.php:87
 #: include/database.item.php:92 include/database.item.php:89
 #: include/database.item.php:88 include/database.item.php:86
+#: include/database.item.php:85
 msgid "Gestion des périodes"
 msgstr "Beheersperioden"
 
 #: include/database.item.php:89 include/database.item.php:92
 #: include/database.item.php:86 include/database.item.php:84
+#: include/database.item.php:85
 msgid ""
 "Gestion des périodes : clôture, ajout de période, afin de créer des périodes "
 "vous pouvez aussi utiliser le plugin outil comptable"
@@ -10146,6 +10897,7 @@ msgstr ""
 #: include/lib/user_menu.php:116 include/lib/user_menu.php:129
 #: include/lib/user_menu.php:117 include/lib/user_menu.php:140
 #: include/lib/user_menu.php:74 include/lib/user_menu.php:97
+#: include/lib/user_menu.php:73 include/lib/user_menu.php:96
 msgid "Gestion des utilisateurs"
 msgstr "Users Beheer"
 
@@ -10153,6 +10905,7 @@ msgstr "Users Beheer"
 #: include/database.item.php:170 include/database.item.php:169
 #: include/database.item.php:168 include/database.item.php:172
 #: include/database.item.php:177 include/database.item.php:180
+#: include/database.item.php:176
 msgid "Gestion stock"
 msgstr "Voorraadbeheer"
 
@@ -10172,10 +10925,12 @@ msgstr "Geen filter, alle dagboeken"
 #: include/class/acc_ledger.class.php:372
 #: include/class/acc_ledger.class.php:373
 #: include/class/acc_ledger.class.php:391
+#: include/class/acc_ledger.class.php:390 include/database.item.php:65
 msgid "Grand Livre"
 msgstr "Grootboek"
 
 #: include/verif_bilan.inc.php:78 include/verif_bilan.inc.php:105
+#: include/verif_bilan.inc.php:103
 #, fuzzy
 msgid "Grand livre"
 msgstr "Grootboek"
@@ -10184,11 +10939,13 @@ msgstr "Grootboek"
 #: include/database.item.php:79 include/database.item.php:77
 #: include/database.item.php:76 include/database.item.php:75
 #: include/database.item.php:78 include/database.item.php:72
+#: include/database.item.php:71
 msgid "Grand livre analytique"
 msgstr "Grote analytische boek"
 
 #: include/database.item.php:75 include/database.item.php:78
 #: include/database.item.php:72 include/database.item.php:70
+#: include/database.item.php:71
 #, fuzzy
 msgid "Grand livre pour la comptabilité analytique"
 msgstr "Cost Accounting Module"
@@ -10197,6 +10954,7 @@ msgstr "Cost Accounting Module"
 #: include/database.item.php:79 include/database.item.php:77
 #: include/database.item.php:76 include/database.item.php:75
 #: include/database.item.php:78 include/database.item.php:72
+#: include/database.item.php:71
 msgid "Grand'Livre"
 msgstr "Grand&#39;Livre"
 
@@ -10341,13 +11099,16 @@ msgstr "Grid 86: overnames in België en intra ABC sales"
 #: include/class/class_anc_account.php:290 include/database.item.php:15
 #: include/class/anc_account_table.class.php:50 include/database.item.php:9
 #: include/database.item.php:51 include/export/export_anc_axis_csv.php:47
-#: include/database.item.php:52
+#: include/database.item.php:52 include/class/follow_up.class.php:625
+#: include/template/tag_search_select.php:64
+#: include/template/tag_search_select.php:70 include/database.item.php:8
 msgid "Groupe"
 msgstr "Groep"
 
 #: include/template/detail-action.php:139
 #: include/template/detail-action.php:144
-#: include/template/detail-action.php:143
+#: include/template/detail-action.php:143 include/ajax/ajax_get_profile.php:58
+#: include/template/detail-action.php:150
 #, fuzzy
 msgid "Groupe Gestion"
 msgstr "Management Module"
@@ -10359,6 +11120,11 @@ msgstr "Management Module"
 msgid "Groupe analytique"
 msgstr "Analytische groep"
 
+#: include/cfgtags.inc.php:83
+#, fuzzy
+msgid "Groupe étiquettes"
+msgstr "Toevoeging van een label"
+
 #: include/action.common.inc.php:161 include/action.common.inc.php:178
 #: include/action.common.inc.php:183 include/action.common.inc.php:185
 #: include/action.common.inc.php:186 include/action.common.inc.php:192
@@ -10403,7 +11169,7 @@ msgstr "Vorming van het boekhoudkundig schrijven"
 #: include/class_follow_up.php:418 include/class_follow_up.php:420
 #: include/class_follow_up.php:421 include/class/class_follow_up.php:421
 #: include/class/class_follow_up.php:411 include/class/follow_up.class.php:411
-#: include/class/follow_up.class.php:412
+#: include/class/follow_up.class.php:412 include/class/follow_up.class.php:419
 msgid "Génére le document"
 msgstr "Document Maken"
 
@@ -10437,6 +11203,7 @@ msgstr "De facturen opstellen "
 #: include/compta_ach.inc.php:82 include/compta_ach.inc.php:85
 #: include/compta_ven.inc.php:94 include/compta_ach.inc.php:87
 #: include/compta_ach.inc.php:89 include/compta_ven.inc.php:96
+#: include/compta_ach.inc.php:86
 msgid "Générer une facture ou charger un document"
 msgstr ""
 
@@ -10467,6 +11234,9 @@ msgstr ""
 #: include/class/acc_ledger_history_purchase.class.php:256
 #: include/class/acc_ledger_history_purchase.class.php:260
 #: include/class/print_ledger_detail_item.class.php:161
+#: include/class/acc_ledger_history_sale.class.php:259
+#: include/class/acc_ledger_history_purchase.class.php:271
+#: include/class/print_ledger_simple.class.php:107
 msgid "HTVA"
 msgstr "Zonder BTW"
 
@@ -10496,6 +11266,8 @@ msgstr "Zonder BTW"
 #: include/class/acc_ledger_purchase.class.php:1854
 #: include/class/acc_ledger_sold.class.php:1431
 #: include/class/acc_ledger_purchase.class.php:1860
+#: include/class/acc_ledger_purchase.class.php:1897
+#: include/class/acc_ledger_sold.class.php:1416
 msgid "HTVA Opération"
 msgstr "Operatie exclusief BTW"
 
@@ -10504,7 +11276,8 @@ msgstr "Operatie exclusief BTW"
 #: include/template/action_display_short.php:57
 #: include/class/class_follow_up.php:261 include/class/follow_up.class.php:261
 #: include/template/action_display_short.php:58
-#: include/class/follow_up.class.php:262
+#: include/class/follow_up.class.php:262 include/class/document.class.php:1413
+#: include/class/follow_up.class.php:269 include/class/follow_up.class.php:725
 msgid "Haute"
 msgstr ""
 
@@ -10514,17 +11287,20 @@ msgstr ""
 #: include/template/detail-action.php:104
 #: include/template/action_display_short.php:88
 #: include/template/action_display_short.php:89
+#: include/template/detail-action.php:111
 msgid "Heure"
 msgstr "Tijd"
 
 #: include/verif_bilan.inc.php:127 include/verif_bilan.inc.php:165
 #: include/verif_bilan.inc.php:168 include/verif_bilan.inc.php:169
+#: include/verif_bilan.inc.php:167
 msgid "Hist."
 msgstr ""
 
 #: include/database.item.php:93 include/database.item.php:96
 #: include/database.item.php:101 include/database.item.php:98
 #: include/database.item.php:97 include/database.item.php:95
+#: include/database.item.php:94
 msgid "Histo. Changement"
 msgstr "Histo. Verandering"
 
@@ -10544,7 +11320,8 @@ msgstr "Histo. Verandering"
 #: include/database.item.php:11 include/ajax/ajax_card.php:166
 #: include/database.item.php:5 include/database.item.php:98
 #: include/ext/import-winbook/index.php:66 include/fiche.inc.php:65
-#: include/ajax/ajax_card.php:167
+#: include/ajax/ajax_card.php:167 include/ajax/ajax_card.php:170
+#: include/database.item.php:4 include/database.item.php:97
 msgid "Historique"
 msgstr "Historisch"
 
@@ -10575,6 +11352,7 @@ msgstr ""
 
 #: include/database.item.php:66 include/database.item.php:69
 #: include/database.item.php:63 include/database.item.php:61
+#: include/database.item.php:62
 msgid ""
 "Historique de toutes vos opérations dans les journaux d'opérations diverses "
 "un menu de recherche, vous permettra de retrouver rapidement l'opération qui "
@@ -10583,6 +11361,7 @@ msgstr ""
 
 #: include/database.item.php:109 include/database.item.php:112
 #: include/database.item.php:106 include/database.item.php:104
+#: include/database.item.php:105
 msgid ""
 "Historique de toutes vos opérations dans les journaux de trésorerie un menu "
 "de recherche, vous permettra de retrouver rapidement l'opération qui vous "
@@ -10591,6 +11370,7 @@ msgstr ""
 
 #: include/database.item.php:108 include/database.item.php:111
 #: include/database.item.php:105 include/database.item.php:103
+#: include/database.item.php:104
 msgid ""
 "Historique de toutes vos opérations dans les journaux de vente un menu de "
 "recherche, vous permettra de retrouver rapidement l'opération qui vous "
@@ -10599,6 +11379,7 @@ msgstr ""
 
 #: include/database.item.php:100 include/database.item.php:103
 #: include/database.item.php:97 include/database.item.php:95
+#: include/database.item.php:96
 msgid ""
 "Historique de toutes vos opérations dans tous  les journaux auquels vous "
 "avez accès, vous permettra de retrouver rapidement l'opération qui vous "
@@ -10616,6 +11397,7 @@ msgstr ""
 
 #: include/database.item.php:101 include/database.item.php:104
 #: include/database.item.php:98 include/database.item.php:96
+#: include/database.item.php:97
 msgid ""
 "Historique de toutes vos opérations un menu de recherche, vous permettra de "
 "retrouver rapidement l'opération qui vous intéresse"
@@ -10642,7 +11424,7 @@ msgstr "Geschiedenis geschreven invoer"
 
 #: include/database.item.php:3 include/database.item.php:6
 #: include/database.item.php:8 include/database.item.php:11
-#: include/database.item.php:5
+#: include/database.item.php:5 include/database.item.php:4
 msgid "Historique des imputations analytiques"
 msgstr "Geschiedenis analytische postings"
 
@@ -10658,12 +11440,14 @@ msgstr "Geschiedenis operaties"
 #: include/database.item.php:102 include/database.item.php:105
 #: include/database.item.php:111 include/database.item.php:108
 #: include/database.item.php:107 include/database.item.php:103
+#: include/database.item.php:104
 msgid "Historique des ventes"
 msgstr "Sales Geschiedenis"
 
 #: include/database.item.php:103 include/database.item.php:106
 #: include/database.item.php:112 include/database.item.php:109
 #: include/database.item.php:108 include/database.item.php:104
+#: include/database.item.php:105
 msgid "Historique financier"
 msgstr "Financiële Geschiedenis"
 
@@ -10686,18 +11470,21 @@ msgstr "Niet Scholar Geschiedenis"
 #: include/database.item.php:70 include/database.item.php:68
 #: include/database.item.php:67 include/database.item.php:66
 #: include/database.item.php:69 include/database.item.php:63
+#: include/database.item.php:62
 msgid "Historique opérations diverses"
 msgstr "Historische verschillende bewerkingen"
 
 #: include/database.item.php:16 include/database.item.php:19
 #: include/database.item.php:23 include/database.item.php:22
 #: include/database.item.php:25 include/database.item.php:18
+#: include/database.item.php:17
 msgid "Historique stock"
 msgstr "Stock Geschiedenis"
 
 #: include/database.item.php:102 include/database.item.php:105
 #: include/database.item.php:111 include/database.item.php:108
 #: include/database.item.php:107 include/database.item.php:103
+#: include/database.item.php:104
 msgid "Historique vente"
 msgstr "Historische omzet"
 
@@ -10706,6 +11493,7 @@ msgstr "Historische omzet"
 #: include/lib/user_menu.php:168 include/lib/user_menu.php:169
 #: include/lib/user_menu.php:181 include/lib/user_menu.php:182
 #: include/lib/user_menu.php:139 include/lib/user_menu.php:140
+#: include/lib/user_menu.php:138
 msgid "Hors Comptabilité"
 msgstr "Exclusief Accounting"
 
@@ -10735,10 +11523,14 @@ msgstr ""
 #: include/class_user.php:973 include/class_user.php:974
 #: include/class/class_user.php:974 include/class/class_user.php:962
 #: include/class/class_user.php:961 include/class/user.class.php:961
-#: include/class/user.class.php:985
+#: include/class/user.class.php:985 include/class/user.class.php:988
 msgid "Id"
 msgstr ""
 
+#: include/lib/message_javascript.php:109
+msgid "Il est conseillé d'avoir un quickcode de moins de 9 car."
+msgstr ""
+
 #: include/ext/importbank/include/class_import_bank.php:78
 #: include/ext/importbank/include/import_bank.class.php:78
 msgid "Il manque la colonne pour les  dates"
@@ -10763,13 +11555,14 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:266
 #: include/class/acc_ledger_sold.class.php:214
 #: include/class/acc_ledger_purchase.class.php:265
+#: include/class/acc_ledger_purchase.class.php:267
 msgid "Il n'y a aucune marchandise"
 msgstr "Er are Geen goederen"
 
 #: html/admin/setup.php:462 html/install.php:526 html/install.php:525
 #: html/install.php:523 html/install.php:529 html/install.php:521
 #: html/install.php:527 html/install.php:489 html/install.php:464
-#: html/install.php:470 html/install.php:473
+#: html/install.php:470 html/install.php:473 html/install.php:522
 #, php-format
 msgid "Il y a %s param&egrave;tre qui sont trop bas"
 msgstr ""
@@ -10777,6 +11570,7 @@ msgstr ""
 #: html/ajax_misc.php:572 html/ajax_misc.php:614 html/ajax_misc.php:409
 #: html/ajax_misc.php:435 html/ajax_misc.php:547 html/ajax_misc.php:549
 #: html/ajax_misc.php:555 html/ajax_misc.php:557 html/ajax_misc.php:561
+#: html/ajax_misc.php:526
 msgid "Il y a une erreur, ce plugin n'existe pas"
 msgstr ""
 
@@ -10842,6 +11636,8 @@ msgstr "Balans export"
 #: html/install.php:213 html/install.php:543 html/install.php:599
 #: html/install.php:625 html/install.php:549 html/install.php:606
 #: html/install.php:632 html/install.php:552 html/install.php:635
+#: html/install.php:259 html/install.php:602 html/install.php:659
+#: html/install.php:688 include/class/follow_up.class.php:731
 #, fuzzy
 msgid "Important"
 msgstr "Invoegen"
@@ -10937,6 +11733,7 @@ msgstr "Invoegen"
 #: include/class/class_fiche.php:1024 include/class/class_fiche.php:1027
 #: include/class/fiche.class.php:1117 include/class/fiche.class.php:1119
 #: include/class/fiche.class.php:1133 include/class/fiche.class.php:1134
+#: include/class/fiche.class.php:1161
 msgid "Impossible cette fiche est utilisée dans un journal"
 msgstr ""
 
@@ -10970,6 +11767,7 @@ msgstr "Onmogelijk om de waarde te veranderen: post is al in gebruik"
 #: include/class/acc_ledger.class.php:2584
 #: include/class/acc_ledger.class.php:2593
 #: include/class/acc_ledger.class.php:2632
+#: include/class/acc_ledger.class.php:2656
 msgid "Impossible d'effacer un journal qui contient des opérations"
 msgstr ""
 "Onmogelijk om een journaal te verwijderen waarin operaties nog actief zijn"
@@ -10996,14 +11794,14 @@ msgid "Impossible de changer la valeur: poste déjà utilisé"
 msgstr "Onmogelijk om de waarde te veranderen: post is al in gebruik"
 
 #: include/param_sec.inc.php:244 include/param_sec.inc.php:178
-#: include/param_sec.inc.php:184
+#: include/param_sec.inc.php:184 include/param_sec.inc.php:189
 msgid ""
 "Impossible de modifier cet utilisateur dans cet écran, il faut passer par\n"
 "\t\t\tl'écran administration -> utilisateur."
 msgstr ""
 
 #: include/param_sec.inc.php:231 include/param_sec.inc.php:165
-#: include/param_sec.inc.php:171
+#: include/param_sec.inc.php:171 include/param_sec.inc.php:176
 msgid ""
 "Impossible de modifier cet utilisateur dans cet écran, il faut passer par\n"
 "\t\tl'écran administration -> utilisateur."
@@ -11015,7 +11813,7 @@ msgstr "Kan dit bestand op te slaan"
 
 #: html/install.php:278 html/install.php:277 html/install.php:275
 #: html/install.php:281 html/install.php:287 html/install.php:238
-#: html/install.php:245 html/install.php:248
+#: html/install.php:245 html/install.php:248 html/install.php:295
 msgid ""
 "Impossible de se connecter à Postgresql, vérifiez les informations de "
 "connection"
@@ -11038,35 +11836,42 @@ msgstr "Kan dit bestand op te slaan"
 #: include/database.item.php:73 include/ajax/ajax_get_profile.php:114
 #: include/database.item.php:76 include/ajax/ajax_get_profile.php:120
 #: include/database.item.php:70 include/database.item.php:115
+#: include/ajax/ajax_get_profile.php:119 include/database.item.php:69
+#: include/database.item.php:116
 msgid "Impression"
 msgstr "Indruk"
 
 #: include/database.item.php:44 include/database.item.php:47
 #: include/database.item.php:51 include/database.item.php:50
 #: include/database.item.php:53 include/database.item.php:46
+#: include/database.item.php:45
 msgid "Impression Grand-Livre"
 msgstr "Print Ledger"
 
 #: include/database.item.php:112 include/database.item.php:115
 #: include/database.item.php:121 include/database.item.php:118
 #: include/database.item.php:117 include/database.item.php:113
+#: include/database.item.php:114
 msgid "Impression Journaux"
 msgstr "Kranten Printing"
 
 #: include/database.item.php:114 include/database.item.php:117
 #: include/database.item.php:123 include/database.item.php:120
 #: include/database.item.php:119 include/database.item.php:115
+#: include/database.item.php:116
 msgid "Impression compta. analytique"
 msgstr "Printing geteld. analytisch"
 
 #: include/database.item.php:105 include/database.item.php:108
 #: include/database.item.php:114 include/database.item.php:111
 #: include/database.item.php:110 include/database.item.php:106
+#: include/database.item.php:107
 msgid "Impression de bilan"
 msgstr "Balans Printing"
 
 #: include/database.item.php:111 include/database.item.php:114
 #: include/database.item.php:108 include/database.item.php:106
+#: include/database.item.php:107
 msgid ""
 "Impression de bilan, ce module est basique, il est plus intéressant "
 "d'utiliser le plugin \"rapport avancés\""
@@ -11076,11 +11881,13 @@ msgstr ""
 #: include/database.item.php:72 include/database.item.php:70
 #: include/database.item.php:69 include/database.item.php:68
 #: include/database.item.php:71 include/database.item.php:65
+#: include/database.item.php:64
 msgid "Impression de rapport"
 msgstr "Rapport afdrukken"
 
 #: include/database.item.php:68 include/database.item.php:71
 #: include/database.item.php:65 include/database.item.php:63
+#: include/database.item.php:64
 msgid ""
 "Impression de rapport personnalisé, il est aussi possible d'exporter en CSV "
 "afin de faire des graphiques"
@@ -11090,17 +11897,20 @@ msgstr ""
 #: include/database.item.php:74 include/database.item.php:72
 #: include/database.item.php:71 include/database.item.php:70
 #: include/database.item.php:73 include/database.item.php:67
+#: include/database.item.php:66
 msgid "Impression des balances comptables"
 msgstr "Print boekhoudsaldi"
 
 #: include/database.item.php:112 include/database.item.php:115
 #: include/database.item.php:121 include/database.item.php:118
 #: include/database.item.php:117 include/database.item.php:113
+#: include/database.item.php:114
 msgid "Impression des journaux"
 msgstr "Drukken van kranten"
 
 #: include/database.item.php:118 include/database.item.php:121
 #: include/database.item.php:115 include/database.item.php:113
+#: include/database.item.php:114
 msgid ""
 "Impression des journaux avec les détails pour les parties privés, la TVA et "
 "ce qui est non déductibles en ce qui concerne les journaux de vente et "
@@ -11110,11 +11920,13 @@ msgstr ""
 #: include/database.item.php:104 include/database.item.php:107
 #: include/database.item.php:113 include/database.item.php:110
 #: include/database.item.php:109 include/database.item.php:105
+#: include/database.item.php:106
 msgid "Impression des rapprochements"
 msgstr "Print verzoeningen"
 
 #: include/database.item.php:110 include/database.item.php:113
 #: include/database.item.php:107 include/database.item.php:105
+#: include/database.item.php:106
 #, fuzzy
 msgid ""
 "Impression des rapprochements : opérations non rapprochées ou avec des "
@@ -11125,6 +11937,7 @@ msgstr "Geletterde operaties verschillende bedragen"
 #: include/database.item.php:71 include/database.item.php:69
 #: include/database.item.php:68 include/database.item.php:67
 #: include/database.item.php:70 include/database.item.php:64
+#: include/database.item.php:63
 msgid "Impression du détail d'un poste comptable"
 msgstr "Detail van een afdruktaak boekhoudkundige"
 
@@ -11132,6 +11945,7 @@ msgstr "Detail van een afdruktaak boekhoudkundige"
 #: include/database.item.php:73 include/database.item.php:71
 #: include/database.item.php:70 include/database.item.php:69
 #: include/database.item.php:72 include/database.item.php:66
+#: include/database.item.php:65
 msgid "Impression du grand livre"
 msgstr "Het grootboek afdrukken"
 
@@ -11178,7 +11992,7 @@ msgid ""
 "sauvés exemple c:/temp, /tmp"
 msgstr ""
 
-#: html/install.php:142
+#: html/install.php:142 html/install.php:155
 msgid ""
 "Indiquez ici le répertoire où les documents temporaires peuvent être sauvés "
 "exemple c:/temp, /tmp"
@@ -11211,6 +12025,7 @@ msgstr ""
 #: include/template/ledger_detail_bottom.php:37 include/ext/tva/ajax.php:101
 #: include/ext/tva/ajax.php:200 include/ajax/ajax_ledger.php:104
 #: include/ajax/ajax_ledger.php:126
+#: include/template/ledger_detail_bottom.php:42
 msgid "Information"
 msgstr "Informatie"
 
@@ -11218,6 +12033,7 @@ msgstr "Informatie"
 #: include/database.item.php:78 include/database.item.php:76
 #: include/database.item.php:75 include/database.item.php:74
 #: include/database.item.php:77 include/database.item.php:71
+#: include/database.item.php:70
 msgid "Information Banque"
 msgstr "Informatie Bank"
 
@@ -11228,6 +12044,7 @@ msgstr "Opgeslagen Informatie"
 
 #: include/database.item.php:88 include/database.item.php:91
 #: include/database.item.php:85 include/database.item.php:83
+#: include/database.item.php:84
 msgid ""
 "Information sur votre société : nom, adresse... utilisé lors de la "
 "génération de documents"
@@ -11235,7 +12052,8 @@ msgstr ""
 
 #: include/lib/user_menu.php:122 include/lib/user_menu.php:123
 #: include/lib/user_menu.php:142 include/lib/user_menu.php:80
-#: include/lib/user_menu.php:99
+#: include/lib/user_menu.php:99 include/lib/user_menu.php:79
+#: include/lib/user_menu.php:98
 #, fuzzy
 msgid "Information système"
 msgstr "Opgeslagen Informatie"
@@ -11253,11 +12071,14 @@ msgstr "Algemene informatie"
 #: html/install.php:235 include/upgrade-plugin.php:113
 #: include/lib/user_menu.php:121 html/install.php:238
 #: include/upgrade-plugin.php:125 include/lib/user_menu.php:78
+#: html/install.php:285 include/lib/user_menu.php:77
+#: include/upgrade-plugin.php:128
 #, fuzzy
 msgid "Installation"
 msgstr "Herstelt"
 
 #: include/lib/user_menu.php:121 include/lib/user_menu.php:78
+#: include/lib/user_menu.php:77
 #, fuzzy
 msgid "Installation Mise à jour du système et des bases de données"
 msgstr "Update"
@@ -11289,6 +12110,11 @@ msgstr ""
 msgid "Installé par défaut dans %s"
 msgstr ""
 
+#: include/ajax/ajax_anc_key_clean.php:65
+#, fuzzy
+msgid "Interdit"
+msgstr "Intern"
+
 #: include/class_acc_ledger.php:656 include/class_acc_ledger.php:655
 #: include/class_acc_ledger.php:659 include/class_acc_ledger.php:660
 #: include/class_acc_ledger.php:661 include/class/class_acc_ledger.php:661
@@ -11299,6 +12125,8 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:929
 #: include/class/acc_ledger_search.class.php:937
 #: include/class/acc_ledger_search.class.php:950
+#: include/class/acc_ledger_search.class.php:1039
+#: include/export/export_histo_csv.php:39
 msgid "Internal"
 msgstr "Intern"
 
@@ -11359,11 +12187,17 @@ msgstr "Intern"
 #: include/class/fiche.class.php:1475
 #: include/class/acc_ledger_history_generic.class.php:769
 #: include/class/acc_ledger_sold.class.php:1412
-#: include/class/acc_ledger_purchase.class.php:1838
+#: include/class/acc_ledger_purchase.class.php:1838 include/fiche.inc.php:542
+#: include/class/print_ledger_misc.class.php:44
+#: include/class/fiche.class.php:1502
+#: include/class/acc_ledger_purchase.class.php:1875
+#: include/class/acc_ledger_sold.class.php:1397
+#: include/class/acc_ledger_history_generic.class.php:770
+#: include/class/anc_grandlivre.class.php:232
 msgid "Interne"
 msgstr "Intern"
 
-#: include/ajax/ajax_periode.php:291
+#: include/ajax/ajax_periode.php:291 include/ajax/ajax_periode.php:261
 #, fuzzy
 msgid "Invalid command"
 msgstr "Bestelbon"
@@ -11376,7 +12210,7 @@ msgid "Invalide"
 msgstr "Bevestigen"
 
 #: html/ajax_misc.php:288 html/ajax_misc.php:290 html/ajax_misc.php:296
-#: html/ajax_misc.php:298
+#: html/ajax_misc.php:298 html/ajax_misc.php:313
 #, fuzzy
 msgid "Invalide type"
 msgstr "Bevestigen"
@@ -11403,7 +12237,7 @@ msgstr "Ongeldig jaar"
 #: include/class_html_input.php:332 include/lib/class_html_input.php:332
 #: include/lib/class_ibutton.php:63 include/compta_fin_rec.inc.php:221
 #: include/lib/class_html_input.php:333 include/lib/class_html_input.php:334
-#: include/lib/ibutton.class.php:63
+#: include/lib/ibutton.class.php:63 include/compta_fin_rec.inc.php:258
 msgid "Inverser la sélection"
 msgstr "Omgekeerde selectie"
 
@@ -11411,6 +12245,7 @@ msgstr "Omgekeerde selectie"
 #: include/class/acc_ledger_search.class.php:1070
 #: include/class/acc_ledger_search.class.php:1078
 #: include/class/acc_ledger_search.class.php:1091
+#: include/class/acc_ledger_search.class.php:1180
 #, fuzzy
 msgid "Inverser sel"
 msgstr "Omgekeerde selectie"
@@ -11424,7 +12259,7 @@ msgid "Item"
 msgstr "Item code"
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
-#: include/class/periode.class.php:651
+#: include/class/periode.class.php:651 include/class/periode.class.php:652
 msgid "Janvier"
 msgstr ""
 
@@ -11442,6 +12277,7 @@ msgstr "Javascript"
 #: include/template/detail-action.php:461
 #: include/template/detail-action.php:465
 #: include/template/detail-action.php:463
+#: include/template/detail-action.php:476
 msgid "Je ne peux pas ajouter de fichier"
 msgstr "EEN blad Toevoegen is niet mogelijk"
 
@@ -11493,11 +12329,74 @@ msgstr "Donderdag"
 #: include/class/acc_ledger_search.class.php:954
 #: include/export/export_printtva_csv.php:39
 #: include/export/export_printtva_csv.php:58
+#: unit-test/include/class/print_ledger_detail.classTest.php:75
+#: unit-test/include/class/print_ledger_fin.classTest.php:72
+#: unit-test/include/class/print_ledger_fin.classTest.php:83
+#: unit-test/include/class/print_ledger_fin.classTest.php:95
+#: unit-test/include/class/print_ledger_fin.classTest.php:106
+#: include/class/acc_ledger_search.class.php:1043
+#: include/class/operation_predef_mtable.class.php:51
+#: include/class/acc_ledger_purchase.class.php:1433
+#: include/class/acc_ledger_sold.class.php:703
+#: include/export/export_printtva_csv.php:51
+#: include/export/export_printtva_csv.php:70
+#: include/export/export_ledger_pdf.php:84
+#: include/export/export_histo_csv.php:40
+#: include/template/pre_operation_display.php:38
 msgid "Journal"
 msgstr "Journaal"
 
+# Controleren of dit hetzelfde betekent (beide boekhoudkundige termen)
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:78
+#: unit-test/include/class/print_ledger_simple.classTest.php:82
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:82
+#, fuzzy
+msgid "Journal Achat Payé"
+msgstr "Inkoopdagboeken"
+
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:107
+#: unit-test/include/class/print_ledger_simple.classTest.php:111
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:109
+#, fuzzy
+msgid "Journal Achat tous"
+msgstr "Handeling is niet gevonden"
+
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:92
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:141
+#: unit-test/include/class/print_ledger_simple.classTest.php:96
+#: unit-test/include/class/print_ledger_simple.classTest.php:145
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:95
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:141
+#, fuzzy
+msgid "Journal Non Payé"
+msgstr "Handeling is niet gevonden"
+
+#: unit-test/include/class/print_ledger_misc.classTest.php:84
+#, fuzzy
+msgid "Journal Opérations diverses"
+msgstr "Jounalen over Verschillende Handelingen"
+
+#: unit-test/include/class/print_ledger_misc.classTest.php:73
+#, fuzzy
+msgid "Journal Opérations diverses "
+msgstr "Jounalen over Verschillende Handelingen"
+
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:127
+#: unit-test/include/class/print_ledger_simple.classTest.php:131
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:128
+#, fuzzy
+msgid "Journal Vente Payé"
+msgstr "Inloggen bestaat niet"
+
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:156
+#: unit-test/include/class/print_ledger_simple.classTest.php:160
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:155
+#, fuzzy
+msgid "Journal Vente tous"
+msgstr "Handeling is niet gevonden"
+
 #: include/template/param_jrn.php:125 include/template/param_jrn.php:127
-#: include/template/param_jrn.php:171
+#: include/template/param_jrn.php:171 include/template/param_jrn.php:172
 #, fuzzy
 msgid "Journal actif"
 msgstr "Totale activa"
@@ -11523,6 +12422,7 @@ msgstr "Financiële journalen"
 #: include/class/acc_ledger.class.php:2871
 #: include/class/acc_ledger.class.php:2880
 #: include/class/acc_ledger.class.php:2919
+#: include/class/acc_ledger.class.php:2943
 #, fuzzy
 msgid "Journal incorrect"
 msgstr "Fout bedrag"
@@ -11535,6 +12435,7 @@ msgstr "Onbestaand dagboek"
 #: include/ext/import_account/include/class_impacc_export.php:104
 #: include/ext/import_account/include/impacc_export.class.php:104
 #: include/class/acc_ledger.class.php:2938
+#: include/class/acc_ledger.class.php:2962
 #, fuzzy
 msgid "Journal invalide"
 msgstr "Journaal"
@@ -11557,6 +12458,7 @@ msgstr "Financiële journalen"
 #: include/class/acc_ledger.class.php:2205
 #: include/class/acc_ledger.class.php:2214
 #: include/class/acc_ledger.class.php:2230
+#: include/class/acc_ledger.class.php:2249
 msgid "Journal n'existe pas"
 msgstr "Inloggen bestaat niet"
 
@@ -11575,9 +12477,14 @@ msgstr "Handeling is niet gevonden"
 #: include/param_sec.inc.php:223 include/class/acc_ledger_search.class.php:1065
 #: include/class/acc_ledger_search.class.php:1073
 #: include/class/acc_ledger_search.class.php:1086
+#: include/class/acc_ledger_search.class.php:1175 include/param_sec.inc.php:228
 msgid "Journaux"
 msgstr "Dagboeken"
 
+#: include/lib/message_javascript.php:108
+msgid "Journaux Achat ou vente en mode simple, TVA ou détaillé"
+msgstr ""
+
 #: include/class_acc_ledger.php:3380 include/class/class_acc_ledger.php:3380
 #: include/class/class_acc_ledger.php:3379
 #: include/class/class_acc_ledger.php:3384
@@ -11586,6 +12493,7 @@ msgstr "Dagboeken"
 #: include/class/acc_ledger.class.php:2111
 #: include/class/acc_ledger.class.php:2120
 #: include/class/acc_ledger.class.php:2136
+#: include/class/acc_ledger.class.php:2155
 #, fuzzy
 msgid "Journaux Financier"
 msgstr "Financiële journalen"
@@ -11598,6 +12506,7 @@ msgstr "Financiële journalen"
 #: include/class/acc_ledger.class.php:2112
 #: include/class/acc_ledger.class.php:2121
 #: include/class/acc_ledger.class.php:2137
+#: include/class/acc_ledger.class.php:2156
 #, fuzzy
 msgid "Journaux d'Opérations diverses"
 msgstr "Jounalen over Verschillende Handelingen"
@@ -11611,6 +12520,7 @@ msgstr "Jounalen over Verschillende Handelingen"
 #: include/class/acc_ledger.class.php:2110
 #: include/class/acc_ledger.class.php:2119
 #: include/class/acc_ledger.class.php:2135
+#: include/class/acc_ledger.class.php:2154
 #, fuzzy
 msgid "Journaux d'achat"
 msgstr "Inkoopdagboeken"
@@ -11627,17 +12537,18 @@ msgstr "Inkoopdagboeken"
 #: include/class/acc_ledger.class.php:2109
 #: include/class/acc_ledger.class.php:2118
 #: include/class/acc_ledger.class.php:2134
+#: include/class/acc_ledger.class.php:2153
 msgid "Journaux de vente"
 msgstr "Geschiedenis verkopen "
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
-#: include/class/periode.class.php:652
+#: include/class/periode.class.php:652 include/class/periode.class.php:653
 #, fuzzy
 msgid "Juillet"
 msgstr "City"
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
-#: include/class/periode.class.php:652
+#: include/class/periode.class.php:652 include/class/periode.class.php:653
 msgid "Juin"
 msgstr ""
 
@@ -11671,10 +12582,14 @@ msgid "L'extension est installée, pourriez-vous en vérifier le paramètrage ?"
 msgstr "De extensie is geïnstalleerd, kunt u de instellingen te controleren?"
 
 #: include/param_sec.inc.php:242 include/param_sec.inc.php:176
-#: include/param_sec.inc.php:182
+#: include/param_sec.inc.php:182 include/param_sec.inc.php:187
 msgid "L'utilisateur n'a pas accès à ce dossier"
 msgstr ""
 
+#: include/class/html_input_noalyss.class.php:46
+msgid "LAD46 Erreur type"
+msgstr ""
+
 #: html/admin/setup.php:459
 msgid "La base de donn&eacute;es est bien configur&eacute;e "
 msgstr ""
@@ -11690,7 +12605,7 @@ msgstr ""
 
 #: html/install.php:605 html/install.php:621 html/install.php:613
 #: html/install.php:619 html/install.php:581 html/install.php:571
-#: html/install.php:577 html/install.php:580
+#: html/install.php:577 html/install.php:580 html/install.php:630
 #, php-format
 msgid ""
 "La base de donnée %s est vide, \n"
@@ -11720,7 +12635,7 @@ msgstr ""
 #: html/admin/setup.php:459 html/install.php:523 html/install.php:522
 #: html/install.php:520 html/install.php:526 html/install.php:518
 #: html/install.php:524 html/install.php:486 html/install.php:461
-#: html/install.php:467 html/install.php:470
+#: html/install.php:467 html/install.php:470 html/install.php:519
 #, fuzzy
 msgid "La base de données est bien configurée "
 msgstr "UW datagegevens is niet van de laatste versie"
@@ -11798,6 +12713,13 @@ msgstr "De datum is ongeldig, formaat is dd.mm.yyyy"
 #: include/class/acc_ledger_sold.class.php:210
 #: include/class/acc_ledger_purchase.class.php:200
 #: include/class/acc_ledger_purchase.class.php:225
+#: include/class/acc_ledger_purchase.class.php:132
+#: include/class/acc_ledger_purchase.class.php:157
+#: include/class/acc_ledger_purchase.class.php:176
+#: include/class/acc_ledger_purchase.class.php:182
+#: include/class/acc_ledger_purchase.class.php:187
+#: include/class/acc_ledger_purchase.class.php:202
+#: include/class/acc_ledger_purchase.class.php:227
 msgid "La fiche "
 msgstr "Het blad"
 
@@ -11822,6 +12744,8 @@ msgstr "Het blad"
 #: include/class/acc_ledger.class.php:1252
 #: include/class/acc_ledger.class.php:1125
 #: include/class/acc_ledger.class.php:1268
+#: include/class/acc_ledger.class.php:1121
+#: include/class/acc_ledger.class.php:1264
 #, php-format
 msgid "La fiche %s n'a pas de poste comptable"
 msgstr "De% s-plug heeft geen financieel administratieve post"
@@ -11837,12 +12761,27 @@ msgid ""
 "le numéro"
 msgstr "Dagboek van nummering hängt"
 
+#: include/param_sec.inc.php:327
+msgid ""
+"La sécurité sur les actions permet de limiter ce que l'utilisateur peut "
+"faire, si  elle n'est pas active l'utilisateur a donc accès à toutes ces "
+"actions"
+msgstr ""
+
+#: include/param_sec.inc.php:253
+msgid ""
+"La sécurité sur les journaux, permet de limiter l'accès de l'utilisateur aux "
+"journaux, si cette  sécurité n'est pas activée , l'utilisateur a accès à "
+"tous les journaux en lecture et écriture"
+msgstr ""
+
 #: include/class_fiche_def.php:453 include/ajax_plugin_detail.php:35
 #: include/class_fiche_def.php:436 include/class_fiche_def.php:442
 #: include/class_fiche_def.php:452 include/ajax/ajax_plugin_detail.php:35
 #: include/class/class_fiche_def.php:452
 #: include/class/anc_account_table.class.php:48
 #: include/class/fiche_def.class.php:453
+#: include/class/document_state_mtable.php:43
 msgid "Label"
 msgstr "Etiket"
 
@@ -11869,7 +12808,7 @@ msgstr ""
 
 #: html/admin/setup.php:76 html/admin/setup.php:79 html/admin/setup.php:130
 #: html/install.php:132 html/install.php:131 html/install.php:137
-#: html/install.php:144
+#: html/install.php:144 html/install.php:157
 msgid "Le chemin vers le repertoire contenant psql, pg_dump..."
 msgstr ""
 
@@ -11916,6 +12855,17 @@ msgstr "De quick ratio is een verhouding die op uw homepage verschijnt"
 msgid "Le modèle %s est effacé"
 msgstr "Lege regels worden gewist"
 
+#: html/install.php:226
+#, fuzzy
+msgid "Le mot de passe du super admin et le login ne peuvent être vides"
+msgstr "De naam mag niet leeg zijn"
+
+#: html/install.php:243
+msgid ""
+"Le mot de passe du super admin et le superadmin ne peut pas contenir des "
+"guillemets ou espaces, ni @mobile"
+msgstr ""
+
 #: include/user.inc.php:98 include/user.inc.php:99 include/user.inc.php:101
 #, fuzzy
 msgid "Le mot de passe ne peut être vide"
@@ -11923,13 +12873,14 @@ msgstr "De naam mag niet leeg zijn"
 
 #: include/database.item.php:99 include/database.item.php:102
 #: include/database.item.php:96 include/database.item.php:94
+#: include/database.item.php:95
 msgid ""
 "Le navigateur vous présente une liste de menu auquel vous avez accès et vous "
 "permet d'accèder plus rapidement au menu que vous souhaitez"
 msgstr ""
 
 #: include/lib/icard.class.php:222 include/lib/icard.class.php:223
-#: include/lib/icard.class.php:224
+#: include/lib/icard.class.php:224 include/lib/icard.class.php:225
 #, fuzzy
 msgid "Le nom d une icard doit être donne"
 msgstr "De naam mag niet leeg zijn"
@@ -11974,7 +12925,7 @@ msgstr "EEN Naam bij post are Moeder Verplicht"
 #: include/ajax/ajax_card.php:551 include/class/forecast.class.php:70
 #: include/ajax/ajax_card.php:555
 #: include/class/template_card_category.class.php:73
-#: include/ajax/ajax_card.php:574
+#: include/ajax/ajax_card.php:574 include/ajax/ajax_card.php:650
 msgid "Le nom ne peut pas être vide"
 msgstr "De Naam mag are niet leeg"
 
@@ -12010,6 +12961,7 @@ msgstr "Van rekening"
 
 #: include/class/acc_ledger.class.php:1124
 #: include/class/acc_ledger.class.php:1140
+#: include/class/acc_ledger.class.php:1136
 #, fuzzy, php-format
 msgid "Le poste %s n'est pas dans ce journal"
 msgstr "wordt niet in this journaal"
@@ -12061,12 +13013,14 @@ msgstr ""
 #: include/export/export_security_pdf.php:137
 #: include/class/profile_menu.class.php:246
 #: include/class/profile_menu.class.php:271
+#: include/class/profile_menu.class.php:272
 msgid "Lecture"
 msgstr "Lezing"
 
 #: include/param_sec.inc.php:286 include/param_sec.inc.php:228
 #: include/param_sec.inc.php:278 include/param_sec.inc.php:259
-#: include/param_sec.inc.php:335
+#: include/param_sec.inc.php:335 include/param_sec.inc.php:270
+#: include/param_sec.inc.php:350
 #, fuzzy
 msgid "Lecture et écriture"
 msgstr "Schrijven opstellen"
@@ -12075,16 +13029,20 @@ msgstr "Schrijven opstellen"
 #: html/ajax_misc.php:405 html/ajax_misc.php:483
 #: include/ajax/ajax_display_letter.php:119
 #: include/ajax/ajax_display_letter.php:124
+#: include/ajax/ajax_display_letter.php:142
 msgid "Les 2"
 msgstr "2"
 
 #: include/class/tva_rate_mtable.class.php:207
 #: include/class/tva_rate_mtable.class.php:209
+#: include/class/tva_rate_mtable.class.php:224
+#: include/class/tva_rate_mtable.class.php:226
 #, fuzzy
 msgid "Les 2 postes comptables ne peuvent être nuls"
 msgstr "De naam mag niet leeg zijn"
 
 #: include/param_sec.inc.php:237 include/param_sec.inc.php:302
+#: include/param_sec.inc.php:240 include/param_sec.inc.php:313
 msgid "Les administrateurs NOALYSS ont toujours accès à tout"
 msgstr ""
 
@@ -12105,6 +13063,7 @@ msgstr "referentiepunt in formaat TT.MM.JJJJ"
 #: include/class/class_anc_grandlivre.php:146
 #: include/class/anc_grandlivre.class.php:167
 #: include/class/anc_grandlivre.class.php:168
+#: include/class/anc_grandlivre.class.php:180
 #, fuzzy
 msgid ""
 "Les extensions CONVERT_GIF_PDF et PDFTK pour convertir en pdf ne sont pas "
@@ -12132,7 +13091,7 @@ msgstr "De stekkers moet ten minste een naam hebben"
 #: html/admin/setup.php:193 html/admin/setup.php:211 html/admin/setup.php:213
 #: html/install.php:255 html/install.php:254 html/install.php:252
 #: html/install.php:257 html/install.php:263 html/install.php:214
-#: html/install.php:221 html/install.php:224
+#: html/install.php:221 html/install.php:224 html/install.php:271
 msgid "Les informations sont sauv&eacute;es vous pouvez continuer"
 msgstr ""
 
@@ -12167,6 +13126,7 @@ msgstr ""
 #: include/class/class_user.php:1212 include/class/class_user.php:1200
 #: include/class/class_user.php:1238 include/class/class_user.php:1236
 #: include/class/user.class.php:1236 include/class/user.class.php:1261
+#: include/class/user.class.php:1284
 msgid "Les mots de passe ne correspondent pas. Mot de passe inchangé"
 msgstr "Wachtwoorden komen niet overeen. Wachtwoord ongewijzigd"
 
@@ -12223,7 +13183,7 @@ msgstr "Laten."
 #: include/export/export_fiche_balance_csv.php:161 include/fiche.inc.php:522
 #: include/export/export_fiche_detail_csv.php:80
 #: include/export/export_poste_detail_csv.php:91 include/fiche.inc.php:524
-#: include/fiche.inc.php:533
+#: include/fiche.inc.php:533 include/fiche.inc.php:546
 msgid "Let."
 msgstr "Laten."
 
@@ -12239,7 +13199,8 @@ msgstr "Laten."
 #: include/export/export_gl_csv.php:90 include/template/letter_prop.php:65
 #: include/category_card.inc.php:79 include/export/export_gl_csv.php:96
 #: include/database.item.php:74 include/ajax/ajax_display_letter.php:49
-#: include/category_card.inc.php:81
+#: include/category_card.inc.php:81 include/ajax/ajax_display_letter.php:63
+#: include/database.item.php:73
 msgid "Lettrage"
 msgstr "Belettering"
 
@@ -12267,11 +13228,12 @@ msgstr "Belettering Bericht"
 msgid "Lettrage par fiche"
 msgstr "Belettering vel"
 
-#: include/lettering.card.inc.php:50
+#: include/lettering.card.inc.php:50 include/lettering.card.inc.php:51
 msgid "Lettrage pour la fiche "
 msgstr "Belettering voor de goede orde"
 
 #: include/lettering.account.inc.php:47 include/lettering.account.inc.php:53
+#: include/lettering.account.inc.php:55
 msgid "Lettrage pour le poste comptable "
 msgstr "Belettering voor de boekhoudkundige positie"
 
@@ -12279,7 +13241,7 @@ msgstr "Belettering voor de boekhoudkundige positie"
 #: include/database.item.php:198 include/database.item.php:201
 #: include/database.item.php:176 include/database.item.php:177
 #: include/database.item.php:180 include/database.item.php:188
-#: include/database.item.php:193
+#: include/database.item.php:193 include/database.item.php:186
 msgid "Lettre de rappel"
 msgstr "Herinnering"
 
@@ -12466,7 +13428,22 @@ msgstr "smaad"
 #: include/class/acc_ledger.class.php:621
 #: include/class/acc_ledger.class.php:628
 #: include/class/acc_ledger.class.php:903
-#: include/class/acc_ledger_purchase.class.php:1836
+#: include/class/acc_ledger_purchase.class.php:1836 include/fiche.inc.php:416
+#: include/class/payment_method_mtable.class.php:39
+#: include/class/acc_ledger.class.php:869
+#: include/class/acc_ledger.class.php:891
+#: include/class/acc_ledger_purchase.class.php:1436
+#: include/class/acc_ledger_purchase.class.php:1873
+#: include/class/acc_ledger_sold.class.php:706
+#: include/class/acc_ledger_sold.class.php:1395
+#: include/class/pre_op_advanced.class.php:200
+#: include/class/print_ledger_detail_item.class.php:59
+#: include/class/acc_ledger_history_generic.class.php:774
+#: include/class/anc_grandlivre.class.php:228
+#: include/export/export_ledger_csv.php:149
+#: include/template/form_ledger_detail.php:59
+#: include/template/ledger_detail_bottom.php:95
+#: include/template/ledger_detail_bottom.php:384
 #, php-format
 msgid "Libellé"
 msgstr "Opstellen"
@@ -12494,6 +13471,8 @@ msgstr "Opstellen"
 #: include/class/acc_ledger_sold.class.php:945
 #: include/class/acc_ledger_purchase.class.php:1703
 #: include/class/acc_ledger_sold.class.php:947
+#: include/class/acc_ledger_purchase.class.php:1725
+#: include/class/acc_ledger_sold.class.php:951
 msgid "Libellé :"
 msgstr "Volgt:"
 
@@ -12513,7 +13492,7 @@ msgstr ""
 
 #: include/database.item.php:6 include/database.item.php:9
 #: include/database.item.php:11 include/database.item.php:14
-#: include/database.item.php:8
+#: include/database.item.php:8 include/database.item.php:7
 msgid "Lien entre comptabilité et Comptabilité analytique"
 msgstr "Verband tussen Boekhouding en Cost Accounting"
 
@@ -12576,7 +13555,7 @@ msgstr "Importlijst"
 #: include/database.item.php:120 include/database.item.php:123
 #: include/database.item.php:129 include/database.item.php:125
 #: include/database.item.php:124 include/database.item.php:128
-#: include/database.item.php:122
+#: include/database.item.php:122 include/database.item.php:121
 msgid "Liste Suivi"
 msgstr "Tracking lijst"
 
@@ -12600,6 +13579,7 @@ msgstr "Lijst met contacten"
 
 #: include/database.item.php:125 include/database.item.php:128
 #: include/database.item.php:122 include/database.item.php:120
+#: include/database.item.php:121
 msgid ""
 "Liste de vos suivis, en fait de tous les documents, réunions ... dont vous "
 "avez besoin afin de suivre vos clients, fournisseurs ou administrations. Il "
@@ -12614,11 +13594,13 @@ msgstr "Lijst van aflosbare goederen "
 #: include/database.item.php:93 include/database.item.php:96
 #: include/database.item.php:101 include/database.item.php:98
 #: include/database.item.php:97 include/database.item.php:95
+#: include/database.item.php:94
 msgid "Liste des changements manuels des stocks"
 msgstr "Lijst van boeken stock veranderingen"
 
 #: include/database.item.php:98 include/database.item.php:101
 #: include/database.item.php:95 include/database.item.php:93
+#: include/database.item.php:94
 msgid ""
 "Liste des changements manuels des stocks, inventaire, transfert de "
 "marchandises entre dépôts..."
@@ -12652,6 +13634,7 @@ msgstr "Retail operatie"
 #: include/ajax/ajax_search_operation.php:119
 #: include/ajax/ajax_search_operation.php:122
 #: include/ajax/ajax_search_operation.php:124
+#: include/ajax/ajax_search_operation.php:129
 #, fuzzy
 msgid "Liste limitée à "
 msgstr "Beperkt tot 12 resultaten"
@@ -12726,7 +13709,7 @@ msgid "Lundi"
 msgstr "Maandag"
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
-#: include/class/periode.class.php:652
+#: include/class/periode.class.php:652 include/class/periode.class.php:653
 #, fuzzy
 msgid "Mai"
 msgstr "Dinsdag"
@@ -12743,12 +13726,14 @@ msgstr "Gemachtigde"
 #: include/class_extension.php:247 include/class_extension.php:262
 #: include/class/class_extension.php:262 include/class/class_extension.php:270
 #: include/class/extension.class.php:270 include/class/extension.class.php:302
+#: include/class/extension.class.php:308
 msgid "Manque auteur"
 msgstr ""
 
 #: include/class_extension.php:246 include/class_extension.php:261
 #: include/class/class_extension.php:261 include/class/class_extension.php:269
 #: include/class/extension.class.php:269 include/class/extension.class.php:300
+#: include/class/extension.class.php:306
 #, fuzzy
 msgid "Manque code"
 msgstr "Qcode"
@@ -12756,6 +13741,7 @@ msgstr "Qcode"
 #: include/class_extension.php:245 include/class_extension.php:260
 #: include/class/class_extension.php:260 include/class/class_extension.php:268
 #: include/class/extension.class.php:268 include/class/extension.class.php:298
+#: include/class/extension.class.php:304
 #, fuzzy
 msgid "Manque description"
 msgstr "Beschrijving"
@@ -12763,6 +13749,7 @@ msgstr "Beschrijving"
 #: include/class_extension.php:249 include/class_extension.php:264
 #: include/class/class_extension.php:264 include/class/class_extension.php:272
 #: include/class/extension.class.php:272 include/class/extension.class.php:306
+#: include/class/extension.class.php:312
 #, fuzzy
 msgid "Manque fichier à inclure"
 msgstr "Bestand te laden"
@@ -12770,6 +13757,7 @@ msgstr "Bestand te laden"
 #: include/class_extension.php:244 include/class_extension.php:259
 #: include/class/class_extension.php:259 include/class/class_extension.php:267
 #: include/class/extension.class.php:267 include/class/extension.class.php:296
+#: include/class/extension.class.php:302
 #, fuzzy
 msgid "Manque nom"
 msgstr "Bank"
@@ -12777,6 +13765,7 @@ msgstr "Bank"
 #: include/class_extension.php:239 include/class_extension.php:254
 #: include/class/class_extension.php:254 include/class/class_extension.php:262
 #: include/class/extension.class.php:262 include/class/extension.class.php:290
+#: include/class/extension.class.php:296
 #, fuzzy
 msgid "Manque plugin"
 msgstr "Deze plug-in toevoegen"
@@ -12784,6 +13773,7 @@ msgstr "Deze plug-in toevoegen"
 #: include/class_extension.php:248 include/class_extension.php:263
 #: include/class/class_extension.php:263 include/class/class_extension.php:271
 #: include/class/extension.class.php:271 include/class/extension.class.php:304
+#: include/class/extension.class.php:310
 msgid "Manque répertoire racine"
 msgstr ""
 
@@ -12806,7 +13796,7 @@ msgid "Marquer pour suppression"
 msgstr "Print menu"
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
-#: include/class/periode.class.php:651
+#: include/class/periode.class.php:651 include/class/periode.class.php:652
 msgid "Mars"
 msgstr ""
 
@@ -12835,6 +13825,7 @@ msgstr "Materiaaldemping"
 #: html/ajax_misc.php:497 html/ajax_misc.php:575
 #: include/ajax/ajax_display_letter.php:211
 #: include/ajax/ajax_display_letter.php:216
+#: include/ajax/ajax_display_letter.php:223
 msgid "Mauvais type objet"
 msgstr "Verkeerd type object"
 
@@ -12877,18 +13868,20 @@ msgstr "Menu"
 #: include/database.item.php:76 include/database.item.php:74
 #: include/database.item.php:73 include/database.item.php:72
 #: include/database.item.php:75 include/database.item.php:69
+#: include/database.item.php:68
 msgid "Menu "
 msgstr "Menu"
 
 #: include/database.item.php:119 include/database.item.php:122
 #: include/database.item.php:128 include/database.item.php:124
 #: include/database.item.php:123 include/database.item.php:127
-#: include/database.item.php:121
+#: include/database.item.php:121 include/database.item.php:120
 msgid "Menu Financier"
 msgstr "Financiële Menu"
 
 #: include/database.item.php:77 include/database.item.php:80
 #: include/database.item.php:74 include/database.item.php:72
+#: include/database.item.php:73
 #, fuzzy
 msgid "Menu Lettrage"
 msgstr "Belettering"
@@ -12897,6 +13890,7 @@ msgstr "Belettering"
 #: include/database.item.php:75 include/database.item.php:73
 #: include/database.item.php:72 include/database.item.php:71
 #: include/database.item.php:74 include/database.item.php:68
+#: include/database.item.php:67
 msgid "Menu achat"
 msgstr "Aankoop menu"
 
@@ -12907,11 +13901,13 @@ msgstr "Huidige menu"
 #: include/database.item.php:117 include/database.item.php:120
 #: include/database.item.php:126 include/database.item.php:123
 #: include/database.item.php:122 include/database.item.php:118
+#: include/database.item.php:119
 msgid "Menu avancé"
 msgstr "Menu Geavanceerd"
 
 #: include/database.item.php:80 include/database.item.php:83
 #: include/database.item.php:77 include/database.item.php:75
+#: include/database.item.php:76
 #, fuzzy
 msgid "Menu de différents paramètres"
 msgstr "Module instellen"
@@ -12920,6 +13916,7 @@ msgstr "Module instellen"
 #: include/database.item.php:76 include/database.item.php:74
 #: include/database.item.php:73 include/database.item.php:72
 #: include/database.item.php:75 include/database.item.php:69
+#: include/database.item.php:68
 msgid "Menu et profil"
 msgstr "Menu en het profiel"
 
@@ -12927,12 +13924,19 @@ msgstr "Menu en het profiel"
 #: include/database.item.php:77 include/database.item.php:75
 #: include/database.item.php:74 include/database.item.php:73
 #: include/database.item.php:76 include/database.item.php:70
+#: include/database.item.php:69
 msgid "Menu impression"
 msgstr "Print menu"
 
+#: include/class/acc_operation.class.php:747
+#, fuzzy
+msgid "Menu invalide"
+msgstr "Ongeldige code"
+
 #: include/database.item.php:111 include/database.item.php:114
 #: include/database.item.php:120 include/database.item.php:117
 #: include/database.item.php:116 include/database.item.php:112
+#: include/database.item.php:113
 msgid "Menu opérations diverses"
 msgstr "Menu verschillende bewerkingen"
 
@@ -12943,31 +13947,34 @@ msgstr "Menu verschillende bewerkingen"
 #: include/database.item.php:130 include/ajax/ajax_add_menu.php:156
 #: include/ajax/ajax_get_menu_detail.php:71 include/ajax/ajax_add_menu.php:157
 #: include/database.item.php:134 include/ajax/ajax_add_menu.php:165
-#: include/database.item.php:128
+#: include/database.item.php:128 include/database.item.php:127
 msgid "Menu par défaut"
 msgstr "Standaardmenu"
 
 #: include/database.item.php:123 include/database.item.php:126
 #: include/database.item.php:120 include/database.item.php:118
+#: include/database.item.php:119
 msgid ""
 "Menu regroupant la création de rapport, la vérification de la comptabilité..."
 msgstr ""
 
 #: include/database.item.php:19 include/database.item.php:22
 #: include/database.item.php:51 include/database.item.php:49
-#: include/database.item.php:62
+#: include/database.item.php:62 include/database.item.php:61
 msgid "Menu regroupant les plugins"
 msgstr ""
 
 #: include/database.item.php:94 include/database.item.php:97
 #: include/database.item.php:102 include/database.item.php:99
 #: include/database.item.php:98 include/database.item.php:96
+#: include/database.item.php:95
 msgid "Menu simplifié pour retrouver rapidement un menu"
 msgstr "Vereenvoudigd menu om een ​​menu snel te lokaliseren"
 
 #: include/database.item.php:113 include/database.item.php:116
 #: include/database.item.php:122 include/database.item.php:119
 #: include/database.item.php:118 include/database.item.php:114
+#: include/database.item.php:115
 msgid "Menu ventes et recettes"
 msgstr "Menu Winsten"
 
@@ -12988,13 +13995,13 @@ msgstr "Woensdag"
 #: include/ext/invoicing/include/template/recorded_message_display.php:27
 #: include/compta_ach.inc.php:111 include/compta_ven.inc.php:118
 #: include/operation_ods_confirm.inc.php:68 include/compta_ven.inc.php:116
-#: include/compta_ach.inc.php:109
+#: include/compta_ach.inc.php:109 include/compta_ach.inc.php:108
 msgid "Message"
 msgstr "Bericht"
 
 #: include/compta_ach.inc.php:109 include/compta_ven.inc.php:116
 #: include/operation_ods_confirm.inc.php:67 include/compta_ven.inc.php:114
-#: include/compta_ach.inc.php:107
+#: include/compta_ach.inc.php:107 include/compta_ach.inc.php:106
 #, fuzzy
 msgid "Message extourne"
 msgstr "Bericht"
@@ -13005,6 +14012,7 @@ msgid "Met à jour toutes les dossiers et modèles"
 msgstr "Update"
 
 #: include/export/export_ledger_csv.php:143
+#: include/export/export_ledger_csv.php:148
 #, fuzzy
 msgid "Methode paiement"
 msgstr "Betaling"
@@ -13031,6 +14039,8 @@ msgstr ""
 #: include/ajax/ajax_search_operation.php:132
 #: include/ajax/ajax_search_operation.php:129
 #: include/ajax/ajax_search_operation.php:134
+#: include/ajax/ajax_search_operation.php:135
+#: include/ajax/ajax_search_operation.php:140
 msgid "Mettre à jour"
 msgstr "Up-to-date brengen"
 
@@ -13047,7 +14057,7 @@ msgid "Mini-Rapport : "
 msgstr "Mini-Report:"
 
 #: include/template/param_jrn.php:68 include/template/param_jrn.php:75
-#: include/template/param_jrn.php:119
+#: include/template/param_jrn.php:119 include/template/param_jrn.php:120
 #, fuzzy
 msgid "Minimum de lignes à afficher"
 msgstr "Geen bestand"
@@ -13060,7 +14070,7 @@ msgstr "Bijwerken"
 #: html/admin/setup.php:528 html/install.php:592 html/install.php:591
 #: html/install.php:589 html/install.php:602 html/install.php:594
 #: html/install.php:600 html/install.php:562 html/install.php:552
-#: html/install.php:558 html/install.php:561
+#: html/install.php:558 html/install.php:561 html/install.php:611
 #, fuzzy
 msgid "Mise  à jour dossier"
 msgstr "Bijwerken"
@@ -13100,19 +14110,21 @@ msgstr "OPSLAAN"
 #: include/ext/import_card/include/import_card.class.php:340
 #: include/upgrade-plugin.php:101 include/upgrade-template.php:39
 #: include/upgrade-plugin.php:113 include/upgrade-template.php:51
+#: include/upgrade-plugin.php:116
 msgid "Mise à jour"
 msgstr "Bijwerken"
 
 #: html/admin/setup.php:549 html/install.php:613 html/install.php:614
 #: html/install.php:621 html/install.php:637 html/install.php:629
 #: html/install.php:635 html/install.php:597 html/install.php:587
-#: html/install.php:594
+#: html/install.php:594 html/install.php:647
 #, fuzzy
 msgid "Mise à jour Repository"
 msgstr "OPSLAAN"
 
 #: include/upgrade.inc.php:50 include/upgrade.inc.php:45
 #: include/upgrade.inc.php:46 include/class/dossier.class.php:344
+#: include/class/dossier.class.php:350
 #, fuzzy
 msgid "Mise à jour de la base de données principale"
 msgstr "Database"
@@ -13124,6 +14136,7 @@ msgstr "Update"
 
 #: include/upgrade.inc.php:65 include/upgrade.inc.php:60
 #: include/upgrade.inc.php:61 include/class/dossier.class.php:360
+#: include/class/dossier.class.php:366
 #, fuzzy
 msgid "Mise à jour dossiers"
 msgstr "Bijwerken"
@@ -13136,7 +14149,7 @@ msgstr "Werk plugin, kunt u de parameter instelling te controleren?"
 #: html/admin/setup.php:527 html/install.php:591 html/install.php:590
 #: html/install.php:588 html/install.php:601 html/install.php:593
 #: html/install.php:599 html/install.php:561 html/install.php:551
-#: html/install.php:557 html/install.php:560
+#: html/install.php:557 html/install.php:560 html/install.php:610
 #, fuzzy
 msgid "Mise à jour du systeme"
 msgstr "Update"
@@ -13149,6 +14162,7 @@ msgstr "Update"
 #: include/upgrade.inc.php:91 include/upgrade.inc.php:86
 #: include/upgrade.inc.php:87 include/upgrade.inc.php:88
 #: include/upgrade.inc.php:89 include/class/dossier.class.php:388
+#: include/class/dossier.class.php:394
 #, fuzzy
 msgid "Mise à jour modèles"
 msgstr "Kies een dossier"
@@ -13180,6 +14194,8 @@ msgstr "Kies een dossier"
 #: include/history_operation.inc.php:150 include/history_operation.inc.php:156
 #: include/class/acc_ledger_sold.class.php:1046
 #: include/class/acc_ledger_purchase.class.php:1793
+#: include/history_operation.inc.php:168
+#: include/class/acc_ledger_purchase.class.php:1817
 msgid "Mise à jour paiement"
 msgstr "OPSLAAN"
 
@@ -13196,10 +14212,11 @@ msgstr ""
 #: html/admin/template_config_form.php:59
 #: include/template/template_config_form.php:63
 #: include/template/template_config_form.php:71
+#: include/template/template_config_form.php:81
 msgid "Mode Serveur mutualisé"
 msgstr ""
 
-#: include/lib/html_tab.class.php:99
+#: include/lib/html_tab.class.php:99 include/lib/html_tab.class.php:119
 #, fuzzy
 msgid "Mode invalide"
 msgstr "Ongeldige code"
@@ -13228,6 +14245,7 @@ msgstr "Verandering"
 #: include/database.item.php:92 include/database.item.php:95
 #: include/database.item.php:100 include/database.item.php:97
 #: include/database.item.php:96 include/database.item.php:94
+#: include/database.item.php:93
 msgid "Modification Stocks"
 msgstr "Veranderen Voorraden"
 
@@ -13247,17 +14265,19 @@ msgstr ""
 #: include/database.item.php:92 include/database.item.php:95
 #: include/database.item.php:100 include/database.item.php:97
 #: include/database.item.php:96 include/database.item.php:94
+#: include/database.item.php:93
 msgid "Modification des stocks (inventaire)"
 msgstr "Veranderen van voorraden (inventaris)"
 
 #: include/database.item.php:97 include/database.item.php:100
 #: include/database.item.php:94 include/database.item.php:92
+#: include/database.item.php:93
 #, fuzzy
 msgid "Modification des stocks, menu utilisé pour l'inventaire"
 msgstr "Veranderen van voorraden (inventaris)"
 
 #: include/ajax_mod_predf_op.php:32 include/ajax/ajax_mod_predf_op.php:32
-#: include/ajax/ajax_mod_predf_op.php:31
+#: include/ajax/ajax_mod_predf_op.php:31 include/ajax/ajax_mod_predf_op.php:44
 msgid "Modification du nom"
 msgstr "Naam veranderen"
 
@@ -13320,6 +14340,8 @@ msgstr "Verandering"
 #: include/class/anc_operation.class.php:318
 #: include/class/anc_operation.class.php:319
 #: include/lib/manage_table_sql.class.php:755
+#: include/class/document_type.class.php:77
+#: include/lib/manage_table_sql.class.php:807
 msgid "Modifier"
 msgstr "Veranderen"
 
@@ -13332,6 +14354,7 @@ msgstr "Deze plug-in veranderen "
 #: include/database.item.php:215 include/database.item.php:192
 #: include/database.item.php:193 include/database.item.php:196
 #: include/database.item.php:207 include/database.item.php:212
+#: include/database.item.php:202
 msgid "Modifier le type de document"
 msgstr "Wijzig het type document"
 
@@ -13360,12 +14383,14 @@ msgstr "Module"
 #: include/database.item.php:74 include/database.item.php:77
 #: include/database.item.php:82 include/database.item.php:80
 #: include/database.item.php:79 include/database.item.php:76
+#: include/database.item.php:75
 msgid "Module comptabilité"
 msgstr "Accounting Module"
 
 #: include/database.item.php:115 include/database.item.php:118
 #: include/database.item.php:124 include/database.item.php:121
 #: include/database.item.php:120 include/database.item.php:116
+#: include/database.item.php:117
 msgid "Module comptabilité analytique"
 msgstr "Cost Accounting Module"
 
@@ -13377,6 +14402,7 @@ msgstr "Tarief van de BTW"
 #: include/database.item.php:71 include/database.item.php:74
 #: include/database.item.php:14 include/database.item.php:76
 #: include/database.item.php:79 include/database.item.php:73
+#: include/database.item.php:72
 msgid "Module gestion"
 msgstr "Management Module"
 
@@ -13391,6 +14417,7 @@ msgstr "Management Module"
 #: include/lib/ac_common.php:881 include/class/extension.class.php:122
 #: include/lib/ac_common.php:893 include/class/extension.class.php:138
 #: include/lib/ac_common.php:895 include/lib/ac_common.php:911
+#: include/lib/ac_common.php:921
 msgid "Module inexistant"
 msgstr "Module bestaat niet"
 
@@ -13409,7 +14436,7 @@ msgid "Module paramètres"
 msgstr "Module instellen"
 
 # Je suppose que TKPDF est comme PDF?
-#: html/install.php:384 html/install.php:387
+#: html/install.php:384 html/install.php:387 html/install.php:436
 #, fuzzy
 msgid "Module php-pgsql n'est pas installé"
 msgstr "TKPDF is niet geïnstalleerd"
@@ -13422,6 +14449,7 @@ msgstr "TKPDF is niet geïnstalleerd"
 #: include/dossier.inc.php:353 include/compta_ach.inc.php:89
 #: include/compta_ach.inc.php:91 include/compta_ven.inc.php:98
 #: include/dossier.inc.php:358 include/upgrade.inc.php:36
+#: include/compta_ach.inc.php:88
 msgid "Modèle"
 msgstr "Model"
 
@@ -13430,6 +14458,7 @@ msgstr "Model"
 #: include/class/acc_ledger.class.php:798
 #: include/class/acc_ledger.class.php:803
 #: include/class/acc_ledger.class.php:819
+#: include/class/acc_ledger.class.php:807
 #, fuzzy
 msgid "Modèle d'opération"
 msgstr "Operatiemodel"
@@ -13443,6 +14472,8 @@ msgstr "Operatiemodel"
 #: include/class/pre_operation.class.php:249
 #: include/class/pre_operation.class.php:248
 #: include/class/pre_operation.class.php:250
+#: include/class/pre_operation.class.php:312
+#: include/class/pre_operation.class.php:315
 msgid "Modèle d'opérations"
 msgstr "Operatiemodel"
 
@@ -13454,6 +14485,7 @@ msgstr "Model van het document"
 #: include/upgrade.inc.php:106 include/upgrade.inc.php:101
 #: include/upgrade.inc.php:102 include/upgrade.inc.php:104
 #: include/upgrade.inc.php:105 include/class/dossier.class.php:404
+#: include/class/dossier.class.php:410
 #, fuzzy
 msgid "Modèle inexistant"
 msgstr "Module bestaat niet"
@@ -13475,6 +14507,7 @@ msgid "Modèle non trouvé"
 msgstr "Handeling is niet gevonden"
 
 #: include/template/form_ledger_detail.php:15
+#: include/template/form_ledger_detail.php:18
 #, fuzzy
 msgid "Modèle opération"
 msgstr "Operatiemodel"
@@ -13482,7 +14515,7 @@ msgstr "Operatiemodel"
 #: include/compta_ach.inc.php:84 include/compta_ach.inc.php:87
 #: include/compta_ven.inc.php:96 include/operation_ods_confirm.inc.php:51
 #: include/compta_ach.inc.php:89 include/compta_ach.inc.php:91
-#: include/compta_ven.inc.php:98
+#: include/compta_ven.inc.php:98 include/compta_ach.inc.php:88
 #, fuzzy
 msgid "Modèle à sauver"
 msgstr "Modellen"
@@ -13492,9 +14525,15 @@ msgstr "Modellen"
 #: include/modele.inc.php:274 include/lib/user_menu.php:119
 #: include/modele.inc.php:257 include/modele.inc.php:258
 #: include/lib/user_menu.php:76 include/modele.inc.php:259
+#: include/lib/user_menu.php:75
 msgid "Modèles"
 msgstr "Modellen"
 
+#: include/template/fiche_def_input.php:26
+#, fuzzy
+msgid "Modèles de catégorie"
+msgstr "Een categorie toevoegen"
+
 #: include/modele.inc.php:326 include/modele.inc.php:327
 msgid "Modèles disponibles dans le dépôt"
 msgstr ""
@@ -13511,6 +14550,7 @@ msgstr "Maand"
 
 #: include/class/periode.class.php:438 include/class/periode.class.php:440
 #: include/class/periode.class.php:442 include/class/periode.class.php:444
+#: include/class/periode.class.php:443 include/class/periode.class.php:445
 #, fuzzy
 msgid "Mois de début n'existe pas "
 msgstr "Dit plan bestaat niet"
@@ -13624,6 +14664,15 @@ msgstr "Dit plan bestaat niet"
 #: include/class/anc_listing.class.php:86 include/class/fiche.class.php:1398
 #: include/lib/ac_common.php:1215 include/fiche.inc.php:531
 #: include/class/fiche.class.php:1399 include/class/acc_ledger.class.php:904
+#: include/fiche.inc.php:544 include/class/anc_group_operation.class.php:137
+#: include/class/acc_ledger_search.class.php:738
+#: include/class/acc_ledger_search.class.php:1051
+#: include/class/acc_ledger.class.php:892
+#: include/class/print_ledger_misc.class.php:47
+#: include/class/fiche.class.php:1426
+#: include/class/acc_ledger_purchase.class.php:1463
+#: include/class/acc_ledger_sold.class.php:733
+#: include/class/pre_op_advanced.class.php:201 include/lib/ac_common.php:1225
 msgid "Montant"
 msgstr "Bedrag"
 
@@ -13652,6 +14701,10 @@ msgstr "Afgeschreven hoeveelheid"
 #: include/export/export_printtva_csv.php:64
 #: include/export/export_printtva_pdf.php:58
 #: include/export/export_printtva_pdf.php:213
+#: include/export/export_printtva_pdf.php:60
+#: include/export/export_printtva_pdf.php:217
+#: include/export/export_printtva_csv.php:56
+#: include/export/export_printtva_csv.php:76
 #, fuzzy
 msgid "Montant Autoliquidation"
 msgstr "Datum van de verrichting"
@@ -13664,6 +14717,10 @@ msgstr "Datum van de verrichting"
 #: include/export/export_printtva_csv.php:61
 #: include/export/export_printtva_pdf.php:57
 #: include/export/export_printtva_pdf.php:212
+#: include/export/export_printtva_pdf.php:59
+#: include/export/export_printtva_pdf.php:216
+#: include/export/export_printtva_csv.php:54
+#: include/export/export_printtva_csv.php:73
 #, fuzzy
 msgid "Montant HT"
 msgstr "BTW Bedrag Zonder"
@@ -13690,6 +14747,8 @@ msgstr "BTW Bedrag Zonder"
 #: include/class/acc_ledger_purchase.class.php:1446
 #: include/class/acc_ledger_sold.class.php:727
 #: include/class/acc_ledger_purchase.class.php:1449
+#: include/class/acc_ledger_purchase.class.php:1460
+#: include/class/acc_ledger_sold.class.php:730
 msgid "Montant HTVA"
 msgstr "BTW Bedrag Zonder"
 
@@ -13713,6 +14772,8 @@ msgstr "OOrspronkelijk bedrag"
 #: include/class/acc_ledger_purchase.class.php:1851
 #: include/export/export_printtva_csv.php:65
 #: include/class/acc_ledger_purchase.class.php:1857
+#: include/class/acc_ledger_purchase.class.php:1894
+#: include/export/export_printtva_csv.php:77
 msgid "Montant ND"
 msgstr "Niet terug te vorderen bedrag"
 
@@ -13720,6 +14781,7 @@ msgstr "Niet terug te vorderen bedrag"
 #: include/template/tax_summary_display.php:214
 #: include/template/tax_summary_display.php:306
 #: include/export/export_printtva_pdf.php:213
+#: include/export/export_printtva_pdf.php:217
 #, fuzzy
 msgid "Montant Non Déd"
 msgstr "Niet terug te vorderen bedrag"
@@ -13789,6 +14851,16 @@ msgstr "Niet terug te vorderen bedrag"
 #: include/export/export_printtva_pdf.php:212
 #: include/class/acc_ledger_sold.class.php:1427
 #: include/class/acc_ledger_purchase.class.php:1853
+#: include/class/acc_ledger_purchase.class.php:1459
+#: include/class/acc_ledger_purchase.class.php:1890
+#: include/class/acc_ledger_sold.class.php:729
+#: include/class/acc_ledger_sold.class.php:1412
+#: include/export/export_printtva_pdf.php:59
+#: include/export/export_printtva_pdf.php:216
+#: include/export/export_printtva_csv.php:55
+#: include/export/export_printtva_csv.php:75
+#: include/template/follow_up_detail_display.php:55
+#: include/template/newEmptyPHP_NOALYSS.php:40
 msgid "Montant TVA"
 msgstr "BTW Bedrag"
 
@@ -13807,6 +14879,7 @@ msgstr "BTW Bedrag"
 #: include/class/acc_ledger_purchase.class.php:1849
 #: include/class/acc_ledger_purchase.class.php:1852
 #: include/class/acc_ledger_purchase.class.php:1858
+#: include/class/acc_ledger_purchase.class.php:1895
 msgid "Montant TVA ND"
 msgstr "Bedrag niet terug te vorderen BTW"
 
@@ -13842,6 +14915,10 @@ msgstr "Foutief bedrag van de BTW"
 #: include/class/acc_ledger_purchase.class.php:1447
 #: include/class/acc_ledger_sold.class.php:728
 #: include/class/acc_ledger_purchase.class.php:1450
+#: include/class/acc_ledger_purchase.class.php:1461
+#: include/class/acc_ledger_sold.class.php:731
+#: include/template/follow_up_detail_display.php:56
+#: include/template/newEmptyPHP_NOALYSS.php:41
 msgid "Montant TVAC"
 msgstr "BTW Inbegrepen Bedrag"
 
@@ -13877,6 +14954,7 @@ msgstr "Bedrag kleiner dan of gelijk aan"
 #: include/database.item.php:179 include/database.item.php:138
 #: include/database.item.php:139 include/database.item.php:140
 #: include/database.item.php:145 include/database.item.php:150
+#: include/database.item.php:146
 msgid "Montant initial"
 msgstr "Oorspronkelijk bedrag"
 
@@ -13893,6 +14971,7 @@ msgstr "Oorspronkelijk bedrag"
 #: include/ext/amortis/include/am_card.class.php:279
 #: include/class/acc_ledger.class.php:1105
 #: include/class/acc_ledger.class.php:1121
+#: include/class/acc_ledger.class.php:1117
 msgid "Montant invalide"
 msgstr "Ongeldig bedrag"
 
@@ -13900,6 +14979,7 @@ msgstr "Ongeldig bedrag"
 #: html/ajax_misc.php:362 html/ajax_misc.php:440
 #: include/ajax/ajax_display_letter.php:76
 #: include/ajax/ajax_display_letter.php:81
+#: include/ajax/ajax_display_letter.php:96
 msgid "Montant max. "
 msgstr "Max bedrag."
 
@@ -13907,12 +14987,14 @@ msgstr "Max bedrag."
 #: html/ajax_misc.php:355 html/ajax_misc.php:433
 #: include/ajax/ajax_display_letter.php:69
 #: include/ajax/ajax_display_letter.php:74
+#: include/ajax/ajax_display_letter.php:89
 msgid "Montant min. "
 msgstr "Bedragen min."
 
 #: include/export/export_histo_csv.php:44
 #: include/export/export_histo_csv.php:45
 #: include/export/export_histo_csv.php:46
+#: include/export/export_histo_csv.php:49
 #, fuzzy
 msgid "Montant opération"
 msgstr "Datum van de verrichting"
@@ -13920,6 +15002,9 @@ msgstr "Datum van de verrichting"
 #: include/export/export_ledger_csv.php:142
 #: include/class/acc_ledger_history_purchase.class.php:279
 #: include/class/acc_ledger_history_sale.class.php:265
+#: include/class/acc_ledger_history_sale.class.php:275
+#: include/class/acc_ledger_history_purchase.class.php:291
+#: include/export/export_ledger_csv.php:147
 #, fuzzy
 msgid "Montant paiement"
 msgstr "Datum van de betaling"
@@ -13929,6 +15014,7 @@ msgid "Montant supérieur ou égal à"
 msgstr "Bedrag groter dan of gelijk aan"
 
 #: include/compta_fin_rec.inc.php:303 include/compta_fin_rec.inc.php:304
+#: include/compta_fin_rec.inc.php:345
 #, fuzzy
 msgid "Montant sélectionné"
 msgstr "Verwijder geselecteerde bladwijzers"
@@ -13967,7 +15053,7 @@ msgstr "Oplopen tot aankoop"
 msgid "Montrer articles"
 msgstr "Artikel toevoegen"
 
-#: include/periode.inc.php:88
+#: include/periode.inc.php:88 include/periode.inc.php:86
 #, fuzzy
 msgid "Montrer l'exercice"
 msgstr "Een andere oefening"
@@ -13990,10 +15076,21 @@ msgstr "Details Tonen"
 #: html/install.php:593 html/install.php:208 html/install.php:555
 #: include/user.inc.php:83 html/install.php:215 html/install.php:545
 #: html/install.php:551 html/install.php:218 html/install.php:554
+#: html/install.php:265 html/install.php:604
 #, fuzzy
 msgid "Mot de passe"
 msgstr "Onkostennota"
 
+#: include/template/template_config_form.php:65
+#, fuzzy
+msgid "Mot de passe administrateur de noalyss"
+msgstr "Beheerder"
+
+#: html/install.php:164
+msgid ""
+"Mot de passe administrateur, il peut être changé ensuite dans les préférences"
+msgstr ""
+
 #: html/admin/template_config_form.php:51
 #, fuzzy
 msgid "Mot de passe de l'utilisateur"
@@ -14006,12 +15103,13 @@ msgstr "Gebruiker toevoegen"
 
 #: html/admin/template_config_form.php:51
 #: include/template/template_config_form.php:51
+#: include/template/template_config_form.php:52
 #, fuzzy
 msgid "Mot de passe de l'utilisateur Postgresql"
 msgstr "Gebruiker toevoegen"
 
 #: html/admin/setup.php:132 html/install.php:134 html/install.php:133
-#: html/install.php:139 html/install.php:146
+#: html/install.php:139 html/install.php:146 html/install.php:159
 #, fuzzy
 msgid "Mot de passe de l'utilisateur de Postgresql"
 msgstr "Gebruiker toevoegen"
@@ -14034,7 +15132,7 @@ msgstr "Reden van de verandering"
 #: include/database.item.php:121 include/database.item.php:124
 #: include/database.item.php:130 include/database.item.php:126
 #: include/database.item.php:125 include/database.item.php:129
-#: include/database.item.php:123
+#: include/database.item.php:123 include/database.item.php:122
 msgid "Moyen de paiement"
 msgstr "Betaling"
 
@@ -14043,17 +15141,24 @@ msgstr "Betaling"
 #: include/template/action_display_short.php:58
 #: include/class/class_follow_up.php:262 include/class/follow_up.class.php:262
 #: include/template/action_display_short.php:59
-#: include/class/follow_up.class.php:263
+#: include/class/follow_up.class.php:263 include/class/follow_up.class.php:728
 msgid "Moyenne"
 msgstr ""
 
 #: include/upgrade-plugin.php:91 include/upgrade-plugin.php:103
+#: include/upgrade-plugin.php:106
 #, fuzzy
 msgid "MultiModule"
 msgstr "Module"
 
+#: include/template/action_document_type_mtable_input.php:116
+#, fuzzy
+msgid "Multiples"
+msgstr "Module"
+
 #: include/class/acc_ledger_history_purchase.class.php:278
 #: include/class/acc_ledger_history_sale.class.php:264
+#: include/class/acc_ledger_history_purchase.class.php:290
 #, fuzzy
 msgid "Méthode paiement"
 msgstr "Betaling"
@@ -14066,7 +15171,7 @@ msgstr ""
 #: include/database.item.php:102 include/ajax_navigator.php:23
 #: include/database.item.php:99 include/database.item.php:98
 #: include/ajax/ajax_navigator.php:23 include/database.item.php:96
-#: include/ajax/ajax_navigator.php:28
+#: include/ajax/ajax_navigator.php:28 include/database.item.php:95
 msgid "Navigateur"
 msgstr "Navigator"
 
@@ -14124,6 +15229,15 @@ msgstr ""
 msgid "Ne donner pas ce poste comptable si ce code n'est pas utilisé à l'achat"
 msgstr ""
 
+#: include/lib/message_javascript.php:78
+msgid ""
+"Ne donnez pas ce poste comptable si ce code n'est pas utilisé  à la vente"
+msgstr ""
+
+#: include/lib/message_javascript.php:77
+msgid "Ne donnez pas ce poste comptable si ce code n'est pas utilisé à l'achat"
+msgstr ""
+
 #: include/restore.inc.php:196 include/restore.inc.php:135
 #: include/restore.inc.php:197 include/restore.inc.php:198
 #: include/restore.inc.php:136 include/restore.inc.php:199
@@ -14148,6 +15262,7 @@ msgstr "Kan niet worden toegevoegd"
 #: include/class_document.php:199 include/class_document.php:200
 #: include/class/class_document.php:200 include/class/class_document.php:201
 #: include/class/class_document.php:207 include/class/document.class.php:207
+#: include/class/document.class.php:212
 #, fuzzy
 msgid "Ne peut pas créer le répertoire "
 msgstr "Kan niet worden omgezet in PDF"
@@ -14209,6 +15324,7 @@ msgstr ""
 #: include/ext/rapport_avance/include/rapav_declaration.class.php:361
 #: include/ext/rapport_avance/include/rapav_declaration.class.php:434
 #: include/class/document.class.php:311 include/class/document.class.php:285
+#: include/class/document.class.php:290
 msgid "Ne peut pas sauver "
 msgstr "Het kan-niet OPSLAAN"
 
@@ -14344,7 +15460,16 @@ msgstr "Geen handeling"
 #: include/class/acc_ledger_fin.class.php:754
 #: include/class/fiche.class.php:1780 include/class/fiche.class.php:1781
 #: include/modele.inc.php:248 include/modele.inc.php:359
-#: include/database.item.php:157
+#: include/database.item.php:157 include/class/acc_ledger_search.class.php:1193
+#: include/class/tag_group_mtable.class.php:40
+#: include/class/operation_predef_mtable.class.php:52
+#: include/class/fiche.class.php:1807
+#: include/class/card_attribut_mtable.class.php:39
+#: include/class/action_document_type_mtable.class.php:48
+#: include/class/anc_plan.class.php:138 include/class/anc_plan.class.php:154
+#: include/class/contact_option_ref_mtable.class.php:36
+#: include/class/user.class.php:991
+#: include/template/card_multiple_result.php:19 include/upgrade-plugin.php:62
 msgid "Nom"
 msgstr "Naam"
 
@@ -14379,12 +15504,15 @@ msgstr "Naam TVA"
 #: include/class/acc_ledger_purchase.class.php:1842
 #: include/class/acc_ledger_sold.class.php:1422
 #: include/class/acc_ledger_purchase.class.php:1848
+#: include/class/acc_ledger_purchase.class.php:1885
+#: include/class/acc_ledger_sold.class.php:1407
 msgid "Nom TVA"
 msgstr "Naam TVA"
 
 #: html/admin/template_config_form.php:64
 #: include/template/template_config_form.php:68
 #: include/template/template_config_form.php:76
+#: include/template/template_config_form.php:86
 #, fuzzy
 msgid "Nom base de donnée"
 msgstr "Database"
@@ -14444,6 +15572,7 @@ msgstr "Naam van de map"
 #: include/class/acc_ledger_search.class.php:259
 #: include/class/acc_ledger_search.class.php:246
 #: include/class/acc_ledger_search.class.php:248
+#: include/class/acc_ledger_search.class.php:262
 #, fuzzy
 msgid "Nom du filtre"
 msgstr "Naam fiche"
@@ -14457,6 +15586,16 @@ msgstr "Naam fiche"
 msgid "Nom du format"
 msgstr "Documentnaam"
 
+#: include/template/pre_operation_display.php:32
+#, fuzzy
+msgid "Nom du modèle"
+msgstr "Toevoeging van een menu"
+
+#: include/class/pre_operation.class.php:69
+#, fuzzy
+msgid "Nom du modèle "
+msgstr "Toevoeging van een menu"
+
 #: include/class/acc_report.class.php:115
 #, fuzzy
 msgid "Nom du rapport"
@@ -14488,6 +15627,8 @@ msgstr "Documentnaam"
 #: include/class/acc_ledger_purchase.class.php:1838
 #: include/class/acc_ledger_sold.class.php:1418
 #: include/class/acc_ledger_purchase.class.php:1844
+#: include/class/acc_ledger_purchase.class.php:1881
+#: include/class/acc_ledger_sold.class.php:1403
 msgid "Nom fiche"
 msgstr "Naam fiche"
 
@@ -14517,6 +15658,8 @@ msgstr "Naam fiche"
 #: include/class/acc_ledger_purchase.class.php:1840
 #: include/class/acc_ledger_sold.class.php:1420
 #: include/class/acc_ledger_purchase.class.php:1846
+#: include/class/acc_ledger_purchase.class.php:1883
+#: include/class/acc_ledger_sold.class.php:1405
 msgid "Nom fournisseur"
 msgstr "Naam leverancier"
 
@@ -14538,16 +15681,19 @@ msgid "Nom manquant"
 msgstr "Parameter"
 
 #: include/ajax/ajax_search_filter.php:73
+#: include/class/action_document_type_mtable.class.php:106
 #, fuzzy
 msgid "Nom ne peut être vide"
 msgstr "De naam mag niet leeg zijn"
 
 #: include/company.inc.php:97 include/company.inc.php:116
-#: include/company.inc.php:120
+#: include/company.inc.php:120 include/company.inc.php:128
 msgid "Nom société"
 msgstr "Maatschappij Naam"
 
 #: include/card_attr.inc.php:78 include/card_attr.inc.php:79
+#: include/class/card_attribut_mtable.class.php:53
+#: include/class/contact_option_ref_mtable.class.php:43
 msgid "Nombre"
 msgstr "Aantal"
 
@@ -14591,6 +15737,11 @@ msgstr "Aantal eenheid"
 msgid "Nombre de colonnes incorrect"
 msgstr "Aantal foute rijen"
 
+#: include/template/card_multiple_result.php:14
+#, fuzzy, php-format
+msgid "Nombre de fiches trouvées %d montrées %d"
+msgstr "Aantal foute rijen"
+
 #: include/class_acc_ledger.php:3406 include/class_acc_ledger.php:3476
 #: include/class_acc_ledger.php:3475 include/class_acc_ledger.php:3491
 #: include/class_acc_ledger.php:3508 include/class_acc_ledger.php:3535
@@ -14604,6 +15755,7 @@ msgstr "Aantal foute rijen"
 #: include/class/acc_ledger.class.php:2313
 #: include/class/acc_ledger.class.php:2322
 #: include/class/acc_ledger.class.php:2344
+#: include/class/acc_ledger.class.php:2368
 msgid "Nombre de ligne incorrect"
 msgstr "Aantal foute rijen"
 
@@ -14629,7 +15781,7 @@ msgid "Nombre de mois"
 msgstr "Aantal geregistreerde lijnen"
 
 #: include/class/periode.class.php:436 include/class/periode.class.php:438
-#: include/class/periode.class.php:440
+#: include/class/periode.class.php:440 include/class/periode.class.php:441
 msgid "Nombre de mois doit être compris entre 1 & 60 "
 msgstr ""
 
@@ -14639,7 +15791,7 @@ msgid "Nombre de mois invalide"
 msgstr "Aantal ongeldige annuïteiten"
 
 #: include/class/periode.class.php:434 include/class/periode.class.php:436
-#: include/class/periode.class.php:438
+#: include/class/periode.class.php:438 include/class/periode.class.php:439
 #, fuzzy
 msgid "Nombre de mois n'est pas un nombre"
 msgstr "tarief is geen getal"
@@ -14680,6 +15832,8 @@ msgstr "Aantal operaties %d"
 #: include/template/profile_menu_display_submenu.php:65
 #: include/user_detail.inc.php:158
 #: include/template/profile_menu_display_module.php:81
+#: include/class/tva_rate_mtable.class.php:56 include/company.inc.php:71
+#: include/company.inc.php:74 include/company.inc.php:112
 msgid "Non"
 msgstr "Geboren"
 
@@ -14711,6 +15865,7 @@ msgstr "Niet aftrekbaar"
 #: include/class/acc_ledger_purchase.class.php:1778
 #: include/class/acc_ledger_sold.class.php:1037
 #: include/class/acc_ledger_purchase.class.php:1784
+#: include/class/acc_ledger_purchase.class.php:1808
 msgid "Non Payée"
 msgstr "Niet Betaald &#39;"
 
@@ -14757,6 +15912,7 @@ msgstr ""
 
 # Je suppose que TKPDF est comme PDF?
 #: include/upgrade-plugin.php:112 include/upgrade-plugin.php:124
+#: include/upgrade-plugin.php:127
 #, fuzzy
 msgid "Non installée"
 msgstr "TKPDF is niet geïnstalleerd"
@@ -14769,9 +15925,15 @@ msgstr "TKPDF is niet geïnstalleerd"
 #: include/class/acc_ledger_search.class.php:860
 #: include/class/acc_ledger_search.class.php:868
 #: include/class/acc_ledger_search.class.php:881
+#: include/class/acc_ledger_search.class.php:970
 msgid "Non payé"
 msgstr "Niet betaald"
 
+#: include/class/acc_ledger_search.class.php:213
+#, fuzzy
+msgid "Non payées"
+msgstr "Niet betaald"
+
 #: include/ext/import_account/include/class_impacc_operation.php:47
 #: include/ext/import_account/include/class_impacc_operation.php:78
 #: include/ext/import_account/include/impacc_operation.class.php:47
@@ -14782,6 +15944,7 @@ msgstr "niet use of"
 
 #: include/ext/amortis/include/class_am_card.php:245 html/fid_card.php:169
 #: html/fid_card.php:170 html/fid_card.php:175 html/fid_card.php:174
+#: html/fid_card.php:176
 msgid "Non trouvé"
 msgstr "Niet gevonden"
 
@@ -14793,6 +15956,7 @@ msgstr "Niet gevonden"
 #: include/template/ledger_detail_bottom.php:291
 #: include/template/ledger_detail_bottom.php:292
 #: include/template/ledger_detail_bottom.php:289
+#: include/template/ledger_detail_bottom.php:307
 #, fuzzy
 msgid "Non utilisée"
 msgstr "niet use of"
@@ -14802,6 +15966,10 @@ msgstr "niet use of"
 msgid "Normal"
 msgstr ""
 
+#: include/class/document.class.php:1413 include/class/follow_up.class.php:270
+msgid "Normale"
+msgstr ""
+
 #: include/template/ledger_detail_ven.php:95
 #: include/template/ledger_detail_ven.php:101
 #: include/template/security_list_action.php:73
@@ -14819,10 +15987,13 @@ msgstr ""
 #: include/class/acc_ledger_history_sale.class.php:247
 #: include/class/acc_ledger_history_purchase.class.php:254
 #: include/class/acc_ledger_history_purchase.class.php:258
+#: include/class/acc_ledger_history_sale.class.php:257
+#: include/class/acc_ledger_history_purchase.class.php:269
+#: include/export/export_histo_csv.php:48
 msgid "Note"
 msgstr "Nota"
 
-#: include/database.item.php:236
+#: include/database.item.php:236 include/database.item.php:220
 #, fuzzy
 msgid "Note de crédit"
 msgstr "Saldo credit"
@@ -14831,7 +16002,7 @@ msgstr "Saldo credit"
 #: include/database.item.php:192 include/database.item.php:195
 #: include/database.item.php:193 include/database.item.php:181
 #: include/database.item.php:182 include/database.item.php:185
-#: include/database.item.php:198
+#: include/database.item.php:198 include/database.item.php:191
 msgid "Note de frais"
 msgstr "Onkostennota"
 
@@ -14845,6 +16016,7 @@ msgstr "Onkostennota"
 #: include/class/acc_ledger_search.class.php:940
 #: include/class/acc_ledger_search.class.php:948
 #: include/class/acc_ledger_search.class.php:961
+#: include/class/acc_ledger_search.class.php:1050
 msgid "Notes"
 msgstr "Notes"
 
@@ -14889,7 +16061,7 @@ msgstr "Nieuw menu"
 
 #: include/database.item.php:2 include/database.item.php:5
 #: include/database.item.php:7 include/database.item.php:10
-#: include/database.item.php:4
+#: include/database.item.php:4 include/database.item.php:3
 msgid "Nouvel achat ou dépense"
 msgstr "Nieuwe Aankopen van uitgave"
 
@@ -14922,6 +16094,7 @@ msgstr "Nieuwe bankafschrift"
 #: include/template/action_display_short.php:81
 #: include/lib/html_input.class.php:1103 include/lib/html_input.class.php:1104
 #: include/lib/html_input.class.php:1119 include/lib/html_input.class.php:1120
+#: include/lib/html_input.class.php:1153
 #, fuzzy
 msgid "Nouvel événement"
 msgstr "Voeg dit element toe"
@@ -14929,6 +16102,7 @@ msgstr "Voeg dit element toe"
 #: include/class_anc_key.php:335 include/class_anc_key.php:337
 #: include/class/class_anc_key.php:338 include/class/class_anc_key.php:339
 #: include/class/class_anc_key.php:340 include/class/anc_key.class.php:349
+#: include/class/anc_key.class.php:350
 msgid "Nouvelle clef"
 msgstr "Nieuwe sleutel"
 
@@ -14940,7 +16114,7 @@ msgstr "Nieuwe extensie"
 #: html/ajax_card.php:182 html/ajax_card.php:200 html/ajax_card.php:201
 #: include/ajax/ajax_card.php:181 include/ajax/ajax_card.php:182
 #: include/ajax/ajax_card.php:185 include/ajax/ajax_card.php:191
-#: include/ajax/ajax_card.php:192
+#: include/ajax/ajax_card.php:192 include/ajax/ajax_card.php:195
 msgid "Nouvelle fiche"
 msgstr "Nieuwe fiche"
 
@@ -14972,6 +16146,7 @@ msgstr "Nieuwe lijn"
 #: include/class/acc_ledger.class.php:2789
 #: include/class/acc_ledger.class.php:2798
 #: include/class/acc_ledger.class.php:2837
+#: include/class/acc_ledger.class.php:2861
 #, fuzzy
 msgid "Nouvelle opération"
 msgstr "Nieuwe verschillende bewerkingen"
@@ -14986,17 +16161,18 @@ msgstr "Nieuwe verschillende bewerkingen"
 
 #: include/database.item.php:9 include/database.item.php:12
 #: include/database.item.php:14 include/database.item.php:17
-#: include/database.item.php:11
+#: include/database.item.php:11 include/database.item.php:10
 msgid "Nouvelle vente ou recette"
 msgstr "Nieuwe omzet of inkomsten"
 
 #: include/upgrade-plugin.php:98 include/upgrade-plugin.php:110
+#: include/upgrade-plugin.php:113
 #, php-format
 msgid "Nouvelle version disponible %s , votre version %s"
 msgstr ""
 
 #: include/class/periode.class.php:649 include/class/periode.class.php:651
-#: include/class/periode.class.php:653
+#: include/class/periode.class.php:653 include/class/periode.class.php:654
 #, fuzzy
 msgid "Novembre"
 msgstr "Aantal"
@@ -15042,6 +16218,8 @@ msgstr "Num.interne"
 #: include/class/acc_ledger_purchase.class.php:1743
 #: include/class/acc_ledger_sold.class.php:1003
 #: include/class/acc_ledger_purchase.class.php:1749
+#: include/class/acc_ledger_purchase.class.php:1773
+#: include/class/acc_ledger_sold.class.php:1007
 msgid "Numero de bon de commande : "
 msgstr "Nummer van bestelbon"
 
@@ -15054,7 +16232,7 @@ msgid "Numero de client"
 msgstr "Aantal klanten"
 
 #: include/company.inc.php:105 include/company.inc.php:124
-#: include/company.inc.php:128
+#: include/company.inc.php:128 include/company.inc.php:136
 msgid "Numéro"
 msgstr "Nummer"
 
@@ -15105,6 +16283,12 @@ msgstr "Nummer"
 #: include/class/acc_ledger_sold.class.php:682
 #: include/class/acc_ledger_purchase.class.php:1395
 #: include/class/acc_ledger_purchase.class.php:1403
+#: include/class/acc_ledger_purchase.class.php:1406
+#: include/class/acc_ledger_purchase.class.php:1411
+#: include/class/acc_ledger_purchase.class.php:1414
+#: include/class/acc_ledger_sold.class.php:677
+#: include/class/acc_ledger_sold.class.php:685
+#: include/template/form_ledger_detail.php:51
 msgid "Numéro Pièce"
 msgstr "Referentie"
 
@@ -15125,7 +16309,7 @@ msgid "Numéro de TVA incorrect"
 msgstr "Ongeldig BTW nummer"
 
 #: include/company.inc.php:113 include/company.inc.php:132
-#: include/company.inc.php:136
+#: include/company.inc.php:136 include/company.inc.php:144
 msgid "Numéro de Tva"
 msgstr "BTW nummer"
 
@@ -15155,6 +16339,7 @@ msgstr "Verkeerd telefoonnummer"
 #: include/template/action_search.php:88 include/template/action_search.php:102
 #: include/template/action_search.php:139
 #: include/template/action_search.php:121
+#: include/template/action_search.php:122
 msgid "Numéro document"
 msgstr "Document nummer"
 
@@ -15174,6 +16359,7 @@ msgstr "Extract nummer"
 #: include/class/class_pdf_operation.php:76
 #: include/class/pdf_operation.class.php:76
 #: include/class/print_ledger_detail_item.class.php:58
+#: include/class/print_ledger_detail_item.class.php:57
 #, fuzzy
 msgid "Numéro interne"
 msgstr "Num.interne"
@@ -15205,6 +16391,8 @@ msgstr "Num.interne"
 #: include/class/acc_ledger_purchase.class.php:1825
 #: include/class/acc_ledger_sold.class.php:1405
 #: include/class/acc_ledger_purchase.class.php:1831
+#: include/class/acc_ledger_purchase.class.php:1868
+#: include/class/acc_ledger_sold.class.php:1390
 msgid "Numéro opération"
 msgstr "Operatienummer"
 
@@ -15229,6 +16417,8 @@ msgstr "Nr."
 #: include/export/export_ledger_csv.php:212
 #: include/export/export_ledger_csv.php:220
 #: include/class/acc_ledger_history_generic.class.php:768
+#: include/class/acc_ledger_history_generic.class.php:769
+#: include/export/export_ledger_csv.php:228
 #, fuzzy
 msgid "N° Pièce"
 msgstr "Stuk nr."
@@ -15267,6 +16457,8 @@ msgstr "Document nr."
 #: include/class/acc_ledger_purchase.class.php:1837
 #: include/class/acc_ledger_sold.class.php:1417
 #: include/class/acc_ledger_purchase.class.php:1843
+#: include/class/acc_ledger_purchase.class.php:1880
+#: include/class/acc_ledger_sold.class.php:1402
 msgid "N° fiche"
 msgstr "Fiche nr."
 
@@ -15296,6 +16488,8 @@ msgstr "Fiche nr."
 #: include/class/acc_ledger_purchase.class.php:1839
 #: include/class/acc_ledger_sold.class.php:1419
 #: include/class/acc_ledger_purchase.class.php:1845
+#: include/class/acc_ledger_purchase.class.php:1882
+#: include/class/acc_ledger_sold.class.php:1404
 msgid "N° fiche fournisseur"
 msgstr "Nr. van Leveranciersfiche"
 
@@ -15322,7 +16516,7 @@ msgstr "Geen ruimte"
 
 #: include/template/param_jrn.php:110 include/template/param_jrn.php:108
 #: include/template/param_jrn.php:115 include/template/param_jrn.php:117
-#: include/template/param_jrn.php:161
+#: include/template/param_jrn.php:161 include/template/param_jrn.php:162
 msgid "N° pièce justificative"
 msgstr "Nummer"
 
@@ -15330,12 +16524,13 @@ msgstr "Nummer"
 #: html/test_class.php:221 include/ajax_preference.php:175
 #: include/ajax/ajax_preference.php:175 include/ajax/ajax_preference.php:254
 #: dev/test/test_class.php:217 include/ajax/ajax_preference.php:265
+#: dev-2/test/test_class.php:217
 msgid "Néerlandais"
 msgstr "Nederlands"
 
 #: include/database.item.php:12 include/database.item.php:15
 #: include/database.item.php:17 include/database.item.php:20
-#: include/database.item.php:14
+#: include/database.item.php:14 include/database.item.php:13
 msgid "OD analytique"
 msgstr "Analytische OD"
 
@@ -15345,6 +16540,7 @@ msgstr "Analytische OD"
 #: include/lib/manage_table_sql.class.php:1025
 #: include/lib/manage_table_sql.class.php:1022
 #: include/lib/manage_table_sql.class.php:1066
+#: include/lib/manage_table_sql.class.php:1122
 msgid "OK"
 msgstr ""
 
@@ -15359,6 +16555,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1342
 #: include/class/acc_ledger.class.php:1351
 #: include/class/acc_ledger.class.php:1367
+#: include/class/acc_ledger.class.php:1365
 msgid "OPERATION ANNULEE "
 msgstr "OPERATIE ONGEDAAN GEMAAKT"
 
@@ -15369,6 +16566,11 @@ msgstr "OPERATIE ONGEDAAN GEMAAKT"
 msgid "OUT"
 msgstr "OUT"
 
+#: include/lib/output_html_tab.class.php:71
+#, fuzzy
+msgid "OUTPUTHTML070 Mode invalide"
+msgstr "Ongeldige code"
+
 #: include/class/class_acc_operation.php:595
 #: include/class/class_acc_operation.php:599
 #: include/class/class_acc_operation.php:610
@@ -15397,7 +16599,7 @@ msgid ""
 msgstr "Verplicht voor FIN kranten geven hier de Data Bank gebruikt"
 
 #: include/template/param_jrn.php:61 include/template/param_jrn.php:68
-#: include/template/param_jrn.php:74
+#: include/template/param_jrn.php:74 include/template/param_jrn.php:75
 #, fuzzy
 msgid ""
 "Obligatoire pour les journaux FIN : donner ici la fiche du compte en banque "
@@ -15405,12 +16607,12 @@ msgid ""
 msgstr "Verplicht voor FIN kranten geven hier de Data Bank gebruikt"
 
 #: include/class/periode.class.php:649 include/class/periode.class.php:651
-#: include/class/periode.class.php:653
+#: include/class/periode.class.php:653 include/class/periode.class.php:654
 msgid "Octobre"
 msgstr ""
 
 #: include/class/periode.class.php:688 include/class/periode.class.php:690
-#: include/class/periode.class.php:692
+#: include/class/periode.class.php:692 include/class/periode.class.php:693
 msgid "On ne peut ajouter une période que sur un exercice qui existe déjà"
 msgstr ""
 
@@ -15424,7 +16626,7 @@ msgstr ""
 
 #: html/admin/setup.php:201 html/admin/setup.php:219 html/admin/setup.php:221
 #: html/install.php:227 html/install.php:225 html/install.php:233
-#: html/install.php:184 html/install.php:191
+#: html/install.php:184 html/install.php:191 html/install.php:207
 msgid ""
 "On ne peut pas écrire dans le répertoire de NOALYSS, changez-en les droits "
 msgstr ""
@@ -15461,6 +16663,7 @@ msgstr "Betrokken Op"
 #: include/class/acc_ledger_search.class.php:1080
 #: include/class/acc_ledger_search.class.php:1088
 #: include/class/acc_ledger_search.class.php:1101
+#: include/class/acc_ledger_search.class.php:1190
 #, fuzzy
 msgid "Op.Diverses"
 msgstr "Divers"
@@ -15471,12 +16674,33 @@ msgstr "Divers"
 msgid "Operation non equilibrée"
 msgstr "Niet evenwichtige Operatie"
 
+#: include/class/card_attribut_mtable.class.php:42
+#, fuzzy
+msgid "Option sup."
+msgstr "Operatie"
+
+#: include/template/action_search.php:146
+#, fuzzy
+msgid "Option étiquettes"
+msgstr "Configuratie van de label"
+
+#: include/class/contact_option_ref_mtable.class.php:39
+#, fuzzy
+msgid "Options"
+msgstr "Operatie"
+
 #: include/ajax_preference.php:69 include/ajax_preference.php:70
 #: include/ajax/ajax_preference.php:69 include/ajax/ajax_preference.php:70
 #: include/ajax/ajax_preference.php:81
 msgid "Options Générales"
 msgstr "Algemeen Opties"
 
+#: include/ajax/ajax_display_card_option.php:42
+#: include/template/action_document_type_mtable_input.php:125
+#, fuzzy
+msgid "Options contact"
+msgstr "Geletterde operaties"
+
 #: include/export_ledger_csv.php:49 include/export/export_ledger_csv.php:49
 #: include/export/export_ledger_csv.php:50
 msgid "Options invalides"
@@ -15488,7 +16712,7 @@ msgstr "Ongeldige opties"
 msgid "Options pour la page d'accueil"
 msgstr "Opties voor de home page"
 
-#: include/ext/tools/index.php:41
+#: include/ext/tools/index.php:41 include/tax_summary.inc.php:41
 msgid "Opération"
 msgstr "Operatie"
 
@@ -15497,7 +16721,7 @@ msgstr "Operatie"
 #: include/database.item.php:231 include/database.item.php:208
 #: include/database.item.php:209 include/database.item.php:212
 #: include/database.item.php:229 include/database.item.php:210
-#: include/database.item.php:232
+#: include/database.item.php:232 include/database.item.php:216
 msgid "Opération Diverses"
 msgstr "Diverse operatie"
 
@@ -15521,6 +16745,11 @@ msgstr "Operatie"
 msgid "Opération a effacer"
 msgstr "Operatie Ontruimde"
 
+#: include/company.inc.php:146
+msgid ""
+"Opération analytique uniquement pour les postes comptables commençant par"
+msgstr ""
+
 #: include/class_acc_ledger.php:762 include/class_acc_ledger.php:990
 #: include/class_acc_ledger.php:761 include/class_acc_ledger.php:989
 #: include/class_acc_ledger.php:765 include/class_acc_ledger.php:996
@@ -15538,6 +16767,8 @@ msgstr "Operatie Ontruimde"
 #: include/class/acc_ledger_search.class.php:1045
 #: include/class/acc_ledger_search.class.php:850
 #: include/class/acc_ledger_search.class.php:1058
+#: include/class/acc_ledger_search.class.php:939
+#: include/class/acc_ledger_search.class.php:1147
 msgid "Opération annulée"
 msgstr "Operatie ongedaan gemaakt"
 
@@ -15582,6 +16813,7 @@ msgstr "Werking omgekeerd"
 #: include/class/acc_ledger.class.php:2826
 #: include/class/acc_ledger.class.php:2835
 #: include/class/acc_ledger.class.php:2874
+#: include/class/acc_ledger.class.php:2898
 #, fuzzy
 msgid "Opération identique"
 msgstr "Operatie van verkopen"
@@ -15601,7 +16833,7 @@ msgstr ""
 #: include/compta_ven.inc.php:209 include/compta_ach.inc.php:197
 #: include/compta_ods.inc.php:121 include/compta_ven.inc.php:214
 #: include/compta_ods.inc.php:123 include/compta_ven.inc.php:212
-#: include/compta_ach.inc.php:195
+#: include/compta_ach.inc.php:195 include/compta_ach.inc.php:194
 #, fuzzy
 msgid "Opération non extournée"
 msgstr "Werking omgekeerd"
@@ -15612,11 +16844,12 @@ msgid "Opération non trouvée"
 msgstr "Handeling is niet gevonden"
 
 #: include/export/export_ledger_csv.php:144
+#: include/export/export_ledger_csv.php:150
 #, fuzzy
 msgid "Opération paiement"
 msgstr "Operatie van verkopen"
 
-#: include/operation_ods_new.inc.php:94
+#: include/operation_ods_new.inc.php:94 include/operation_ods_new.inc.php:95
 #, fuzzy, php-format
 msgid "Opération rapprochée : %s"
 msgstr "Vergelijkbare operaties"
@@ -15670,12 +16903,15 @@ msgstr "Operations &amp; Belettering"
 #: include/database.item.php:56 include/database.item.php:248
 #: include/database.item.php:223 include/cfgledger.inc.php:172
 #: include/database.item.php:55 include/database.item.php:255
+#: include/class/operation_predef_mtable.class.php:180
+#: include/database.item.php:232
 msgid "Opérations Diverses"
 msgstr "Verschillende bewerkingen"
 
 #: include/lettering.account.inc.php:87 include/lettering.card.inc.php:92
 #: include/lettering.gestion.inc.php:43 include/lettering.gestion.inc.php:42
-#: include/lettering.account.inc.php:95
+#: include/lettering.account.inc.php:95 include/lettering.account.inc.php:96
+#: include/lettering.card.inc.php:94
 msgid "Opérations NON lettrées"
 msgstr "NON operaties geletterde"
 
@@ -15684,6 +16920,7 @@ msgid "Opérations Ventes/Achats"
 msgstr "Operatie Verkopen/Aankopen"
 
 #: include/template/detail-action.php:167
+#: include/template/detail-action.php:174
 #, fuzzy
 msgid "Opérations concernées"
 msgstr "Geletterde operaties"
@@ -15693,12 +16930,14 @@ msgstr "Geletterde operaties"
 #: include/database.item.php:120 include/database.item.php:117
 #: include/database.item.php:116 include/database.item.php:17
 #: include/database.item.php:20 include/database.item.php:14
-#: include/database.item.php:112
+#: include/database.item.php:112 include/database.item.php:13
+#: include/database.item.php:113
 msgid "Opérations diverses"
 msgstr "Verschillende bewerkingen"
 
 #: include/database.item.php:17 include/database.item.php:20
 #: include/database.item.php:14 include/database.item.php:12
+#: include/database.item.php:13
 #, fuzzy
 msgid "Opérations diverses en Analytique"
 msgstr "Verschillende bewerkingen"
@@ -15706,17 +16945,20 @@ msgstr "Verschillende bewerkingen"
 #: include/lettering.account.inc.php:85 include/lettering.card.inc.php:90
 #: include/lettering.gestion.inc.php:42 include/lettering.gestion.inc.php:41
 #: include/lettering.account.inc.php:93 include/impress_poste.inc.php:104
+#: include/lettering.account.inc.php:94 include/lettering.card.inc.php:92
 msgid "Opérations lettrées"
 msgstr "Geletterde operaties"
 
 #: include/lettering.account.inc.php:86 include/lettering.card.inc.php:91
-#: include/lettering.account.inc.php:94
+#: include/lettering.account.inc.php:94 include/lettering.account.inc.php:95
+#: include/lettering.card.inc.php:93
 msgid "Opérations lettrées montants différents"
 msgstr "Geletterde operaties verschillende bedragen"
 
 #: include/template/ledger_detail_bottom.php:18
 #: include/template/ledger_detail_bottom.php:33
 #: include/template/ledger_detail_bottom.php:38
+#: include/template/ledger_detail_bottom.php:43
 msgid "Opérations liées"
 msgstr "Gelinkte operaties"
 
@@ -15796,6 +17038,9 @@ msgstr "Kies de BTW"
 #: include/template/profile_menu_display_module.php:81
 #: include/class/acc_plan_mtable.class.php:59
 #: include/class/acc_plan_mtable.class.php:65
+#: include/class/tva_rate_mtable.class.php:57
+#: include/class/acc_plan_mtable.class.php:66 include/company.inc.php:72
+#: include/company.inc.php:75 include/company.inc.php:113
 msgid "Oui"
 msgstr "Ja"
 
@@ -15818,6 +17063,7 @@ msgstr "de begrotingspost"
 #: include/class/periode_ledger_table.class.php:142
 #: include/class/periode_ledger_table.class.php:144
 #: include/class/periode.class.php:587 include/class/periode.class.php:589
+#: include/class/periode.class.php:590
 #, fuzzy
 msgid "Ouvert"
 msgstr "OPSLAAN"
@@ -15834,6 +17080,7 @@ msgstr "Opening Schrift"
 #: include/class/class_acc_bilan.php:637 include/class/class_acc_bilan.php:654
 #: include/class/acc_bilan.class.php:655 include/class/acc_bilan.class.php:658
 #: include/class/acc_bilan.class.php:663 include/class/acc_bilan.class.php:665
+#: include/class/acc_bilan.class.php:670
 #, fuzzy
 msgid "Ouverture fichier impossible"
 msgstr "fout bij het openen van het bestand"
@@ -15868,6 +17115,7 @@ msgstr "TKPDF is niet geïnstalleerd"
 #: include/class/acc_ledger.class.php:228
 #: include/class/acc_ledger.class.php:229
 #: include/class/acc_ledger.class.php:247
+#: include/class/acc_ledger.class.php:246
 msgid "PERIODE FERMEE"
 msgstr "Gesloten periode"
 
@@ -15920,6 +17168,8 @@ msgstr "TKPDF is niet geïnstalleerd"
 #: include/class/acc_ledger_purchase.class.php:1850
 #: include/class/acc_ledger_sold.class.php:1430
 #: include/class/acc_ledger_purchase.class.php:1856
+#: include/class/acc_ledger_purchase.class.php:1893
+#: include/class/acc_ledger_sold.class.php:1415
 msgid "PU"
 msgstr "Eenheidsprijs"
 
@@ -15951,6 +17201,11 @@ msgstr "Eenheidsprijs"
 #: include/class/acc_ledger_history_purchase.class.php:250
 #: include/class/acc_ledger_history_purchase.class.php:254
 #: include/class/acc_ledger.class.php:2452
+#: include/class/acc_ledger_history_sale.class.php:253
+#: include/class/acc_ledger_search.class.php:730
+#: include/class/acc_ledger_history_purchase.class.php:265
+#: include/class/acc_ledger.class.php:2480
+#: include/export/export_histo_csv.php:43 include/tax_summary.inc.php:42
 msgid "Paiement"
 msgstr "Betaling"
 
@@ -15991,6 +17246,7 @@ msgstr "betaling in"
 #: include/database.item.php:219 include/database.item.php:224
 #: include/database.item.php:201 include/database.item.php:202
 #: include/database.item.php:205 include/database.item.php:203
+#: include/database.item.php:211
 msgid "Paiement électronique"
 msgstr "Elektronisch betalen"
 
@@ -16037,6 +17293,7 @@ msgstr "Per fiche"
 #: include/database.item.php:226 include/database.item.php:203
 #: include/database.item.php:204 include/database.item.php:207
 #: include/database.item.php:221 include/database.item.php:205
+#: include/database.item.php:213
 msgid "Par gérant ou administrateur"
 msgstr "Door de manager of beheerder"
 
@@ -16060,6 +17317,7 @@ msgstr "Parameter is ongeldig"
 #: include/database.item.php:83 include/database.item.php:86
 #: include/database.item.php:91 include/database.item.php:88
 #: include/database.item.php:87 include/database.item.php:85
+#: include/database.item.php:84
 msgid "Parametre societe"
 msgstr "Parameter bedrijf"
 
@@ -16071,6 +17329,7 @@ msgstr "Parameter bedrijf"
 #: include/class/acc_ledger.class.php:427
 #: include/class/acc_ledger.class.php:428
 #: include/class/acc_ledger.class.php:443
+#: include/class/acc_ledger.class.php:442
 msgid "Parametres journaux non trouves"
 msgstr "Parameters van niet journaal van stuurprogramma"
 
@@ -16113,6 +17372,7 @@ msgstr "Parameter"
 #: html/install.php:471 include/admin_repo.inc.php:125 html/install.php:477
 #: html/install.php:439 include/admin_repo.inc.php:127 html/install.php:414
 #: include/admin_repo.inc.php:129 html/install.php:420 html/install.php:423
+#: html/install.php:472
 #, fuzzy
 msgid "Paramètre base de données"
 msgstr "Database"
@@ -16148,6 +17408,7 @@ msgstr "Parameter is ongeldig"
 #: include/lib/http_input.class.php:121 include/class/acc_ledger.class.php:89
 #: include/lib/http_input.class.php:123 include/class/periode.class.php:237
 #: include/class/acc_ledger.class.php:91 include/class/periode.class.php:239
+#: include/lib/http_input.class.php:161
 msgid "Paramètre invalide"
 msgstr "Parameter is ongeldig"
 
@@ -16165,6 +17426,7 @@ msgstr "Parameter voor de BTW"
 #: include/database.item.php:75 include/database.item.php:78
 #: include/database.item.php:83 include/database.item.php:81
 #: include/database.item.php:80 include/database.item.php:77
+#: include/database.item.php:76
 msgid "Paramètres divers"
 msgstr "Verschillende parameters"
 
@@ -16187,6 +17449,7 @@ msgstr "Percentage"
 #: include/database.item.php:218 include/database.item.php:195
 #: include/database.item.php:196 include/database.item.php:199
 #: include/database.item.php:210 include/database.item.php:215
+#: include/database.item.php:205
 msgid "Partager une note"
 msgstr ""
 
@@ -16199,6 +17462,7 @@ msgstr "Een deel van de financieel administratieve post of etiket"
 #: include/database.item.php:182 include/database.item.php:141
 #: include/database.item.php:142 include/database.item.php:143
 #: include/database.item.php:148 include/database.item.php:153
+#: include/database.item.php:149
 msgid "Partie fiscalement non déductible"
 msgstr "Fiscaal niet aftrekbare gedeelte"
 
@@ -16302,6 +17566,9 @@ msgstr "Geen documenten gegeven"
 #: include/class/acc_ledger_fin.class.php:1052 include/compta_ven.inc.php:251
 #: include/class/acc_ledger_sold.class.php:1132
 #: include/class/acc_ledger.class.php:790 include/compta_ach.inc.php:236
+#: include/class/acc_ledger.class.php:777
+#: include/class/acc_ledger_purchase.class.php:1083
+#: include/class/acc_ledger_sold.class.php:1099 include/compta_ach.inc.php:235
 msgid "Pas de journal disponible"
 msgstr "Journaal available Geen"
 
@@ -16338,7 +17605,7 @@ msgstr "Betaling"
 #: include/template/stock_summary_list.php:41 include/company.inc.php:130
 #: include/ext/sav/include/template/sas_display_detail.php:107
 #: include/ajax/ajax_mod_stock_repo.php:63 include/company.inc.php:134
-#: include/export/export_stock_resume_list.php:38
+#: include/export/export_stock_resume_list.php:38 include/company.inc.php:142
 msgid "Pays"
 msgstr "Land"
 
@@ -16365,6 +17632,8 @@ msgstr "Land"
 #: include/class/acc_ledger_search.class.php:864
 #: include/class/acc_ledger_search.class.php:706
 #: include/class/acc_ledger_search.class.php:877
+#: include/class/acc_ledger_search.class.php:792
+#: include/class/acc_ledger_search.class.php:966
 msgid "Payé"
 msgstr "Betaald"
 
@@ -16387,9 +17656,16 @@ msgstr "Betaald"
 #: include/class/acc_ledger_purchase.class.php:1698
 #: include/class/acc_ledger_purchase.class.php:1701
 #: include/class/print_ledger_simple.class.php:274
+#: include/class/acc_ledger_purchase.class.php:1722
+#: include/class/print_ledger_simple.class.php:297
 msgid "Payé par"
 msgstr "Betaald deur"
 
+#: include/class/acc_ledger_search.class.php:214
+#, fuzzy
+msgid "Payées"
+msgstr "Betaald"
+
 #: include/template/dashboard.php:185 include/template/dashboard.php:10
 msgid "Pense-Bête"
 msgstr "Je Doen fractie Lijst"
@@ -16416,11 +17692,14 @@ msgstr "Periode"
 #: include/class/acc_ledger_sold.class.php:113
 #: include/class/acc_ledger.class.php:1068
 #: include/class/acc_ledger.class.php:1084
+#: include/class/acc_ledger.class.php:1080
+#: include/class/acc_ledger_purchase.class.php:111
 msgid "Periode fermee"
 msgstr "Gesloten periode"
 
 #: include/database.item.php:95 include/database.item.php:98
 #: include/database.item.php:92 include/database.item.php:90
+#: include/database.item.php:91
 msgid ""
 "Permet d'ajouter de nouveaux attributs que vous pourrez par la suite ajouter "
 "à des catégories de fiches"
@@ -16429,7 +17708,8 @@ msgstr ""
 #: include/database.item.php:113 include/database.item.php:115
 #: include/database.item.php:116 include/database.item.php:118
 #: include/database.item.php:110 include/database.item.php:112
-#: include/database.item.php:108
+#: include/database.item.php:108 include/database.item.php:109
+#: include/database.item.php:111
 msgid ""
 "Permet d'ajouter de nouvelles catégorie de fiche, d'ajouter des attributs à "
 "ces catégories (numéro de téléphone, gsm, email...)"
@@ -16437,6 +17717,7 @@ msgstr ""
 
 #: include/database.item.php:13 include/database.item.php:16
 #: include/database.item.php:10 include/database.item.php:8
+#: include/database.item.php:9
 msgid ""
 "Permet d'ajouter des taux de TVA ou de les modifier ainsi que les postes "
 "comptables de ces TVA, ces TVA sont utilisables dans les menus de vente et "
@@ -16445,6 +17726,7 @@ msgstr ""
 
 #: include/database.item.php:116 include/database.item.php:119
 #: include/database.item.php:113 include/database.item.php:111
+#: include/database.item.php:112
 msgid ""
 "Permet d'ajouter des état pour les documents utilisés dans le suivi (à "
 "faire, à suivre...)"
@@ -16452,6 +17734,7 @@ msgstr ""
 
 #: include/database.item.php:83 include/database.item.php:86
 #: include/database.item.php:80 include/database.item.php:78
+#: include/database.item.php:79
 msgid ""
 "Permet d'avoir la balance de toutes vos fiches, les résumés exportables en "
 "CSV, les historiques avec ou sans lettrages"
@@ -16459,15 +17742,21 @@ msgstr ""
 
 #: include/database.item.php:114 include/database.item.php:117
 #: include/database.item.php:111 include/database.item.php:109
+#: include/database.item.php:110
 msgid "Permet de changer le poste comptable de base des catégories de fiches"
 msgstr ""
 
-#: include/database.item.php:139
+#: include/lib/message_javascript.php:110
+msgid "Permet de chercher dans le suivi pour les contacts multiques"
+msgstr ""
+
+#: include/database.item.php:139 include/database.item.php:138
 msgid "Permet de configurer les devises"
 msgstr ""
 
 #: include/database.item.php:102 include/database.item.php:105
 #: include/database.item.php:99 include/database.item.php:97
+#: include/database.item.php:98
 msgid ""
 "Permet de faire correspondre vos extraits bancaires avec les opérations de "
 "vente ou d'achat, le lettrage se fait automatiquement"
@@ -16503,6 +17792,8 @@ msgstr ""
 #: include/export/export_histo_csv.php:40
 #: include/export/export_histo_csv.php:41
 #: include/class/print_ledger_misc.class.php:44 include/compta_ods.inc.php:96
+#: include/class/print_ledger_misc.class.php:43
+#: include/export/export_histo_csv.php:44
 #, fuzzy
 msgid "Piece"
 msgstr "stuk"
@@ -16610,6 +17901,15 @@ msgstr "stuk"
 #: include/class/acc_ledger_sold.class.php:1411
 #: include/class/acc_ledger.class.php:874
 #: include/class/acc_ledger_purchase.class.php:1837
+#: include/class/acc_ledger_history_sale.class.php:255
+#: include/class/acc_ledger_search.class.php:732
+#: include/class/acc_ledger_search.class.php:1047
+#: include/class/acc_ledger_history_purchase.class.php:267
+#: include/class/acc_ledger.class.php:862
+#: include/class/acc_ledger_purchase.class.php:1874
+#: include/class/acc_ledger_sold.class.php:1396
+#: include/class/print_ledger_simple.class.php:96
+#: include/class/anc_grandlivre.class.php:231 include/lib/ac_common.php:1222
 msgid "Pièce"
 msgstr "Bewijs"
 
@@ -16621,7 +17921,7 @@ msgstr "Bewijs"
 msgid "Pièce inexistante"
 msgstr "Map niet bestaat"
 
-#: include/compta_fin_rec.inc.php:339
+#: include/compta_fin_rec.inc.php:339 include/compta_fin_rec.inc.php:380
 #, fuzzy
 msgid "Pièce justificative"
 msgstr "Nummer"
@@ -16636,6 +17936,7 @@ msgstr "Nummer"
 #: include/template/detail-action.php:403
 #: include/template/detail-action.php:407
 #: include/template/detail-action.php:405
+#: include/template/detail-action.php:401
 msgid "Pièces attachées"
 msgstr "Documenten"
 
@@ -16720,6 +18021,7 @@ msgstr ""
 # Plage heeft verschillende vertalingen: periode, marge/verschil, programmablok
 #: include/template/template_config_form.php:59
 #: include/template/template_config_form.php:67
+#: include/template/template_config_form.php:77
 #, fuzzy
 msgid "Port de Postgresql"
 msgstr "Basisklasse"
@@ -16733,7 +18035,7 @@ msgstr "Basisklasse"
 
 # Plage heeft verschillende vertalingen: periode, marge/verschil, programmablok
 #: html/install.php:135 html/install.php:134 html/install.php:140
-#: html/install.php:147
+#: html/install.php:147 html/install.php:160
 #, fuzzy
 msgid "Port pour postgresql"
 msgstr "Basisklasse"
@@ -16831,7 +18133,14 @@ msgstr "Archief"
 #: include/class/acc_ledger_sold.class.php:1414
 #: include/class/acc_ledger.class.php:627
 #: include/class/acc_ledger.class.php:902
-#: include/class/acc_ledger_purchase.class.php:1840
+#: include/class/acc_ledger_purchase.class.php:1840 include/fiche.inc.php:417
+#: include/class/acc_ledger.class.php:890 include/class/fiche.class.php:1501
+#: include/class/acc_ledger_purchase.class.php:1877
+#: include/class/acc_ledger_sold.class.php:1399
+#: include/class/pre_op_advanced.class.php:199
+#: include/class/acc_ledger_history_generic.class.php:772
+#: include/class/anc_grandlivre.class.php:226
+#: include/ajax/ajax_display_letter.php:64 include/database.item.php:63
 msgid "Poste"
 msgstr "Rekening"
 
@@ -16871,6 +18180,7 @@ msgstr "Kostenpost "
 #: include/class/acc_plan_mtable.class.php:45 include/class/fiche.class.php:470
 #: include/class/fiche.class.php:469
 #: include/class/pdfbalance_simple.class.php:55
+#: include/template/ledger_detail_bottom.php:93
 msgid "Poste Comptable"
 msgstr "rekening"
 
@@ -16890,6 +18200,7 @@ msgstr "Basis rekening"
 #: include/class/acc_ledger.class.php:1122
 #: include/class/acc_ledger.class.php:1131
 #: include/class/acc_ledger.class.php:1147
+#: include/class/acc_ledger.class.php:1143
 msgid "Poste Inexistant ["
 msgstr "Niet aanwezig positie ["
 
@@ -16903,6 +18214,7 @@ msgstr "Niet aanwezig positie ["
 #: include/class/acc_ledger.class.php:1107
 #: include/class/acc_ledger.class.php:1114
 #: include/class/acc_ledger.class.php:1130
+#: include/class/acc_ledger.class.php:1126
 msgid "Poste Inexistant pour la fiche ["
 msgstr "Niet aanwezig post voor details ["
 
@@ -16947,7 +18259,8 @@ msgstr "Kostenpost"
 #: include/class/fiche.class.php:1756 include/class/pdf_operation.class.php:246
 #: include/ajax/ajax_boxcard_search.php:65 include/class/fiche.class.php:1759
 #: include/class/fiche.class.php:1761 include/class/fiche.class.php:1779
-#: include/class/fiche.class.php:1780
+#: include/class/fiche.class.php:1780 include/class/fiche.class.php:1806
+#: include/class/card_attribut_mtable.class.php:58
 msgid "Poste comptable"
 msgstr "Accountant Vacature"
 
@@ -16991,6 +18304,7 @@ msgstr ""
 #: include/class/acc_plan_mtable.class.php:137
 #: include/class/acc_plan_mtable.class.php:149
 #: include/class/acc_plan_mtable.class.php:173
+#: include/class/acc_plan_mtable.class.php:177
 #, fuzzy
 msgid "Poste comptable dépendant ne peut pas être vide"
 msgstr "De Naam mag are niet leeg"
@@ -16998,12 +18312,15 @@ msgstr "De Naam mag are niet leeg"
 #: include/class/acc_plan_mtable.class.php:127
 #: include/class/acc_plan_mtable.class.php:139
 #: include/class/acc_plan_mtable.class.php:163
+#: include/class/acc_plan_mtable.class.php:167
 #, fuzzy
 msgid "Poste comptable est unique"
 msgstr "Accountant Vacature"
 
 #: include/class/tva_rate_mtable.class.php:233
 #: include/class/tva_rate_mtable.class.php:243
+#: include/class/tva_rate_mtable.class.php:250
+#: include/class/tva_rate_mtable.class.php:260
 #, fuzzy
 msgid "Poste comptable inexistant"
 msgstr "Rekenitem gebruikt voor voorschotten aan de BTW"
@@ -17016,6 +18333,7 @@ msgstr "Dit plan bestaat niet"
 #: include/class/acc_plan_mtable.class.php:130
 #: include/class/acc_plan_mtable.class.php:142
 #: include/class/acc_plan_mtable.class.php:166
+#: include/class/acc_plan_mtable.class.php:170
 #, fuzzy
 msgid "Poste comptable ne peut être vide"
 msgstr "De naam mag niet leeg zijn"
@@ -17044,7 +18362,10 @@ msgstr "Boekhoudkundige post of fiche veranderen"
 #: include/class/fiche.class.php:849 include/class/fiche.class.php:995
 #: include/class/fiche.class.php:996 include/class/fiche.class.php:1036
 #: include/class/fiche.class.php:850 include/class/fiche.class.php:997
-#: include/class/fiche.class.php:1037
+#: include/class/fiche.class.php:1037 include/class/fiche.class.php:846
+#: include/class/fiche.class.php:876 include/class/fiche.class.php:877
+#: include/class/fiche.class.php:1024 include/class/fiche.class.php:1064
+#: include/class/acc_plan_mtable.class.php:174
 #, fuzzy
 msgid "Poste comptable trop long"
 msgstr "Accountant Vacature"
@@ -17117,6 +18438,7 @@ msgstr "Onbekende post"
 #: include/class/acc_ledger.class.php:1119
 #: include/class/acc_ledger.class.php:1128
 #: include/class/acc_ledger.class.php:1144
+#: include/class/acc_ledger.class.php:1140
 msgid "Poste invalide ["
 msgstr "Ongeldig bericht ["
 
@@ -17126,6 +18448,11 @@ msgstr "Ongeldig bericht ["
 msgid "Poste parent incorrect"
 msgstr "Ongeldige kostenpost"
 
+#: include/class/acc_plan_mtable.class.php:197
+#, fuzzy
+msgid "Poste utilisé"
+msgstr "niet use of"
+
 #: include/class/acc_account.class.php:181
 #: include/class/acc_account.class.php:182
 msgid "Poste utilisé : effacement interdit"
@@ -17145,7 +18472,7 @@ msgid ""
 "Pour ajouter, effacer ou modifier une p&eacute;riode, il faut choisir global"
 msgstr ""
 
-#: include/periode.inc.php:126
+#: include/periode.inc.php:126 include/periode.inc.php:127
 msgid "Pour ajouter, effacer ou modifier une période, il faut choisir global"
 msgstr ""
 
@@ -17156,7 +18483,7 @@ msgstr "Voor vandaag"
 #: html/admin/setup.php:420 html/install.php:484 html/install.php:483
 #: html/install.php:481 html/install.php:487 html/install.php:479
 #: html/install.php:485 html/install.php:447 html/install.php:422
-#: html/install.php:428 html/install.php:431
+#: html/install.php:428 html/install.php:431 html/install.php:480
 msgid ""
 "Pour cela, sur la ligne de commande en tant qu\\'utilisateur postgres, "
 "faites createlang plpgsql template1"
@@ -17219,6 +18546,8 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:145
 #: include/class/acc_ledger_sold.class.php:204
 #: include/class/acc_ledger_purchase.class.php:219
+#: include/class/acc_ledger_purchase.class.php:151
+#: include/class/acc_ledger_purchase.class.php:221
 msgid "Pour la fiche "
 msgstr "VOOR Het blad"
 
@@ -17233,6 +18562,7 @@ msgstr "VOOR Het blad"
 #: include/class/acc_ledger.class.php:1683
 #: include/class/acc_ledger.class.php:1692
 #: include/class/acc_ledger.class.php:1708
+#: include/class/acc_ledger.class.php:1698
 #, php-format
 msgid "Pour la fiche %s le poste comptable [%s] n'existe pas"
 msgstr "Voor de fiche % s, bestaat de de begrotingspost % s niet"
@@ -17242,6 +18572,7 @@ msgstr "Voor de fiche % s, bestaat de de begrotingspost % s niet"
 #: include/class/class_acc_ledger_purchase.php:254
 #: include/class/acc_ledger_purchase.class.php:254
 #: include/class/acc_ledger_purchase.class.php:253
+#: include/class/acc_ledger_purchase.class.php:255
 #, php-format
 msgid "Pour la fiche %s, le compte contrepartie %s n'existe pas"
 msgstr "Voor de goede orde% s, is de wederpartij% s-account niet bestaat"
@@ -17283,6 +18614,7 @@ msgid ""
 msgstr "For a Betere Kennismaking zet Web, neem Tijd OM browser up-to-date"
 
 #: include/impress_bilan.inc.php:87 include/impress_bilan.inc.php:94
+#: include/impress_bilan.inc.php:98
 msgid "Pour une vérification complète, allez dans "
 msgstr ""
 
@@ -17307,6 +18639,7 @@ msgstr ""
 #: include/class/follow_up.class.php:1923
 #: include/class/follow_up.class.php:1921
 #: include/class/follow_up.class.php:1922
+#: include/class/follow_up.class.php:1871
 msgid "Principal"
 msgstr ""
 
@@ -17317,10 +18650,12 @@ msgstr ""
 #: include/template/detail-action.php:133
 #: include/template/action_display_short.php:99
 #: include/template/action_display_short.php:100
+#: include/template/detail-action.php:140
 msgid "Priorité"
 msgstr "Prioriteit"
 
 #: include/class/print_ledger_simple.class.php:113
+#: include/class/print_ledger_simple.class.php:110
 msgid "Priv/DNA"
 msgstr ""
 
@@ -17328,6 +18663,8 @@ msgstr ""
 #: include/template/tax_summary_display.php:297
 #: include/export/export_printtva_csv.php:62
 #: include/export/export_printtva_pdf.php:212
+#: include/export/export_printtva_pdf.php:216
+#: include/export/export_printtva_csv.php:74
 msgid "Privée"
 msgstr ""
 
@@ -17352,6 +18689,8 @@ msgstr "Prijs / A"
 #: include/database.item.php:172 include/database.item.php:136
 #: include/database.item.php:137 include/database.item.php:147
 #: include/database.item.php:152 include/database.item.php:182
+#: include/template/action_document_type_mtable_input.php:76
+#: include/database.item.php:178
 msgid "Prix achat"
 msgstr "Aankoopprijs"
 
@@ -17360,6 +18699,8 @@ msgstr "Aankoopprijs"
 #: include/database.item.php:171 include/database.item.php:135
 #: include/database.item.php:136 include/database.item.php:146
 #: include/database.item.php:151 include/database.item.php:181
+#: include/template/action_document_type_mtable_input.php:75
+#: include/database.item.php:177
 msgid "Prix vente"
 msgstr "Verkoopprijs"
 
@@ -17396,6 +18737,7 @@ msgid "Problème réseau"
 msgstr ""
 
 #: include/template/document_mod_change.php:71
+#: include/template/action_document_type_mtable_input.php:36
 msgid "Prochain numéro"
 msgstr "Het volgende nummer"
 
@@ -17413,7 +18755,7 @@ msgstr "Producten"
 
 #: include/user_menu.php:154 include/user_menu.php:158
 #: include/lib/user_menu.php:167 include/lib/user_menu.php:180
-#: include/lib/user_menu.php:138
+#: include/lib/user_menu.php:138 include/lib/user_menu.php:137
 msgid "Produits"
 msgstr "Producten"
 
@@ -17431,7 +18773,7 @@ msgstr "Producten"
 #: include/template/action_search.php:56 include/database.item.php:84
 #: include/param_sec.inc.php:217 include/database.item.php:78
 #: include/param_sec.inc.php:221 include/template/action_search.php:52
-#: include/database.item.php:76
+#: include/database.item.php:76 include/param_sec.inc.php:226
 msgid "Profil"
 msgstr "Profiel"
 
@@ -17461,7 +18803,8 @@ msgstr "Prog."
 #: include/export/export_poste_detail_csv.php:90
 #: include/class/anc_grandlivre.class.php:221
 #: include/class/anc_grandlivre.class.php:222 include/fiche.inc.php:523
-#: include/fiche.inc.php:532
+#: include/fiche.inc.php:532 include/fiche.inc.php:545
+#: include/class/anc_grandlivre.class.php:235
 msgid "Prog."
 msgstr "Prog."
 
@@ -17469,7 +18812,7 @@ msgstr "Prog."
 #: include/database.item.php:205 include/database.item.php:202
 #: include/database.item.php:178 include/database.item.php:179
 #: include/database.item.php:182 include/database.item.php:190
-#: include/database.item.php:195
+#: include/database.item.php:195 include/database.item.php:188
 msgid "Proposition"
 msgstr "Voorstel"
 
@@ -17488,11 +18831,23 @@ msgstr "Voorvoegsel"
 
 #: include/template/param_jrn.php:84 include/template/param_jrn.php:91
 #: include/template/param_jrn.php:93 include/template/param_jrn.php:137
+#: include/template/param_jrn.php:138
 msgid "Préfixe code interne"
 msgstr "Prefix interne code"
 
+#: include/class/action_document_type_mtable.class.php:49
+#, fuzzy
+msgid "Préfixe document"
+msgstr "Prefix interne code"
+
+#: include/class/action_document_type_mtable.class.php:111
+#, fuzzy
+msgid "Préfixe ne peut être vide"
+msgstr "De naam mag niet leeg zijn"
+
 #: include/template/param_jrn.php:88 include/template/param_jrn.php:95
 #: include/template/param_jrn.php:97 include/template/param_jrn.php:141
+#: include/template/param_jrn.php:142
 msgid "Préfixe pièce justificative"
 msgstr "Prefix voucher"
 
@@ -17512,6 +18867,7 @@ msgstr "Voorkeur"
 
 #: include/database.item.php:84 include/database.item.php:87
 #: include/database.item.php:81 include/database.item.php:79
+#: include/database.item.php:80
 msgid ""
 "Préférence de l'utilisateur, apparence de l'application pour l'utilisateur, "
 "période par défaut et mot de passe"
@@ -17528,6 +18884,7 @@ msgstr ""
 #: include/database.item.php:165 include/user.inc.php:81
 #: include/user.inc.php:145 include/class/balance_age.class.php:146
 #: include/database.item.php:170 include/database.item.php:173
+#: include/database.item.php:169
 msgid "Prénom"
 msgstr "Voornaam"
 
@@ -17548,12 +18905,13 @@ msgstr "Presentatie"
 #: include/database.item.php:123 include/database.item.php:126
 #: include/database.item.php:132 include/database.item.php:128
 #: include/database.item.php:127 include/database.item.php:131
-#: include/database.item.php:125
+#: include/database.item.php:125 include/database.item.php:124
 msgid "Prévision"
 msgstr "Uitzicht"
 
 #: include/database.item.php:128 include/database.item.php:131
 #: include/database.item.php:125 include/database.item.php:123
+#: include/database.item.php:124
 msgid ""
 "Prévision de vos achats, revenus, permet de suivre l'évolution de votre "
 "société. Vos prévisions sont des formules sur les postes comptables et vous "
@@ -17566,11 +18924,11 @@ msgstr ""
 
 #: html/install.php:268 html/install.php:267 html/install.php:265
 #: html/install.php:270 html/install.php:276 html/install.php:227
-#: html/install.php:234 html/install.php:237
+#: html/install.php:234 html/install.php:237 html/install.php:284
 msgid "Puis cliquez sur ce lien"
 msgstr ""
 
-#: html/install.php:586 html/install.php:589
+#: html/install.php:586 html/install.php:589 html/install.php:639
 msgid ""
 "Puis refaites la procédure d'installation pour mettre la base de données à "
 "jour"
@@ -17608,6 +18966,8 @@ msgstr ""
 #: include/ajax/ajax_preference.php:150
 #: include/class/acc_ledger_sold.class.php:1409
 #: include/class/acc_ledger_purchase.class.php:1835
+#: include/class/acc_ledger_purchase.class.php:1872
+#: include/class/acc_ledger_sold.class.php:1394 include/database.item.php:85
 msgid "Période"
 msgstr "Periode"
 
@@ -17651,6 +19011,8 @@ msgstr "periode tussen% s [% s] en [% s]"
 #: include/class/acc_ledger_purchase.class.php:1415
 #: include/class/acc_ledger.class.php:604
 #: include/class/acc_ledger.class.php:620
+#: include/class/acc_ledger_purchase.class.php:1426
+#: include/class/acc_ledger_sold.class.php:696
 msgid "Période Comptable"
 msgstr "Boekhoudingsperiode"
 
@@ -17697,6 +19059,9 @@ msgstr ""
 #: include/class/acc_ledger.class.php:842
 #: include/class/acc_ledger_sold.class.php:1116
 #: include/class/acc_ledger.class.php:858
+#: include/class/acc_ledger.class.php:846
+#: include/class/acc_ledger_purchase.class.php:1063
+#: include/class/acc_ledger_sold.class.php:1083
 msgid "Période comptable"
 msgstr "Boekhoudingsperiode"
 
@@ -17715,7 +19080,7 @@ msgstr "Periode Start ongeldig"
 msgid "Période de fin non valable"
 msgstr "Periode van ongeldige einde"
 
-#: include/tax_summary.inc.php:39
+#: include/tax_summary.inc.php:39 include/tax_summary.inc.php:48
 #, fuzzy, php-format
 msgid "Période du %s au %s"
 msgstr "periode tussen% s [% s] en [% s]"
@@ -17725,6 +19090,11 @@ msgstr "periode tussen% s [% s] en [% s]"
 msgid "Période fermée"
 msgstr "Gesloten periode"
 
+#: include/class/acc_ledger.class.php:1063
+#, fuzzy
+msgid "Période inexistante"
+msgstr "Map niet bestaat"
+
 #: include/ext/import_account/include/class_impacc_csv.php:48
 #: include/ext/import_account/include/class_impacc_csv.php:49
 #: include/ext/import_account/include/impacc_csv.class.php:48
@@ -17739,6 +19109,7 @@ msgstr ""
 
 #: include/ext/amortis/include/class_amortissement_material_pdf.php:33
 #: include/ext/amortis/include/amortissement_material_pdf.class.php:33
+#: include/template/card_multiple_result.php:17
 #, fuzzy
 msgid "QCode"
 msgstr "Code"
@@ -17803,7 +19174,9 @@ msgstr "Hoeveelheid"
 #: include/class/fiche.class.php:1758 include/class/fiche.class.php:1760
 #: include/class/acc_ledger_fin.class.php:753
 #: include/class/fiche.class.php:1778 include/class/fiche.class.php:1779
-#: include/database.item.php:167
+#: include/database.item.php:167 include/fiche.inc.php:415
+#: include/class/fiche.class.php:1805
+#: include/template/ledger_detail_bottom.php:94
 msgid "Quick Code"
 msgstr "Quick Code"
 
@@ -17840,6 +19213,9 @@ msgstr "Quick Code of"
 #: include/export/export_ledger_csv.php:221
 #: include/class/print_ledger_detail_item.class.php:156
 #: include/class/acc_ledger_history_generic.class.php:772
+#: include/class/acc_account_ledger.class.php:386
+#: include/class/acc_ledger_history_generic.class.php:773
+#: include/export/export_ledger_csv.php:229
 msgid "QuickCode"
 msgstr "QuickCode"
 
@@ -17856,6 +19232,7 @@ msgstr "QuickCode"
 #: include/class/anc_listing.class.php:79
 #: include/class/anc_grandlivre.class.php:215
 #: include/class/anc_listing.class.php:81
+#: include/class/anc_grandlivre.class.php:227
 msgid "Quick_code"
 msgstr "Quick_code"
 
@@ -17891,7 +19268,7 @@ msgstr "HERINNERING: Rekining ZAL"
 #: include/database.item.php:66 include/database.item.php:72
 #: include/database.item.php:70 include/database.item.php:69
 #: include/database.item.php:68 include/database.item.php:71
-#: include/database.item.php:65
+#: include/database.item.php:65 include/database.item.php:64
 msgid "Rapport"
 msgstr "Verslag"
 
@@ -17911,15 +19288,22 @@ msgstr "Verslag"
 #: include/database.item.php:113 include/database.item.php:102
 #: include/database.item.php:110 include/database.item.php:101
 #: include/database.item.php:109 include/database.item.php:99
+#: include/database.item.php:98 include/database.item.php:106
 msgid "Rapprochement"
 msgstr "Verzoening"
 
 #: include/database.item.php:97 include/database.item.php:100
 #: include/database.item.php:105 include/database.item.php:102
 #: include/database.item.php:101 include/database.item.php:99
+#: include/database.item.php:98
 msgid "Rapprochement bancaire"
 msgstr "Bank Verzoening"
 
+#: include/template/follow_up_detail_display.php:194
+#, fuzzy
+msgid "Recalculer"
+msgstr "Door berekening"
+
 #: html/ajax_card.php:328 html/ajax_poste.php:83 html/recherche.php:65
 #: include/adm.inc.php:81 include/ajax_anc_search.php:45
 #: include/ajax_anc_search.php:56 include/bank.inc.php:75
@@ -17991,6 +19375,16 @@ msgstr "Bank Verzoening"
 #: include/ajax/ajax_search_operation.php:74 include/ajax/ajax_poste.php:63
 #: include/fiche.inc.php:86 include/class/acc_ledger_search.class.php:556
 #: include/ajax/ajax_card.php:386 include/database.item.php:57
+#: html/recherche.php:87 include/class/acc_ledger_search.class.php:642
+#: include/lettering.account.inc.php:107 include/ajax/ajax_card.php:419
+#: include/ajax/ajax_search_operation.php:67
+#: include/ajax/ajax_search_operation.php:75
+#: include/ajax/ajax_anc_search.php:61
+#: include/ajax/ajax_add_concerned_card.php:90
+#: include/template/action_button.php:35 include/database.item.php:96
+#: include/lettering.card.inc.php:104 include/lib/html_input.class.php:984
+#: include/lib/html_input.class.php:1004 include/lib/html_input.class.php:1021
+#: include/upgrade-plugin.php:55
 #, php-format
 msgid "Recherche"
 msgstr "Vinden"
@@ -18016,7 +19410,7 @@ msgstr "Gedetailleerder Zoeken"
 #: include/ajax/ajax_card.php:373 include/ajax/ajax_card.php:374
 #: include/ajax/ajax_card.php:375 include/ajax/ajax_card.php:408
 #: include/ajax/ajax_card.php:411 include/fiche.inc.php:93
-#: include/ajax/ajax_card.php:412
+#: include/ajax/ajax_card.php:412 include/ajax/ajax_card.php:466
 msgid "Recherche de fiche"
 msgstr "VIND EEN blad"
 
@@ -18058,9 +19452,15 @@ msgstr "VIND EEN blad"
 #: include/ext/rapport_avance/include/formulaire_param_detail.class.php:368
 #: include/ajax/ajax_card.php:506 include/class/acc_report.class.php:151
 #: include/ajax/ajax_card.php:510 include/ajax/ajax_card.php:511
+#: include/ajax/ajax_card.php:587
 msgid "Recherche poste"
 msgstr "Bericht Vinden"
 
+#: include/class/card_attribut_mtable.class.php:43
+#, fuzzy
+msgid "Recherche suivi"
+msgstr "Activiteit zoeken"
+
 #: include/class_acc_ledger_fin.php:1037 include/class_acc_ledger.php:2842
 #: include/anc_great_ledger.inc.php:19 include/class_acc_ledger.php:2911
 #: include/class_anc_balance_double.php:342
@@ -18093,6 +19493,7 @@ msgstr "Bericht Vinden"
 #: include/class/acc_ledger_search.class.php:560
 #: include/class/acc_ledger_fin.class.php:1087
 #: include/class/anc_balance_double.class.php:370
+#: include/class/acc_ledger_search.class.php:646
 msgid "Rechercher"
 msgstr "Vinden"
 
@@ -18131,22 +19532,26 @@ msgstr "Analytische groep"
 
 #: include/database.item.php:74 include/database.item.php:77
 #: include/database.item.php:71 include/database.item.php:69
+#: include/database.item.php:70
 msgid "Regroupement des menus des journaux de trésorerie"
 msgstr ""
 
 #: include/database.item.php:119 include/database.item.php:122
 #: include/database.item.php:116 include/database.item.php:114
+#: include/database.item.php:115
 #, fuzzy
 msgid "Regroupement des menus ventes et recettes"
 msgstr "Menu Winsten"
 
 #: include/database.item.php:71 include/database.item.php:74
 #: include/database.item.php:68 include/database.item.php:66
+#: include/database.item.php:67
 msgid "Regroupement pour les menus d'achats(nouvelle opération, historique...)"
 msgstr ""
 
 #: include/database.item.php:117 include/database.item.php:120
 #: include/database.item.php:114 include/database.item.php:112
+#: include/database.item.php:113
 msgid ""
 "Regroupement pour les menus d'opérations diverses (nouvelle opération, "
 "historique...)"
@@ -18154,12 +19559,14 @@ msgstr ""
 
 #: include/database.item.php:124 include/database.item.php:127
 #: include/database.item.php:121 include/database.item.php:119
+#: include/database.item.php:120
 msgid ""
 "Regroupement pour les menus de trésorerie (nouvelle opération, historique...)"
 msgstr ""
 
 #: include/database.item.php:72 include/database.item.php:75
 #: include/database.item.php:69 include/database.item.php:67
+#: include/database.item.php:68
 msgid "Regroupement pour les menus et les profils"
 msgstr ""
 
@@ -18200,11 +19607,13 @@ msgstr "Records Management"
 
 #: include/user_menu.php:113 include/lib/user_menu.php:119
 #: include/lib/user_menu.php:120 include/lib/user_menu.php:77
+#: include/lib/user_menu.php:76
 msgid "Restaure"
 msgstr "Herstelt"
 
 #: include/user_menu.php:113 include/lib/user_menu.php:119
 #: include/lib/user_menu.php:120 include/lib/user_menu.php:77
+#: include/lib/user_menu.php:76
 msgid "Restaure une base de données"
 msgstr "Restore Database"
 
@@ -18228,6 +19637,7 @@ msgid "Reste à amortir"
 msgstr "Rest kussen"
 
 #: include/compta_fin_rec.inc.php:306 include/compta_fin_rec.inc.php:307
+#: include/compta_fin_rec.inc.php:348
 #, fuzzy
 msgid "Reste à selectionner"
 msgstr "Vinkje bij alle"
@@ -18272,11 +19682,13 @@ msgstr "Is te laat"
 #: include/modele.inc.php:403 include/modele.inc.php:443
 #: include/ajax/ajax_display_letter.php:39 include/cfgledger.inc.php:141
 #: include/ext/tva/ajax.php:35 html/do.php:312 html/do.php:281
-#: include/modele.inc.php:404 include/modele.inc.php:444
+#: include/modele.inc.php:404 include/modele.inc.php:444 html/do.php:283
+#: include/ajax/ajax_display_letter.php:53
 msgid "Retour"
 msgstr "Terug"
 
 #: include/action.inc.php:26 include/action.inc.php:25
+#: include/action.inc.php:27
 msgid "Retour liste"
 msgstr "Terug fractie Lijst"
 
@@ -18294,6 +19706,7 @@ msgstr "Terug naar de lijst"
 #: include/ajax_fiche_def_detail.php:40
 #: include/ajax/ajax_fiche_def_detail.php:40 include/param_sec.inc.php:135
 #: include/param_sec.inc.php:141 include/ajax/ajax_fiche_def_detail.php:41
+#: include/param_sec.inc.php:146
 msgid "Retour à la liste"
 msgstr "Terug naar de lijst"
 
@@ -18331,7 +19744,7 @@ msgid "Rue"
 msgstr "Straat "
 
 #: include/company.inc.php:103 include/company.inc.php:122
-#: include/company.inc.php:126
+#: include/company.inc.php:126 include/company.inc.php:134
 msgid "Rue "
 msgstr "Straat"
 
@@ -18344,7 +19757,7 @@ msgstr ""
 #: include/database.item.php:199 include/database.item.php:206
 #: include/database.item.php:183 include/database.item.php:184
 #: include/database.item.php:187 include/database.item.php:195
-#: include/database.item.php:200
+#: include/database.item.php:200 include/database.item.php:193
 msgid "Réception commande Client"
 msgstr "Client commando receptie"
 
@@ -18352,7 +19765,7 @@ msgstr "Client commando receptie"
 #: include/database.item.php:200 include/database.item.php:205
 #: include/database.item.php:182 include/database.item.php:183
 #: include/database.item.php:186 include/database.item.php:194
-#: include/database.item.php:199
+#: include/database.item.php:199 include/database.item.php:192
 msgid "Réception commande Fournisseur"
 msgstr "Command receptie Leverancier"
 
@@ -18360,7 +19773,7 @@ msgstr "Command receptie Leverancier"
 #: include/database.item.php:202 include/database.item.php:207
 #: include/database.item.php:184 include/database.item.php:185
 #: include/database.item.php:188 include/database.item.php:196
-#: include/database.item.php:201
+#: include/database.item.php:201 include/database.item.php:194
 msgid "Réception magazine"
 msgstr "Voorkant tijdschrift"
 
@@ -18374,6 +19787,7 @@ msgstr "Beschrijving"
 #: include/class/acc_ledger.class.php:981
 #: include/class/acc_ledger.class.php:986
 #: include/class/acc_ledger.class.php:1002
+#: include/class/acc_ledger.class.php:994
 #, fuzzy, php-format
 msgid "Réconciliation/rapprochements : %s"
 msgstr "Beschrijving"
@@ -18382,11 +19796,15 @@ msgstr "Beschrijving"
 msgid "Réel"
 msgstr "Echt"
 
+#: include/class/follow_up.class.php:624
+msgid "Réf."
+msgstr ""
+
 #: include/template/action_search.php:82 include/template/action_search.php:96
 #: include/export/export_gl_csv.php:95 include/export/export_gl_csv.php:90
 #: include/template/action_search.php:133 include/export/export_gl_csv.php:96
 #: include/export/export_gl_pdf.php:88 include/template/action_search.php:115
-#: include/template/action_show.php:38
+#: include/template/action_show.php:38 include/template/action_search.php:116
 msgid "Référence"
 msgstr "Referentie"
 
@@ -18400,6 +19818,7 @@ msgstr "Omslag"
 
 #: html/admin/template_config_form.php:33
 #: include/template/template_config_form.php:33
+#: include/template/template_config_form.php:34
 msgid "Répertoire temporaire"
 msgstr ""
 
@@ -18433,6 +19852,7 @@ msgstr ""
 #: include/ext/importbank/include/template/confirm_transfer.php:285
 #: include/verif_bilan.inc.php:152 include/verif_bilan.inc.php:214
 #: include/verif_bilan.inc.php:217 include/verif_bilan.inc.php:219
+#: include/verif_bilan.inc.php:150
 msgid "Résultat"
 msgstr "Resultaat"
 
@@ -18452,7 +19872,7 @@ msgid "Résultat limité à %d , %d nombre de fiches trouvées"
 msgstr "Beperkt tot% d resultaat% d aantal records gevonden"
 
 #: html/fid_card.php:164 html/fid_card.php:165 html/fid_card.php:170
-#: html/fid_card.php:169
+#: html/fid_card.php:169 html/fid_card.php:171
 #, php-format
 msgid "Résultat limité à 12"
 msgstr "Beperkt tot 12 resultaten"
@@ -18462,6 +19882,7 @@ msgid "Résultat recherche"
 msgstr "Resultaten opzoeking"
 
 #: include/template/account_result.php:6 include/template/card_result.php:6
+#: include/template/card_multiple_result.php:7
 msgid "Résultats"
 msgstr "Resultaten"
 
@@ -18476,6 +19897,7 @@ msgstr "Overzicht"
 #: include/balance.inc.php:465 include/export/export_balance_pdf.php:341
 #: include/export/export_balance_pdf.php:336
 #: include/export/export_balance_pdf.php:337
+#: include/export/export_balance_pdf.php:338
 msgid "Résumé Exercice courant"
 msgstr ""
 
@@ -18484,20 +19906,24 @@ msgstr ""
 #: include/balance.inc.php:458 include/export/export_balance_pdf.php:334
 #: include/export/export_balance_pdf.php:329
 #: include/export/export_balance_pdf.php:330
+#: include/export/export_balance_pdf.php:331
 msgid "Résumé Exercice précédent"
 msgstr ""
 
 #: include/export/export_printtva_pdf.php:49 include/database.item.php:141
+#: include/export/export_printtva_pdf.php:51 include/database.item.php:140
 #, fuzzy
 msgid "Résumé TVA"
 msgstr "Overzicht"
 
 #: include/export/export_printtva_pdf.php:301
+#: include/export/export_printtva_pdf.php:315
 #, fuzzy
 msgid "Résumé TVA Achat"
 msgstr "Overzicht"
 
 #: include/export/export_printtva_pdf.php:160
+#: include/export/export_printtva_pdf.php:164
 #, fuzzy
 msgid "Résumé TVA vente"
 msgstr "Overzicht"
@@ -18525,6 +19951,7 @@ msgstr ""
 #: include/class/follow_up.class.php:1782
 #: include/class/follow_up.class.php:1780
 #: include/class/follow_up.class.php:1781
+#: include/class/follow_up.class.php:1731
 #, fuzzy
 msgid "SECURITE : Ajout impossible"
 msgstr "Export is onmogelijk"
@@ -18586,7 +20013,9 @@ msgstr "Nieuwe lijn"
 #: include/template/dashboard.php:350 include/ajax/ajax_card.php:203
 #: include/ajax/ajax_card.php:517 include/ajax/ajax_mod_predf_op.php:54
 #: include/cfgledger.inc.php:137 include/ajax/ajax_card.php:204
-#: include/ajax/ajax_card.php:518
+#: include/ajax/ajax_card.php:518 include/ajax/ajax_mod_predf_op.php:67
+#: include/ajax/ajax_card.php:207 include/ajax/ajax_card.php:594
+#: include/company.inc.php:163
 msgid "Sauve"
 msgstr "OPSLAAN"
 
@@ -18684,6 +20113,10 @@ msgstr "Geen enkel model"
 #: include/template/stock_inv.php:107 include/class/acc_ledger.class.php:2028
 #: include/template/ledger_detail_bottom.php:315 include/ajax/ajax_card.php:165
 #: include/class/acc_ledger.class.php:2044
+#: include/class/acc_ledger.class.php:2063
+#: include/ajax/ajax_display_letter.php:226 include/ajax/ajax_card.php:168
+#: include/template/ledger_detail_bottom.php:333
+#: include/template/card_multiple_display_option.php:114
 msgid "Sauver"
 msgstr "OPSLAAN"
 
@@ -18717,6 +20150,7 @@ msgstr "Module instellen"
 #: include/class_fiche_def.php:776 include/class_fiche_def.php:788
 #: include/class/class_fiche_def.php:787 include/operation_ods_new.inc.php:95
 #: include/class/fiche_def.class.php:788 include/operation_ods_new.inc.php:98
+#: include/operation_ods_new.inc.php:99
 msgid "Sauvez"
 msgstr "OPSLAAN"
 
@@ -18734,7 +20168,7 @@ msgstr "Bewaard"
 #: include/lib/ac_common.php:810 include/lib/ac_common.php:817
 #: include/lib/ac_common.php:828 include/lib/ac_common.php:829
 #: include/lib/ac_common.php:841 include/lib/ac_common.php:843
-#: include/lib/ac_common.php:859
+#: include/lib/ac_common.php:859 include/lib/ac_common.php:869
 msgid "Se reconnecter pour revenir ici"
 msgstr ""
 
@@ -18761,6 +20195,7 @@ msgstr "Schatkist"
 #: include/class_follow_up.php:129 include/class/class_follow_up.php:128
 #: include/class/class_follow_up.php:129 include/class/follow_up.class.php:128
 #: include/class/follow_up.class.php:129 include/class/follow_up.class.php:130
+#: include/class/follow_up.class.php:135 include/class/follow_up.class.php:136
 #, fuzzy
 msgid "Securité"
 msgstr "Veiligheid"
@@ -18776,6 +20211,7 @@ msgstr "Veiligheid"
 #: include/class/acc_ledger_search.class.php:928
 #: include/class/acc_ledger_search.class.php:936
 #: include/class/acc_ledger_search.class.php:949
+#: include/class/acc_ledger_search.class.php:1038
 msgid "Selection"
 msgstr "Selectie"
 
@@ -18805,13 +20241,13 @@ msgid "Selectionnez votre langue"
 msgstr "Selecteer uw taal"
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
-#: include/class/periode.class.php:652
+#: include/class/periode.class.php:652 include/class/periode.class.php:653
 msgid "Septembre"
 msgstr ""
 
 # Plage heeft verschillende vertalingen: periode, marge/verschil, programmablok
 #: html/install.php:138 html/install.php:137 html/install.php:143
-#: html/install.php:150
+#: html/install.php:150 html/install.php:163
 #, fuzzy
 msgid "Serveur postgresql"
 msgstr "Basisklasse"
@@ -18826,11 +20262,13 @@ msgstr "Diensten-intra uitgestelde waarneming"
 
 #: include/template/param_jrn.php:136 include/template/param_jrn.php:143
 #: include/template/param_jrn.php:145 include/template/param_jrn.php:190
+#: include/template/param_jrn.php:191
 msgid "Services, fournitures ou biens  achetés (D)"
 msgstr ""
 
 #: include/template/param_jrn.php:197 include/template/param_jrn.php:204
 #: include/template/param_jrn.php:206 include/template/param_jrn.php:251
+#: include/template/param_jrn.php:252
 msgid "Services, fournitures ou biens  vendus (C)"
 msgstr ""
 
@@ -18849,6 +20287,12 @@ msgid ""
 "Acc_Ledger_History_Generic"
 msgstr ""
 
+#: html/user_login.php:132
+msgid ""
+"Si la redirection ne fonctionne pas, vous devez changer la valeur de "
+"NOALYSS_URL "
+msgstr ""
+
 #: include/lib/message_javascript.php:83 include/lib/message_javascript.php:85
 msgid "Si vous changez de page vous perdez les reconciliations, continuez ?"
 msgstr ""
@@ -18914,17 +20358,19 @@ msgstr "Situatie"
 #: include/database.item.php:171 include/database.item.php:170
 #: include/database.item.php:169 include/database.item.php:173
 #: include/database.item.php:178 include/database.item.php:183
+#: include/template/card_multiple_result.php:18 include/database.item.php:179
 msgid "Société"
 msgstr "Vennootschap"
 
 #: include/contact.inc.php:90 include/contact.inc.php:94
-#: include/contact.inc.php:95
+#: include/contact.inc.php:95 include/contact.inc.php:96
 msgid "Société :"
 msgstr "Bedrijf:"
 
 #: include/database.item.php:83 include/database.item.php:86
 #: include/database.item.php:91 include/database.item.php:88
 #: include/database.item.php:87 include/database.item.php:85
+#: include/database.item.php:84
 msgid "Sociétés"
 msgstr "Bedrijven"
 
@@ -18946,7 +20392,8 @@ msgstr "Bedrijven"
 #: include/class/anc_listing.class.php:120 include/class/fiche.class.php:1784
 #: include/class/anc_balance_double.class.php:101
 #: include/class/fiche.class.php:1785 include/export/export_balance_pdf.php:136
-#: include/class/pdfbalance_simple.class.php:58
+#: include/class/pdfbalance_simple.class.php:58 include/fiche.inc.php:420
+#: include/class/fiche.class.php:1811
 msgid "Solde"
 msgstr "evenwicht"
 
@@ -18978,18 +20425,25 @@ msgstr "evenwicht"
 msgid "Solde crédit"
 msgstr "Saldo credit"
 
-#: include/template/letter_all.php:117
+#: include/template/letter_all.php:117 include/export/export_balance_csv.php:79
 msgid "Solde créditeur"
 msgstr "Creditsaldo"
 
+#: include/template/letter_all.php:128
+#, fuzzy, php-format
+msgid "Solde créditeur : %s"
+msgstr "Creditsaldo"
+
 #: include/database.item.php:98 include/database.item.php:101
 #: include/database.item.php:106 include/database.item.php:103
 #: include/database.item.php:102 include/database.item.php:100
+#: include/database.item.php:99
 msgid "Solde des comptes en banques, caisse..."
 msgstr "Saldo van bankrekeningen, contant ..."
 
 #: include/database.item.php:103 include/database.item.php:106
 #: include/database.item.php:100 include/database.item.php:98
+#: include/database.item.php:99
 msgid ""
 "Solde des journaux de trésorerie cela concerne les comptes en banques, "
 "caisse , les chèques... "
@@ -18999,10 +20453,15 @@ msgstr ""
 msgid "Solde débit"
 msgstr "Saldo debet"
 
-#: include/template/letter_all.php:115
+#: include/template/letter_all.php:115 include/export/export_balance_csv.php:79
 msgid "Solde débiteur"
 msgstr "Debetsaldo"
 
+#: include/template/letter_all.php:126
+#, fuzzy, php-format
+msgid "Solde débiteur : %s"
+msgstr "Debetsaldo"
+
 #: include/template/form_ledger_fin.php:33
 msgid "Solde début"
 msgstr "Evenwicht begin"
@@ -19020,6 +20479,7 @@ msgstr "Nieuwe extract"
 #: include/database.item.php:98 include/database.item.php:101
 #: include/database.item.php:106 include/database.item.php:103
 #: include/database.item.php:102 include/database.item.php:100
+#: include/database.item.php:99
 msgid "Soldes"
 msgstr "Sales"
 
@@ -19030,7 +20490,8 @@ msgstr "Sales"
 #: include/lib/user_menu.php:125 include/lib/user_menu.php:144
 #: include/database.item.php:107 include/database.item.php:101
 #: include/database.item.php:99 include/lib/user_menu.php:82
-#: include/lib/user_menu.php:101
+#: include/lib/user_menu.php:101 include/lib/user_menu.php:81
+#: include/lib/user_menu.php:100
 msgid "Sortie"
 msgstr "Uitgang"
 
@@ -19043,23 +20504,24 @@ msgid "Sortie &#9094"
 msgstr "Uitgang"
 
 #: include/class/periode.class.php:521 include/class/periode.class.php:523
-#: include/class/periode.class.php:525
+#: include/class/periode.class.php:525 include/class/periode.class.php:526
 msgid "Status"
 msgstr ""
 
 #: include/database.item.php:107 include/database.item.php:110
 #: include/database.item.php:116 include/database.item.php:113
 #: include/database.item.php:112 include/database.item.php:108
+#: include/database.item.php:109
 msgid "Stock"
 msgstr "Voorraad"
 
 #: include/user_menu.php:150 include/user_menu.php:154
 #: include/lib/user_menu.php:163 include/lib/user_menu.php:176
-#: include/lib/user_menu.php:134
+#: include/lib/user_menu.php:134 include/lib/user_menu.php:133
 msgid "Stock et commande"
 msgstr "Voorraad in Bestelling"
 
-#: include/impress_jrn.inc.php:156
+#: include/impress_jrn.inc.php:156 include/impress_jrn.inc.php:170
 #, fuzzy
 msgid "Style d'impression"
 msgstr "Print menu"
@@ -19070,12 +20532,12 @@ msgid "Suggestion"
 msgstr "Beheer"
 
 #: include/company.inc.php:120 include/company.inc.php:139
-#: include/company.inc.php:143
+#: include/company.inc.php:143 include/company.inc.php:157
 msgid "Suggérer la date"
 msgstr "Suggereren de datum"
 
 #: include/company.inc.php:119 include/company.inc.php:138
-#: include/company.inc.php:142
+#: include/company.inc.php:142 include/company.inc.php:156
 msgid "Suggérer le numéro de pièce justificative"
 msgstr "Suggeren nummer van de akte"
 
@@ -19100,7 +20562,7 @@ msgstr "Gevolgd leverancier, klant, bank, offerte, order, mail"
 #: include/database.item.php:122 include/database.item.php:125
 #: include/database.item.php:131 include/database.item.php:127
 #: include/database.item.php:126 include/database.item.php:130
-#: include/database.item.php:124
+#: include/database.item.php:124 include/database.item.php:123
 msgid "Suivi administration, banque"
 msgstr "Gevolgd administratie, bank"
 
@@ -19108,16 +20570,19 @@ msgstr "Gevolgd administratie, bank"
 #: include/database.item.php:108 include/database.item.php:105
 #: include/database.item.php:104 include/database.item.php:21
 #: include/database.item.php:24 include/database.item.php:17
+#: include/database.item.php:16
 msgid "Suivi client"
 msgstr "Customer care"
 
 #: include/database.item.php:21 include/database.item.php:24
 #: include/database.item.php:17 include/database.item.php:15
+#: include/database.item.php:16
 msgid "Suivi client : devis, réunion, courrier, commande..."
 msgstr ""
 
 #: include/database.item.php:130 include/database.item.php:133
 #: include/database.item.php:127 include/database.item.php:125
+#: include/database.item.php:126
 msgid ""
 "Suivi de vos salariés, managers ainsi que des administrateurs, pour les "
 "documents et les opérations comptables"
@@ -19125,24 +20590,26 @@ msgstr ""
 
 #: include/database.item.php:127 include/database.item.php:130
 #: include/database.item.php:124 include/database.item.php:122
+#: include/database.item.php:123
 msgid "Suivi des administrations : courrrier, déclarations."
 msgstr ""
 
 #: include/database.item.php:16 include/database.item.php:19
 #: include/database.item.php:13 include/database.item.php:11
+#: include/database.item.php:12
 msgid "Suivi des fournisseurs : devis, lettres, email...."
 msgstr ""
 
 #: include/database.item.php:125 include/database.item.php:128
 #: include/database.item.php:134 include/database.item.php:130
 #: include/database.item.php:129 include/database.item.php:133
-#: include/database.item.php:127
+#: include/database.item.php:127 include/database.item.php:126
 msgid "Suivi des gérants, administrateurs et salariés"
 msgstr "Monitoring van managers, bestuurders en werknemers"
 
 #: include/database.item.php:11 include/database.item.php:14
 #: include/database.item.php:16 include/database.item.php:19
-#: include/database.item.php:13
+#: include/database.item.php:13 include/database.item.php:12
 msgid "Suivi fournisseur"
 msgstr "Leverancier controle"
 
@@ -19211,15 +20678,16 @@ msgstr ""
 #: html/ajax_misc.php:235 html/ajax_misc.php:313 html/ajax_misc.php:318
 #: html/ajax_misc.php:346 html/ajax_misc.php:458 html/ajax_misc.php:460
 #: html/ajax_misc.php:466 html/ajax_misc.php:468 html/ajax_misc.php:472
+#: html/ajax_misc.php:437
 msgid "Symbole"
 msgstr "Symbool"
 
-#: include/param_sec.inc.php:88
+#: include/param_sec.inc.php:88 include/param_sec.inc.php:89
 msgid "Séc. Action actif"
 msgstr ""
 
 # Controleren of dit hetzelfde betekent (beide boekhoudkundige termen)
-#: include/param_sec.inc.php:87
+#: include/param_sec.inc.php:87 include/param_sec.inc.php:88
 #, fuzzy
 msgid "Séc. Journaux actif"
 msgstr "Inkoopdagboeken"
@@ -19227,20 +20695,25 @@ msgstr "Inkoopdagboeken"
 #: include/database.item.php:89 include/database.item.php:92
 #: include/database.item.php:97 include/database.item.php:94
 #: include/database.item.php:93 include/export/export_security_pdf.php:89
-#: include/database.item.php:91
+#: include/database.item.php:91 include/database.item.php:90
 msgid "Sécurité"
 msgstr "Veiligheid"
 
-#: include/param_sec.inc.php:298
+#: include/param_sec.inc.php:298 include/param_sec.inc.php:309
 #, fuzzy
 msgid "Sécurité sur les actions"
 msgstr "Alle Operaties"
 
-#: include/param_sec.inc.php:231
+#: include/param_sec.inc.php:231 include/param_sec.inc.php:234
 #, fuzzy
 msgid "Sécurité sur les journaux"
 msgstr "Alle dagboeken"
 
+#: include/lib/select_dialog.class.php:48
+#, fuzzy
+msgid "Sélection"
+msgstr "Selectie"
+
 #: include/template/action_other_action.php:18
 msgid "Sélectionner les documents et l' action :"
 msgstr "Alle documenten en actie:"
@@ -19340,6 +20813,8 @@ msgstr ""
 #: include/template/acc_ledger_history_purchase_extended.php:129
 #: include/template/acc_ledger_history_sale_extended.php:130
 #: include/class/print_ledger_detail_item.class.php:164
+#: include/class/acc_ledger_history_sale.class.php:260
+#: include/tax_summary.inc.php:43 include/database.item.php:9
 msgid "TVA"
 msgstr "BTW"
 
@@ -19359,9 +20834,16 @@ msgstr "Fiscaal aftrekbaar"
 #: include/template/ledger_detail_ach.php:134
 #: include/template/ledger_detail_ach.php:135
 #: include/class/print_ledger_simple.class.php:114
+#: include/class/print_ledger_simple.class.php:111
+#: include/export/export_printtva_pdf.php:217
 msgid "TVA ND"
 msgstr "BTW ND"
 
+#: include/export/export_printtva_pdf.php:217
+#, fuzzy
+msgid "TVA ND récup"
+msgstr "BTW ingevorderd"
+
 #: include/template/operation_detail_ach.php:53
 #: include/template/operation_detail_ven.php:45
 #: include/export/export_ledger_csv.php:248
@@ -19373,6 +20855,8 @@ msgstr "BTW ND"
 #: include/class/acc_ledger_history_purchase.class.php:260
 #: include/class/acc_ledger_history_purchase.class.php:264
 #: include/class/print_ledger_detail_item.class.php:162
+#: include/class/acc_ledger_history_purchase.class.php:275
+#: include/class/print_ledger_simple.class.php:113
 #, fuzzy
 msgid "TVA NP"
 msgstr "BTW ND"
@@ -19389,6 +20873,7 @@ msgstr "BTW ND"
 #: include/class/acc_ledger_purchase.class.php:1853
 #: include/class/acc_ledger_purchase.class.php:1856
 #: include/class/acc_ledger_purchase.class.php:1862
+#: include/class/acc_ledger_purchase.class.php:1899
 #, fuzzy
 msgid "TVA NP opération"
 msgstr "BTW handeling"
@@ -19397,6 +20882,7 @@ msgstr "BTW handeling"
 #: include/template/tax_summary_display.php:309
 #: include/export/export_printtva_csv.php:66
 #: include/export/export_printtva_pdf.php:213
+#: include/export/export_printtva_csv.php:78
 #, fuzzy
 msgid "TVA Non Déd"
 msgstr "Niet Betaald &#39;"
@@ -19405,6 +20891,7 @@ msgstr "Niet Betaald &#39;"
 #: include/template/tax_summary_display.php:312
 #: include/export/export_printtva_csv.php:67
 #: include/export/export_printtva_pdf.php:213
+#: include/export/export_printtva_csv.php:79
 #, fuzzy
 msgid "TVA Non Déd & récup"
 msgstr "BTW ingevorderd"
@@ -19430,6 +20917,8 @@ msgstr "BTW ingevorderd"
 #: include/class/acc_ledger_purchase.class.php:1845
 #: include/class/acc_ledger_sold.class.php:1425
 #: include/class/acc_ledger_purchase.class.php:1851
+#: include/class/acc_ledger_purchase.class.php:1888
+#: include/class/acc_ledger_sold.class.php:1410
 #, fuzzy
 msgid "TVA Non Payé"
 msgstr "Niet Betaald &#39;"
@@ -19460,6 +20949,8 @@ msgstr "Niet Betaald &#39;"
 #: include/class/acc_ledger_purchase.class.php:1855
 #: include/class/acc_ledger_sold.class.php:1432
 #: include/class/acc_ledger_purchase.class.php:1861
+#: include/class/acc_ledger_purchase.class.php:1898
+#: include/class/acc_ledger_sold.class.php:1417
 msgid "TVA Opération"
 msgstr "BTW handeling"
 
@@ -19495,14 +20986,22 @@ msgstr ""
 #: include/class/acc_ledger_history_sale.class.php:251
 #: include/class/acc_ledger_sold.class.php:1424
 #: include/class/acc_ledger_purchase.class.php:1850
+#: include/class/acc_ledger_history_sale.class.php:261
+#: include/class/acc_ledger_purchase.class.php:1887
+#: include/class/acc_ledger_sold.class.php:1409
 msgid "TVA annulée"
 msgstr "Geannuleerd BTW"
 
+#: include/lib/message_javascript.php:107
+msgid "TVA due ou récupérable quand l'opération est payée ou exécutée"
+msgstr ""
+
 #: include/database.item.php:134 include/database.item.php:137
 #: include/database.item.php:177 include/database.item.php:181
 #: include/database.item.php:180 include/database.item.php:139
 #: include/database.item.php:140 include/database.item.php:141
 #: include/database.item.php:146 include/database.item.php:151
+#: include/database.item.php:147
 msgid "TVA non déductible"
 msgstr "Niet-aftrekbare BTW"
 
@@ -19511,6 +21010,7 @@ msgstr "Niet-aftrekbare BTW"
 #: include/database.item.php:181 include/database.item.php:140
 #: include/database.item.php:141 include/database.item.php:142
 #: include/database.item.php:147 include/database.item.php:152
+#: include/database.item.php:148
 msgid "TVA non déductible récupérable par l'impôt"
 msgstr "Niet-aftrekbare BTW terugvorderbaar door de Belastingdienst"
 
@@ -19528,6 +21028,7 @@ msgstr "Niet-aftrekbare BTW terugvorderbaar door de Belastingdienst"
 #: include/class/acc_ledger_purchase.class.php:1850
 #: include/class/acc_ledger_purchase.class.php:1853
 #: include/class/acc_ledger_purchase.class.php:1859
+#: include/class/acc_ledger_purchase.class.php:1896
 msgid "TVA récup."
 msgstr "BTW ingevorderd"
 
@@ -19558,6 +21059,7 @@ msgstr "BTW ingevorderd"
 #: include/template/acc_ledger_history_purchase_extended.php:131
 #: include/template/acc_ledger_history_sale_extended.php:132
 #: include/class/print_ledger_detail_item.class.php:165
+#: include/class/print_ledger_detail_item.class.php:64
 msgid "TVAC"
 msgstr "BTW Met"
 
@@ -19567,13 +21069,15 @@ msgstr "BTW Met"
 #: include/class/acc_ledger_history_sale.class.php:262
 #: include/class/acc_ledger_history_purchase.class.php:271
 #: include/class/acc_ledger_history_purchase.class.php:276
+#: include/class/acc_ledger_history_sale.class.php:272
+#: include/class/acc_ledger_history_purchase.class.php:287
 #, fuzzy
 msgid "TVAC/TTC"
 msgstr "BTW Met"
 
 #: include/database.item.php:5 include/database.item.php:8
 #: include/database.item.php:10 include/database.item.php:13
-#: include/database.item.php:7
+#: include/database.item.php:7 include/database.item.php:6
 msgid "Tableau"
 msgstr "Tafel"
 
@@ -19588,11 +21092,13 @@ msgstr "Tabel afschrijving per jaar"
 #: include/database.item.php:116 include/database.item.php:119
 #: include/database.item.php:125 include/database.item.php:122
 #: include/database.item.php:121 include/database.item.php:117
+#: include/database.item.php:118
 msgid "Tableau de bord"
 msgstr "Dashboard"
 
 #: include/database.item.php:122 include/database.item.php:125
 #: include/database.item.php:119 include/database.item.php:117
+#: include/database.item.php:118
 msgid ""
 "Tableau de suivi, vous permet de voir en un coup d'oeil vos dernières "
 "opérations, un petit calendrier, une liste de chose à faire..."
@@ -19600,13 +21106,15 @@ msgstr ""
 
 #: include/database.item.php:5 include/database.item.php:8
 #: include/database.item.php:10 include/database.item.php:13
-#: include/database.item.php:7
+#: include/database.item.php:7 include/database.item.php:6
 msgid "Tableau lié à la comptabilité"
 msgstr "Tabel met betrekking tot boekhouding"
 
 #: include/template/tag_list.php:11 include/template/tag_search_select.php:16
 #: include/template/tag_select.php:16 include/template/tag_list.php:12
 #: include/template/tag_search_select.php:18 include/template/tag_select.php:20
+#: include/template/tag_select.php:22 include/template/tag_search_select.php:21
+#: include/template/tag_list.php:13
 msgid "Tag"
 msgstr "Tag"
 
@@ -19619,6 +21127,7 @@ msgstr "Totale activa"
 #: include/card_attr.inc.php:96 include/dossier.inc.php:204
 #: include/dossier.inc.php:238 include/dossier.inc.php:239
 #: include/dossier.inc.php:242 include/dossier.inc.php:247
+#: include/class/card_attribut_mtable.class.php:41
 msgid "Taille"
 msgstr "Aantal"
 
@@ -19659,7 +21168,11 @@ msgstr ""
 #: include/export/export_printtva_csv.php:41
 #: include/export/export_printtva_csv.php:60
 #: include/export/export_printtva_pdf.php:57
-#: include/export/export_printtva_pdf.php:212
+#: include/export/export_printtva_pdf.php:212 html/ajax_misc.php:436
+#: include/export/export_printtva_pdf.php:59
+#: include/export/export_printtva_pdf.php:216
+#: include/export/export_printtva_csv.php:53
+#: include/export/export_printtva_csv.php:72
 msgid "Taux"
 msgstr "Tarief"
 
@@ -19686,6 +21199,7 @@ msgid "Taux de TVA"
 msgstr "Tarief van de BTW"
 
 #: include/class/tva_rate_mtable.class.php:215
+#: include/class/tva_rate_mtable.class.php:232
 #, fuzzy
 msgid "Taux de TVA invalide"
 msgstr "Ongeldige code"
@@ -19695,6 +21209,8 @@ msgid "Test Inplace_Edit"
 msgstr ""
 
 #: include/card_attr.inc.php:77 include/card_attr.inc.php:78
+#: include/class/card_attribut_mtable.class.php:51
+#: include/class/contact_option_ref_mtable.class.php:42
 msgid "Texte"
 msgstr "Tekst"
 
@@ -19752,6 +21268,14 @@ msgstr "Thema"
 #: include/class/fiche.class.php:1476 include/export/export_ledger_csv.php:214
 #: include/export/export_ledger_csv.php:222
 #: include/class/acc_ledger_history_generic.class.php:686
+#: include/class/acc_ledger_search.class.php:736
+#: include/class/print_ledger_misc.class.php:45
+#: include/class/fiche.class.php:1503
+#: include/class/acc_account_ledger.class.php:388
+#: include/class/acc_ledger_history_generic.class.php:687
+#: include/class/anc_grandlivre.class.php:229
+#: include/export/export_ledger_csv.php:230
+#: include/export/export_histo_csv.php:46
 msgid "Tiers"
 msgstr "Derde"
 
@@ -19769,6 +21293,7 @@ msgstr "Derde"
 #: include/template/detail-action.php:258 include/template/dashboard.php:348
 #: include/ext/invoicing/include/invoice_send_mail_input.inc.php:139
 #: include/template/action_show.php:40 include/template/dashboard.php:346
+#: include/class/follow_up.class.php:627
 msgid "Titre"
 msgstr "Titel"
 
@@ -19790,6 +21315,7 @@ msgstr "Titel"
 #: include/class_print_ledger_detail_item.php:61
 #: include/class/class_print_ledger_detail_item.php:61
 #: include/class/print_ledger_detail_item.class.php:61
+#: include/class/print_ledger_detail_item.class.php:60
 #, fuzzy
 msgid "Tot HTVA"
 msgstr "Totaal Zonder BTW"
@@ -19797,6 +21323,7 @@ msgstr "Totaal Zonder BTW"
 #: include/class_print_ledger_detail_item.php:64
 #: include/class/class_print_ledger_detail_item.php:64
 #: include/class/print_ledger_detail_item.class.php:64
+#: include/class/print_ledger_detail_item.class.php:63
 #, fuzzy
 msgid "Tot TVA"
 msgstr "Totaal BTW"
@@ -19804,6 +21331,7 @@ msgstr "Totaal BTW"
 #: include/class_print_ledger_detail_item.php:62
 #: include/class/class_print_ledger_detail_item.php:62
 #: include/class/print_ledger_detail_item.class.php:62
+#: include/class/print_ledger_detail_item.class.php:61
 #, fuzzy
 msgid "Tot TVA NP"
 msgstr "Totaal BTW"
@@ -19872,6 +21400,8 @@ msgstr "Totaal BTW"
 #: include/class/anc_listing.class.php:118
 #: include/class/anc_balance_double.class.php:83
 #: include/class/anc_balance_double.class.php:278
+#: include/template/form_ledger_detail.php:116
+#: include/template/predf_ledger_detail.php:80
 msgid "Total"
 msgstr "Totaal"
 
@@ -19882,6 +21412,7 @@ msgstr "Totaal"
 #: include/template/form_ledger_detail.php:79
 #: include/template/form_ledger_detail.php:83
 #: include/template/impress_reconciliation.php:65
+#: include/template/form_ledger_detail.php:86
 msgid "Total "
 msgstr "Totaal"
 
@@ -19948,6 +21479,10 @@ msgstr "Debet Totaal"
 #: include/class/acc_ledger_purchase.class.php:1848
 #: include/class/acc_ledger_sold.class.php:1428
 #: include/class/acc_ledger_purchase.class.php:1854
+#: include/class/acc_ledger_purchase.class.php:1891
+#: include/class/acc_ledger_sold.class.php:1413
+#: include/template/form_ledger_detail.php:79
+#: include/template/predf_ledger_detail.php:76
 msgid "Total HTVA"
 msgstr "Totaal Zonder BTW"
 
@@ -19975,6 +21510,9 @@ msgstr "Totaal Zonder BTW"
 #: include/class/acc_ledger_purchase.class.php:1643
 #: include/class/acc_ledger_sold.class.php:900
 #: include/class/acc_ledger_purchase.class.php:1646
+#: include/class/acc_ledger_purchase.class.php:1659
+#: include/class/acc_ledger_sold.class.php:904
+#: include/template/predf_ledger_detail.php:77
 msgid "Total TVA"
 msgstr "Totaal BTW"
 
@@ -20002,6 +21540,9 @@ msgstr "Totaal BTW"
 #: include/class/acc_ledger_purchase.class.php:1644
 #: include/class/acc_ledger_sold.class.php:901
 #: include/class/acc_ledger_purchase.class.php:1647
+#: include/class/acc_ledger_purchase.class.php:1660
+#: include/class/acc_ledger_sold.class.php:905
+#: include/template/predf_ledger_detail.php:78
 msgid "Total TVAC"
 msgstr "Totaal zet BTW"
 
@@ -20026,6 +21567,7 @@ msgstr "Totale last"
 #: include/class/class_fiche.php:1606 include/class/fiche.class.php:1760
 #: include/class/fiche.class.php:1763 include/class/fiche.class.php:1765
 #: include/class/fiche.class.php:1783 include/class/fiche.class.php:1784
+#: include/class/fiche.class.php:1810
 msgid "Total crédit"
 msgstr "Credit Totaal"
 
@@ -20041,6 +21583,7 @@ msgstr "Rekeningoverzicht"
 #: include/class/class_fiche.php:1605 include/class/fiche.class.php:1759
 #: include/class/fiche.class.php:1762 include/class/fiche.class.php:1764
 #: include/class/fiche.class.php:1782 include/class/fiche.class.php:1783
+#: include/class/fiche.class.php:1809
 msgid "Total débit"
 msgstr "Debet Totaal"
 
@@ -20059,6 +21602,7 @@ msgstr "Totale niveau"
 #: include/class/acc_ledger_history_generic.class.php:684
 #: include/class/acc_ledger_history_generic.class.php:685
 #: include/class/acc_ledger_history_generic.class.php:688
+#: include/class/acc_ledger_history_generic.class.php:689
 #, fuzzy
 msgid "Total opération"
 msgstr "Retail operatie"
@@ -20151,10 +21695,25 @@ msgstr "Total Credit"
 #: include/template/acc_ledger_history_purchase_extended.php:160
 #: include/template/acc_ledger_history_sale_extended.php:161
 #: include/class/acc_ledger_history_generic.class.php:741
-#: include/class/acc_ledger.class.php:740
+#: include/class/acc_ledger.class.php:740 include/fiche.inc.php:459
+#: include/class/fiche.class.php:1589
+#: include/class/acc_ledger_purchase.class.php:1601
+#: include/class/acc_ledger_sold.class.php:848
+#: include/class/acc_account_ledger.class.php:431
+#: include/class/acc_ledger_history_generic.class.php:742
 msgid "Totaux"
 msgstr "Totalen"
 
+#: include/export/export_balance_pdf.php:179
+#, fuzzy, php-format
+msgid "Totaux %s "
+msgstr "Totalen"
+
+#: include/class/acc_balance.class.php:279
+#, fuzzy, php-format
+msgid "Totaux %s %s"
+msgstr "Totalen"
+
 #: include/balance.inc.php:111 include/balance.inc.php:112
 #: include/balance.inc.php:118 include/balance.inc.php:119
 #: include/balance.inc.php:122
@@ -20165,6 +21724,7 @@ msgstr "Het totaal per subniveau"
 #: include/user.inc.php:176 include/user.inc.php:178
 #: include/ext/importbank/include/import_bank.class.php:136
 #: include/template/tag_search_select.php:14
+#: include/template/tag_search_select.php:17
 msgid "Tous"
 msgstr ""
 
@@ -20182,6 +21742,11 @@ msgstr ""
 msgid "Tous les Etats"
 msgstr "Alle staten"
 
+#: include/class/follow_up.class.php:1128
+#, fuzzy
+msgid "Tous les actions ouvertes"
+msgstr "Alle Operaties"
+
 #: include/ext/amortis/include/am_card.php:43
 msgid "Tous les biens y compris ceux qui sont complétement amortis"
 msgstr "Alle woningen inclusief die volledig afgeschreven"
@@ -20217,6 +21782,7 @@ msgstr ""
 #: include/class/follow_up.class.php:1245
 #: include/class/follow_up.class.php:1243
 #: include/class/follow_up.class.php:1244
+#: include/class/follow_up.class.php:1161
 msgid "Tous les profiles"
 msgstr "Alle profielen"
 
@@ -20231,6 +21797,7 @@ msgstr "Alle profielen"
 #: include/class/follow_up.class.php:1205
 #: include/class/follow_up.class.php:1203
 #: include/class/follow_up.class.php:1204
+#: include/class/follow_up.class.php:1121
 msgid "Tous les types"
 msgstr "Alle soorten"
 
@@ -20256,7 +21823,8 @@ msgstr ""
 
 # Je suppose que TKPDF est comme PDF?
 #: html/install.php:632 html/install.php:592 html/install.php:639
-#: html/install.php:595 html/install.php:642
+#: html/install.php:595 html/install.php:642 html/install.php:645
+#: html/install.php:695
 #, fuzzy
 msgid "Tout est installé"
 msgstr "TKPDF is niet geïnstalleerd"
@@ -20274,13 +21842,19 @@ msgstr "Up-to-date brengen"
 msgid "Tout sélectionner"
 msgstr "Alles selecteren"
 
+#: include/class/acc_ledger_search.class.php:212
+#, fuzzy
+msgid "Toutes"
+msgstr "Alles"
+
 #: include/param_sec.inc.php:320 include/param_sec.inc.php:260
-#: include/param_sec.inc.php:292
+#: include/param_sec.inc.php:292 include/template/security_list_action.php:8
 #, fuzzy
 msgid "Toutes les actions"
 msgstr "Alle Operaties"
 
 #: include/class/acc_plan_mtable.class.php:196
+#: include/class/acc_plan_mtable.class.php:213
 #, fuzzy
 msgid "Toutes les fiches"
 msgstr "Alle bladen in PDF"
@@ -20292,12 +21866,19 @@ msgstr "Alle bladen in PDF"
 #: include/category_card.inc.php:67 include/category_card.inc.php:68
 #: include/category_card.inc.php:71 include/impress_poste.inc.php:103
 #: include/category_card.inc.php:76 include/category_card.inc.php:78
+#: include/impress_jrn.inc.php:156
 msgid "Toutes les opérations"
 msgstr "Alle Operaties"
 
+#: include/template/action_search.php:149
+#, fuzzy
+msgid "Toutes les étiquettes"
+msgstr "Toevoeging van een label"
+
 #: include/lettering.account.inc.php:84 include/lettering.card.inc.php:89
 #: include/lettering.gestion.inc.php:41 include/lettering.gestion.inc.php:40
-#: include/lettering.account.inc.php:92
+#: include/lettering.account.inc.php:92 include/lettering.account.inc.php:93
+#: include/lettering.card.inc.php:91
 msgid "Toutes opérations"
 msgstr "Alle activiteiten"
 
@@ -20342,6 +21923,7 @@ msgstr ""
 #: include/template/detail-action.php:383
 #: include/template/detail-action.php:390
 #: include/template/detail-action.php:392
+#: include/template/follow_up_detail_display.php:203
 msgid "Transformer en facture"
 msgstr "Omzetten in een factuur"
 
@@ -20370,7 +21952,7 @@ msgstr "trimester"
 #: include/database.item.php:119 include/database.item.php:122
 #: include/database.item.php:128 include/database.item.php:124
 #: include/database.item.php:123 include/database.item.php:127
-#: include/database.item.php:121
+#: include/database.item.php:121 include/database.item.php:120
 msgid "Trésorerie"
 msgstr "Schatkist"
 
@@ -20403,10 +21985,15 @@ msgstr "BTW NTV"
 #: include/class/fiche.class.php:1463
 #: include/class/acc_ledger_search.class.php:1106
 #: include/class/fiche.class.php:1477 include/class/fiche.class.php:1478
+#: include/class/acc_ledger_search.class.php:1195
+#: include/class/fiche.class.php:1505
+#: include/class/card_attribut_mtable.class.php:40
+#: include/class/acc_account_ledger.class.php:390
 msgid "Type"
 msgstr "Type"
 
 #: include/param_pcmn.inc.php:57 include/param_pcmn.inc.php:58
+#: include/class/contact_option_ref_mtable.class.php:37
 msgid "Type "
 msgstr "Type"
 
@@ -20420,6 +22007,7 @@ msgstr "Type"
 #: include/class/follow_up.class.php:1696
 #: include/class/follow_up.class.php:1694
 #: include/class/follow_up.class.php:1695
+#: include/class/follow_up.class.php:1643
 #, fuzzy
 msgid "Type action invalide"
 msgstr "Ongeldige opties"
@@ -20445,11 +22033,13 @@ msgstr "Soort document"
 #: include/template/new_mod_payment.php:28 include/payment_middle.inc.php:121
 #: include/payment_middle.inc.php:122
 #: include/class/payment_method_mtable.class.php:40
+#: include/class/payment_method_mtable.class.php:41
 msgid "Type de fiche"
 msgstr "Soort blad"
 
 #: include/template/param_jrn.php:78 include/template/param_jrn.php:85
 #: include/template/param_jrn.php:6
+#: include/class/operation_predef_mtable.class.php:53
 msgid "Type de journal"
 msgstr "Soort boek van"
 
@@ -20475,12 +22065,15 @@ msgstr "Soort blad"
 #: include/lib/http_input.class.php:65 include/lib/http_input.class.php:73
 #: include/ajax/ajax_gestion.php:81 include/lib/http_input.class.php:62
 #: include/lib/http_input.class.php:72 include/lib/http_input.class.php:80
+#: include/lib/http_input.class.php:92 include/lib/http_input.class.php:106
+#: include/lib/http_input.class.php:118
 #, fuzzy
 msgid "Type invalide"
 msgstr "Ongeldig verzoek"
 
 #: include/operation_ods_confirm.inc.php:54
 #: include/template/ledger_detail_bottom.php:155
+#: include/template/ledger_detail_bottom.php:160
 #, fuzzy
 msgid "Type opération"
 msgstr "Datum van de verrichting"
@@ -20517,6 +22110,7 @@ msgstr "Alle facturen downloaden"
 #: include/template/stock_summary_list.php:42 include/company.inc.php:118
 #: include/ext/sav/include/template/sas_display_detail.php:115
 #: include/ajax/ajax_mod_stock_repo.php:71 include/company.inc.php:122
+#: include/company.inc.php:130
 msgid "Téléphone"
 msgstr "Telefoon"
 
@@ -20533,6 +22127,11 @@ msgstr "onbestaand"
 msgid "Un instant svp"
 msgstr ""
 
+#: include/lettering.account.inc.php:139
+#, fuzzy
+msgid "Un instant..."
+msgstr "onbestaand"
+
 #: include/class_acc_ledger.php:3410 include/class_acc_ledger.php:3480
 #: include/class_acc_ledger.php:3479 include/class_acc_ledger.php:3495
 #: include/class_acc_ledger.php:3512 include/class_acc_ledger.php:3539
@@ -20546,11 +22145,14 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2318
 #: include/class/acc_ledger.class.php:2327
 #: include/class/acc_ledger.class.php:2349
+#: include/class/acc_ledger.class.php:2373
 msgid "Un journal avec ce nom existe déjà"
 msgstr "Een journaal met deze naam bestaat al"
 
 #: include/class/payment_method_mtable.class.php:68
 #: include/class/payment_method_mtable.class.php:92
+#: include/class/payment_method_mtable.class.php:69
+#: include/class/payment_method_mtable.class.php:93
 #, fuzzy
 msgid "Un libellé est obligatoire"
 msgstr "Het onderwerp is verplicht"
@@ -20576,13 +22178,19 @@ msgstr ""
 msgid "Unicode"
 msgstr "code"
 
+#: include/template/action_document_type_mtable_input.php:115
+#, fuzzy
+msgid "Unique"
+msgstr "Analytisch"
+
 #: include/param_sec.inc.php:279 include/param_sec.inc.php:221
-#: include/param_sec.inc.php:225
+#: include/param_sec.inc.php:225 include/param_sec.inc.php:263
 #, fuzzy
 msgid "Uniquement Lecture"
 msgstr "ALLEEN cijffers"
 
 #: include/template/tag_search_select.php:13
+#: include/template/tag_search_select.php:16
 #, fuzzy
 msgid "Uniquement actif"
 msgstr "ALLEEN cijffers"
@@ -20603,6 +22211,11 @@ msgstr "Enkel open rekeningen"
 msgid "Uniquement des chiffres"
 msgstr "ALLEEN cijffers"
 
+#: include/company.inc.php:120
+#, fuzzy
+msgid "Uniquement des chiffres séparés par des virgules"
+msgstr "ALLEEN cijffers"
+
 #: include/class_document_modele.php:259
 #: include/template/modele_document.php:48
 #: include/class/class_document_modele.php:259
@@ -20627,7 +22240,8 @@ msgstr "Alleen de verkoop van kranten"
 
 #: include/param_sec.inc.php:285 include/param_sec.inc.php:227
 #: include/param_sec.inc.php:280 include/param_sec.inc.php:258
-#: include/param_sec.inc.php:337
+#: include/param_sec.inc.php:337 include/param_sec.inc.php:269
+#: include/param_sec.inc.php:352
 #, fuzzy
 msgid "Uniquement lecture"
 msgstr "ALLEEN cijffers"
@@ -20642,10 +22256,25 @@ msgstr "Enkel open rekeningen"
 msgid "Uniquement les opérations non lettrées"
 msgstr "Alleen interne acties"
 
-#: include/template/param_jrn.php:93
+#: include/impress_jrn.inc.php:158
+#, fuzzy
+msgid "Uniquement non payées"
+msgstr "In Actie Alleen niet betalend"
+
+#: include/template/param_jrn.php:93 include/template/param_jrn.php:94
 msgid "Uniquement note de débit ou crédit"
 msgstr ""
 
+#: include/impress_jrn.inc.php:157
+#, fuzzy
+msgid "Uniquement payées"
+msgstr "In Actie Alleen niet betalend"
+
+#: include/impress_jrn.inc.php:162
+#, fuzzy
+msgid "Uniquement pour journaux vente et achat"
+msgstr "Alleen de verkoop van kranten"
+
 #: include/template/param_jrn.php:21 include/template/param_jrn.php:28
 #: include/template/param_jrn.php:31
 msgid ""
@@ -20658,7 +22287,7 @@ msgstr ""
 "van zijn' aan te duiden, bijvoorbeeld: 4*"
 
 #: include/lib/http_input.class.php:78 include/lib/http_input.class.php:85
-#: include/lib/http_input.class.php:87
+#: include/lib/http_input.class.php:87 include/lib/http_input.class.php:125
 msgid "Unknown type"
 msgstr ""
 
@@ -20681,7 +22310,7 @@ msgstr "Gebruiker"
 
 #: html/install.php:594 html/install.php:586 html/install.php:592
 #: html/install.php:554 html/install.php:544 html/install.php:550
-#: html/install.php:553
+#: html/install.php:553 html/install.php:603
 #, fuzzy
 msgid "Utilisateur  administrateur"
 msgstr "Gebruiker"
@@ -20692,13 +22321,14 @@ msgid "Utilisateur : %s"
 msgstr "Users"
 
 #: include/param_sec.inc.php:91 include/param_sec.inc.php:95
-#: include/param_sec.inc.php:97
+#: include/param_sec.inc.php:97 include/param_sec.inc.php:98
 #, fuzzy
 msgid "Utilisateur Normal"
 msgstr "Gebruiker"
 
 #: html/admin/template_config_form.php:47
 #: include/template/template_config_form.php:47
+#: include/template/template_config_form.php:48
 #, fuzzy
 msgid "Utilisateur Postgresql"
 msgstr "Gebruiker"
@@ -20709,6 +22339,7 @@ msgstr "Gebruiker"
 #: html/install.php:610 html/install.php:634 html/install.php:214
 #: html/install.php:600 html/install.php:626 html/install.php:607
 #: html/install.php:633 html/install.php:217 html/install.php:636
+#: html/install.php:264 html/install.php:660 html/install.php:689
 #, fuzzy
 msgid "Utilisateur administrateur"
 msgstr "Gebruiker"
@@ -20720,7 +22351,7 @@ msgstr "Database"
 
 #: html/admin/setup.php:77 html/admin/setup.php:80 html/admin/setup.php:131
 #: html/install.php:133 html/install.php:132 html/install.php:138
-#: html/install.php:145
+#: html/install.php:145 html/install.php:158
 #, fuzzy
 msgid "Utilisateur de la base de donnée postgresql"
 msgstr "Database"
@@ -20736,7 +22367,7 @@ msgstr "Database"
 #: include/lib/ac_common.php:959 include/lib/ac_common.php:970
 #: include/lib/ac_common.php:971 include/lib/ac_common.php:972
 #: include/lib/ac_common.php:984 include/lib/ac_common.php:986
-#: include/lib/ac_common.php:1002
+#: include/lib/ac_common.php:1002 include/lib/ac_common.php:1012
 #, fuzzy
 msgid ""
 "Utilisateur n'a pas de profil, votre administrateur doit en configurer un "
@@ -20755,6 +22386,7 @@ msgstr ""
 #: include/user_detail.inc.php:169 include/user_detail.inc.php:165
 #: include/user_detail.inc.php:174 include/param_sec.inc.php:147
 #: include/export/export_security_pdf.php:66 include/param_sec.inc.php:153
+#: include/param_sec.inc.php:158
 #, fuzzy
 msgid "Utilisateur normal"
 msgstr "Gebruiker"
@@ -20768,6 +22400,7 @@ msgstr "Verkeerd login van wachword"
 #: include/lib/user_menu.php:116 include/lib/user_menu.php:129
 #: include/lib/user_menu.php:117 include/lib/user_menu.php:140
 #: include/lib/user_menu.php:74 include/lib/user_menu.php:97
+#: include/lib/user_menu.php:73 include/lib/user_menu.php:96
 msgid "Utilisateurs"
 msgstr "Users"
 
@@ -20775,21 +22408,23 @@ msgstr "Users"
 #: include/lib/user_menu.php:121 include/lib/user_menu.php:130
 #: include/lib/user_menu.php:122 include/lib/user_menu.php:141
 #: include/lib/user_menu.php:79 include/lib/user_menu.php:98
+#: include/lib/user_menu.php:78 include/lib/user_menu.php:97
 msgid "Utilisateurs qui se sont connectés"
 msgstr "Gebruikers die zijn aangesloten"
 
 #: include/class/payment_method_mtable.class.php:42
+#: include/class/payment_method_mtable.class.php:43
 #, fuzzy
 msgid "Utilisation dans"
 msgstr "Gebruik van de voorraden"
 
 #: include/company.inc.php:114 include/company.inc.php:133
-#: include/company.inc.php:137
+#: include/company.inc.php:137 include/company.inc.php:145
 msgid "Utilisation de la compta. analytique"
 msgstr "Use of van analytisch Boekhouding"
 
 #: include/company.inc.php:115 include/company.inc.php:134
-#: include/company.inc.php:138
+#: include/company.inc.php:138 include/company.inc.php:152
 msgid "Utilisation des stocks"
 msgstr "Gebruik van de voorraden"
 
@@ -20801,12 +22436,13 @@ msgstr "Gebruik van de voorraden"
 
 #: include/class/acc_ledger.class.php:1150
 #: include/class/acc_ledger.class.php:1166
+#: include/class/acc_ledger.class.php:1162
 #, fuzzy, php-format
 msgid "Utilisation directe interdite du poste comptable %s"
 msgstr "Automatisch aanmaken van de boekhoudkundige post"
 
 #: include/company.inc.php:117 include/company.inc.php:136
-#: include/company.inc.php:140
+#: include/company.inc.php:140 include/company.inc.php:154
 msgid "Utilisation du mode strict "
 msgstr "Use of van Strikt Wijze"
 
@@ -20821,7 +22457,7 @@ msgid "Utiliser un modèle d'import"
 msgstr "Verkeerd login van wachword"
 
 #: include/company.inc.php:122 include/company.inc.php:141
-#: include/company.inc.php:145
+#: include/company.inc.php:145 include/company.inc.php:159
 msgid "Utilisez des postes comptables alphanumérique"
 msgstr "Gebruik alfanumerieke boekhoudkundige posten"
 
@@ -20830,6 +22466,7 @@ msgid "Utilitaire"
 msgstr "Besturingssoftware"
 
 #: html/install.php:629 html/install.php:636 html/install.php:639
+#: html/install.php:692
 #, php-format
 msgid "VOUS DEVEZ EFFACER CE FICHIER %s"
 msgstr ""
@@ -20843,10 +22480,18 @@ msgstr "Accounting Plan"
 #: include/class/user.class.php:1379 include/class/user.class.php:1408
 #: include/class/acc_ledger.class.php:2365
 #: include/lib/input_switch.class.php:56
+#: include/class/acc_ledger.class.php:2399 include/class/user.class.php:1402
+#: include/class/user.class.php:1431 include/lib/input_switch.class.php:57
+#: include/lib/input_checkbox.class.php:65
 #, fuzzy
 msgid "Valeur invalide"
 msgstr "Ongeldige waarden"
 
+#: include/class/noalyss_parameter_folder.class.php:70
+#, fuzzy, php-format
+msgid "Valeur invalide %s"
+msgstr "Ongeldige waarden"
+
 #: include/ext/amortis/include/template/listing_year.php:75
 #: include/ext/amortis/include/template/listing_year.php:119
 msgid "Valeur net "
@@ -20927,6 +22572,8 @@ msgstr "Bevestigen"
 #: include/class/acc_ledger_search.class.php:1121
 #: include/class/acc_ledger_search.class.php:1134
 #: include/ajax/ajax_preference.php:280
+#: include/class/acc_ledger_search.class.php:1223
+#: include/ajax/ajax_preference.php:283
 msgid "Valider"
 msgstr "Bevestigen"
 
@@ -20975,13 +22622,16 @@ msgstr "Vrijdag"
 #: include/cfgledger.inc.php:173 include/class/acc_ledger_search.class.php:1084
 #: include/class/acc_ledger_search.class.php:1097
 #: include/template/tax_summary_display.php:29 include/database.item.php:234
-#: include/database.item.php:253
+#: include/database.item.php:253 include/class/acc_ledger_search.class.php:1186
+#: include/class/operation_predef_mtable.class.php:176
+#: include/database.item.php:10 include/database.item.php:218
 msgid "Vente"
 msgstr "Verkoop"
 
 #: include/database.item.php:113 include/database.item.php:116
 #: include/database.item.php:122 include/database.item.php:119
 #: include/database.item.php:118 include/database.item.php:114
+#: include/database.item.php:115
 msgid "Vente / Recette"
 msgstr "Sales / Recepten"
 
@@ -20992,7 +22642,7 @@ msgid "Ventes"
 msgstr "Verkoop"
 
 #: include/impress_bilan.inc.php:64 include/impress_bilan.inc.php:71
-#: include/impress_bilan.inc.php:78
+#: include/impress_bilan.inc.php:78 include/impress_bilan.inc.php:81
 msgid "Verification comptabilite"
 msgstr "Verificatie vand van Boekhouding"
 
@@ -21010,10 +22660,15 @@ msgstr ""
 msgid "Version PHP trop basse , minimum 5.4"
 msgstr ""
 
+#: html/install.php:356
+msgid "Version PHP trop basse , minimum 7.0.33"
+msgstr ""
+
 #: html/admin/setup.php:395 html/install.php:459 html/install.php:458
 #: html/install.php:456 html/install.php:462 html/install.php:454
 #: html/install.php:460 html/install.php:424 html/install.php:399
 #: html/install.php:405 html/install.php:408 scenario/180209.php:18
+#: html/install.php:457
 #, fuzzy
 msgid "Version base de données :"
 msgstr "Database"
@@ -21034,7 +22689,7 @@ msgstr "Gelieve opnieuw"
 #: include/lib/ac_common.php:806 include/lib/ac_common.php:813
 #: include/lib/ac_common.php:824 include/lib/ac_common.php:825
 #: include/lib/ac_common.php:837 include/lib/ac_common.php:839
-#: include/lib/ac_common.php:855
+#: include/lib/ac_common.php:855 include/lib/ac_common.php:865
 msgid ""
 "Veuillez vous reconnecter soit dans une autre fenêtre soit  en cliquant sur "
 "le lien"
@@ -21079,10 +22734,17 @@ msgstr "Zichtbare Y of N"
 #: include/balance.inc.php:183 include/balance.inc.php:195
 #: include/balance.inc.php:196 include/impress_jrn.inc.php:146
 #: include/impress_rapport.inc.php:286 include/balance.inc.php:199
-#: include/impress_jrn.inc.php:160
+#: include/impress_jrn.inc.php:160 include/impress_jrn.inc.php:174
 msgid "Visualisation"
 msgstr "Visualisatie"
 
+#: html/install.php:260
+msgid ""
+"Voici l'utilisateur et mot de passe de l'utilisateur administrateur de "
+"Noalyss ,  il a tous les droits et a accès à tout. Connectez-vous avec ses "
+"identifiants et changer le mot de passe dans préférence (en haut à droit)"
+msgstr ""
+
 #: html/install.php:214
 msgid ""
 "Voici l'utilisateur et mot de passe de l'utilisateur administrateur de "
@@ -21094,6 +22756,7 @@ msgstr ""
 #: include/database.item.php:214 include/database.item.php:191
 #: include/database.item.php:192 include/database.item.php:195
 #: include/database.item.php:206 include/database.item.php:211
+#: include/database.item.php:201
 msgid "Voir les documents du suivi"
 msgstr "Zie documenten controle"
 
@@ -21119,6 +22782,12 @@ msgstr ""
 msgid "Votre version est à jour"
 msgstr "UW datagegevens is niet van de laatste versie"
 
+#: include/class/acc_operation.class.php:769
+#: include/class/acc_operation.class.php:779
+#, fuzzy, php-format
+msgid "Voulez-vous aller à %s pour dupliquer cette opération ?"
+msgstr "Wilt u deze transactie verwijderen"
+
 #: include/ext/backup_noadmin/include/template/home.php:3
 msgid "Voulez-vous avoir une copie de ce dossier"
 msgstr "Heeft u een kopie van deze kwestie"
@@ -21132,6 +22801,7 @@ msgstr "Heeft u een kopie van deze kwestie"
 #: include/template/detail-action.php:278
 #: include/template/detail-action.php:247
 #: include/template/detail-action.php:249
+#: include/template/detail-action.php:336
 #, php-format
 msgid "Voulez-vous effacer ce commentaire"
 msgstr "Wilt u deze opmerking verwijderen?"
@@ -21161,6 +22831,8 @@ msgstr "Wilt u deze plug-in wissen?"
 #: include/class/follow_up.class.php:2017
 #: include/class/follow_up.class.php:1954
 #: include/class/follow_up.class.php:2018
+#: include/class/follow_up.class.php:1906
+#: include/class/follow_up.class.php:1971
 #, php-format
 msgid "Voulez-vous effacer cette action "
 msgstr "Wilt u deze actie wilt verwijderen"
@@ -21177,7 +22849,7 @@ msgstr "Wilt u deze transactie verwijderen"
 #: include/lib/class_html_input.php:946 include/lib/class_html_input.php:972
 #: include/lib/html_input.class.php:1025 include/lib/html_input.class.php:1083
 #: include/lib/html_input.class.php:1084 include/lib/html_input.class.php:1099
-#: include/lib/html_input.class.php:1100
+#: include/lib/html_input.class.php:1100 include/lib/html_input.class.php:1133
 #, fuzzy, php-format
 msgid "Voulez-vous effacer cette relation "
 msgstr "Wilt u deze actie wilt verwijderen"
@@ -21192,6 +22864,7 @@ msgstr "Wilt u deze actie wilt verwijderen"
 #: include/template/detail-action.php:438
 #: include/template/detail-action.php:442
 #: include/template/detail-action.php:440
+#: include/template/detail-action.php:453
 #, php-format
 msgid "Voulez-vous effacer le document"
 msgstr "Wilt u sterven afvegen papier?"
@@ -21210,11 +22883,12 @@ msgstr "Bent u zeker dat u deze handeling wilt verwijderen?"
 #: include/contact.inc.php:53 include/customer.inc.php:53
 #: include/manager.inc.php:56 include/supplier.inc.php:55
 #: include/adm.inc.php:51 include/customer.inc.php:54
+#: include/contact.inc.php:54
 msgid "Vous  ne pouvez pas enlever de fiche"
 msgstr "U mag Geen blad verwijderen"
 
 #: html/do.php:44 html/popup.php:38 html/popup.php:35 html/do.php:47
-#: html/do.php:48 html/popup.php:37
+#: html/do.php:48 html/popup.php:37 html/recherche.php:33
 msgid "Vous  êtes déconnecté"
 msgstr "Wordt verbroken"
 
@@ -21233,6 +22907,7 @@ msgstr "Je hebt meer dan een keer in dezelfde kolom gedefinieerd"
 #: include/ajax/ajax_plugin_detail.php:32
 #: include/class/class_document_type.php:83 include/ajax/ajax_add_menu.php:137
 #: include/ajax/ajax_add_menu.php:145 include/class/document_type.class.php:83
+#: include/class/document_type.class.php:85
 msgid "Vous confirmez"
 msgstr "U bevestigt"
 
@@ -21268,7 +22943,7 @@ msgstr "U bevestigt het \\ wissen"
 #: include/action.common.inc.php:187 include/action.common.inc.php:207
 #: include/action.common.inc.php:208 include/action.common.inc.php:213
 #: include/action.common.inc.php:215 include/action.common.inc.php:216
-#: include/action.common.inc.php:222
+#: include/action.common.inc.php:222 include/action.common.inc.php:244
 msgid "Vous confirmez l\\'effacement"
 msgstr "U bevestigt het wissen"
 
@@ -21311,7 +22986,7 @@ msgstr "U moet een bestand of berekening kiezen"
 
 #: html/admin/setup.php:81 html/admin/setup.php:84 html/admin/setup.php:135
 #: html/install.php:137 html/install.php:136 html/install.php:142
-#: html/install.php:149
+#: html/install.php:149 html/install.php:162
 msgid ""
 "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"
@@ -21349,6 +23024,7 @@ msgid "Vous devez donner un fichier"
 msgstr "U moet de periode geven"
 
 #: include/compta_ven.inc.php:80 include/compta_ach.inc.php:72
+#: include/compta_ach.inc.php:71
 #, fuzzy
 msgid "Vous devez encore confirmer"
 msgstr "U moet corrigeren"
@@ -21356,7 +23032,7 @@ msgstr "U moet corrigeren"
 #: html/admin/setup.php:419 html/install.php:483 html/install.php:482
 #: html/install.php:480 html/install.php:486 html/install.php:478
 #: html/install.php:484 html/install.php:446 html/install.php:421
-#: html/install.php:427 html/install.php:430
+#: html/install.php:427 html/install.php:430 html/install.php:479
 msgid ""
 "Vous devez installer le langage plpgsql pour permettre aux fonctions SQL de "
 "fonctionner."
@@ -21365,7 +23041,7 @@ msgstr ""
 #: html/admin/setup.php:261 html/admin/setup.php:279 html/admin/setup.php:281
 #: html/install.php:345 html/install.php:344 html/install.php:342
 #: html/install.php:348 html/install.php:354 html/install.php:318
-#: html/install.php:327 html/install.php:330
+#: html/install.php:327 html/install.php:330 html/install.php:379
 msgid "Vous devez installer ou activer l'extension"
 msgstr ""
 
@@ -21382,6 +23058,7 @@ msgstr ""
 
 #: include/class/pre_operation.class.php:285
 #: include/class/pre_operation.class.php:286
+#: include/class/pre_operation.class.php:343
 msgid "Vous n'avez encore sauvé aucun modèle"
 msgstr ""
 
@@ -21401,6 +23078,7 @@ msgstr "U has Geen Klant gegeven"
 #: include/class_acc_ledger_purchase.php:84
 #: include/class/class_acc_ledger_purchase.php:84
 #: include/class/acc_ledger_purchase.class.php:84
+#: include/class/acc_ledger_purchase.class.php:86
 msgid "Vous n'avez pas donné de fournisseur"
 msgstr "U hebt Geen Leverancier gegeven"
 
@@ -21424,6 +23102,7 @@ msgid "Vous n\\'êtes pas administrateur"
 msgstr "U bent geen beheerder"
 
 #: include/class/tva_rate_mtable.class.php:273
+#: include/class/tva_rate_mtable.class.php:290
 msgid ""
 "Vous ne pouvez pas effacer tous les taux. Si votre société n'utilise pas la "
 "TVA, changer dans le menu société"
@@ -21440,6 +23119,7 @@ msgid ""
 msgstr "U kunt niet in die dagboek"
 
 #: include/operation_ods_new.inc.php:43 include/operation_ods_new.inc.php:44
+#: include/operation_ods_new.inc.php:45
 #, fuzzy
 msgid ""
 "Vous ne pouvez pas écrire dans ce journal, contactez votre administrateur"
@@ -21464,6 +23144,7 @@ msgstr ""
 
 #: include/database.item.php:7 include/database.item.php:10
 #: include/database.item.php:4 include/database.item.php:2
+#: include/database.item.php:3
 msgid ""
 "Vous permet d'encoder des achats, dépenses, des notes de frais ou des notes "
 "de crédits, vous pouvez spécifier un bénéficiaire ou un autre moyen de "
@@ -21475,7 +23156,7 @@ msgstr ""
 msgid "Vous pouvez aussi copier ce profil et puis le corriger"
 msgstr ""
 
-#: include/cfgtags.inc.php:51
+#: include/cfgtags.inc.php:51 include/cfgtags.inc.php:66
 msgid ""
 "Vous pouvez utiliser ceci comme des étiquettes pour marquer des documents "
 "ou \n"
@@ -21495,6 +23176,7 @@ msgstr ""
 #: html/admin/setup.php:259 html/install.php:323 html/install.php:322
 #: html/install.php:320 html/install.php:326 html/install.php:332
 #: html/install.php:283 html/install.php:290 html/install.php:293
+#: html/install.php:342
 #, fuzzy
 msgid "Vous utilisez le domaine"
 msgstr "U niet gebruikt voorraadbeheer"
@@ -21519,6 +23201,7 @@ msgstr "U van Gebruikt Strikt-modus, datum van de laatste is Operatie"
 
 #: include/class/acc_ledger.class.php:1079
 #: include/class/acc_ledger.class.php:1095
+#: include/class/acc_ledger.class.php:1091
 #, fuzzy, php-format
 msgid ""
 "Vous utilisez le mode strict la dernière operation est la date du %s\n"
@@ -21535,6 +23218,7 @@ msgstr "U van Gebruikt Strikt-modus, datum van de laatste is Operatie"
 #: include/class/acc_ledger_fin.class.php:126
 #: include/class/acc_ledger_fin.class.php:210
 #: include/class/acc_ledger_purchase.class.php:119
+#: include/class/acc_ledger_purchase.class.php:121
 msgid "Vous utilisez le mode strict la dernière operation est à la date du "
 msgstr "U van Gebruikt Strikt-modus, datum van de laatste is Operatie"
 
@@ -21550,21 +23234,30 @@ msgstr "De verbinding is verbroken"
 #: include/database.item.php:85 include/database.item.php:88
 #: include/database.item.php:93 include/database.item.php:90
 #: include/database.item.php:89 include/database.item.php:87
+#: include/database.item.php:86
 msgid "Vérification "
 msgstr "Verificatie"
 
+#: include/template/ledger_detail_bottom.php:337
+#, fuzzy
+msgid "Vérification CA"
+msgstr "Verificatie"
+
 #: include/database.item.php:85 include/database.item.php:88
 #: include/database.item.php:93 include/database.item.php:90
 #: include/database.item.php:89 include/database.item.php:87
+#: include/database.item.php:86
 msgid "Vérification de la comptabilité"
 msgstr "Accounting Audit"
 
 #: include/verif_bilan.inc.php:84 include/verif_bilan.inc.php:111
+#: include/verif_bilan.inc.php:109
 #, fuzzy
 msgid "Vérification des comptes"
 msgstr "Accounting Audit"
 
 #: include/verif_bilan.inc.php:96 include/verif_bilan.inc.php:123
+#: include/verif_bilan.inc.php:121
 #, fuzzy
 msgid "Vérification des fiches"
 msgstr "Verificatie"
@@ -21576,6 +23269,7 @@ msgstr "Configuratie van de dagboeken"
 
 #: include/database.item.php:90 include/database.item.php:93
 #: include/database.item.php:87 include/database.item.php:85
+#: include/database.item.php:86
 msgid ""
 "Vérifie que votre comptabilité ne contient pas d'erreur de base, tels que "
 "l'équilibre entre le passif et l'actif, l'utilisation des postes "
@@ -21590,6 +23284,7 @@ msgstr ""
 #: include/class/class_acc_ledger_sold.php:844
 #: include/class/acc_ledger_sold.class.php:867
 #: include/class/acc_ledger_sold.class.php:884
+#: include/class/acc_ledger_sold.class.php:888
 msgid "Vérifiez Imputation Analytique"
 msgstr "Controleer Imputatie Analytische"
 
@@ -21605,6 +23300,7 @@ msgstr "Controleer Imputatie Analytische"
 #: include/class/acc_ledger_purchase.class.php:1610
 #: include/class/acc_ledger_purchase.class.php:1627
 #: include/class/acc_ledger_purchase.class.php:1630
+#: include/class/acc_ledger_purchase.class.php:1643
 msgid "Vérifiez imputation analytique"
 msgstr "Controleer analytische toerekening"
 
@@ -21613,6 +23309,7 @@ msgid "Y pour oui ou N pour non"
 msgstr "Y voor ja of N voor geen"
 
 #: include/card_attr.inc.php:80 include/card_attr.inc.php:81
+#: include/class/card_attribut_mtable.class.php:56
 msgid "Zone de texte"
 msgstr "Tekstzone "
 
@@ -21639,6 +23336,8 @@ msgstr "] Doorsturingslijst is leeg niet"
 #: include/class/acc_ledger_purchase.class.php:185
 #: include/class/acc_ledger_sold.class.php:176
 #: include/class/acc_ledger_sold.class.php:180
+#: include/class/acc_ledger_purchase.class.php:182
+#: include/class/acc_ledger_purchase.class.php:187
 msgid "a un code tva invalide"
 msgstr "een vat code ongeldig"
 
@@ -21646,6 +23345,7 @@ msgstr "een vat code ongeldig"
 #: include/class_acc_ledger_purchase.php:172
 #: include/class/class_acc_ledger_purchase.php:172
 #: include/class/acc_ledger_purchase.class.php:172
+#: include/class/acc_ledger_purchase.class.php:174
 msgid "a un montant invalide"
 msgstr "has EEN verkeerde Bedrag"
 
@@ -21659,6 +23359,7 @@ msgstr "Heet EEN ongeldig Bedrag"
 #: html/admin/setup.php:272 html/install.php:336 html/install.php:335
 #: html/install.php:333 html/install.php:339 html/install.php:345
 #: html/install.php:309 html/install.php:316 html/install.php:319
+#: html/install.php:368
 #, fuzzy
 msgid "a une mauvaise valeur"
 msgstr "has EEN Verkeerd hoeveelheid"
@@ -21667,6 +23368,7 @@ msgstr "has EEN Verkeerd hoeveelheid"
 #: include/class_acc_ledger_purchase.php:174
 #: include/class/class_acc_ledger_purchase.php:174
 #: include/class/acc_ledger_purchase.class.php:174
+#: include/class/acc_ledger_purchase.class.php:176
 msgid "a une quantité invalide"
 msgstr "has EEN Verkeerd hoeveelheid"
 
@@ -21706,6 +23408,11 @@ msgstr "rekening"
 msgid "appel incorrect"
 msgstr "Foute e-mail"
 
+#: include/template/letter_all.php:53
+#, fuzzy
+msgid "aucun lettrage"
+msgstr "belettering"
+
 #: include/class_anc_grandlivre.php:136 include/class_anc_grandlivre.php:250
 #: include/class_anc_listing.php:77 include/class_anc_grandlivre.php:295
 #: include/ext/tools/include/class_anc_grandlivre_ext.php:96
@@ -21713,6 +23420,11 @@ msgstr "Foute e-mail"
 msgid "aucune donnée"
 msgstr "Geen Gegevens"
 
+#: include/export/export_balance_csv.php:85
+#, fuzzy, php-format
+msgid "balance du %s au %s"
+msgstr "periode tussen% s [% s] en [% s]"
+
 #: include/lib/database_core.class.php:64
 #, fuzzy, php-format
 msgid "base de donnée  = %s"
@@ -21728,6 +23440,7 @@ msgid "calculé"
 msgstr "Door berekening"
 
 #: include/lib/inplace_edit.class.php:80 include/lib/inplace_edit.class.php:79
+#: include/lib/inplace_edit.class.php:82
 #, fuzzy
 msgid "cancel"
 msgstr "Evenwicht"
@@ -21737,11 +23450,12 @@ msgstr "Evenwicht"
 #: include/class/class_acc_ledger_purchase.php:244
 #: include/class/acc_ledger_purchase.class.php:244
 #: include/class/acc_ledger_purchase.class.php:243
+#: include/class/acc_ledger_purchase.class.php:245
 msgid "ce code n'a pas de poste comptable, créez ce poste : ["
 msgstr ""
 "Deze code heeft geen financieel administratieve post, maken dit bericht: ["
 
-#: include/class/document.class.php:1293
+#: include/class/document.class.php:1293 include/class/document.class.php:1576
 #, php-format
 msgid "chaine à remplacer [%s] contient un caractère interdit"
 msgstr ""
@@ -21763,6 +23477,8 @@ msgstr "kiezen"
 #: include/lib/html_input.class.php:1017 include/lib/html_input.class.php:1018
 #: include/class/acc_ledger_search.class.php:112
 #: include/lib/html_input.class.php:1033 include/lib/html_input.class.php:1034
+#: include/class/acc_ledger_search.class.php:114
+#: include/lib/html_input.class.php:1067
 msgid "choix des journaux"
 msgstr "keuze van de dagboeken"
 
@@ -21780,6 +23496,7 @@ msgstr "keuze van de dagboeken"
 #: include/class/acc_ledger.class.php:2483
 #: include/class/acc_ledger.class.php:2492
 #: include/class/acc_ledger.class.php:2523
+#: include/class/acc_ledger.class.php:2553
 msgid "choix du type de journal"
 msgstr "keuze van de soort dagboek"
 
@@ -21805,7 +23522,7 @@ msgstr "Klik hier om uw voorkeuren bij te werken"
 #: include/class/pdf_operation.class.php:194
 #: include/class/pdf_operation.class.php:247 html/ajax_misc.php:456
 #: html/ajax_misc.php:458 html/ajax_misc.php:464 html/ajax_misc.php:466
-#: html/ajax_misc.php:470
+#: html/ajax_misc.php:470 html/ajax_misc.php:435
 msgid "code"
 msgstr "code"
 
@@ -21828,6 +23545,7 @@ msgstr "BTW-code"
 #: include/export/export_ledger_csv.php:213
 #: include/export/export_ledger_csv.php:215
 #: include/export/export_ledger_csv.php:223
+#: include/export/export_ledger_csv.php:231
 #, fuzzy
 msgid "commentaire"
 msgstr "Commentaar"
@@ -21835,6 +23553,7 @@ msgstr "Commentaar"
 #: include/database.item.php:89 include/database.item.php:92
 #: include/database.item.php:97 include/database.item.php:94
 #: include/database.item.php:93 include/database.item.php:91
+#: include/database.item.php:90
 msgid "configuration de la sécurité"
 msgstr "Beveiliging"
 
@@ -21854,6 +23573,7 @@ msgstr "Credit"
 #: include/database.item.php:212 include/database.item.php:189
 #: include/database.item.php:190 include/database.item.php:193
 #: include/database.item.php:204 include/database.item.php:209
+#: include/database.item.php:199
 msgid "création, modification et effacement de catégorie de fiche"
 msgstr "aanmaken, wijzigen en verwijderen van categorie opnemen"
 
@@ -21897,6 +23617,7 @@ msgstr ""
 #: include/template/ledger_detail_bottom.php:200
 #: include/template/ledger_detail_bottom.php:217
 #: include/template/ledger_detail_bottom.php:214
+#: include/template/ledger_detail_bottom.php:232
 msgid "delta"
 msgstr "delta"
 
@@ -21910,6 +23631,7 @@ msgstr "Verschil"
 #: include/class/follow_up.class.php:1950
 #: include/class/follow_up.class.php:1948
 #: include/class/follow_up.class.php:1949
+#: include/class/follow_up.class.php:1901
 #, fuzzy
 msgid "direct parent "
 msgstr "Filteren op"
@@ -22005,6 +23727,7 @@ msgstr "Tussen 61 en 90 dagen"
 #: include/template/ledger_detail_bottom.php:355
 #: include/template/ledger_detail_bottom.php:352
 #: include/ajax/ajax_ledger.php:545
+#: include/template/ledger_detail_bottom.php:380
 msgid "entrez une date"
 msgstr "datum invoeren"
 
@@ -22027,6 +23750,8 @@ msgstr "fout"
 #: include/class/acc_bilan.class.php:706 include/class/acc_bilan.class.php:688
 #: include/class/acc_bilan.class.php:711 include/class/acc_bilan.class.php:374
 #: include/class/acc_bilan.class.php:690 include/class/acc_bilan.class.php:713
+#: include/class/acc_bilan.class.php:375 include/class/acc_bilan.class.php:695
+#: include/class/acc_bilan.class.php:718
 msgid "erreur Ouverture fichier"
 msgstr "fout bij het openen van het bestand"
 
@@ -22038,6 +23763,7 @@ msgstr "fout bij het openen van het bestand"
 #: include/ajax/ajax_history.php:58 include/ajax/ajax_history.php:141
 #: include/ajax/ajax_history.php:61 include/ajax/ajax_history.php:146
 #: include/ajax/ajax_history.php:147 include/ajax/ajax_history.php:148
+#: include/balance_card.inc.php:37
 msgid ""
 "erreur aucune période par défaut, allez dans préférence pour en choisir une"
 msgstr ""
@@ -22048,6 +23774,7 @@ msgstr ""
 #: include/class/class_acc_bilan.php:668 include/class/class_acc_bilan.php:685
 #: include/class/acc_bilan.class.php:686 include/class/acc_bilan.class.php:689
 #: include/class/acc_bilan.class.php:694 include/class/acc_bilan.class.php:696
+#: include/class/acc_bilan.class.php:701
 msgid "erreur écriture fichier"
 msgstr "schrijffout in bestand"
 
@@ -22068,6 +23795,7 @@ msgstr "is in use of, logout eerst"
 #: include/template/ledger_search.php:25 include/template/ledger_search.php:33
 #: include/template/ledger_search.php:51 include/template/ledger_search.php:26
 #: include/template/ledger_search.php:35 include/template/ledger_search.php:54
+#: include/template/ledger_search.php:56
 msgid "et"
 msgstr "in"
 
@@ -22087,11 +23815,13 @@ msgstr ""
 #: include/ajax/ajax_mod_periode.php:60 include/ajax/ajax_mod_periode.php:78
 #: include/ajax/ajax_periode.php:176 include/class/periode.class.php:707
 #: include/class/periode.class.php:709 include/class/periode.class.php:711
+#: include/class/periode.class.php:712
 #, fuzzy
 msgid "fermer"
 msgstr "Dicht"
 
 #: include/export/export_fiche_csv.php:36
+#: include/export/export_fiche_csv.php:37
 #, fuzzy
 msgid "fiche"
 msgstr "Blad"
@@ -22112,6 +23842,11 @@ msgstr "Balans export sheet"
 msgid "fiche_"
 msgstr "Blad"
 
+#: include/ajax/ajax_card.php:430
+#, fuzzy
+msgid "fiches inactives"
+msgstr "Huidige menu"
+
 #: include/ext/import_account/include/class_import_card.php:242
 msgid "fiches sont insérées dans la catégorie"
 msgstr "pluggen in de categorie ingevoegd"
@@ -22142,6 +23877,8 @@ msgstr "Huidige menu"
 #: include/class/acc_ledger.class.php:1496
 #: include/class/acc_ledger.class.php:1495
 #: include/class/acc_ledger.class.php:1512
+#: include/class/acc_ledger.class.php:1485
+#: include/class/acc_ledger.class.php:1502
 msgid "get_default_card p_ledger_side is invalide ["
 msgstr "get_default_card p_ledger_side is invalide ["
 
@@ -22180,12 +23917,13 @@ msgstr "id"
 #: include/class_fiche.php:557 include/class/class_fiche.php:557
 #: include/class/class_fiche.php:558 include/class/fiche.class.php:564
 #: include/class/fiche.class.php:566 include/class/fiche.class.php:565
+#: include/class/fiche.class.php:578
 #, fuzzy
 msgid "id fiche"
 msgstr "Het blad"
 
 #: include/param_sec.inc.php:324 include/param_sec.inc.php:264
-#: include/param_sec.inc.php:321
+#: include/param_sec.inc.php:321 include/param_sec.inc.php:336
 msgid "imprime"
 msgstr ""
 
@@ -22208,6 +23946,8 @@ msgstr "onbestaand"
 #: include/export/export_ledger_csv.php:216
 #: include/export/export_ledger_csv.php:224
 #: include/class/acc_ledger_history_generic.class.php:685
+#: include/class/acc_ledger_history_generic.class.php:686
+#: include/export/export_ledger_csv.php:232
 #, fuzzy
 msgid "internal"
 msgstr "Intern"
@@ -22223,6 +23963,8 @@ msgstr "Intern"
 #: include/class/acc_ledger_history_sale.class.php:248
 #: include/class/acc_ledger_history_purchase.class.php:255
 #: include/class/acc_ledger_history_purchase.class.php:259
+#: include/class/acc_ledger_history_sale.class.php:258
+#: include/class/acc_ledger_history_purchase.class.php:270
 #, fuzzy
 msgid "interne"
 msgstr "Intern"
@@ -22233,6 +23975,8 @@ msgstr "Intern"
 #: include/class/acc_ledger_history.class.php:122
 #: include/class/acc_ledger_history.class.php:110
 #: include/class/acc_ledger_history.class.php:123
+#: include/class/acc_ledger_history.class.php:138
+#: include/class/acc_ledger_history.class.php:151
 msgid "invalid parameter"
 msgstr "ongeldig parameter "
 
@@ -22252,6 +23996,10 @@ msgstr "ongeldig parameter "
 #: include/class/acc_ledger_history_purchase.class.php:240
 #: include/class/acc_ledger_history_purchase.class.php:244
 #: include/class/acc_ledger_history_generic.class.php:762
+#: include/class/acc_ledger_history_sale.class.php:243
+#: include/class/acc_ledger_history_purchase.class.php:255
+#: include/class/acc_ledger_history_generic.class.php:763
+#: include/export/export_ledger_csv.php:49
 #, fuzzy
 msgid "journal"
 msgstr "Journaal"
@@ -22265,6 +24013,7 @@ msgstr "Onbekende post"
 #: include/database.item.php:88 include/database.item.php:91
 #: include/database.item.php:96 include/database.item.php:93
 #: include/database.item.php:92 include/database.item.php:90
+#: include/database.item.php:89
 msgid "journaux"
 msgstr "Kranten"
 
@@ -22303,10 +24052,15 @@ msgstr "Etiket"
 msgid "latin1"
 msgstr "latin1"
 
+#: include/class/document.class.php:1229
+#, php-format
+msgid "le %s , %s écrit %s"
+msgstr ""
+
 #: include/class_acc_bilan.php:249 include/class_acc_bilan.php:250
 #: include/class/class_acc_bilan.php:250 include/class/class_acc_bilan.php:266
 #: include/class/acc_bilan.class.php:266 include/class/acc_bilan.class.php:269
-#: include/class/acc_bilan.class.php:271
+#: include/class/acc_bilan.class.php:271 include/class/acc_bilan.class.php:272
 #, fuzzy
 msgid "le formulaire id n'est pas donnee"
 msgstr "tarief is geen getal"
@@ -22381,6 +24135,15 @@ msgstr "smaad"
 msgid "libellé"
 msgstr "Opstellen"
 
+#: include/class/html_input_noalyss.class.php:56
+#, fuzzy
+msgid "ligne à ajouter"
+msgstr "Bijwerken"
+
+#: include/ajax/ajax_add_concerned_card.php:71
+msgid "limité aux champs "
+msgstr ""
+
 #: include/ext/transform/include/template/listing_assujetti_representative.php:66
 msgid "listing id"
 msgstr "ID-lijst"
@@ -22389,10 +24152,15 @@ msgstr "ID-lijst"
 msgid "login"
 msgstr "login"
 
+#: html/install.php:165
+#, fuzzy
+msgid "login administrateur"
+msgstr "Beheerder"
+
 #: html/admin/setup.php:329 html/admin/setup.php:347 html/admin/setup.php:349
 #: html/install.php:413 html/install.php:412 html/install.php:410
 #: html/install.php:416 html/install.php:422 html/install.php:386
-#: html/install.php:353 html/install.php:356
+#: html/install.php:353 html/install.php:356 html/install.php:405
 msgid "max_execution_time devrait être de 60 minimum"
 msgstr ""
 
@@ -22418,6 +24186,9 @@ msgstr ""
 #: include/export/export_ledger_csv.php:217
 #: include/export/export_ledger_csv.php:225
 #: include/template/ledger_detail_bottom.php:213
+#: include/ajax/ajax_display_letter.php:69
+#: include/export/export_ledger_csv.php:233
+#: include/template/ledger_detail_bottom.php:231
 msgid "montant"
 msgstr "bedrag"
 
@@ -22438,6 +24209,8 @@ msgstr "bedrag"
 #: include/class/acc_ledger_sold.class.php:129
 #: include/class/acc_ledger_sold.class.php:171
 #: include/class/acc_ledger_purchase.class.php:200
+#: include/class/acc_ledger_purchase.class.php:132
+#: include/class/acc_ledger_purchase.class.php:202
 msgid "n'a pas de poste comptable"
 msgstr "has Geen rekening"
 
@@ -22458,6 +24231,8 @@ msgstr "has Geen rekening"
 #: include/class/acc_ledger_sold.class.php:152
 #: include/class/acc_ledger_sold.class.php:210
 #: include/class/acc_ledger_purchase.class.php:225
+#: include/class/acc_ledger_purchase.class.php:157
+#: include/class/acc_ledger_purchase.class.php:227
 msgid "n'est pas accessible à ce journal"
 msgstr "Kan niet Worden deur Gebruikt zei journaal"
 
@@ -22486,15 +24261,23 @@ msgstr "wordt niet in this journaal"
 #: include/class/acc_ledger_purchase.class.php:220
 #: include/class/acc_ledger_sold.class.php:204
 #: include/class/acc_ledger_purchase.class.php:219
+#: include/class/acc_ledger_purchase.class.php:151
+#: include/class/acc_ledger_purchase.class.php:221
 msgid "n'existe pas"
 msgstr "doorsturingslijst is leeg niet"
 
 #: include/class/periode.class.php:520 include/class/periode.class.php:522
-#: include/class/periode.class.php:524
+#: include/class/periode.class.php:524 include/class/periode.class.php:525
 #, fuzzy
 msgid "nb opérations"
 msgstr "Operatie"
 
+#: include/export/export_balance_pdf.php:186
+#: include/export/export_balance_pdf.php:192
+#, fuzzy, php-format
+msgid "niveau %s"
+msgstr "Niveau 1"
+
 #: include/class/class_acc_reconciliation.php:470
 #: include/class/acc_reconciliation.class.php:495
 #, fuzzy
@@ -22502,11 +24285,13 @@ msgid "nom journal"
 msgstr "Boek Naam"
 
 #: include/template/tag_search_select.php:45
+#: include/template/tag_search_select.php:48
 #, fuzzy
 msgid "non actif"
 msgstr "Totale activa"
 
 #: include/lib/manage_table_sql.class.php:965
+#: include/lib/manage_table_sql.class.php:1020
 #, fuzzy
 msgid "non implémenté"
 msgstr "Geletterde operaties"
@@ -22523,11 +24308,12 @@ msgid "non permis"
 msgstr "Geletterde operaties"
 
 #: include/company.inc.php:37 include/company.inc.php:56
-#: include/company.inc.php:60
+#: include/company.inc.php:60 include/company.inc.php:64
 msgid "non utilisé"
 msgstr "niet use of"
 
 #: include/template/document_mod_change.php:56
+#: include/template/action_document_type_mtable_input.php:39
 msgid "numéro actuel"
 msgstr "huidige uitgave"
 
@@ -22560,6 +24346,7 @@ msgstr "Stuk nr."
 
 #: include/class/acc_account_ledger.class.php:392
 #: include/class/acc_account_ledger.class.php:393
+#: include/class/acc_account_ledger.class.php:385
 #, fuzzy
 msgid "n° de pièce"
 msgstr "Geen ruimte"
@@ -22569,7 +24356,7 @@ msgstr "Geen ruimte"
 #: include/class/class_fiche.php:1231 include/class/class_fiche.php:1234
 #: include/class/fiche.class.php:1378 include/class/fiche.class.php:1379
 #: include/class/fiche.class.php:1381 include/class/fiche.class.php:1395
-#: include/class/fiche.class.php:1396
+#: include/class/fiche.class.php:1396 include/class/fiche.class.php:1423
 #, fuzzy
 msgid "n° de pièce / Code interne"
 msgstr "Interne code"
@@ -22586,6 +24373,7 @@ msgstr "Interne code"
 #: include/class/acc_ledger_search.class.php:681
 #: include/class/acc_ledger_search.class.php:699
 #: include/class/acc_ledger_fin.class.php:753
+#: include/class/acc_ledger_search.class.php:785
 msgid "n° interne"
 msgstr "Intern nr."
 
@@ -22595,6 +24383,8 @@ msgstr "lijn nr"
 
 #: include/class/acc_ledger_history_purchase.class.php:280
 #: include/class/acc_ledger_history_sale.class.php:266
+#: include/class/acc_ledger_history_sale.class.php:276
+#: include/class/acc_ledger_history_purchase.class.php:292
 #, fuzzy
 msgid "n° opération"
 msgstr "Operatienr."
@@ -22614,15 +24404,18 @@ msgstr "Operatienr."
 #: include/class/acc_ledger_history_generic.class.php:681
 #: include/class/fiche.class.php:1473
 #: include/class/acc_ledger_history_generic.class.php:684
+#: include/class/fiche.class.php:1500
+#: include/class/acc_ledger_history_generic.class.php:685
 msgid "n° pièce"
 msgstr "Geen ruimte"
 
 #: include/company.inc.php:35 include/company.inc.php:54
-#: include/company.inc.php:58
+#: include/company.inc.php:58 include/company.inc.php:62
 msgid "obligatoire"
 msgstr "Verplicht"
 
 #: include/lib/inplace_edit.class.php:79 include/lib/inplace_edit.class.php:78
+#: include/lib/inplace_edit.class.php:81
 msgid "ok"
 msgstr ""
 
@@ -22632,7 +24425,7 @@ msgstr ""
 msgid "op. concernée"
 msgstr "betreft Operatie"
 
-#: html/install.php:370 html/install.php:373
+#: html/install.php:370 html/install.php:373 html/install.php:422
 msgid "open_basedir empêche certaines fonctions de Noalyss,mettez-le à vide "
 msgstr ""
 
@@ -22657,12 +24450,16 @@ msgstr ""
 #: include/export/export_ledger_csv.php:218
 #: include/class/acc_ledger_history_purchase.class.php:255
 #: include/class/acc_ledger_history_generic.class.php:767
+#: include/class/acc_ledger_history_sale.class.php:254
+#: include/class/acc_ledger_history_purchase.class.php:266
+#: include/class/acc_ledger_history_generic.class.php:768
+#: include/export/export_ledger_csv.php:226
 #, fuzzy
 msgid "operation"
 msgstr "Operatie"
 
 #: include/company.inc.php:36 include/company.inc.php:55
-#: include/company.inc.php:59
+#: include/company.inc.php:59 include/company.inc.php:63
 msgid "optionnel"
 msgstr "Optie"
 
@@ -22673,6 +24470,7 @@ msgstr "Operatie"
 
 #: include/class/fiche.class.php:1047 include/class/fiche.class.php:1049
 #: include/class/fiche.class.php:1063 include/class/fiche.class.php:1064
+#: include/class/fiche.class.php:1091
 #, fuzzy
 msgid "opération annulée"
 msgstr "Operatie ongedaan gemaakt"
@@ -22730,6 +24528,7 @@ msgstr "of QuickCode"
 #: include/class/acc_ledger_purchase.class.php:1729
 #: include/class/acc_ledger_purchase.class.php:1732
 #: include/class/acc_ledger_purchase.class.php:1738
+#: include/class/acc_ledger_purchase.class.php:1762
 msgid "ou générer un document"
 msgstr "Maak van een document"
 
@@ -22742,12 +24541,14 @@ msgstr "Maak van een document"
 #: include/class/acc_ledger_sold.class.php:966
 #: include/class/acc_ledger_sold.class.php:983
 #: include/class/acc_ledger_sold.class.php:992
+#: include/class/acc_ledger_sold.class.php:996
 msgid "ou générer une facture"
 msgstr "Creeren een faktuur"
 
 #: include/class/acc_ledger_history.class.php:46
 #: include/class/acc_ledger_history.class.php:47
 #: include/class/acc_ledger_history.class.php:48
+#: include/class/acc_ledger_history.class.php:59
 msgid "pa_ledger doit être un tableau"
 msgstr ""
 
@@ -22758,6 +24559,7 @@ msgstr "Bijvoorbeeld Klant niet veranderen in Leverancier"
 
 #: include/lib/ac_common.php:567 include/lib/ac_common.php:568
 #: include/lib/ac_common.php:570 include/lib/ac_common.php:586
+#: include/lib/ac_common.php:596
 #, fuzzy
 msgid "paramètre invalide"
 msgstr "Parameter is ongeldig"
@@ -22784,7 +24586,7 @@ msgstr ""
 #: html/admin/setup.php:375 html/install.php:439 html/install.php:438
 #: html/install.php:436 html/install.php:442 html/install.php:434
 #: html/install.php:440 html/install.php:404 html/install.php:379
-#: html/install.php:382
+#: html/install.php:382 html/install.php:431
 msgid "php mal configuré "
 msgstr ""
 
@@ -22795,7 +24597,7 @@ msgstr ""
 #: html/admin/setup.php:373 html/install.php:437 html/install.php:436
 #: html/install.php:434 html/install.php:440 html/install.php:432
 #: html/install.php:438 html/install.php:402 html/install.php:377
-#: html/install.php:380
+#: html/install.php:380 html/install.php:429
 msgid "php.ini est bien configuré "
 msgstr ""
 
@@ -22843,6 +24645,7 @@ msgstr "Accountant Vacature"
 #: include/class/acc_ledger_history_purchase.class.php:256
 #: include/class/acc_ledger_history_purchase.class.php:257
 #: include/class/acc_ledger_history_purchase.class.php:261
+#: include/class/acc_ledger_history_purchase.class.php:272
 msgid "privé"
 msgstr ""
 
@@ -22864,6 +24667,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1439
 #: include/class/acc_ledger_sold.class.php:720
 #: include/class/acc_ledger_purchase.class.php:1442
+#: include/class/acc_ledger_purchase.class.php:1453
+#: include/class/acc_ledger_sold.class.php:723
 msgid "prix"
 msgstr "Prijs"
 
@@ -22877,6 +24682,8 @@ msgstr "Prijs"
 #: include/template/detail-action.php:314
 #: include/template/detail-action.php:318
 #: include/template/detail-action.php:317
+#: include/template/follow_up_detail_display.php:52
+#: include/template/newEmptyPHP_NOALYSS.php:37
 msgid "prix unitaire"
 msgstr "Eenheid Prijs"
 
@@ -22884,6 +24691,7 @@ msgstr "Eenheid Prijs"
 #: include/template/predf_ledger_detail.php:26
 #: include/template/form_ledger_detail.php:77
 #: include/template/form_ledger_detail.php:81
+#: include/template/form_ledger_detail.php:84
 msgid "prix/unité "
 msgstr "prijs / eenheid"
 
@@ -22891,15 +24699,16 @@ msgstr "prijs / eenheid"
 #: include/template/predf_ledger_detail.php:19
 #: include/template/form_ledger_detail.php:70
 #: include/template/form_ledger_detail.php:74
+#: include/template/form_ledger_detail.php:77
 msgid "prix/unité htva"
 msgstr "Eenheid Prijs Zonder BTW"
 
-#: include/param_sec.inc.php:86
+#: include/param_sec.inc.php:86 include/param_sec.inc.php:87
 #, fuzzy
 msgid "profil"
 msgstr "Profiel"
 
-#: include/param_sec.inc.php:85
+#: include/param_sec.inc.php:85 include/param_sec.inc.php:86
 #, fuzzy
 msgid "prénom"
 msgstr "Voornaam"
@@ -22911,6 +24720,7 @@ msgstr "periode tussen% s [% s] en [% s]"
 
 #: include/ext/amortis/raw.php:100 include/export/export_histo_csv.php:41
 #: include/export/export_histo_csv.php:42
+#: include/export/export_histo_csv.php:45
 msgid "qcode"
 msgstr "Qcode"
 
@@ -22974,6 +24784,13 @@ msgstr "Qcode"
 #: include/class/acc_ledger_purchase.class.php:1849
 #: include/class/acc_ledger_sold.class.php:1429
 #: include/class/acc_ledger_purchase.class.php:1855
+#: include/class/acc_ledger_purchase.class.php:1454
+#: include/class/acc_ledger_purchase.class.php:1892
+#: include/class/acc_ledger_sold.class.php:724
+#: include/class/acc_ledger_sold.class.php:1414
+#: include/template/follow_up_detail_display.php:53
+#: include/template/form_ledger_detail.php:85
+#: include/template/newEmptyPHP_NOALYSS.php:38
 msgid "quantité"
 msgstr "hoeveelheid"
 
@@ -22999,9 +24816,15 @@ msgstr "Verzoening"
 #: include/contact.inc.php:98 include/manager.inc.php:105
 #: include/template/action_search.php:152 include/customer.inc.php:103
 #: include/template/action_search.php:148 scenario/select-box-test.php:62
+#: include/template/action_search.php:161 include/contact.inc.php:99
 msgid "recherche"
 msgstr "Zoeken"
 
+#: include/template/card_multiple_result.php:10
+#, fuzzy
+msgid "recherche rapide"
+msgstr "Zoeken"
+
 #: include/export_fiche_balance_csv.php:140 include/fiche.inc.php:438
 #: include/fiche.inc.php:443 include/fiche.inc.php:445
 #: include/fiche.inc.php:513 include/fiche.inc.php:516
@@ -23009,13 +24832,15 @@ msgstr "Zoeken"
 #: include/export/export_fiche_balance_csv.php:153
 #: include/export/export_fiche_balance_csv.php:154 include/fiche.inc.php:517
 #: include/fiche.inc.php:519 include/fiche.inc.php:528
-#: include/class/print_ledger_simple.class.php:101
+#: include/class/print_ledger_simple.class.php:101 include/fiche.inc.php:541
+#: include/class/print_ledger_simple.class.php:98
 msgid "ref"
 msgstr "ref"
 
 #: html/admin/setup.php:357 html/install.php:421 html/install.php:420
 #: html/install.php:418 html/install.php:424 html/install.php:430
 #: html/install.php:394 html/install.php:361 html/install.php:364
+#: html/install.php:413
 msgid "register_globals doit être à off"
 msgstr ""
 
@@ -23027,6 +24852,7 @@ msgid "report"
 msgstr "Export"
 
 #: include/param_sec.inc.php:135 include/param_sec.inc.php:141
+#: include/category_followup.inc.php:50 include/param_sec.inc.php:146
 #, fuzzy
 msgid "retour"
 msgstr "Terug"
@@ -23045,10 +24871,15 @@ msgstr "nieuwe regel"
 #: include/ajax_mod_periode.php:59 include/ajax/ajax_mod_periode.php:59
 #: include/ajax/ajax_periode.php:175 include/class/periode.class.php:706
 #: include/class/periode.class.php:708 include/class/periode.class.php:710
+#: include/class/periode.class.php:711
 #, fuzzy
 msgid "sauver"
 msgstr "OPSLAAN"
 
+#: include/lib/iconcerned.class.php:99
+msgid "setSingleOperation failed"
+msgstr ""
+
 #: include/fiche_def.inc.php:69
 #: include/class/template_card_category.class.php:105
 msgid ""
@@ -23061,7 +24892,7 @@ msgstr ""
 #: html/admin/setup.php:539 html/install.php:603 html/install.php:604
 #: html/install.php:611 html/install.php:627 html/install.php:619
 #: html/install.php:625 html/install.php:587 html/install.php:577
-#: html/install.php:583 html/install.php:586
+#: html/install.php:583 html/install.php:586 html/install.php:636
 msgid ""
 "soit noalyss/contrib/mono-dossier/mono-belge.sql pour la comptabilité belge"
 msgstr ""
@@ -23069,7 +24900,7 @@ msgstr ""
 #: html/admin/setup.php:538 html/install.php:602 html/install.php:603
 #: html/install.php:610 html/install.php:626 html/install.php:618
 #: html/install.php:624 html/install.php:586 html/install.php:576
-#: html/install.php:582 html/install.php:585
+#: html/install.php:582 html/install.php:585 html/install.php:635
 msgid ""
 "soit noalyss/contrib/mono-dossier/mono-france.sql pour la comptabilité "
 "française"
@@ -23078,17 +24909,18 @@ msgstr ""
 #: html/admin/setup.php:540 html/install.php:604 html/install.php:605
 #: html/install.php:612 html/install.php:628 html/install.php:620
 #: html/install.php:626 html/install.php:588 html/install.php:578
-#: html/install.php:584 html/install.php:587
+#: html/install.php:584 html/install.php:587 html/install.php:637
 msgid "soit y restaurer un backup ou un modèle"
 msgstr ""
 
 #: include/export/export_fiche_balance_csv.php:57 include/fiche.inc.php:587
-#: include/fiche.inc.php:596
+#: include/fiche.inc.php:596 include/fiche.inc.php:609
 #, fuzzy
 msgid "solde"
 msgstr "evenwicht"
 
 #: include/fiche.inc.php:592 include/fiche.inc.php:601
+#: include/fiche.inc.php:614
 #, fuzzy
 msgid "solde crediteur"
 msgstr "Creditsaldo"
@@ -23103,6 +24935,8 @@ msgstr "Creditsaldo"
 #: include/class/fiche.class.php:1407 include/class/fiche.class.php:1536
 #: include/class/fiche.class.php:1421 include/class/fiche.class.php:1552
 #: include/class/fiche.class.php:1422 include/class/fiche.class.php:1553
+#: include/class/fiche.class.php:1449 include/class/fiche.class.php:1579
+#: include/class/acc_account_ledger.class.php:467
 #, fuzzy
 msgid "solde créditeur"
 msgstr "Creditsaldo"
@@ -23110,6 +24944,7 @@ msgstr "Creditsaldo"
 #: include/class/acc_ledger_history_generic.class.php:668
 #: include/class/acc_ledger_history_generic.class.php:669
 #: include/class/acc_ledger_history_generic.class.php:672
+#: include/class/acc_ledger_history_generic.class.php:673
 #, fuzzy
 msgid "solde créditeur:"
 msgstr "Creditsaldo"
@@ -23125,6 +24960,9 @@ msgstr "Creditsaldo"
 #: include/fiche.inc.php:590 include/class/fiche.class.php:1421
 #: include/class/fiche.class.php:1552 include/fiche.inc.php:599
 #: include/class/fiche.class.php:1422 include/class/fiche.class.php:1553
+#: include/fiche.inc.php:612 include/class/fiche.class.php:1449
+#: include/class/fiche.class.php:1579
+#: include/class/acc_account_ledger.class.php:467
 #, fuzzy
 msgid "solde débiteur"
 msgstr "Debetsaldo"
@@ -23132,6 +24970,7 @@ msgstr "Debetsaldo"
 #: include/class/acc_ledger_history_generic.class.php:667
 #: include/class/acc_ledger_history_generic.class.php:668
 #: include/class/acc_ledger_history_generic.class.php:671
+#: include/class/acc_ledger_history_generic.class.php:672
 #, fuzzy
 msgid "solde débiteur:"
 msgstr "Debetsaldo"
@@ -23177,6 +25016,7 @@ msgstr "Text"
 #: include/class/acc_ledger.class.php:202
 #: include/class/acc_ledger.class.php:203
 #: include/class/acc_ledger.class.php:221
+#: include/class/acc_ledger.class.php:220
 msgid "this->jr_id is not set ou opération inconnue"
 msgstr "this->jr_id is not set of onbekende handeling"
 
@@ -23188,6 +25028,7 @@ msgstr "this->jr_id is not set of onbekende handeling"
 #: include/class/acc_ledger_search.class.php:938
 #: include/class/acc_ledger_search.class.php:946
 #: include/class/acc_ledger_search.class.php:959
+#: include/class/acc_ledger_search.class.php:1048
 msgid "tiers"
 msgstr "derde"
 
@@ -23195,6 +25036,7 @@ msgstr "derde"
 #: include/template/predf_ledger_detail.php:23
 #: include/template/form_ledger_detail.php:74
 #: include/template/form_ledger_detail.php:78
+#: include/template/form_ledger_detail.php:81
 msgid "tot.tva"
 msgstr "tot btw"
 
@@ -23226,7 +25068,7 @@ msgstr "Totaal"
 msgid "totaux"
 msgstr "Totalen"
 
-#: include/database.item.php:141
+#: include/database.item.php:141 include/database.item.php:140
 #, fuzzy
 msgid "totaux  par TVA et par journal"
 msgstr "Gefilterd per dagboek"
@@ -23257,6 +25099,9 @@ msgstr "toutes_les_fiches.pdf"
 #: include/class/acc_ledger_purchase.class.php:1444
 #: include/class/acc_ledger_sold.class.php:725
 #: include/class/acc_ledger_purchase.class.php:1447
+#: include/class/acc_ledger_purchase.class.php:1458
+#: include/class/acc_ledger_sold.class.php:728
+#: include/template/form_ledger_detail.php:80
 msgid "tva"
 msgstr "btw"
 
@@ -23267,7 +25112,8 @@ msgstr "btw"
 #: html/ajax_misc.php:405 html/ajax_misc.php:512 html/ajax_misc.php:517
 #: html/ajax_misc.php:514 html/ajax_misc.php:519 html/ajax_misc.php:520
 #: html/ajax_misc.php:525 html/ajax_misc.php:522 html/ajax_misc.php:527
-#: html/ajax_misc.php:526 html/ajax_misc.php:531
+#: html/ajax_misc.php:526 html/ajax_misc.php:531 html/ajax_misc.php:491
+#: html/ajax_misc.php:496
 msgid "tva inconnue"
 msgstr "onbekend btw"
 
@@ -23278,6 +25124,7 @@ msgstr "onbekend btw"
 #: include/class/acc_ledger_history_purchase.class.php:258
 #: include/class/acc_ledger_history_purchase.class.php:259
 #: include/class/acc_ledger_history_purchase.class.php:263
+#: include/class/acc_ledger_history_purchase.class.php:274
 #, fuzzy
 msgid "tva non ded."
 msgstr "onbekend btw"
@@ -23286,6 +25133,7 @@ msgstr "onbekend btw"
 #: include/template/predf_ledger_detail.php:24
 #: include/template/form_ledger_detail.php:75
 #: include/template/form_ledger_detail.php:79
+#: include/template/form_ledger_detail.php:82
 msgid "tvac"
 msgstr "zet btw"
 
@@ -23319,6 +25167,10 @@ msgstr "Soort boek van"
 msgid "téléphone "
 msgstr "telefoon"
 
+#: unit-test/include/class/tax_summary.Test.php:110
+msgid "unknow jrn_type"
+msgstr ""
+
 #: include/ajax/ajax_preference.php:219 include/ajax/ajax_preference.php:230
 msgid "utf8"
 msgstr "utf8"
@@ -23366,6 +25218,7 @@ msgstr "u bevestigt"
 #: include/template/ledger_detail_bottom.php:178
 #: include/template/ledger_detail_bottom.php:195
 #: include/template/ledger_detail_bottom.php:192
+#: include/template/ledger_detail_bottom.php:211
 #, fuzzy
 msgid "vous confirmez?"
 msgstr "u bevestigt"

From e0514bca6925e5755d56039abe55f0842fef326d Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 5 Nov 2020 23:44:50 +0100
Subject: [PATCH 150/257] Task #0001861: Check Box range for checkbox

---
 include/class/follow_up.class.php            |  4 ++--
 include/class/periode.class.php              |  1 +
 include/class/periode_ledger_table.class.php |  1 +
 include/periode.inc.php                      |  1 +
 include/template/periode_add_exercice.php    | 15 ++++++++++++---
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 34a8ff0fd..b91532828 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -627,7 +627,7 @@ class Follow_Up
         $table->add(_('Titre'), $url, 'order by ag_title asc', 'order by ag_title desc', 'ta', 'td');
         $table->add(_('Etat'), $url, 'order by s_value asc', 'order by s_value desc', 'ea', 'ed');
 
-        $ord=(!isset($_GET['ord']))?"dcd":$_GET['ord'];
+        $ord=(!isset($_GET['ord']))?"dd":$_GET['ord'];
         $sort=$table->get_sql_order($ord);
 
         if (strlen(trim($p_filter))!=0)
@@ -736,7 +736,7 @@ class Follow_Up
             $r.="<td>".$row['s_value']."</td>";
              $r.='<td>'.$href.
                     h($row['ag_title'])."</A></td>";
-            $r.="<td>".$href.h($row['tags']).'</a>'."</td>";
+            $r.="<td>".$href."<span style=\"font-size:75%\">".h($row['tags']).'</span>'.'</a>'."</td>";
             $r.="<td>".$href.$row['ag_ref'].'</a>'."</td>";
             $r.="<td>".$href.h($row['dest']).'</a>'."</td>";
 
diff --git a/include/class/periode.class.php b/include/class/periode.class.php
index 43cde5797..a8b0272b5 100644
--- a/include/class/periode.class.php
+++ b/include/class/periode.class.php
@@ -573,6 +573,7 @@ class Periode
         if ($obj->getp("p_closed")=="f")
         {
             $checkbox=new ICheckBox("sel_per_close[]");
+            $checkbox->set_range("sel_per_close_ck");
             $checkbox->set_attribute("per_id", $obj->getp("p_id"));
             $checkbox->value=$obj->getp("p_id");
             echo "<td>".$checkbox->input()."</td>";
diff --git a/include/class/periode_ledger_table.class.php b/include/class/periode_ledger_table.class.php
index 263b23105..c3d057e8b 100644
--- a/include/class/periode_ledger_table.class.php
+++ b/include/class/periode_ledger_table.class.php
@@ -131,6 +131,7 @@ class Periode_Ledger_Table
         if ($pa_row["status"] == "OP") {
             $checkbox=new ICheckBox("sel_per_close[]");
             $checkbox->set_attribute("per_id", $pa_row['id']);
+            $checkbox->set_range("sel_per_close_ck");
             $checkbox->value=$pa_row['id'];
             echo "<td>".$checkbox->input()."</td>";
         }else {
diff --git a/include/periode.inc.php b/include/periode.inc.php
index 095419064..9c4cfc3b0 100644
--- a/include/periode.inc.php
+++ b/include/periode.inc.php
@@ -137,4 +137,5 @@ echo '</div>';
 ?>
 <script>
     Periode.filter_exercice('periode_tbl');
+    activate_checkbox_range("sel_per_close_ck");
 </script>
diff --git a/include/template/periode_add_exercice.php b/include/template/periode_add_exercice.php
index f801ad826..ce31a26cf 100644
--- a/include/template/periode_add_exercice.php
+++ b/include/template/periode_add_exercice.php
@@ -70,9 +70,18 @@ de fin d'exercice: amortissements, régulations de compte... Avec une 13ième p
             </td>
         </tr>
     </table>
-    <?php
-    echo HtmlInput::submit("add_exercicebt", _("Ajout d'un exercice comptable"));
-    ?>
+    <ul class="aligned-block">
+    <li>
+        <?php
+        echo HtmlInput::submit("add_exercicebt", _("Ajout d'un exercice comptable"));
+       ?>
+    </li>
+    <li>
+        <?php
+        echo HtmlInput::button_hide('exercice_add');
+       ?>
+    </li>
+    </ul>
 </form>
 <script charset="UTF8" lang="javascript">
     function validate()

From 1aa830eaf01c2c359e8131375cee06c10cc6863f Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 6 Nov 2020 17:20:03 +0100
Subject: [PATCH 151/257] Compatibility PostgreSQL 13 , remove the default OID

---
 contrib/mono-dossier/mono-belge.sql       | 25 -----------------
 contrib/mono-dossier/mono-france.sql      | 25 -----------------
 include/sql/account_repository/schema.sql |  1 -
 include/sql/mod1/schema.sql               | 33 -----------------------
 4 files changed, 84 deletions(-)

diff --git a/contrib/mono-dossier/mono-belge.sql b/contrib/mono-dossier/mono-belge.sql
index a03d3ffbb..ad800050a 100644
--- a/contrib/mono-dossier/mono-belge.sql
+++ b/contrib/mono-dossier/mono-belge.sql
@@ -2332,7 +2332,6 @@ $$;
 
 SET default_tablespace = '';
 
-SET default_with_oids = true;
 
 --
 -- Name: action; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -2360,7 +2359,6 @@ COMMENT ON TABLE action IS 'The different privileges';
 COMMENT ON COLUMN action.ac_code IS 'this code will be used in the code with the function User::check_action ';
 
 
-SET default_with_oids = false;
 
 --
 -- Name: action_detail; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -2480,7 +2478,6 @@ CREATE SEQUENCE action_gestion_ag_id_seq
 SELECT pg_catalog.setval('action_gestion_ag_id_seq', 1, false);
 
 
-SET default_with_oids = true;
 
 --
 -- Name: action_gestion; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -2658,7 +2655,6 @@ CREATE SEQUENCE bilan_b_id_seq
 SELECT pg_catalog.setval('bilan_b_id_seq', 4, true);
 
 
-SET default_with_oids = false;
 
 --
 -- Name: bilan; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -2772,7 +2768,6 @@ CREATE SEQUENCE bud_detail_periode_bdp_id_seq
 SELECT pg_catalog.setval('bud_detail_periode_bdp_id_seq', 1, false);
 
 
-SET default_with_oids = true;
 
 --
 -- Name: centralized; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -2803,7 +2798,6 @@ CREATE TABLE centralized (
 COMMENT ON TABLE centralized IS 'The centralized journal';
 
 
-SET default_with_oids = false;
 
 --
 -- Name: del_action; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -2967,7 +2961,6 @@ CREATE SEQUENCE document_d_id_seq
 SELECT pg_catalog.setval('document_d_id_seq', 1, false);
 
 
-SET default_with_oids = true;
 
 --
 -- Name: document; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -3129,7 +3122,6 @@ CREATE TABLE document_type (
 COMMENT ON TABLE document_type IS 'Type of document : meeting, invoice,...';
 
 
-SET default_with_oids = false;
 
 --
 -- Name: extension; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -3220,7 +3212,6 @@ ALTER SEQUENCE extension_ex_id_seq OWNED BY extension.ex_id;
 SELECT pg_catalog.setval('extension_ex_id_seq', 1, true);
 
 
-SET default_with_oids = true;
 
 --
 -- Name: fiche; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -3296,7 +3287,6 @@ CREATE TABLE fiche_detail (
 COMMENT ON TABLE fiche_detail IS 'join between the card and the attribut definition';
 
 
-SET default_with_oids = false;
 
 --
 -- Name: forecast; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -3508,7 +3498,6 @@ ALTER SEQUENCE forecast_item_fi_id_seq OWNED BY forecast_item.fi_id;
 SELECT pg_catalog.setval('forecast_item_fi_id_seq', 1, false);
 
 
-SET default_with_oids = true;
 
 --
 -- Name: form; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -3540,7 +3529,6 @@ CREATE TABLE formdef (
 );
 
 
-SET default_with_oids = false;
 
 --
 -- Name: groupe_analytique; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -3608,7 +3596,6 @@ CREATE SEQUENCE s_jnt_id
 SELECT pg_catalog.setval('s_jnt_id', 53, true);
 
 
-SET default_with_oids = true;
 
 --
 -- Name: jnt_fic_attr; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -3629,7 +3616,6 @@ CREATE TABLE jnt_fic_attr (
 COMMENT ON TABLE jnt_fic_attr IS 'join between the family card and the attribut definition';
 
 
-SET default_with_oids = false;
 
 --
 -- Name: jnt_letter; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -3667,7 +3653,6 @@ ALTER SEQUENCE jnt_letter_jl_id_seq OWNED BY jnt_letter.jl_id;
 SELECT pg_catalog.setval('jnt_letter_jl_id_seq', 1, false);
 
 
-SET default_with_oids = true;
 
 --
 -- Name: jrn; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -3756,7 +3741,6 @@ CREATE TABLE jrn_def (
 COMMENT ON TABLE jrn_def IS 'Definition of a journal, his properties';
 
 
-SET default_with_oids = false;
 
 --
 -- Name: jrn_info; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -3851,7 +3835,6 @@ CREATE TABLE jrn_periode (
 );
 
 
-SET default_with_oids = true;
 
 --
 -- Name: jrn_rapt; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -3919,7 +3902,6 @@ CREATE TABLE jrnx (
 COMMENT ON TABLE jrnx IS 'Journal: content one line for each accountancy writing';
 
 
-SET default_with_oids = false;
 
 --
 -- Name: letter_cred; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -4245,7 +4227,6 @@ CREATE TABLE operation_analytique (
 COMMENT ON TABLE operation_analytique IS 'History of the analytic account';
 
 
-SET default_with_oids = true;
 
 --
 -- Name: parameter; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -4315,7 +4296,6 @@ CREATE TABLE parm_periode (
 COMMENT ON TABLE parm_periode IS 'Periode definition';
 
 
-SET default_with_oids = false;
 
 --
 -- Name: parm_poste; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -4714,7 +4694,6 @@ CREATE TABLE quant_purchase (
 COMMENT ON COLUMN quant_purchase.qp_vat_sided IS 'amount of the VAT which avoid VAT, case of the VAT which add the same amount at the deb and cred';
 
 
-SET default_with_oids = true;
 
 --
 -- Name: quant_sold; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -5776,7 +5755,6 @@ CREATE SEQUENCE todo_list_tl_id_seq
 SELECT pg_catalog.setval('todo_list_tl_id_seq', 1, false);
 
 
-SET default_with_oids = false;
 
 --
 -- Name: todo_list; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -5798,7 +5776,6 @@ CREATE TABLE todo_list (
 COMMENT ON TABLE todo_list IS 'Todo list';
 
 
-SET default_with_oids = true;
 
 --
 -- Name: tva_rate; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -5871,7 +5848,6 @@ CREATE TABLE user_sec_act (
 );
 
 
-SET default_with_oids = false;
 
 --
 -- Name: user_sec_extension; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -5918,7 +5894,6 @@ ALTER SEQUENCE user_sec_extension_use_id_seq OWNED BY user_sec_extension.use_id;
 SELECT pg_catalog.setval('user_sec_extension_use_id_seq', 1, true);
 
 
-SET default_with_oids = true;
 
 --
 -- Name: user_sec_jrn; Type: TABLE; Schema: public; Owner: -; Tablespace: 
diff --git a/contrib/mono-dossier/mono-france.sql b/contrib/mono-dossier/mono-france.sql
index a359f64d4..554f16cff 100644
--- a/contrib/mono-dossier/mono-france.sql
+++ b/contrib/mono-dossier/mono-france.sql
@@ -2332,7 +2332,6 @@ $$;
 
 SET default_tablespace = '';
 
-SET default_with_oids = true;
 
 --
 -- Name: action; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -2360,7 +2359,6 @@ COMMENT ON TABLE action IS 'The different privileges';
 COMMENT ON COLUMN action.ac_code IS 'this code will be used in the code with the function User::check_action ';
 
 
-SET default_with_oids = false;
 
 --
 -- Name: action_detail; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -2480,7 +2478,6 @@ CREATE SEQUENCE action_gestion_ag_id_seq
 SELECT pg_catalog.setval('action_gestion_ag_id_seq', 1, false);
 
 
-SET default_with_oids = true;
 
 --
 -- Name: action_gestion; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -2658,7 +2655,6 @@ CREATE SEQUENCE bilan_b_id_seq
 SELECT pg_catalog.setval('bilan_b_id_seq', 4, true);
 
 
-SET default_with_oids = false;
 
 --
 -- Name: bilan; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -2772,7 +2768,6 @@ CREATE SEQUENCE bud_detail_periode_bdp_id_seq
 SELECT pg_catalog.setval('bud_detail_periode_bdp_id_seq', 1, false);
 
 
-SET default_with_oids = true;
 
 --
 -- Name: centralized; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -2803,7 +2798,6 @@ CREATE TABLE centralized (
 COMMENT ON TABLE centralized IS 'The centralized journal';
 
 
-SET default_with_oids = false;
 
 --
 -- Name: del_action; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -2967,7 +2961,6 @@ CREATE SEQUENCE document_d_id_seq
 SELECT pg_catalog.setval('document_d_id_seq', 1, false);
 
 
-SET default_with_oids = true;
 
 --
 -- Name: document; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -3129,7 +3122,6 @@ CREATE TABLE document_type (
 COMMENT ON TABLE document_type IS 'Type of document : meeting, invoice,...';
 
 
-SET default_with_oids = false;
 
 --
 -- Name: extension; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -3220,7 +3212,6 @@ ALTER SEQUENCE extension_ex_id_seq OWNED BY extension.ex_id;
 SELECT pg_catalog.setval('extension_ex_id_seq', 1, false);
 
 
-SET default_with_oids = true;
 
 --
 -- Name: fiche; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -3296,7 +3287,6 @@ CREATE TABLE fiche_detail (
 COMMENT ON TABLE fiche_detail IS 'join between the card and the attribut definition';
 
 
-SET default_with_oids = false;
 
 --
 -- Name: forecast; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -3508,7 +3498,6 @@ ALTER SEQUENCE forecast_item_fi_id_seq OWNED BY forecast_item.fi_id;
 SELECT pg_catalog.setval('forecast_item_fi_id_seq', 1, false);
 
 
-SET default_with_oids = true;
 
 --
 -- Name: form; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -3540,7 +3529,6 @@ CREATE TABLE formdef (
 );
 
 
-SET default_with_oids = false;
 
 --
 -- Name: groupe_analytique; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -3608,7 +3596,6 @@ CREATE SEQUENCE s_jnt_id
 SELECT pg_catalog.setval('s_jnt_id', 53, true);
 
 
-SET default_with_oids = true;
 
 --
 -- Name: jnt_fic_attr; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -3629,7 +3616,6 @@ CREATE TABLE jnt_fic_attr (
 COMMENT ON TABLE jnt_fic_attr IS 'join between the family card and the attribut definition';
 
 
-SET default_with_oids = false;
 
 --
 -- Name: jnt_letter; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -3667,7 +3653,6 @@ ALTER SEQUENCE jnt_letter_jl_id_seq OWNED BY jnt_letter.jl_id;
 SELECT pg_catalog.setval('jnt_letter_jl_id_seq', 1, false);
 
 
-SET default_with_oids = true;
 
 --
 -- Name: jrn; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -3756,7 +3741,6 @@ CREATE TABLE jrn_def (
 COMMENT ON TABLE jrn_def IS 'Definition of a journal, his properties';
 
 
-SET default_with_oids = false;
 
 --
 -- Name: jrn_info; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -3851,7 +3835,6 @@ CREATE TABLE jrn_periode (
 );
 
 
-SET default_with_oids = true;
 
 --
 -- Name: jrn_rapt; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -3919,7 +3902,6 @@ CREATE TABLE jrnx (
 COMMENT ON TABLE jrnx IS 'Journal: content one line for each accountancy writing';
 
 
-SET default_with_oids = false;
 
 --
 -- Name: letter_cred; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -4245,7 +4227,6 @@ CREATE TABLE operation_analytique (
 COMMENT ON TABLE operation_analytique IS 'History of the analytic account';
 
 
-SET default_with_oids = true;
 
 --
 -- Name: parameter; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -4315,7 +4296,6 @@ CREATE TABLE parm_periode (
 COMMENT ON TABLE parm_periode IS 'Periode definition';
 
 
-SET default_with_oids = false;
 
 --
 -- Name: parm_poste; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -4714,7 +4694,6 @@ CREATE TABLE quant_purchase (
 COMMENT ON COLUMN quant_purchase.qp_vat_sided IS 'amount of the VAT which avoid VAT, case of the VAT which add the same amount at the deb and cred';
 
 
-SET default_with_oids = true;
 
 --
 -- Name: quant_sold; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -5776,7 +5755,6 @@ CREATE SEQUENCE todo_list_tl_id_seq
 SELECT pg_catalog.setval('todo_list_tl_id_seq', 1, false);
 
 
-SET default_with_oids = false;
 
 --
 -- Name: todo_list; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -5798,7 +5776,6 @@ CREATE TABLE todo_list (
 COMMENT ON TABLE todo_list IS 'Todo list';
 
 
-SET default_with_oids = true;
 
 --
 -- Name: tva_rate; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -5871,7 +5848,6 @@ CREATE TABLE user_sec_act (
 );
 
 
-SET default_with_oids = false;
 
 --
 -- Name: user_sec_extension; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -5918,7 +5894,6 @@ ALTER SEQUENCE user_sec_extension_use_id_seq OWNED BY user_sec_extension.use_id;
 SELECT pg_catalog.setval('user_sec_extension_use_id_seq', 1, false);
 
 
-SET default_with_oids = true;
 
 --
 -- Name: user_sec_jrn; Type: TABLE; Schema: public; Owner: -; Tablespace: 
diff --git a/include/sql/account_repository/schema.sql b/include/sql/account_repository/schema.sql
index b14091b34..de2bf0324 100644
--- a/include/sql/account_repository/schema.sql
+++ b/include/sql/account_repository/schema.sql
@@ -43,7 +43,6 @@ $$;
 
 SET default_tablespace = '';
 
-SET default_with_oids = false;
 
 
 CREATE TABLE ac_dossier (
diff --git a/include/sql/mod1/schema.sql b/include/sql/mod1/schema.sql
index d52aa8457..6a0d2abc1 100644
--- a/include/sql/mod1/schema.sql
+++ b/include/sql/mod1/schema.sql
@@ -2441,7 +2441,6 @@ $$;
 
 SET default_tablespace = '';
 
-SET default_with_oids = true;
 
 
 CREATE TABLE action (
@@ -2460,7 +2459,6 @@ COMMENT ON TABLE action IS 'The different privileges';
 COMMENT ON COLUMN action.ac_code IS 'this code will be used in the code with the function User::check_action ';
 
 
-SET default_with_oids = false;
 
 
 CREATE TABLE action_detail (
@@ -2530,7 +2528,6 @@ CREATE SEQUENCE action_gestion_ag_id_seq
     CACHE 1;
 
 
-SET default_with_oids = true;
 
 
 CREATE TABLE action_gestion (
@@ -2594,7 +2591,6 @@ COMMENT ON COLUMN action_gestion.ag_contact IS ' contact of the third part ';
 COMMENT ON COLUMN action_gestion.ag_state IS 'state of the action same as document_state ';
 
 
-SET default_with_oids = false;
 
 
 CREATE TABLE action_gestion_comment (
@@ -2760,7 +2756,6 @@ CREATE SEQUENCE action_tags_at_id_seq
 ALTER SEQUENCE action_tags_at_id_seq OWNED BY action_tags.at_id;
 
 
-SET default_with_oids = true;
 
 
 CREATE TABLE attr_def (
@@ -2796,7 +2791,6 @@ CREATE SEQUENCE bilan_b_id_seq
     CACHE 1;
 
 
-SET default_with_oids = false;
 
 
 CREATE TABLE bilan (
@@ -2885,7 +2879,6 @@ CREATE SEQUENCE bud_detail_periode_bdp_id_seq
     CACHE 1;
 
 
-SET default_with_oids = true;
 
 
 CREATE TABLE centralized (
@@ -2910,7 +2903,6 @@ CREATE TABLE centralized (
 COMMENT ON TABLE centralized IS 'The centralized journal';
 
 
-SET default_with_oids = false;
 
 
 CREATE TABLE del_action (
@@ -3016,7 +3008,6 @@ CREATE SEQUENCE document_d_id_seq
     CACHE 1;
 
 
-SET default_with_oids = true;
 
 
 CREATE TABLE document (
@@ -3118,7 +3109,6 @@ COMMENT ON TABLE document_type IS 'Type of document : meeting, invoice,...';
 COMMENT ON COLUMN document_type.dt_prefix IS 'Prefix for ag_ref';
 
 
-SET default_with_oids = false;
 
 
 CREATE TABLE extension (
@@ -3172,7 +3162,6 @@ CREATE SEQUENCE extension_ex_id_seq
 ALTER SEQUENCE extension_ex_id_seq OWNED BY extension.ex_id;
 
 
-SET default_with_oids = true;
 
 
 CREATE TABLE fiche (
@@ -3225,7 +3214,6 @@ CREATE TABLE fiche_detail (
 COMMENT ON TABLE fiche_detail IS 'join between the card and the attribut definition';
 
 
-SET default_with_oids = false;
 
 
 CREATE TABLE forecast (
@@ -3350,7 +3338,6 @@ CREATE SEQUENCE forecast_item_fi_id_seq
 ALTER SEQUENCE forecast_item_fi_id_seq OWNED BY forecast_item.fi_id;
 
 
-SET default_with_oids = true;
 
 
 CREATE TABLE form (
@@ -3373,7 +3360,6 @@ CREATE TABLE formdef (
 );
 
 
-SET default_with_oids = false;
 
 
 CREATE TABLE groupe_analytique (
@@ -3412,7 +3398,6 @@ CREATE SEQUENCE s_jnt_id
     CACHE 1;
 
 
-SET default_with_oids = true;
 
 
 CREATE TABLE jnt_fic_attr (
@@ -3427,7 +3412,6 @@ CREATE TABLE jnt_fic_attr (
 COMMENT ON TABLE jnt_fic_attr IS 'join between the family card and the attribut definition';
 
 
-SET default_with_oids = false;
 
 
 CREATE TABLE jnt_letter (
@@ -3448,7 +3432,6 @@ CREATE SEQUENCE jnt_letter_jl_id_seq
 ALTER SEQUENCE jnt_letter_jl_id_seq OWNED BY jnt_letter.jl_id;
 
 
-SET default_with_oids = true;
 
 
 CREATE TABLE jrn (
@@ -3515,7 +3498,6 @@ COMMENT ON TABLE jrn_def IS 'Definition of a journal, his properties';
 COMMENT ON COLUMN jrn_def.jrn_enable IS 'Set to 1 if the ledger is enable ';
 
 
-SET default_with_oids = false;
 
 
 CREATE TABLE jrn_info (
@@ -3582,7 +3564,6 @@ CREATE TABLE jrn_periode (
 );
 
 
-SET default_with_oids = true;
 
 
 CREATE TABLE jrn_rapt (
@@ -3632,7 +3613,6 @@ CREATE TABLE jrnx (
 COMMENT ON TABLE jrnx IS 'Journal: content one line for each accountancy writing';
 
 
-SET default_with_oids = false;
 
 
 CREATE TABLE key_distribution (
@@ -4044,7 +4024,6 @@ COMMENT ON COLUMN operation_analytique.oa_positive IS 'Sign of the amount';
 COMMENT ON COLUMN operation_analytique.f_id IS 'FK to fiche.f_id , used only with ODS';
 
 
-SET default_with_oids = true;
 
 
 CREATE TABLE parameter (
@@ -4093,7 +4072,6 @@ CREATE TABLE parm_periode (
 COMMENT ON TABLE parm_periode IS 'Periode definition';
 
 
-SET default_with_oids = false;
 
 
 CREATE TABLE parm_poste (
@@ -4385,7 +4363,6 @@ CREATE TABLE quant_purchase (
 COMMENT ON COLUMN quant_purchase.qp_vat_sided IS 'amount of the VAT which avoid VAT, case of the VAT which add the same amount at the deb and cred';
 
 
-SET default_with_oids = true;
 
 
 CREATE TABLE quant_sold (
@@ -4867,7 +4844,6 @@ CREATE SEQUENCE seq_doc_type_9
     CACHE 1;
 
 
-SET default_with_oids = false;
 
 
 CREATE TABLE stock_change (
@@ -4893,7 +4869,6 @@ CREATE SEQUENCE stock_change_c_id_seq
 ALTER SEQUENCE stock_change_c_id_seq OWNED BY stock_change.c_id;
 
 
-SET default_with_oids = true;
 
 
 CREATE TABLE stock_goods (
@@ -4918,7 +4893,6 @@ CREATE TABLE stock_goods (
 COMMENT ON TABLE stock_goods IS 'About the goods';
 
 
-SET default_with_oids = false;
 
 
 CREATE TABLE stock_repository (
@@ -5008,7 +4982,6 @@ CREATE SEQUENCE tmp_pcmn_id_seq
     CACHE 1;
 
 
-SET default_with_oids = true;
 
 
 CREATE TABLE tmp_pcmn (
@@ -5034,7 +5007,6 @@ COMMENT ON COLUMN tmp_pcmn.id IS 'allow to identify the row, it is unique and no
 COMMENT ON COLUMN tmp_pcmn.pcm_direct_use IS 'Value are N or Y , N cannot be used directly , not even through a card';
 
 
-SET default_with_oids = false;
 
 
 CREATE TABLE tmp_stockgood (
@@ -5158,7 +5130,6 @@ CREATE TABLE tool_uos (
 );
 
 
-SET default_with_oids = true;
 
 
 CREATE TABLE tva_rate (
@@ -5175,7 +5146,6 @@ CREATE TABLE tva_rate (
 COMMENT ON TABLE tva_rate IS 'Rate of vat';
 
 
-SET default_with_oids = false;
 
 
 CREATE TABLE user_active_security (
@@ -5248,7 +5218,6 @@ CREATE SEQUENCE user_filter_id_seq
 ALTER SEQUENCE user_filter_id_seq OWNED BY user_filter.id;
 
 
-SET default_with_oids = true;
 
 
 CREATE TABLE user_local_pref (
@@ -5282,7 +5251,6 @@ CREATE TABLE user_sec_act (
 );
 
 
-SET default_with_oids = false;
 
 
 CREATE TABLE user_sec_action_profile (
@@ -5323,7 +5291,6 @@ CREATE SEQUENCE user_sec_action_profile_ua_id_seq
 ALTER SEQUENCE user_sec_action_profile_ua_id_seq OWNED BY user_sec_action_profile.ua_id;
 
 
-SET default_with_oids = true;
 
 
 CREATE TABLE user_sec_jrn (

From 66a82492a5df7fb3356586fb0bd713d273bce249 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 6 Nov 2020 17:20:39 +0100
Subject: [PATCH 152/257] CFGCONTACT change to CFGOPT1

---
 include/constant.php             | 2 +-
 include/sql/patch/upgrade149.sql | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 include/sql/patch/upgrade149.sql

diff --git a/include/constant.php b/include/constant.php
index fe77c4d64..7d08aea22 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -107,7 +107,7 @@ if ( !defined ("NOALYSS_PACKAGE_REPOSITORY")) {
 if ( ! defined ("SYSINFO_DISPLAY")) {
     define ("SYSINFO_DISPLAY",TRUE);
 }
-define ("DBVERSION",149);
+define ("DBVERSION",150);
 define ("MONO_DATABASE",25);
 define ("DBVERSIONREPO",18);
 define ('NOTFOUND','--not found--');
diff --git a/include/sql/patch/upgrade149.sql b/include/sql/patch/upgrade149.sql
new file mode 100644
index 000000000..b1865a488
--- /dev/null
+++ b/include/sql/patch/upgrade149.sql
@@ -0,0 +1,6 @@
+begin;
+update menu_ref set me_code='CFGOPT1',me_menu='Option Fiches', me_description = 'configure les options pour les fiches dans le suivi' where me_code='CFGCONTACT';
+update bookmark set b_action=replace(b_action,'CFGCONTACT','CFGOPT1');
+
+insert into version (val,v_description) values (150,'Change name default action');
+commit;

From 83dc1e2c2c6a900ae1c5eeea752dade4ca159d6d Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 6 Nov 2020 17:21:00 +0100
Subject: [PATCH 153/257] Follow Up col. order in the list

---
 include/class/follow_up.class.php | 56 ++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index b91532828..1149058a3 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -617,14 +617,22 @@ class Follow_Up
         $url=$p_base.$arg;
 
         $table=new Sort_Table();
-        $table->add(_('Date Doc.'), $url, 'order by ag_timestamp asc', 'order by ag_timestamp desc', 'da', 'dd');
+        // 0
+        $table->add(_('Date Doc.'), $url, 'order by ag_timestamp asc', 'order by ag_timestamp desc', 'da', 'dd'); 
         //$table->add(_('Date Comm.'), $url, 'order by last_comment', 'order by last_comment desc', 'dca', 'dcd');
+        //1
         $table->add(_('Date Limite'), $url, 'order by ag_remind_date asc', 'order by ag_remind_date  desc', 'ra', 'rd');
-        $table->add(_('Etiquette'), $url, 'order by tags asc', 'order by tags desc', 'taa', 'tad');
+        //2
         $table->add(_('Réf.'), $url, 'order by ag_ref asc', 'order by ag_ref desc', 'ra', 'rd');
+        //3
+        $table->add(_('Etiquette'), $url, 'order by tags asc', 'order by tags desc', 'taa', 'tad');
+        //4
         $table->add(_('Groupe'), $url, "order by coalesce((select p_name from profile where p_id=ag_dest),'Aucun groupe')", "order by coalesce((select p_name from profile where p_id=ag_dest),'Aucun groupe') desc", 'dea', 'ded');
+        //5
         $table->add(_('Dest/Exp'), $url, 'order by name asc', 'order by name desc', 'ea', 'ed');
+        //6
         $table->add(_('Titre'), $url, 'order by ag_title asc', 'order by ag_title desc', 'ta', 'td');
+        //7
         $table->add(_('Etat'), $url, 'order by s_value asc', 'order by s_value desc', 'ea', 'ed');
 
         $ord=(!isset($_GET['ord']))?"dd":$_GET['ord'];
@@ -669,15 +677,15 @@ class Follow_Up
         $r.="<tr>";
         $r.='<th name="ag_id_td" style="display:none" >'.ICheckBox::toggle_checkbox('ag', 'list_ag_frm').'</th>';
         $r.='<th style="width:5.57%">'.$table->get_header(0).'</th>';
-//        $r.='<th>'.$table->get_header(1).'</th>';
         $r.='<th style="width:5.57%">'.$table->get_header(1).'</th>';
-        $r.=th('Priorité','style="width:5.57%"');
-        $r.='<th style="width:5.57%">'.$table->get_header(7).'</th>';
-        $r.='<th style="width:35%">'.$table->get_header(6).'</th>';
         $r.='<th style="width:5.57%">'.$table->get_header(2).'</th>';
+        $r.='<th style="width:5.57%">'.$table->get_header(5).'</th>';
+//        $r.='<th>'.$table->get_header(1).'</th>';
+        $r.=th('Priorité','style="width:5.57%"');
+        $r.='<th style="width:35%">'.$table->get_header(6).'</th>';
+        $r.='<th style="width:5.57%">'.$table->get_header(7).'</th>';
         $r.='<th style="width:5.57%">'.$table->get_header(3).'</th>';
         $r.='<th style="width:5.57%">'.$table->get_header(4).'</th>';
-        $r.='<th style="width:5.57%">'.$table->get_header(5).'</th>';
         $r.="</tr>";
 
 
@@ -716,7 +724,22 @@ class Follow_Up
             $r.="<td>".$href.smaller_date($row['my_date']).'</a>'."</td>";
             //$r.="<td>".$href.$row['str_last_comment'].'</a>'."</td>";
             $r.="<td>".$href.smaller_date($row['my_remind']).'</a>'."</td>";
-                        /*
+            $r.="<td>".$href.$row['ag_ref'].'</a>'."</td>";
+            // Expediteur
+            $fexp=new Fiche($this->db);
+            $fexp->id=$row['f_id_dest'];
+            $qcode_dest=$fexp->strAttribut(ATTR_DEF_QUICKCODE);
+
+            $qexp=($qcode_dest==NOTFOUND)?"Interne":$qcode_dest;
+            $jsexp=sprintf("javascript:showfiche('%s')", $qexp);
+            if ($qexp!='Interne')
+            {
+                $r.="<td>$href".$qexp." : ".$fexp->getName().'</a></td>';
+            }
+            else
+                $r.="<td>$href Interne </a></td>";
+
+             /*
              * State
              */
             switch ($row['ag_priority'])
@@ -733,26 +756,13 @@ class Follow_Up
             }
             $r.=td($priority);
 
-            $r.="<td>".$row['s_value']."</td>";
              $r.='<td>'.$href.
                     h($row['ag_title'])."</A></td>";
+            $r.="<td>".$row['s_value']."</td>";
             $r.="<td>".$href."<span style=\"font-size:75%\">".h($row['tags']).'</span>'.'</a>'."</td>";
-            $r.="<td>".$href.$row['ag_ref'].'</a>'."</td>";
             $r.="<td>".$href.h($row['dest']).'</a>'."</td>";
 
-            // Expediteur
-            $fexp=new Fiche($this->db);
-            $fexp->id=$row['f_id_dest'];
-            $qcode_dest=$fexp->strAttribut(ATTR_DEF_QUICKCODE);
-
-            $qexp=($qcode_dest==NOTFOUND)?"Interne":$qcode_dest;
-            $jsexp=sprintf("javascript:showfiche('%s')", $qexp);
-            if ($qexp!='Interne')
-            {
-                $r.="<td>$href".$qexp." : ".$fexp->getName().'</a></td>';
-            }
-            else
-                $r.="<td>$href Interne </a></td>";
+            
 
 
 

From 67dc4a8b5442c81be45fed11b35b18c89aa2ae50 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 6 Nov 2020 17:26:22 +0100
Subject: [PATCH 154/257] typo

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

diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 1149058a3..b65eee717 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -748,10 +748,10 @@ class Follow_Up
                     $priority=_('Haute');
                     break;
                 case 2:
-                    $priority=_("Moyenne");
+                    $priority=_("Normale");
                     break;
                 case 3:
-                    $priority=_("Important");
+                    $priority=_("Basse");
                     break;
             }
             $r.=td($priority);

From 6fdce8881ad49d64c819bcc11e75a805210e76e6 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 6 Nov 2020 17:49:19 +0100
Subject: [PATCH 155/257] Cosmetic : follow up

---
 include/class/follow_up.class.php        | 2 +-
 include/template/action_other_action.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index b65eee717..6d740cdfe 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -682,7 +682,7 @@ class Follow_Up
         $r.='<th style="width:5.57%">'.$table->get_header(5).'</th>';
 //        $r.='<th>'.$table->get_header(1).'</th>';
         $r.=th('Priorité','style="width:5.57%"');
-        $r.='<th style="width:35%">'.$table->get_header(6).'</th>';
+        $r.='<th style="min-width:52%">'.$table->get_header(6).'</th>';
         $r.='<th style="width:5.57%">'.$table->get_header(7).'</th>';
         $r.='<th style="width:5.57%">'.$table->get_header(3).'</th>';
         $r.='<th style="width:5.57%">'.$table->get_header(4).'</th>';
diff --git a/include/template/action_other_action.php b/include/template/action_other_action.php
index 4d941b3e0..4759467c3 100644
--- a/include/template/action_other_action.php
+++ b/include/template/action_other_action.php
@@ -13,7 +13,7 @@
 echo HtmlInput::request_to_hidden(array("closed_action","remind_date_end","remind_date","sag_ref", "remind_date","only_internal", "state", "gDossier", "qcode", "start_date", "end_date", "ag_id", "ag_dest_query",
 		"tdoc",   "action_query","date_start","date_end","hsstate","searchtag"));
 ?>
-<div id="other_div" class="inner_box" style="left:25%;width:40%;display: none">
+<div id="other_div" class="inner_box" style="left:25%;width:45rem;display: none">
     <?php echo HtmlInput::title_box(_('Actions sur plusieurs documents'),'other_div', 'hide','action_hide_checkbox();') ?>
     <?php echo _("Sélectionner les documents et l' action :")?>
     <ul style='list-style-type: none;padding-left:30px;margin: 0px' >
@@ -61,6 +61,7 @@ echo HtmlInput::request_to_hidden(array("closed_action","remind_date_end","remin
 ?>
 </div>
 <script>
+    var obj=document.getElementById('other_div');
     new Draggable('other_div',{starteffect:function(){
                                     new Effect.Highlight(obj.id,{scroll:window,queue:'end'});
                                   }

From cd0294e01756cec2c18ad68523fe49c4e31c3420 Mon Sep 17 00:00:00 2001
From: Dany wm De Bontridder <danydb@noalyss.eu>
Date: Sat, 7 Nov 2020 09:21:36 +0100
Subject: [PATCH 156/257] Cosmetic : install structure input

---
 html/install.php                          |   8 +-
 include/template/template_config_form.php | 110 +++++++++++++---------
 2 files changed, 70 insertions(+), 48 deletions(-)

diff --git a/html/install.php b/html/install.php
index 847a91145..e08cbc3b1 100644
--- a/html/install.php
+++ b/html/install.php
@@ -29,14 +29,18 @@
      h2 {
          font-size: 105%;
          text-align: left;
-         text-decoration: underline;
+         text-decoration: none;
+         color:darkblue;
+         margin-bottom: 1rem;
+         margin-top: 1rem;
+
      }
      h3 {
          font-size : 102%;
          font-style: italic;
          margin-left: 3px;
      }
- 
+
     .button {
         font-size:110%;
         color:white;
diff --git a/include/template/template_config_form.php b/include/template/template_config_form.php
index dd8042f02..58432d549 100644
--- a/include/template/template_config_form.php
+++ b/include/template/template_config_form.php
@@ -28,23 +28,71 @@
  */
 
 ?>
-<div style="margin-left: 30">
-<table>
-	<tr>
-		<TD> <?php echo _('Répertoire temporaire');?> </TD>
-		<TD> <?php echo $ictmp->input(); echo Icon_Action::infobulle(200);?></TD>
+<div style="margin-left: 5em">
+    <h2><?=_("Application")?></h2>
+    <div style="margin-left:5rem">
 
-	</tr>
-	<TR>
+    <table>
+        <tr>
+            <td>
+                <?php echo _('Administrateur de noalyss')?>
+            </td>
+            <td>
+                <?php echo $icadmin->input();echo Icon_Action::infobulle(210)?>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <?php echo _('Mot de passe administrateur de noalyss')?>
+            </td>
+            <td>
+                <?php echo $icpassword_admin->input();?>
+                <?php echo Icon_Action::infobulle(209)?>
+            </td>
+        </tr>
 
-		<TD><?php echo _('Changement de langue');?></TD>
-		<TD> <?php echo $iclocale->input();echo Icon_Action::infobulle(201)?></TD>
-	</TR>
-	<TR>
-		<TD><?php echo _('Chemin complet vers les executable de Postgresql');?> </TD>
-		<TD><?php echo $icpath->input();echo Icon_Action::infobulle(202)?></TD>
-	</TR>
-	<TR>
+    </table>
+    </div>
+    <h2><?=_("Serveur")?></h2>
+        <div style="margin-left:5rem">
+    <table>
+        <tr>
+            <TD> <?php echo _('Répertoire temporaire');?> </TD>
+            <TD> <?php echo $ictmp->input(); echo Icon_Action::infobulle(200);?></TD>
+
+        </tr>
+        <TR>
+
+            <TD><?php echo _('Changement de langue');?></TD>
+            <TD> <?php echo $iclocale->input();echo Icon_Action::infobulle(201)?></TD>
+        </TR>
+        <TR>
+            <TD><?php echo _('Chemin complet vers les executable de Postgresql');?> </TD>
+            <TD><?php echo $icpath->input();echo Icon_Action::infobulle(202)?></TD>
+        </TR>
+        <tr>
+            <td><?php echo _('Mode Serveur mutualisé'). Icon_Action::infobulle(207) ?></td>
+            <td><?php echo $smulti->input() ?></td>
+        </tr>
+        <tr id="div_db" style="visibility:hidden">
+            <td>
+                <?php echo _('Nom base de donnée');?>
+
+            </td>
+            <td>
+                <?php echo $icdbname->input();echo Icon_Action::infobulle(206) ?>
+                <a href="https://wiki.noalyss.eu/doku.php?id=installation:installation_sur_serveur_mutualise" target="_blank"><?php echo _('Aide');?></a>
+            </td>
+        </tr>
+
+    </table>
+        </div>
+
+    <h2><?=_("Postgresql")?></h2>
+    <div style="margin-left:5rem">
+
+    <table>
+    <TR>
 		<TD><?php echo _('Utilisateur Postgresql');?> </TD>
 		<TD><?php echo $icuser->input();echo Icon_Action::infobulle(203)?></TD>
 	</TR>
@@ -52,23 +100,6 @@
 		<TD><?php echo _('Mot de passe de l\'utilisateur Postgresql');?> </TD>
 		<TD><?php echo $icpasswd->input();echo Icon_Action::infobulle(204)?></TD>
 </TR>
-<tr>
-    <td>
-        <?php echo _('Administrateur de noalyss')?>
-    </td>
-    <td>
-        <?php echo $icadmin->input();echo Icon_Action::infobulle(210)?>
-    </td>
-</tr>
-<tr>
-    <td>
-        <?php echo _('Mot de passe administrateur de noalyss')?>
-    </td>
-    <td>
-        <?php echo $icpassword_admin->input();?>
-        <?php echo Icon_Action::infobulle(209)?>
-    </td>
-</tr>
 <TR>
 	<TD><?php echo _('Adresse Serveur Postgresql');?> </TD>
 	<TD><?php echo $ichost->input();echo Icon_Action::infobulle(208)?></TD>
@@ -77,21 +108,8 @@
 	<TD><?php echo _('Port de Postgresql');?> </TD>
 	<TD><?php echo $icport->input();echo Icon_Action::infobulle(205)?></TD>
 </TR>
-<tr>
-	<td><?php echo _('Mode Serveur mutualisé'). Icon_Action::infobulle(207) ?></td>
-	<td><?php echo $smulti->input() ?></td>
-</tr>
-<tr id="div_db" style="visibility:hidden">
-	<td>
-		<?php echo _('Nom base de donnée');?>
-		
-	</td>
-	<td>
-		<?php echo $icdbname->input();echo Icon_Action::infobulle(206) ?>
-		<a href="https://wiki.noalyss.eu/doku.php?id=installation:installation_sur_serveur_mutualise" target="_blank"><?php echo _('Aide');?></a>
-	</td>
-</tr>
 </table>
+    </div>
 </div>
 <div class="notice">
 	<?php

From 40b3786df3d6aa77234e4cca013dd9af454493b3 Mon Sep 17 00:00:00 2001
From: Dany wm De Bontridder <danydb@noalyss.eu>
Date: Sat, 7 Nov 2020 14:21:40 +0100
Subject: [PATCH 157/257] Cosmetic

---
 html/style-classic7.css | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/html/style-classic7.css b/html/style-classic7.css
index e0235d9bb..c85e87ca1 100644
--- a/html/style-classic7.css
+++ b/html/style-classic7.css
@@ -88,15 +88,24 @@ table.sortable th,  table.table_large th,table.result th {
 h2 {
     font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
     color:white;
-    background-color:#6393c1;
+    background-color:#9fbcd6;
     /*! margin:1px; */
-    padding:3px;
     font-style: italic; 
     font-size:15px;
     font-size:1.1rem;
-    margin-bottom: 5px;
     margin-top: 5px;
+    font-size: 1.1rem;
+margin-bottom: 1rem;
+margin-top: 1rem;
+border-radius: 2px;
+padding: 0.5rem 0rem 0.7rem 2rem;
 }
+ @media only screen and (max-width: 1280px) {
+     h2{
+         margin-top:2px;
+         padding: 0.2rem 0rem 0.3rem 1rem;
+     }
+ }
 div.info {
     background:#879ED4;
     color:#FFFFFF;
@@ -438,9 +447,9 @@ div.content a {
     font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
     font-family: 'openSansRegular';
     text-decoration: none;
-    display: block;
+    display: inline-block;
    color: #0000FF;
-    padding: 0px;
+    padding: 0px 10px 0px 0px;
     text-decoration: underline;
 /*! background: rgb(247, 192, 156) none repeat scroll 0% 0%; */
 
@@ -453,7 +462,7 @@ div.content a:hover {
     color: #FFFFFF;
     background-color:#336699;
     text-decoration: none;
-    display: block;
+    display: inline-block;
 
     /*! border-top-color: white; */
     /*! border-top-style: solid; */

From 598978ca802443b704ec5cf34a4fa6703bc96fa3 Mon Sep 17 00:00:00 2001
From: Dany wm De Bontridder <danydb@noalyss.eu>
Date: Sat, 7 Nov 2020 14:22:08 +0100
Subject: [PATCH 158/257] Bug : incompatibilty with php 7.4

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

diff --git a/include/class/acc_ledger_history_generic.class.php b/include/class/acc_ledger_history_generic.class.php
index a50f142d8..2b96f2ab2 100644
--- a/include/class/acc_ledger_history_generic.class.php
+++ b/include/class/acc_ledger_history_generic.class.php
@@ -498,8 +498,8 @@ class Acc_Ledger_History_Generic extends Acc_Ledger_History
 // Grand livre == 0
         $Res=$this->db->exec_sql("select jr_id,j_id,j_id as int_j_id,to_char(j_date,'DD.MM.YYYY') as j_date,
                                      jr_internal,
-                                     case j_debit when 't' then j_montant::text else '   ' end as deb_montant,
-                                     case j_debit when 'f' then j_montant::text else '   ' end as cred_montant,
+                                     case j_debit when 't' then j_montant else 0 end as deb_montant,
+                                     case j_debit when 'f' then j_montant else 0 end as cred_montant,
                                      j_debit as debit,j_poste as poste,j_qcode,jr_montant , ".
                 "case when j_text='' or j_text is null then pcm_lib else j_text end as description,j_grpt as grp,
                                      jr_comment||' ('||jr_internal||')'  as jr_comment,

From d63d68d9794f686367f02fbd5f776fdcfc685aea Mon Sep 17 00:00:00 2001
From: Dany wm De Bontridder <danydb@noalyss.eu>
Date: Sat, 7 Nov 2020 14:22:30 +0100
Subject: [PATCH 159/257] ergonomy : add waiting box

---
 include/impress_jrn.inc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/impress_jrn.inc.php b/include/impress_jrn.inc.php
index aaaadd12b..b3c9e7fcd 100644
--- a/include/impress_jrn.inc.php
+++ b/include/impress_jrn.inc.php
@@ -98,12 +98,12 @@ echo '<div class="content">';
 /*
  * Let you change the exercice
  */
-echo '<form method="GET">';
+echo '<form method="GET" onsubmit="waiting_box();return true;">';
 echo '<fieldset><legend>' . _('Exercice') . '</legend>';
 ;
 echo _('Choisissez un autre exercice').' :';
 $ex = new Exercice($cn);
-$wex = $ex->select('exercice', $exercice, ' onchange="submit(this)"');
+$wex = $ex->select('exercice', $exercice, ' onchange="waiting_box();submit(this)"');
 echo $wex->input();
 echo dossier::hidden();
 echo HtmlInput::get_to_hidden(array('ac', 'type'));
@@ -112,7 +112,7 @@ echo '</form>';
 ?>
 <?php
 
-echo '<FORM METHOD="GET">' . dossier::hidden();
+echo '<FORM METHOD="GET"  onsubmit="waiting_box();return true;">' . dossier::hidden();
 echo HtmlInput::get_to_hidden(array('ac', 'type'));
 echo HtmlInput::hidden('type', 'jrn');
 echo HtmlInput::get_to_hidden(array('exercice'));

From 80a0993ce731d44bddd068d1583f05432447570f Mon Sep 17 00:00:00 2001
From: Dany wm De Bontridder <danydb@noalyss.eu>
Date: Sat, 7 Nov 2020 14:22:54 +0100
Subject: [PATCH 160/257] Bug : follow up mixed description and comment

---
 include/class/follow_up.class.php  |  59 +++++++-------
 include/template/detail-action.php | 124 ++++++++++++++++-------------
 2 files changed, 99 insertions(+), 84 deletions(-)

diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 6d740cdfe..010958bce 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -596,7 +596,12 @@ class Follow_Up
         if (trim($this->ag_comment)!='' && Document_Option::can_add_comment($this->ag_id))
         {
             $this->db->exec_sql("insert into action_gestion_comment (ag_id,tech_user,agc_comment) values ($1,$2,$3)"
-                    , array($this->ag_id, $_SESSION['g_user'], $this->ag_comment));
+                , array($this->ag_id, $_SESSION['g_user'], $this->ag_comment));
+        }
+        if (trim($this->ag_description)!='' && Document_Option::can_add_comment($this->ag_id))
+        {
+            $this->db->exec_sql("insert into action_gestion_comment (ag_id,tech_user,agc_comment) values ($1,$2,$3)"
+                , array($this->ag_id, $_SESSION['g_user'], $this->ag_description));
         }
         $this->insert_operation();
         $this->insert_action();
@@ -905,6 +910,11 @@ class Follow_Up
             $this->db->exec_sql("insert into action_gestion_comment (ag_id,tech_user,agc_comment) values ($1,$2,$3)"
                     , array($this->ag_id, $_SESSION['g_user'], $this->ag_comment));
         }
+        if (trim($this->ag_description)!='')
+        {
+            $this->db->exec_sql("insert into action_gestion_comment (ag_id,tech_user,agc_comment) values ($1,$2,$3)"
+                    , array($this->ag_id, $_SESSION['g_user'], $this->ag_description));
+        }
         $this->insert_operation();
         $this->insert_action();
         return true;
@@ -949,29 +959,24 @@ class Follow_Up
     function fromArray($p_array)
     {
         global $g_user;
-        $this->ag_id=(isset($p_array['ag_id']))?$p_array['ag_id']:0;
-        $this->ag_ref=(isset($p_array['ag_ref']))?$p_array['ag_ref']:"";
-        $this->qcode_dest=(isset($p_array['qcode_dest']))?$p_array['qcode_dest']:"";
-        $this->f_id_dest=(isset($p_array['f_id_dest']))?$p_array['f_id_dest']:null;
-        $this->ag_timestamp=(isset($p_array['ag_timestamp']))?$p_array['ag_timestamp']:date('d.m.Y');
-        $this->qcode_dest=(isset($p_array['qcode_dest']))?$p_array['qcode_dest']:"";
-        $this->dt_id=(isset($p_array['dt_id']))?$p_array['dt_id']:"";
-        $this->ag_state=(isset($p_array['ag_state']))?$p_array['ag_state']:2;
-        $this->ag_ref=(isset($p_array['ag_ref']))?$p_array['ag_ref']:"";
-        $this->ag_title=(isset($p_array['ag_title']))?$p_array['ag_title']:"";
-        $this->ag_hour=(isset($p_array['ag_hour']))?$p_array['ag_hour']:"";
-        $this->ag_dest=(isset($p_array['ag_dest']))?$p_array['ag_dest']:$g_user->get_profile();
-        $this->ag_priority=(isset($p_array['ag_priority']))?$p_array['ag_priority']:2;
-        $this->ag_contact=(isset($p_array['ag_contact']))?$p_array['ag_contact']:"";
-        $this->ag_comment=(isset($p_array['ag_comment']))?$p_array['ag_comment']:"";
-        $this->ag_remind_date=(isset($p_array['ag_remind_date']))?$p_array['ag_remind_date']:null;
-        $this->operation=(isset($p_array['operation']))?$p_array['operation']:null;
-        /**
-         * @todo
-         * deprecated : to remove
-          $this->op = (isset($p_array['op'])) ? $p_array['op'] : null;
-         */
-        $this->action=(isset($p_array['action']))?$p_array['action']:null;
+        $http=new HttpInput();
+        $this->ag_id=$http->extract($p_array,"ag_id","number",0);
+        $this->ag_ref=$http->extract($p_array,"ag_ref","string","");
+        $this->qcode_dest=$http->extract($p_array,"qcode_dest","string","");
+        $this->f_id_dest=$http->extract($p_array,"f_id_dest","string",null);
+        $this->ag_timestamp=$http->extract($p_array,"ag_timestamp","string",date('d.m.Y'));
+        $this->dt_id=$http->extract($p_array,"dt_id","string","");
+        $this->ag_state=$http->extract($p_array,"ag_state","number",2);
+        $this->ag_title=$http->extract($p_array,"ag_title","string","");
+        $this->ag_hour=$http->extract($p_array,"ag_hour","string","");
+        $this->ag_dest=$http->extract($p_array,"ag_dest","string",$g_user->get_profile());
+        $this->ag_priority=$http->extract($p_array,"ag_priority","string","2");
+        $this->ag_contact=$http->extract($p_array,"ag_contact","string","");
+        $this->ag_comment=$http->extract($p_array,"ag_comment","string","");
+        $this->ag_description=$http->extract($p_array,"ag_description","string","");
+        $this->ag_remind_date=$http->extract($p_array,"ag_remind_date","string",null);
+        $this->operation=$http->extract($p_array,"operation","string",null);
+        $this->action=$http->extract($p_array,"action","string",null);
     }
 
     /**
@@ -1520,7 +1525,7 @@ class Follow_Up
      * @brief show the cell content in Display for the tags
      * called also by ajax
      */
-    function tag_cell()
+    function tag_cell($p_view='UPD')
     {
         global $g_user;
         $a_tag=$this->tag_get();
@@ -1529,7 +1534,7 @@ class Follow_Up
         {
             echo '<span class="tagcell">';
             echo $a_tag[$e]['t_tag'];
-            if ($g_user->can_write_action($this->ag_id)==true)
+            if ($g_user->can_write_action($this->ag_id)==true && $p_view != 'READ')
             {
                 $js_remove=sprintf("action_tag_remove('%s','%s','%s')", dossier::id(), $this->ag_id, $a_tag[$e]['t_id']);
                 echo Icon_Action::trash(uniqid(), $js_remove);
@@ -1539,7 +1544,7 @@ class Follow_Up
             echo '&nbsp;';
         }
         
-        if ($g_user->can_write_action($this->ag_id)==true)
+        if ($p_view != 'READ' && $g_user->can_write_action($this->ag_id)==true)
         {
             $js=sprintf("onclick=\"action_tag_select('%s','%s')\"", dossier::id(), $this->ag_id);
             echo HtmlInput::button('tag_bt', _('Ajout étiquette'), $js, 'smallbutton');
diff --git a/include/template/detail-action.php b/include/template/detail-action.php
index 1e13df757..3cb50719f 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -74,7 +74,7 @@ $uniq=uniqid("tab",TRUE);
               <td id="concerned_card_td">
               <?php 
                     echo $this->display_linked();
-                     if  ($g_user->can_write_action($this->ag_id) == true ):
+                     if  ($p_view != 'READ' && $g_user->can_write_action($this->ag_id) == true ):
                         echo HtmlInput::button_action_add_concerned_card( $this->ag_id);
                      endif;
                ?>
@@ -160,7 +160,7 @@ $uniq=uniqid("tab",TRUE);
             
             <td id="action_tag_td">
                 <?php
-                   $this->tag_cell();
+                   $this->tag_cell($p_view);
                 ?>
             </td>
           </TR>
@@ -253,47 +253,48 @@ function small(p_id_textarea){
    // description
    $description = new ITextarea("ag_description");
    $description->id="ag_description";
-   //---------------------------------- Description -------------------------------------------------------------------
-   if ( count($acomment)> 0) {
-        $editable_description = Document_Option::is_enable_editable_description($this->dt_id);
-        if ( $editable_description == true){
-             echo h2(_("Description"));
-            $itDescription=new ITextarea("ag_description");
-            $itDescription->style='class="input_text field_follow_up" style="height:21rem;width:98%"';
-            
-            $ag_description_id= $acomment[0]['agc_id'];
-            $itDescription->value=$acomment[0]['agc_comment'];
-            $itDescription->id="ag_description";
+    //---------------------------------- Description -------------------------------------------------------------------
+    if ( count($acomment)> 0) {
+            $has_description = true;
+            $editable_description = Document_Option::is_enable_editable_description($this->dt_id);
+            if ( $p_view != 'READ' && $editable_description == true){
+                echo h2(_("Description"));
+                $itDescription=new ITextarea("ag_description");
+                $itDescription->style='class="input_text field_follow_up" style="height:21rem;width:98%"';
 
-             // One editable comment is available
-            $editable_description=new Inplace_Edit($itDescription);
-            $editable_description->add_json_param("op", "followup_comment_oneedit");
-            $editable_description->add_json_param("agc_id", $ag_description_id);
-            $editable_description->add_json_param("ag_id", $ag_id);
-            $editable_description->add_json_param("gDossier", Dossier::id());
-            $editable_description->set_callback("ajax_misc.php");
+                $ag_description_id= $acomment[0]['agc_id'];
+                $itDescription->value=$acomment[0]['agc_comment'];
+                $itDescription->id="ag_description";
 
-            echo $editable_description->input();
-        } 
-        elseif ($p_view == 'READ' || $editable_description == false)
-        {
-            echo h2(_("Description"));
-            
-            echo '<pre class="field_follow_up">';
+                // One editable comment is available
+                $editable_description=new Inplace_Edit($itDescription);
+                $editable_description->add_json_param("op", "followup_comment_oneedit");
+                $editable_description->add_json_param("agc_id", $ag_description_id);
+                $editable_description->add_json_param("ag_id", $ag_id);
+                $editable_description->add_json_param("gDossier", Dossier::id());
+                $editable_description->set_callback("ajax_misc.php");
+
+                echo $editable_description->input();
+            }
+            elseif ($p_view == 'READ' || $editable_description == false)
+            {
+                echo h2(_("Description"));
+
+                echo '<pre class="field_follow_up">';
                 echo h($acomment[0]['agc_comment']);
                 echo '</pre>';
-        }
-   } else {
-       echo h2(_("Description"));
-       echo $desc->input();
+            }
+    } else {
+          echo h2(_("Description"));
+          echo $description->input();
    }
-   
-   //---------------------------------- Comment -----------------------------------------------------------------------
+
+        //---------------------------------- Comment -----------------------------------------------------------------------
    
    if (    Document_Option::can_add_comment($ag_id)  && 
            Document_Option::option_comment($this->dt_id) == "ONE_EDIT" ) 
    {
-        if (count($acomment) > 1 && $p_view != 'READ')  {
+        if (count($acomment) > 1 )  {
             echo h2(_("Commentaire"));
             $comment=new ITextarea("ag_comment_edit");
             $comment->style='class="input_text field_follow_up" style="height:21rem;width:98%"';
@@ -302,34 +303,40 @@ function small(p_id_textarea){
             $comment->value=(count($acomment) > 1 )?$acomment[1]['agc_comment']:'';
             $comment->id="ag_comment_edit";
 
-            // One editable comment is available
-            $editable_comment=new Inplace_Edit($comment);
-            $editable_comment->add_json_param("op", "followup_comment_oneedit");
-            $editable_comment->add_json_param("agc_id", $ag_comment_id);
-            $editable_comment->add_json_param("ag_id", $ag_id);
-            $editable_comment->add_json_param("gDossier", Dossier::id());
-            $editable_comment->set_callback("ajax_misc.php");
-            echo '<p></p>';
-            echo $editable_comment->input();
+            if ( $p_view != 'READ') {
+
+                // One editable comment is available
+                $editable_comment=new Inplace_Edit($comment);
+                $editable_comment->add_json_param("op", "followup_comment_oneedit");
+                $editable_comment->add_json_param("agc_id", $ag_comment_id);
+                $editable_comment->add_json_param("ag_id", $ag_id);
+                $editable_comment->add_json_param("gDossier", Dossier::id());
+                $editable_comment->set_callback("ajax_misc.php");
+                echo '<p></p>';
+                echo $editable_comment->input();
+            } else {
+                echo '<p></p>';
+                echo $comment->display();
+            }
         } else {
             echo '<span class="noprint">';
-            if (  $p_view == 'UPD' && Document_Option::can_add_comment($ag_id) )  {
-            echo '<p></p>';
-            echo $desc->input();
-     
+            if (  $p_view == 'UPD' &&  $has_description && Document_Option::can_add_comment($ag_id) )  {
+                echo h2(_("Commentaire"));
+                echo '<p></p>';
+                echo $desc->input();
+
             }
             echo '</span>';
         }
    }
-    if (    Document_Option::can_add_comment($ag_id) 
+    if (  count($acomment) > 0
+            &&  Document_Option::can_add_comment($ag_id)
             && Document_Option::option_comment($this->dt_id) == "SOME_FIXED")
     {
-       if( count($acomment) >0 ) echo h2(_("Commentaire"));
+        echo h2(_("Commentaire"));
 
         for( $c=1;$c<count($acomment);$c++){
-            if ($c == 0) { $m_desc=_('Description');}
-            else
-             { $m_desc=_('Commentaire');}
+            $m_desc=_('Commentaire');
              $comment="";
              if ( $p_view != 'READ' && $c > 0)
             {
@@ -360,13 +367,16 @@ function small(p_id_textarea){
             echo '<p></p>';
             echo $comment;
         } // end for
-        echo '<span class="noprint">';
-        if (  $p_view == 'UPD' && Document_Option::can_add_comment($ag_id))  {
+        if (  $has_description &&  $p_view == 'UPD' && Document_Option::can_add_comment($ag_id))  {
+            echo '<span class="noprint">';
             echo '<p></p>';
-        echo $desc->input();
-     
+                echo $desc->input();
+
+            }
+            echo '</span>';
+            if  ($p_view == 'UPD') {
+
         }
-        echo '</span>';
     }
 
     

From c6390edd8df3c43a5511a70a155fcf747f7b792b Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sat, 7 Nov 2020 15:32:09 +0100
Subject: [PATCH 161/257] =?UTF-8?q?task=20#0001861:=20Plage=20de=20cases?=
 =?UTF-8?q?=20=C3=A0=20cocher=20,=20search=20action?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/include/template/action_search_result.php b/include/template/action_search_result.php
index 9b5c30d89..06ebbd82c 100644
--- a/include/template/action_search_result.php
+++ b/include/template/action_search_result.php
@@ -26,6 +26,7 @@
  * @brief show the result of a search into a inner windows
  *
  */
+
 ?>
 <form onsubmit="set_action_related('fresultaction');return false;" id="fresultaction">
 	<?php echo HtmlInput::hidden('ctlc',$_GET['ctlc'])?>
@@ -63,6 +64,7 @@
 			<?php
 			$ck=new ICheckBox('ag_id[]');
 			 $ck->value=$a_row[$i]['ag_id'];
+                         $ck->set_range("ag_id_search_ck");
 			 echo $ck->input();
 			?>
 		</td>
@@ -86,4 +88,7 @@
 <?php endfor;?>
 </table>
 	<?php echo HtmlInput::submit("save_action", _("Mettre à jour"))?>
-</form>
\ No newline at end of file
+</form>
+<?php
+echo ICheckBox::javascript_set_range("ag_id_search_ck");
+?>
\ No newline at end of file

From 1d32dbe93f063154fcd1d22690cae53f3e97de2b Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sat, 7 Nov 2020 15:35:58 +0100
Subject: [PATCH 162/257] Remove direct access _GET

---
 include/template/action_search.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/template/action_search.php b/include/template/action_search.php
index f2eb1a7f7..20f3a436b 100644
--- a/include/template/action_search.php
+++ b/include/template/action_search.php
@@ -132,9 +132,11 @@
                    <?php echo Tag::button_search('search'); ?>
                    <?php
                        if ( isset($_GET['searchtag'])) {
+                           $http=new HttpInput();
                            echo Tag::add_clear_button('search');
-                           for ($i=0;$i<count($_GET['searchtag']);$i++) {
-                               $t=new Tag($cn, $_GET['searchtag'][$i]);
+                           $asearchtag= $http->get("searchtag","array",array());
+                           for ($i=0;$i<count($asearchtag);$i++) {
+                               $t=new Tag($cn, $asearchtag[$i]);
                                echo $t->update_search_cell('search');
                            }
                        }

From cd8e0d397b15f37a94f4f6bea41b5372ecac471b Mon Sep 17 00:00:00 2001
From: Dany wm De Bontridder <danydb@noalyss.eu>
Date: Sat, 7 Nov 2020 19:18:39 +0100
Subject: [PATCH 163/257] Print Accounting : export pdf does not work

---
 include/export/export_poste_detail_pdf.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/export/export_poste_detail_pdf.php b/include/export/export_poste_detail_pdf.php
index f755dab26..c4b2fefba 100644
--- a/include/export/export_poste_detail_pdf.php
+++ b/include/export/export_poste_detail_pdf.php
@@ -39,13 +39,14 @@ $poste_id=$http->request("poste_id");
 $from_periode=$http->request("from_periode");
 $to_periode=$http->request("to_periode");
 $ople=$http->request("ople");
+$poste_fille=$http->request("poste_fille","string",0);
 
 $gDossier=dossier::id();
 
 /* Security */
 $cn=Dossier::connect();
 
-if ( isset ( $poste_fille) )
+if (  $poste_fille ==  'on' )
 { //choisit de voir tous les postes
     $a_poste=$cn->get_array("select pcm_val from tmp_pcmn where pcm_val::text like $1||'%' order by pcm_val",array($poste_id));
 }
@@ -53,7 +54,7 @@ else
 {
     $a_poste=$cn->get_array("select pcm_val from tmp_pcmn where pcm_val::text = $1 ",array($poste_id));
 }
-
+tracedebug("exportpostedetail",$a_poste,"a_poste");
 $ret="";
 
 $pdf=new PDF($cn);

From 6d6c6a438e827a5e6072395c1304ca8d0eca3ed6 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sat, 7 Nov 2020 19:22:08 +0100
Subject: [PATCH 164/257] Bug : when ledger not found

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

diff --git a/include/class/acc_account_ledger.class.php b/include/class/acc_account_ledger.class.php
index 18c58e1c0..40a164ecb 100644
--- a/include/class/acc_account_ledger.class.php
+++ b/include/class/acc_account_ledger.class.php
@@ -655,7 +655,7 @@ class Acc_Account_Ledger
     {
         $l=new Acc_Ledger($this->db,$p_jrn);
         $row=$l->get_propertie();
-        if ( strlen(trim($row['jrn_def_class_deb'])) == 0 ) return array();
+        if ( $row == null || strlen(trim($row['jrn_def_class_deb'])) == 0 ) return array();
         $valid_account=explode(" ",$row['jrn_def_class_deb']);
         return $valid_account;
     }

From 3a2a910b6864716055cdb19cb3442f48737aaceb Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sat, 7 Nov 2020 19:22:23 +0100
Subject: [PATCH 165/257] Improve Test

---
 unit-test/include/class/acc_ledger_search.Test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unit-test/include/class/acc_ledger_search.Test.php b/unit-test/include/class/acc_ledger_search.Test.php
index 9109a07f9..c15e8f431 100644
--- a/unit-test/include/class/acc_ledger_search.Test.php
+++ b/unit-test/include/class/acc_ledger_search.Test.php
@@ -87,7 +87,7 @@ class Acc_Ledger_Test extends TestCase
          put_global(array(["key"=>"ac","value"=>"phpunit"]));
         $ledger=new Acc_Ledger_Search('ALL');
         $r=$ledger->display_search_form();
-        $this->assertEquals(9066,strlen($r),"Size of the html string for display_search_form");
+        $this->assertEquals(8983,strlen($r),"Size of the html string for display_search_form");
     }
     /**
      * @covers ::build_search_filter

From 9d5d626ad80fd656f11914a95661d5b3d85ad4f0 Mon Sep 17 00:00:00 2001
From: Dany wm De Bontridder <danydb@noalyss.eu>
Date: Sun, 8 Nov 2020 21:47:03 +0100
Subject: [PATCH 166/257] Bug : follow-up , add a new security against the
 duplicate for Follo_Up reference (ag_ref)

---
 include/class/follow_up.class.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 010958bce..37191c658 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -539,13 +539,17 @@ class Follow_Up
             $this->ag_title=$doc_mod->dt_value;
         }
         $this->ag_id=$this->db->get_next_seq('action_gestion_ag_id_seq');
-         // Get The sequence id,
         $seq_name="seq_doc_type_".$this->dt_id;
-
-        // Create the reference
-        $ag_ref=$this->db->get_value('select dt_prefix from document_type where dt_id=$1', array($this->dt_id)).'-'.$this->db->get_next_seq($seq_name);
+        // to avoid duplicate
+        do {
+            // Create the reference
+            $ag_ref=$this->db->get_value('select dt_prefix from document_type where dt_id=$1', array($this->dt_id)).'-'.$this->db->get_next_seq($seq_name);
+            // if reference does not exist , finish the loop
+            if ( $this->db->get_value("select count(*) from action_gestion where ag_ref = $1",array($ag_ref)) == 0)
+            break;
+        } while (1);
+        // check if the reference already exist and try to compute new one
         $this->ag_ref=$ag_ref;
-
         // save into the database
         if ($this->ag_remind_date!=null||$this->ag_remind_date!='')
         {

From 56e178d4cb5e85090e8a81b6aa93e8fd91c3ef75 Mon Sep 17 00:00:00 2001
From: Dany wm De Bontridder <danydb@noalyss.eu>
Date: Sun, 8 Nov 2020 22:10:03 +0100
Subject: [PATCH 167/257] Cosmetic : use H2

---
 include/impress_gl_comptes.inc.php | 2 +-
 include/impress_poste.inc.php      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/impress_gl_comptes.inc.php b/include/impress_gl_comptes.inc.php
index 3da5d89b3..216322767 100644
--- a/include/impress_gl_comptes.inc.php
+++ b/include/impress_gl_comptes.inc.php
@@ -172,7 +172,7 @@ if ( isset( $_REQUEST['bt_html'] ) )
 
         echo '<tr >
         <td colspan="8" style="width:auto">
-        <h2 class="info">'. $poste_id['pcm_val'].' '.h($Poste->label).'</h2>
+        <h2 class="">'. $poste_id['pcm_val'].' '.h($Poste->label).'</h2>
         </td>
         </tr>';
 
diff --git a/include/impress_poste.inc.php b/include/impress_poste.inc.php
index 3b9555bae..c862300fb 100644
--- a/include/impress_poste.inc.php
+++ b/include/impress_poste.inc.php
@@ -173,7 +173,7 @@ if ( isset( $_REQUEST['bt_html'] ) )
             $result=$Poste->HtmlTable(null,$_GET['ople']);
             $table=ob_get_clean();
             if ( $result == 0) {
-            echo '<h2 class="info">'.$Poste->id." ".h($Poste->label).'</h2>';
+            echo '<h2 class="">'.$Poste->id." ".h($Poste->label).'</h2>';
             echo $table;
             }
 	    echo '</div>';
@@ -219,7 +219,7 @@ if ( isset( $_REQUEST['bt_html'] ) )
         if ( ! isset($_REQUEST['oper_detail']) )
         {
             echo '<div class="content">';
-            echo '<h2 class="info"> ' .
+            echo '<h2 class=""> ' .
                 '(' . $fiche->id . ')' .
                 $fiche->getName() . ' ' .
                 ' [ ' . $fiche->get_quick_code() . ' ] ' .
@@ -233,7 +233,7 @@ if ( isset( $_REQUEST['bt_html'] ) )
         {
             // Detail //
             echo '<div class="content">';
-            echo '<h2 class="info"> ' .
+            echo '<h2 class=""> ' .
                 '(' . $fiche->id . ')' .
                 $fiche->getName() . ' ' .
                 ' [ ' . $fiche->get_quick_code() . ' ] ' .
@@ -269,7 +269,7 @@ if ( isset( $_REQUEST['bt_html'] ) )
                 $result=$Poste->HtmlTable(null,$_GET['ople']);
                 $table=ob_get_clean();
                 if ( $result == 0) {
-                echo '<h2 class="info">'.$Poste->id." ".h($Poste->label).'</h2>';
+                echo '<h2 class="">'.$Poste->id." ".h($Poste->label).'</h2>';
                 echo $table;
                 }
                 

From ab54f85fcdd54e675ede9297248bde160eb97f1a Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sun, 8 Nov 2020 23:39:33 +0100
Subject: [PATCH 168/257] HtmlInput::anchor, needs a javascript:void(0)

---
 include/lib/html_input.class.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/lib/html_input.class.php b/include/lib/html_input.class.php
index 0cbbabbe4..cf3978cc6 100755
--- a/include/lib/html_input.class.php
+++ b/include/lib/html_input.class.php
@@ -908,18 +908,19 @@ class HtmlInput
      * @param string $p_url  url
      * @param string $p_js javascript
      * @param string $p_style is the visuable effect (class, style...)
+     * @param string $p_title Title
      */
     static function anchor($p_text, $p_url="", $p_js="",
-            $p_style=' class="line" ')
+            $p_style=' class="line" ',$p_title="click")
     {
         if ($p_js!="")
         {
-            $p_url='href="#"';
+            $p_url='href="javascript:void(0)"';
           } else {
               $p_url=sprintf('href="%s"',$p_url);
         }
 
-        $str=sprintf('<a %s %s %s>%s</a>', $p_style, $p_url, $p_js, $p_text);
+        $str=sprintf('<a %s %s %s title="%s">%s</a>', $p_style, $p_url, $p_js, $p_title,$p_text);
         return $str;
     }
 

From 4e8a18047ad2992925e246a3d1bac67faadd1c44 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Mon, 9 Nov 2020 14:51:40 +0100
Subject: [PATCH 169/257] Compatibility edge

---
 html/js/card.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/js/card.js b/html/js/card.js
index aba30582f..0bf2e8260 100644
--- a/html/js/card.js
+++ b/html/js/card.js
@@ -342,7 +342,7 @@ function search_get_card(obj)
     }
     if ( obj.elements['accvis'] ) 
     {
-        queryString+="&accvis="+$F(accvis);
+        queryString+="&accvis="+$F('accvis');
     } else {
         queryString+="&accvis=0";
     } 

From 91a8347a30aee49437a642d33ebb6dd8dbfe6b49 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Mon, 9 Nov 2020 14:52:11 +0100
Subject: [PATCH 170/257] Minor : remove warning and typo

---
 include/class/follow_up.class.php                      | 1 +
 include/template/action_document_type_mtable_input.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 37191c658..03a748536 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -85,6 +85,7 @@ class Follow_Up
     var $ag_contact;  /*!< $ag_contact contact */
     var $ag_remind_date;  /*!< $ag_contact contact */
     var $f_id_dest ; /*!< followup action recipient */
+    var $ag_description; /*!< description of the action */
     /**
      * @brief $operation string related operation
      */
diff --git a/include/template/action_document_type_mtable_input.php b/include/template/action_document_type_mtable_input.php
index b0a32899f..455036667 100644
--- a/include/template/action_document_type_mtable_input.php
+++ b/include/template/action_document_type_mtable_input.php
@@ -83,7 +83,7 @@ echo $select_detail_operation->input();
 $i=new ICheckBox("det_contact_mul",1);
 if ( Document_Option::is_enable_contact_multiple($table->dt_id)) $i->set_check(1); else $i->set_check(0);
 echo $i->input();
-echo _("Contacts multiples");
+echo _("Autres fiches");
 ?>
         </li> 
         <li>

From fb1ade420a7c962e318e2bb3c2534103e46675c1 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 10 Nov 2020 10:54:25 +0100
Subject: [PATCH 171/257] Follow_Up : other card, change presentation, use a
 button instead of displaying a lot of cells , one per card, the button calls
 a dialog box with the list of other cards

---
 html/js/card.js                               |  64 ++++-
 include/ajax/ajax_action_concerned_list.php   |  66 +++++
 include/ajax/ajax_action_remove_concerned.php |  18 +-
 include/ajax/ajax_action_save_concerned.php   |   8 +-
 include/ajax/ajax_card.php                    |   7 +
 include/ajax/ajax_save_card_option.php        |   7 +-
 include/class/follow_up.class.php             |  60 +----
 .../class/follow_up_other_concerned.class.php | 237 ++++++++++++++++++
 include/lib/html_input.class.php              |  13 +-
 include/template/detail-action.php            |   6 +-
 ...ollow_up_other_concerned_display_table.php |  71 ++++++
 unit-test/create-dossier-test.sh              |   3 +-
 12 files changed, 474 insertions(+), 86 deletions(-)
 create mode 100644 include/ajax/ajax_action_concerned_list.php
 create mode 100644 include/class/follow_up_other_concerned.class.php
 create mode 100644 include/template/follow_up_other_concerned_display_table.php

diff --git a/html/js/card.js b/html/js/card.js
index 0bf2e8260..428c38426 100644
--- a/html/js/card.js
+++ b/html/js/card.js
@@ -161,7 +161,10 @@ function action_concerned_save_card(obj)
                 code_html = unescape_xml(code_html);
                 $(namectl).update(code_html);
                 removeDiv('search_card');
-                
+                /* if dialog box exist with list other card, then refresh it */
+                if ( document.getElementById("action_concerned_list_dv") ) {
+                    action_concerned_list({ag_id:obj.ag_id.value,dossier:obj.gDossier.value});
+                }
 
             }
         });
@@ -173,6 +176,58 @@ function action_concerned_save_card(obj)
     }
     return false;
 }
+/**
+ * Display the list of other card from a followup action
+ * @returns {undefined}
+ */
+function action_concerned_list(p_obj) {
+    try {
+        var action = new Ajax.Request('ajax_misc.php',
+                {
+                    method: 'get',
+                    parameters: {gDossier: p_obj.dossier, op: 'card', 'op2': "action_concerned_list", "ag_id": p_obj.ag_id
+                        ,"ctl":'action_concerned_list_dv'},
+                    onFailure: errorFid,
+                    onSuccess: function (req, txt)
+                    {
+                        try {
+                            var sx = 0;
+                            if (window.scrollY)
+                            {
+                                sx = window.scrollY + 40;
+                            } else
+                            {
+                                sx = document.body.scrollTop + 60;
+                            }
+                            var div_style = "top:" + sx + "px;";
+                            add_div({id: 'action_concerned_list_dv', cssclass: 'inner_box', html: "",
+                                style: div_style, drag: true});
+                            remove_waiting_box();
+                            var answer = req.responseXML;
+                            var a = answer.getElementsByTagName('ctl');
+                            if (a.length == 0)
+                            {
+                                var rec = req.responseText;
+                                alert_box('erreur :' + rec);
+                            }
+                            var html = answer.getElementsByTagName('code');
+                            var namectl = a[0].firstChild.nodeValue;
+                            var nodeXml = html[0];
+                            var code_html = getNodeText(nodeXml);
+                            code_html = unescape_xml(code_html);
+
+
+                            $('action_concerned_list_dv').innerHTML = code_html;
+                        } catch (e) {
+                            alert_box(e.message);
+                        }
+                    }
+                }
+        );
+    } catch (e) {
+        alert_box("action_concerned_list" + e.message);
+    }
+}
 /**
  * Display form for searching cards to add to action-follow-up
  *@see ajax_add_concerned_card.php
@@ -1089,8 +1144,11 @@ function action_remove_concerned(p_dossier,p_fiche_id,p_action_id)
                         var nodeXml=html[0];
                         var code_html = getNodeText(nodeXml);
                         code_html = unescape_xml(code_html);
-                        removeDiv('search_card');
                         $('concerned_card_td').innerHTML = code_html;
+                        removeDiv('search_card');
+                        
+                        $(namectl).remove();
+                        
                     } catch (e) {
                         if ( console) { console.log('Erreur ') + e.message;}
                         alert_box('action_remove_concerned '+e.message);
@@ -1346,6 +1404,8 @@ function save_linked_card_option(obj)
         onSuccess:function(req) {
             remove_waiting_box();
             removeDiv("d_linked_card_option");
+            $("other_"+obj.action_person_id.value).update(req.responseText);
+              new Effect.Highlight("other_"+obj.action_person_id.value,{startcolor: '#FAD4D4',endcolor: '#F78082' });
         }
     });
     return false;
diff --git a/include/ajax/ajax_action_concerned_list.php b/include/ajax/ajax_action_concerned_list.php
new file mode 100644
index 000000000..55548a1a2
--- /dev/null
+++ b/include/ajax/ajax_action_concerned_list.php
@@ -0,0 +1,66 @@
+<?php
+
+/* 
+ * Copyright (C) 2020 Dany De Bontridder <dany@alchimerys.be>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
+$http=new HttpInput();
+try {
+    // follow_up id
+    $ag_id=$http->request("ag_id","number");
+} catch (Exception $ex) {
+     record_log(__FILE__.$ex->getMessage().$ex->getTraceAsString());
+     return;
+}
+/*
+ * security Who can do it ?
+ */
+if ( ! $g_user->can_write_action($ag_id)  ) {
+    record_log(__FILE__."security : access refused");
+    return;
+}
+require_once 'class/follow_up_other_concerned.class.php';
+ob_start();
+echo HtmlInput::title_box(_("Liste Autres Fiches"), "action_concerned_list_dv");
+
+$follow=new Follow_Up_Other_Concerned($cn,$ag_id);
+$follow->display_table();
+
+echo $follow->button_action_add_concerned_card( );
+$csv="export.php?".
+        http_build_query(["gDossier"=>Dossier::id(),
+            "act"=>"CSV:FollowUpContactOption",
+            "ag_id"=>$ag_id]);
+echo HtmlInput::button_anchor(_("Export CSV"), $csv,"",' title="Export Contacts options"','smallbutton');
+
+echo HtmlInput::button_close("action_concerned_list_dv");
+$response = ob_get_clean();
+
+if ( headers_sent() && DEBUG) {
+    echo $response;
+} 
+$html = escape_xml($response);
+header('Content-type: text/xml; charset=UTF-8');
+echo <<<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<data>
+<ctl>$ctl</ctl>
+<code>$html</code>
+</data>
+EOF;
+?>     
\ No newline at end of file
diff --git a/include/ajax/ajax_action_remove_concerned.php b/include/ajax/ajax_action_remove_concerned.php
index 00d389490..08251710e 100644
--- a/include/ajax/ajax_action_remove_concerned.php
+++ b/include/ajax/ajax_action_remove_concerned.php
@@ -45,22 +45,30 @@ if ( ! $g_user->can_read_action($ag_id)  ) {
     return;
 }
 
-require_once 'class/follow_up.class.php';
-$follow=new Follow_Up($cn,$ag_id);
+require_once 'class/follow_up_other_concerned.class.php';
+$follow=new Follow_Up_Other_Concerned($cn,$ag_id);
 
 ob_start();
+$action_person_id=$cn->get_value(" select ap_id from action_person where ag_id =$1 and f_id =$2 ",[$ag_id,$f_id]);
+
+// row id to update
+$ctl= "other_".$action_person_id;
+
 $follow->remove_linked_card($f_id);
-echo $follow->display_linked();
-echo HtmlInput::button_action_add_concerned_card( $follow->ag_id);
+$follow->display_linked_count();
+echo $follow->button_action_add_concerned_card( );
 
 $response = ob_get_clean();
 
+if (headers_sent() && DEBUG) {
+    echo $response;
+}
 $html = escape_xml($response);
 header('Content-type: text/xml; charset=UTF-8');
 echo <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <data>
-<ctl>unused</ctl>
+<ctl>$ctl</ctl>
 <code>$html</code>
 </data>
 EOF;
diff --git a/include/ajax/ajax_action_save_concerned.php b/include/ajax/ajax_action_save_concerned.php
index 25baf3008..4500c5b59 100644
--- a/include/ajax/ajax_action_save_concerned.php
+++ b/include/ajax/ajax_action_save_concerned.php
@@ -46,8 +46,8 @@ if ( ! $g_user->can_write_action($ag_id)  ) {
     return;
 }
 
-require_once 'class/follow_up.class.php';
-$follow=new Follow_Up($cn,$ag_id);
+require_once 'class/follow_up_other_concerned.class.php';
+$follow=new Follow_Up_Other_Concerned($cn,$ag_id);
 $nb_card=count($selected_card);
 for ($i=0;$i< $nb_card;$i++)
 {
@@ -61,8 +61,8 @@ for ($i=0;$i< $nb_card;$i++)
  */
 
 ob_start();
-$follow->display_linked();
-echo HtmlInput::button_action_add_concerned_card( $ag_id);
+$follow->display_linked_count();
+echo $follow->button_action_add_concerned_card( );
 $response = ob_get_clean();
 $html = escape_xml($response);
 header('Content-type: text/xml; charset=UTF-8');
diff --git a/include/ajax/ajax_card.php b/include/ajax/ajax_card.php
index 7b065898b..62e88de20 100644
--- a/include/ajax/ajax_card.php
+++ b/include/ajax/ajax_card.php
@@ -776,6 +776,13 @@ case 'upr':
             return;
 
             break;
+  // ----------------------------------------------------------------------------------------------------------------
+  // Display a list of other card linked to the event / followup
+  // ----------------------------------------------------------------------------------------------------------------
+        case 'action_concerned_list':
+            require_once NOALYSS_INCLUDE.'/ajax/ajax_action_concerned_list.php';
+            return ;
+            break;
             
 } // switch
 $xml=escape_xml($html);
diff --git a/include/ajax/ajax_save_card_option.php b/include/ajax/ajax_save_card_option.php
index 931f07ed3..58457d431 100644
--- a/include/ajax/ajax_save_card_option.php
+++ b/include/ajax/ajax_save_card_option.php
@@ -21,7 +21,7 @@
 
 if (!defined('ALLOWED'))
     die('Appel direct ne sont pas permis');
-
+require_once NOALYSS_INCLUDE."/class/follow_up_other_concerned.class.php";
 /**
  * @file
  * @brief save option of card into action_person_option
@@ -52,4 +52,7 @@ for ($i=0;$i<$nb; $i++) {
 
         $cn->exec_sql("UPDATE public.action_person_option SET ap_value=$1 WHERE ap_id=$2",
                 [$ap_value[$i],$ap_id[$i]]);
-}
\ No newline at end of file
+}
+$follow=new Follow_Up_Other_Concerned($cn,$ag_id);
+$aColumn = $follow->get_option();
+echo $follow->display_row($fiche_id, 0, $aColumn);
\ No newline at end of file
diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 03a748536..380743a15 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -1670,65 +1670,7 @@ class Follow_Up
             $this->f_id_dest=null;
     }
 
-    /**
-     *  Add another concerned (tiers, supplier...)
-     * @remark type $g_user
-     * @param type $p_fiche_id
-     */
-    function insert_linked_card($p_fiche_id)
-    {
-        global $g_user;
-        if ($g_user->can_write_action($this->ag_id))
-        {
-            /**
-             * insert into action_person
-             */
-            $count=$this->db->get_value('select count(*) from action_person where f_id=$1 and ag_id=$2', array($p_fiche_id, $this->ag_id));
-            if ($count==0)
-            {
-                $this->db->exec_sql('insert into action_person (ag_id,f_id) values ($1,$2)', array($this->ag_id, $p_fiche_id));
-            }
-        }
-    }
-
-    /**
-     * Remove  another concerned (tiers, supplier...)
-     * @remark type $g_user
-     * @param type $p_fiche_id
-     */
-    function remove_linked_card($p_fiche_id)
-    {
-        global $g_user;
-        if ($g_user->can_write_action($this->ag_id))
-        {
-            $this->db->exec_sql('delete from action_person where ag_id = $1 and f_id = $2', array($this->ag_id, $p_fiche_id));
-        }
-    }
-
-    /**
-     * Display the other concerned (tiers, supplier...)
-     * @return string
-     */
-    function display_linked()
-    {
-        $a_linked=$this->db->get_array('select ap_id,f_id from action_person where ag_id=$1', array($this->ag_id));
-        if (count($a_linked)==0)
-            return "";
-        $dossier_id=Dossier::id();
-        for ($i=0; $i<count($a_linked); $i++)
-        {
-            $fiche=new Fiche($this->db, $a_linked[$i]['f_id']);
-            $qc=$fiche->get_quick_code();
-            $js_remove=sprintf("action_remove_concerned('%s','%s','%s')", dossier::id(), $a_linked[$i]['f_id'], $this->ag_id);
-            echo '<span class="tagcell">';
-            echo HtmlInput::anchor($qc,"", sprintf("onclick=\"linked_card_option('%s','%s')\"",
-                    $a_linked[$i]['ap_id'],$dossier_id));
-            echo Icon_Action::trash(uniqid(), $js_remove);
-            echo '</span>';
-            echo '&nbsp;';
-            echo '&nbsp;';
-        }
-    }
+   
     /**
      * @brief display a small form to enter a new event
      * 
diff --git a/include/class/follow_up_other_concerned.class.php b/include/class/follow_up_other_concerned.class.php
new file mode 100644
index 000000000..56cec39ef
--- /dev/null
+++ b/include/class/follow_up_other_concerned.class.php
@@ -0,0 +1,237 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+
+/**
+ * @file
+ * @brief Others concerned card in an action
+ * @see Follow_Up
+ */
+
+/**
+ * @class
+ * @brief Others concerned card in an action
+ * @see Follow_Up
+ */
+
+class Follow_Up_Other_Concerned
+{
+    private $ag_id; /*!< action_gestion.ag_id*/
+    private $db; /*!< Database handle */
+    
+    function __construct($p_database,$p_action_gestion_id)
+    {
+        $this->db=$p_database;
+        $this->ag_id=$p_action_gestion_id;
+    }
+    public function get_ag_id()
+    {
+        return $this->ag_id;
+    }
+
+    public function set_ag_id($ag_id)
+    {
+        $this->ag_id=$ag_id;
+        return $this;
+    }
+    public function get_db()
+    {
+        return $this->db;
+    }
+
+    public function set_db($cn)
+    {
+        $this->db=$cn;
+        return $this;
+    }
+
+    
+         /**
+     * Remove  another concerned (tiers, supplier...)
+     * @remark type $g_user
+     * @param type $p_fiche_id
+     */
+    function remove_linked_card($p_fiche_id)
+    {
+        global $g_user;
+        if ($g_user->can_write_action($this->ag_id))
+        {
+            $this->db->exec_sql('delete from action_person where ag_id = $1 and f_id = $2', array($this->ag_id, $p_fiche_id));
+            return true;
+        }
+        return false;
+    }
+
+//    /**
+//     * Display the other concerned (tiers, supplier...) in a small cell
+//     * @return string
+//     */
+//    function display_linked()
+//    {
+//        $a_linked=$this->db->get_array('select ap_id,f_id from action_person where ag_id=$1', array($this->ag_id));
+//        if (count($a_linked)==0)
+//            return "";
+//        $dossier_id=Dossier::id();
+//        for ($i=0; $i<count($a_linked); $i++)
+//        {
+//            $fiche=new Fiche($this->db, $a_linked[$i]['f_id']);
+//            $qc=$fiche->get_quick_code();
+//            $js_remove=sprintf("action_remove_concerned('%s','%s','%s')", dossier::id(), $a_linked[$i]['f_id'], 
+//                    $this->ag_id);
+//            echo '<span class="tagcell">';
+//            echo HtmlInput::anchor($qc,"", sprintf("onclick=\"linked_card_option('%s','%s')\"",
+//                    $a_linked[$i]['ap_id'],$dossier_id));
+//            echo Icon_Action::trash(uniqid(), $js_remove);
+//            echo '</span>';
+//            echo '&nbsp;';
+//            echo '&nbsp;';
+//        }
+//    }
+    /**
+     * Display the count of other concerned card (tiers, supplier...) in button which call 
+     * @return string
+     */
+    function display_linked_count()
+    {
+        $a_linked=$this->db->get_array('select ap_id,f_id from action_person where ag_id=$1', array($this->ag_id));
+        if (count($a_linked)==0)
+            return "0";
+        $dossier_id=Dossier::id();
+        $javascript=<<<EOF
+                    var obj={dossier:$dossier_id,ag_id:$this->ag_id};action_concerned_list(obj);
+EOF;
+        echo HtmlInput::anchor_action(count($a_linked), $javascript, null, "button");
+    }
+    
+    /**
+     *  Add another concerned (tiers, supplier...)
+     * @remark type $g_user
+     * @param type $p_fiche_id
+     */
+    function insert_linked_card($p_fiche_id)
+    {
+        global $g_user;
+        if ($g_user->can_write_action($this->ag_id))
+        {
+            /**
+             * insert into action_person
+             */
+            $count=$this->db->get_value('select count(*) from action_person where f_id=$1 and ag_id=$2', array($p_fiche_id, $this->ag_id));
+            if ($count==0)
+            {
+                $this->db->exec_sql('insert into action_person (ag_id,f_id) values ($1,$2)', array($this->ag_id, $p_fiche_id));
+            }
+        }
+    }
+    /**
+     * Return a HTML string with a button for adding other cards
+     * @return type
+     */
+    function button_action_add_concerned_card()
+    {
+        $dossier=Dossier::id();
+        $javascript=<<<EOF
+                    var obj={dossier:$dossier,ag_id:$this->ag_id};action_concerned_search_card(obj);
+EOF;
+        $js=HtmlInput::button_action(_('Ajout autres'), $javascript, 'xx',
+                        'smallbutton');
+        return $js;
+    }
+    
+    /**
+     * Display one row for all the option of a card 
+     * @param int $p_fid card if (fiche.f_id)
+     * @param int $p_row index of the row used for alternate the color of the rows
+     * @param array $aOther Column of the options
+     */
+    function display_row($p_fid,$p_row,$pa_Column){
+        static $dossier_id;
+        $dossier_id=Dossier::id();
+        
+        $action_person_id=$this->db->get_value("select ap_id from action_person where f_id=$1 and ag_id=$2",
+                [$p_fid,$this->ag_id]);
+        
+        // Name , first & quick code from fiche
+       $row= $this->db->get_row("select 
+            (select ad_value from fiche_detail fd2 where fd2.f_id=ap.f_id and fd2.ad_id = 1) as xname,
+            (select ad_value from fiche_detail fd2 where fd2.f_id=ap.f_id and fd2.ad_id = 32) as xfirst_name,
+            (select ad_value from fiche_detail fd2 where fd2.f_id=ap.f_id and fd2.ad_id = 23) as xqcode
+            from fiche ap
+            where ap.f_id=$1
+                ",[$p_fid]);
+       
+    
+       // Detail for this one
+       $detail = HtmlInput::anchor($row['xqcode'],"", sprintf("onclick=\"linked_card_option('%s','%s')\"",
+                    $action_person_id,$dossier_id),'class="line"',_("Options"));
+       // remove card
+        $js_remove=sprintf("action_remove_concerned('%s','%s','%s')", dossier::id(), $p_fid, 
+                    $this->ag_id);
+        $remove =  Icon_Action::trash(uniqid(), $js_remove);
+        $r=<<<EOF
+    <tr id="other_{$action_person_id}">
+       
+        <td>
+            {$detail}
+        </td>
+        <td>
+            {$row['xname']}
+        </td>
+        <td>
+            {$row['xfirst_name']}
+        </td>
+EOF;     
+            $nb_other=count($pa_Column);
+            for ($i=0;$i<$nb_other;$i++) {
+                $value=$this->db->get_value("
+                        select 	apo2.ap_value
+                        from action_person_option apo2 
+                        join action_person ap on (apo2.action_person_id=ap.ap_id) 
+                        where 
+                        apo2.contact_option_ref_id =$1
+                        and ap.f_id=$2
+                        ",array($pa_Column[$i]['cor_id'] , $p_fid));
+                $r.= td($value);
+            }
+        $r.='<td>'.$remove.'</td>';
+        $r.='</tr>'; 
+        return $r;
+    }
+    /**
+     * Display all the person with option in a html table
+     */
+    function display_table(){
+    require_once NOALYSS_TEMPLATE."/follow_up_other_concerned_display_table.php";
+    }
+    /**
+     * Get Available options
+     */
+    function get_option() 
+    {
+        $aColumn = $this->db->get_array("select cor_id,cor_label,jdoc.jdoc_enable 
+    from contact_option_ref cor 
+    join jnt_document_option_contact jdoc on (cor.cor_id=jdoc.contact_option_ref_id ) 
+    join action_gestion ag on (ag.ag_type=jdoc.document_type_id ) 
+    where ag_id=$1
+    order by upper(cor_label)",[$this->ag_id]);
+        return $aColumn;
+    }
+}
\ No newline at end of file
diff --git a/include/lib/html_input.class.php b/include/lib/html_input.class.php
index cf3978cc6..e43c0ff53 100755
--- a/include/lib/html_input.class.php
+++ b/include/lib/html_input.class.php
@@ -480,7 +480,7 @@ class HtmlInput
             $id=uniqid("xx");
         }
         $r="";
-        $r.='<a  id="'.$id.'" class="'.$p_class.'" onclick="'.$javascript.'">'.$p_symbole.h($action).'</a>';
+        $r.='<a  id="'.$id.'" href="javascript:void(0)" class="'.$p_class.'" onclick="'.$javascript.'">'.$p_symbole.h($action).'</a>';
         return $r;
     }
 
@@ -1137,16 +1137,7 @@ class HtmlInput
         return $js;
     }
 
-    static function button_action_add_concerned_card($p_agid)
-    {
-        $dossier=Dossier::id();
-        $javascript=<<<EOF
-                    obj={dossier:$dossier,ag_id:$p_agid};action_concerned_search_card(obj);
-EOF;
-        $js=HtmlInput::button_action(_('Ajout autres'), $javascript, 'xx',
-                        'smallbutton');
-        return $js;
-    }
+
 
     static function button_action_add()
     {
diff --git a/include/template/detail-action.php b/include/template/detail-action.php
index 3cb50719f..821cb62b6 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -1,4 +1,5 @@
 <?php
+require_once NOALYSS_INCLUDE."/class/follow_up_other_concerned.class.php";
 //This file is part of NOALYSS and is under GPL 
 //see licence.txt
 $uniq=uniqid("tab",TRUE);
@@ -73,9 +74,10 @@ $uniq=uniqid("tab",TRUE);
               </td>
               <td id="concerned_card_td">
               <?php 
-                    echo $this->display_linked();
+                    $followup_other_concerned=new Follow_Up_Other_Concerned($this->db,$this->ag_id);
+                    echo $followup_other_concerned->display_linked_count();
                      if  ($p_view != 'READ' && $g_user->can_write_action($this->ag_id) == true ):
-                        echo HtmlInput::button_action_add_concerned_card( $this->ag_id);
+                        echo $followup_other_concerned->button_action_add_concerned_card();
                      endif;
                ?>
               </td>
diff --git a/include/template/follow_up_other_concerned_display_table.php b/include/template/follow_up_other_concerned_display_table.php
new file mode 100644
index 000000000..275d711e8
--- /dev/null
+++ b/include/template/follow_up_other_concerned_display_table.php
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
+
+/**
+ * @file
+ * @brief  display a table
+ */
+$aColumn = $this->get_option();
+$r='0,1,2';
+ $nb_column=count($aColumn);
+for ( $e=0;$e<$nb_column;$e++) { 
+    $r.=','.($e+3);
+    
+}
+?>
+<?=HtmlInput::filter_table("action_concerned_list_tb1", $r, 1);?>
+<table id="action_concerned_list_tb1" class="result">
+    <tr>
+       
+        <th>
+            <?=_("Code")?>
+        </th>
+        <th>
+            <?=_("Nom")?>
+        </th>
+        <th>
+            <?=_("Prénom")?>
+        </th>
+        <?php 
+       
+        for ($o=0;$o< $nb_column;$o++){
+            echo th($aColumn[$o]["cor_label"]);
+        }
+        ?>
+    <?php
+        $aOther=$this->db->get_array("
+            select (select ad_value from fiche_detail fd1 where fd1.f_id=ap.f_id and ad_id=23) as qcode ,
+            f_id
+            ,ap.ap_id
+                from action_person ap 
+                join action_gestion on (ap.ag_id=action_gestion.ag_id)
+                where ap.ag_id=$1 order by 1",[$this->ag_id]);
+        $nb_other=count($aOther);
+        for ($x=0;$x<$nb_other;$x++) {
+            
+            echo $this->display_row($aOther[$x]['f_id'],$x,$aColumn);
+        }
+    ?>
+    </tr>
+</table>
\ No newline at end of file
diff --git a/unit-test/create-dossier-test.sh b/unit-test/create-dossier-test.sh
index 372e87440..144f47113 100755
--- a/unit-test/create-dossier-test.sh
+++ b/unit-test/create-dossier-test.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
+export PGCLUSTER=10/main
 DOSSIER_TEST=rel70dossier25
-FILE_TEST=dossiertest200318-1402.sql
+FILE_TEST=dossiertest201107-1806.sql
 
 dropdb $DOSSIER_TEST
 createdb $DOSSIER_TEST

From 656ab45372893f6274326f86839caefdd0b4e882 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 10 Nov 2020 13:54:43 +0100
Subject: [PATCH 172/257] Tag : add color to tags

---
 html/js/scripts.js                   | 15 +++++
 html/style-classic.css               | 86 +++++++++++++++++++++++++++
 html/style-classic7.css              | 86 +++++++++++++++++++++++++++
 html/style-light.css                 | 87 ++++++++++++++++++++++++++++
 include/ajax/ajax_tag_add_action.php |  2 +-
 include/ajax/ajax_tag_detail.php     | 20 ++++---
 include/class/follow_up.class.php    | 21 +++++--
 include/class/tag.class.php          | 19 +++++-
 include/database/tag_sql.class.php   |  2 +
 include/template/tag_detail.php      | 26 ++++++++-
 include/template/tag_list.php        |  2 +-
 include/template/tag_select.php      |  2 +-
 12 files changed, 350 insertions(+), 18 deletions(-)

diff --git a/html/js/scripts.js b/html/js/scripts.js
index 25307b890..69c611627 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -3804,3 +3804,18 @@ function json_concat(p_json1,p_json2)
         return result;
 
 }
+/**
+ * this function unchecks other checkbox , it mimics the way a radio behaves
+ * @param string p_click is the DOM id of the checkbox you clicked
+ * @param string p_name is the name of all the checkbox to uncheck
+ */
+function uncheck_other(p_click,p_name) 
+{
+    var aCheckbox=document.getElementsByName(p_name);
+    if (aCheckbox.length == 0) return;
+    var i=0;
+    for (i=0;i<aCheckbox.length;i++) {
+        aCheckbox[i].checked=false;
+    }
+    p_click.checked=true;
+}
\ No newline at end of file
diff --git a/html/style-classic.css b/html/style-classic.css
index 95be1394b..4a65fad7b 100644
--- a/html/style-classic.css
+++ b/html/style-classic.css
@@ -2451,4 +2451,90 @@ span.tagcell {
 #action_add_action2_list {
     height:15rem;
     overflow: auto;
+}
+/*********************************************************************************************************************
+ * Color for tag
+ ********************************************************************************************************************/
+.tagcell-color1 {
+    /* Nothing no color */
+}
+.tagcell-color2 {
+        background-color: #002ba3 !important;
+    color : white !important; 
+ 
+}
+.tagcell-color3 {
+    background-color: #336699 !important;
+    color: white !important;
+}
+.tagcell-color4 {
+    background-color: #5d90cd !important;
+    color: white !important;
+}
+.tagcell-color5 {
+     background-color: #C2E3FC !important;
+    color: #002ba3 !important;
+}
+.tagcell-color6 {
+    background-color: #006318 !important;
+    color : white !important; 
+}
+.tagcell-color7 {
+    background-color: #008000 !important;
+    color : white !important; 
+    
+}
+.tagcell-color8 {
+    background-color: #00D000 !important;
+    color : white !important; 
+}
+.tagcell-color9 {
+        background-color: #87D087 !important;
+    color: white !important;
+}
+.tagcell-color10 {
+        background-color: #C8EEC8 !important;
+    color: #006318 !important;
+    
+}
+.tagcell-color11 {
+       background-color: red  !important;
+    color: #edeff4 !important;
+}
+.tagcell-color12 {
+     background-color: #9D0244 !important;
+    color:#edeff4 !important;
+}
+.tagcell-color13 {
+     background-color: #C14064 !important;
+    color: #edeff4 !important;
+}
+.tagcell-color14 {
+     background-color: #F07396  !important;
+    color: #edeff4 !important;
+}
+.tagcell-color15 {
+   background-color: #F2AABE  !important;
+    color: red !important;
+}
+
+.tagcell-color16 {
+        background-color:  #77420A  !important;
+    color: #edeff4 !important;
+}
+.tagcell-color17 {
+       background-color: #B06F2A !important;
+    color: #edeff4 !important;
+}
+.tagcell-color18 {
+    background-color: orange !important;
+    color: #edeff4 !important;
+}
+.tagcell-color19 {
+    background-color:  #F2CFAA !important;
+    color: red !important;
+}
+.tagcell-color20 {
+    background-color:  yellow !important;
+    color: orangered !important;
 }
\ No newline at end of file
diff --git a/html/style-classic7.css b/html/style-classic7.css
index c85e87ca1..c4e12cf4f 100644
--- a/html/style-classic7.css
+++ b/html/style-classic7.css
@@ -2497,3 +2497,89 @@ span.tagcell {
     height:15rem;
     overflow: auto;
 }
+/*********************************************************************************************************************
+ * Color for tag
+ ********************************************************************************************************************/
+.tagcell-color1 {
+    /* Nothing no color */
+}
+.tagcell-color2 {
+        background-color: #002ba3 !important;
+    color : white !important; 
+ 
+}
+.tagcell-color3 {
+    background-color: #336699 !important;
+    color: white !important;
+}
+.tagcell-color4 {
+    background-color: #5d90cd !important;
+    color: white !important;
+}
+.tagcell-color5 {
+     background-color: #C2E3FC !important;
+    color: #002ba3 !important;
+}
+.tagcell-color6 {
+    background-color: #006318 !important;
+    color : white !important; 
+}
+.tagcell-color7 {
+    background-color: #008000 !important;
+    color : white !important; 
+    
+}
+.tagcell-color8 {
+    background-color: #00D000 !important;
+    color : white !important; 
+}
+.tagcell-color9 {
+        background-color: #87D087 !important;
+    color: white !important;
+}
+.tagcell-color10 {
+        background-color: #C8EEC8 !important;
+    color: #006318 !important;
+    
+}
+.tagcell-color11 {
+       background-color: red  !important;
+    color: #edeff4 !important;
+}
+.tagcell-color12 {
+     background-color: #9D0244 !important;
+    color:#edeff4 !important;
+}
+.tagcell-color13 {
+     background-color: #C14064 !important;
+    color: #edeff4 !important;
+}
+.tagcell-color14 {
+     background-color: #F07396  !important;
+    color: #edeff4 !important;
+}
+.tagcell-color15 {
+   background-color: #F2AABE  !important;
+    color: red !important;
+}
+
+.tagcell-color16 {
+        background-color:  #77420A  !important;
+    color: #edeff4 !important;
+}
+.tagcell-color17 {
+       background-color: #B06F2A !important;
+    color: #edeff4 !important;
+}
+.tagcell-color18 {
+    background-color: orange !important;
+    color: #edeff4 !important;
+}
+.tagcell-color19 {
+    background-color:  #F2CFAA !important;
+    color: red !important;
+}
+.tagcell-color20 {
+    background-color:  yellow !important;
+    color: orangered !important;
+}
\ No newline at end of file
diff --git a/html/style-light.css b/html/style-light.css
index 096ffc179..c624db404 100644
--- a/html/style-light.css
+++ b/html/style-light.css
@@ -2384,4 +2384,91 @@ span.tagcell {
 #action_add_action2_list {
     height:15rem;
     overflow: auto;
+}
+
+/*********************************************************************************************************************
+ * Color for tag
+ ********************************************************************************************************************/
+.tagcell-color1 {
+    /* Nothing no color */
+}
+.tagcell-color2 {
+        background-color: #002ba3 !important;
+    color : white !important; 
+ 
+}
+.tagcell-color3 {
+    background-color: #336699 !important;
+    color: white !important;
+}
+.tagcell-color4 {
+    background-color: #5d90cd !important;
+    color: white !important;
+}
+.tagcell-color5 {
+     background-color: #C2E3FC !important;
+    color: #002ba3 !important;
+}
+.tagcell-color6 {
+    background-color: #006318 !important;
+    color : white !important; 
+}
+.tagcell-color7 {
+    background-color: #008000 !important;
+    color : white !important; 
+    
+}
+.tagcell-color8 {
+    background-color: #00D000 !important;
+    color : white !important; 
+}
+.tagcell-color9 {
+        background-color: #87D087 !important;
+    color: white !important;
+}
+.tagcell-color10 {
+        background-color: #C8EEC8 !important;
+    color: #006318 !important;
+    
+}
+.tagcell-color11 {
+       background-color: red  !important;
+    color: #edeff4 !important;
+}
+.tagcell-color12 {
+     background-color: #9D0244 !important;
+    color:#edeff4 !important;
+}
+.tagcell-color13 {
+     background-color: #C14064 !important;
+    color: #edeff4 !important;
+}
+.tagcell-color14 {
+     background-color: #F07396  !important;
+    color: #edeff4 !important;
+}
+.tagcell-color15 {
+   background-color: #F2AABE  !important;
+    color: red !important;
+}
+
+.tagcell-color16 {
+        background-color:  #77420A  !important;
+    color: #edeff4 !important;
+}
+.tagcell-color17 {
+       background-color: #B06F2A !important;
+    color: #edeff4 !important;
+}
+.tagcell-color18 {
+    background-color: orange !important;
+    color: #edeff4 !important;
+}
+.tagcell-color19 {
+    background-color:  #F2CFAA !important;
+    color: red !important;
+}
+.tagcell-color20 {
+    background-color:  yellow !important;
+    color: orangered !important;
 }
\ No newline at end of file
diff --git a/include/ajax/ajax_tag_add_action.php b/include/ajax/ajax_tag_add_action.php
index 890966c0a..c6b44af1a 100644
--- a/include/ajax/ajax_tag_add_action.php
+++ b/include/ajax/ajax_tag_add_action.php
@@ -36,7 +36,7 @@ if ( $http->request("isgroup") == 't') {
     $fl->tag_add($http->request('t_id',"number"));
 } else {
         // Add all the tag from the group 
-    $aTag=$cn->get_array("select t_id,t_tag from jnt_tag_group_tag jtgt  join tags on (tag_id=t_id) where tag_group_id=$1 order by 2 ",[$http->request("t_id","number")]);
+    $aTag=$cn->get_array("select t_id,t_tag ,t_color from jnt_tag_group_tag jtgt  join tags on (tag_id=t_id) where tag_group_id=$1 order by 2 ",[$http->request("t_id","number")]);
     $nb_atag=count($aTag);
     if ( $nb_atag > 0) {
         for ($i=0;$i<$nb_atag;$i++){
diff --git a/include/ajax/ajax_tag_detail.php b/include/ajax/ajax_tag_detail.php
index 20043000b..5e12c7bb0 100644
--- a/include/ajax/ajax_tag_detail.php
+++ b/include/ajax/ajax_tag_detail.php
@@ -12,9 +12,10 @@ require_once NOALYSS_INCLUDE.'/class/tag.class.php';
 ob_start();
 $tag=new Tag($cn);
 $http=new HttpInput();
-$tag->data->t_id=$http->get("tag","number");
-if ($tag->data->t_id == -1 &&  $g_user->check_action(TAGADD) == 0 ) return;
-$tag->data->load();
+$data=$tag->get_data();
+$data->t_id=$http->get("tag","number");
+if ($data->t_id == -1 &&  $g_user->check_action(TAGADD) == 0 ) return;
+$data->load();
 echo HtmlInput::title_box(_("Détail du dossier ou étiquette"), "tag_div","close","","y");
 
 ?>
@@ -32,9 +33,10 @@ else :
 <?php        endif; ?>        
     <?php
     echo dossier::hidden();
-    echo HtmlInput::hidden('t_id', $_GET['tag']);
-    echo HtmlInput::hidden('ac',$_GET['ac']);
-    $data=$tag->data;
+    echo HtmlInput::hidden('t_id', $http->get('tag') );
+    echo HtmlInput::hidden('ac',$http->get('ac'));
+
+
     require_once NOALYSS_TEMPLATE.'/tag_detail.php';
     echo HtmlInput::submit("save_tag_sb", "Valider");
     echo HtmlInput::button_close("tag_div");
@@ -43,8 +45,12 @@ else :
 </form>
 <?php
     $response=  ob_get_clean();
-    $html=escape_xml($response);
+if (headers_sent() && DEBUG )    {
+    echo $response;
+}else {
     header('Content-type: text/xml; charset=UTF-8');
+}
+    $html=escape_xml($response);
     echo <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <data>
diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 380743a15..e674ee1f1 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -663,7 +663,8 @@ class Follow_Up
                 ag_title,dt_value,ag_ref, ag_priority,ag_state,
                 coalesce((select p_name from profile where p_id=ag_dest),'Aucun groupe') as dest,
                 (select ad_value from fiche_Detail where f_id=ag.f_id_dest and ad_id=1) as name,
-                array_to_string((select array_agg(t1.t_tag) from action_tags as a1 join tags as t1 on (a1.t_id=t1.t_id) where a1.ag_id=ag.ag_id ),',') as tags
+                array_to_string((select array_agg(t1.t_tag) from action_tags as a1 join tags as t1 on (a1.t_id=t1.t_id) where a1.ag_id=ag.ag_id ),',') as tags,
+                array_to_string((select array_agg(t1.t_color) from action_tags as a1 join tags as t1 on (a1.t_id=t1.t_id) where a1.ag_id=ag.ag_id ),',') as tags_color
             from action_gestion as ag
                 join document_type on (ag_type=dt_id)
                 join document_state on (ag_state=s_id)
@@ -769,7 +770,19 @@ class Follow_Up
              $r.='<td>'.$href.
                     h($row['ag_title'])."</A></td>";
             $r.="<td>".$row['s_value']."</td>";
-            $r.="<td>".$href."<span style=\"font-size:75%\">".h($row['tags']).'</span>'.'</a>'."</td>";
+            $r.="<td>";
+            if ($row['tags']!=""){
+                $r.=$href;
+                $aColor=explode(",", $row["tags_color"]);
+                $aTags=explode(",", $row["tags"]);
+                $nb_tag=count($aTags);
+                for ( $x=0;$x<$nb_tag;$x++) {
+                   $r.=sprintf('<span style="font-size:75%%" class="tagcell-color%s">%s</span>',$aColor[$x],$aTags[$x]);
+                   $r.="&nbsp;";
+                } // end loop $x
+                $r.='</a>';
+            }
+            $r.="</td>";
             $r.="<td>".$href.h($row['dest']).'</a>'."</td>";
 
             
@@ -1488,7 +1501,7 @@ class Follow_Up
     {
         if ($this->ag_id==0)
             return;
-        $sql='select b.ag_id,b.t_id,b.at_id,a.t_tag'
+        $sql='select b.ag_id,b.t_id,b.at_id,a.t_tag,a.t_color'
                 .' from '
                 .' tags as a join action_tags as b on (a.t_id=b.t_id)'
                 .' where ag_id=$1 '
@@ -1537,7 +1550,7 @@ class Follow_Up
         $c=count($a_tag);
         for ($e=0; $e<$c; $e++)
         {
-            echo '<span class="tagcell">';
+            echo '<span class="tagcell tagcell-color'.$a_tag[$e]['t_color'].'">';
             echo $a_tag[$e]['t_tag'];
             if ($g_user->can_write_action($this->ag_id)==true && $p_view != 'READ')
             {
diff --git a/include/class/tag.class.php b/include/class/tag.class.php
index 2f3b0a1c0..aacd77728 100644
--- a/include/class/tag.class.php
+++ b/include/class/tag.class.php
@@ -21,12 +21,24 @@ require_once NOALYSS_INCLUDE.'/database/tag_sql.class.php';
 
 class Tag
 {
+    private $data; //<! Tag_SQL 
     function __construct($p_cn,$id=-1)
     {
         $this->cn=$p_cn;
         $this->data=new Tag_SQL($p_cn,$id);
     }
-    /**
+    public function get_data()
+    {
+        return $this->data;
+    }
+
+    public function set_data($data)
+    {
+        $this->data=$data;
+        return $this;
+    }
+
+        /**
      * Show the list of available tag
      * @return HTML
      */
@@ -42,11 +54,11 @@ class Tag
     function select()
     {
         $ret=$this->data->seek("where t_actif='Y' order by t_tag");
-        $ret=$this->cn->exec_sql(" select t_id,t_tag,t_description,'t' as tag_type 
+        $ret=$this->cn->exec_sql(" select t_id,t_tag,t_description,'t' as tag_type ,t_color
                     from tags 
                     where t_actif='Y' 
                 union all 
-                select tg_id,tg_name ,'G','g' from tag_group order by 2");
+                select tg_id,tg_name ,'G','g' ,1 from tag_group order by 2");
         require_once NOALYSS_TEMPLATE.'/tag_select.php';
     }
     /**
@@ -73,6 +85,7 @@ class Tag
         $this->data->t_tag=  strip_tags($p_array['t_tag']);
         $this->data->t_description=strip_tags($p_array['t_description']);
         $this->data->t_actif=$p_array['t_actif'];
+        $this->data->t_color=$p_array['tagcell_color'];
         $this->data->save();
     }
     function remove($p_array)
diff --git a/include/database/tag_sql.class.php b/include/database/tag_sql.class.php
index 13698f156..9876b9c47 100644
--- a/include/database/tag_sql.class.php
+++ b/include/database/tag_sql.class.php
@@ -37,12 +37,14 @@ class Tag_SQL extends Noalyss_SQL
 			, "t_tag" => "t_tag"
 			, "t_description" => "t_description"
                         ,'t_actif'=>'t_actif'
+                    ,'t_color'=>'t_color'
                     );
 		$this->type = array(
 			"t_id" => "numeric"
 			, "t_tag" => "text"
 			, "t_description" => "text"
                        ,'t_actif'=>"text"
+                        ,'t_color'=>"numeric"
 		);
 		$this->default = array(
 			"t_id" => "auto",
diff --git a/include/template/tag_detail.php b/include/template/tag_detail.php
index d2be03ef5..a2a9847ac 100644
--- a/include/template/tag_detail.php
+++ b/include/template/tag_detail.php
@@ -16,6 +16,8 @@ $t_actif->value=[
     ['label'=>_('Non actif'),'value'=>'N']
     ];
 $t_actif->selected=$data->t_actif;
+$icheckbox=new ICheckBox("tagcell_color");
+$icheckbox->javascript='onclick="uncheck_other(this,\'tagcell_color\');"';
 ?>
 <p>
    <?php echo _("Etiquette (tag)")?> : <?php echo $t_tag->input(); ?>
@@ -24,7 +26,29 @@ $t_actif->selected=$data->t_actif;
 <?php echo _("Description")?> : <?php echo $t_description->input(); ?>
 </p>
 <p>
-    <?=_("Etiquette(tag) actif") ?><?=$t_actif->input()?>
+    <?=_("Couleur")?>
+</p>
+<?php
+if ( $data->t_id == '-1') $data->t_color=1;
+$nb_color=20;
+
+for ($i=1 ; $i != $nb_color+1 ; $i++ ) {
+?>    
+        <span class="tagcell <?="tagcell-color".$i?>">
+            <?=_("Exemple").$i ?>
+            <?php $icheckbox->value=$i;
+            if ( $data->t_color==$i) { $icheckbox->set_check($i);} else {$icheckbox->selected=false;}
+            echo $icheckbox->input();
+            ?>
+        </span>
+    <?php if ( $i % 5 == 0 ) echo '<br>';?>
+<?php 
+
+} // end loop $i
+?>
+  
+<p>
+    <?=_("Etiquette actif") ?><?=$t_actif->input()?>
 </p>
 <?php
 // If exist you can remove it
diff --git a/include/template/tag_list.php b/include/template/tag_list.php
index fb4802a95..3a25dcaa3 100644
--- a/include/template/tag_list.php
+++ b/include/template/tag_list.php
@@ -29,7 +29,7 @@ $ac=$http->request('ac');
                 $row=Database::fetch_array($ret, $i);
         ?>
     <tr class="<?php echo (($i%2==0)?'even':'odd');?>">
-        <td>
+        <td class="tagcell-color<?=$row['t_color']?>">
             <?php
             $js=sprintf("show_tag('%s','%s','%s','p')",$gDossier,$ac,$row['t_id']);
             echo HtmlInput::anchor($row['t_tag'], "", "onclick=\"$js\"");
diff --git a/include/template/tag_select.php b/include/template/tag_select.php
index f166662cf..59732c3f2 100644
--- a/include/template/tag_select.php
+++ b/include/template/tag_select.php
@@ -33,7 +33,7 @@ if (isNumber($ag_id) == 0 ) die ('ERROR : parameters invalid');
         $row=Database::fetch_array($ret, $i);
 ?>
     <tr class="<?php echo (($i%2==0)?'even':'odd');?>">
-        <td>
+        <td class="tagcell-color<?=$row['t_color']?>">
             <?php
             $js=sprintf("action_tag_add('%s','%s','%s','%s')",$gDossier,$ag_id,$row['t_id'],$row['tag_type']);
             echo HtmlInput::anchor($row['t_tag'], "", "onclick=\"$js\"");

From 085efd0efa4c1dc9bc0ce923064e8ff810a5875d Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 10 Nov 2020 19:48:20 +0100
Subject: [PATCH 173/257] =?UTF-8?q?task=20#0001697:=20Extension=20usage=20?=
 =?UTF-8?q?des=20=C3=A9tiquettes=20,=20tag=20on=20operation=20+=20export?=
 =?UTF-8?q?=20CSV=20+=20filter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/ajax_misc.php                         |  10 +-
 html/js/acc_ledger.js                      |  26 ++-
 html/js/scripts.js                         | 142 ++++++++++++++-
 html/recherche.php                         |  12 +-
 include/ajax/ajax_ledger.php               |   1 +
 include/ajax/ajax_operation_tag.php        | 166 +++++++++++++++++
 include/ajax/ajax_search_add_tag.php       |   8 +-
 include/ajax/ajax_search_clear_tag.php     |   4 +-
 include/ajax/ajax_search_display_tag.php   |  23 ++-
 include/ajax/ajax_search_filter.php        |  42 ++++-
 include/ajax/ajax_tag_list.php             |  10 +-
 include/ajax/ajax_tag_select_search.php    |   4 +-
 include/class/acc_ledger_search.class.php  |  27 ++-
 include/class/follow_up.class.php          |   1 +
 include/class/tag.class.php                |  62 ++-----
 include/class/tag_action.class.php         |  94 ++++++++++
 include/class/tag_operation.class.php      | 199 +++++++++++++++++++++
 include/constant.php                       |   2 +-
 include/database/user_filter_sql.class.php |   5 +
 include/history_operation.inc.php          |  13 +-
 include/sql/patch/upgrade150.sql           |  15 ++
 include/template/action_other_action.php   |   8 +-
 include/template/action_search.php         |   6 +-
 include/template/detail-action.php         |   2 +-
 include/template/ledger_detail_bottom.php  |  19 +-
 include/template/ledger_search.php         |  37 +++-
 include/template/tag_select.php            |  19 +-
 27 files changed, 857 insertions(+), 100 deletions(-)
 create mode 100644 include/ajax/ajax_operation_tag.php
 create mode 100644 include/class/tag_action.class.php
 create mode 100644 include/class/tag_operation.class.php
 create mode 100644 include/sql/patch/upgrade150.sql

diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index 2db616d12..a1dfd697c 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -240,6 +240,8 @@ $path = array(
     "save_filter"=>"ajax_search_filter",
     // Load a search filter
     "load_filter"=>"ajax_search_filter",
+    // display tag for filter
+    'display_filter_tag'=>'ajax_search_filter',
     // search operation to reconcile
     	'search_op'=>'ajax_search_operation',
     // delete operation
@@ -269,7 +271,13 @@ $path = array(
     // set the group for a tag
     'tag_set_group'=>"ajax_tag_set_group",
     // Document_state
-    "document_state"=>"ajax_document_state"
+    "document_state"=>"ajax_document_state",
+    // Operations tag add
+    'operation_tag_add'=>"ajax_operation_tag",
+    // Operations tag remove
+    'operation_tag_remove'=>"ajax_operation_tag",
+    // Operations tag select
+    'operation_tag_select'=>"ajax_operation_tag"
 )    ;
 
 if (array_key_exists($op, $path)) {
diff --git a/html/js/acc_ledger.js b/html/js/acc_ledger.js
index 33e959fc2..03116b7b5 100644
--- a/html/js/acc_ledger.js
+++ b/html/js/acc_ledger.js
@@ -1297,8 +1297,8 @@ function manage_search_filter(p_obj) {
        onSuccess:function(req) {
             remove_waiting_box();
             var x=posX;
-            var y=posY-20;
-            create_div({'id':'boxfilter'+p_obj.div,'cssclass':'inner_box','html':req.responseText,'style':'top:'+y+'px;left:'+x+'px;position:absolute;width:400px'});
+            var y=calcy(200)
+            create_div({'id':'boxfilter'+p_obj.div,'cssclass':'inner_box','html':req.responseText,'style':'top:'+y+'px;left:'+x+'px;position:absolute;width:400px',drag:1});
             $('boxfilter'+p_obj.div).show();
        }
     });
@@ -1315,8 +1315,9 @@ function manage_search_filter(p_obj) {
 function save_filter(p_div,p_dossier) {
     var elt=['ledger_type','nb_jrn','date_start','date_end',
         'date_paid_start','date_paid_end','desc','amount_min','amount_max','qcode','accounting',
-        'operation_filter'];
+        'operation_filter','tag_option'];
     var eltValue={};
+    var i =0;
     eltValue['gDossier']=p_dossier;
     eltValue['op']="save_filter";
     eltValue['div']=p_div;
@@ -1338,6 +1339,12 @@ function save_filter(p_div,p_dossier) {
             eltValue['r_jrn'+i]=$(idx).value
    
         }
+    }
+      //ledger's tags
+    var aTag=Array.from(document.getElementsByName(p_div+"tag[]"));
+    eltValue["tag[]"]=[];
+    for (i=0 ; i < aTag.length;i++) {
+            eltValue["tag[]"][i]=aTag[i].value;
     }
     new Ajax.Request('ajax_misc.php', {
         method:"POST",
@@ -1349,7 +1356,7 @@ function save_filter(p_div,p_dossier) {
                     /*Add the new list to the selection */
                     var new_item=document.createElement('li');
                     new_item.innerHTML=answer.filter_name;
-                    new_item.setAttribute("id","li"+p_div+"_"+answer.filter_id);
+                    new_item.setAttribute("id","manageli"+p_div+"_"+answer.filter_id);
                     $('manage'+p_div).appendChild(new_item);
                     $(p_div+"filter_new").value="";
                 } else {
@@ -1377,7 +1384,7 @@ function load_filter(p_div,p_dossier,p_filter_id) {
                 var answer=req.responseJSON;    
                 console.log(answer);
                 var elt=['ledger_type','date_start','date_end','date_paid_start','date_paid_end',
-                    'desc','amount_min','amount_max','qcode','accounting','operation_filter'];
+                    'desc','amount_min','amount_max','qcode','accounting','operation_filter','tag_option'];
                 for (var i=0;i<elt.length;i++) {
                     var idx=elt[i];
                     $(p_div+idx).value=answer[elt[i]];
@@ -1402,8 +1409,15 @@ function load_filter(p_div,p_dossier,p_filter_id) {
                    eltHidden.setAttribute("value",answer.r_jrn[i]);
                    eltLedgerId.appendChild(eltHidden);
                }
+               new Ajax.Request("ajax_misc.php",{
+                   method:"get",
+                   parameters:{"gDossier":p_dossier,"div":p_div,"op":"display_filter_tag","filter_id":p_filter_id,
+                   uf_tag:answer.uf_tag},
+                   onSuccess:function (req) {
+                       $(p_div+'tag_choose_td').update(req.responseText);
+                   }
+               })
                
-
                
            } catch (e) {
               smoke.alert(e.message);
diff --git a/html/js/scripts.js b/html/js/scripts.js
index 69c611627..14a8a4f97 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -2711,13 +2711,16 @@ function activate_tag(p_dossier, p_tag_id) {
  * Display a div with available tags, this div can update the cell
  * tag_choose_td
  * @param {type} p_dossier
+ * @param {string} p_prefix is the prefix of the div
+ * @param {string} Calling object either Tag_Operation or Tag_Action
  * @returns {undefined}
+ * 
  */
-function search_display_tag(p_dossier, p_prefix)
+function search_display_tag(p_dossier, p_prefix,p_object)
 {
     try {
         waiting_box();
-        var queryString = "op=search_display_tag&gDossier=" + p_dossier + "&pref=" + p_prefix;
+        var queryString = { op : "search_display_tag",gDossier:p_dossier,pref:p_prefix,caller_obj:p_object};
         var action = new Ajax.Request(
                 "ajax_misc.php",
                 {
@@ -3818,4 +3821,137 @@ function uncheck_other(p_click,p_name)
         aCheckbox[i].checked=false;
     }
     p_click.checked=true;
-}
\ No newline at end of file
+}
+/**
+ * Manage the tag with operations
+ * @returns {undefined}
+ */
+var operation_tag = function (p_div)
+{
+    this.ctl = p_div;
+    console.log("ctl "+p_div);
+    /**
+     * Show a list of tag which can be added to the current followup document
+     * @param {type} p_dossier
+     * @param {type} jrn_id
+     * @returns {undefined}
+     */
+    this.select = function (p_dossier, p_jrn_id)
+    {
+        try {
+            waiting_box();
+            var queryString = {jrn_id:p_jrn_id,op:"operation_tag_select",gDossier:p_dossier,ctl:this.ctl};
+            var action = new Ajax.Request(
+                    "ajax_misc.php",
+                    {
+                        method: 'get', 
+                        parameters: queryString,
+                        onFailure: ajax_misc_failure,
+                        onSuccess: function (req, j) {
+                            remove_waiting_box();
+                            
+                            var answer = req.responseXML;
+                            var html = answer.getElementsByTagName('code');
+                            if (html.length === 0)
+                            {
+                                var rec = unescape_xml(req.responseText);
+                                error_message('erreur :' + rec);
+                            }
+                            var code_html = getNodeText(html[0]);
+                            code_html = unescape_xml(code_html);
+                            var pos = fixed_position(35, 229);
+                            add_div({id: 'tag_div', style: pos, cssclass: 'inner_box tag', drag: 0});
+
+                            remove_waiting_box();
+                            $('tag_div').innerHTML = code_html;
+                        }
+                    }
+            );
+        } catch (e) {
+            error_message(e.message);
+        }
+    };
+
+    /**
+     * @brief Add the current tag to the current ag_id
+     * @param {type} p_dossier
+     * @param {type} ag_id
+     * @param p_isgroup g it is a group , t is a single tag
+     * @returns {undefined}
+     */
+    this.add = function (p_dossier, p_jrn_id, t_id, p_isgroup)
+    {
+        try {
+            waiting_box();
+            var queryString = {t_id:t_id,jrn_id:p_jrn_id,op:"operation_tag_add",
+                gDossier:p_dossier,ctl:this.ctl,isgroup:p_isgroup};
+            var ctl=this.ctl;
+            var action = new Ajax.Request(
+                    "ajax_misc.php",
+                    {
+                        method: 'get', parameters: queryString,
+                        onFailure: ajax_misc_failure,
+                        onSuccess: function (req, j) {
+                            var answer = req.responseXML;
+                            console.log("1-ctl "+ctl);
+                            var html = answer.getElementsByTagName('code');
+                            if (html.length === 0)
+                            {
+                                var rec = unescape_xml(req.responseText);
+                                error_message('erreur :' + rec);
+                            }
+                            var code_html = getNodeText(html[0]);
+                            code_html = unescape_xml(code_html);
+                            remove_waiting_box();
+                            $('operation_tag_td'+ctl).innerHTML = code_html;
+                            removeDiv('tag_div');
+                        }
+                    }
+            );
+        } catch (e) {
+            error_message(e.message);
+        }
+    };
+    /**
+     * @brief remove the current tag to the current ag_id
+     * @param {type} p_dossier
+     * @param {type} ag_id
+     * @returns {undefined}
+     */
+    this.remove = function (p_dossier, p_jrn_id, t_id)
+    {
+        var ctl=this.ctl;
+         console.log("remove-1.ctl "+ctl);
+        confirm_box(null, content[50], function () {
+            try {
+                waiting_box();
+                var queryString = {t_id:t_id,jrn_id:p_jrn_id,op:"operation_tag_remove",gDossier:p_dossier,ctl:ctl};
+                var action = new Ajax.Request(
+                        "ajax_misc.php",
+                        {
+                            method: 'get', 
+                            parameters: queryString,
+                            onFailure: ajax_misc_failure,
+                            onSuccess: function (req, j) {
+                                var answer = req.responseXML;
+                                var html = answer.getElementsByTagName('code');
+                                if (html.length === 0)
+                                {
+                                    var rec = unescape_xml(req.responseText);
+                                    error_message('erreur :' + rec);
+                                }
+                                var code_html = getNodeText(html[0]);
+                                code_html = unescape_xml(code_html);
+                                remove_waiting_box();
+                                console.log("remove-2.ctl "+ctl);
+                                $('operation_tag_td'+ctl).innerHTML = code_html;
+
+                            }
+                        }
+                );
+                } catch (e) {
+                    error_message(e.message);
+                }
+            });
+    };
+};
diff --git a/html/recherche.php b/html/recherche.php
index f34549a23..aa655ca6e 100644
--- a/html/recherche.php
+++ b/html/recherche.php
@@ -124,7 +124,7 @@ if ( isset ($_GET['viewsearch']))
      * Export to csv
      */
     $r=HtmlInput::get_to_hidden(array('l','date_start','date_end','desc','amount_min','amount_max',
-        'qcode','accounting','unpaid','gDossier','ledger_type'));
+        'qcode','accounting','unpaid','gDossier','ledger_type','tag_option'));
     if (isset($_GET['r_jrn'])) {
         $http=new HttpInput();
         $a_rjrn=$http->get("r_jrn","array");
@@ -135,6 +135,16 @@ if ( isset ($_GET['viewsearch']))
         }
       }
     }
+    if (isset($_GET['tag'])) {
+        $http=new HttpInput();
+        $aTag=$http->get("tag","array");
+      foreach ($aTag as $k=>$v) {
+          // Protect : check that $k and $v are numeric
+        if (isNumber($k)&&isNumber($v)) {
+            $r.=HtmlInput::hidden('tag[]',$v);
+        }
+      }
+    }
     echo '<form action="export.php" method="get">';
     echo $r;
     echo HtmlInput::hidden('act','CSV:histo');
diff --git a/include/ajax/ajax_ledger.php b/include/ajax/ajax_ledger.php
index 316a5a662..6eb4bcb09 100644
--- a/include/ajax/ajax_ledger.php
+++ b/include/ajax/ajax_ledger.php
@@ -42,6 +42,7 @@ require_once NOALYSS_INCLUDE.'/lib/idate.class.php';
 require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
 require_once NOALYSS_INCLUDE.'/lib/iconcerned.class.php';
 require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
+require_once NOALYSS_INCLUDE.'/class/tag_operation.class.php';
 $http=new HttpInput();
 
 /**
diff --git a/include/ajax/ajax_operation_tag.php b/include/ajax/ajax_operation_tag.php
new file mode 100644
index 000000000..7c0a0d21f
--- /dev/null
+++ b/include/ajax/ajax_operation_tag.php
@@ -0,0 +1,166 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
+require_once NOALYSS_INCLUDE.'/class/tag.class.php';
+require_once NOALYSS_INCLUDE.'/class/tag_operation.class.php';
+
+/**
+ * @file
+ * @brief manage the ajax calls for adding , deleting tag on operations
+ */
+try
+{
+    $op=$http->request('op');
+    $jrn_id=$http->request('jrn_id', "number");
+}
+catch (Exception $ex)
+{
+    echo $ex->getMessage();
+}
+
+// Security : check ledger accessible
+global $g_user;
+$ledger=$cn->get_value("select jr_def_id from jrn where jr_id=$1", [$jrn_id]);
+
+if ($g_user->get_ledger_access($ledger)!='W')
+{
+    record_log("AJT0001");
+    return;
+}
+switch ($op)
+{
+    case 'operation_tag_select':
+        //--------------------------------------------------------------------------------------------------
+        // Display a list of available tag
+        //--------------------------------------------------------------------------------------------------
+        ob_start();
+        $tag_operation=new Tag_Operation($cn);
+        echo $tag_operation->select($ctl);
+
+        //------------------- Propose to add a tag
+
+        $js=sprintf("onclick=\"show_tag('%s','%s','%s','j')\"", Dossier::id(), '', '-1');
+        if ($g_user->check_action(TAGADD)==1)
+        {
+            echo HtmlInput::button("tag_add", _("Ajout d'un tag"), $js);
+        }
+        echo HtmlInput::button_close("tag_div");
+
+        $response=ob_get_clean();
+        if (headers_sent()&&DEBUG)
+        {
+            echo $response;
+        }
+        else
+        {
+            header('Content-type: text/xml; charset=UTF-8');
+        }
+        $html=escape_xml($response);
+        echo <<<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+        <data>
+        <ctl></ctl>
+        <code>$html</code>
+        </data>
+EOF;
+        return;
+    case 'operation_tag_add':
+        //--------------------------------------------------------------------------------------------------
+        // Display all the tags attached to this operation
+        //--------------------------------------------------------------------------------------------------
+        $tag_operation=new Tag_Operation($cn);
+        $tag_operation->set_jrn_id($jrn_id);
+        $pref=$http->request("ctl");
+
+        if ($http->request("isgroup")=='t')
+        {
+            $tag_operation->tag_add($http->request('t_id', "number"));
+        }
+        else
+        {
+            // Add all the tag from the group 
+            $aTag=$cn->get_array("select t_id,t_tag ,t_color from jnt_tag_group_tag jtgt  join tags on (tag_id=t_id) where tag_group_id=$1 order by 2 ",
+                    [$http->request("t_id", "number")]);
+            $nb_atag=count($aTag);
+            if ($nb_atag>0)
+            {
+                for ($i=0; $i<$nb_atag; $i++)
+                {
+                    $tag_operation->tag_add($aTag[$i]['t_id']);
+                }
+            }
+        }
+
+        ob_start();
+
+        $tag_operation->tag_cell($ctl);
+
+        $response=ob_get_clean();
+        if (headers_sent()&&DEBUG)
+        {
+            echo $response;
+        }
+        else
+        {
+            header('Content-type: text/xml; charset=UTF-8');
+        }
+        $html=escape_xml($response);
+        echo <<<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<data>
+<ctl></ctl>
+<code>$html</code>
+</data>
+EOF;
+        return;
+        break;
+    case 'operation_tag_remove':
+        $tag_operation=new Tag_Operation($cn);
+        $tag_operation->set_jrn_id($jrn_id);
+        $pref=$http->request("ctl");
+        $tag_operation->tag_remove($http->request("t_id", "number"));
+
+        ob_start();
+
+        $tag_operation->tag_cell($pref);
+
+        $response=ob_get_clean();
+        if (headers_sent()&&DEBUG)
+        {
+            echo $response;
+        }
+        else
+        {
+            header('Content-type: text/xml; charset=UTF-8');
+        }
+        $html=escape_xml($response);
+        echo <<<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<data>
+<ctl></ctl>
+<code>$html</code>
+</data>
+EOF;
+        return;
+        break;
+}
\ No newline at end of file
diff --git a/include/ajax/ajax_search_add_tag.php b/include/ajax/ajax_search_add_tag.php
index d1e3b853c..b3697ae4e 100644
--- a/include/ajax/ajax_search_add_tag.php
+++ b/include/ajax/ajax_search_add_tag.php
@@ -25,18 +25,18 @@ if (!defined('ALLOWED'))
  * @brief add tag , used for follow up
  * @see Tag
  */
-require_once NOALYSS_INCLUDE.'/class/tag.class.php';
+require_once NOALYSS_INCLUDE.'/class/tag_action.class.php';
 //Single Tag
 ob_start();
 if ($_GET['clear']==1)
 {
     /* Add a clear button */
-    echo Tag::add_clear_button($_GET['pref']);
+    echo Tag_Action::add_clear_button($_GET['pref']);
 }
 if ($http->request("obj")=='t')
 {
 
-    $tag=new Tag($cn, $http->get("id", "number"));
+    $tag=new Tag_Action($cn, $http->get("id", "number"));
     $tag->update_search_cell($http->get("pref"));
 }
 elseif ($http->request("obj")=="g")
@@ -47,7 +47,7 @@ elseif ($http->request("obj")=="g")
     $pref=$http->get("pref");
     if ( $nb_atag > 0) {
         for ($i=0;$i<$nb_atag;$i++){
-            $tag=new Tag($cn,$aTag[$i]['t_id']);
+            $tag=new Tag_Action($cn,$aTag[$i]['t_id']);
             $tag->update_search_cell($pref);
         }
     }
diff --git a/include/ajax/ajax_search_clear_tag.php b/include/ajax/ajax_search_clear_tag.php
index 3904e0773..95ab181c5 100644
--- a/include/ajax/ajax_search_clear_tag.php
+++ b/include/ajax/ajax_search_clear_tag.php
@@ -24,9 +24,9 @@ if ( !defined ('ALLOWED') )  die('Appel direct ne sont pas permis');
  *@see Tag
  */
 
-require_once NOALYSS_INCLUDE.'/class/tag.class.php';
+require_once NOALYSS_INCLUDE.'/class/tag_action.class.php';
 ob_start();
-echo Tag::button_search($_GET['pref']);
+echo Tag_Action::select_tag_search($_GET['pref']);
 $response=  ob_get_clean();
 $html=escape_xml($response);
 header('Content-type: text/xml; charset=UTF-8');
diff --git a/include/ajax/ajax_search_display_tag.php b/include/ajax/ajax_search_display_tag.php
index b4295cc38..43efd2c92 100644
--- a/include/ajax/ajax_search_display_tag.php
+++ b/include/ajax/ajax_search_display_tag.php
@@ -24,10 +24,27 @@ if ( !defined ('ALLOWED') )  die('Appel direct ne sont pas permis');
  *@see Tag
  */
 
-require_once NOALYSS_INCLUDE.'/class/tag.class.php';
-$tag=new Tag($cn);
+require_once NOALYSS_INCLUDE.'/class/tag_action.class.php';
+require_once NOALYSS_INCLUDE.'/class/tag_operation.class.php';
 
-$response=  $tag->select_search($_GET['pref']);
+try {
+    $caller_obj=$http->request("caller_obj");
+    $prefix=$http->request("pref");
+} catch (Exception $ex) {
+    echo $ex->getMessage();
+    return;
+}
+
+if ( $caller_obj == 'Tag_Action' ) { 
+    $tag=new Tag_Action($cn);
+}elseif ($caller_obj=='Tag_Operation')
+{
+    $tag=new Tag_Operation( $cn);
+} else {
+    throw new Exception("AJD001 invalid caller [$caller_obj]");
+}
+
+$response=  $tag->select_search($pref);
 
 $html=escape_xml($response);
 header('Content-type: text/xml; charset=UTF-8');
diff --git a/include/ajax/ajax_search_filter.php b/include/ajax/ajax_search_filter.php
index 7f6a8eaa1..c27458f11 100644
--- a/include/ajax/ajax_search_filter.php
+++ b/include/ajax/ajax_search_filter.php
@@ -24,6 +24,7 @@ if (!defined('ALLOWED'))
 
 require NOALYSS_INCLUDE.'/database/user_filter_sql.class.php';
 require NOALYSS_INCLUDE.'/class/acc_ledger_search.class.php';
+require_once NOALYSS_INCLUDE.'/class/tag_operation.class.php';
 $cn=Dossier::connect();
 $dossier_id=Dossier::id();
 global $g_user;
@@ -55,12 +56,19 @@ if ($op=='save_filter')
         $new->setp("amount_max", $http->post("amount_max", 'number', NULL));
         $new->setp("qcode", $http->post("qcode", 'string', NULL));
         $new->setp("accounting", $http->post("accounting", 'string', NULL));
+        $new->setp("uf_tag_option",$http->post("tag_option","string",null));
         $new->setp("date_paid_start",
                 $http->post("date_paid_start", 'string', NULL));
         $new->setp("date_paid_end", $http->post("date_paid_end", 'string', NULL));
         $new->setp("ledger_type", $http->post("ledger_type", 'string'));
         $new->setp("operation_filter", $http->post("operation_filter", 'string', NULL));
         $new->setp("filter_name", h($http->post("filter_name", 'string')));
+        $tag=$http->post("tag","string",'');
+        
+        if (is_array($tag) ) 
+            $new->setp("uf_tag",join(',',$tag));
+        else
+            $new->setp("uf_tag",null);
         $aJrn=[];
         $max=$http->post("nb_jrn");
         for ($i=0; $i<$max; $i++)
@@ -75,11 +83,11 @@ if ($op=='save_filter')
         $new->save();
         $rmAction=sprintf("delete_filter('%s','%s','%s')",  trim($http->post('div')), $dossier_id,
                 $new->getp('id'));
-        $answer['filter_name']=sprintf('<a class="tinybutton" style="display:inline" id="" onclick="'.$rmAction.'">'.SMALLX.'</a>'
-        );
-        $answer['filter_name'].=sprintf("<a style=\"display:inline\" onclick=\"load_filter('%s','%s','%s')\">%s</a>",
+        $answer['filter_name']="";
+        $answer['filter_name'].=sprintf("<a class=\"line\" style=\"display:inline;text-decoration:underline\" onclick=\"load_filter('%s','%s','%s')\">%s</a>",
                 trim($http->post('div')), $dossier_id, $new->getp('id'),
                 $new->getp("filter_name"));
+        $answer['filter_name'].='<span id="'.uniqid().'" onclick="'.$rmAction.'" class="icon" style="display:inline;margin-left:2em">&#xe80f;</span>';; 
         $answer['filter_id']=$new->getp("id");
         $answer['status']='OK';
     }
@@ -108,7 +116,8 @@ if ($op=="load_filter")
 
     $record['desc']=$record['description'];
     $record['r_jrn']=explode(",", $record['r_jrn']);
-
+    $record['tag']=explode(",",$record['uf_tag']);
+    $record['tag_option']=$record["uf_tag_option"];
     $result=array_merge($answer, $record);
 
 
@@ -148,7 +157,7 @@ if ($op=="display_search_filter")
     echo "</li>";
     
     echo "<li>";
-    echo HtmlInput::anchor(_("Remise à zéro"), "", "onclick=\"reset_filter('$p_div');removeDiv('boxfilter{$p_div}')\"");
+    echo HtmlInput::anchor(_("Remise à zéro"), "", "style=\"text-decoration:underline\" onclick=\"reset_filter('$p_div');removeDiv('boxfilter{$p_div}')\"");
     echo "</li>";
     
     // Link reset
@@ -157,12 +166,11 @@ if ($op=="display_search_filter")
         printf(' <li id="manageli%s_%d">', $p_div, $result[$i]["id"]);
         $rmAction=sprintf("delete_filter('%s','%s','%s')", $p_div, $dossier_id,
                 $result[$i]['id']);
-        printf('<a class="tinybutton" style="display:inline" id="" onclick="'.$rmAction.'">'.SMALLX.'</a>'
-        );
-        printf("<a style=\"display:inline\" onclick=\"load_filter('%s','%s','%s');removeDiv('boxfilter%s')\">",
+        printf("<a href=\"javascript:void(0)\" style=\"display:inline;text-decoration:underline\"  onclick=\"load_filter('%s','%s','%s');removeDiv('boxfilter%s')\">",
                 $p_div, $dossier_id, $result[$i]["id"],$p_div);
         echo $result[$i]["filter_name"];
         echo '</a>';
+        echo '<span id="'.uniqid().'" onclick="'.$rmAction.'" class="icon" style="display:inline;margin-left:2em">&#xe80f;</span>';
 
         printf("</li>");
     }
@@ -198,4 +206,22 @@ if ($op=="delete_search_operation")
     header('Content-Type: application/json;charset=utf-8');
     echo json_encode($answer);
     return;
+}
+//---------------------------------------------------------------------------------------------------------------
+// display_filter_tag : transform uf_tag into a list of tag , and display those tags in cells
+//----------------------------------------------------------------------------------------------------------------
+if ($op=='display_filter_tag')
+{
+    $tag=$http->request("uf_tag");
+    $div=$http->request("div");
+    $aTag=explode(',', $tag);
+    if (is_array($aTag))
+    {
+        $nb_tag=count($aTag);
+        for ($j=0; $j<$nb_tag; $j++)
+        {
+            $tag_operation=new Tag_Operation($cn, $aTag[$j]);
+            $tag_operation->update_search_cell($div);
+        }
+    }
 }
\ No newline at end of file
diff --git a/include/ajax/ajax_tag_list.php b/include/ajax/ajax_tag_list.php
index 5ce78c43f..794b21a88 100644
--- a/include/ajax/ajax_tag_list.php
+++ b/include/ajax/ajax_tag_list.php
@@ -23,9 +23,9 @@
    */
 if ( !defined ('ALLOWED') )  die('Appel direct ne sont pas permis');
 
-require_once NOALYSS_INCLUDE.'/class/tag.class.php';
+require_once NOALYSS_INCLUDE.'/class/tag_action.class.php';
 ob_start();
-$tag=new Tag($cn);
+$tag=new Tag_Action($cn);
 $tag->select();
 
 //------------------- Propose to add a tag
@@ -35,8 +35,12 @@ if ( $g_user->check_action(TAGADD) == 1) { echo HtmlInput::button("tag_add", _("
 echo HtmlInput::button_close("tag_div");
 
 $response=  ob_get_clean();
+if (headers_sent() && DEBUG ){
+    echo $response;
+} else {
+    header('Content-type: text/xml; charset=UTF-8');
+}
 $html=escape_xml($response);
-header('Content-type: text/xml; charset=UTF-8');
 echo <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <data>
diff --git a/include/ajax/ajax_tag_select_search.php b/include/ajax/ajax_tag_select_search.php
index f5f9462b0..f103a4f43 100644
--- a/include/ajax/ajax_tag_select_search.php
+++ b/include/ajax/ajax_tag_select_search.php
@@ -23,9 +23,9 @@ if ( !defined ('ALLOWED') )  die('Appel direct ne sont pas permis');
  *@brief Show the tags to select
  *@see Tag
  */
-require_once NOALYSS_INCLUDE.'/class/tag.class.php';
+require_once NOALYSS_INCLUDE.'/class/tag_action.class.php';
 ob_start();
-$tag=new Tag($cn);
+$tag=new Tag_Action($cn);
 $tag->select_search();
 
 $response=  ob_get_clean();
diff --git a/include/class/acc_ledger_search.class.php b/include/class/acc_ledger_search.class.php
index 801e98b34..4989f61e6 100644
--- a/include/class/acc_ledger_search.class.php
+++ b/include/class/acc_ledger_search.class.php
@@ -21,6 +21,8 @@
 
 // if (!defined('ALLOWED'))     die('Appel direct ne sont pas permis');
 
+require_once NOALYSS_INCLUDE."/class/tag_operation.class.php";
+
 /**
  * @file
  * @brief search in ledger
@@ -455,6 +457,7 @@ class Acc_Ledger_Search
         $fil_paid='';
         $fil_date_paid='';
         $fil_hide_operation='';
+        $fil_tag='';
 
         $and='';
         $g_user=new User($this->cn);
@@ -500,7 +503,27 @@ class Acc_Ledger_Search
                 $and='';
             }
         }
-
+        //----
+        // Search tags
+        if ( isset($p_array[$op."tag"] ))
+        {
+            $strTag=join(",", $p_array[$op."tag"]);
+            if ($p_array[$op."tag_option"] == 1){
+                // any tag
+                $fil_tag=$and.' jr_id in (select jrn_id from operation_tag where tag_id in ('.sql_string($strTag).')) ';
+            } else {
+                // all tags
+                $aTag=$p_array[$op."tag"];
+                $sub_tag=""; $nb_tag=count($aTag);
+                $and2='';
+                for ($x=0;$x < $nb_tag;$x++) {
+                    $sub_tag = " tag_id = ".sql_string($aTag[$x]);
+                    $fil_tag=$and.' jr_id in (select jrn_id from operation_tag where '.$sub_tag.')' ;
+                    $and=" and ";
+                }
+            }
+            $and=" and ";
+        }
         /* format the number */
         $amount_min=abs(toNumber($amount_min));
         $amount_max=abs(toNumber($amount_max));
@@ -620,7 +643,7 @@ class Acc_Ledger_Search
                     " and uj_priv in ('R','W'))";
         }
         $where=$fil_ledger.$fil_amount.$fil_date.$fil_desc.$fil_sec.$fil_amount.
-            $fil_qcode.$fil_paid.$fil_account.$fil_date_paid.$fil_hide_operation;
+            $fil_qcode.$fil_paid.$fil_account.$fil_date_paid.$fil_hide_operation.$fil_tag;
         $sql.=" where ".$where;
         
         // Q?? Why do we return where if it is included in SQL ?
diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index e674ee1f1..f8c592989 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -42,6 +42,7 @@ require_once NOALYSS_INCLUDE.'/class/document_option.class.php';
 require_once NOALYSS_INCLUDE.'/class/default_menu.class.php';
 require_once NOALYSS_INCLUDE.'/lib/inplace_edit.class.php';
 require_once NOALYSS_INCLUDE.'/lib/noalyss_csv.class.php';
+require_once NOALYSS_INCLUDE.'/class/tag_action.class.php';
 
 /**
  * \file
diff --git a/include/class/tag.class.php b/include/class/tag.class.php
index aacd77728..5672adf08 100644
--- a/include/class/tag.class.php
+++ b/include/class/tag.class.php
@@ -38,7 +38,7 @@ class Tag
         return $this;
     }
 
-        /**
+    /**
      * Show the list of available tag
      * @return HTML
      */
@@ -48,19 +48,7 @@ class Tag
         if ( $this->cn->count($ret) == 0) return "";
         require_once NOALYSS_TEMPLATE.'/tag_list.php';
     }
-    /**
-     * let select a tag to add
-     */
-    function select()
-    {
-        $ret=$this->data->seek("where t_actif='Y' order by t_tag");
-        $ret=$this->cn->exec_sql(" select t_id,t_tag,t_description,'t' as tag_type ,t_color
-                    from tags 
-                    where t_actif='Y' 
-                union all 
-                select tg_id,tg_name ,'G','g' ,1 from tag_group order by 2");
-        require_once NOALYSS_TEMPLATE.'/tag_select.php';
-    }
+    
     /**
      * Display a inner window with the detail of a tag
      */
@@ -93,43 +81,17 @@ class Tag
         $this->data->t_id=$p_array['t_id'];
         $this->data->delete();
     }
-    /**
-     * Show a button to select tag for Search
-     * @return HTML
+    /***
+     * query the active tag and returns the database handler
      */
-    static  function button_search($p_prefix)
-    {
-        $r="";
-        $r.=HtmlInput::button("choose_tag", _("Etiquette"), 'onclick="search_display_tag('.Dossier::id().',\''.$p_prefix.'\')"', "smallbutton");
-        return $r;
-    }
-    /**
-     * let select a tag to add to the search
-     */
-    function select_search($p_prefix)
-    {
-        $res="";
-        $ret=$this->data->seek(' order by t_tag');
-        require_once NOALYSS_TEMPLATE.'/tag_search_select.php';
-        return HtmlInput::title_box('Tag', $p_prefix.'tag_div').$res;
-    }
-    /**
-     * In the screen search add this data to the cell
-     */
-    function update_search_cell($p_prefix) {
-        echo '<span id="sp_'.$p_prefix.$this->data->t_id.'" class="tagcell">';
-        echo h($this->data->t_tag);
-        echo HtmlInput::hidden($p_prefix.'tag[]', $this->data->t_id);
-        $js=sprintf("$('sp_".$p_prefix.$this->data->t_id."').remove();");
-        echo Icon_Action::trash(uniqid(), $js);
-        echo '</span>';
-    }
-    /**
-     * clear the search cell
-     */
-    static function add_clear_button($p_prefix) {
-        $clear=HtmlInput::button('clear', 'X', 'onclick="search_clear_tag('.Dossier::id().',\''.$p_prefix.'\');"', 'smallbutton');
-        return $clear;
+    function query_active_tag()
+    {  
+        $ret=$this->cn->exec_sql(" select t_id,t_tag,t_description,'t' as tag_type ,t_color
+                    from tags 
+                    where t_actif='Y' 
+                union all 
+                select tg_id,tg_name ,'G','g' ,1 from tag_group order by 2");
+        return $ret;
     }
 }
 
diff --git a/include/class/tag_action.class.php b/include/class/tag_action.class.php
new file mode 100644
index 000000000..41521d471
--- /dev/null
+++ b/include/class/tag_action.class.php
@@ -0,0 +1,94 @@
+<?php
+
+/*
+ * * Copyright (C) 2020 Dany De Bontridder <dany@alchimerys.be>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+ * 
+ * Author : Dany De Bontridder danydb@noalyss.eu
+ * 
+ */
+
+require_once NOALYSS_INCLUDE.'/class/tag.class.php';
+
+/**
+ * @file
+ * @brief  concerns the tags linked to an action
+ */
+class Tag_Action extends Tag
+{
+    function __construct($p_cn, $p_id=-1 )
+    {
+        parent::__construct($p_cn, $p_id);
+    }
+
+    /**
+     * let select a tag to add
+     */
+    function select($p_prefix="")
+    {
+        $ret=parent::query_active_tag();
+        require_once NOALYSS_TEMPLATE.'/tag_select.php';
+    }
+
+    /**
+     * Show a button to select tag for Search
+     * @return HTML
+     */
+    static function select_tag_search($p_prefix)
+    {
+        $r="";
+        $r.=HtmlInput::button("choose_tag", _("Etiquette"),
+                        'onclick="search_display_tag('.Dossier::id().',\''.$p_prefix.'\',\'Tag_Action\')"', "smallbutton");
+        return $r;
+    }
+
+    /**
+     * clear the search cell
+     */
+    static function add_clear_button($p_prefix)
+    {
+        $clear=HtmlInput::button('clear', 'X', 'onclick="search_clear_tag('.Dossier::id().',\''.$p_prefix.'\');"',
+                        'smallbutton');
+        return $clear;
+    }
+
+    /**
+     * In the screen search add this data to the cell
+     */
+    function update_search_cell($p_prefix)
+    {
+        $data=$this->get_data();
+        echo '<span id="sp_'.$p_prefix.$data->t_id.'" class="tagcell">';
+        echo h($data->t_tag);
+        echo HtmlInput::hidden($p_prefix.'tag[]', $data->t_id);
+        $js=sprintf("$('sp_".$p_prefix.$data->t_id."').remove();");
+        echo Icon_Action::trash(uniqid(), $js);
+        echo '</span>';
+    }
+
+    /**
+     * let select a tag to add to the search
+     */
+    function select_search($p_prefix)
+    {
+        $res="";
+        $ret=$this->get_data()->seek(' order by t_tag');
+        require_once NOALYSS_TEMPLATE.'/tag_search_select.php';
+        return HtmlInput::title_box('Tag', $p_prefix.'tag_div').$res;
+    }
+
+}
diff --git a/include/class/tag_operation.class.php b/include/class/tag_operation.class.php
new file mode 100644
index 000000000..af89bd9f5
--- /dev/null
+++ b/include/class/tag_operation.class.php
@@ -0,0 +1,199 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2002-2020) Author Dany De Bontridder <danydb@noalyss.eu>
+
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
+
+/**
+ * @file
+ * @brief   concerns the tags linked to an accountancy writing
+ */
+class Tag_Operation extends Tag
+{
+
+    private $jrn_id=-1;
+
+    function __construct($p_cn, $p_id=-1)
+    {
+        parent::__construct($p_cn, $p_id);
+    }
+
+    public function get_jrn_id()
+    {
+        return $this->jrn_id;
+    }
+
+    public function set_jrn_id($jrn_id)
+    {
+        $this->jrn_id=$jrn_id;
+        return $this;
+    }
+
+    /**
+     * let select a tag to add
+     */
+    function select($p_prefix="")
+    {
+        $ret=parent::query_active_tag();
+        require_once NOALYSS_TEMPLATE.'/tag_select.php';
+    }
+
+    /**
+     * Show a button to select tag for Search
+     * @param $p_jr jr_id of the operation
+     * @param $p_div prefix of the dialog box
+     * @return HTML
+     */
+    static function button_search($p_jr, $p_div)
+    {
+        $r="";
+        $js=sprintf("onclick=\"new operation_tag('%s').select('%s','%s')\"", $p_div, dossier::id(), $p_jr);
+        $r.=HtmlInput::button('tag_bt', _('Ajout étiquette'), $js, 'smallbutton');
+        return $r;
+    }
+
+    /**
+     * clear the search cell
+     */
+    static function add_clear_button($p_prefix)
+    {
+        $clear=HtmlInput::button('clear', 'X', 'onclick="search_clear_tag('.Dossier::id().',\''.$p_prefix.'\');"',
+                        'smallbutton');
+        return $clear;
+    }
+
+    /**
+     * In the screen search add this data to the cell
+     */
+    function update_search_cell($p_prefix)
+    {
+        $data=$this->get_data();
+        echo '<span id="sp_'.$p_prefix.$data->t_id.'" class="tagcell">';
+        echo h($data->t_tag);
+        echo HtmlInput::hidden($p_prefix.'tag[]', $data->t_id);
+        $js=sprintf("$('sp_".$p_prefix.$data->t_id."').remove();");
+        echo Icon_Action::trash(uniqid(), $js);
+        echo '</span>';
+    }
+
+    /**
+     * Links a tag to an operation
+     * @param int $p_tag_id tag.t_id 
+     */
+    function tag_add($p_tag_id)
+    {
+        if ($this->jrn_id==-1)
+        {
+            throw new Exception("TO99 jrn_id unset");
+        }
+        $count=$this->cn->get_value('select count(*) from operation_tag'.
+                ' where jrn_id=$1 and tag_id=$2', array($this->jrn_id, $p_tag_id));
+        if ($count>0)
+            return;
+        $sql=' insert into operation_tag (jrn_id,tag_id) values ($1,$2)';
+        $this->cn->exec_sql($sql, array($this->jrn_id, $p_tag_id));
+    }
+
+    /**
+     * @brief show the cell content in Display for the tags
+     * @param $div prefix of the DOM id 
+     * called also by ajax
+     */
+    function tag_cell($p_div)
+    {
+        global $g_user;
+        $a_tag=$this->tag_get();
+        $c=count($a_tag);
+        $ledger=$this->cn->get_value("select jr_def_id from jrn where jr_id=$1", [$this->jrn_id]);
+        $access=$g_user->get_ledger_access($ledger);
+        for ($e=0; $e<$c; $e++)
+        {
+            echo '<span class="tagcell tagcell-color'.$a_tag[$e]['t_color'].'">';
+            echo $a_tag[$e]['t_tag'];
+            if ($access=='W')
+            {
+                $js_remove=sprintf("new operation_tag('%s').remove('%s','%s','%s')", $p_div, dossier::id(),
+                        $this->jrn_id, $a_tag[$e]['t_id']);
+                echo Icon_Action::trash(uniqid(), $js_remove);
+            }
+            echo '</span>';
+            echo '&nbsp;';
+            echo '&nbsp;';
+        }
+    }
+
+    /**
+     * @brief get the tags of the current objet
+     * @return an array idx [ag_id,t_id,at_id,t_tag]
+     */
+    function tag_get()
+    {
+        if ($this->jrn_id==-1)
+        {
+            throw new Exception("TO01 jrn_id unset");
+        }
+        $sql='select b.jrn_id,a.t_id,a.t_id,a.t_tag,a.t_color'
+                .' from '
+                .' tags as a join operation_tag as b on (a.t_id=b.tag_id)'
+                .' where jrn_id=$1 '
+                .' order by a.t_tag';
+        $array=$this->cn->get_array($sql, array($this->jrn_id));
+        return $array;
+    }
+
+    /**
+     * Remove a tag 
+     * @param int  $p_tag_id tag id
+     */
+    function tag_remove($p_tag_id)
+    {
+        if ($this->jrn_id==-1)
+        {
+            throw new Exception("TO01 jrn_id unset");
+        }
+        $this->cn->exec_sql("delete from operation_tag where jrn_id=$1 and tag_id=$2", [$this->jrn_id, $p_tag_id]);
+    }
+
+    /**
+     * let select a tag to add to the search
+     */
+    function select_search($p_prefix)
+    {
+        $res="";
+        $ret=$this->get_data()->seek(' order by t_tag');
+        require_once NOALYSS_TEMPLATE.'/tag_search_select.php';
+        return HtmlInput::title_box('Tag', $p_prefix.'tag_div').$res;
+    }
+    /**
+     * Show a button to select tag for Search
+     * @return HTML
+     */
+    static function select_tag_search($p_prefix)
+    {
+        $r="";
+        $r.=HtmlInput::button("choose_tag", _("Etiquette"),
+                        'onclick="search_display_tag('.Dossier::id().',\''.$p_prefix.'\',\'Tag_Operation\')"', "smallbutton");
+        return $r;
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/include/constant.php b/include/constant.php
index 7d08aea22..92046e50d 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -107,7 +107,7 @@ if ( !defined ("NOALYSS_PACKAGE_REPOSITORY")) {
 if ( ! defined ("SYSINFO_DISPLAY")) {
     define ("SYSINFO_DISPLAY",TRUE);
 }
-define ("DBVERSION",150);
+define ("DBVERSION",151);
 define ("MONO_DATABASE",25);
 define ("DBVERSIONREPO",18);
 define ('NOTFOUND','--not found--');
diff --git a/include/database/user_filter_sql.class.php b/include/database/user_filter_sql.class.php
index 72ebb83c9..55b59beab 100644
--- a/include/database/user_filter_sql.class.php
+++ b/include/database/user_filter_sql.class.php
@@ -56,6 +56,9 @@ class User_filter_SQL extends Noalyss_SQL
             , "all_ledger"=>"all_ledger"
             ,"operation_filter"=>"operation_filter"
             ,'filter_name'=>"filter_name"
+            ,'uf_tag'=>'uf_tag'
+            ,'uf_tag_option'=>'uf_tag_option'
+            
         );
         /*
          * Type of columns
@@ -78,6 +81,8 @@ class User_filter_SQL extends Noalyss_SQL
             , "all_ledger"=>"numeric"
             ,"operation_filter"=>"text"
             ,"filter_name"=>"text"
+            ,'uf_tag'=>'text'
+            ,'uf_tag_option'=>'numeric'
         );
 
 
diff --git a/include/history_operation.inc.php b/include/history_operation.inc.php
index 5e7aac3e0..d61658e67 100644
--- a/include/history_operation.inc.php
+++ b/include/history_operation.inc.php
@@ -175,17 +175,28 @@ echo '</form>';
  */
 $r = HtmlInput::get_to_hidden(array('l', 'date_paid_start','date_paid_end',
 				    'date_start', 'date_end', 'desc', 'amount_min', 'amount_max', 'qcode','operation_filter',
-				    'accounting', 'unpaid', 'gDossier', 'ledger_type', 'p_action'));
+				    'accounting', 'unpaid', 'gDossier', 'ledger_type', 'p_action','search_optag_option'));
 if (isset($_GET['search_opr_jrn']))
 {
     foreach ($a_search_opr_jrn as $k => $v)
        if (isNumber($v))  $r.=HtmlInput::hidden('r_jrn[' . $k . ']', $v);
 }
+$r.=HtmlInput::hidden("tag_option",$http->request("search_optag_option","string",0));
 if (isset($_GET['r_jrn']))
 {
 	foreach ($a_rjn as $k => $v)
 	if (isNumber($v)) 	$r.=HtmlInput::hidden('r_jrn[' . $k . ']', $v);
 }
+if (isset($_GET['search_optag'])) {
+    $http=new HttpInput();
+    $aTag=$http->get("search_optag","array");
+  foreach ($aTag as $k=>$v) {
+      // Protect : check that $k and $v are numeric
+    if (isNumber($k)&&isNumber($v)) {
+        $r.=HtmlInput::hidden('tag[]',$v);
+    }
+  }
+}
 echo '<form action="export.php" method="get">';
 echo $r;
 echo HtmlInput::hidden('act', 'CSV:histo');
diff --git a/include/sql/patch/upgrade150.sql b/include/sql/patch/upgrade150.sql
new file mode 100644
index 000000000..b3a879b3a
--- /dev/null
+++ b/include/sql/patch/upgrade150.sql
@@ -0,0 +1,15 @@
+begin;
+alter table tags add column t_color int;
+alter table tags alter t_color set default 1;
+update tags set t_color=1;
+create table operation_tag (opt_id bigserial primary key, jrn_id bigint , tag_id int);
+alter table operation_tag add constraint opt_jrnx foreign key   (jrn_id)  references jrn (jr_id) on update cascade on delete cascade;
+alter table operation_tag add constraint opt_tag_id foreign key   (tag_id)  references tags (t_id) on update cascade on delete cascade;
+comment on table operation_tag is 'Tag attached to an operation';
+ALTER TABLE public.user_filter ADD uf_tag text ;
+alter table user_filter add uf_tag_option int;
+
+COMMENT ON COLUMN public.user_filter.uf_tag IS 'Tag list';
+COMMENT ON COLUMN public.user_filter.uf_tag_option IS '0 : all tags must be present, 1: at least one';
+insert into version (val,v_description) values (151,'Tag with color and operation');
+commit;
diff --git a/include/template/action_other_action.php b/include/template/action_other_action.php
index 4759467c3..19d510441 100644
--- a/include/template/action_other_action.php
+++ b/include/template/action_other_action.php
@@ -33,16 +33,16 @@ echo HtmlInput::request_to_hidden(array("closed_action","remind_date_end","remin
         <li>
             <?php $radio->value="ETIADD";echo $radio->input(); ?>
             <?php echo _("Ajout d'étiquettes");?>
-            <?php echo Tag::button_search('add'); ?>
-            <?php echo Tag::add_clear_button('add'); ?>
+            <?php echo Tag_Action::select_tag_search('add'); ?>
+            <?php echo Tag_Action::add_clear_button('add'); ?>
 				<span id="addtag_choose_td">
                                 </span>
         </li>
         <li>
             <?php $radio->value="ETIREM";echo $radio->input(); ?>
             <?php echo _("Enlever des étiquettes");?>
-            <?php echo Tag::button_search('rem'); ?>
-            <?php echo Tag::add_clear_button('rem'); ?>
+            <?php echo Tag_Action::select_tag_search('rem'); ?>
+            <?php echo Tag_Action::add_clear_button('rem'); ?>
 				<span id="remtag_choose_td">
                                 </span>
         </li>
diff --git a/include/template/action_search.php b/include/template/action_search.php
index 20f3a436b..00d11ec39 100644
--- a/include/template/action_search.php
+++ b/include/template/action_search.php
@@ -129,14 +129,14 @@
             <p>
                 <?php echo _('Etiquette'); ?>
                <span id="searchtag_choose_td">
-                   <?php echo Tag::button_search('search'); ?>
+                   <?php echo Tag_Action::select_tag_search('search'); ?>
                    <?php
                        if ( isset($_GET['searchtag'])) {
                            $http=new HttpInput();
-                           echo Tag::add_clear_button('search');
+                           echo Tag_Action::add_clear_button('search');
                            $asearchtag= $http->get("searchtag","array",array());
                            for ($i=0;$i<count($asearchtag);$i++) {
-                               $t=new Tag($cn, $asearchtag[$i]);
+                               $t=new Tag_Action($cn, $asearchtag[$i]);
                                echo $t->update_search_cell('search');
                            }
                        }
diff --git a/include/template/detail-action.php b/include/template/detail-action.php
index 821cb62b6..d930f531c 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -160,7 +160,7 @@ $uniq=uniqid("tab",TRUE);
                 Dossier / Etiquette
             </TD>
             
-            <td id="action_tag_td">
+            <td id="action_tag_td" style="max-width:35rem">
                 <?php
                    $this->tag_cell($p_view);
                 ?>
diff --git a/include/template/ledger_detail_bottom.php b/include/template/ledger_detail_bottom.php
index f62975a17..3675ad2d1 100644
--- a/include/template/ledger_detail_bottom.php
+++ b/include/template/ledger_detail_bottom.php
@@ -44,6 +44,7 @@ $a_tab['linked_operation_div']=array('id'=>'linked_operation_div'.$div,'label'=>
 $a_tab['document_operation_div']=array('id'=>'document_operation_div'.$div,'label'=>_('Document').'('.$nb_document.')','display'=>'block');
 $a_tab['linked_action_div']=array('id'=>'linked_action_div'.$div,'label'=>_('Actions Gestion').'('.count($a_followup).')','display'=>'none');
 $a_tab['analytic_div']=array('id'=>'analytic_div'.$div,'label'=>_('Comptabilité Analytique'),'display'=>'none');
+$a_tab['tag_operation_div']=array('id'=>'tag_operation_div'.$div,'label'=>_('Etiquette'),'display'=>'none');
 
  
 // show tabs
@@ -308,7 +309,23 @@ require_once NOALYSS_TEMPLATE.'/ledger_detail_file.php';
     </span>
 <?php endif;?>
 </div>
-
+<div id="tag_operation_div<?=$div?>" style="overflow:auto;display:<?php echo $a_tab['tag_operation_div']['display']?>"> 
+    <div id="operation_tag_td<?=$div?>">
+    <?php
+    /******************************************************************************************************************
+     * Tags on operation
+     *****************************************************************************************************************/
+    $tag_operation=new Tag_Operation($cn);
+    $tag_operation->set_jrn_id($obj->det->jr_id);
+    $tag_operation->tag_cell($div);
+    ?>
+    
+    </div>
+    <?php
+    // Button add tags
+         if ( $access=='W') { echo Tag_Operation::button_search($obj->det->jr_id,$div);}
+    ?>
+</div>
 <hr>
 <?php 
       echo '<p style="text-align:center">';
diff --git a/include/template/ledger_search.php b/include/template/ledger_search.php
index a6a1e00e5..7461998eb 100644
--- a/include/template/ledger_search.php
+++ b/include/template/ledger_search.php
@@ -87,5 +87,40 @@ echo $f_accounting->input();  ?>
 <?php echo $f_paid->input();  ?>
 </td>
 </tr>
-
+<tr>
+    
+<td  style="text-align:right;width:30em">
+    
+        <?php
+         $iselect= new ISelect($this->div."tag_option");
+                $iselect->value=array(
+                    array("value"=>0,"label"=>_("Toutes les étiquettes")),
+                    array("value"=>1,"label"=>_("Au moins une étiquette"))
+                    );
+                
+                $iselect->set_value($http->request($this->div."tag_option","number",0));
+                echo $iselect->input(); 
+               
+        ?>
+        <?php
+        echo Tag_Operation::select_tag_search($this->div);
+        ?>
+</td>
+    <td >
+        <span id="<?=$this->div?>tag_choose_td">
+            <?php 
+            $aTag= $http->request($this->div."tag","string",0);
+                if (is_array($aTag) ) {
+                    $nb_tag=count($aTag);
+                    for ($j=0;$j< $nb_tag;$j++) {
+                        $tag_operation=new Tag_Operation($this->cn,$aTag[$j]);
+                        $tag_operation->update_search_cell($this->div);
+                    }
+                }
+            ?>
+        
+        </span>
+    </td>
+</tr>
+    
 </table>
diff --git a/include/template/tag_select.php b/include/template/tag_select.php
index 59732c3f2..4263df1ba 100644
--- a/include/template/tag_select.php
+++ b/include/template/tag_select.php
@@ -27,15 +27,28 @@ if ( $max == 0 ) {
     </tr>
 <?php
 $gDossier=Dossier::id();
-$ag_id=$http->request("ag_id","number");
-if (isNumber($ag_id) == 0 ) die ('ERROR : parameters invalid');
+$id="none";
+
+if ( get_class($this) == 'Tag_Action' ) {
+    $id=$http->request("ag_id","number");
+ } elseif (get_class($this)=='Tag_Operation')
+{
+     $id=$http->request("jrn_id");
+}
+
+if (isNumber($id) == 0 ) die ('ERROR : parameters invalid');
     for ($i=0;$i<$max;$i++):
         $row=Database::fetch_array($ret, $i);
 ?>
     <tr class="<?php echo (($i%2==0)?'even':'odd');?>">
         <td class="tagcell-color<?=$row['t_color']?>">
             <?php
-            $js=sprintf("action_tag_add('%s','%s','%s','%s')",$gDossier,$ag_id,$row['t_id'],$row['tag_type']);
+            if ( get_class($this) == 'Tag_Action' ) {
+                $js=sprintf("action_tag_add('%s','%s','%s','%s')",$gDossier,$id,$row['t_id'],$row['tag_type']);
+            } else {
+                $js=sprintf("new operation_tag('%s').add('%s','%s','%s','%s')",$p_prefix,$gDossier,$id,$row['t_id'],$row['tag_type']);
+            }
+            
             echo HtmlInput::anchor($row['t_tag'], "", "onclick=\"$js\"");
             ?>
         </td>

From e5d6011a58c6e8251f25ee4d63cfe6bea9c5ddd6 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 11 Nov 2020 00:24:56 +0100
Subject: [PATCH 174/257] Tag sorted alphabetically

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

diff --git a/include/class/document.class.php b/include/class/document.class.php
index 64641f8c1..d7b7f8789 100644
--- a/include/class/document.class.php
+++ b/include/class/document.class.php
@@ -1388,7 +1388,7 @@ class Document
                 if ( $aTag == NULL ) {
                     // retrieve comments
                     $aTag=$this->db->get_array("
-                       select t_tag from action_tags at2 join tags t using(t_id)  where ag_id=$1
+                       select t_tag from action_tags at2 join tags t using(t_id)  where ag_id=$1 order by upper(t_tag)
                             "
                             ,[$p_array['ag_id']]);
                 }

From 2f2426206bcc0581010b1c22b6151995fab5900e Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 11 Nov 2020 00:38:41 +0100
Subject: [PATCH 175/257] Export FollowUp option doesn't work

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

diff --git a/include/export/export_follow_up_contact_csv.php b/include/export/export_follow_up_contact_csv.php
index d7b4a1e93..0d02f9697 100644
--- a/include/export/export_follow_up_contact_csv.php
+++ b/include/export/export_follow_up_contact_csv.php
@@ -64,7 +64,7 @@ join contact_option_ref cor on (cor.cor_id=apo.contact_option_ref_id)
 where ag_id=$1 and f_id=$2  order by cor_id",array($ag_id,$lastcard));
        $nb_option=count($aOption);
        for ($h=0;$h < $nb_option;$h++) {
-           $csv->add($h);
+           $csv->add($aOption[$h]['ap_value']);
        }
        $csv->write();
        $lastcard=$aRow[$i]['f_id'];

From 1bad9db118085e489a9538afcafd756d1959eec8 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 11 Nov 2020 00:39:19 +0100
Subject: [PATCH 176/257] Bug : display unused other card options

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

diff --git a/include/class/follow_up_other_concerned.class.php b/include/class/follow_up_other_concerned.class.php
index 56cec39ef..199501608 100644
--- a/include/class/follow_up_other_concerned.class.php
+++ b/include/class/follow_up_other_concerned.class.php
@@ -230,7 +230,7 @@ EOF;
     from contact_option_ref cor 
     join jnt_document_option_contact jdoc on (cor.cor_id=jdoc.contact_option_ref_id ) 
     join action_gestion ag on (ag.ag_type=jdoc.document_type_id ) 
-    where ag_id=$1
+    where ag_id=$1 and jdoc.jdoc_enable=1
     order by upper(cor_label)",[$this->ag_id]);
         return $aColumn;
     }

From 008495a7055282c8050389f613e198eb111c509c Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 11 Nov 2020 00:53:19 +0100
Subject: [PATCH 177/257] Bug : error end-of-file

---
 .../class/follow_up_other_concerned.class.php | 98 +++++++++++--------
 1 file changed, 55 insertions(+), 43 deletions(-)

diff --git a/include/class/follow_up_other_concerned.class.php b/include/class/follow_up_other_concerned.class.php
index 199501608..33942d939 100644
--- a/include/class/follow_up_other_concerned.class.php
+++ b/include/class/follow_up_other_concerned.class.php
@@ -31,17 +31,18 @@
  * @brief Others concerned card in an action
  * @see Follow_Up
  */
-
 class Follow_Up_Other_Concerned
 {
-    private $ag_id; /*!< action_gestion.ag_id*/
-    private $db; /*!< Database handle */
-    
-    function __construct($p_database,$p_action_gestion_id)
+
+    private $ag_id; /* !< action_gestion.ag_id */
+    private $db; /* !< Database handle */
+
+    function __construct($p_database, $p_action_gestion_id)
     {
         $this->db=$p_database;
         $this->ag_id=$p_action_gestion_id;
     }
+
     public function get_ag_id()
     {
         return $this->ag_id;
@@ -52,6 +53,7 @@ class Follow_Up_Other_Concerned
         $this->ag_id=$ag_id;
         return $this;
     }
+
     public function get_db()
     {
         return $this->db;
@@ -63,8 +65,7 @@ class Follow_Up_Other_Concerned
         return $this;
     }
 
-    
-         /**
+    /**
      * Remove  another concerned (tiers, supplier...)
      * @remark type $g_user
      * @param type $p_fiche_id
@@ -74,7 +75,8 @@ class Follow_Up_Other_Concerned
         global $g_user;
         if ($g_user->can_write_action($this->ag_id))
         {
-            $this->db->exec_sql('delete from action_person where ag_id = $1 and f_id = $2', array($this->ag_id, $p_fiche_id));
+            $this->db->exec_sql('delete from action_person where ag_id = $1 and f_id = $2',
+                    array($this->ag_id, $p_fiche_id));
             return true;
         }
         return false;
@@ -105,6 +107,7 @@ class Follow_Up_Other_Concerned
 //            echo '&nbsp;';
 //        }
 //    }
+
     /**
      * Display the count of other concerned card (tiers, supplier...) in button which call 
      * @return string
@@ -120,7 +123,7 @@ class Follow_Up_Other_Concerned
 EOF;
         echo HtmlInput::anchor_action(count($a_linked), $javascript, null, "button");
     }
-    
+
     /**
      *  Add another concerned (tiers, supplier...)
      * @remark type $g_user
@@ -134,13 +137,16 @@ EOF;
             /**
              * insert into action_person
              */
-            $count=$this->db->get_value('select count(*) from action_person where f_id=$1 and ag_id=$2', array($p_fiche_id, $this->ag_id));
+            $count=$this->db->get_value('select count(*) from action_person where f_id=$1 and ag_id=$2',
+                    array($p_fiche_id, $this->ag_id));
             if ($count==0)
             {
-                $this->db->exec_sql('insert into action_person (ag_id,f_id) values ($1,$2)', array($this->ag_id, $p_fiche_id));
+                $this->db->exec_sql('insert into action_person (ag_id,f_id) values ($1,$2)',
+                        array($this->ag_id, $p_fiche_id));
             }
         }
     }
+
     /**
      * Return a HTML string with a button for adding other cards
      * @return type
@@ -151,41 +157,41 @@ EOF;
         $javascript=<<<EOF
                     var obj={dossier:$dossier,ag_id:$this->ag_id};action_concerned_search_card(obj);
 EOF;
-        $js=HtmlInput::button_action(_('Ajout autres'), $javascript, 'xx',
-                        'smallbutton');
+        $js=HtmlInput::button_action(_('Ajout autres'), $javascript, 'xx', 'smallbutton');
         return $js;
     }
-    
+
     /**
      * Display one row for all the option of a card 
      * @param int $p_fid card if (fiche.f_id)
      * @param int $p_row index of the row used for alternate the color of the rows
      * @param array $aOther Column of the options
      */
-    function display_row($p_fid,$p_row,$pa_Column){
+    function display_row($p_fid, $p_row, $pa_Column)
+    {
         static $dossier_id;
         $dossier_id=Dossier::id();
-        
+
         $action_person_id=$this->db->get_value("select ap_id from action_person where f_id=$1 and ag_id=$2",
-                [$p_fid,$this->ag_id]);
-        
+                [$p_fid, $this->ag_id]);
+
         // Name , first & quick code from fiche
-       $row= $this->db->get_row("select 
+        $row=$this->db->get_row("select 
             (select ad_value from fiche_detail fd2 where fd2.f_id=ap.f_id and fd2.ad_id = 1) as xname,
             (select ad_value from fiche_detail fd2 where fd2.f_id=ap.f_id and fd2.ad_id = 32) as xfirst_name,
             (select ad_value from fiche_detail fd2 where fd2.f_id=ap.f_id and fd2.ad_id = 23) as xqcode
             from fiche ap
             where ap.f_id=$1
-                ",[$p_fid]);
-       
-    
-       // Detail for this one
-       $detail = HtmlInput::anchor($row['xqcode'],"", sprintf("onclick=\"linked_card_option('%s','%s')\"",
-                    $action_person_id,$dossier_id),'class="line"',_("Options"));
-       // remove card
-        $js_remove=sprintf("action_remove_concerned('%s','%s','%s')", dossier::id(), $p_fid, 
-                    $this->ag_id);
-        $remove =  Icon_Action::trash(uniqid(), $js_remove);
+                ", [$p_fid]);
+
+
+        // Detail for this one
+        $detail=HtmlInput::anchor($row['xqcode'], "",
+                        sprintf("onclick=\"linked_card_option('%s','%s')\"", $action_person_id, $dossier_id),
+                        'class="line"', _("Options"));
+        // remove card
+        $js_remove=sprintf("action_remove_concerned('%s','%s','%s')", dossier::id(), $p_fid, $this->ag_id);
+        $remove=Icon_Action::trash(uniqid(), $js_remove);
         $r=<<<EOF
     <tr id="other_{$action_person_id}">
        
@@ -198,40 +204,46 @@ EOF;
         <td>
             {$row['xfirst_name']}
         </td>
-EOF;     
-            $nb_other=count($pa_Column);
-            for ($i=0;$i<$nb_other;$i++) {
-                $value=$this->db->get_value("
+EOF;
+        $nb_other=count($pa_Column);
+        for ($i=0; $i<$nb_other; $i++)
+        {
+            $value=$this->db->get_value("
                         select 	apo2.ap_value
                         from action_person_option apo2 
                         join action_person ap on (apo2.action_person_id=ap.ap_id) 
                         where 
                         apo2.contact_option_ref_id =$1
                         and ap.f_id=$2
-                        ",array($pa_Column[$i]['cor_id'] , $p_fid));
-                $r.= td($value);
-            }
+                        ", array($pa_Column[$i]['cor_id'], $p_fid));
+            $r.=td($value);
+        }
         $r.='<td>'.$remove.'</td>';
-        $r.='</tr>'; 
+        $r.='</tr>';
         return $r;
     }
+
     /**
      * Display all the person with option in a html table
      */
-    function display_table(){
-    require_once NOALYSS_TEMPLATE."/follow_up_other_concerned_display_table.php";
+    function display_table()
+    {
+        require_once NOALYSS_TEMPLATE."/follow_up_other_concerned_display_table.php";
     }
+
     /**
      * Get Available options
      */
-    function get_option() 
+    function get_option()
     {
-        $aColumn = $this->db->get_array("select cor_id,cor_label,jdoc.jdoc_enable 
+        $aColumn=$this->db->get_array("select cor_id,cor_label,jdoc.jdoc_enable 
     from contact_option_ref cor 
     join jnt_document_option_contact jdoc on (cor.cor_id=jdoc.contact_option_ref_id ) 
     join action_gestion ag on (ag.ag_type=jdoc.document_type_id ) 
     where ag_id=$1 and jdoc.jdoc_enable=1
-    order by upper(cor_label)",[$this->ag_id]);
+    order by upper(cor_label)", [$this->ag_id]);
         return $aColumn;
     }
-}
\ No newline at end of file
+
+}
+?>
\ No newline at end of file

From 536bba4be6c7a4c4200c6f38b3e7d97235ca3563 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 11 Nov 2020 10:54:09 +0100
Subject: [PATCH 178/257] Bug : followup detail operation:  price Purchase or
 Sale, amount_from_type lost when searching , because exists in double

---
 include/ajax/ajax_card.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/ajax/ajax_card.php b/include/ajax/ajax_card.php
index 62e88de20..5c7cdac74 100644
--- a/include/ajax/ajax_card.php
+++ b/include/ajax/ajax_card.php
@@ -440,7 +440,6 @@ case 'fs':
             $sql_array[$i]=${$i};
         }
     }
-    $r.=$hidden;
     $r.="</form>";
 
     $sql_array["query"]=$query;

From 8bd9ba4fb5754fd5ba8c6c20d6e98500e237ac9b Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 11 Nov 2020 16:23:19 +0100
Subject: [PATCH 179/257] minor changes : remove commented code, add new color
 for tags

---
 html/js/scripts.js                            |  4 +-
 html/style-classic7.css                       | 74 ++++++++++++++++++-
 include/class/follow_up.class.php             |  6 +-
 .../class/follow_up_other_concerned.class.php | 29 +-------
 include/template/detail-action.php            |  1 +
 include/template/tag_detail.php               |  5 +-
 6 files changed, 83 insertions(+), 36 deletions(-)

diff --git a/html/js/scripts.js b/html/js/scripts.js
index 14a8a4f97..12aa9bb84 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -2738,8 +2738,8 @@ function search_display_tag(p_dossier, p_prefix,p_object)
                         code_html = unescape_xml(code_html);
                         remove_waiting_box();
                         add_div({id: p_prefix + 'tag_div', style: 'left:10%;width:70%', cssclass: 'inner_box', drag: 1});
-                        $(p_prefix + 'tag_div').style.top = posY - 80 + "px";
-                        $(p_prefix + 'tag_div').style.left = posX - 200 + "px";
+                        $(p_prefix + 'tag_div').style.top = calcy(200)+"px"
+                        $(p_prefix + 'tag_div').style.left = 20+ "%";
                         remove_waiting_box();
                         $(p_prefix + 'tag_div').innerHTML = code_html;
                         code_html.evalScripts();
diff --git a/html/style-classic7.css b/html/style-classic7.css
index c4e12cf4f..6bb8ce04d 100644
--- a/html/style-classic7.css
+++ b/html/style-classic7.css
@@ -2582,4 +2582,76 @@ span.tagcell {
 .tagcell-color20 {
     background-color:  yellow !important;
     color: orangered !important;
-}
\ No newline at end of file
+}
+.tagcell-color21 {
+    background-color:  #151514 !important;
+    color: orangered !important;
+}
+.tagcell-color22 {
+	background-color: #0f0f0e !important;
+	color: #ffef00 !important;
+}
+.tagcell-color23 {
+	background-color: #64644a !important;
+	color: #ffbf00 !important;
+}
+.tagcell-color24 {
+	color: orangered !important;
+}
+.tagcell-color25 {
+	color: #ff0606 !important;
+	font-style: oblique;
+}
+.tagcell-color26 {
+	background-color: #fff !important;
+	color: #03038a;
+}
+.tagcell-color27 {
+	color: #08030b !important;
+	background-image: linear-gradient(to right, rgb(227, 175, 175), rgb(136, 13, 13));
+}
+.tagcell-color28 {
+	color: white !important;
+	background-image: linear-gradient(darkblue,lightblue) !important;
+}
+.tagcell-color29 {
+	background-color: yellow !important;
+	color: white !important;
+	background-image: linear-gradient(to right,black,yellow,red) !important;
+}
+.tagcell-color30 {
+	background-color: yellow !important;
+	color: white !important;
+	background-image: linear-gradient(to right,darkblue,white,red) !important;
+}
+.tagcell-color31 {
+	color: #e1d5d0 !important;
+	background-image: linear-gradient(to bottom right, #9abbe3a8,#6f6fac, #002ba3) !important;
+}
+.tagcell-color32 {
+	background-color: #ff00e3 !important;
+	font-family: SansationLight !important;
+}
+.tagcell-color33 {
+	color: white !important;
+	background-color: #8d3dcc !important;
+}
+.tagcell-color34 {
+	background-image: linear-gradient(to right,blue,white) !important;
+}
+.tagcell-color35 {
+	color: white !important;
+	background-image: linear-gradient(to right,#a61660,#e697d2) !important;
+}
+.tagcell-color36 {
+	background-image: linear-gradient(to right,#008000,#c8eec8) !important;
+	color: aquamarine !important;
+}
+/***************************************
+ * Button for linked card in follow up
+ * **************************************/
+#linked_card_bt {
+	font-size: 110%;
+	padding: 0.25em 1em 0.25em 1em;
+	font-family: bold;
+}
diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index f8c592989..0ce9e8f1a 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -694,9 +694,9 @@ class Follow_Up
         $r.='<th style="width:5.57%">'.$table->get_header(5).'</th>';
 //        $r.='<th>'.$table->get_header(1).'</th>';
         $r.=th('Priorité','style="width:5.57%"');
-        $r.='<th style="min-width:52%">'.$table->get_header(6).'</th>';
+        $r.='<th style="min-width:45%">'.$table->get_header(6).'</th>';
         $r.='<th style="width:5.57%">'.$table->get_header(7).'</th>';
-        $r.='<th style="width:5.57%">'.$table->get_header(3).'</th>';
+        $r.='<th style="max-width:10%">'.$table->get_header(3).'</th>';
         $r.='<th style="width:5.57%">'.$table->get_header(4).'</th>';
         $r.="</tr>";
 
@@ -778,7 +778,7 @@ class Follow_Up
                 $aTags=explode(",", $row["tags"]);
                 $nb_tag=count($aTags);
                 for ( $x=0;$x<$nb_tag;$x++) {
-                   $r.=sprintf('<span style="font-size:75%%" class="tagcell-color%s">%s</span>',$aColor[$x],$aTags[$x]);
+                   $r.=sprintf('<span style="font-size:75%%;padding:1px;border-color:transparent" class="tagcell tagcell-color%s">%s</span>',$aColor[$x],$aTags[$x]);
                    $r.="&nbsp;";
                 } // end loop $x
                 $r.='</a>';
diff --git a/include/class/follow_up_other_concerned.class.php b/include/class/follow_up_other_concerned.class.php
index 33942d939..e2c457f5e 100644
--- a/include/class/follow_up_other_concerned.class.php
+++ b/include/class/follow_up_other_concerned.class.php
@@ -82,31 +82,6 @@ class Follow_Up_Other_Concerned
         return false;
     }
 
-//    /**
-//     * Display the other concerned (tiers, supplier...) in a small cell
-//     * @return string
-//     */
-//    function display_linked()
-//    {
-//        $a_linked=$this->db->get_array('select ap_id,f_id from action_person where ag_id=$1', array($this->ag_id));
-//        if (count($a_linked)==0)
-//            return "";
-//        $dossier_id=Dossier::id();
-//        for ($i=0; $i<count($a_linked); $i++)
-//        {
-//            $fiche=new Fiche($this->db, $a_linked[$i]['f_id']);
-//            $qc=$fiche->get_quick_code();
-//            $js_remove=sprintf("action_remove_concerned('%s','%s','%s')", dossier::id(), $a_linked[$i]['f_id'], 
-//                    $this->ag_id);
-//            echo '<span class="tagcell">';
-//            echo HtmlInput::anchor($qc,"", sprintf("onclick=\"linked_card_option('%s','%s')\"",
-//                    $a_linked[$i]['ap_id'],$dossier_id));
-//            echo Icon_Action::trash(uniqid(), $js_remove);
-//            echo '</span>';
-//            echo '&nbsp;';
-//            echo '&nbsp;';
-//        }
-//    }
 
     /**
      * Display the count of other concerned card (tiers, supplier...) in button which call 
@@ -121,7 +96,7 @@ class Follow_Up_Other_Concerned
         $javascript=<<<EOF
                     var obj={dossier:$dossier_id,ag_id:$this->ag_id};action_concerned_list(obj);
 EOF;
-        echo HtmlInput::anchor_action(count($a_linked), $javascript, null, "button");
+        echo HtmlInput::anchor_action(count($a_linked), $javascript, 'linked_card_bt', "button");
     }
 
     /**
@@ -246,4 +221,4 @@ EOF;
     }
 
 }
-?>
\ No newline at end of file
+?>
diff --git a/include/template/detail-action.php b/include/template/detail-action.php
index d930f531c..b9ba1461c 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -255,6 +255,7 @@ function small(p_id_textarea){
    // description
    $description = new ITextarea("ag_description");
    $description->id="ag_description";
+   $has_description = false;
     //---------------------------------- Description -------------------------------------------------------------------
     if ( count($acomment)> 0) {
             $has_description = true;
diff --git a/include/template/tag_detail.php b/include/template/tag_detail.php
index a2a9847ac..68bad6571 100644
--- a/include/template/tag_detail.php
+++ b/include/template/tag_detail.php
@@ -30,7 +30,7 @@ $icheckbox->javascript='onclick="uncheck_other(this,\'tagcell_color\');"';
 </p>
 <?php
 if ( $data->t_id == '-1') $data->t_color=1;
-$nb_color=20;
+$nb_color=36;
 
 for ($i=1 ; $i != $nb_color+1 ; $i++ ) {
 ?>    
@@ -41,7 +41,6 @@ for ($i=1 ; $i != $nb_color+1 ; $i++ ) {
             echo $icheckbox->input();
             ?>
         </span>
-    <?php if ( $i % 5 == 0 ) echo '<br>';?>
 <?php 
 
 } // end loop $i
@@ -59,4 +58,4 @@ if ( $data->t_id != '-1') :
 
 <?php
 endif;
-?>
\ No newline at end of file
+?>

From 4c9a9f1a745fffd75760eeef73089b77ed76bada Mon Sep 17 00:00:00 2001
From: Dany wm De Bontridder <danydb@noalyss.eu>
Date: Wed, 11 Nov 2020 18:08:03 +0100
Subject: [PATCH 180/257] Security administration : add a confirmation with
 generate random string and record it in audit

---
 include/ajax/ajax_admin.php        |  4 +--
 include/class/user.class.php       | 38 ++++++++++++++++++-----
 include/constant.php               |  2 +-
 include/dossier.inc.php            | 13 +++++---
 include/lib/ac_common.php          | 32 ++++++++++++++++++++
 include/sql/patch/ac-upgrade19.sql |  7 +++++
 include/user.inc.php               |  2 ++
 include/user_detail.inc.php        | 48 ++++++++++++++++++++++++++----
 8 files changed, 127 insertions(+), 19 deletions(-)
 create mode 100644 include/sql/patch/ac-upgrade19.sql

diff --git a/include/ajax/ajax_admin.php b/include/ajax/ajax_admin.php
index 1d38c98c4..6e958fea3 100644
--- a/include/ajax/ajax_admin.php
+++ b/include/ajax/ajax_admin.php
@@ -261,8 +261,8 @@ if (in_array($op, array('modele_drop', 'modele_modify', 'folder_modify', 'folder
         $confirm=new ICheckBox();
         $confirm->name="p_confirm";
         echo '<p>';
-        echo _('Cochez la case si vous êtes sûr de vouloir effacer ce dossier');
-        echo $confirm->input();
+        echo _("Tapez le code de confirmation");
+        echo confirm_with_string("fld_drop",5);
         echo '</p>';
         echo '<p style="text-align:center">';
         echo HtmlInput::submit('remove', _('Effacer'));
diff --git a/include/class/user.class.php b/include/class/user.class.php
index 6d43289b6..7ea928d27 100644
--- a/include/class/user.class.php
+++ b/include/class/user.class.php
@@ -1085,6 +1085,21 @@ class User
 		return $array;
 	}
 
+	/**
+	 * Audit action from the administration menu
+	 * @param $p_module description of the action
+	 */
+	static function audit_admin($p_module) {
+		$cn = new Database();
+		$sql = "insert into audit_connect (ac_user,ac_ip,ac_module,ac_url,ac_state) values ($1,$2,$3,$4,$5)";
+
+		$cn->exec_sql($sql, array(
+			$_SESSION['g_user'],
+			$_SERVER["REMOTE_ADDR"],
+			$p_module,
+			$_SERVER['REQUEST_URI'],
+			'ADMIN'));
+	}
 	function audit($action = 'AUDIT', $p_module = "")
 	{
 		global $audit;
@@ -1364,19 +1379,28 @@ class User
     static function remove_inexistant_user($p_dossier)
     {
         $cnx_repo=new Database();
+        $name=$cnx_repo->format_name($p_dossier,'dos');
+        if ($cnx_repo->exist_database($name) == 0 )return;
         $cnx_dossier=new Database($p_dossier);
-        
-        $a_user=$cnx_dossier->get_array('select user_name from profile_user');
+		if ($cnx_dossier->exist_table('profile_user'))
+      	  $a_user=$cnx_dossier->get_array('select user_name from profile_user');
+		else
+			return;
+
         if ( ! $a_user ) return;
         $nb=count($a_user);
         for ($i=0;$i < $nb;$i++) {
             if ( $cnx_repo->get_value('select count(*) from ac_users where use_login=$1',
                     array($a_user[$i]['user_name'])) == 0) {
-                $cnx_dossier->exec_sql("delete from user_sec_jrn where uj_login=$1",array($a_user[$i]['user_name']));
-                $cnx_dossier->exec_sql("delete from profile_user where user_name=$1",array($a_user[$i]['user_name']));
-                $cnx_dossier->exec_sql("delete from user_sec_act where ua_login=$1",array($a_user[$i]['user_name']));
-                $cnx_dossier->exec_sql("delete from user_sec_jrn where uj_login=$1",array($a_user[$i]['user_name']));
-                $cnx_dossier->exec_sql("delete from user_active_security where us_login=$1",array($a_user[$i]['user_name']));
+            	if ($cnx_dossier->exist_table('user_sec_jrn'))
+            		$cnx_dossier->exec_sql("delete from user_sec_jrn where uj_login=$1",array($a_user[$i]['user_name']));
+            	$cnx_dossier->exec_sql("delete from profile_user where user_name=$1",array($a_user[$i]['user_name']));
+				if ($cnx_dossier->exist_table('user_sec_act'))
+		            $cnx_dossier->exec_sql("delete from user_sec_act where ua_login=$1",array($a_user[$i]['user_name']));
+				if ($cnx_dossier->exist_table('user_sec_jrn'))
+              	  $cnx_dossier->exec_sql("delete from user_sec_jrn where uj_login=$1",array($a_user[$i]['user_name']));
+				if ($cnx_dossier->exist_table('user_active_security'))
+             	   $cnx_dossier->exec_sql("delete from user_active_security where us_login=$1",array($a_user[$i]['user_name']));
             }
         }
     }
diff --git a/include/constant.php b/include/constant.php
index 92046e50d..5aa3a4da6 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -109,7 +109,7 @@ if ( ! defined ("SYSINFO_DISPLAY")) {
 }
 define ("DBVERSION",151);
 define ("MONO_DATABASE",25);
-define ("DBVERSIONREPO",18);
+define ("DBVERSIONREPO",19);
 define ('NOTFOUND','--not found--');
 define ("MAX_COMPTE",4);
 define ('MAX_ARTICLE',5);
diff --git a/include/dossier.inc.php b/include/dossier.inc.php
index 25d865934..1ff726bdb 100644
--- a/include/dossier.inc.php
+++ b/include/dossier.inc.php
@@ -105,6 +105,8 @@ if ( isset ($_POST["DATABASE"]) )
                            values ($1,$2,$3)",array($dos,$desc,$max_email));
         $l_id=$repo->get_current_seq('dossier_id');
         $repo->commit();
+
+
     }
     catch (Exception $e)
     {
@@ -181,7 +183,7 @@ if ( isset ($_POST["DATABASE"]) )
 
                 Dossier::synchro_admin($l_id);
                 User::remove_inexistant_user($l_id);
-
+                User::audit_admin(sprintf('CREATE DATABASE %s %s',$l_id,$dos));
 
             }
         }
@@ -204,6 +206,7 @@ if ( isset ($_POST["DATABASE"]) )
                     echo _("Echec création ");
                     exit;
                 }
+                User::audit_admin(sprintf('CREATE DATABASE %s %s',$l_id,$dos));
                 ob_flush();
             
         }
@@ -376,10 +379,11 @@ if ( $sa == 'list' )
 //---------------------------------------------------------------------------
 if ( $sa == 'remove' && isNumber($dossier_id) == 1 && $dossier_id != -1 )
 {
-    
-    if ( ! isset ($_REQUEST['p_confirm']))
+    $ctl=$http->request("fld_drop");
+    $ctl_code=$http->request("ctlcode");
+    if ( $ctl != $ctl_code)
     {
-        echo _('Désolé, vous n\'avez pas coché la case');
+        echo _('Désolé, le code est invalide');
         echo HtmlInput::button_anchor(_('Retour'),'?action=dossier_mgt');
         return;
     }
@@ -423,6 +427,7 @@ if ( $sa == 'remove' && isNumber($dossier_id) == 1 && $dossier_id != -1 )
     $cn->exec_sql($sql,array($dossier_id));
     print '<h2 class="error">';
     printf (_("Le dossier %s est effacé").'</h2>',h($name));
+    User::audit_admin(sprintf('DROP DATABASE %s %s',$dossier_id,$name));
     echo HtmlInput::button_anchor(_('Retour'),'?action=dossier_mgt');
 }
 ?>
diff --git a/include/lib/ac_common.php b/include/lib/ac_common.php
index ff0f1e8f2..c6c30e7d1 100644
--- a/include/lib/ac_common.php
+++ b/include/lib/ac_common.php
@@ -1392,3 +1392,35 @@ function remove_divide_zero($p_formula)
     return $p_formula;
 }
 
+/**
+ * Create randomly a string
+ * @param int $p_length length of the generate string
+ */
+function generate_random_string($car)
+{
+    $string="";
+    $chaine="abcdefghijklmnpqrstuvwxyABCDEFGHIJKLMNPQRSTUVWXY0123456789*/+-=<>";
+    srand((double) microtime()*1020030);
+    for ($i=0; $i<$car; $i++)
+    {
+        $string .= $chaine[rand()%strlen($chaine)];
+    }
+    return $string;
+}
+
+/**
+ * generate a string of p_car character and a input text with name p_ctl_name
+ * work like a kind of captcha.The control code for checking is ctlcode.
+ * You compare the content of the variable p_ctl_name with ctlcode
+ * @param $p_ctl_name
+ * @param $p_car
+ */
+function confirm_with_string($p_ctl_name,$p_car)
+{
+    $code=generate_random_string($p_car );
+    $r =  HtmlInput::hidden("ctlcode",$code);
+    $r.='<span style="margin-left:1.2em;margin-right:1.2em;font-size:112%;font-weight:bold">'. $code.'</span>';
+    $ctl=new IText($p_ctl_name);
+    $r.=$ctl->input();
+    return $r;
+}
diff --git a/include/sql/patch/ac-upgrade19.sql b/include/sql/patch/ac-upgrade19.sql
new file mode 100644
index 000000000..6fe6bb07c
--- /dev/null
+++ b/include/sql/patch/ac-upgrade19.sql
@@ -0,0 +1,7 @@
+begin;
+
+ALTER TABLE public.audit_connect DROP CONSTRAINT valid_state ;
+ALTER TABLE public.audit_connect ADD CONSTRAINT valid_state CHECK ( ac_state in  ('FAIL','SUCCESS','AUDIT','ADMIN'));
+
+select upgrade_repo(19);
+commit;
\ No newline at end of file
diff --git a/include/user.inc.php b/include/user.inc.php
index 3148f2f55..f3248a659 100644
--- a/include/user.inc.php
+++ b/include/user.inc.php
@@ -57,6 +57,8 @@ if ( isset ($_POST["ADD"]) )
         $new_user->insert();
         $new_user->load();
         $_REQUEST['use_id']=$new_user->id;
+        User::audit_admin(sprintf('ADD USER %s %s',$new_user->id,$login));
+
         require_once NOALYSS_INCLUDE.'/user_detail.inc.php';
         return;
 
diff --git a/include/user_detail.inc.php b/include/user_detail.inc.php
index 8740238c8..c0c72bdb3 100644
--- a/include/user_detail.inc.php
+++ b/include/user_detail.inc.php
@@ -87,7 +87,16 @@ else if ($sbaction == "delete")
 //
 // Delete the user
 //
+    // check that the control is correct
+    $code=$http->post("userdel");
+    $ctl_code=$http->post('ctlcode');
+    if ( $code != $ctl_code) {
+        echo _("Code invalide, effacement refusé");
+        return;
+    }
     $cn = new Database();
+    $auser=$cn->get_row('select use_login from ac_users where use_id = $1',[$uid]);
+    if ( $auser == null) return;
     $Res = $cn->exec_sql("delete from jnt_use_dos where use_id=$1", array($uid));
     $Res = $cn->exec_sql("delete from ac_users where use_id=$1", array($uid));
     //------------------------------------
@@ -99,8 +108,10 @@ else if ($sbaction == "delete")
         for ( $i=0;$i<$nb;$i++)
             User::remove_inexistant_user($a_dossier[$i]['dos_id']);
     }
-    
-    echo "<center><H2 class=\"info\"> Utilisateur " . h($_POST['fname']) . " " . h($_POST['lname']) . " est effacé</H2></CENTER>";
+    User::audit_admin(sprintf('DELETE USER %s %s',$uid,$auser['use_login']));
+    echo "<H2 class=\"info\">";
+    printf (_("Utilisateur %s %s est effacé"),$http->post('fname'),$http->post('lname')) ;
+    echo " </H2>";
     require_once NOALYSS_INCLUDE.'/lib/iselect.class.php';
     require_once NOALYSS_INCLUDE.'/user.inc.php';
     return;
@@ -180,12 +191,39 @@ $it_pass->value="";
             </td>
         </tr>
     </table>
-    <input type="hidden" name="sbaction" id="sbaction" value="">
-        <input type="Submit" class="button" NAME="SAVE" VALUE="Sauver les changements" onclick="$('sbaction').value='save';return confirm_box('user_detail_frm','Confirmer changement ?');">
 
-        <input type="Submit"  class="button" NAME="DELETE" VALUE="Effacer" onclick="$('sbaction').value='delete';return confirm_box('user_detail_frm','Confirmer effacement ?');" >
+    <input type="hidden" name="sbaction" id="sbaction" value="save">
+
+        <input type="Submit" class="button" NAME="SAVE" VALUE="<?=('Sauver les changements')?>" onclick="return confirm_box('user_detail_frm','<?=_('Confirmer')?>');">
+
+        <input type="button"  class="button" NAME="DELETE" VALUE="<?=('Effacer')?>" onclick="$('delete_user_div').show();" >
 
 </FORM>
+<div id="delete_user_div" class="inner_box" style="display: none">
+<?=HtmlInput::title_box(_("Effacer"),'delete_user_div','hide')?>
+<FORM  id="user_detail_frm" METHOD="POST">
+    <INPUT   type="hidden" NAME="lname" value="<?=_("$UserChange->name")?>">
+    <INPUT type="hidden" NAME="fname" value="<?=_("$UserChange->first_name")?>">
+    <?php echo HtmlInput::hidden('UID',$uid)?>
+    <input type="hidden" name="sbaction" value="delete">
+    <p  class="info" id="codedel_div">
+        <?php
+        echo _("Pour effacer , confirmez en retapant le code");
+        echo confirm_with_string('userdel','5');
+        ?>
+
+    </p>
+    <ul class="aligned-block">
+        <li>
+            <input type="Submit"  class="button" NAME="DELETE" VALUE="<?=_("Confirmer")?>">
+        </li>
+        <li>
+            <?=HtmlInput::button_hide('delete_user_div')?>
+        </li>
+    </ul>
+</FORM>
+</div>
+
 <?php
 if  ($UserChange->admin == 0 ) :
 ?>

From 5c160657d4931ddf9d54a09bac661bed1c6b8e6e Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 11 Nov 2020 20:59:47 +0100
Subject: [PATCH 181/257] translate en

---
 html/lang/en_US/LC_MESSAGES/messages.po | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/html/lang/en_US/LC_MESSAGES/messages.po b/html/lang/en_US/LC_MESSAGES/messages.po
index 4cccc9079..df2bcf167 100644
--- a/html/lang/en_US/LC_MESSAGES/messages.po
+++ b/html/lang/en_US/LC_MESSAGES/messages.po
@@ -8086,9 +8086,8 @@ msgstr "Add details failed"
 
 #: include/class/pre_operation.class.php:149
 #: include/class/pre_operation.class.php:550
-#, php-format
 msgid "Echec PreOperatoin chargement %s"
-msgstr "Fail loading operation template"
+msgstr "Fail loading operation template %s"
 
 #: include/dossier.inc.php:195 include/dossier.inc.php:196
 #: include/dossier.inc.php:199 include/dossier.inc.php:204
@@ -8881,12 +8880,12 @@ msgstr "Error:"
 #: include/class/acc_operation.class.php:281
 #, php-format
 msgid "Erreur : balance incorrecte :diff = %d"
-msgstr "wrong balance diff = %d"
+msgstr "Error balance diff = %d"
 
 #: include/class/acc_operation.class.php:281
 #, php-format
 msgid "Erreur : balance incorrecte :diff = %s"
-msgstr "wrong balance diff = %s"
+msgstr "Error balance diff = %s"
 
 #: include/class_noalyss_sql.php:316 include/lib/class_noalyss_sql.php:316
 #: include/lib/data_sql.class.php:286 include/lib/noalyss_sql.class.php:391
@@ -8900,7 +8899,7 @@ msgstr "Error exec_sql expects an array"
 #: include/ajax/ajax_todo_list.php:140 include/ajax/ajax_todo_list.php:157
 #: include/ajax/ajax_todo_list.php:159 include/ajax/ajax_todo_list.php:161
 msgid "Erreur : note invalide"
-msgstr "error : invalid note"
+msgstr "Error : invalid note"
 
 #: html/ajax_todo_list.php:214 html/ajax_todo_list.php:273
 #: html/ajax_todo_list.php:215 html/ajax_todo_list.php:274
@@ -8918,7 +8917,7 @@ msgstr "Error : invalid parameter"
 
 #: include/lib/database_core.class.php:73
 msgid "Erreur Connexion"
-msgstr "Disconnect"
+msgstr "Error connect"
 
 #: include/ext/import_account/include/class_impacc_csv.php:55
 #: include/ext/import_account/include/impacc_csv.class.php:55

From e97f6ff385c476360602c31e8ce1224ca4080fbb Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 11 Nov 2020 21:32:41 +0100
Subject: [PATCH 182/257] rename upgrade18

---
 include/sql/patch/{ac-upgrade19.sql => ac-upgrade18.sql} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename include/sql/patch/{ac-upgrade19.sql => ac-upgrade18.sql} (100%)

diff --git a/include/sql/patch/ac-upgrade19.sql b/include/sql/patch/ac-upgrade18.sql
similarity index 100%
rename from include/sql/patch/ac-upgrade19.sql
rename to include/sql/patch/ac-upgrade18.sql

From 22b3512167542d196d073384b4029b7b3d103ed1 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 12 Nov 2020 08:54:11 +0100
Subject: [PATCH 183/257] Security

---
 include/export/export_fiche_detail_pdf.php | 10 +++++-----
 include/export/export_fiche_pdf.php        | 19 ++++++++++++-------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/include/export/export_fiche_detail_pdf.php b/include/export/export_fiche_detail_pdf.php
index de21a96ff..713de2af4 100644
--- a/include/export/export_fiche_detail_pdf.php
+++ b/include/export/export_fiche_detail_pdf.php
@@ -109,12 +109,12 @@ for ($e=0;$e<count($array);$e++)
             $diff_solde=bcsub($tot_deb,$tot_cred);
             if ( $diff_solde < 0 )
             {
-                $solde=" créditeur ";
+                $solde=" "._("créditeur")." ";
                 $diff_solde=bcmul($diff_solde,-1);
             }
             else
             {
-                 $solde=" débiteur ";
+                 $solde=" "._('débiteur')." ";
             }
             $str_diff_solde=sprintf("%12.2f €",$diff_solde);
 
@@ -129,7 +129,7 @@ for ($e=0;$e<count($array);$e++)
             /*
             * reset total and current_exercice
             */
-            $prog=0;
+            $progress=0;
             $current_exercice=$row['p_exercice'];
             $tot_deb=0;$tot_cred=0;    
             $pdf->SetFont('DejaVuCond','',8);
@@ -213,12 +213,12 @@ $str_credit=sprintf("% 12.2f €",$tot_cred);
 $diff_solde=$tot_deb-$tot_cred;
 if ( $diff_solde < 0 )
 {
-    $solde=" créditeur ";
+    $solde=" "._("créditeur")." ";
     $diff_solde*=-1;
 }
 else
 {
-    $solde=" débiteur ";
+    $solde=" "._('débiteur')." ";
 }
 $str_diff_solde=sprintf("%12.2f €",$diff_solde);
 
diff --git a/include/export/export_fiche_pdf.php b/include/export/export_fiche_pdf.php
index 03585e55a..567cf1727 100644
--- a/include/export/export_fiche_pdf.php
+++ b/include/export/export_fiche_pdf.php
@@ -48,23 +48,29 @@ $pdf->SetFont('DejaVu','BI',14);
 $pdf->write_cell(0,8,$name,0,1,'C');
 $pdf->SetTitle($name,1);
 $pdf->SetAuthor('NOALYSS');
+$http=new HttpInput();
+$start=$http->request('start');
+$end=$http->request('end');
+if ( isDate($start) == null || isDate ($end) == null ) 	 return;
+
 /* balance */
 if ( $_GET['histo'] == 4 )
 {
-    $fd=new Fiche_Def($cn,$_REQUEST['cat']);
+    $cat=$http->request('cat');
+    $fd=new Fiche_Def($cn,$cat);
     if ( $fd->hasAttribute(ATTR_DEF_ACCOUNT) == false )
     {
-        $pdf->write_cell(0,10, "Cette catégorie n'ayant pas de poste comptable n'a pas de balance");
+        $pdf->write_cell(0,10, _("Cette catégorie n'ayant pas de poste comptable n'a pas de balance"));
         //Save PDF to file
         $fDate=date('dmy-Hi');
         $pdf->Output("category-$fDate.pdf", 'D');
         exit;
     }
-    $aCard=$cn->get_array("select f_id,ad_value from fiche join fiche_Detail using (f_id)  where ad_id=1 and fd_id=$1 order by 2 ",array($_REQUEST['cat']));
+    $aCard=$cn->get_array("select f_id,ad_value from fiche join fiche_Detail using (f_id)  where ad_id=1 and fd_id=$1 order by 2 ",array($cat));
 
     if ( empty($aCard))
     {
-        $pdf->write_cell(0,10, "Aucune fiche trouvée");//Save PDF to file
+        $pdf->write_cell(0,10, _("Aucune fiche trouvée"));//Save PDF to file
         $fDate=date('dmy-Hi');
         $pdf->Output("category-$fDate.pdf", 'D');
         exit;
@@ -78,11 +84,10 @@ if ( $_GET['histo'] == 4 )
     $pdf->write_cell(20,7,'D/C',0,0,'C',0);
     $pdf->line_new();
     $idx=0;
+    $filter= " (j_date >= to_date('".$start."','DD.MM.YYYY') ".
+             " and  j_date <= to_date('".$end."','DD.MM.YYYY')) ";
     for ($i=0;$i < count($aCard);$i++)
     {
-        if ( isDate($_REQUEST['start']) == null || isDate ($_REQUEST['end']) == null ) 	 exit;
-        $filter= " (j_date >= to_date('".$_REQUEST['start']."','DD.MM.YYYY') ".
-                 " and  j_date <= to_date('".$_REQUEST['end']."','DD.MM.YYYY')) ";
         $oCard=new Fiche($cn,$aCard[$i]['f_id']);
         $solde=$oCard->get_solde_detail($filter);
         if ( $solde['debit'] == 0 && $solde['credit']==0) continue;

From 2e5b55fecc13ec80a9469f8f65229efa2a486227 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 12 Nov 2020 17:37:59 +0100
Subject: [PATCH 184/257] Version 8.0

---
 html/image/logo8000.png | Bin 0 -> 36368 bytes
 html/index.php          |   2 +-
 html/install.php        |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 html/image/logo8000.png

diff --git a/html/image/logo8000.png b/html/image/logo8000.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee5fc4bda583a521caad1eeb25b9faee0fd55e4d
GIT binary patch
literal 36368
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
TAK5nq_@AWc8<Bh=-B14qKmFSi

literal 0
HcmV?d00001

diff --git a/html/index.php b/html/index.php
index 172e15b81..b6ce4ccb4 100644
--- a/html/index.php
+++ b/html/index.php
@@ -191,7 +191,7 @@ if (isset ($_REQUEST['reconnect']) && isset ($_REQUEST['backurl'])) {
 }
 echo '
 
-<IMG SRC="image/logo7500.png" id="logo_id" alt="NOALYSS">
+<IMG SRC="image/logo8000.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 e08cbc3b1..efa5aadcd 100644
--- a/html/install.php
+++ b/html/install.php
@@ -83,7 +83,7 @@
 </head>
 <body>
 <p align="center">
-  <IMG SRC="image/logo7500.png" style="width: 30%;z-index:-1;position:fixed;top:30%;margin-left: 20%;opacity: 0.2" alt="NOALYSS">
+  <IMG SRC="image/logo8000.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>
 

From 110d903ac740ecb0bf977447e8c12a8ab5b3110f Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 12 Nov 2020 17:51:52 +0100
Subject: [PATCH 185/257] Follow-up : list , the name is a tip

---
 include/class/follow_up.class.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 0ce9e8f1a..9c78f7115 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -640,7 +640,7 @@ class Follow_Up
         //4
         $table->add(_('Groupe'), $url, "order by coalesce((select p_name from profile where p_id=ag_dest),'Aucun groupe')", "order by coalesce((select p_name from profile where p_id=ag_dest),'Aucun groupe') desc", 'dea', 'ded');
         //5
-        $table->add(_('Dest/Exp'), $url, 'order by name asc', 'order by name desc', 'ea', 'ed');
+        $table->add(_('Dest/Exp'), $url, 'order by qcode asc', 'order by qcode desc', 'ea', 'ed');
         //6
         $table->add(_('Titre'), $url, 'order by ag_title asc', 'order by ag_title desc', 'ta', 'td');
         //7
@@ -664,6 +664,7 @@ class Follow_Up
                 ag_title,dt_value,ag_ref, ag_priority,ag_state,
                 coalesce((select p_name from profile where p_id=ag_dest),'Aucun groupe') as dest,
                 (select ad_value from fiche_Detail where f_id=ag.f_id_dest and ad_id=1) as name,
+                (select ad_value from fiche_Detail where f_id=ag.f_id_dest and ad_id=23) as qcode,
                 array_to_string((select array_agg(t1.t_tag) from action_tags as a1 join tags as t1 on (a1.t_id=t1.t_id) where a1.ag_id=ag.ag_id ),',') as tags,
                 array_to_string((select array_agg(t1.t_color) from action_tags as a1 join tags as t1 on (a1.t_id=t1.t_id) where a1.ag_id=ag.ag_id ),',') as tags_color
             from action_gestion as ag
@@ -684,8 +685,10 @@ class Follow_Up
         $a_row=Database::fetch_all($Res);
 
         $r="";
+        $r.=HtmlInput::filter_table('mylist_tb', '1,2,3,4,5,6,7,8,9',1);
         $r.='<p>'.$bar.'</p>';
-        $r.='<table class="document">';
+        
+        $r.='<table id="mylist_tb" class="document">';
         $r.="<tr>";
         $r.='<th name="ag_id_td" style="display:none" >'.ICheckBox::toggle_checkbox('ag', 'list_ag_frm').'</th>';
         $r.='<th style="width:5.57%">'.$table->get_header(0).'</th>';
@@ -716,7 +719,7 @@ class Follow_Up
         //show the sub_action
         foreach ($a_row as $row)
         {
-            $href='<A class="document" HREF="'.$p_base.HtmlInput::get_to_string(array("closed_action", "remind_date_end", "remind_date", "sag_ref", "only_internal", "state", "gDossier", "qcode", "ag_dest_query", "action_query", "tdoc", "date_start", "date_end", "hsstate", "searchtag", "ac"), "").'&sa=detail&ag_id='.$row['ag_id'].'" title="detail">';
+            $href='<A class="document" HREF="'.$p_base.HtmlInput::get_to_string(array("closed_action", "remind_date_end", "remind_date", "sag_ref", "only_internal", "state", "gDossier", "qcode", "ag_dest_query", "action_query", "tdoc", "date_start", "date_end", "hsstate", "searchtag", "ac"), "").'&sa=detail&ag_id='.$row['ag_id'].'" title="'.$row['name'].'">';
             $i++;
             $tr=($i%2==0)?'even':'odd';
             if ($row['ag_priority']<2)
@@ -738,18 +741,13 @@ class Follow_Up
             $r.="<td>".$href.smaller_date($row['my_remind']).'</a>'."</td>";
             $r.="<td>".$href.$row['ag_ref'].'</a>'."</td>";
             // Expediteur
-            $fexp=new Fiche($this->db);
-            $fexp->id=$row['f_id_dest'];
-            $qcode_dest=$fexp->strAttribut(ATTR_DEF_QUICKCODE);
-
-            $qexp=($qcode_dest==NOTFOUND)?"Interne":$qcode_dest;
-            $jsexp=sprintf("javascript:showfiche('%s')", $qexp);
-            if ($qexp!='Interne')
+            if ($row['qcode']!='')
             {
-                $r.="<td>$href".$qexp." : ".$fexp->getName().'</a></td>';
+                $jsexp=sprintf("javascript:showfiche('%s')", $row['qcode']);
+                $r.="<td>$href".$row['qcode'].'</a></td>';
             }
             else
-                $r.="<td>$href Interne </a></td>";
+                $r.="<td></td>";
 
              /*
              * State

From 8e4aa4654374e803c16b73857bb7c08224251a13 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 12 Nov 2020 18:00:34 +0100
Subject: [PATCH 186/257] ANCGL : export CSV add the date of payment

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

diff --git a/include/class/anc_grandlivre.class.php b/include/class/anc_grandlivre.class.php
index d8d7991fd..f6f8aade9 100644
--- a/include/class/anc_grandlivre.class.php
+++ b/include/class/anc_grandlivre.class.php
@@ -116,6 +116,7 @@ class Anc_GrandLivre extends Anc_Print
         $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,
 	case when j_poste is null and b.f_id is not null then
         (select ad_value from fiche_detail where fiche_detail.f_id=b.f_id and ad_id=".ATTR_DEF_ACCOUNT.")
             when j_poste is not null then
@@ -343,6 +344,7 @@ class Anc_GrandLivre extends Anc_Print
         $aheader=array();
         $aheader[]=array("title"=>'Imp. Analytique','type'=>'string');
         $aheader[]=array("title"=>'Date','type'=>'string');
+        $aheader[]=array("title"=>'Date Pay','type'=>'string');
         $aheader[]=array("title"=>'Poste','type'=>'string');
         $aheader[]=array("title"=>'Quick_Code','type'=>'string');
         $aheader[]=array("title"=>'libelle','type'=>'string');

From 82efa19bd0ab40f42f45922bc0fc55887f6e0683 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 12 Nov 2020 18:00:55 +0100
Subject: [PATCH 187/257] Security remove direct access to $_REQUEST

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

diff --git a/include/class/anc_print.class.php b/include/class/anc_print.class.php
index dedefcb2a..9f72e499c 100644
--- a/include/class/anc_print.class.php
+++ b/include/class/anc_print.class.php
@@ -62,19 +62,20 @@ class Anc_Print
      */
     function get_request()
     {
+        $http=new HttpInput();
         if ( isset($_REQUEST['from']))
-            $this->from=$_REQUEST['from'];
+            $this->from=$http->request('from');
 
         if ( isset($_REQUEST['to']))
-            $this->to=$_REQUEST['to'];
+            $this->to=$http->request('to');
 
         if ( isset($_REQUEST['from_poste']))
-            $this->from_poste=$_REQUEST['from_poste'];
+            $this->from_poste=$http->request('from_poste');
 
         if ( isset($_REQUEST['to_poste']))
-            $this->to_poste=$_REQUEST['to_poste'];
+            $this->to_poste=$http->request('to_poste');
         if ( isset($_REQUEST['pa_id']))
-            $this->pa_id=$_REQUEST['pa_id'];
+            $this->pa_id=$http->request('pa_id');
         else
             $this->pa_id="";
 

From 93723987b45d9f3c60d98353b6a1f9b2af94956b Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 12 Nov 2020 18:08:33 +0100
Subject: [PATCH 188/257] IText require , used for admin and password

---
 html/install.php            | 12 +++++++-----
 include/lib/config_file.php |  2 ++
 include/lib/itext.class.php | 16 ++++++++++++----
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/html/install.php b/html/install.php
index efa5aadcd..821df7a8c 100644
--- a/html/install.php
+++ b/html/install.php
@@ -260,13 +260,15 @@ if (isset($_POST['save_config'])) {
   // If conx successfull save the file or display it
   // -----
   if ( $err == 0 && $cnx !== false ) {
-       echo '<h1>'._('Important').'</h1>';
-       echo '<h2 class="warning">',_("Voici l'utilisateur et mot de passe de l'utilisateur administrateur de Noalyss , "
+      echo '<div style="border:red 1px solid">';
+       echo '<h1 style="padding-top:0px;margin-top:0px;background-color:orangered">'._('Important').'</h1>';
+       echo '<p style="padding:10px">',_("Voici l'utilisateur et mot de passe de l'utilisateur administrateur de Noalyss , "
                . " il a tous les droits et a accès à tout."
                . " Connectez-vous avec ses identifiants et changer le mot de passe dans préférence (en haut à droit)"),
-	 "</h2>";
-       echo '<p style="font-size:120%">'._('Utilisateur administrateur'),' ','<span style="color:red"> ',$cadmin,'</span>','</p>';
-       echo '<p style="font-size:120%">',_('Mot de passe'),'<span style="color:red"> '.$cpassword_admin.' </span>','</p>';
+	 "</p>";
+       echo '<p style="padding:10px;font-size:120%">'._('Utilisateur administrateur'),' ','<span style="color:red"> ',$cadmin,'</span>','</p>';
+       echo '<p style="padding:10px;font-size:120%">',_('Mot de passe'),'<span style="color:red"> '.$cpassword_admin.' </span>','</p>';
+       echo '</div>';
       // Create the db
       if (is_writable(NOALYSS_INCLUDE)) { 
         $url=config_file_create($_POST,1,$os); 
diff --git a/include/lib/config_file.php b/include/lib/config_file.php
index 3f7c7e62a..b70da1715 100644
--- a/include/lib/config_file.php
+++ b/include/lib/config_file.php
@@ -94,6 +94,7 @@ function config_file_form($p_array=null)
     $ichost=new IText("chost",$chost);
     
     $icadmin=new IText('cadmin',$cadmin);
+    $icadmin->set_require(true);
     /*
      * For version MONO
      */
@@ -109,6 +110,7 @@ function config_file_form($p_array=null)
     
     $icpassword_admin=new IText('cpassword_admin');
     $icpassword_admin->value=$cpassword_admin;
+    $icpassword_admin->set_require(true);
     
     require NOALYSS_TEMPLATE.'/template_config_form.php';
 }
diff --git a/include/lib/itext.class.php b/include/lib/itext.class.php
index 0b813aa46..e74c23805 100644
--- a/include/lib/itext.class.php
+++ b/include/lib/itext.class.php
@@ -36,6 +36,7 @@ class IText extends HtmlInput
         $this->extra="";
         $this->style=' class="input_text" ';
         $this->autofocus=false;
+        $this->require=false;
     }
     /*!\brief show the html  input of the widget*/
     public function input($p_name=null,$p_value=null)
@@ -48,11 +49,12 @@ class IText extends HtmlInput
         $t= 'title="'.$this->title.'" ';
         $autofocus=($this->autofocus)?" autofocus ":"";
         $this->value=str_replace('"','',$this->value);
+        $require=($this->require)?"required":"";
         if ( ! isset ($this->css_size))
         {
             
             $r=  sprintf('<INPUT TYPE="TEXT" %s id="%s" name="%s" value="%s" placeholder="%s" title="%s"
-                     Size="%s"  %s %s  %s>
+                     Size="%s"  %s %s  %s %s>
                     ',$this->style,
                     $this->id,
                     $this->name,
@@ -62,11 +64,12 @@ class IText extends HtmlInput
                     $this->size,
                     $this->javascript,
                     $this->extra,
-                    $autofocus
+                    $autofocus,
+                    $require
                     );
         } else {
             $r=  sprintf('<INPUT TYPE="TEXT" %s id="%s" name="%s" value="%s" placeholder="%s" title="%s"
-                     style="width:%s;"  %s %s  %s>
+                     style="width:%s;"  %s %s  %s %s>
                     ',$this->style,
                     $this->id,
                     $this->name,
@@ -76,7 +79,8 @@ class IText extends HtmlInput
                     $this->css_size,
                     $this->javascript,
                     $this->extra,
-                    $autofocus
+                    $autofocus,
+                    $require
                     );
         }
 
@@ -115,6 +119,10 @@ class IText extends HtmlInput
         return $r;
 
     }
+    function set_require($p_boolean)
+    {
+        $this->require=$p_boolean;
+    }
     static public function test_me()
     {
     }

From 0f3f185dbc998ec6da261dbc52159d18d19f9da9 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 12 Nov 2020 18:21:46 +0100
Subject: [PATCH 189/257] typo

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

diff --git a/include/ajax/ajax_tag_detail.php b/include/ajax/ajax_tag_detail.php
index 5e12c7bb0..7f2a9cc27 100644
--- a/include/ajax/ajax_tag_detail.php
+++ b/include/ajax/ajax_tag_detail.php
@@ -16,7 +16,7 @@ $data=$tag->get_data();
 $data->t_id=$http->get("tag","number");
 if ($data->t_id == -1 &&  $g_user->check_action(TAGADD) == 0 ) return;
 $data->load();
-echo HtmlInput::title_box(_("Détail du dossier ou étiquette"), "tag_div","close","","y");
+echo HtmlInput::title_box(_("Etiquette"), "tag_div","close","","y");
 
 ?>
 <?php

From 502eed256b62086ddfa0f91cb8cdfa1309babe63 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 12 Nov 2020 21:20:16 +0100
Subject: [PATCH 190/257] Small typo

---
 html/js/ajax_fiche.js                   |  2 +-
 include/ajax/ajax_tag_remove_action.php |  6 +++---
 include/ajax/ajax_tag_save.php          | 12 +++++++-----
 include/user_detail.inc.php             |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/html/js/ajax_fiche.js b/html/js/ajax_fiche.js
index f46d8f270..e20f84921 100644
--- a/html/js/ajax_fiche.js
+++ b/html/js/ajax_fiche.js
@@ -226,7 +226,7 @@ function ajax_success_saldo(request,json)
 * \param ctl : id of the div to show
 * \param page
 */
-function ajax_card(p_dossier,f_id,p_operation,ctl,page)
+function _saajax_card(p_dossier,f_id,p_operation,ctl,page)
 {
     $(ctl).show();
     var queryString="gDossier="+p_dossier+"&f_id="+f_id+"&op="+p_operation+"&p="+page+'&ctl='+ctl;
diff --git a/include/ajax/ajax_tag_remove_action.php b/include/ajax/ajax_tag_remove_action.php
index 3f49b21c7..46f4218aa 100644
--- a/include/ajax/ajax_tag_remove_action.php
+++ b/include/ajax/ajax_tag_remove_action.php
@@ -22,11 +22,11 @@
  *@brief remove a tag from an event in the follow up
  */
 if ( !defined ('ALLOWED') )  die('Appel direct ne sont pas permis');
-
+$http=new HttpInput();
 $fl=new Follow_Up($cn);
-$fl->ag_id=$_REQUEST['ag_id'];
+$fl->ag_id=$http->request('ag_id');
 
-if ( $g_user->can_write_action($fl->ag_id) == TRUE ) $fl->tag_remove($_REQUEST['t_id']);
+if ( $g_user->can_write_action($fl->ag_id) == TRUE ) $fl->tag_remove($http->request('t_id'));
 
 ob_start();
 
diff --git a/include/ajax/ajax_tag_save.php b/include/ajax/ajax_tag_save.php
index ade69812e..d52b39614 100644
--- a/include/ajax/ajax_tag_save.php
+++ b/include/ajax/ajax_tag_save.php
@@ -36,18 +36,20 @@ if ( $op == "tag_activate")
     $tag=new Tag($cn, $tag_id);
     $return=array();
     $id=sprintf("tag_onoff%d",$tag_id);
-    if ( $tag->data->getp('t_actif') == 'Y')
+    $data=$tag->get_data();
+    if ( $data->getp('t_actif') == 'Y')
     {
-        $tag->data->t_actif='N';
-        $tag->data->save();
+        $data->t_actif='N';
+        $data->save();
         $return['code']='&#xf204;';
         $return['style']='color:red';
     } else {
-        $tag->data->t_actif='Y';
-        $tag->data->save();
+        $data->t_actif='Y';
+        $data->save();
         $return['code']='&#xf205;';
         $return['style']='color:green';
     }
+    $tag->set_data($data);
     header("Content-type: text/json; charset: utf8",true);
     echo json_encode($return);
 }
diff --git a/include/user_detail.inc.php b/include/user_detail.inc.php
index c0c72bdb3..b39e988d1 100644
--- a/include/user_detail.inc.php
+++ b/include/user_detail.inc.php
@@ -109,7 +109,7 @@ else if ($sbaction == "delete")
             User::remove_inexistant_user($a_dossier[$i]['dos_id']);
     }
     User::audit_admin(sprintf('DELETE USER %s %s',$uid,$auser['use_login']));
-    echo "<H2 class=\"info\">";
+ZZ    echo "<H2 class=\"info\">";
     printf (_("Utilisateur %s %s est effacé"),$http->post('fname'),$http->post('lname')) ;
     echo " </H2>";
     require_once NOALYSS_INCLUDE.'/lib/iselect.class.php';

From 2ffd12586226ea155809b8421b7a681daafe599c Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 12 Nov 2020 22:11:28 +0100
Subject: [PATCH 191/257] Correct language for Chrome

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

diff --git a/include/lib/message_javascript.php b/include/lib/message_javascript.php
index cebdf2245..0046a6e3d 100644
--- a/include/lib/message_javascript.php
+++ b/include/lib/message_javascript.php
@@ -62,7 +62,7 @@ content[30]="<?php echo escape_xml(_("Peut contenir une information telle que le
 content[31]="<?php echo escape_xml(_("Peut contenir un numéro de bon de commande"))?>";
 // Because we are using HTML tag , we cannot escape and we must be careful with quote and double-quote, the best
 // is to avoid them
-content[32]="<?php echo _("<h3>        Remarque  : choix possibles    </h3>    <ul>        <li> Détail opérations ne donne pas le même résultat si on regarde tous les journaux ou un journal de type ACH ou VEN</li>        <li> Liste opérations ne donne pas le même résultat si on regarde tous les journaux ou un journal de type ACH ou VEN</li>        <li> Journaux VEN ou ACH en mode détail opérations donne les détails des factures, y compris les montants, TVA et quantité par article</li>        <li> Journaux VEN ou ACH en mode liste opérations donne pour chaque opération, le total de la TVA, ND, ...</li>    </ul>")?>";
+content[32]=_('Le résultat peut changer en fonction du type de journal');
 content[33]="<?php echo escape_xml(_("le type vaut :<ul>	<li> ME pour Menu</li>	<li> PR pour les impressions </li>	<li> PL pour les plugins</li>	<li> SP pour des valeurs spéciales</li>	</ul>"))?>";
 content[34]="<?php echo escape_xml(_("Cliquez sur le code AD pour ouvrir le menu dans un nouvel onglet"))?>";
 content[35]="<?php echo escape_xml(_("Cliquez sur le chemin pour ouvrir le menu"))?>";

From 52d0aad533654f857af9bd888fdeb3622569af4d Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 13 Nov 2020 09:00:18 +0100
Subject: [PATCH 192/257] Translate , make failed chrome because of HTML in
 javascript message

---
 html/lang/en_US/LC_MESSAGES/messages.po |  621 ++++-
 html/lang/messages.po                   | 3227 +++++++++++++++++------
 html/lang/nl_NL/LC_MESSAGES/messages.po |  727 +++--
 include/database.item.php               |    2 +-
 include/lib/message_javascript.php      |    7 +-
 5 files changed, 3533 insertions(+), 1051 deletions(-)

diff --git a/html/lang/en_US/LC_MESSAGES/messages.po b/html/lang/en_US/LC_MESSAGES/messages.po
index df2bcf167..e03896d1a 100644
--- a/html/lang/en_US/LC_MESSAGES/messages.po
+++ b/html/lang/en_US/LC_MESSAGES/messages.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NOALYSS 672\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-04 17:42+0100\n"
-"PO-Revision-Date: 2020-11-04 18:01+0100\n"
+"POT-Creation-Date: 2020-11-12 22:12+0100\n"
+"PO-Revision-Date: 2020-11-13 08:59+0100\n"
 "Last-Translator: dany <danydb@noalyss.eu>\n"
 "Language-Team: French <kde-i18n-doc@kde.org>\n"
 "Language: en_US\n"
@@ -30,9 +30,10 @@ msgid "  Periode : "
 msgstr "Period"
 
 #: include/export/export_poste_detail_pdf.php:60
+#: include/export/export_poste_detail_pdf.php:61
 #, php-format
 msgid "  Période : %s %s"
-msgstr "Periode  : %s %s"
+msgstr "Period  : %s %s"
 
 #: include/ext/import_card/include/template/input_file.php:47
 #: include/ext/import_card/include/template/input_format.php:39
@@ -79,12 +80,13 @@ msgstr "Grid 01: Operations for which the VAT is due (6%)"
 #: include/ajax/ajax_card.php:456 include/ajax/ajax_card.php:457
 #: include/ajax/ajax_card.php:490 include/ajax/ajax_card.php:494
 #: include/ajax/ajax_card.php:495 include/ajax/ajax_card.php:571
+#: include/ajax/ajax_card.php:570
 msgid " Banque"
 msgstr "Bank"
 
 #: include/dossier.inc.php:111 include/dossier.inc.php:132
 #: include/dossier.inc.php:143 include/dossier.inc.php:146
-#: include/dossier.inc.php:151
+#: include/dossier.inc.php:151 include/dossier.inc.php:153
 msgid " Base de donnée "
 msgstr "Database"
 
@@ -93,6 +95,7 @@ msgstr "Database"
 #: include/template/ledger_detail_bottom.php:143
 #: include/template/ledger_detail_bottom.php:148
 #: include/template/ledger_detail_bottom.php:153
+#: include/template/ledger_detail_bottom.php:154
 msgid " Bon de commande"
 msgstr "Customer order"
 
@@ -100,6 +103,8 @@ msgstr "Customer order"
 #: include/export/export_poste_detail_pdf.php:225
 #: include/export/export_poste_detail_pdf.php:128
 #: include/export/export_poste_detail_pdf.php:236
+#: include/export/export_poste_detail_pdf.php:129
+#: include/export/export_poste_detail_pdf.php:237
 msgid " C "
 msgstr "C"
 
@@ -133,13 +138,15 @@ msgstr "VAT code"
 #: include/export/export_poste_detail_pdf.php:230
 #: include/export/export_poste_detail_pdf.php:133
 #: include/export/export_poste_detail_pdf.php:241
+#: include/export/export_poste_detail_pdf.php:134
+#: include/export/export_poste_detail_pdf.php:242
 msgid " D "
 msgstr "D"
 
 #: include/ajax_mod_periode.php:55 include/ajax/ajax_mod_periode.php:55
 #: include/ajax/ajax_periode.php:171 include/class/periode.class.php:702
 #: include/class/periode.class.php:704 include/class/periode.class.php:706
-#: include/class/periode.class.php:707
+#: include/class/periode.class.php:707 include/class/periode.class.php:708
 msgid " Début période : "
 msgstr "Start periode"
 
@@ -151,6 +158,7 @@ msgstr "Sorry but this period is used"
 #: include/ajax/ajax_card.php:460 include/ajax/ajax_card.php:461
 #: include/ajax/ajax_card.php:494 include/ajax/ajax_card.php:498
 #: include/ajax/ajax_card.php:499 include/ajax/ajax_card.php:575
+#: include/ajax/ajax_card.php:574
 msgid " Employé ou administrateur"
 msgstr "Manager or Employee"
 
@@ -165,16 +173,16 @@ msgstr "Error in formula"
 #: include/ajax_mod_periode.php:57 include/ajax/ajax_mod_periode.php:57
 #: include/ajax/ajax_periode.php:173 include/class/periode.class.php:704
 #: include/class/periode.class.php:706 include/class/periode.class.php:708
-#: include/class/periode.class.php:709
+#: include/class/periode.class.php:709 include/class/periode.class.php:710
 msgid " Exercice : "
 msgstr "Exercise"
 
 #: include/ajax_mod_periode.php:56 include/ajax/ajax_mod_periode.php:56
 #: include/ajax/ajax_periode.php:172 include/class/periode.class.php:703
 #: include/class/periode.class.php:705 include/class/periode.class.php:707
-#: include/class/periode.class.php:708
+#: include/class/periode.class.php:708 include/class/periode.class.php:709
 msgid " Fin période : "
-msgstr "End Periode :"
+msgstr "End Period :"
 
 #: include/user_menu.php:147 include/user_menu.php:151
 #: include/lib/user_menu.php:160 include/lib/user_menu.php:173
@@ -303,7 +311,7 @@ msgstr ""
 "thanks a package , compile one, read carefully instructions to migrate your "
 "databases"
 
-#: html/install.php:462
+#: html/install.php:462 html/install.php:468
 msgid ""
 " Vous devez absolument utiliser au minimum une version 9.5 de PostGresql, si "
 "votre distribution n'en\n"
@@ -326,7 +334,7 @@ msgstr "to"
 #: include/ajax/ajax_card.php:447 include/ajax/ajax_card.php:448
 #: include/ajax/ajax_card.php:449 include/ajax/ajax_card.php:482
 #: include/ajax/ajax_card.php:486 include/ajax/ajax_card.php:487
-#: include/ajax/ajax_card.php:563
+#: include/ajax/ajax_card.php:563 include/ajax/ajax_card.php:562
 msgid " d'administration"
 msgstr "of administration"
 
@@ -335,7 +343,7 @@ msgstr "of administration"
 #: include/ajax/ajax_card.php:439 include/ajax/ajax_card.php:440
 #: include/ajax/ajax_card.php:441 include/ajax/ajax_card.php:474
 #: include/ajax/ajax_card.php:478 include/ajax/ajax_card.php:479
-#: include/ajax/ajax_card.php:555
+#: include/ajax/ajax_card.php:555 include/ajax/ajax_card.php:554
 msgid " de clients"
 msgstr "of customers"
 
@@ -344,6 +352,7 @@ msgstr "of customers"
 #: include/ajax/ajax_card.php:452 include/ajax/ajax_card.php:453
 #: include/ajax/ajax_card.php:486 include/ajax/ajax_card.php:490
 #: include/ajax/ajax_card.php:491 include/ajax/ajax_card.php:567
+#: include/ajax/ajax_card.php:566
 msgid " de contacts"
 msgstr "of contacts"
 
@@ -352,7 +361,7 @@ msgstr "of contacts"
 #: include/ajax/ajax_card.php:443 include/ajax/ajax_card.php:444
 #: include/ajax/ajax_card.php:445 include/ajax/ajax_card.php:478
 #: include/ajax/ajax_card.php:482 include/ajax/ajax_card.php:483
-#: include/ajax/ajax_card.php:559
+#: include/ajax/ajax_card.php:559 include/ajax/ajax_card.php:558
 msgid " de fournisseurs"
 msgstr "of suppliers"
 
@@ -390,7 +399,7 @@ msgstr "records. The number of found records is "
 
 #: include/dossier.inc.php:94 include/dossier.inc.php:115
 #: include/dossier.inc.php:126 include/dossier.inc.php:129
-#: include/dossier.inc.php:134
+#: include/dossier.inc.php:134 include/dossier.inc.php:136
 msgid " est une année invalide"
 msgstr "is an invalid year"
 
@@ -405,7 +414,7 @@ msgstr "and"
 #: include/class_anc_print.php:137 include/class_anc_print.php:179
 #: include/class_anc_print.php:181 include/class/class_anc_print.php:181
 #: include/class/class_anc_print.php:183 include/class/anc_print.class.php:177
-#: include/class/anc_print.class.php:183
+#: include/class/anc_print.class.php:183 include/class/anc_print.class.php:184
 msgid " et l'activité "
 msgstr "and activity"
 
@@ -767,6 +776,7 @@ msgid "A partir du mois de"
 msgstr "From"
 
 #: include/class/acc_ledger_search.class.php:603
+#: include/class/acc_ledger_search.class.php:626
 msgid "ALS01 Etat inconnu"
 msgstr "ALS01 unknown status"
 
@@ -915,6 +925,7 @@ msgstr "all access"
 #: include/class/operation_predef_mtable.class.php:172
 #: include/database.item.php:3 include/database.item.php:67
 #: include/database.item.php:219 include/database.item.php:231
+#: include/class/acc_ledger_search.class.php:1211
 msgid "Achat"
 msgstr "Purchase"
 
@@ -929,6 +940,7 @@ msgstr "Acquisition year"
 #: include/class/acc_plan_mtable.class.php:49
 #: include/template/tag_detail.php:15
 #: include/class/acc_plan_mtable.class.php:55 include/template/tag_list.php:20
+#: include/user_detail.inc.php:163 include/user.inc.php:131
 msgid "Actif"
 msgstr "Active"
 
@@ -1010,7 +1022,9 @@ msgstr "Late"
 #: include/ajax/ajax_card.php:220 include/ajax/ajax_card.php:402
 #: include/ajax/ajax_card.php:603 include/ajax/ajax_card.php:658
 #: include/ajax/ajax_card.php:673 include/ajax/ajax_card.php:702
-#: include/ajax/ajax_card.php:738
+#: include/ajax/ajax_card.php:738 include/ajax/ajax_card.php:602
+#: include/ajax/ajax_card.php:657 include/ajax/ajax_card.php:672
+#: include/ajax/ajax_card.php:701 include/ajax/ajax_card.php:737
 msgid "Action interdite"
 msgstr "Forbidden"
 
@@ -1064,6 +1078,7 @@ msgstr "Action Management"
 #: include/template/detail-action.php:191
 #: include/template/detail-action.php:166
 #: include/template/detail-action.php:173
+#: include/template/detail-action.php:175
 msgid "Actions concernées"
 msgstr "Concerned operations"
 
@@ -1131,11 +1146,13 @@ msgstr "Refresh"
 #: include/param_sec.inc.php:99 include/param_sec.inc.php:158
 #: html/user_login.php:115 include/database.item.php:126
 #: include/param_sec.inc.php:100 include/param_sec.inc.php:163
+#: include/user_detail.inc.php:186 include/user.inc.php:175
 msgid "Administrateur"
 msgstr "Administrator"
 
 #: include/template/template_config_form.php:56
 #: include/template/template_config_form.php:57
+#: include/template/template_config_form.php:38
 msgid "Administrateur de noalyss"
 msgstr "Noalyss Administrators"
 
@@ -1181,6 +1198,7 @@ msgstr "Address"
 #: include/template/template_config_form.php:55
 #: include/template/template_config_form.php:63
 #: include/template/template_config_form.php:73
+#: include/template/template_config_form.php:104
 msgid "Adresse Serveur Postgresql"
 msgstr "Postgresql Host"
 
@@ -1249,6 +1267,7 @@ msgid "Agenda, présentation du suivi sous forme d'agenda "
 msgstr "Calendar, display the follow up like a calendar"
 
 #: include/template/template_config_form.php:91
+#: include/template/template_config_form.php:84
 msgid "Aide"
 msgstr "Help"
 
@@ -1294,7 +1313,8 @@ msgstr "Help "
 #: include/class/operation_predef_mtable.class.php:170
 #: include/template/followup-show-action-add.php:61
 #: include/lib/manage_table_sql.class.php:663
-#: include/lib/manage_table_sql.class.php:704
+#: include/lib/manage_table_sql.class.php:704 include/user_detail.inc.php:283
+#: include/class/acc_ledger_search.class.php:266
 msgid "Ajout"
 msgstr "Add"
 
@@ -1312,6 +1332,7 @@ msgid "Ajout Menu"
 msgstr "Add Menu"
 
 #: include/user.inc.php:73 include/user.inc.php:74 include/user.inc.php:76
+#: include/user.inc.php:78
 msgid "Ajout Utilisateur"
 msgstr "Add users"
 
@@ -1371,6 +1392,7 @@ msgstr "Add item"
 #: include/lib/html_input.class.php:1037 include/lib/html_input.class.php:1095
 #: include/lib/html_input.class.php:1096 include/lib/html_input.class.php:1111
 #: include/lib/html_input.class.php:1112 include/lib/html_input.class.php:1145
+#: include/class/follow_up_other_concerned.class.php:135
 msgid "Ajout autres"
 msgstr "Adding others"
 
@@ -1388,6 +1410,7 @@ msgstr "Add materiel to amortize"
 #: include/dossier.inc.php:242 include/dossier.inc.php:264
 #: include/dossier.inc.php:298 include/dossier.inc.php:299
 #: include/dossier.inc.php:302 include/dossier.inc.php:307
+#: include/dossier.inc.php:310
 msgid "Ajout d'un dossier"
 msgstr "Add folder"
 
@@ -1406,6 +1429,7 @@ msgstr "Add an exercice"
 #: include/template/periode_add_exercice.php:21
 #: include/template/periode_add_exercice.php:22
 #: include/template/periode_add_exercice.php:74
+#: include/template/periode_add_exercice.php:76
 msgid "Ajout d'un exercice comptable"
 msgstr "Add an accounting year"
 
@@ -1450,7 +1474,7 @@ msgid "Ajout d'un poste analytique"
 msgstr "Analytical group"
 
 #: include/ajax_tag_list.php:30 include/ajax/ajax_tag_list.php:30
-#: include/ajax/ajax_tag_list.php:34
+#: include/ajax/ajax_tag_list.php:34 include/ajax/ajax_operation_tag.php:65
 msgid "Ajout d'un tag"
 msgstr "Add a tag"
 
@@ -1587,14 +1611,18 @@ msgstr "Add forecast"
 #: include/periode.inc.php:113 include/class/periode.class.php:687
 #: include/class/periode.class.php:689 include/class/periode.class.php:691
 #: include/class/periode.class.php:692 include/periode.inc.php:114
+#: include/class/periode.class.php:693
 msgid "Ajout période"
 msgstr "Add periode"
 
 #: include/user.inc.php:109 include/user.inc.php:110 include/user.inc.php:112
+#: include/user.inc.php:114
 msgid "Ajout utilisateur"
 msgstr "Add users"
 
 #: include/class/follow_up.class.php:1535
+#: include/class/follow_up.class.php:1567
+#: include/class/tag_operation.class.php:69
 msgid "Ajout étiquette"
 msgstr "Add tag"
 
@@ -1615,7 +1643,7 @@ msgstr "Add an Action here"
 #: include/dossier.inc.php:214 include/modele.inc.php:261
 #: include/dossier.inc.php:217 include/dossier.inc.php:222
 #: include/modele.inc.php:262 include/modele.inc.php:263
-#: include/ajax/ajax_add_concerned_card.php:138
+#: include/ajax/ajax_add_concerned_card.php:138 include/dossier.inc.php:225
 msgid "Ajouter"
 msgstr "Add"
 
@@ -1631,6 +1659,7 @@ msgstr "Add accounting years"
 #: include/dossier.inc.php:159 include/dossier.inc.php:179
 #: include/dossier.inc.php:213 include/dossier.inc.php:214
 #: include/dossier.inc.php:217 include/dossier.inc.php:222
+#: include/dossier.inc.php:225
 msgid "Ajouter un dossier"
 msgstr "Add a folder"
 
@@ -1649,6 +1678,7 @@ msgstr "Add a repository"
 #: include/template/detail-action.php:480
 #: include/template/detail-action.php:478
 #: include/template/detail-action.php:491
+#: include/template/detail-action.php:504
 msgid "Ajouter un fichier"
 msgstr "Add an attachment"
 
@@ -1837,6 +1867,7 @@ msgstr "Cancel"
 #: include/dossier.inc.php:303 include/dossier.inc.php:339
 #: include/dossier.inc.php:340 include/dossier.inc.php:356
 #: include/dossier.inc.php:361 include/template/periode_add_exercice.php:41
+#: include/dossier.inc.php:364
 msgid "Année"
 msgstr "Year"
 
@@ -1878,6 +1909,7 @@ msgstr "Year must be between %s and%s"
 #: include/ext/amortis/include/am_card.class.php:235
 #: include/template/periode_add_exercice.php:92
 #: include/ext/amortis/include/am_card.class.php:267
+#: include/template/periode_add_exercice.php:101
 msgid "Année invalide"
 msgstr "Invalid year"
 
@@ -1898,6 +1930,7 @@ msgstr "Anomaly for the accounting"
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
 #: include/class/periode.class.php:652 include/class/periode.class.php:653
+#: include/class/periode.class.php:654
 msgid "Août"
 msgstr "August"
 
@@ -1917,7 +1950,7 @@ msgstr "Invalid call"
 msgid "Appel invalide Service_After_Sale "
 msgstr "Invalid call SAS"
 
-#: include/upgrade.inc.php:34
+#: include/upgrade.inc.php:34 include/template/template_config_form.php:32
 msgid "Application"
 msgstr "Appplication"
 
@@ -2067,6 +2100,7 @@ msgstr ""
 #: include/template/template_config_form.php:80
 #: include/template/template_config_form.php:88
 #: include/template/template_config_form.php:100
+#: include/template/template_config_form.php:118
 msgid ""
 "Attention : si vous installez sous windows n'utilisez pas le \\ mais plutôt "
 "le / dans les nom de répertoire (càd les chemins ou path)"
@@ -2125,6 +2159,7 @@ msgstr "Warning the parameter effective_cache_size is %s instead of 1000"
 #: html/install.php:503 html/install.php:509 html/install.php:501
 #: html/install.php:507 html/install.php:469 html/install.php:444
 #: html/install.php:450 html/install.php:453 html/install.php:502
+#: html/install.php:508
 #, php-format
 msgid "Attention le paramètre effective_cache_size est de %s au lieu de 1000"
 msgstr "Warning the parameter effective_cache_size is %s instead of 1000"
@@ -2250,7 +2285,8 @@ msgstr "mandatory attribute"
 msgid "Attribut à ajouter"
 msgstr "Attribute to add"
 
-#: include/template/action_search.php:150
+#: include/template/action_search.php:150 include/template/ledger_search.php:98
+#: include/template/action_search.php:152
 msgid "Au moins une étiquette"
 msgstr "At least one tag"
 
@@ -2266,6 +2302,7 @@ msgstr "At least one tag"
 #: include/class/follow_up.class.php:1219
 #: include/class/follow_up.class.php:1220
 #: include/class/follow_up.class.php:1137
+#: include/class/follow_up.class.php:1169
 msgid "Aucun"
 msgstr "No"
 
@@ -2409,6 +2446,9 @@ msgstr "No record found"
 #: include/class/follow_up.class.php:775 include/class/follow_up.class.php:688
 #: include/class/acc_ledger_search.class.php:763
 #: include/class/acc_ledger_search.class.php:1032
+#: include/class/follow_up.class.php:711
+#: include/class/acc_ledger_search.class.php:786
+#: include/class/acc_ledger_search.class.php:1055
 msgid "Aucun enregistrement trouvé"
 msgstr "No record found"
 
@@ -2416,7 +2456,7 @@ msgstr "No record found"
 #: html/ajax_ledger.php:277 html/ajax_ledger.php:279
 #: include/ajax/ajax_ledger.php:256 include/ajax/ajax_ledger.php:259
 #: include/ajax/ajax_ledger.php:261 include/ajax/ajax_ledger.php:265
-#: include/ajax/ajax_ledger.php:266
+#: include/ajax/ajax_ledger.php:266 include/ajax/ajax_ledger.php:267
 msgid "Aucun fichier"
 msgstr "No file"
 
@@ -2454,6 +2494,7 @@ msgstr "no data"
 
 #: include/dossier.inc.php:318 include/dossier.inc.php:319
 #: include/dossier.inc.php:322 include/dossier.inc.php:327
+#: include/dossier.inc.php:330
 msgid "Aucun modèle (dossier vide, devant être restauré manuellement)"
 msgstr "No template"
 
@@ -2477,7 +2518,7 @@ msgstr "No analytical plan defined"
 
 #: include/class_anc_print.php:93 include/class_anc_print.php:94
 #: include/class/class_anc_print.php:94 include/class/class_anc_print.php:96
-#: include/class/anc_print.class.php:96
+#: include/class/anc_print.class.php:96 include/class/anc_print.class.php:97
 msgid "Aucun plan défini"
 msgstr "No plane defined"
 
@@ -2562,7 +2603,7 @@ msgstr "No class plug will match your request"
 #: include/ajax/ajax_card.php:410 include/ajax/ajax_card.php:264
 #: include/ajax/ajax_card.php:413 include/ajax/ajax_card.php:265
 #: include/ajax/ajax_card.php:414 include/ajax/ajax_card.php:271
-#: include/ajax/ajax_card.php:468
+#: include/ajax/ajax_card.php:468 include/ajax/ajax_card.php:467
 msgid ""
 "Aucune catégorie de fiche ne correspond à votre demande, le journal pourrait "
 "n'avoir accès à aucune fiche"
@@ -2610,6 +2651,7 @@ msgstr "No description"
 #: include/template/tax_summary_display.php:105
 #: include/template/tax_summary_display.php:277
 #: include/template/ledger_detail_bottom.php:302 include/lib/ac_common.php:1257
+#: include/template/ledger_detail_bottom.php:303
 msgid "Aucune donnée"
 msgstr "no data"
 
@@ -2640,7 +2682,7 @@ msgstr "No card Abebooks web sites"
 #: include/fiche.inc.php:133 include/fiche.inc.php:387
 #: include/fiche.inc.php:134 include/fiche.inc.php:388
 #: include/fiche.inc.php:395 include/fiche.inc.php:135
-#: include/fiche.inc.php:405
+#: include/fiche.inc.php:405 include/export/export_fiche_pdf.php:73
 msgid "Aucune fiche trouvée"
 msgstr "No record found"
 
@@ -2818,6 +2860,7 @@ msgstr "Other exercise %s"
 #: include/template/ledger_detail_bottom.php:146
 #: include/template/ledger_detail_bottom.php:151
 #: include/template/ledger_detail_bottom.php:156
+#: include/template/ledger_detail_bottom.php:157
 msgid "Autre information"
 msgstr "Other info"
 
@@ -2856,9 +2899,14 @@ msgstr "Add Action"
 
 #: include/template/detail-action.php:64 include/template/detail-action.php:67
 #: include/template/detail-action.php:72 include/template/detail-action.php:71
+#: include/template/detail-action.php:73
 msgid "Autres concernés"
 msgstr "Others concerned persons"
 
+#: include/template/action_document_type_mtable_input.php:86
+msgid "Autres fiches"
+msgstr "Other cards"
+
 #: include/database.item.php:117 include/balance.inc.php:86
 #: include/database.item.php:120 include/database.item.php:126
 #: include/database.item.php:123 include/database.item.php:122
@@ -2923,6 +2971,7 @@ msgstr "With the card"
 #: html/install.php:351 html/install.php:360 html/install.php:369
 #: html/install.php:354 html/install.php:363 html/install.php:372
 #: html/install.php:403 html/install.php:412 html/install.php:421
+#: html/install.php:409 html/install.php:418
 msgid "Avertissement"
 msgstr "Warning"
 
@@ -2937,6 +2986,7 @@ msgstr "Warning can not be empty"
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
 #: include/class/periode.class.php:651 include/class/periode.class.php:652
+#: include/class/periode.class.php:653
 msgid "Avril"
 msgstr "April"
 
@@ -2953,6 +3003,7 @@ msgstr "Analytic axis"
 #: include/modele.inc.php:314 include/dossier.inc.php:281
 #: include/dossier.inc.php:286 include/modele.inc.php:315
 #: include/modele.inc.php:320 include/modele.inc.php:321
+#: include/dossier.inc.php:289
 msgid "Backup"
 msgstr "Backup"
 
@@ -3156,7 +3207,7 @@ msgstr "Based on"
 #: include/dossier.inc.php:365 include/dossier.inc.php:321
 #: include/dossier.inc.php:354 include/dossier.inc.php:390
 #: include/dossier.inc.php:391 include/dossier.inc.php:407
-#: include/dossier.inc.php:412
+#: include/dossier.inc.php:412 include/dossier.inc.php:416
 msgid "Base de donnée "
 msgstr "Database"
 
@@ -3199,6 +3250,7 @@ msgstr "Empty  Database"
 #: include/class/dossier.class.php:395 html/install.php:398
 #: html/install.php:401 html/install.php:450
 #: include/class/dossier.class.php:373 include/class/dossier.class.php:401
+#: html/install.php:456
 msgid "Base de données"
 msgstr "Database"
 
@@ -3208,7 +3260,8 @@ msgstr "Database"
 #: include/class/class_follow_up.php:263 include/class/follow_up.class.php:263
 #: include/template/action_display_short.php:60
 #: include/class/follow_up.class.php:264 include/class/document.class.php:1413
-#: include/class/follow_up.class.php:271
+#: include/class/follow_up.class.php:271 include/class/follow_up.class.php:273
+#: include/class/follow_up.class.php:764
 msgid "Basse"
 msgstr "Low"
 
@@ -3295,6 +3348,7 @@ msgstr "Budget"
 
 #: include/export/export_poste_detail_pdf.php:168
 #: include/export/export_poste_detail_pdf.php:179
+#: include/export/export_poste_detail_pdf.php:180
 msgid "C"
 msgstr "D / C "
 
@@ -3389,7 +3443,7 @@ msgstr "calculator is visible"
 #: include/ajax/ajax_calendar_zoom.php:26 include/lib/html_input.class.php:991
 #: include/ajax/ajax_calendar_zoom.php:32 include/lib/html_input.class.php:992
 #: include/lib/html_input.class.php:1007 include/lib/html_input.class.php:1008
-#: include/lib/html_input.class.php:1041
+#: include/lib/html_input.class.php:1041 include/lib/html_input.class.php:1042
 msgid "Calendrier"
 msgstr "Calendar"
 
@@ -3501,6 +3555,7 @@ msgstr "Existing category"
 #: include/ajax/ajax_card.php:510 include/ajax/ajax_card.php:511
 #: include/ajax/ajax_card.php:544 include/ajax/ajax_card.php:548
 #: include/ajax/ajax_card.php:563 include/ajax/ajax_card.php:639
+#: include/ajax/ajax_card.php:638
 msgid "Catégorie existe déjà"
 msgstr "Category already exists"
 
@@ -3515,6 +3570,7 @@ msgstr "Invalid category"
 #: include/ajax/ajax_card.php:512 include/ajax/ajax_card.php:513
 #: include/ajax/ajax_card.php:546 include/ajax/ajax_card.php:550
 #: include/ajax/ajax_card.php:567 include/ajax/ajax_card.php:643
+#: include/ajax/ajax_card.php:642
 msgid "Catégorie sauvée"
 msgstr "Category saved"
 
@@ -3593,7 +3649,7 @@ msgstr "This plan does not exist"
 #: html/ajax_misc.php:571 html/ajax_misc.php:613 html/ajax_misc.php:408
 #: html/ajax_misc.php:434 html/ajax_misc.php:546 html/ajax_misc.php:548
 #: html/ajax_misc.php:554 html/ajax_misc.php:556 html/ajax_misc.php:560
-#: html/ajax_misc.php:525
+#: html/ajax_misc.php:525 html/ajax_misc.php:533
 msgid "Ce plugin n'existe pas "
 msgstr "No plugin"
 
@@ -3667,7 +3723,7 @@ msgstr "This category has no email attribute"
 #: include/fiche.inc.php:290 include/fiche.inc.php:363
 #: include/fiche.inc.php:366 include/fiche.inc.php:367
 #: include/fiche.inc.php:368 include/fiche.inc.php:375
-#: include/fiche.inc.php:385
+#: include/fiche.inc.php:385 include/export/export_fiche_pdf.php:63
 msgid "Cette catégorie n'ayant pas de poste comptable n'a pas de balance"
 msgstr "This record has no valid accounting "
 
@@ -3752,6 +3808,7 @@ msgstr "Change the language"
 #: html/admin/template_config_form.php:39
 #: include/template/template_config_form.php:39
 #: include/template/template_config_form.php:40
+#: include/template/template_config_form.php:66
 msgid "Changement de langue"
 msgstr "Select your language"
 
@@ -3763,7 +3820,7 @@ msgstr "Change the status"
 #: html/ajax_ledger.php:522 html/ajax_ledger.php:529 html/ajax_ledger.php:531
 #: include/ajax/ajax_ledger.php:508 include/ajax/ajax_ledger.php:511
 #: include/ajax/ajax_ledger.php:515 include/ajax/ajax_ledger.php:516
-#: include/ajax/ajax_ledger.php:517
+#: include/ajax/ajax_ledger.php:517 include/ajax/ajax_ledger.php:518
 msgid ""
 "Changement impossible: on ne peut pas changer la date dans une période fermée"
 msgstr "Warning : you can not change in a closed period"
@@ -3811,6 +3868,7 @@ msgstr "Reverse expenses"
 #: include/ajax/ajax_ledger.php:239 include/ajax/ajax_ledger.php:352
 #: include/ajax/ajax_ledger.php:243 include/ajax/ajax_ledger.php:356
 #: include/ajax/ajax_ledger.php:244 include/ajax/ajax_ledger.php:357
+#: include/ajax/ajax_ledger.php:245 include/ajax/ajax_ledger.php:358
 msgid "Chargement"
 msgstr "Loading"
 
@@ -3847,6 +3905,7 @@ msgstr "Path"
 #: html/admin/template_config_form.php:43
 #: include/template/template_config_form.php:43
 #: include/template/template_config_form.php:44
+#: include/template/template_config_form.php:70
 msgid "Chemin complet vers les executable de Postgresql"
 msgstr "full path to postgresql"
 
@@ -3904,7 +3963,8 @@ msgstr "full path to postgresql"
 #: include/class/acc_ledger.class.php:2220 include/class/fiche.class.php:2274
 #: include/ajax/ajax_card.php:298 include/compta_fin_rec.inc.php:263
 #: include/template/tag_select.php:18 include/template/tag_search_select.php:15
-#: include/lib/manage_table_sql.class.php:681
+#: include/lib/manage_table_sql.class.php:681 html/ajax_misc.php:441
+#: include/user.inc.php:140 include/dossier.inc.php:242
 #, php-format
 msgid "Cherche"
 msgstr "Search"
@@ -3927,6 +3987,7 @@ msgstr "Search"
 #: include/class/acc_ledger_search.class.php:588
 #: include/class/anc_operation.class.php:295
 #: include/class/acc_ledger_search.class.php:674
+#: include/class/acc_ledger_search.class.php:697
 msgid "Chercher"
 msgstr "Search"
 
@@ -3953,6 +4014,7 @@ msgstr "Select the exercice ( N-1 )  to report  for the Report As New"
 
 #: html/ajax_misc.php:452 html/ajax_misc.php:454 html/ajax_misc.php:460
 #: html/ajax_misc.php:462 html/ajax_misc.php:466 html/ajax_misc.php:431
+#: html/ajax_misc.php:439
 msgid "Choisissez la TVA"
 msgstr "Select the VAT"
 
@@ -4429,7 +4491,7 @@ msgstr "Check the box if you are sure to remove this folder"
 msgid "Cochez pour cette case pour effacer ce tag"
 msgstr "Check the box if you want  to remove this tag"
 
-#: include/template/tag_detail.php:33
+#: include/template/tag_detail.php:33 include/template/tag_detail.php:56
 msgid "Cochez pour cette case pour effacer cette étiquette (tag)"
 msgstr "Check it to remove this tag"
 
@@ -4488,6 +4550,7 @@ msgstr "Tick ​​to delete this record"
 #: include/class/acc_ledger_sold.class.php:721
 #: include/class/print_ledger_detail_item.class.php:58
 #: include/upgrade-plugin.php:71
+#: include/template/follow_up_other_concerned_display_table.php:42
 msgid "Code"
 msgstr "Code"
 
@@ -4687,6 +4750,10 @@ msgstr "Internal operation code to change"
 msgid "Code invalide"
 msgstr "Invalid code"
 
+#: include/user_detail.inc.php:94
+msgid "Code invalide, effacement refusé"
+msgstr "Invalid code"
+
 #: include/class_acc_ledger_purchase.php:1735
 #: include/class_acc_ledger_sold.php:1319
 #: include/class_acc_ledger_sold.php:1317
@@ -4774,7 +4841,7 @@ msgstr "Unknow command"
 #: html/install.php:533 html/install.php:532 html/install.php:530
 #: html/install.php:536 html/install.php:528 html/install.php:534
 #: html/install.php:496 html/install.php:471 html/install.php:477
-#: html/install.php:480 html/install.php:529
+#: html/install.php:480 html/install.php:529 html/install.php:535
 msgid "Commencer la mise à jour ou l'installation"
 msgstr "Start the uprade or the installation"
 
@@ -4836,6 +4903,9 @@ msgstr "Start the uprade or the installation"
 #: include/template/detail-action.php:297
 #: include/template/detail-action.php:327
 #: include/template/detail-action.php:332
+#: include/template/detail-action.php:301
+#: include/template/detail-action.php:339
+#: include/template/detail-action.php:342
 msgid "Commentaire"
 msgstr "How"
 
@@ -5059,6 +5129,8 @@ msgstr "Accounting"
 #: include/class/acc_ledger_search.class.php:963
 #: include/class/acc_ledger_search.class.php:794
 #: include/class/acc_ledger_search.class.php:1052
+#: include/class/acc_ledger_search.class.php:817
+#: include/class/acc_ledger_search.class.php:1075
 msgid "Concerne"
 msgstr "Regarding"
 
@@ -5153,6 +5225,7 @@ msgstr "Config accountancy"
 #: html/install.php:320 html/install.php:319 html/install.php:317
 #: html/install.php:323 html/install.php:329 html/install.php:280
 #: html/install.php:287 html/install.php:290 html/install.php:339
+#: html/install.php:345
 msgid "Configuration"
 msgstr "Setting"
 
@@ -5307,7 +5380,8 @@ msgstr "Confirm"
 #: include/compta_fin.inc.php:83 include/compta_fin.inc.php:84
 #: include/operation_ods_confirm.inc.php:78 include/ext/importbank/ajax.php:232
 #: include/ext/importbank/ajax.php:237 include/ext/importbank/ajax.php:238
-#: include/operation_ods_confirm.inc.php:89
+#: include/operation_ods_confirm.inc.php:89 include/user_detail.inc.php:197
+#: include/user_detail.inc.php:218
 msgid "Confirmer"
 msgstr "To confirm"
 
@@ -5355,6 +5429,7 @@ msgstr "You are not an administrator"
 #: html/install.php:683 html/install.php:676 html/install.php:655
 #: html/install.php:682 html/install.php:617 html/install.php:644
 #: html/install.php:607 html/install.php:614 html/install.php:667
+#: html/install.php:673
 msgid "Connectez-vous à NOALYSS"
 msgstr "Connect to NOALYSS"
 
@@ -5366,6 +5441,7 @@ msgstr "Connect to NOALYSS"
 #: include/database.item.php:57 include/category_card.inc.php:75
 #: include/database.item.php:60 include/database.item.php:52
 #: include/category_card.inc.php:77 include/database.item.php:53
+#: include/template/detail-action.php:50
 msgid "Contact"
 msgstr "Contact"
 
@@ -5386,6 +5462,7 @@ msgstr "Context"
 #: html/install.php:215 html/install.php:257 include/opening.inc.php:140
 #: include/opening.inc.php:174 html/install.php:222 html/install.php:225
 #: html/install.php:267 html/install.php:272 html/install.php:315
+#: html/install.php:278 html/install.php:321
 msgid "Continuer"
 msgstr "Continue"
 
@@ -5477,6 +5554,10 @@ msgstr "Correcting accounting entry"
 msgid "Corriger"
 msgstr "Correct"
 
+#: include/template/tag_detail.php:29
+msgid "Couleur"
+msgstr "Color"
+
 #: include/database.item.php:172 include/database.item.php:175
 #: include/database.item.php:207 include/database.item.php:204
 #: include/database.item.php:177 include/database.item.php:178
@@ -5488,21 +5569,21 @@ msgstr "Email"
 #: include/dossier.inc.php:286 include/dossier.inc.php:283
 #: include/dossier.inc.php:305 include/dossier.inc.php:341
 #: include/dossier.inc.php:342 include/dossier.inc.php:358
-#: include/dossier.inc.php:363
+#: include/dossier.inc.php:363 include/dossier.inc.php:366
 msgid "Creation Dossier"
 msgstr "Folder Creation"
 
 #: html/admin/setup.php:497 html/install.php:561 html/install.php:560
 #: html/install.php:558 html/install.php:569 html/install.php:567
 #: html/install.php:529 html/install.php:513 html/install.php:519
-#: html/install.php:522 html/install.php:572
+#: html/install.php:522 html/install.php:572 html/install.php:578
 msgid "Creation of Modele 1"
 msgstr "Creation template 1"
 
 #: html/admin/setup.php:510 html/install.php:574 html/install.php:573
 #: html/install.php:571 html/install.php:582 html/install.php:580
 #: html/install.php:542 html/install.php:532 html/install.php:538
-#: html/install.php:541 html/install.php:591
+#: html/install.php:541 html/install.php:591 html/install.php:597
 msgid "Creation of Modele 2"
 msgstr "Creation template 2"
 
@@ -5518,6 +5599,7 @@ msgstr "Creation template 2"
 #: include/ajax/ajax_display_letter.php:123 include/fiche.inc.php:580
 #: include/fiche.inc.php:589 include/fiche.inc.php:602
 #: include/ajax/ajax_display_letter.php:141
+#: include/export/export_poste_detail_pdf.php:105
 msgid "Credit"
 msgstr "Credit"
 
@@ -5704,6 +5786,9 @@ msgstr "Credit"
 #: include/export/export_balance_csv.php:79
 #: include/template/ledger_detail_bottom.php:97
 #: include/operation_ods_new.inc.php:86
+#: include/class/anc_grandlivre.class.php:235
+#: include/export/export_poste_detail_pdf.php:251
+#: include/template/ledger_detail_bottom.php:98
 msgid "Crédit"
 msgstr "Credit"
 
@@ -5716,6 +5801,7 @@ msgid "Créditeur"
 msgstr "Credit"
 
 #: include/user.inc.php:84 include/user.inc.php:85 include/user.inc.php:87
+#: include/user.inc.php:89
 msgid "Créer Utilisateur"
 msgstr "Add users"
 
@@ -5821,13 +5907,14 @@ msgstr "Add a new public note"
 #: include/class/acc_ledger.class.php:2505
 #: include/class/pre_op_advanced.class.php:177 include/bank.inc.php:125
 #: include/supplier.inc.php:130 include/contact.inc.php:131
-#: include/customer.inc.php:128
+#: include/customer.inc.php:128 include/class/follow_up.class.php:306
 msgid "Créer une nouvelle fiche"
 msgstr "Add a new card"
 
 #: html/install.php:264 html/install.php:263 html/install.php:261
 #: html/install.php:266 html/install.php:272 html/install.php:223
 #: html/install.php:230 html/install.php:233 html/install.php:280
+#: html/install.php:286
 #, php-format
 msgid "Créez ce fichier %s avec les informations suivantes "
 msgstr "Create this file %s with the following informations"
@@ -5837,6 +5924,7 @@ msgstr "Create this file %s with the following informations"
 #: include/ext/invoicing/include/acc_ledger_sold_generate.class.php:118
 #: include/export/export_poste_detail_pdf.php:182
 #: include/ext/invoicing/include/acc_ledger_sold_generate.class.php:119
+#: include/export/export_poste_detail_pdf.php:183
 msgid "D"
 msgstr "D"
 
@@ -6151,6 +6239,12 @@ msgstr "Database::get_row returns too many rows"
 #: include/export/export_histo_csv.php:41
 #: include/template/form_ledger_detail.php:25
 #: include/template/detail-action.php:102 include/lib/ac_common.php:1220
+#: include/class/acc_ledger_search.class.php:747
+#: include/class/acc_ledger_search.class.php:1069
+#: include/class/anc_grandlivre.class.php:226
+#: include/export/export_poste_detail_pdf.php:93
+#: include/template/detail-action.php:104
+#: include/template/action_search_result.php:45
 #, php-format
 msgid "Date"
 msgstr "Date"
@@ -6179,7 +6273,7 @@ msgstr "Date Acquisition"
 msgid "Date DMY"
 msgstr "Date DMY"
 
-#: include/class/follow_up.class.php:620
+#: include/class/follow_up.class.php:620 include/class/follow_up.class.php:632
 msgid "Date Doc."
 msgstr "Date"
 
@@ -6207,7 +6301,7 @@ msgstr "Start date"
 msgid "Date Fin"
 msgstr "End Date"
 
-#: include/class/follow_up.class.php:622
+#: include/class/follow_up.class.php:622 include/class/follow_up.class.php:635
 msgid "Date Limite"
 msgstr "Deadline"
 
@@ -6382,6 +6476,8 @@ msgstr "Date out of bound"
 #: include/class/acc_ledger.class.php:224
 #: include/class/acc_ledger.class.php:1052
 #: include/class/acc_ledger_purchase.class.php:91
+#: include/class/follow_up.class.php:1678
+#: include/class/follow_up.class.php:1680
 msgid "Date invalide"
 msgstr "Invalid Date"
 
@@ -6409,6 +6505,7 @@ msgstr "Invalid date, operation not reversed"
 #: include/template/detail-action.php:115
 #: include/template/detail-action.php:114
 #: include/template/detail-action.php:121
+#: include/template/detail-action.php:123
 msgid "Date limite"
 msgstr "Deadline"
 
@@ -6547,6 +6644,7 @@ msgstr "Inavlid limit date"
 #: include/ajax/ajax_display_letter.php:122 include/fiche.inc.php:576
 #: include/fiche.inc.php:585 include/fiche.inc.php:598
 #: include/ajax/ajax_display_letter.php:140
+#: include/export/export_poste_detail_pdf.php:103
 msgid "Debit"
 msgstr "Debit"
 
@@ -6597,6 +6695,7 @@ msgstr "Store"
 #: include/ext/bilan_interne/acc_bilaninterne.class.php:274
 #: include/class/acc_bilan.class.php:70 include/class/anc_print.class.php:142
 #: include/balance.inc.php:77 include/impress_jrn.inc.php:132
+#: include/class/anc_print.class.php:143
 msgid "Depuis"
 msgstr "From"
 
@@ -6830,7 +6929,13 @@ msgstr "Event depends on this category"
 #: include/template/param_jrn.php:130
 #: include/template/newEmptyPHP_NOALYSS.php:36
 #: include/template/card_multiple_result.php:20 include/lib/ac_common.php:1223
-#: include/upgrade-plugin.php:65
+#: include/upgrade-plugin.php:65 include/class/acc_ledger_search.class.php:763
+#: include/class/acc_ledger_search.class.php:1072
+#: include/class/acc_ledger_search.class.php:1217
+#: include/template/detail-action.php:284
+#: include/template/detail-action.php:291
+#: include/template/detail-action.php:499 include/template/tag_detail.php:26
+#: include/dossier.inc.php:231 include/dossier.inc.php:345
 msgid "Description"
 msgstr "Description"
 
@@ -6873,7 +6978,7 @@ msgstr "Description"
 
 #: include/dossier.inc.php:76 include/dossier.inc.php:97
 #: include/dossier.inc.php:103 include/dossier.inc.php:106
-#: include/dossier.inc.php:111
+#: include/dossier.inc.php:111 include/dossier.inc.php:113
 msgid ""
 "Desole la creation de ce dossier a echoue,\n"
 " la cause la plus probable est deux fois le même nom de dossier"
@@ -6881,7 +6986,7 @@ msgstr ""
 "Sorry the folder creation failed,\n"
 " it is likely due to a duplicate name"
 
-#: include/class/follow_up.class.php:626
+#: include/class/follow_up.class.php:626 include/class/follow_up.class.php:643
 msgid "Dest/Exp"
 msgstr "Recipient"
 
@@ -6895,6 +7000,8 @@ msgstr "Recipient"
 #: include/template/action_search.php:51
 #: include/template/action_display_short.php:97
 #: include/template/action_search.php:47 include/template/action_show.php:39
+#: include/template/detail-action.php:41
+#: include/template/action_search_result.php:54
 msgid "Destinataire"
 msgstr "Recipient"
 
@@ -7055,6 +7162,8 @@ msgstr "Miscelleanous"
 #: include/compta_ach.inc.php:174 include/class/document.class.php:177
 #: include/class/acc_ledger_search.class.php:795 include/compta_ach.inc.php:173
 #: include/template/ledger_detail_bottom.php:44 include/database.item.php:88
+#: include/class/acc_ledger_search.class.php:818
+#: include/ajax/ajax_ledger.php:324 include/ajax/ajax_ledger.php:353
 msgid "Document"
 msgstr "Document"
 
@@ -7252,13 +7361,14 @@ msgstr "No data available"
 #: include/user.inc.php:124 include/restore.inc.php:219
 #: include/user.inc.php:125 include/restore.inc.php:220
 #: include/restore.inc.php:221 include/restore.inc.php:222
-#: include/user.inc.php:127
+#: include/user.inc.php:127 include/user.inc.php:129
 msgid "Dossier"
 msgstr "Folders"
 
 #: include/dossier.inc.php:150 include/dossier.inc.php:170
 #: include/dossier.inc.php:204 include/dossier.inc.php:205
 #: include/dossier.inc.php:208 include/dossier.inc.php:213
+#: include/dossier.inc.php:216
 msgid "Dossier Management"
 msgstr "Folder Management"
 
@@ -7270,6 +7380,7 @@ msgstr "Folder Management"
 #: include/upgrade.inc.php:79 include/dossier.inc.php:271
 #: include/dossier.inc.php:276 include/upgrade.inc.php:80
 #: include/class/dossier.class.php:379 include/class/dossier.class.php:385
+#: include/dossier.inc.php:279
 msgid "Dossier inexistant"
 msgstr "Folder does not exist"
 
@@ -7361,6 +7472,7 @@ msgstr "From %s to %s"
 #: include/ext/import_account/include/impacc_tva.class.php:64
 #: include/ext/import_account/include/impacc_tva.class.php:76
 #: include/template/ledger_detail_bottom.php:354
+#: include/template/ledger_detail_bottom.php:371
 msgid "Duplicate"
 msgstr "Duplicate"
 
@@ -7368,7 +7480,7 @@ msgstr "Duplicate"
 msgid "Dupliquer"
 msgstr "Duplicate"
 
-#: include/ajax/ajax_ledger.php:589
+#: include/ajax/ajax_ledger.php:589 include/ajax/ajax_ledger.php:590
 msgid "Dupliquer une opération"
 msgstr "Duplicate an operation"
 
@@ -7480,6 +7592,9 @@ msgstr "Amortization term"
 #: include/export/export_balance_csv.php:79
 #: include/template/ledger_detail_bottom.php:96
 #: include/operation_ods_new.inc.php:85
+#: include/class/anc_grandlivre.class.php:234
+#: include/export/export_poste_detail_pdf.php:248
+#: include/template/ledger_detail_bottom.php:97
 msgid "Débit"
 msgstr "Debit"
 
@@ -7506,6 +7621,7 @@ msgstr "Debit"
 
 #: include/class/periode.class.php:649 include/class/periode.class.php:651
 #: include/class/periode.class.php:653 include/class/periode.class.php:654
+#: include/class/periode.class.php:655
 msgid "Décembre"
 msgstr "December"
 
@@ -7631,6 +7747,7 @@ msgstr "Depending on"
 
 #: include/template/detail-action.php:168
 #: include/template/detail-action.php:175
+#: include/template/detail-action.php:177
 msgid "Dépendant"
 msgstr "Depending on"
 
@@ -7700,7 +7817,7 @@ msgstr "Warehouse"
 
 #: html/admin/setup.php:75 html/admin/setup.php:78 html/admin/setup.php:129
 #: html/install.php:131 html/install.php:130 html/install.php:136
-#: html/install.php:143 html/install.php:156
+#: html/install.php:143 html/install.php:156 html/install.php:160
 msgid "Désactiver le changement de langue (requis pour MacOSX)"
 msgstr "Deactivate the language support"
 
@@ -7730,7 +7847,7 @@ msgstr "Sorry no data found"
 #: html/ajax_ledger.php:223 html/ajax_ledger.php:225
 #: include/ajax/ajax_ledger.php:202 include/ajax/ajax_ledger.php:205
 #: include/ajax/ajax_ledger.php:207 include/ajax/ajax_ledger.php:211
-#: include/ajax/ajax_ledger.php:212
+#: include/ajax/ajax_ledger.php:212 include/ajax/ajax_ledger.php:213
 msgid "Désolé il y a une erreur"
 msgstr "Sorry there was an error"
 
@@ -7761,6 +7878,10 @@ msgstr "Sorry , you are in strict mode , you cannot use this plugin"
 msgid "Désolé, il y a trop de virgule dans le poste comptable "
 msgstr "Sorry too many coma in the accounting"
 
+#: include/dossier.inc.php:386
+msgid "Désolé, le code est invalide"
+msgstr "Invalid code"
+
 #: include/lib/message_javascript.php:85 include/lib/message_javascript.php:87
 msgid "Désolé, les montants pour la comptabilité analytique sont incorrects"
 msgstr "Sorry amount for analytic account are incorrect"
@@ -7946,6 +8067,7 @@ msgstr "Card details"
 #: include/ajax/ajax_card.php:544 include/ajax/ajax_card.php:545
 #: include/ajax/ajax_card.php:578 include/ajax/ajax_card.php:582
 #: include/ajax/ajax_card.php:605 include/ajax/ajax_card.php:684
+#: include/ajax/ajax_card.php:683
 msgid "Détail fiche (sauvée)"
 msgstr "Card details(saved)"
 
@@ -7981,6 +8103,7 @@ msgid "Détail opération "
 msgstr "Details operation"
 
 #: include/export/export_poste_detail_pdf.php:64
+#: include/export/export_poste_detail_pdf.php:65
 msgid "Détail poste comptable"
 msgstr "Detail the accounting "
 
@@ -8037,6 +8160,7 @@ msgstr "ERROR"
 #: include/class/acc_ledger_sold.class.php:693
 #: include/export/export_histo_csv.php:42
 #: include/template/form_ledger_detail.php:33
+#: include/class/acc_ledger_search.class.php:751
 msgid "Echeance"
 msgstr "Limit Date"
 
@@ -8086,11 +8210,13 @@ msgstr "Add details failed"
 
 #: include/class/pre_operation.class.php:149
 #: include/class/pre_operation.class.php:550
+#, php-format
 msgid "Echec PreOperatoin chargement %s"
 msgstr "Fail loading operation template %s"
 
 #: include/dossier.inc.php:195 include/dossier.inc.php:196
 #: include/dossier.inc.php:199 include/dossier.inc.php:204
+#: include/dossier.inc.php:206
 msgid "Echec création "
 msgstr "Creation failed"
 
@@ -8241,6 +8367,7 @@ msgstr "Writing and removing"
 #: html/admin/setup.php:199 html/admin/setup.php:217 html/admin/setup.php:219
 #: html/install.php:225 html/install.php:223 html/install.php:231
 #: html/install.php:182 html/install.php:189 html/install.php:205
+#: html/install.php:209
 msgid "Ecriture non possible"
 msgstr "Writing not possible"
 
@@ -8316,6 +8443,7 @@ msgstr "Erase statement"
 
 #: include/class/periode.class.php:673 include/class/periode.class.php:675
 #: include/class/periode.class.php:677 include/class/periode.class.php:678
+#: include/class/periode.class.php:679
 msgid "Effacement impossible"
 msgstr "Impossible removal"
 
@@ -8335,7 +8463,7 @@ msgstr "Removal forbidden : VAT In use"
 #: html/ajax_ledger.php:186 html/ajax_ledger.php:187
 #: include/ajax/ajax_ledger.php:164 include/ajax/ajax_ledger.php:167
 #: include/ajax/ajax_ledger.php:168 include/ajax/ajax_ledger.php:172
-#: include/ajax/ajax_ledger.php:173
+#: include/ajax/ajax_ledger.php:173 include/ajax/ajax_ledger.php:174
 msgid "Effacement refusé"
 msgstr "Removal forbidden"
 
@@ -8419,7 +8547,10 @@ msgstr "Removal forbidden"
 #: include/class/periode.class.php:598 include/class/periode.class.php:603
 #: include/class/document_type.class.php:84 include/class/periode.class.php:604
 #: include/template/ledger_detail_bottom.php:344
-#: include/lib/manage_table_sql.class.php:820
+#: include/lib/manage_table_sql.class.php:820 include/user_detail.inc.php:203
+#: include/class/periode.class.php:600 include/class/periode.class.php:605
+#: include/template/ledger_detail_bottom.php:361 include/dossier.inc.php:284
+#: include/dossier.inc.php:293
 msgid "Effacer"
 msgstr "Remove"
 
@@ -8485,6 +8616,7 @@ msgstr "Clear documentation of monitoring"
 #: include/class/acc_ledger_search.class.php:1080
 #: include/class/acc_ledger_search.class.php:1093
 #: include/class/acc_ledger_search.class.php:1182
+#: include/class/acc_ledger_search.class.php:1205
 msgid "Effacer sel"
 msgstr "Remove"
 
@@ -8530,6 +8662,7 @@ msgstr "Items"
 #: include/user.inc.php:84 include/database.item.php:191
 #: include/ajax/ajax_preference.php:74 include/ajax/ajax_preference.php:85
 #: include/database.item.php:196 include/database.item.php:189
+#: include/user.inc.php:86
 msgid "Email"
 msgstr "E-mail"
 
@@ -8598,7 +8731,7 @@ msgstr ""
 
 #: html/admin/setup.php:80 html/admin/setup.php:83 html/admin/setup.php:134
 #: html/install.php:136 html/install.php:135 html/install.php:141
-#: html/install.php:148 html/install.php:161
+#: html/install.php:148 html/install.php:161 html/install.php:165
 msgid ""
 "En version mono dossier, le nom de la base de données doit être mentionné"
 msgstr "In mono mode, the database name must be set"
@@ -8673,6 +8806,7 @@ msgstr "Enter the invoice"
 #: include/ajax_admin.php:57 include/user_detail.inc.php:226
 #: include/ajax/ajax_admin.php:57 include/user_detail.inc.php:235
 #: include/ajax/ajax_admin.php:54 include/ajax/ajax_admin.php:62
+#: include/user_detail.inc.php:273
 msgid "Enleve"
 msgstr "Remove"
 
@@ -8765,7 +8899,7 @@ msgstr "Recorded in ledger"
 #: include/class_anc_print.php:130 include/class_anc_print.php:177
 #: include/class_anc_print.php:179 include/class/class_anc_print.php:179
 #: include/class/class_anc_print.php:181 include/class/anc_print.class.php:175
-#: include/class/anc_print.class.php:181
+#: include/class/anc_print.class.php:181 include/class/anc_print.class.php:182
 msgid "Entre l'activité "
 msgstr "Between activity"
 
@@ -8788,6 +8922,7 @@ msgstr "Enter the date of the declaration"
 #: html/install.php:290 html/install.php:289 html/install.php:287
 #: html/install.php:293 html/install.php:299 html/install.php:250
 #: html/install.php:257 html/install.php:260 html/install.php:308
+#: html/install.php:314
 msgid "Entrez les informations nécessaires à noalyss"
 msgstr "Enter the required information for Noalyss"
 
@@ -9004,7 +9139,7 @@ msgid "Erreur sécurité"
 msgstr "Security error"
 
 #: html/install.php:636 html/install.php:643 html/install.php:646
-#: html/install.php:699
+#: html/install.php:699 html/install.php:705
 msgid "Essai effacement install.php et se connecter à NOALYSS"
 msgstr "Try to unlink install.php and connect to Noalyss"
 
@@ -9110,6 +9245,7 @@ msgstr "Step 4/4 : data are loaded"
 #: include/template/detail-action.php:123 include/template/action_search.php:60
 #: include/template/action_search.php:56 include/class/follow_up.class.php:628
 #: include/template/detail-action.php:130 include/template/ledger_search.php:83
+#: include/class/follow_up.class.php:647 include/template/detail-action.php:132
 msgid "Etat"
 msgstr "State"
 
@@ -9152,13 +9288,22 @@ msgstr "Are you sure to remove this folder"
 #: include/template/action_search.php:129 include/class/tag.class.php:85
 #: include/class/follow_up.class.php:623 include/class/tag.class.php:90
 #: include/template/action_search.php:130 include/cfgtags.inc.php:38
+#: include/class/follow_up.class.php:639 include/class/tag_action.class.php:54
+#: include/class/tag_operation.class.php:192
+#: include/ajax/ajax_tag_detail.php:19
+#: include/template/ledger_detail_bottom.php:47
 msgid "Etiquette"
 msgstr "Etiquette"
 
 #: include/template/tag_detail.php:15 include/template/tag_detail.php:21
+#: include/template/tag_detail.php:23
 msgid "Etiquette (tag)"
 msgstr "Tag"
 
+#: include/template/tag_detail.php:50
+msgid "Etiquette actif"
+msgstr "Active Tag"
+
 #: include/template/tag_detail.php:27
 msgid "Etiquette(tag) actif"
 msgstr "Tag"
@@ -9181,6 +9326,10 @@ msgstr "Event recorded"
 msgid "Exclure Etat"
 msgstr "Exclude State"
 
+#: include/template/tag_detail.php:38
+msgid "Exemple"
+msgstr "Example"
+
 #: include/ext/tools/index.php:43 include/bank.inc.php:73
 #: include/template/stock_state_search.php:35 include/impress_bilan.inc.php:49
 #: include/impress_jrn.inc.php:84 include/impress_rapport.inc.php:182
@@ -9208,6 +9357,7 @@ msgid "Exercice doit être entre %s et %s "
 msgstr "Exercice is between %s and %s"
 
 #: include/template/periode_add_exercice.php:82
+#: include/template/periode_add_exercice.php:91
 msgid "Exercice invalide"
 msgstr "Invalid exercice"
 
@@ -9233,7 +9383,7 @@ msgstr "Due for sales"
 #: html/ajax_misc.php:236 html/ajax_misc.php:314 html/ajax_misc.php:319
 #: html/ajax_misc.php:347 html/ajax_misc.php:459 html/ajax_misc.php:461
 #: html/ajax_misc.php:467 html/ajax_misc.php:469 html/ajax_misc.php:473
-#: html/ajax_misc.php:438
+#: html/ajax_misc.php:438 html/ajax_misc.php:446
 msgid "Explication"
 msgstr "Explanation"
 
@@ -9312,6 +9462,8 @@ msgstr "Export balance"
 #: include/class/fiche.class.php:1646 include/class/fiche.class.php:2242
 #: include/class/acc_account_ledger.class.php:727
 #: include/template/detail-action.php:88
+#: include/ajax/ajax_action_concerned_list.php:49
+#: include/template/detail-action.php:90
 msgid "Export CSV"
 msgstr "Export CSV"
 
@@ -9421,6 +9573,7 @@ msgstr "Export Ledger"
 #: include/class/fiche.class.php:2264
 #: include/class/acc_account_ledger.class.php:749
 #: include/template/ledger_detail_bottom.php:359
+#: include/template/ledger_detail_bottom.php:376
 msgid "Export PDF"
 msgstr "Export PDF"
 
@@ -9471,6 +9624,8 @@ msgstr "Export analytic tabel"
 #: include/class/anc_grandlivre.class.php:170
 #: include/class/anc_grandlivre.class.php:174
 #: include/class/anc_grandlivre.class.php:182
+#: include/class/anc_grandlivre.class.php:175
+#: include/class/anc_grandlivre.class.php:183
 msgid "Export des pièces en PDF"
 msgstr "Export in PDF"
 
@@ -9532,6 +9687,7 @@ msgstr "Export report"
 #: html/recherche.php:126 html/recherche.php:129
 #: include/history_operation.inc.php:167 include/history_operation.inc.php:178
 #: html/recherche.php:141 include/history_operation.inc.php:192
+#: html/recherche.php:151 include/history_operation.inc.php:203
 msgid "Export vers CSV"
 msgstr "Export CSV"
 
@@ -9601,6 +9757,8 @@ msgstr "Plugin"
 #: include/ajax/ajax_ledger.php:564 include/class/acc_operation.class.php:729
 #: include/ajax/ajax_ledger.php:565 include/compta_ach.inc.php:89
 #: include/template/ledger_detail_bottom.php:349
+#: include/ajax/ajax_ledger.php:566
+#: include/template/ledger_detail_bottom.php:366
 msgid "Extourne"
 msgstr "Reverse"
 
@@ -9632,6 +9790,7 @@ msgstr "Reverse operation"
 #: include/template/ledger_detail_bottom.php:333
 #: include/template/ledger_detail_bottom.php:346
 #: include/template/ledger_detail_bottom.php:374
+#: include/template/ledger_detail_bottom.php:391
 msgid "Extourner"
 msgstr "Reverse"
 
@@ -9643,6 +9802,7 @@ msgstr "Reverse"
 #: include/template/ledger_detail_bottom.php:351
 #: include/template/ledger_detail_bottom.php:348
 #: include/template/ledger_detail_bottom.php:376
+#: include/template/ledger_detail_bottom.php:393
 msgid ""
 "Extourner une opération vous permet de l'annuler par son écriture inverse"
 msgstr "Avoid an operation by writing the reversed one"
@@ -9824,7 +9984,10 @@ msgstr "Firm action"
 #: include/class/extension.class.php:276 include/ajax/ajax_card.php:319
 #: include/template/ledger_detail_bottom.php:317
 #: include/template/ledger_detail_bottom.php:318
-#: include/template/action_search.php:169
+#: include/template/action_search.php:169 html/recherche.php:154
+#: include/template/ledger_detail_bottom.php:334
+#: include/template/ledger_detail_bottom.php:335
+#: include/template/action_search.php:171 include/user.inc.php:90
 #, php-format
 msgid "Fermer"
 msgstr "close"
@@ -9842,13 +10005,15 @@ msgstr "Close"
 #: include/ext/sav/include/sav_repair_card_sql.class.php:67
 #: include/ext/sav/include/sav_repair_card_sql.class.php:72
 #: include/class/periode_ledger_table.class.php:145
+#: include/class/periode_ledger_table.class.php:146
 msgid "Fermé"
 msgstr "close"
 
 #: include/class/periode.class.php:585
 #: include/class/periode_ledger_table.class.php:142
 #: include/class/periode.class.php:587 include/class/periode.class.php:589
-#: include/class/periode.class.php:590
+#: include/class/periode.class.php:590 include/class/periode.class.php:591
+#: include/class/periode_ledger_table.class.php:143
 msgid "Fermée"
 msgstr "Closed"
 
@@ -9950,7 +10115,7 @@ msgid "Fiche non disponible pour journal"
 msgstr "Card not available for this ledger"
 
 #: include/ajax/ajax_card.php:619 include/ajax/ajax_card.php:642
-#: include/ajax/ajax_card.php:756
+#: include/ajax/ajax_card.php:756 include/ajax/ajax_card.php:755
 msgid "Fiche non effacée"
 msgstr "Card not deleted"
 
@@ -9983,6 +10148,8 @@ msgstr "Card not found"
 #: include/ajax/ajax_card.php:607 include/ajax/ajax_card.php:600
 #: include/ajax/ajax_card.php:630 include/ajax/ajax_card.php:679
 #: include/ajax/ajax_card.php:708 include/ajax/ajax_card.php:744
+#: include/ajax/ajax_card.php:678 include/ajax/ajax_card.php:707
+#: include/ajax/ajax_card.php:743
 msgid "Fiche non valide"
 msgstr "Invalid file"
 
@@ -10058,6 +10225,7 @@ msgstr "Removed file"
 #: html/install.php:269 html/install.php:220
 #: include/ext/import_account/include/impacc_file.class.php:69
 #: html/install.php:227 html/install.php:230 html/install.php:277
+#: html/install.php:283
 msgid "Fichier non sauvé"
 msgstr "Card not found"
 
@@ -10141,6 +10309,8 @@ msgstr "Filter per periode"
 #: include/class/acc_ledger_search.class.php:562 include/modele.inc.php:279
 #: html/recherche.php:88 include/class/acc_ledger_search.class.php:648
 #: include/lettering.card.inc.php:98
+#: include/class/acc_ledger_search.class.php:671
+#: include/ajax/ajax_search_filter.php:137
 msgid "Filtre"
 msgstr "Filter"
 
@@ -10151,6 +10321,7 @@ msgstr "Filter"
 #: include/class/acc_ledger_search.class.php:1077
 #: include/class/acc_ledger_search.class.php:1090
 #: include/class/acc_ledger_search.class.php:1179
+#: include/class/acc_ledger_search.class.php:1202
 msgid "Filtre "
 msgstr "Filter"
 
@@ -10259,6 +10430,7 @@ msgstr "Fin /MO"
 #: include/database.item.php:233 include/database.item.php:252
 #: include/class/acc_ledger_search.class.php:1184 include/database.item.php:217
 #: include/database.item.php:229 include/lib/user_menu.php:135
+#: include/class/acc_ledger_search.class.php:1207
 msgid "Financier"
 msgstr "Financial"
 
@@ -10414,6 +10586,7 @@ msgstr "French"
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
 #: include/class/periode.class.php:651 include/class/periode.class.php:652
+#: include/class/periode.class.php:653
 msgid "Février"
 msgstr "February"
 
@@ -10677,6 +10850,7 @@ msgstr ""
 #: include/database.item.php:52 include/class/follow_up.class.php:625
 #: include/template/tag_search_select.php:64
 #: include/template/tag_search_select.php:70 include/database.item.php:8
+#: include/class/follow_up.class.php:641
 msgid "Groupe"
 msgstr "Group"
 
@@ -10684,6 +10858,7 @@ msgstr "Group"
 #: include/template/detail-action.php:144
 #: include/template/detail-action.php:143 include/ajax/ajax_get_profile.php:58
 #: include/template/detail-action.php:150
+#: include/template/detail-action.php:152
 msgid "Groupe Gestion"
 msgstr "Management group"
 
@@ -10738,6 +10913,7 @@ msgstr "Accounting entries generation"
 #: include/class_follow_up.php:421 include/class/class_follow_up.php:421
 #: include/class/class_follow_up.php:411 include/class/follow_up.class.php:411
 #: include/class/follow_up.class.php:412 include/class/follow_up.class.php:419
+#: include/class/follow_up.class.php:421
 msgid "Génére le document"
 msgstr "Generate the document"
 
@@ -10845,6 +11021,7 @@ msgstr "Operation without tax"
 #: include/template/action_display_short.php:58
 #: include/class/follow_up.class.php:262 include/class/document.class.php:1413
 #: include/class/follow_up.class.php:269 include/class/follow_up.class.php:725
+#: include/class/follow_up.class.php:271 include/class/follow_up.class.php:758
 msgid "Haute"
 msgstr "High"
 
@@ -10855,6 +11032,7 @@ msgstr "High"
 #: include/template/action_display_short.php:88
 #: include/template/action_display_short.php:89
 #: include/template/detail-action.php:111
+#: include/template/detail-action.php:113
 msgid "Heure"
 msgstr "Hour"
 
@@ -11140,6 +11318,7 @@ msgstr "There is no item"
 #: html/install.php:523 html/install.php:529 html/install.php:521
 #: html/install.php:527 html/install.php:489 html/install.php:464
 #: html/install.php:470 html/install.php:473 html/install.php:522
+#: html/install.php:528
 #, php-format
 msgid "Il y a %s param&egrave;tre qui sont trop bas"
 msgstr "There are %s invalid parameters"
@@ -11147,7 +11326,7 @@ msgstr "There are %s invalid parameters"
 #: html/ajax_misc.php:572 html/ajax_misc.php:614 html/ajax_misc.php:409
 #: html/ajax_misc.php:435 html/ajax_misc.php:547 html/ajax_misc.php:549
 #: html/ajax_misc.php:555 html/ajax_misc.php:557 html/ajax_misc.php:561
-#: html/ajax_misc.php:526
+#: html/ajax_misc.php:526 html/ajax_misc.php:534
 msgid "Il y a une erreur, ce plugin n'existe pas"
 msgstr "This plugin doesn't exist"
 
@@ -11211,6 +11390,7 @@ msgstr "Import / export"
 #: html/install.php:632 html/install.php:552 html/install.php:635
 #: html/install.php:259 html/install.php:602 html/install.php:659
 #: html/install.php:688 include/class/follow_up.class.php:731
+#: html/install.php:264 html/install.php:608 html/install.php:694
 msgid "Important"
 msgstr "Important"
 
@@ -11380,6 +11560,7 @@ msgstr "Unable to save this file"
 #: html/install.php:278 html/install.php:277 html/install.php:275
 #: html/install.php:281 html/install.php:287 html/install.php:238
 #: html/install.php:245 html/install.php:248 html/install.php:295
+#: html/install.php:301
 msgid ""
 "Impossible de se connecter à Postgresql, vérifiez les informations de "
 "connection"
@@ -11564,7 +11745,7 @@ msgid ""
 "sauvés exemple c:/temp, /tmp"
 msgstr "Give the folder for temporary files example c:/temp , /tmp,..."
 
-#: html/install.php:142 html/install.php:155
+#: html/install.php:142 html/install.php:155 html/install.php:159
 msgid ""
 "Indiquez ici le répertoire où les documents temporaires peuvent être sauvés "
 "exemple c:/temp, /tmp"
@@ -11596,6 +11777,7 @@ msgstr "Extra info"
 #: include/ext/tva/ajax.php:200 include/ajax/ajax_ledger.php:104
 #: include/ajax/ajax_ledger.php:126
 #: include/template/ledger_detail_bottom.php:42
+#: include/ajax/ajax_ledger.php:105 include/ajax/ajax_ledger.php:127
 msgid "Information"
 msgstr "Information"
 
@@ -11643,7 +11825,7 @@ msgstr "General Information"
 #: include/lib/user_menu.php:121 html/install.php:238
 #: include/upgrade-plugin.php:125 include/lib/user_menu.php:78
 #: html/install.php:285 include/lib/user_menu.php:77
-#: include/upgrade-plugin.php:128
+#: include/upgrade-plugin.php:128 html/install.php:291
 msgid "Installation"
 msgstr "Installation"
 
@@ -11694,6 +11876,7 @@ msgstr "Forbidden"
 #: include/class/acc_ledger_search.class.php:950
 #: include/class/acc_ledger_search.class.php:1039
 #: include/export/export_histo_csv.php:39
+#: include/class/acc_ledger_search.class.php:1062
 msgid "Internal"
 msgstr "Internal"
 
@@ -11761,6 +11944,7 @@ msgstr "Internal"
 #: include/class/acc_ledger_sold.class.php:1397
 #: include/class/acc_ledger_history_generic.class.php:770
 #: include/class/anc_grandlivre.class.php:232
+#: include/class/anc_grandlivre.class.php:233
 msgid "Interne"
 msgstr "Internal"
 
@@ -11775,7 +11959,7 @@ msgid "Invalide"
 msgstr "Invalide"
 
 #: html/ajax_misc.php:288 html/ajax_misc.php:290 html/ajax_misc.php:296
-#: html/ajax_misc.php:298 html/ajax_misc.php:313
+#: html/ajax_misc.php:298 html/ajax_misc.php:313 html/ajax_misc.php:321
 msgid "Invalide type"
 msgstr "Invalide type"
 
@@ -11807,6 +11991,7 @@ msgstr "Invert selection"
 #: include/class/acc_ledger_search.class.php:1078
 #: include/class/acc_ledger_search.class.php:1091
 #: include/class/acc_ledger_search.class.php:1180
+#: include/class/acc_ledger_search.class.php:1203
 msgid "Inverser sel"
 msgstr "Invert sel"
 
@@ -11819,6 +12004,7 @@ msgstr "Item"
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
 #: include/class/periode.class.php:651 include/class/periode.class.php:652
+#: include/class/periode.class.php:653
 msgid "Janvier"
 msgstr "January"
 
@@ -11837,6 +12023,7 @@ msgstr "Javascript"
 #: include/template/detail-action.php:465
 #: include/template/detail-action.php:463
 #: include/template/detail-action.php:476
+#: include/template/detail-action.php:489
 msgid "Je ne peux pas ajouter de fichier"
 msgstr "I can not add this file"
 
@@ -11902,6 +12089,8 @@ msgstr "Thursday"
 #: include/export/export_ledger_pdf.php:84
 #: include/export/export_histo_csv.php:40
 #: include/template/pre_operation_display.php:38
+#: include/class/acc_ledger_search.class.php:1066
+#: include/export/export_poste_detail_pdf.php:97
 msgid "Journal"
 msgstr "Ledger"
 
@@ -12023,6 +12212,7 @@ msgstr "Ledger not found"
 #: include/class/acc_ledger_search.class.php:1073
 #: include/class/acc_ledger_search.class.php:1086
 #: include/class/acc_ledger_search.class.php:1175 include/param_sec.inc.php:228
+#: include/class/acc_ledger_search.class.php:1198
 msgid "Journaux"
 msgstr "Ledgers"
 
@@ -12084,11 +12274,13 @@ msgstr "Ledger of sales"
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
 #: include/class/periode.class.php:652 include/class/periode.class.php:653
+#: include/class/periode.class.php:654
 msgid "Juillet"
 msgstr "July"
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
 #: include/class/periode.class.php:652 include/class/periode.class.php:653
+#: include/class/periode.class.php:654
 msgid "Juin"
 msgstr "June"
 
@@ -12100,7 +12292,7 @@ msgstr "Until accountancy"
 #: include/template/stock_histo_search.php:47 include/class_anc_print.php:159
 #: include/class/class_anc_print.php:159 include/class/class_anc_print.php:161
 #: include/class/anc_print.class.php:155 include/class/anc_print.class.php:153
-#: include/impress_jrn.inc.php:143
+#: include/impress_jrn.inc.php:143 include/class/anc_print.class.php:154
 msgid "Jusque"
 msgstr "Until"
 
@@ -12150,6 +12342,7 @@ msgstr ""
 #: html/install.php:605 html/install.php:621 html/install.php:613
 #: html/install.php:619 html/install.php:581 html/install.php:571
 #: html/install.php:577 html/install.php:580 html/install.php:630
+#: html/install.php:636
 #, php-format
 msgid ""
 "La base de donnée %s est vide, \n"
@@ -12191,6 +12384,7 @@ msgstr ""
 #: html/install.php:520 html/install.php:526 html/install.php:518
 #: html/install.php:524 html/install.php:486 html/install.php:461
 #: html/install.php:467 html/install.php:470 html/install.php:519
+#: html/install.php:525
 msgid "La base de données est bien configurée "
 msgstr "The database is properly configured"
 
@@ -12322,8 +12516,8 @@ msgid ""
 "faire, si  elle n'est pas active l'utilisateur a donc accès à toutes ces "
 "actions"
 msgstr ""
-"The security on the action limit what the user can do , if it is not enable,"
-" the user can do all those actions"
+"The security on the action limit what the user can do , if it is not enable, "
+"the user can do all those actions"
 
 #: include/param_sec.inc.php:253
 msgid ""
@@ -12331,8 +12525,8 @@ msgid ""
 "journaux, si cette  sécurité n'est pas activée , l'utilisateur a accès à "
 "tous les journaux en lecture et écriture"
 msgstr ""
-"The security on the ledger limit what the user can access, if it is not"
-" enable, the user can access all the ledgers"
+"The security on the ledger limit what the user can access, if it is not "
+"enable, the user can access all the ledgers"
 
 #: include/class_fiche_def.php:453 include/ajax_plugin_detail.php:35
 #: include/class_fiche_def.php:436 include/class_fiche_def.php:442
@@ -12366,13 +12560,14 @@ msgstr "Latin"
 
 #: html/admin/setup.php:76 html/admin/setup.php:79 html/admin/setup.php:130
 #: html/install.php:132 html/install.php:131 html/install.php:137
-#: html/install.php:144 html/install.php:157
+#: html/install.php:144 html/install.php:157 html/install.php:161
 msgid "Le chemin vers le repertoire contenant psql, pg_dump..."
 msgstr "Give the path to the postgresql binaries (psql, pg_dump,...)"
 
 #: include/dossier.inc.php:331 include/dossier.inc.php:367
 #: include/dossier.inc.php:403 include/dossier.inc.php:404
 #: include/dossier.inc.php:420 include/dossier.inc.php:425
+#: include/dossier.inc.php:429
 #, php-format
 msgid "Le dossier %s est effacé"
 msgstr "Folder %s is dropped"
@@ -12395,6 +12590,7 @@ msgid "Le login ne peut pas être vide"
 msgstr "The login can not be empty"
 
 #: include/user.inc.php:93 include/user.inc.php:94 include/user.inc.php:96
+#: include/user.inc.php:98
 msgid "Le login ne peut être vide"
 msgstr "The login can not be empty"
 
@@ -12412,17 +12608,18 @@ msgstr "The mini-report"
 msgid "Le modèle %s est effacé"
 msgstr "Folder %s is dropped"
 
-#: html/install.php:226
+#: html/install.php:226 html/install.php:230
 msgid "Le mot de passe du super admin et le login ne peuvent être vides"
 msgstr "The password can not be empty"
 
-#: html/install.php:243
+#: html/install.php:243 html/install.php:247
 msgid ""
 "Le mot de passe du super admin et le superadmin ne peut pas contenir des "
 "guillemets ou espaces, ni @mobile"
 msgstr "Password of superadmin cannot contains space, quote or @mobile"
 
 #: include/user.inc.php:98 include/user.inc.php:99 include/user.inc.php:101
+#: include/user.inc.php:103
 msgid "Le mot de passe ne peut être vide"
 msgstr "The password can not be empty"
 
@@ -12480,6 +12677,7 @@ msgstr "The name and the accounting base can not be empty"
 #: include/ajax/ajax_card.php:555
 #: include/class/template_card_category.class.php:73
 #: include/ajax/ajax_card.php:574 include/ajax/ajax_card.php:650
+#: include/ajax/ajax_card.php:649
 msgid "Le nom ne peut pas être vide"
 msgstr "the name cannot be empty"
 
@@ -12610,6 +12808,7 @@ msgstr "The date formats are DD.MM.YYYY"
 #: include/class/anc_grandlivre.class.php:167
 #: include/class/anc_grandlivre.class.php:168
 #: include/class/anc_grandlivre.class.php:180
+#: include/class/anc_grandlivre.class.php:181
 msgid ""
 "Les extensions CONVERT_GIF_PDF et PDFTK pour convertir en pdf ne sont pas "
 "installées "
@@ -12636,6 +12835,7 @@ msgstr "The plugs must have at least one name"
 #: html/install.php:255 html/install.php:254 html/install.php:252
 #: html/install.php:257 html/install.php:263 html/install.php:214
 #: html/install.php:221 html/install.php:224 html/install.php:271
+#: html/install.php:277
 msgid "Les informations sont sauv&eacute;es vous pouvez continuer"
 msgstr "Parameters are saved , continue"
 
@@ -12673,7 +12873,7 @@ msgstr ""
 #: include/class/class_user.php:1212 include/class/class_user.php:1200
 #: include/class/class_user.php:1238 include/class/class_user.php:1236
 #: include/class/user.class.php:1236 include/class/user.class.php:1261
-#: include/class/user.class.php:1284
+#: include/class/user.class.php:1284 include/class/user.class.php:1299
 msgid "Les mots de passe ne correspondent pas. Mot de passe inchangé"
 msgstr "The password do not match, the password is not changed"
 
@@ -12725,6 +12925,7 @@ msgstr "Decimal and thousand separators must be different"
 
 #: include/export/export_gl_pdf.php:88
 #: include/export/export_poste_detail_pdf.php:100
+#: include/export/export_poste_detail_pdf.php:101
 msgid "Let"
 msgstr "Let."
 
@@ -12997,6 +13198,10 @@ msgstr "label"
 #: include/template/form_ledger_detail.php:59
 #: include/template/ledger_detail_bottom.php:95
 #: include/template/ledger_detail_bottom.php:384
+#: include/class/anc_grandlivre.class.php:229
+#: include/export/export_poste_detail_pdf.php:99
+#: include/template/ledger_detail_bottom.php:96
+#: include/template/ledger_detail_bottom.php:401
 #, php-format
 msgid "Libellé"
 msgstr "Label"
@@ -13098,6 +13303,10 @@ msgstr "Filter the card type if you choose the card , only with Misc Ledger"
 msgid "Liste"
 msgstr "List"
 
+#: include/ajax/ajax_action_concerned_list.php:39
+msgid "Liste Autres Fiches"
+msgstr "List other cards"
+
 #: include/ext/importbank/index.php:57 include/ext/importbank/index.php:59
 msgid "Liste Import "
 msgstr "Import List"
@@ -13243,7 +13452,7 @@ msgstr "Local admin"
 
 #: include/template/todo_list_list_user.php:37 include/user.inc.php:122
 #: include/user.inc.php:123 include/param_sec.inc.php:57
-#: include/user.inc.php:125
+#: include/user.inc.php:125 include/user.inc.php:127
 msgid "Login"
 msgstr "login"
 
@@ -13257,6 +13466,7 @@ msgstr "Monday"
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
 #: include/class/periode.class.php:652 include/class/periode.class.php:653
+#: include/class/periode.class.php:654
 msgid "Mai"
 msgstr "May"
 
@@ -13337,6 +13547,7 @@ msgstr "Mark for deleting"
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
 #: include/class/periode.class.php:651 include/class/periode.class.php:652
+#: include/class/periode.class.php:653
 msgid "Mars"
 msgstr "March"
 
@@ -13369,7 +13580,7 @@ msgstr "Bad type of object"
 
 #: include/dossier.inc.php:342 include/ajax/ajax_admin.php:213
 #: include/dossier.inc.php:347 include/ajax/ajax_admin.php:234
-#: include/ajax/ajax_admin.php:238
+#: include/ajax/ajax_admin.php:238 include/dossier.inc.php:350
 msgid "Max. email / jour (-1 = illimité)"
 msgstr "Max of email / day (-1 for unlimited)"
 
@@ -13548,10 +13759,6 @@ msgstr "Update system and databases"
 msgid "Methode paiement"
 msgstr "means of payment"
 
-#: include/lib/message_javascript.php:72 include/lib/message_javascript.php:74
-msgid "Mettez le pourcentage <br> à zéro pour effacer la ligne"
-msgstr "Put the percentage to 0 to remove the row"
-
 #: include/lib/message_javascript.php:72
 msgid "Mettez le pourcentage à zéro pour effacer la ligne"
 msgstr "Put the percentage to 0 to remove the row"
@@ -13572,6 +13779,8 @@ msgstr "Upgrade your database "
 #: include/ajax/ajax_search_operation.php:134
 #: include/ajax/ajax_search_operation.php:135
 #: include/ajax/ajax_search_operation.php:140
+#: include/template/action_search_result.php:33
+#: include/template/action_search_result.php:90
 msgid "Mettre à jour"
 msgstr "Update"
 
@@ -13602,6 +13811,7 @@ msgstr "Update"
 #: html/install.php:589 html/install.php:602 html/install.php:594
 #: html/install.php:600 html/install.php:562 html/install.php:552
 #: html/install.php:558 html/install.php:561 html/install.php:611
+#: html/install.php:617
 msgid "Mise  à jour dossier"
 msgstr "Update folder"
 
@@ -13645,7 +13855,7 @@ msgstr "Update"
 #: html/admin/setup.php:549 html/install.php:613 html/install.php:614
 #: html/install.php:621 html/install.php:637 html/install.php:629
 #: html/install.php:635 html/install.php:597 html/install.php:587
-#: html/install.php:594 html/install.php:647
+#: html/install.php:594 html/install.php:647 html/install.php:653
 msgid "Mise à jour Repository"
 msgstr "Update Repository"
 
@@ -13674,6 +13884,7 @@ msgstr "Update plugin, could you check the parameter setting?"
 #: html/install.php:588 html/install.php:601 html/install.php:593
 #: html/install.php:599 html/install.php:561 html/install.php:551
 #: html/install.php:557 html/install.php:560 html/install.php:610
+#: html/install.php:616
 msgid "Mise à jour du systeme"
 msgstr "Update"
 
@@ -13733,6 +13944,7 @@ msgstr "Missing parameter"
 #: include/template/template_config_form.php:63
 #: include/template/template_config_form.php:71
 #: include/template/template_config_form.php:81
+#: include/template/template_config_form.php:74
 msgid "Mode Serveur mutualisé"
 msgstr "Mode Server (default) or limited "
 
@@ -13858,7 +14070,7 @@ msgstr "Missing description"
 #: include/class/anc_operation.class.php:319
 #: include/lib/manage_table_sql.class.php:755
 #: include/class/document_type.class.php:77
-#: include/lib/manage_table_sql.class.php:807
+#: include/lib/manage_table_sql.class.php:807 include/dossier.inc.php:286
 msgid "Modifier"
 msgstr "Modify"
 
@@ -13951,6 +14163,7 @@ msgid "Module paramètres"
 msgstr "Parameters module"
 
 #: html/install.php:384 html/install.php:387 html/install.php:436
+#: html/install.php:442
 msgid "Module php-pgsql n'est pas installé"
 msgstr " php-pgsql is not installed"
 
@@ -13962,7 +14175,7 @@ msgstr " php-pgsql is not installed"
 #: include/dossier.inc.php:353 include/compta_ach.inc.php:89
 #: include/compta_ach.inc.php:91 include/compta_ven.inc.php:98
 #: include/dossier.inc.php:358 include/upgrade.inc.php:36
-#: include/compta_ach.inc.php:88
+#: include/compta_ach.inc.php:88 include/dossier.inc.php:361
 msgid "Modèle"
 msgstr "Template"
 
@@ -14176,6 +14389,8 @@ msgstr "Starting month does not exist"
 #: include/class/acc_ledger_purchase.class.php:1463
 #: include/class/acc_ledger_sold.class.php:733
 #: include/class/pre_op_advanced.class.php:201 include/lib/ac_common.php:1225
+#: include/class/acc_ledger_search.class.php:761
+#: include/class/acc_ledger_search.class.php:1074
 msgid "Montant"
 msgstr "Amount"
 
@@ -14567,15 +14782,17 @@ msgstr "Show details"
 #: html/install.php:593 html/install.php:208 html/install.php:555
 #: include/user.inc.php:83 html/install.php:215 html/install.php:545
 #: html/install.php:551 html/install.php:218 html/install.php:554
-#: html/install.php:265 html/install.php:604
+#: html/install.php:265 html/install.php:604 html/install.php:270
+#: html/install.php:610 include/user.inc.php:85
 msgid "Mot de passe"
 msgstr "password"
 
 #: include/template/template_config_form.php:65
+#: include/template/template_config_form.php:46
 msgid "Mot de passe administrateur de noalyss"
 msgstr "Noalyss Administrators password"
 
-#: html/install.php:164
+#: html/install.php:164 html/install.php:168
 msgid ""
 "Mot de passe administrateur, il peut être changé ensuite dans les préférences"
 msgstr "Administrator password can be change in the \"Preference\""
@@ -14591,11 +14808,13 @@ msgstr "User's password"
 #: html/admin/template_config_form.php:51
 #: include/template/template_config_form.php:51
 #: include/template/template_config_form.php:52
+#: include/template/template_config_form.php:100
 msgid "Mot de passe de l'utilisateur Postgresql"
 msgstr "User's password"
 
 #: html/admin/setup.php:132 html/install.php:134 html/install.php:133
 #: html/install.php:139 html/install.php:146 html/install.php:159
+#: html/install.php:163
 msgid "Mot de passe de l'utilisateur de Postgresql"
 msgstr "User's password"
 
@@ -14946,6 +15165,9 @@ msgstr "No action"
 #: include/class/contact_option_ref_mtable.class.php:36
 #: include/class/user.class.php:991
 #: include/template/card_multiple_result.php:19 include/upgrade-plugin.php:62
+#: include/class/acc_ledger_search.class.php:1216
+#: include/template/follow_up_other_concerned_display_table.php:45
+#: include/user.inc.php:84 include/user.inc.php:128 include/dossier.inc.php:230
 msgid "Nom"
 msgstr "Name"
 
@@ -14988,6 +15210,7 @@ msgstr "Label VAT"
 #: include/template/template_config_form.php:68
 #: include/template/template_config_form.php:76
 #: include/template/template_config_form.php:86
+#: include/template/template_config_form.php:79
 msgid "Nom base de donnée"
 msgstr "Database name"
 
@@ -14997,7 +15220,7 @@ msgstr "Database name"
 #: include/dossier.inc.php:239 include/modele.inc.php:280
 #: include/dossier.inc.php:242 include/dossier.inc.php:247
 #: include/modele.inc.php:281 include/modele.inc.php:286
-#: include/modele.inc.php:287
+#: include/modele.inc.php:287 include/dossier.inc.php:250
 msgid "Nom base de données"
 msgstr "Database"
 
@@ -15035,7 +15258,7 @@ msgstr "Document Name"
 #: include/dossier.inc.php:275 include/dossier.inc.php:272
 #: include/dossier.inc.php:294 include/dossier.inc.php:330
 #: include/dossier.inc.php:331 include/dossier.inc.php:334
-#: include/dossier.inc.php:339
+#: include/dossier.inc.php:339 include/dossier.inc.php:342
 msgid "Nom du dossier"
 msgstr "Folder name"
 
@@ -15043,6 +15266,7 @@ msgstr "Folder name"
 #: include/class/acc_ledger_search.class.php:246
 #: include/class/acc_ledger_search.class.php:248
 #: include/class/acc_ledger_search.class.php:262
+#: include/class/acc_ledger_search.class.php:264
 msgid "Nom du filtre"
 msgstr "Filter name"
 
@@ -15146,6 +15370,7 @@ msgstr "Name is missing"
 
 #: include/ajax/ajax_search_filter.php:73
 #: include/class/action_document_type_mtable.class.php:106
+#: include/ajax/ajax_search_filter.php:81
 msgid "Nom ne peut être vide"
 msgstr "The name can not be empty"
 
@@ -15245,6 +15470,7 @@ msgid "Nombre de mois doit être compris entre 1 & 60 "
 msgstr "Number of months must be between 1 and 60"
 
 #: include/template/periode_add_exercice.php:87
+#: include/template/periode_add_exercice.php:96
 msgid "Nombre de mois invalide"
 msgstr "Number of month invalid"
 
@@ -15254,6 +15480,7 @@ msgid "Nombre de mois n'est pas un nombre"
 msgstr "Number of month is not a number"
 
 #: include/template/periode_add_exercice.php:99
+#: include/template/periode_add_exercice.php:108
 msgid "Nombre de mois possible entre 1 et 60"
 msgstr "Number of months must be between 1 and 60"
 
@@ -15290,6 +15517,7 @@ msgstr "Number of operation% d"
 #: include/template/profile_menu_display_module.php:81
 #: include/class/tva_rate_mtable.class.php:56 include/company.inc.php:71
 #: include/company.inc.php:74 include/company.inc.php:112
+#: include/user_detail.inc.php:169
 msgid "Non"
 msgstr "No"
 
@@ -15376,10 +15604,12 @@ msgstr "Not installed"
 #: include/class/acc_ledger_search.class.php:868
 #: include/class/acc_ledger_search.class.php:881
 #: include/class/acc_ledger_search.class.php:970
+#: include/class/acc_ledger_search.class.php:993
 msgid "Non payé"
 msgstr "unpaid"
 
 #: include/class/acc_ledger_search.class.php:213
+#: include/class/acc_ledger_search.class.php:215
 msgid "Non payées"
 msgstr "unpaid"
 
@@ -15405,6 +15635,7 @@ msgstr "Not found"
 #: include/template/ledger_detail_bottom.php:292
 #: include/template/ledger_detail_bottom.php:289
 #: include/template/ledger_detail_bottom.php:307
+#: include/template/ledger_detail_bottom.php:308
 msgid "Non utilisée"
 msgstr "not used"
 
@@ -15414,6 +15645,7 @@ msgid "Normal"
 msgstr "Normal"
 
 #: include/class/document.class.php:1413 include/class/follow_up.class.php:270
+#: include/class/follow_up.class.php:272 include/class/follow_up.class.php:761
 msgid "Normale"
 msgstr "Normal"
 
@@ -15463,6 +15695,7 @@ msgstr "Note of free"
 #: include/class/acc_ledger_search.class.php:948
 #: include/class/acc_ledger_search.class.php:961
 #: include/class/acc_ledger_search.class.php:1050
+#: include/class/acc_ledger_search.class.php:1073
 msgid "Notes"
 msgstr "Notes"
 
@@ -15537,7 +15770,7 @@ msgstr "New bank statement"
 #: include/template/action_display_short.php:81
 #: include/lib/html_input.class.php:1103 include/lib/html_input.class.php:1104
 #: include/lib/html_input.class.php:1119 include/lib/html_input.class.php:1120
-#: include/lib/html_input.class.php:1153
+#: include/lib/html_input.class.php:1153 include/lib/html_input.class.php:1145
 msgid "Nouvel événement"
 msgstr "New event"
 
@@ -15614,6 +15847,7 @@ msgstr "Available version %s , your version %s"
 
 #: include/class/periode.class.php:649 include/class/periode.class.php:651
 #: include/class/periode.class.php:653 include/class/periode.class.php:654
+#: include/class/periode.class.php:655
 msgid "Novembre"
 msgstr "November"
 
@@ -15862,6 +16096,7 @@ msgid "N° TVA"
 msgstr "No VAT"
 
 #: include/template/detail-action.php:19 include/template/detail-action.php:12
+#: include/template/detail-action.php:13
 msgid "N° document"
 msgstr "Document No."
 
@@ -16036,11 +16271,13 @@ msgstr "Mandatory for FIN ledger: give here the card of the bank"
 
 #: include/class/periode.class.php:649 include/class/periode.class.php:651
 #: include/class/periode.class.php:653 include/class/periode.class.php:654
+#: include/class/periode.class.php:655
 msgid "Octobre"
 msgstr "October"
 
 #: include/class/periode.class.php:688 include/class/periode.class.php:690
 #: include/class/periode.class.php:692 include/class/periode.class.php:693
+#: include/class/periode.class.php:694
 msgid "On ne peut ajouter une période que sur un exercice qui existe déjà"
 msgstr "It is possible to add a period on an existing exercice"
 
@@ -16052,6 +16289,7 @@ msgstr "Warning : you can not change in a closed period"
 #: html/admin/setup.php:201 html/admin/setup.php:219 html/admin/setup.php:221
 #: html/install.php:227 html/install.php:225 html/install.php:233
 #: html/install.php:184 html/install.php:191 html/install.php:207
+#: html/install.php:211
 msgid ""
 "On ne peut pas écrire dans le répertoire de NOALYSS, changez-en les droits "
 msgstr "Not possible to write in the Noalyss folder, change the rights"
@@ -16089,6 +16327,7 @@ msgstr "Concerned op"
 #: include/class/acc_ledger_search.class.php:1088
 #: include/class/acc_ledger_search.class.php:1101
 #: include/class/acc_ledger_search.class.php:1190
+#: include/class/acc_ledger_search.class.php:1213
 msgid "Op.Diverses"
 msgstr "Miscelleanous"
 
@@ -16103,10 +16342,12 @@ msgid "Option sup."
 msgstr "Extra options"
 
 #: include/template/action_search.php:146
+#: include/template/action_search.php:148
 msgid "Option étiquettes"
 msgstr "Tag options"
 
 #: include/class/contact_option_ref_mtable.class.php:39
+#: include/class/follow_up_other_concerned.class.php:166
 msgid "Options"
 msgstr "Options"
 
@@ -16148,6 +16389,7 @@ msgstr "Miscellaneous operation"
 #: html/ajax_ledger.php:156 html/ajax_ledger.php:174 html/ajax_ledger.php:175
 #: include/ajax/ajax_ledger.php:152 include/ajax/ajax_ledger.php:155
 #: include/ajax/ajax_ledger.php:159 include/ajax/ajax_ledger.php:160
+#: include/ajax/ajax_ledger.php:161
 msgid "Opération Effacée"
 msgstr "Removed accounting"
 
@@ -16187,6 +16429,8 @@ msgstr "Analytic operation only for accounting beginning with"
 #: include/class/acc_ledger_search.class.php:1058
 #: include/class/acc_ledger_search.class.php:939
 #: include/class/acc_ledger_search.class.php:1147
+#: include/class/acc_ledger_search.class.php:962
+#: include/class/acc_ledger_search.class.php:1170
 msgid "Opération annulée"
 msgstr "Entry canceled"
 
@@ -16220,7 +16464,7 @@ msgstr "recorded entry"
 #: html/ajax_ledger.php:564 html/ajax_ledger.php:576 html/ajax_ledger.php:578
 #: include/ajax/ajax_ledger.php:555 include/ajax/ajax_ledger.php:558
 #: include/ajax/ajax_ledger.php:563 include/ajax/ajax_ledger.php:568
-#: include/ajax/ajax_ledger.php:569
+#: include/ajax/ajax_ledger.php:569 include/ajax/ajax_ledger.php:570
 msgid "Opération extournée"
 msgstr "Reversed accounting"
 
@@ -16280,6 +16524,7 @@ msgstr "Entry restored"
 #: include/ajax/ajax_ledger.php:504 include/ajax/ajax_ledger.php:508
 #: include/anc_od.inc.php:121 include/ajax/ajax_ledger.php:509
 #: include/ext/modop/modop_save.php:165 include/ajax/ajax_ledger.php:510
+#: include/ajax/ajax_ledger.php:511
 msgid "Opération sauvée"
 msgstr "Entry saved"
 
@@ -16332,6 +16577,7 @@ msgstr "Operations Sales / Purchases"
 
 #: include/template/detail-action.php:167
 #: include/template/detail-action.php:174
+#: include/template/detail-action.php:176
 msgid "Opérations concernées"
 msgstr "Concerned operations"
 
@@ -16443,6 +16689,7 @@ msgstr "Select the card"
 #: include/class/tva_rate_mtable.class.php:57
 #: include/class/acc_plan_mtable.class.php:66 include/company.inc.php:72
 #: include/company.inc.php:75 include/company.inc.php:113
+#: include/user_detail.inc.php:170
 msgid "Oui"
 msgstr "yes"
 
@@ -16462,7 +16709,9 @@ msgstr "Tools for co-ownership"
 #: include/class/periode_ledger_table.class.php:142
 #: include/class/periode_ledger_table.class.php:144
 #: include/class/periode.class.php:587 include/class/periode.class.php:589
-#: include/class/periode.class.php:590
+#: include/class/periode.class.php:590 include/class/periode.class.php:591
+#: include/class/periode_ledger_table.class.php:143
+#: include/class/periode_ledger_table.class.php:145
 msgid "Ouvert"
 msgstr "Open"
 
@@ -16596,6 +16845,7 @@ msgstr "Pu"
 #: include/class/acc_ledger_history_purchase.class.php:265
 #: include/class/acc_ledger.class.php:2480
 #: include/export/export_histo_csv.php:43 include/tax_summary.inc.php:42
+#: include/class/acc_ledger_search.class.php:753
 msgid "Paiement"
 msgstr "Payment"
 
@@ -16754,7 +17004,7 @@ msgstr "Parameter"
 #: html/install.php:471 include/admin_repo.inc.php:125 html/install.php:477
 #: html/install.php:439 include/admin_repo.inc.php:127 html/install.php:414
 #: include/admin_repo.inc.php:129 html/install.php:420 html/install.php:423
-#: html/install.php:472
+#: html/install.php:472 html/install.php:478
 msgid "Paramètre base de données"
 msgstr "Database parameters"
 
@@ -16876,7 +17126,7 @@ msgstr "No record found"
 msgid "Pas d'étape"
 msgstr "No step"
 
-#: include/template/detail-action.php:57
+#: include/template/detail-action.php:57 include/template/detail-action.php:58
 msgid "Pas de catégorie de contact"
 msgstr "Na category for contact"
 
@@ -17006,6 +17256,8 @@ msgstr "Country"
 #: include/class/acc_ledger_search.class.php:877
 #: include/class/acc_ledger_search.class.php:792
 #: include/class/acc_ledger_search.class.php:966
+#: include/class/acc_ledger_search.class.php:815
+#: include/class/acc_ledger_search.class.php:989
 msgid "Payé"
 msgstr "Paid"
 
@@ -17034,6 +17286,7 @@ msgid "Payé par"
 msgstr "Paid by"
 
 #: include/class/acc_ledger_search.class.php:214
+#: include/class/acc_ledger_search.class.php:216
 msgid "Payées"
 msgstr "Paid"
 
@@ -17285,6 +17538,9 @@ msgstr "Receipt"
 #: include/class/acc_ledger_sold.class.php:1396
 #: include/class/print_ledger_simple.class.php:96
 #: include/class/anc_grandlivre.class.php:231 include/lib/ac_common.php:1222
+#: include/class/acc_ledger_search.class.php:755
+#: include/class/acc_ledger_search.class.php:1070
+#: include/class/anc_grandlivre.class.php:232
 msgid "Pièce"
 msgstr "Receipt"
 
@@ -17310,6 +17566,7 @@ msgstr "Receipt number"
 #: include/template/detail-action.php:407
 #: include/template/detail-action.php:405
 #: include/template/detail-action.php:401
+#: include/template/detail-action.php:414
 msgid "Pièces attachées"
 msgstr "Attachment"
 
@@ -17338,7 +17595,7 @@ msgstr "Plan A"
 msgid "Plan Analytique"
 msgstr "Analytical"
 
-#: include/class/anc_print.class.php:163
+#: include/class/anc_print.class.php:163 include/class/anc_print.class.php:164
 msgid "Plan Analytique "
 msgstr "Analytic Plan"
 
@@ -17391,6 +17648,7 @@ msgstr "Port %s"
 #: include/template/template_config_form.php:59
 #: include/template/template_config_form.php:67
 #: include/template/template_config_form.php:77
+#: include/template/template_config_form.php:108
 msgid "Port de Postgresql"
 msgstr "Port of Postgresql"
 
@@ -17400,7 +17658,7 @@ msgid "Port de postgresql"
 msgstr "Port of Postgresql"
 
 #: html/install.php:135 html/install.php:134 html/install.php:140
-#: html/install.php:147 html/install.php:160
+#: html/install.php:147 html/install.php:160 html/install.php:164
 msgid "Port pour postgresql"
 msgstr "Port of Postgresql"
 
@@ -17505,6 +17763,7 @@ msgstr "Possible %d"
 #: include/class/acc_ledger_history_generic.class.php:772
 #: include/class/anc_grandlivre.class.php:226
 #: include/ajax/ajax_display_letter.php:64 include/database.item.php:63
+#: include/class/anc_grandlivre.class.php:227
 msgid "Poste"
 msgstr "Account. Item"
 
@@ -17544,6 +17803,7 @@ msgstr "Post Charge"
 #: include/class/fiche.class.php:469
 #: include/class/pdfbalance_simple.class.php:55
 #: include/template/ledger_detail_bottom.php:93
+#: include/template/ledger_detail_bottom.php:94
 msgid "Poste Comptable"
 msgstr "Accounting item"
 
@@ -17808,6 +18068,10 @@ msgstr "Post crediting incorrect"
 msgid "Postes utilisables journal (débit/crédit) "
 msgstr "Available accounting ledger (debit / credit)"
 
+#: include/template/template_config_form.php:91
+msgid "Postgresql"
+msgstr "Postgresql"
+
 #: include/periode.inc.php:144
 msgid ""
 "Pour ajouter, effacer ou modifier une p&eacute;riode, il faut choisir global"
@@ -17825,6 +18089,7 @@ msgstr "For today"
 #: html/install.php:481 html/install.php:487 html/install.php:479
 #: html/install.php:485 html/install.php:447 html/install.php:422
 #: html/install.php:428 html/install.php:431 html/install.php:480
+#: html/install.php:486
 msgid ""
 "Pour cela, sur la ligne de commande en tant qu\\'utilisateur postgres, "
 "faites createlang plpgsql template1"
@@ -17832,6 +18097,10 @@ msgstr ""
 "For this, in command line as user postgres do \"createlang plpgsql "
 "template1\""
 
+#: include/user_detail.inc.php:211
+msgid "Pour effacer , confirmez en retapant le code"
+msgstr "For deleting, type the code to confirm"
+
 #: include/ext/import_account/include/template/test_operation.php:9
 msgid ""
 "Pour importer des données, c'est-à-dire transformer des fichiers CSV (Valeur "
@@ -17974,6 +18243,7 @@ msgstr "First road"
 #: include/class/follow_up.class.php:1921
 #: include/class/follow_up.class.php:1922
 #: include/class/follow_up.class.php:1871
+#: include/class/follow_up.class.php:1845
 msgid "Principal"
 msgstr "Main"
 
@@ -17985,6 +18255,7 @@ msgstr "Main"
 #: include/template/action_display_short.php:99
 #: include/template/action_display_short.php:100
 #: include/template/detail-action.php:140
+#: include/template/detail-action.php:142
 msgid "Priorité"
 msgstr "Priority"
 
@@ -18113,6 +18384,7 @@ msgid "Profil inexistant"
 msgstr "Profile not found"
 
 #: include/export/export_poste_detail_pdf.php:106
+#: include/export/export_poste_detail_pdf.php:107
 msgid "Prog"
 msgstr "Progr."
 
@@ -18132,6 +18404,7 @@ msgstr "Progr."
 #: include/class/anc_grandlivre.class.php:222 include/fiche.inc.php:523
 #: include/fiche.inc.php:532 include/fiche.inc.php:545
 #: include/class/anc_grandlivre.class.php:235
+#: include/class/anc_grandlivre.class.php:236
 msgid "Prog."
 msgstr "Progr."
 
@@ -18209,6 +18482,8 @@ msgstr "User's preference, display, default period, email and password"
 #: include/user.inc.php:145 include/class/balance_age.class.php:146
 #: include/database.item.php:170 include/database.item.php:173
 #: include/database.item.php:169
+#: include/template/follow_up_other_concerned_display_table.php:48
+#: include/user.inc.php:83 include/user.inc.php:147
 msgid "Prénom"
 msgstr "First Name"
 
@@ -18251,10 +18526,12 @@ msgstr "Public"
 #: html/install.php:268 html/install.php:267 html/install.php:265
 #: html/install.php:270 html/install.php:276 html/install.php:227
 #: html/install.php:234 html/install.php:237 html/install.php:284
+#: html/install.php:290
 msgid "Puis cliquez sur ce lien"
 msgstr "After click on this link"
 
 #: html/install.php:586 html/install.php:589 html/install.php:639
+#: html/install.php:645
 msgid ""
 "Puis refaites la procédure d'installation pour mettre la base de données à "
 "jour"
@@ -18496,6 +18773,7 @@ msgstr "Quantity"
 #: include/database.item.php:167 include/fiche.inc.php:415
 #: include/class/fiche.class.php:1805
 #: include/template/ledger_detail_bottom.php:94
+#: include/template/ledger_detail_bottom.php:95
 msgid "Quick Code"
 msgstr "Quick Code"
 
@@ -18552,6 +18830,7 @@ msgstr "QuickCode"
 #: include/class/anc_grandlivre.class.php:215
 #: include/class/anc_listing.class.php:81
 #: include/class/anc_grandlivre.class.php:227
+#: include/class/anc_grandlivre.class.php:228
 msgid "Quick_code"
 msgstr "Quick_code"
 
@@ -18700,7 +18979,9 @@ msgstr "recompute"
 #: include/template/action_button.php:35 include/database.item.php:96
 #: include/lettering.card.inc.php:104 include/lib/html_input.class.php:984
 #: include/lib/html_input.class.php:1004 include/lib/html_input.class.php:1021
-#: include/upgrade-plugin.php:55
+#: include/upgrade-plugin.php:55 include/class/acc_ledger_search.class.php:665
+#: include/lib/html_input.class.php:985 include/lib/html_input.class.php:1005
+#: include/lib/html_input.class.php:1022
 #, php-format
 msgid "Recherche"
 msgstr "Search"
@@ -18727,6 +19008,7 @@ msgstr "Advanced search"
 #: include/ajax/ajax_card.php:375 include/ajax/ajax_card.php:408
 #: include/ajax/ajax_card.php:411 include/fiche.inc.php:93
 #: include/ajax/ajax_card.php:412 include/ajax/ajax_card.php:466
+#: include/ajax/ajax_card.php:465
 msgid "Recherche de fiche"
 msgstr "Search Card"
 
@@ -18768,7 +19050,7 @@ msgstr "Search Card"
 #: include/ext/rapport_avance/include/formulaire_param_detail.class.php:368
 #: include/ajax/ajax_card.php:506 include/class/acc_report.class.php:151
 #: include/ajax/ajax_card.php:510 include/ajax/ajax_card.php:511
-#: include/ajax/ajax_card.php:587
+#: include/ajax/ajax_card.php:587 include/ajax/ajax_card.php:586
 msgid "Recherche poste"
 msgstr "Search accounting"
 
@@ -18809,6 +19091,7 @@ msgstr "search :"
 #: include/class/acc_ledger_fin.class.php:1087
 #: include/class/anc_balance_double.class.php:370
 #: include/class/acc_ledger_search.class.php:646
+#: include/class/acc_ledger_search.class.php:669
 msgid "Rechercher"
 msgstr "Search"
 
@@ -18831,10 +19114,13 @@ msgstr "Restart sequence (let 0 if you don't want to change)"
 #: include/export/export_poste_detail_pdf.php:94
 #: include/template/acc_ledger_history_purchase_detail.php:35
 #: include/template/acc_ledger_history_sale_detail.php:36
+#: include/export/export_poste_detail_pdf.php:95
+#: include/template/action_search_result.php:48
 msgid "Ref"
 msgstr "Ref"
 
 #: include/template/detail-action.php:27 include/template/detail-action.php:20
+#: include/template/detail-action.php:21
 msgid "Reference"
 msgstr "Reference"
 
@@ -18888,6 +19174,7 @@ msgid "Rejeté"
 msgstr "Rejected"
 
 #: include/ajax/ajax_search_filter.php:151
+#: include/ajax/ajax_search_filter.php:160
 msgid "Remise à zéro"
 msgstr "reset"
 
@@ -18990,7 +19277,8 @@ msgstr "Late"
 #: include/ajax/ajax_display_letter.php:39 include/cfgledger.inc.php:141
 #: include/ext/tva/ajax.php:35 html/do.php:312 html/do.php:281
 #: include/modele.inc.php:404 include/modele.inc.php:444 html/do.php:283
-#: include/ajax/ajax_display_letter.php:53
+#: include/ajax/ajax_display_letter.php:53 include/dossier.inc.php:387
+#: include/dossier.inc.php:431
 msgid "Retour"
 msgstr "Return"
 
@@ -19099,7 +19387,7 @@ msgstr "Reconciliation %s"
 msgid "Réel"
 msgstr "Real"
 
-#: include/class/follow_up.class.php:624
+#: include/class/follow_up.class.php:624 include/class/follow_up.class.php:637
 msgid "Réf."
 msgstr "Ref"
 
@@ -19122,6 +19410,7 @@ msgstr "Key distribution"
 #: html/admin/template_config_form.php:33
 #: include/template/template_config_form.php:33
 #: include/template/template_config_form.php:34
+#: include/template/template_config_form.php:60
 msgid "Répertoire temporaire"
 msgstr "Temporary folder"
 
@@ -19253,6 +19542,7 @@ msgstr "Meeting"
 #: include/class/follow_up.class.php:1780
 #: include/class/follow_up.class.php:1781
 #: include/class/follow_up.class.php:1731
+#: include/class/follow_up.class.php:1705
 msgid "SECURITE : Ajout impossible"
 msgstr "Security : unauthorized"
 
@@ -19315,7 +19605,7 @@ msgstr "new line"
 #: include/cfgledger.inc.php:137 include/ajax/ajax_card.php:204
 #: include/ajax/ajax_card.php:518 include/ajax/ajax_mod_predf_op.php:67
 #: include/ajax/ajax_card.php:207 include/ajax/ajax_card.php:594
-#: include/company.inc.php:163
+#: include/company.inc.php:163 include/ajax/ajax_card.php:593
 msgid "Sauve"
 msgstr "Save"
 
@@ -19417,6 +19707,7 @@ msgstr "Save template %s"
 #: include/ajax/ajax_display_letter.php:226 include/ajax/ajax_card.php:168
 #: include/template/ledger_detail_bottom.php:333
 #: include/template/card_multiple_display_option.php:114
+#: include/template/ledger_detail_bottom.php:350
 msgid "Sauver"
 msgstr "Save"
 
@@ -19489,6 +19780,7 @@ msgstr "Section-Financial"
 #: include/class/class_follow_up.php:129 include/class/follow_up.class.php:128
 #: include/class/follow_up.class.php:129 include/class/follow_up.class.php:130
 #: include/class/follow_up.class.php:135 include/class/follow_up.class.php:136
+#: include/class/follow_up.class.php:137 include/class/follow_up.class.php:138
 msgid "Securité"
 msgstr "Security"
 
@@ -19504,6 +19796,7 @@ msgstr "Security"
 #: include/class/acc_ledger_search.class.php:936
 #: include/class/acc_ledger_search.class.php:949
 #: include/class/acc_ledger_search.class.php:1038
+#: include/class/acc_ledger_search.class.php:1061
 msgid "Selection"
 msgstr "Selection"
 
@@ -19534,11 +19827,16 @@ msgstr "Select your language"
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
 #: include/class/periode.class.php:652 include/class/periode.class.php:653
+#: include/class/periode.class.php:654
 msgid "Septembre"
 msgstr "September"
 
+#: include/template/template_config_form.php:56
+msgid "Serveur"
+msgstr "Server"
+
 #: html/install.php:138 html/install.php:137 html/install.php:143
-#: html/install.php:150 html/install.php:163
+#: html/install.php:150 html/install.php:163 html/install.php:167
 msgid "Serveur postgresql"
 msgstr "Server Postgresql"
 
@@ -19568,8 +19866,8 @@ msgstr "Services, or good  Sold (D)"
 
 #: include/class_user.php:51 include/class_user.php:58
 #: include/class/class_user.php:58 include/class/user.class.php:58
-msgid "Session expirée<br>Utilisateur déconnecté"
-msgstr "Session expired <br> User disconnected"
+msgid "Session expirée Utilisateur déconnecté"
+msgstr "Session expired > User disconnected"
 
 #: scenario/acc_ledger_historyTest.php:40
 msgid ""
@@ -19958,7 +20256,7 @@ msgstr "Deleted"
 #: html/ajax_misc.php:235 html/ajax_misc.php:313 html/ajax_misc.php:318
 #: html/ajax_misc.php:346 html/ajax_misc.php:458 html/ajax_misc.php:460
 #: html/ajax_misc.php:466 html/ajax_misc.php:468 html/ajax_misc.php:472
-#: html/ajax_misc.php:437
+#: html/ajax_misc.php:437 html/ajax_misc.php:445
 msgid "Symbole"
 msgstr "Symbol"
 
@@ -20395,7 +20693,7 @@ msgstr "Enable tag"
 #: include/card_attr.inc.php:96 include/dossier.inc.php:204
 #: include/dossier.inc.php:238 include/dossier.inc.php:239
 #: include/dossier.inc.php:242 include/dossier.inc.php:247
-#: include/class/card_attribut_mtable.class.php:41
+#: include/class/card_attribut_mtable.class.php:41 include/dossier.inc.php:250
 msgid "Taille"
 msgstr "Size"
 
@@ -20418,6 +20716,10 @@ msgstr "You cannot use Noalyss if this file is present"
 msgid "Taper une formule (ex 20*5.1) puis enter"
 msgstr "Type a formula and press enter"
 
+#: include/ajax/ajax_admin.php:264
+msgid "Tapez le code de confirmation"
+msgstr "Type the confirmation code"
+
 #: include/lib/message_javascript.php:40
 msgid ""
 "Tapez le numéro de poste ou une partie du poste ou du libellé puis sur "
@@ -20442,7 +20744,7 @@ msgstr ""
 #: include/export/export_printtva_pdf.php:59
 #: include/export/export_printtva_pdf.php:216
 #: include/export/export_printtva_csv.php:53
-#: include/export/export_printtva_csv.php:72
+#: include/export/export_printtva_csv.php:72 html/ajax_misc.php:444
 msgid "Taux"
 msgstr "Spleen"
 
@@ -20545,6 +20847,8 @@ msgstr "Theme"
 #: include/class/anc_grandlivre.class.php:229
 #: include/export/export_ledger_csv.php:230
 #: include/export/export_histo_csv.php:46
+#: include/class/acc_ledger_search.class.php:759
+#: include/class/anc_grandlivre.class.php:230
 msgid "Tiers"
 msgstr "Tiers"
 
@@ -20562,7 +20866,8 @@ msgstr "Tiers"
 #: include/template/detail-action.php:258 include/template/dashboard.php:348
 #: include/ext/invoicing/include/invoice_send_mail_input.inc.php:139
 #: include/template/action_show.php:40 include/template/dashboard.php:346
-#: include/class/follow_up.class.php:627
+#: include/class/follow_up.class.php:627 include/class/follow_up.class.php:645
+#: include/template/action_search_result.php:51
 msgid "Titre"
 msgstr "Title"
 
@@ -20980,7 +21285,7 @@ msgstr "Subtotal"
 #: include/user.inc.php:176 include/user.inc.php:178
 #: include/ext/importbank/include/import_bank.class.php:136
 #: include/template/tag_search_select.php:14
-#: include/template/tag_search_select.php:17
+#: include/template/tag_search_select.php:17 include/user.inc.php:180
 msgid "Tous"
 msgstr "All"
 
@@ -20999,6 +21304,7 @@ msgid "Tous les Etats"
 msgstr "All States"
 
 #: include/class/follow_up.class.php:1128
+#: include/class/follow_up.class.php:1160
 msgid "Tous les actions ouvertes"
 msgstr "All open actions"
 
@@ -21037,6 +21343,7 @@ msgstr "All the depending accouting"
 #: include/class/follow_up.class.php:1243
 #: include/class/follow_up.class.php:1244
 #: include/class/follow_up.class.php:1161
+#: include/class/follow_up.class.php:1193
 msgid "Tous les profiles"
 msgstr "All profiles"
 
@@ -21052,6 +21359,7 @@ msgstr "All profiles"
 #: include/class/follow_up.class.php:1203
 #: include/class/follow_up.class.php:1204
 #: include/class/follow_up.class.php:1121
+#: include/class/follow_up.class.php:1153
 msgid "Tous les types"
 msgstr "Any type"
 
@@ -21077,7 +21385,7 @@ msgstr "Everything is installed"
 
 #: html/install.php:632 html/install.php:592 html/install.php:639
 #: html/install.php:595 html/install.php:642 html/install.php:645
-#: html/install.php:695
+#: html/install.php:695 html/install.php:651 html/install.php:701
 msgid "Tout est installé"
 msgstr "Everything is installed"
 
@@ -21094,6 +21402,7 @@ msgid "Tout sélectionner"
 msgstr "Check all"
 
 #: include/class/acc_ledger_search.class.php:212
+#: include/class/acc_ledger_search.class.php:214
 msgid "Toutes"
 msgstr "Everything"
 
@@ -21118,7 +21427,8 @@ msgstr "All sheets in PDF"
 msgid "Toutes les opérations"
 msgstr "All entries"
 
-#: include/template/action_search.php:149
+#: include/template/action_search.php:149 include/template/ledger_search.php:97
+#: include/template/action_search.php:151
 msgid "Toutes les étiquettes"
 msgstr "All tags"
 
@@ -21231,6 +21541,10 @@ msgstr "VAT ND"
 #: include/class/fiche.class.php:1505
 #: include/class/card_attribut_mtable.class.php:40
 #: include/class/acc_account_ledger.class.php:390
+#: include/user_detail.inc.php:179
+#: include/class/acc_ledger_search.class.php:1218
+#: include/template/detail-action.php:30
+#: include/template/action_search_result.php:57 include/user.inc.php:149
 msgid "Type"
 msgstr "Type"
 
@@ -21250,6 +21564,7 @@ msgstr "Type"
 #: include/class/follow_up.class.php:1694
 #: include/class/follow_up.class.php:1695
 #: include/class/follow_up.class.php:1643
+#: include/class/follow_up.class.php:1675
 msgid "Type action invalide"
 msgstr "Invalid options"
 
@@ -21309,6 +21624,7 @@ msgstr "Invalid type"
 #: include/operation_ods_confirm.inc.php:54
 #: include/template/ledger_detail_bottom.php:155
 #: include/template/ledger_detail_bottom.php:160
+#: include/template/ledger_detail_bottom.php:161
 msgid "Type opération"
 msgstr "Type of entry"
 
@@ -21521,15 +21837,21 @@ msgstr "invalid values"
 #: include/admin_repo.inc.php:146 include/stock_inv_histo.inc.php:84
 #: include/user.inc.php:173 html/user_login.php:109
 #: include/admin_repo.inc.php:148 html/user_login.php:115
+#: include/user.inc.php:175
 msgid "Utilisateur"
 msgstr "Users"
 
 #: html/install.php:594 html/install.php:586 html/install.php:592
 #: html/install.php:554 html/install.php:544 html/install.php:550
-#: html/install.php:553 html/install.php:603
+#: html/install.php:553 html/install.php:603 html/install.php:609
 msgid "Utilisateur  administrateur"
 msgstr "Administrator user"
 
+#: include/user_detail.inc.php:113
+#, php-format
+msgid "Utilisateur %s %s est effacé"
+msgstr "User %s %s is removed"
+
 #: include/lib/database_core.class.php:66
 #, php-format
 msgid "Utilisateur : %s"
@@ -21543,6 +21865,7 @@ msgstr "Users"
 #: html/admin/template_config_form.php:47
 #: include/template/template_config_form.php:47
 #: include/template/template_config_form.php:48
+#: include/template/template_config_form.php:96
 msgid "Utilisateur Postgresql"
 msgstr "Postgresql users"
 
@@ -21553,6 +21876,7 @@ msgstr "Postgresql users"
 #: html/install.php:600 html/install.php:626 html/install.php:607
 #: html/install.php:633 html/install.php:217 html/install.php:636
 #: html/install.php:264 html/install.php:660 html/install.php:689
+#: html/install.php:269 html/install.php:695
 msgid "Utilisateur administrateur"
 msgstr "Administrator user"
 
@@ -21562,7 +21886,7 @@ msgstr "Postgresql user"
 
 #: html/admin/setup.php:77 html/admin/setup.php:80 html/admin/setup.php:131
 #: html/install.php:133 html/install.php:132 html/install.php:138
-#: html/install.php:145 html/install.php:158
+#: html/install.php:145 html/install.php:158 html/install.php:162
 msgid "Utilisateur de la base de donnée postgresql"
 msgstr "Postgresql user"
 
@@ -21592,7 +21916,7 @@ msgstr "This user has no profile, contact your administrator"
 #: include/user_detail.inc.php:169 include/user_detail.inc.php:165
 #: include/user_detail.inc.php:174 include/param_sec.inc.php:147
 #: include/export/export_security_pdf.php:66 include/param_sec.inc.php:153
-#: include/param_sec.inc.php:158
+#: include/param_sec.inc.php:158 include/user_detail.inc.php:185
 msgid "Utilisateur normal"
 msgstr "Users"
 
@@ -21667,7 +21991,7 @@ msgid "Utilitaire"
 msgstr "Utility"
 
 #: html/install.php:629 html/install.php:636 html/install.php:639
-#: html/install.php:692
+#: html/install.php:692 html/install.php:698
 #, php-format
 msgid "VOUS DEVEZ EFFACER CE FICHIER %s"
 msgstr "You must delete this file %s"
@@ -21682,7 +22006,8 @@ msgstr "Accounting system"
 #: include/lib/input_switch.class.php:56
 #: include/class/acc_ledger.class.php:2399 include/class/user.class.php:1402
 #: include/class/user.class.php:1431 include/lib/input_switch.class.php:57
-#: include/lib/input_checkbox.class.php:65
+#: include/lib/input_checkbox.class.php:65 include/class/user.class.php:1426
+#: include/class/user.class.php:1455
 msgid "Valeur invalide"
 msgstr "Invalid value"
 
@@ -21769,6 +22094,7 @@ msgstr "Validate ?"
 #: include/ajax/ajax_preference.php:280
 #: include/class/acc_ledger_search.class.php:1223
 #: include/ajax/ajax_preference.php:283
+#: include/class/acc_ledger_search.class.php:1246
 msgid "Valider"
 msgstr "Validate"
 
@@ -21820,6 +22146,7 @@ msgstr "Friday"
 #: include/database.item.php:253 include/class/acc_ledger_search.class.php:1186
 #: include/class/operation_predef_mtable.class.php:176
 #: include/database.item.php:10 include/database.item.php:218
+#: include/class/acc_ledger_search.class.php:1209
 msgid "Vente"
 msgstr "Sale"
 
@@ -21855,7 +22182,7 @@ msgstr "Noalyss version"
 msgid "Version PHP trop basse , minimum 5.4"
 msgstr "PHP version to low, minimum 5.4"
 
-#: html/install.php:356
+#: html/install.php:356 html/install.php:362
 msgid "Version PHP trop basse , minimum 7.0.33"
 msgstr "PHP version to low, minimum 7.0.33"
 
@@ -21863,7 +22190,7 @@ msgstr "PHP version to low, minimum 7.0.33"
 #: html/install.php:456 html/install.php:462 html/install.php:454
 #: html/install.php:460 html/install.php:424 html/install.php:399
 #: html/install.php:405 html/install.php:408 scenario/180209.php:18
-#: html/install.php:457
+#: html/install.php:457 html/install.php:463
 msgid "Version base de données :"
 msgstr "Postgresql version"
 
@@ -21931,7 +22258,7 @@ msgstr "Visible Y or N\n"
 msgid "Visualisation"
 msgstr "View"
 
-#: html/install.php:260
+#: html/install.php:260 html/install.php:265
 msgid ""
 "Voici l'utilisateur et mot de passe de l'utilisateur administrateur de "
 "Noalyss ,  il a tous les droits et a accès à tout. Connectez-vous avec ses "
@@ -21997,6 +22324,7 @@ msgstr "Do you have a copy of this issue"
 #: include/template/detail-action.php:247
 #: include/template/detail-action.php:249
 #: include/template/detail-action.php:336
+#: include/template/detail-action.php:346
 #, php-format
 msgid "Voulez-vous effacer ce commentaire"
 msgstr "Do you want to delete this comment"
@@ -22028,6 +22356,8 @@ msgstr "Do you want to delete this action ?"
 #: include/class/follow_up.class.php:2018
 #: include/class/follow_up.class.php:1906
 #: include/class/follow_up.class.php:1971
+#: include/class/follow_up.class.php:1880
+#: include/class/follow_up.class.php:1945
 #, php-format
 msgid "Voulez-vous effacer cette action "
 msgstr "Do you want to delete this action"
@@ -22045,6 +22375,7 @@ msgstr "Do you want to delete this transaction"
 #: include/lib/html_input.class.php:1025 include/lib/html_input.class.php:1083
 #: include/lib/html_input.class.php:1084 include/lib/html_input.class.php:1099
 #: include/lib/html_input.class.php:1100 include/lib/html_input.class.php:1133
+#: include/lib/html_input.class.php:1134
 #, php-format
 msgid "Voulez-vous effacer cette relation "
 msgstr "Do you want to delete this relation"
@@ -22060,6 +22391,7 @@ msgstr "Do you want to delete this relation"
 #: include/template/detail-action.php:442
 #: include/template/detail-action.php:440
 #: include/template/detail-action.php:453
+#: include/template/detail-action.php:466
 #, php-format
 msgid "Voulez-vous effacer le document"
 msgstr "Would you remove this Document"
@@ -22177,7 +22509,7 @@ msgstr "You must choose by file or by calculation"
 
 #: html/admin/setup.php:81 html/admin/setup.php:84 html/admin/setup.php:135
 #: html/install.php:137 html/install.php:136 html/install.php:142
-#: html/install.php:149 html/install.php:162
+#: html/install.php:149 html/install.php:162 html/install.php:166
 msgid ""
 "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"
@@ -22222,6 +22554,7 @@ msgstr "You must  confirm"
 #: html/install.php:480 html/install.php:486 html/install.php:478
 #: html/install.php:484 html/install.php:446 html/install.php:421
 #: html/install.php:427 html/install.php:430 html/install.php:479
+#: html/install.php:485
 msgid ""
 "Vous devez installer le langage plpgsql pour permettre aux fonctions SQL de "
 "fonctionner."
@@ -22231,6 +22564,7 @@ msgstr "You must install plpgsql "
 #: html/install.php:345 html/install.php:344 html/install.php:342
 #: html/install.php:348 html/install.php:354 html/install.php:318
 #: html/install.php:327 html/install.php:330 html/install.php:379
+#: html/install.php:385
 msgid "Vous devez installer ou activer l'extension"
 msgstr "You must set or activate the plugin"
 
@@ -22366,7 +22700,7 @@ msgstr "You can use the % to show the parent accounting"
 #: html/admin/setup.php:259 html/install.php:323 html/install.php:322
 #: html/install.php:320 html/install.php:326 html/install.php:332
 #: html/install.php:283 html/install.php:290 html/install.php:293
-#: html/install.php:342
+#: html/install.php:342 html/install.php:348
 msgid "Vous utilisez le domaine"
 msgstr "You are using the domain"
 
@@ -22430,6 +22764,7 @@ msgid "Vérification "
 msgstr "Verifying"
 
 #: include/template/ledger_detail_bottom.php:337
+#: include/template/ledger_detail_bottom.php:354
 msgid "Vérification CA"
 msgstr "Verify Analytic"
 
@@ -22548,7 +22883,7 @@ msgstr "Has an invalid Amount"
 #: html/admin/setup.php:272 html/install.php:336 html/install.php:335
 #: html/install.php:333 html/install.php:339 html/install.php:345
 #: html/install.php:309 html/install.php:316 html/install.php:319
-#: html/install.php:368
+#: html/install.php:368 html/install.php:374
 msgid "a une mauvaise valeur"
 msgstr "Has an invalid value"
 
@@ -22660,6 +22995,8 @@ msgstr "Choose"
 #: include/lib/html_input.class.php:1033 include/lib/html_input.class.php:1034
 #: include/class/acc_ledger_search.class.php:114
 #: include/lib/html_input.class.php:1067
+#: include/class/acc_ledger_search.class.php:116
+#: include/lib/html_input.class.php:1068
 msgid "choix des journaux"
 msgstr "Ledgers"
 
@@ -22702,7 +23039,7 @@ msgstr "Click here to update "
 #: include/class/pdf_operation.class.php:194
 #: include/class/pdf_operation.class.php:247 html/ajax_misc.php:456
 #: html/ajax_misc.php:458 html/ajax_misc.php:464 html/ajax_misc.php:466
-#: html/ajax_misc.php:470 html/ajax_misc.php:435
+#: html/ajax_misc.php:470 html/ajax_misc.php:435 html/ajax_misc.php:443
 msgid "code"
 msgstr "code"
 
@@ -22755,6 +23092,11 @@ msgstr "Credit"
 msgid "création, modification et effacement de catégorie de fiche"
 msgstr "creation, modification and deletion of category record"
 
+#: include/export/export_fiche_detail_pdf.php:112
+#: include/export/export_fiche_detail_pdf.php:216
+msgid "créditeur"
+msgstr "Credit"
+
 #: html/user_login.php:155 html/user_login.php:157 html/user_login.php:159
 msgid "dans NOALYSS"
 msgstr "in NOALYSS"
@@ -22791,6 +23133,7 @@ msgstr "delete_param : fail"
 #: include/template/ledger_detail_bottom.php:217
 #: include/template/ledger_detail_bottom.php:214
 #: include/template/ledger_detail_bottom.php:232
+#: include/template/ledger_detail_bottom.php:233
 msgid "delta"
 msgstr "Delta"
 
@@ -22804,6 +23147,7 @@ msgstr "Difference"
 #: include/class/follow_up.class.php:1948
 #: include/class/follow_up.class.php:1949
 #: include/class/follow_up.class.php:1901
+#: include/class/follow_up.class.php:1875
 msgid "direct parent "
 msgstr "Direct Parent"
 
@@ -22817,6 +23161,11 @@ msgstr "must be migrated in unicode"
 msgid "du poste comptable"
 msgstr "the accounting item"
 
+#: include/export/export_fiche_detail_pdf.php:117
+#: include/export/export_fiche_detail_pdf.php:221
+msgid "débiteur"
+msgstr "Debit"
+
 #: include/template/dashboard.php:112 include/template/dashboard.php:124
 #: include/template/dashboard.php:140 include/template/dashboard.php:150
 #: include/template/dashboard.php:165 include/template/dashboard.php:175
@@ -22839,7 +23188,7 @@ msgstr "Delete"
 #: include/ext/transform/include/template/listing_assujetti_declarant.php:54
 #: include/ext/transform/include/template/listing_assujetti_representative.php:54
 #: include/user_detail.inc.php:130 include/user_detail.inc.php:126
-#: include/user_detail.inc.php:135
+#: include/user_detail.inc.php:135 include/user_detail.inc.php:146
 msgid "email"
 msgstr "e-mail"
 
@@ -22895,6 +23244,8 @@ msgstr "Between 61 and 90 days"
 #: include/template/ledger_detail_bottom.php:352
 #: include/ajax/ajax_ledger.php:545
 #: include/template/ledger_detail_bottom.php:380
+#: include/ajax/ajax_ledger.php:546
+#: include/template/ledger_detail_bottom.php:397
 msgid "entrez une date"
 msgstr "Give a date"
 
@@ -22954,6 +23305,7 @@ msgstr " is accessed, disconnect first"
 #: include/dossier.inc.php:391 include/dossier.inc.php:392
 #: include/dossier.inc.php:147 include/dossier.inc.php:408
 #: include/dossier.inc.php:152 include/dossier.inc.php:413
+#: include/dossier.inc.php:154 include/dossier.inc.php:417
 msgid "est accèdée, déconnectez-vous d'abord"
 msgstr "Accessed is, first disconnect"
 
@@ -22981,7 +23333,7 @@ msgstr ""
 #: include/ajax/ajax_mod_periode.php:60 include/ajax/ajax_mod_periode.php:78
 #: include/ajax/ajax_periode.php:176 include/class/periode.class.php:707
 #: include/class/periode.class.php:709 include/class/periode.class.php:711
-#: include/class/periode.class.php:712
+#: include/class/periode.class.php:712 include/class/periode.class.php:713
 msgid "fermer"
 msgstr "close"
 
@@ -23064,7 +23416,7 @@ msgstr "Stock-History"
 #: include/dossier.inc.php:218 include/modele.inc.php:245
 #: include/dossier.inc.php:221 include/dossier.inc.php:226
 #: include/modele.inc.php:246 include/class/tva_rate_mtable.class.php:47
-#: include/modele.inc.php:247
+#: include/modele.inc.php:247 include/dossier.inc.php:229
 msgid "id"
 msgstr "id"
 
@@ -23083,7 +23435,7 @@ msgstr "Print"
 #: include/dossier.inc.php:355 include/dossier.inc.php:311
 #: include/dossier.inc.php:334 include/dossier.inc.php:370
 #: include/dossier.inc.php:371 include/dossier.inc.php:387
-#: include/dossier.inc.php:392
+#: include/dossier.inc.php:392 include/dossier.inc.php:396
 msgid "inexistant"
 msgstr "inexistent"
 
@@ -23292,10 +23644,11 @@ msgid "listing id"
 msgstr "listing id"
 
 #: include/user.inc.php:77 include/user.inc.php:78 include/user.inc.php:80
+#: include/user.inc.php:82
 msgid "login"
 msgstr "login"
 
-#: html/install.php:165
+#: html/install.php:165 html/install.php:169
 msgid "login administrateur"
 msgstr "Administrator"
 
@@ -23303,6 +23656,7 @@ msgstr "Administrator"
 #: html/install.php:413 html/install.php:412 html/install.php:410
 #: html/install.php:416 html/install.php:422 html/install.php:386
 #: html/install.php:353 html/install.php:356 html/install.php:405
+#: html/install.php:411
 msgid "max_execution_time devrait être de 60 minimum"
 msgstr "max_execution_time should be more than 60 "
 
@@ -23331,6 +23685,7 @@ msgstr "max_execution_time should be more than 60 "
 #: include/ajax/ajax_display_letter.php:69
 #: include/export/export_ledger_csv.php:233
 #: include/template/ledger_detail_bottom.php:231
+#: include/template/ledger_detail_bottom.php:232
 msgid "montant"
 msgstr "Amount"
 
@@ -23508,6 +23863,7 @@ msgstr "Internal code"
 #: include/class/acc_ledger_search.class.php:699
 #: include/class/acc_ledger_fin.class.php:753
 #: include/class/acc_ledger_search.class.php:785
+#: include/class/acc_ledger_search.class.php:808
 msgid "n° interne"
 msgstr "internal code"
 
@@ -23559,6 +23915,7 @@ msgid "op. concernée"
 msgstr "Concerned op"
 
 #: html/install.php:370 html/install.php:373 html/install.php:422
+#: html/install.php:428
 msgid "open_basedir empêche certaines fonctions de Noalyss,mettez-le à vide "
 msgstr "open_basedir must be empty or set properly"
 
@@ -23692,7 +24049,7 @@ msgstr "Invalid parameter"
 #: include/dossier.inc.php:254 include/dossier.inc.php:251
 #: include/dossier.inc.php:273 include/dossier.inc.php:307
 #: include/dossier.inc.php:308 include/dossier.inc.php:311
-#: include/dossier.inc.php:316
+#: include/dossier.inc.php:316 include/dossier.inc.php:319
 msgid "pas de modèle disponible"
 msgstr "No template"
 
@@ -23711,7 +24068,7 @@ msgstr "php is not  properly configured"
 #: html/admin/setup.php:375 html/install.php:439 html/install.php:438
 #: html/install.php:436 html/install.php:442 html/install.php:434
 #: html/install.php:440 html/install.php:404 html/install.php:379
-#: html/install.php:382 html/install.php:431
+#: html/install.php:382 html/install.php:431 html/install.php:437
 msgid "php mal configuré "
 msgstr "php is not  properly configured"
 
@@ -23722,7 +24079,7 @@ msgstr "php.ini corretly configured"
 #: html/admin/setup.php:373 html/install.php:437 html/install.php:436
 #: html/install.php:434 html/install.php:440 html/install.php:432
 #: html/install.php:438 html/install.php:402 html/install.php:377
-#: html/install.php:380 html/install.php:429
+#: html/install.php:380 html/install.php:429 html/install.php:435
 msgid "php.ini est bien configuré "
 msgstr "php.ini corretly configured"
 
@@ -23936,6 +24293,7 @@ msgstr "Reconciliation"
 #: include/template/action_search.php:152 include/customer.inc.php:103
 #: include/template/action_search.php:148 scenario/select-box-test.php:62
 #: include/template/action_search.php:161 include/contact.inc.php:99
+#: include/template/action_search.php:163
 msgid "recherche"
 msgstr "Search"
 
@@ -23958,7 +24316,7 @@ msgstr "Ref"
 #: html/admin/setup.php:357 html/install.php:421 html/install.php:420
 #: html/install.php:418 html/install.php:424 html/install.php:430
 #: html/install.php:394 html/install.php:361 html/install.php:364
-#: html/install.php:413
+#: html/install.php:413 html/install.php:419
 msgid "register_globals doit être à off"
 msgstr "register_globals must be set to off"
 
@@ -23986,7 +24344,7 @@ msgstr "new line"
 #: include/ajax_mod_periode.php:59 include/ajax/ajax_mod_periode.php:59
 #: include/ajax/ajax_periode.php:175 include/class/periode.class.php:706
 #: include/class/periode.class.php:708 include/class/periode.class.php:710
-#: include/class/periode.class.php:711
+#: include/class/periode.class.php:711 include/class/periode.class.php:712
 msgid "sauver"
 msgstr "Save"
 
@@ -24007,6 +24365,7 @@ msgstr ""
 #: html/install.php:611 html/install.php:627 html/install.php:619
 #: html/install.php:625 html/install.php:587 html/install.php:577
 #: html/install.php:583 html/install.php:586 html/install.php:636
+#: html/install.php:642
 msgid ""
 "soit noalyss/contrib/mono-dossier/mono-belge.sql pour la comptabilité belge"
 msgstr "or noalyss/contrib/mono-dossier/mono-belge.sql for belgian accountancy"
@@ -24015,6 +24374,7 @@ msgstr "or noalyss/contrib/mono-dossier/mono-belge.sql for belgian accountancy"
 #: html/install.php:610 html/install.php:626 html/install.php:618
 #: html/install.php:624 html/install.php:586 html/install.php:576
 #: html/install.php:582 html/install.php:585 html/install.php:635
+#: html/install.php:641
 msgid ""
 "soit noalyss/contrib/mono-dossier/mono-france.sql pour la comptabilité "
 "française"
@@ -24024,6 +24384,7 @@ msgstr "or noalyss/contrib/mono-dossier/mono-france.sql for french accountancy"
 #: html/install.php:612 html/install.php:628 html/install.php:620
 #: html/install.php:626 html/install.php:588 html/install.php:578
 #: html/install.php:584 html/install.php:587 html/install.php:637
+#: html/install.php:643
 msgid "soit y restaurer un backup ou un modèle"
 msgstr "or restore un backup or a template"
 
@@ -24134,6 +24495,7 @@ msgstr "Unknown operation"
 #: include/class/acc_ledger_search.class.php:946
 #: include/class/acc_ledger_search.class.php:959
 #: include/class/acc_ledger_search.class.php:1048
+#: include/class/acc_ledger_search.class.php:1071
 msgid "tiers"
 msgstr "Tiers"
 
@@ -24169,6 +24531,7 @@ msgstr "Total"
 #: include/export/export_fiche_detail_csv.php:182
 #: include/export/export_fiche_detail_pdf.php:122
 #: include/export/export_poste_detail_pdf.php:138
+#: include/export/export_poste_detail_pdf.php:139
 msgid "totaux"
 msgstr "Total"
 
@@ -24216,7 +24579,7 @@ msgstr "vat"
 #: html/ajax_misc.php:514 html/ajax_misc.php:519 html/ajax_misc.php:520
 #: html/ajax_misc.php:525 html/ajax_misc.php:522 html/ajax_misc.php:527
 #: html/ajax_misc.php:526 html/ajax_misc.php:531 html/ajax_misc.php:491
-#: html/ajax_misc.php:496
+#: html/ajax_misc.php:496 html/ajax_misc.php:499 html/ajax_misc.php:504
 msgid "tva inconnue"
 msgstr "VAT unknown"
 
@@ -24319,6 +24682,7 @@ msgstr "Do you confirm"
 #: include/template/ledger_detail_bottom.php:195
 #: include/template/ledger_detail_bottom.php:192
 #: include/template/ledger_detail_bottom.php:211
+#: include/template/ledger_detail_bottom.php:212
 msgid "vous confirmez?"
 msgstr "Do you confirm"
 
@@ -24577,9 +24941,6 @@ msgstr "Step 4"
 #~ msgid "Liste des achats"
 #~ msgstr "List of purchase"
 
-#~ msgid "Liste des tâches"
-#~ msgstr "Todo list"
-
 #~ msgid "Liste des ventes"
 #~ msgstr "List sales"
 
diff --git a/html/lang/messages.po b/html/lang/messages.po
index 2eec06ba0..0b1291009 100644
--- a/html/lang/messages.po
+++ b/html/lang/messages.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: include/database.item.php:125
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-04 17:42+0100\n"
+"POT-Creation-Date: 2020-11-13 08:52+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,6 +32,7 @@ msgstr ""
 #: include/ajax/ajax_card.php:148 include/class/fiche.class.php:661
 #: include/class/fiche.class.php:663 include/class/fiche.class.php:662
 #: include/class/fiche.class.php:681 include/ajax/ajax_card.php:151
+#: include/class/fiche.class.php:681 include/ajax/ajax_card.php:151
 msgid "Fiche non trouvée"
 msgstr ""
 
@@ -52,9 +52,10 @@ msgstr ""
 #: include/database.item.php:11 include/ajax/ajax_card.php:166
 #: include/database.item.php:5 include/database.item.php:98
 #: include/ext/import-winbook/index.php:66 include/fiche.inc.php:65
-#: include/ajax/ajax_card.php:167 include/fiche.inc.php:65
-#: include/ajax/ajax_card.php:170 include/database.item.php:4
-#: include/database.item.php:97
+#: include/ajax/ajax_card.php:167 include/ajax/ajax_card.php:170
+#: include/database.item.php:4 include/database.item.php:97
+#: include/fiche.inc.php:65 include/ajax/ajax_card.php:170
+#: include/database.item.php:4 include/database.item.php:97
 msgid "Historique"
 msgstr ""
 
@@ -62,7 +63,7 @@ msgstr ""
 #: html/ajax_card.php:192 include/ajax/ajax_card.php:172
 #: include/ajax/ajax_card.php:173 include/ajax/ajax_card.php:176
 #: include/ajax/ajax_card.php:182 include/ajax/ajax_card.php:183
-#: include/ajax/ajax_card.php:186
+#: include/ajax/ajax_card.php:186 include/ajax/ajax_card.php:186
 msgid "Aucune fiche demandée"
 msgstr ""
 
@@ -95,7 +96,13 @@ msgstr ""
 #: include/ajax/ajax_card.php:220 include/ajax/ajax_card.php:402
 #: include/ajax/ajax_card.php:603 include/ajax/ajax_card.php:658
 #: include/ajax/ajax_card.php:673 include/ajax/ajax_card.php:702
-#: include/ajax/ajax_card.php:738
+#: include/ajax/ajax_card.php:738 include/ajax/ajax_card.php:602
+#: include/ajax/ajax_card.php:657 include/ajax/ajax_card.php:672
+#: include/ajax/ajax_card.php:701 include/ajax/ajax_card.php:737
+#: include/ajax/ajax_card.php:220 include/ajax/ajax_card.php:402
+#: include/ajax/ajax_card.php:602 include/ajax/ajax_card.php:657
+#: include/ajax/ajax_card.php:672 include/ajax/ajax_card.php:701
+#: include/ajax/ajax_card.php:737
 msgid "Action interdite"
 msgstr ""
 
@@ -108,7 +115,8 @@ msgstr ""
 #: include/ajax/ajax_card.php:410 include/ajax/ajax_card.php:264
 #: include/ajax/ajax_card.php:413 include/ajax/ajax_card.php:265
 #: include/ajax/ajax_card.php:414 include/ajax/ajax_card.php:271
-#: include/ajax/ajax_card.php:468
+#: include/ajax/ajax_card.php:468 include/ajax/ajax_card.php:467
+#: include/ajax/ajax_card.php:271 include/ajax/ajax_card.php:467
 msgid ""
 "Aucune catégorie de fiche ne correspond à votre demande, le journal pourrait "
 "n'avoir accès à aucune fiche"
@@ -118,7 +126,7 @@ msgstr ""
 #: html/ajax_card.php:286 include/ajax/ajax_card.php:266
 #: include/ajax/ajax_card.php:267 include/ajax/ajax_card.php:273
 #: include/ajax/ajax_card.php:275 include/ajax/ajax_card.php:276
-#: include/ajax/ajax_card.php:282
+#: include/ajax/ajax_card.php:282 include/ajax/ajax_card.php:282
 msgid "Aucune catégorie de fiche ne correspond  à votre demande"
 msgstr ""
 
@@ -130,6 +138,7 @@ msgstr ""
 #: include/ajax/ajax_card.php:380 include/ajax/ajax_add_concerned_card.php:54
 #: include/ajax/ajax_card.php:383 include/ajax/ajax_card.php:384
 #: include/ajax/ajax_card.php:417 include/ajax/ajax_add_concerned_card.php:64
+#: include/ajax/ajax_card.php:417 include/ajax/ajax_add_concerned_card.php:64
 msgid "Fiche contenant"
 msgstr ""
 
@@ -204,9 +213,21 @@ msgstr ""
 #: include/ajax/ajax_search_operation.php:74 include/ajax/ajax_poste.php:63
 #: include/fiche.inc.php:86 include/class/acc_ledger_search.class.php:556
 #: include/ajax/ajax_card.php:386 include/database.item.php:57
-#: html/recherche.php:87 include/fiche.inc.php:86
-#: include/anc_acc_table.inc.php:15 include/anc_group_balance.inc.php:16
-#: include/class/acc_ledger_search.class.php:642
+#: html/recherche.php:87 include/class/acc_ledger_search.class.php:642
+#: include/lettering.account.inc.php:107 include/ajax/ajax_card.php:419
+#: include/ajax/ajax_search_operation.php:67
+#: include/ajax/ajax_search_operation.php:75
+#: include/ajax/ajax_anc_search.php:61
+#: include/ajax/ajax_add_concerned_card.php:90
+#: include/template/action_button.php:35 include/database.item.php:96
+#: include/lettering.card.inc.php:104 include/lib/html_input.class.php:984
+#: include/lib/html_input.class.php:1004 include/lib/html_input.class.php:1021
+#: include/upgrade-plugin.php:55 include/class/acc_ledger_search.class.php:665
+#: include/lib/html_input.class.php:985 include/lib/html_input.class.php:1005
+#: include/lib/html_input.class.php:1022 html/recherche.php:87
+#: include/fiche.inc.php:86 include/anc_acc_table.inc.php:15
+#: include/anc_group_balance.inc.php:16
+#: include/class/acc_ledger_search.class.php:665
 #: include/lettering.account.inc.php:107 include/ajax/ajax_card.php:419
 #: include/ajax/ajax_admin.php:144 include/ajax/ajax_search_operation.php:67
 #: include/ajax/ajax_search_operation.php:75
@@ -217,8 +238,8 @@ msgstr ""
 #: include/template/stock_histo_search.php:68
 #: include/lettering.gestion.inc.php:53 include/database.item.php:56
 #: include/database.item.php:96 include/lettering.card.inc.php:104
-#: include/anc_acc_balance.inc.php:15 include/lib/html_input.class.php:984
-#: include/lib/html_input.class.php:1004 include/lib/html_input.class.php:1021
+#: include/anc_acc_balance.inc.php:15 include/lib/html_input.class.php:985
+#: include/lib/html_input.class.php:1005 include/lib/html_input.class.php:1022
 #: include/upgrade-plugin.php:55 include/menu.inc.php:140
 #: include/menu.inc.php:143
 #, php-format
@@ -237,8 +258,9 @@ msgstr ""
 #: include/ajax/ajax_card.php:373 include/ajax/ajax_card.php:374
 #: include/ajax/ajax_card.php:375 include/ajax/ajax_card.php:408
 #: include/ajax/ajax_card.php:411 include/fiche.inc.php:93
-#: include/ajax/ajax_card.php:412 include/fiche.inc.php:93
-#: include/ajax/ajax_card.php:466
+#: include/ajax/ajax_card.php:412 include/ajax/ajax_card.php:466
+#: include/ajax/ajax_card.php:465 include/fiche.inc.php:93
+#: include/ajax/ajax_card.php:465
 msgid "Recherche de fiche"
 msgstr ""
 
@@ -247,7 +269,8 @@ msgstr ""
 #: include/ajax/ajax_card.php:439 include/ajax/ajax_card.php:440
 #: include/ajax/ajax_card.php:441 include/ajax/ajax_card.php:474
 #: include/ajax/ajax_card.php:478 include/ajax/ajax_card.php:479
-#: include/ajax/ajax_card.php:555
+#: include/ajax/ajax_card.php:555 include/ajax/ajax_card.php:554
+#: include/ajax/ajax_card.php:554
 msgid " de clients"
 msgstr ""
 
@@ -256,7 +279,8 @@ msgstr ""
 #: include/ajax/ajax_card.php:443 include/ajax/ajax_card.php:444
 #: include/ajax/ajax_card.php:445 include/ajax/ajax_card.php:478
 #: include/ajax/ajax_card.php:482 include/ajax/ajax_card.php:483
-#: include/ajax/ajax_card.php:559
+#: include/ajax/ajax_card.php:559 include/ajax/ajax_card.php:558
+#: include/ajax/ajax_card.php:558
 msgid " de fournisseurs"
 msgstr ""
 
@@ -265,7 +289,8 @@ msgstr ""
 #: include/ajax/ajax_card.php:447 include/ajax/ajax_card.php:448
 #: include/ajax/ajax_card.php:449 include/ajax/ajax_card.php:482
 #: include/ajax/ajax_card.php:486 include/ajax/ajax_card.php:487
-#: include/ajax/ajax_card.php:563
+#: include/ajax/ajax_card.php:563 include/ajax/ajax_card.php:562
+#: include/ajax/ajax_card.php:562
 msgid " d'administration"
 msgstr ""
 
@@ -307,7 +332,8 @@ msgstr ""
 #: include/ext/rapport_avance/include/formulaire_param_detail.class.php:368
 #: include/ajax/ajax_card.php:506 include/class/acc_report.class.php:151
 #: include/ajax/ajax_card.php:510 include/ajax/ajax_card.php:511
-#: include/class/acc_report.class.php:151 include/ajax/ajax_card.php:587
+#: include/ajax/ajax_card.php:587 include/ajax/ajax_card.php:586
+#: include/class/acc_report.class.php:151 include/ajax/ajax_card.php:586
 msgid "Recherche poste"
 msgstr ""
 
@@ -351,10 +377,12 @@ msgstr ""
 #: include/template/dashboard.php:350 include/ajax/ajax_card.php:203
 #: include/ajax/ajax_card.php:517 include/ajax/ajax_mod_predf_op.php:54
 #: include/cfgledger.inc.php:137 include/ajax/ajax_card.php:204
-#: include/ajax/ajax_card.php:518 include/class/fiche_def.class.php:812
-#: include/ajax/ajax_mod_predf_op.php:67 include/ajax/ajax_card.php:207
-#: include/ajax/ajax_card.php:594 include/compta_fin.inc.php:149
-#: include/template/todo_list_display.php:105
+#: include/ajax/ajax_card.php:518 include/ajax/ajax_mod_predf_op.php:67
+#: include/ajax/ajax_card.php:207 include/ajax/ajax_card.php:594
+#: include/company.inc.php:163 include/ajax/ajax_card.php:593
+#: include/class/fiche_def.class.php:812 include/ajax/ajax_mod_predf_op.php:67
+#: include/ajax/ajax_card.php:207 include/ajax/ajax_card.php:593
+#: include/compta_fin.inc.php:149 include/template/todo_list_display.php:105
 #: include/template/pcmn_update.php:53 include/template/dashboard.php:350
 #: include/report.inc.php:88 include/report.inc.php:103
 #: include/company.inc.php:163 include/cfgledger.inc.php:137
@@ -367,6 +395,7 @@ msgstr ""
 #: include/ajax/ajax_card.php:510 include/ajax/ajax_card.php:511
 #: include/ajax/ajax_card.php:544 include/ajax/ajax_card.php:548
 #: include/ajax/ajax_card.php:563 include/ajax/ajax_card.php:639
+#: include/ajax/ajax_card.php:638 include/ajax/ajax_card.php:638
 msgid "Catégorie existe déjà"
 msgstr ""
 
@@ -376,6 +405,7 @@ msgstr ""
 #: include/ajax/ajax_card.php:512 include/ajax/ajax_card.php:513
 #: include/ajax/ajax_card.php:546 include/ajax/ajax_card.php:550
 #: include/ajax/ajax_card.php:567 include/ajax/ajax_card.php:643
+#: include/ajax/ajax_card.php:642 include/ajax/ajax_card.php:642
 msgid "Catégorie sauvée"
 msgstr ""
 
@@ -393,6 +423,9 @@ msgstr ""
 #: include/ajax/ajax_card.php:607 include/ajax/ajax_card.php:600
 #: include/ajax/ajax_card.php:630 include/ajax/ajax_card.php:679
 #: include/ajax/ajax_card.php:708 include/ajax/ajax_card.php:744
+#: include/ajax/ajax_card.php:678 include/ajax/ajax_card.php:707
+#: include/ajax/ajax_card.php:743 include/ajax/ajax_card.php:678
+#: include/ajax/ajax_card.php:707 include/ajax/ajax_card.php:743
 msgid "Fiche non valide"
 msgstr ""
 
@@ -404,16 +437,18 @@ msgstr ""
 #: include/ajax/ajax_ledger.php:103 include/ajax/ajax_ledger.php:125
 #: include/template/ledger_detail_bottom.php:37 include/ext/tva/ajax.php:101
 #: include/ext/tva/ajax.php:200 include/ajax/ajax_ledger.php:104
-#: include/ajax/ajax_ledger.php:126 include/ajax/ajax_ledger.php:104
 #: include/ajax/ajax_ledger.php:126
 #: include/template/ledger_detail_bottom.php:42
+#: include/ajax/ajax_ledger.php:105 include/ajax/ajax_ledger.php:127
+#: include/ajax/ajax_ledger.php:105 include/ajax/ajax_ledger.php:127
+#: include/template/ledger_detail_bottom.php:42
 msgid "Information"
 msgstr ""
 
 #: html/ajax_ledger.php:156 html/ajax_ledger.php:174 html/ajax_ledger.php:175
 #: include/ajax/ajax_ledger.php:152 include/ajax/ajax_ledger.php:155
 #: include/ajax/ajax_ledger.php:159 include/ajax/ajax_ledger.php:160
-#: include/ajax/ajax_ledger.php:160
+#: include/ajax/ajax_ledger.php:161 include/ajax/ajax_ledger.php:161
 msgid "Opération Effacée"
 msgstr ""
 
@@ -421,7 +456,8 @@ msgstr ""
 #: html/ajax_ledger.php:223 html/ajax_ledger.php:225
 #: include/ajax/ajax_ledger.php:202 include/ajax/ajax_ledger.php:205
 #: include/ajax/ajax_ledger.php:207 include/ajax/ajax_ledger.php:211
-#: include/ajax/ajax_ledger.php:212 include/ajax/ajax_ledger.php:212
+#: include/ajax/ajax_ledger.php:212 include/ajax/ajax_ledger.php:213
+#: include/ajax/ajax_ledger.php:213
 msgid "Désolé il y a une erreur"
 msgstr ""
 
@@ -429,7 +465,8 @@ msgstr ""
 #: html/ajax_ledger.php:277 html/ajax_ledger.php:279
 #: include/ajax/ajax_ledger.php:256 include/ajax/ajax_ledger.php:259
 #: include/ajax/ajax_ledger.php:261 include/ajax/ajax_ledger.php:265
-#: include/ajax/ajax_ledger.php:266 include/ajax/ajax_ledger.php:266
+#: include/ajax/ajax_ledger.php:266 include/ajax/ajax_ledger.php:267
+#: include/ajax/ajax_ledger.php:267
 msgid "Aucun fichier"
 msgstr ""
 
@@ -465,10 +502,14 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:696
 #: include/class/acc_ledger_search.class.php:709 include/compta_ven.inc.php:186
 #: include/ajax/ajax_ledger.php:323 include/ajax/ajax_ledger.php:352
-#: include/compta_ach.inc.php:174 include/compta_ven.inc.php:186
-#: include/class/document.class.php:177
-#: include/class/acc_ledger_search.class.php:795
-#: include/ajax/ajax_ledger.php:323 include/ajax/ajax_ledger.php:352
+#: include/compta_ach.inc.php:174 include/class/document.class.php:177
+#: include/class/acc_ledger_search.class.php:795 include/compta_ach.inc.php:173
+#: include/template/ledger_detail_bottom.php:44 include/database.item.php:88
+#: include/class/acc_ledger_search.class.php:818
+#: include/ajax/ajax_ledger.php:324 include/ajax/ajax_ledger.php:353
+#: include/compta_ven.inc.php:186 include/class/document.class.php:177
+#: include/class/acc_ledger_search.class.php:818
+#: include/ajax/ajax_ledger.php:324 include/ajax/ajax_ledger.php:353
 #: include/compta_ach.inc.php:173 include/template/ledger_detail_bottom.php:44
 #: include/database.item.php:88 include/operation_ods_confirm.inc.php:52
 msgid "Document"
@@ -484,8 +525,8 @@ msgstr ""
 #: include/ajax/ajax_ledger.php:504 include/ajax/ajax_ledger.php:508
 #: include/anc_od.inc.php:121 include/ajax/ajax_ledger.php:509
 #: include/ext/modop/modop_save.php:165 include/ajax/ajax_ledger.php:510
-#: include/ajax/ajax_ledger.php:510 include/stock_inv.inc.php:40
-#: include/anc_od.inc.php:121
+#: include/ajax/ajax_ledger.php:511 include/ajax/ajax_ledger.php:511
+#: include/stock_inv.inc.php:40 include/anc_od.inc.php:121
 msgid "Opération sauvée"
 msgstr ""
 
@@ -493,7 +534,8 @@ msgstr ""
 #: html/ajax_ledger.php:522 html/ajax_ledger.php:529 html/ajax_ledger.php:531
 #: include/ajax/ajax_ledger.php:508 include/ajax/ajax_ledger.php:511
 #: include/ajax/ajax_ledger.php:515 include/ajax/ajax_ledger.php:516
-#: include/ajax/ajax_ledger.php:517 include/ajax/ajax_ledger.php:517
+#: include/ajax/ajax_ledger.php:517 include/ajax/ajax_ledger.php:518
+#: include/ajax/ajax_ledger.php:518
 msgid ""
 "Changement impossible: on ne peut pas changer la date dans une période fermée"
 msgstr ""
@@ -502,7 +544,8 @@ msgstr ""
 #: html/ajax_ledger.php:564 html/ajax_ledger.php:576 html/ajax_ledger.php:578
 #: include/ajax/ajax_ledger.php:555 include/ajax/ajax_ledger.php:558
 #: include/ajax/ajax_ledger.php:563 include/ajax/ajax_ledger.php:568
-#: include/ajax/ajax_ledger.php:569 include/ajax/ajax_ledger.php:569
+#: include/ajax/ajax_ledger.php:569 include/ajax/ajax_ledger.php:570
+#: include/ajax/ajax_ledger.php:570
 msgid "Opération extournée"
 msgstr ""
 
@@ -515,8 +558,8 @@ msgstr ""
 #: include/class/pdf_operation.class.php:194
 #: include/class/pdf_operation.class.php:247 html/ajax_misc.php:456
 #: html/ajax_misc.php:458 html/ajax_misc.php:464 html/ajax_misc.php:466
-#: html/ajax_misc.php:470 html/ajax_misc.php:435
-#: include/class/pdf_operation.class.php:149
+#: html/ajax_misc.php:470 html/ajax_misc.php:435 html/ajax_misc.php:443
+#: html/ajax_misc.php:443 include/class/pdf_operation.class.php:149
 #: include/class/pdf_operation.class.php:194
 #: include/class/pdf_operation.class.php:247
 msgid "code"
@@ -537,6 +580,10 @@ msgstr ""
 #: include/export/export_printtva_pdf.php:59
 #: include/export/export_printtva_pdf.php:216
 #: include/export/export_printtva_csv.php:53
+#: include/export/export_printtva_csv.php:72 html/ajax_misc.php:444
+#: html/ajax_misc.php:444 include/export/export_printtva_pdf.php:59
+#: include/export/export_printtva_pdf.php:216
+#: include/export/export_printtva_csv.php:53
 #: include/export/export_printtva_csv.php:72
 #: include/template/tax_summary_display.php:61
 #: include/template/tax_summary_display.php:119
@@ -549,7 +596,7 @@ msgstr ""
 #: html/ajax_misc.php:235 html/ajax_misc.php:313 html/ajax_misc.php:318
 #: html/ajax_misc.php:346 html/ajax_misc.php:458 html/ajax_misc.php:460
 #: html/ajax_misc.php:466 html/ajax_misc.php:468 html/ajax_misc.php:472
-#: html/ajax_misc.php:437
+#: html/ajax_misc.php:437 html/ajax_misc.php:445 html/ajax_misc.php:445
 msgid "Symbole"
 msgstr ""
 
@@ -557,7 +604,7 @@ msgstr ""
 #: html/ajax_misc.php:236 html/ajax_misc.php:314 html/ajax_misc.php:319
 #: html/ajax_misc.php:347 html/ajax_misc.php:459 html/ajax_misc.php:461
 #: html/ajax_misc.php:467 html/ajax_misc.php:469 html/ajax_misc.php:473
-#: html/ajax_misc.php:438
+#: html/ajax_misc.php:438 html/ajax_misc.php:446 html/ajax_misc.php:446
 msgid "Explication"
 msgstr ""
 
@@ -569,7 +616,8 @@ msgstr ""
 #: html/ajax_misc.php:514 html/ajax_misc.php:519 html/ajax_misc.php:520
 #: html/ajax_misc.php:525 html/ajax_misc.php:522 html/ajax_misc.php:527
 #: html/ajax_misc.php:526 html/ajax_misc.php:531 html/ajax_misc.php:491
-#: html/ajax_misc.php:496
+#: html/ajax_misc.php:496 html/ajax_misc.php:499 html/ajax_misc.php:504
+#: html/ajax_misc.php:499 html/ajax_misc.php:504
 msgid "tva inconnue"
 msgstr ""
 
@@ -607,14 +655,15 @@ msgstr ""
 #: include/modele.inc.php:403 include/modele.inc.php:443
 #: include/ajax/ajax_display_letter.php:39 include/cfgledger.inc.php:141
 #: include/ext/tva/ajax.php:35 html/do.php:312 html/do.php:281
-#: include/modele.inc.php:404 include/modele.inc.php:444 html/user_login.php:71
-#: html/do.php:283 include/opening.inc.php:177
-#: include/ajax/ajax_display_letter.php:53 include/ajax/ajax_get_profile.php:50
-#: include/modele.inc.php:72 include/modele.inc.php:404
-#: include/modele.inc.php:444 include/forecast.inc.php:351
-#: include/restore.inc.php:51 include/dossier.inc.php:383
-#: include/dossier.inc.php:426 include/report.inc.php:129
-#: include/cfgledger.inc.php:141
+#: include/modele.inc.php:404 include/modele.inc.php:444 html/do.php:283
+#: include/ajax/ajax_display_letter.php:53 include/dossier.inc.php:387
+#: include/dossier.inc.php:431 html/user_login.php:71 html/do.php:283
+#: include/opening.inc.php:177 include/ajax/ajax_display_letter.php:53
+#: include/ajax/ajax_get_profile.php:50 include/modele.inc.php:72
+#: include/modele.inc.php:404 include/modele.inc.php:444
+#: include/forecast.inc.php:351 include/restore.inc.php:51
+#: include/dossier.inc.php:387 include/dossier.inc.php:431
+#: include/report.inc.php:129 include/cfgledger.inc.php:141
 msgid "Retour"
 msgstr ""
 
@@ -631,6 +680,7 @@ msgstr ""
 #: include/category_card.inc.php:79 include/export/export_gl_csv.php:96
 #: include/database.item.php:74 include/ajax/ajax_display_letter.php:49
 #: include/category_card.inc.php:81 include/ajax/ajax_display_letter.php:63
+#: include/database.item.php:73 include/ajax/ajax_display_letter.php:63
 #: include/export/export_gl_csv.php:96 include/template/letter_all.php:20
 #: include/template/letter_prop.php:22 include/template/letter_prop.php:65
 #: include/database.item.php:73 include/category_card.inc.php:81
@@ -642,6 +692,7 @@ msgstr ""
 #: include/ajax/ajax_display_letter.php:69
 #: include/ajax/ajax_display_letter.php:74
 #: include/ajax/ajax_display_letter.php:89
+#: include/ajax/ajax_display_letter.php:89
 msgid "Montant min. "
 msgstr ""
 
@@ -650,6 +701,7 @@ msgstr ""
 #: include/ajax/ajax_display_letter.php:76
 #: include/ajax/ajax_display_letter.php:81
 #: include/ajax/ajax_display_letter.php:96
+#: include/ajax/ajax_display_letter.php:96
 msgid "Montant max. "
 msgstr ""
 
@@ -662,6 +714,8 @@ msgstr ""
 #: include/ajax/ajax_display_letter.php:110
 #: include/ajax/ajax_display_letter.php:112
 #: include/ajax/ajax_display_letter.php:128
+#: include/ajax/ajax_display_letter.php:112
+#: include/ajax/ajax_display_letter.php:128
 msgid "Date malformée"
 msgstr ""
 
@@ -677,7 +731,9 @@ msgstr ""
 #: include/ajax/ajax_display_letter.php:122 include/fiche.inc.php:576
 #: include/fiche.inc.php:585 include/fiche.inc.php:598
 #: include/ajax/ajax_display_letter.php:140
-#: include/export/export_poste_detail_pdf.php:102
+#: include/export/export_poste_detail_pdf.php:103 include/fiche.inc.php:598
+#: include/ajax/ajax_display_letter.php:140
+#: include/export/export_poste_detail_pdf.php:103
 msgid "Debit"
 msgstr ""
 
@@ -693,7 +749,9 @@ msgstr ""
 #: include/ajax/ajax_display_letter.php:123 include/fiche.inc.php:580
 #: include/fiche.inc.php:589 include/fiche.inc.php:602
 #: include/ajax/ajax_display_letter.php:141
-#: include/export/export_poste_detail_pdf.php:104
+#: include/export/export_poste_detail_pdf.php:105 include/fiche.inc.php:602
+#: include/ajax/ajax_display_letter.php:141
+#: include/export/export_poste_detail_pdf.php:105
 msgid "Credit"
 msgstr ""
 
@@ -702,6 +760,7 @@ msgstr ""
 #: include/ajax/ajax_display_letter.php:119
 #: include/ajax/ajax_display_letter.php:124
 #: include/ajax/ajax_display_letter.php:142
+#: include/ajax/ajax_display_letter.php:142
 msgid "Les 2"
 msgstr ""
 
@@ -788,13 +847,18 @@ msgstr ""
 #: include/template/stock_inv.php:107 include/class/acc_ledger.class.php:2028
 #: include/template/ledger_detail_bottom.php:315 include/ajax/ajax_card.php:165
 #: include/class/acc_ledger.class.php:2044
+#: include/class/acc_ledger.class.php:2063
+#: include/ajax/ajax_display_letter.php:226 include/ajax/ajax_card.php:168
+#: include/template/ledger_detail_bottom.php:333
+#: include/template/card_multiple_display_option.php:114
+#: include/template/ledger_detail_bottom.php:350
 #: include/class/fiche_def.class.php:775
 #: include/class/acc_ledger.class.php:2063
 #: include/ajax/ajax_display_letter.php:226 include/ajax/ajax_card.php:168
 #: include/ajax/ajax_mod_stock_repo.php:79 include/ajax/ajax_create_menu.php:16
 #: include/ajax/ajax_mod_menu.php:18 include/stock_cfg.inc.php:164
 #: include/default_menu.inc.php:45 include/template/modele_document.php:119
-#: include/template/ledger_detail_bottom.php:333
+#: include/template/ledger_detail_bottom.php:350
 #: include/template/stock_inv.php:107 include/template/user_sec_profile.php:58
 #: include/template/profile_sec_repository.php:59
 #: include/template/card_multiple_display_option.php:114
@@ -837,19 +901,21 @@ msgstr ""
 #: include/class/acc_plan_mtable.class.php:45 include/class/fiche.class.php:470
 #: include/class/fiche.class.php:469
 #: include/class/pdfbalance_simple.class.php:55
+#: include/template/ledger_detail_bottom.php:93
+#: include/template/ledger_detail_bottom.php:94
 #: include/class/pdfbalance_simple.class.php:55
 #: include/class/fiche.class.php:470 include/class/acc_plan_mtable.class.php:45
 #: include/ajax/ajax_poste.php:65 include/balance.inc.php:306
 #: include/template/ledger_detail_misc.php:99
 #: include/template/operation_detail_misc.php:32
-#: include/template/ledger_detail_bottom.php:93
+#: include/template/ledger_detail_bottom.php:94
 #: include/template/fiche_list.php:41 include/database.item.php:174
 msgid "Poste Comptable"
 msgstr ""
 
 #: html/do.php:44 html/popup.php:38 html/popup.php:35 html/do.php:47
-#: html/do.php:48 html/popup.php:37 html/popup.php:37 html/do.php:47
-#: html/recherche.php:33
+#: html/do.php:48 html/popup.php:37 html/recherche.php:33 html/popup.php:37
+#: html/do.php:47 html/recherche.php:33
 msgid "Vous  êtes déconnecté"
 msgstr ""
 
@@ -981,10 +1047,13 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:553
 #: include/class/acc_ledger_search.class.php:562 include/modele.inc.php:279
 #: html/recherche.php:88 include/class/acc_ledger_search.class.php:648
-#: include/cfgplugin.inc.php:110 include/ajax/ajax_search_filter.php:128
-#: include/modele.inc.php:279 include/balance.inc.php:101
-#: include/forecast.inc.php:386 include/lettering.card.inc.php:98
-#: include/menu.inc.php:146
+#: include/lettering.card.inc.php:98
+#: include/class/acc_ledger_search.class.php:671
+#: include/ajax/ajax_search_filter.php:137 html/recherche.php:88
+#: include/class/acc_ledger_search.class.php:671 include/cfgplugin.inc.php:110
+#: include/ajax/ajax_search_filter.php:137 include/modele.inc.php:279
+#: include/balance.inc.php:101 include/forecast.inc.php:386
+#: include/lettering.card.inc.php:98 include/menu.inc.php:146
 msgid "Filtre"
 msgstr ""
 
@@ -999,6 +1068,8 @@ msgstr ""
 #: include/action.common.inc.php:165 include/lib/ac_common.php:434
 #: include/lib/ac_common.php:450 include/action.common.inc.php:133
 #: include/action.common.inc.php:167 include/lib/ac_common.php:460
+#: include/action.common.inc.php:133 include/action.common.inc.php:167
+#: include/lib/ac_common.php:460
 msgid "Cette action ne vous est pas autorisée Contactez votre responsable"
 msgstr ""
 
@@ -1009,6 +1080,7 @@ msgstr ""
 #: include/lib/ac_common.php:436 include/lib/ac_common.php:437
 #: include/lib/ac_common.php:438 include/lib/ac_common.php:440
 #: include/lib/ac_common.php:456 include/lib/ac_common.php:466
+#: include/lib/ac_common.php:466
 msgid " Cette action ne vous est pas autorisée Contactez votre responsable"
 msgstr ""
 
@@ -1023,7 +1095,8 @@ msgstr ""
 #: include/lib/ac_common.php:881 include/class/extension.class.php:122
 #: include/lib/ac_common.php:893 include/class/extension.class.php:138
 #: include/lib/ac_common.php:895 include/lib/ac_common.php:911
-#: include/class/extension.class.php:138 include/lib/ac_common.php:921
+#: include/lib/ac_common.php:921 include/class/extension.class.php:138
+#: include/lib/ac_common.php:921
 msgid "Module inexistant"
 msgstr ""
 
@@ -1054,6 +1127,8 @@ msgstr ""
 #: include/compta_ven.inc.php:338 include/compta_ach.inc.php:296
 #: include/compta_ven.inc.php:330 include/compta_ach.inc.php:297
 #: include/action.common.inc.php:205 include/action.common.inc.php:361
+#: include/compta_ven.inc.php:330 include/compta_ach.inc.php:297
+#: include/action.common.inc.php:205 include/action.common.inc.php:361
 msgid "Enregistrer"
 msgstr ""
 
@@ -1075,6 +1150,7 @@ msgstr ""
 #: include/action.common.inc.php:208 include/action.common.inc.php:213
 #: include/action.common.inc.php:215 include/action.common.inc.php:216
 #: include/action.common.inc.php:222 include/action.common.inc.php:244
+#: include/action.common.inc.php:244
 msgid "Vous confirmez l\\'effacement"
 msgstr ""
 
@@ -1084,8 +1160,8 @@ msgstr ""
 #: include/ajax/ajax_view_action.php:55 include/action.common.inc.php:223
 #: include/action.common.inc.php:225 include/ajax/ajax_view_action.php:56
 #: include/ajax/ajax_view_action.php:52 include/action.common.inc.php:226
-#: include/action.common.inc.php:232 include/ajax/ajax_view_action.php:52
-#: include/action.common.inc.php:257
+#: include/action.common.inc.php:232 include/action.common.inc.php:257
+#: include/ajax/ajax_view_action.php:52 include/action.common.inc.php:257
 msgid "Ce document n'est pas accessible"
 msgstr ""
 
@@ -1093,6 +1169,7 @@ msgstr ""
 #: include/action.common.inc.php:239 include/action.common.inc.php:244
 #: include/action.common.inc.php:246 include/action.common.inc.php:247
 #: include/action.common.inc.php:253 include/action.common.inc.php:278
+#: include/action.common.inc.php:278
 msgid "Action "
 msgstr ""
 
@@ -1100,11 +1177,12 @@ msgstr ""
 #: include/action.common.inc.php:239 include/action.common.inc.php:244
 #: include/action.common.inc.php:246 include/action.common.inc.php:247
 #: include/action.common.inc.php:253 include/action.common.inc.php:278
+#: include/action.common.inc.php:278
 msgid " effacée"
 msgstr ""
 
 #: include/action.inc.php:26 include/action.inc.php:25
-#: include/action.inc.php:27
+#: include/action.inc.php:27 include/action.inc.php:27
 msgid "Retour liste"
 msgstr ""
 
@@ -1117,9 +1195,9 @@ msgstr ""
 #: include/customer.inc.php:89 include/manager.inc.php:92
 #: include/supplier.inc.php:92 include/contact.inc.php:86
 #: include/manager.inc.php:93 include/customer.inc.php:90
-#: include/bank.inc.php:86 include/adm.inc.php:90 include/supplier.inc.php:92
-#: include/contact.inc.php:87 include/customer.inc.php:90
-#: include/manager.inc.php:93
+#: include/contact.inc.php:87 include/bank.inc.php:86 include/adm.inc.php:90
+#: include/supplier.inc.php:92 include/contact.inc.php:87
+#: include/customer.inc.php:90 include/manager.inc.php:93
 msgid "Catégorie :"
 msgstr ""
 
@@ -1135,10 +1213,12 @@ msgstr ""
 #: include/contact.inc.php:98 include/manager.inc.php:105
 #: include/template/action_search.php:152 include/customer.inc.php:103
 #: include/template/action_search.php:148 scenario/select-box-test.php:62
-#: scenario/select-box-test.php:62 include/bank.inc.php:99
-#: include/adm.inc.php:100 include/template/action_search.php:161
-#: include/supplier.inc.php:104 include/contact.inc.php:99
-#: include/customer.inc.php:103 include/manager.inc.php:105
+#: include/template/action_search.php:161 include/contact.inc.php:99
+#: include/template/action_search.php:163 scenario/select-box-test.php:62
+#: include/bank.inc.php:99 include/adm.inc.php:100
+#: include/template/action_search.php:163 include/supplier.inc.php:104
+#: include/contact.inc.php:99 include/customer.inc.php:103
+#: include/manager.inc.php:105
 msgid "recherche"
 msgstr ""
 
@@ -1229,13 +1309,22 @@ msgstr ""
 #: include/class/follow_up.class.php:297 include/category_card.inc.php:162
 #: include/class/acc_ledger.class.php:2436 include/fiche.inc.php:116
 #: include/class/acc_ledger.class.php:2445
-#: include/class/acc_ledger.class.php:2476 include/fiche.inc.php:116
-#: include/fiche.inc.php:241 include/class/pre_op_ach.class.php:177
+#: include/class/acc_ledger.class.php:2476 include/fiche.inc.php:241
+#: include/class/pre_op_ach.class.php:177
 #: include/class/pre_op_ach.class.php:184 include/class/follow_up.class.php:304
 #: include/class/pre_op_ven.class.php:173
 #: include/class/pre_op_ven.class.php:180
 #: include/class/acc_ledger.class.php:2505
 #: include/class/pre_op_advanced.class.php:177 include/bank.inc.php:125
+#: include/supplier.inc.php:130 include/contact.inc.php:131
+#: include/customer.inc.php:128 include/class/follow_up.class.php:306
+#: include/fiche.inc.php:116 include/fiche.inc.php:241
+#: include/class/pre_op_ach.class.php:177
+#: include/class/pre_op_ach.class.php:184 include/class/follow_up.class.php:306
+#: include/class/pre_op_ven.class.php:173
+#: include/class/pre_op_ven.class.php:180
+#: include/class/acc_ledger.class.php:2505
+#: include/class/pre_op_advanced.class.php:177 include/bank.inc.php:125
 #: include/adm.inc.php:125 include/supplier.inc.php:130
 #: include/contact.inc.php:131 include/customer.inc.php:128
 #: include/manager.inc.php:131 include/category_card.inc.php:162
@@ -1252,6 +1341,8 @@ msgstr ""
 #: include/manager.inc.php:140 include/supplier.inc.php:139
 #: include/contact.inc.php:138 include/manager.inc.php:141
 #: include/adm.inc.php:136 include/customer.inc.php:138
+#: include/bank.inc.php:135 include/supplier.inc.php:140
+#: include/contact.inc.php:140 include/customer.inc.php:139
 #: include/bank.inc.php:135 include/adm.inc.php:136
 #: include/supplier.inc.php:140 include/contact.inc.php:140
 #: include/customer.inc.php:139 include/manager.inc.php:141
@@ -1333,9 +1424,21 @@ msgstr ""
 #: include/class/acc_ledger_fin.class.php:754
 #: include/class/fiche.class.php:1780 include/class/fiche.class.php:1781
 #: include/modele.inc.php:248 include/modele.inc.php:359
-#: include/database.item.php:157
+#: include/database.item.php:157 include/class/acc_ledger_search.class.php:1193
+#: include/class/tag_group_mtable.class.php:40
+#: include/class/operation_predef_mtable.class.php:52
+#: include/class/fiche.class.php:1807
+#: include/class/card_attribut_mtable.class.php:39
+#: include/class/action_document_type_mtable.class.php:48
+#: include/class/anc_plan.class.php:138 include/class/anc_plan.class.php:154
+#: include/class/contact_option_ref_mtable.class.php:36
+#: include/class/user.class.php:991
+#: include/template/card_multiple_result.php:19 include/upgrade-plugin.php:62
+#: include/class/acc_ledger_search.class.php:1216
+#: include/template/follow_up_other_concerned_display_table.php:45
+#: include/user.inc.php:84 include/user.inc.php:128 include/dossier.inc.php:230
 #: include/class/template_card_category.class.php:42
-#: include/class/acc_ledger_search.class.php:1193
+#: include/class/acc_ledger_search.class.php:1216
 #: include/class/tag_group_mtable.class.php:40
 #: include/class/operation_predef_mtable.class.php:52
 #: include/class/document_modele.class.php:67
@@ -1352,11 +1455,12 @@ msgstr ""
 #: include/modele.inc.php:359 include/stock_cfg.inc.php:65
 #: include/upgrade-template.php:51 include/export/export_anc_axis_csv.php:44
 #: include/export/export_fiche_balance_csv.php:57
+#: include/template/follow_up_other_concerned_display_table.php:45
 #: include/template/profile.php:33 include/template/forecast_cat.php:15
 #: include/template/card_multiple_result.php:19
-#: include/template/fiche_list.php:38 include/user.inc.php:82
-#: include/user.inc.php:126 include/database.item.php:153
-#: include/dossier.inc.php:227 include/profile.inc.php:359
+#: include/template/fiche_list.php:38 include/user.inc.php:84
+#: include/user.inc.php:128 include/database.item.php:153
+#: include/dossier.inc.php:230 include/profile.inc.php:359
 #: include/upgrade-plugin.php:62 include/param_sec.inc.php:58
 msgid "Nom"
 msgstr ""
@@ -1440,6 +1544,8 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:1409
 #: include/class/acc_ledger_purchase.class.php:1835
 #: include/class/acc_ledger_purchase.class.php:1872
+#: include/class/acc_ledger_sold.class.php:1394 include/database.item.php:85
+#: include/class/acc_ledger_purchase.class.php:1872
 #: include/class/acc_ledger_sold.class.php:1394
 #: include/ajax/ajax_preference.php:150 include/template/forecast_result.php:25
 #: include/database.item.php:85
@@ -1509,8 +1615,8 @@ msgstr ""
 #: html/test_class.php:219 include/ajax_preference.php:173
 #: include/ajax/ajax_preference.php:173 include/ajax/ajax_preference.php:252
 #: dev/test/test_class.php:215 include/ajax/ajax_preference.php:263
-#: dev-2/test/test_class.php:215 include/ajax/ajax_preference.php:263
-#: dev/test/test_class.php:215
+#: dev-2/test/test_class.php:215 dev-2/test/test_class.php:215
+#: include/ajax/ajax_preference.php:263 dev/test/test_class.php:215
 msgid "Français"
 msgstr ""
 
@@ -1518,8 +1624,8 @@ msgstr ""
 #: html/test_class.php:220 include/ajax_preference.php:174
 #: include/ajax/ajax_preference.php:174 include/ajax/ajax_preference.php:253
 #: dev/test/test_class.php:216 include/ajax/ajax_preference.php:264
-#: dev-2/test/test_class.php:216 include/ajax/ajax_preference.php:264
-#: dev/test/test_class.php:216
+#: dev-2/test/test_class.php:216 dev-2/test/test_class.php:216
+#: include/ajax/ajax_preference.php:264 dev/test/test_class.php:216
 msgid "Anglais"
 msgstr ""
 
@@ -1527,8 +1633,8 @@ msgstr ""
 #: html/test_class.php:221 include/ajax_preference.php:175
 #: include/ajax/ajax_preference.php:175 include/ajax/ajax_preference.php:254
 #: dev/test/test_class.php:217 include/ajax/ajax_preference.php:265
-#: dev-2/test/test_class.php:217 include/ajax/ajax_preference.php:265
-#: dev/test/test_class.php:217
+#: dev-2/test/test_class.php:217 dev-2/test/test_class.php:217
+#: include/ajax/ajax_preference.php:265 dev/test/test_class.php:217
 msgid "Néerlandais"
 msgstr ""
 
@@ -1575,7 +1681,10 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:1121
 #: include/class/acc_ledger_search.class.php:1134
 #: include/ajax/ajax_preference.php:280
-#: include/class/acc_ledger_search.class.php:1223 include/cfgplugin.inc.php:171
+#: include/class/acc_ledger_search.class.php:1223
+#: include/ajax/ajax_preference.php:283
+#: include/class/acc_ledger_search.class.php:1246
+#: include/class/acc_ledger_search.class.php:1246 include/cfgplugin.inc.php:171
 #: include/ajax/ajax_add_menu.php:171 include/ajax/ajax_add_menu.php:217
 #: include/ajax/ajax_preference.php:283
 #: include/ajax/ajax_get_menu_detail.php:77 include/balance_age.inc.php:54
@@ -1637,9 +1746,10 @@ msgstr ""
 #: include/ajax/ajax_card.php:551 include/class/forecast.class.php:70
 #: include/ajax/ajax_card.php:555
 #: include/class/template_card_category.class.php:73
-#: include/ajax/ajax_card.php:574 include/class/forecast.class.php:70
+#: include/ajax/ajax_card.php:574 include/ajax/ajax_card.php:650
+#: include/ajax/ajax_card.php:649 include/class/forecast.class.php:70
 #: include/class/template_card_category.class.php:73
-#: include/ajax/ajax_card.php:650
+#: include/ajax/ajax_card.php:649
 msgid "Le nom ne peut pas être vide"
 msgstr ""
 
@@ -1673,12 +1783,20 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:248
 #: include/class/acc_ledger_search.class.php:250
 #: include/lib/manage_table_sql.class.php:616
-#: include/lib/manage_table_sql.class.php:655 include/user_detail.inc.php:245
+#: include/lib/manage_table_sql.class.php:655
 #: include/class/anc_key.class.php:353
 #: include/class/acc_ledger_search.class.php:264
 #: include/class/tag_group_mtable.class.php:91
 #: include/class/operation_predef_mtable.class.php:170
 #: include/template/followup-show-action-add.php:61
+#: include/lib/manage_table_sql.class.php:663
+#: include/lib/manage_table_sql.class.php:704 include/user_detail.inc.php:283
+#: include/class/acc_ledger_search.class.php:266
+#: include/user_detail.inc.php:283 include/class/anc_key.class.php:353
+#: include/class/acc_ledger_search.class.php:266
+#: include/class/tag_group_mtable.class.php:91
+#: include/class/operation_predef_mtable.class.php:170
+#: include/template/followup-show-action-add.php:61
 #: include/template/dashboard.php:21 include/lib/manage_table_sql.class.php:663
 #: include/lib/manage_table_sql.class.php:704
 msgid "Ajout"
@@ -1723,6 +1841,11 @@ msgstr ""
 #: include/class/payment_method_mtable.class.php:42
 #: include/class/anc_group_operation.class.php:122
 #: include/class/card_attribut_mtable.class.php:55
+#: include/template/follow_up_detail_display.php:50
+#: include/template/newEmptyPHP_NOALYSS.php:35 include/database.item.php:111
+#: include/class/payment_method_mtable.class.php:42
+#: include/class/anc_group_operation.class.php:122
+#: include/class/card_attribut_mtable.class.php:55
 #: include/class/acc_plan_mtable.class.php:49
 #: include/ajax/ajax_anc_detail_operation.php:54
 #: include/export/export_stock_histo_csv.php:43
@@ -1770,8 +1893,8 @@ msgstr ""
 #: include/database.item.php:57 include/category_card.inc.php:75
 #: include/database.item.php:60 include/database.item.php:52
 #: include/category_card.inc.php:77 include/database.item.php:53
-#: include/template/detail-action.php:49 include/database.item.php:52
-#: include/category_card.inc.php:77
+#: include/template/detail-action.php:50 include/template/detail-action.php:50
+#: include/database.item.php:52 include/category_card.inc.php:77
 msgid "Contact"
 msgstr ""
 
@@ -1794,8 +1917,8 @@ msgstr ""
 #: include/category_card.inc.php:67 include/category_card.inc.php:68
 #: include/category_card.inc.php:71 include/impress_poste.inc.php:103
 #: include/category_card.inc.php:76 include/category_card.inc.php:78
-#: include/impress_jrn.inc.php:156 include/impress_poste.inc.php:103
-#: include/category_card.inc.php:78
+#: include/impress_jrn.inc.php:156 include/impress_jrn.inc.php:156
+#: include/impress_poste.inc.php:103 include/category_card.inc.php:78
 msgid "Toutes les opérations"
 msgstr ""
 
@@ -1810,8 +1933,9 @@ msgstr ""
 #: include/database.item.php:73 include/database.item.php:67
 #: include/database.item.php:101 include/category_card.inc.php:79
 #: include/fiche.inc.php:70 include/database.item.php:102
-#: include/fiche.inc.php:70 include/database.item.php:66
-#: include/database.item.php:101 include/category_card.inc.php:79
+#: include/database.item.php:66 include/fiche.inc.php:70
+#: include/database.item.php:66 include/database.item.php:101
+#: include/category_card.inc.php:79
 msgid "Balance"
 msgstr ""
 
@@ -1858,8 +1982,8 @@ msgstr ""
 #: include/ext/amortis/include/template/material_add.php:88
 #: include/ajax/ajax_card.php:304 include/template/dashboard.php:351
 #: include/ajax/ajax_mod_predf_op.php:55 include/ajax/ajax_mod_predf_op.php:68
-#: include/category_detail.inc.php:68 include/template/pcmn_update.php:54
-#: include/template/dashboard.php:351
+#: include/ajax/ajax_mod_predf_op.php:68 include/category_detail.inc.php:68
+#: include/template/pcmn_update.php:54 include/template/dashboard.php:351
 msgid "Annuler"
 msgstr ""
 
@@ -2035,6 +2159,25 @@ msgstr ""
 #: include/class/acc_ledger.class.php:903
 #: include/class/acc_ledger_purchase.class.php:1836 include/fiche.inc.php:416
 #: include/class/payment_method_mtable.class.php:39
+#: include/class/acc_ledger.class.php:869
+#: include/class/acc_ledger.class.php:891
+#: include/class/acc_ledger_purchase.class.php:1436
+#: include/class/acc_ledger_purchase.class.php:1873
+#: include/class/acc_ledger_sold.class.php:706
+#: include/class/acc_ledger_sold.class.php:1395
+#: include/class/pre_op_advanced.class.php:200
+#: include/class/print_ledger_detail_item.class.php:59
+#: include/class/acc_ledger_history_generic.class.php:774
+#: include/class/anc_grandlivre.class.php:228
+#: include/export/export_ledger_csv.php:149
+#: include/template/form_ledger_detail.php:59
+#: include/template/ledger_detail_bottom.php:95
+#: include/template/ledger_detail_bottom.php:384
+#: include/class/anc_grandlivre.class.php:229
+#: include/export/export_poste_detail_pdf.php:99
+#: include/template/ledger_detail_bottom.php:96
+#: include/template/ledger_detail_bottom.php:401 include/fiche.inc.php:416
+#: include/class/payment_method_mtable.class.php:39
 #: include/class/anc_operation.class.php:298
 #: include/class/acc_ledger.class.php:605
 #: include/class/acc_ledger.class.php:612
@@ -2053,9 +2196,9 @@ msgstr ""
 #: include/class/pdf_operation.class.php:150
 #: include/class/pdf_operation.class.php:195
 #: include/class/pdf_operation.class.php:248
-#: include/class/anc_grandlivre.class.php:228
+#: include/class/anc_grandlivre.class.php:229
 #: include/export/export_ledger_csv.php:149
-#: include/export/export_poste_detail_pdf.php:98
+#: include/export/export_poste_detail_pdf.php:99
 #: include/export/export_gl_csv.php:96
 #: include/export/export_balance_pdf.php:127
 #: include/export/export_gl_pdf.php:88 include/balance.inc.php:307
@@ -2064,8 +2207,8 @@ msgstr ""
 #: include/template/form_ledger_detail.php:59
 #: include/template/operation_detail_fin.php:33
 #: include/template/operation_detail_misc.php:34
-#: include/template/ledger_detail_bottom.php:95
-#: include/template/ledger_detail_bottom.php:384
+#: include/template/ledger_detail_bottom.php:96
+#: include/template/ledger_detail_bottom.php:401
 #: include/template/ledger_detail_ven.php:80
 #: include/template/balance_aged_result.php:50
 #: include/template/acc_ledger_history_financial_oneline.php:35
@@ -2093,8 +2236,9 @@ msgstr ""
 #: include/ext/bilan_interne/acc_bilaninterne.class.php:274
 #: include/class/acc_bilan.class.php:70 include/class/anc_print.class.php:142
 #: include/balance.inc.php:77 include/impress_jrn.inc.php:132
-#: include/class/acc_bilan.class.php:70 include/class/anc_print.class.php:142
-#: include/balance.inc.php:77 include/impress_gl_comptes.inc.php:62
+#: include/class/anc_print.class.php:143 include/class/acc_bilan.class.php:70
+#: include/class/anc_print.class.php:143 include/balance.inc.php:77
+#: include/impress_gl_comptes.inc.php:62
 #: include/template/impress_cat_card.php:14 include/impress_jrn.inc.php:132
 #: include/impress_poste.inc.php:86
 msgid "Depuis"
@@ -2127,6 +2271,8 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1055
 #: include/class/acc_ledger.class.php:1047
 #: include/class/acc_ledger_purchase.class.php:82
+#: include/class/acc_ledger.class.php:1047
+#: include/class/acc_ledger_purchase.class.php:82
 #: include/class/acc_ledger_sold.class.php:80
 #: include/class/acc_ledger_fin.class.php:70
 msgid "Double Encodage"
@@ -2161,7 +2307,9 @@ msgstr ""
 #: html/recherche.php:58 include/ajax/ajax_todo_list.php:203
 #: include/ajax/ajax_todo_list.php:266 include/class/acc_ledger.class.php:1029
 #: include/class/acc_ledger.class.php:1034
-#: include/class/acc_ledger.class.php:1050 html/export.php:45
+#: include/class/acc_ledger.class.php:1050 html/recherche.php:63
+#: include/class/acc_ledger.class.php:1042
+#: include/class/acc_ledger_purchase.class.php:77 html/export.php:45
 #: html/recherche.php:63 include/class/acc_ledger.class.php:1042
 #: include/class/acc_ledger_purchase.class.php:77
 #: include/class/acc_ledger_sold.class.php:84
@@ -2196,6 +2344,8 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1076
 #: include/class/acc_ledger.class.php:1072
 #: include/class/acc_ledger_purchase.class.php:106
+#: include/class/acc_ledger.class.php:1072
+#: include/class/acc_ledger_purchase.class.php:106
 #: include/class/acc_ledger_sold.class.php:104
 #: include/class/acc_ledger_fin.class.php:110
 #: include/class/acc_ledger_fin.class.php:194
@@ -2221,6 +2371,8 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1084
 #: include/class/acc_ledger.class.php:1080
 #: include/class/acc_ledger_purchase.class.php:111
+#: include/class/acc_ledger.class.php:1080
+#: include/class/acc_ledger_purchase.class.php:111
 #: include/class/acc_ledger_sold.class.php:113
 #: include/class/acc_ledger_fin.class.php:116
 #: include/class/acc_ledger_fin.class.php:200
@@ -2238,6 +2390,7 @@ msgstr ""
 #: include/class/acc_ledger_fin.class.php:210
 #: include/class/acc_ledger_purchase.class.php:119
 #: include/class/acc_ledger_purchase.class.php:121
+#: include/class/acc_ledger_purchase.class.php:121
 #: include/class/acc_ledger_fin.class.php:126
 #: include/class/acc_ledger_fin.class.php:210
 msgid "Vous utilisez le mode strict la dernière operation est à la date du "
@@ -2305,6 +2458,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1462
 #: include/class/acc_ledger.class.php:622
 #: include/class/acc_ledger.class.php:638
+#: include/class/acc_ledger_purchase.class.php:1473
+#: include/class/acc_ledger_sold.class.php:741
 #: include/class/acc_ledger.class.php:622
 #: include/class/acc_ledger_purchase.class.php:1473
 #: include/class/acc_ledger_sold.class.php:741
@@ -2356,6 +2511,9 @@ msgstr ""
 #: include/class/acc_ledger_fin.class.php:1052 include/compta_ven.inc.php:251
 #: include/class/acc_ledger_sold.class.php:1132
 #: include/class/acc_ledger.class.php:790 include/compta_ach.inc.php:236
+#: include/class/acc_ledger.class.php:777
+#: include/class/acc_ledger_purchase.class.php:1083
+#: include/class/acc_ledger_sold.class.php:1099 include/compta_ach.inc.php:235
 #: include/compta_ven.inc.php:251 include/class/acc_ledger.class.php:777
 #: include/class/acc_ledger_purchase.class.php:1083
 #: include/class/acc_ledger_sold.class.php:1099
@@ -2408,6 +2566,8 @@ msgstr ""
 #: include/class/acc_ledger_fin.class.php:1087
 #: include/class/anc_balance_double.class.php:370
 #: include/class/acc_ledger_search.class.php:646
+#: include/class/acc_ledger_search.class.php:669
+#: include/class/acc_ledger_search.class.php:669
 #: include/class/anc_listing.class.php:42
 #: include/class/anc_balance_double.class.php:370
 #: include/class/anc_balance_simple.class.php:193
@@ -2465,6 +2625,13 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1060
 #: include/class/follow_up.class.php:1646
 #: include/class/follow_up.class.php:1648
+#: include/class/acc_ledger.class.php:224
+#: include/class/acc_ledger.class.php:1052
+#: include/class/acc_ledger_purchase.class.php:91
+#: include/class/follow_up.class.php:1678
+#: include/class/follow_up.class.php:1680
+#: include/class/follow_up.class.php:1678
+#: include/class/follow_up.class.php:1680
 #: include/class/anc_acc_list.class.php:334
 #: include/class/acc_ledger.class.php:224
 #: include/class/acc_ledger.class.php:1052
@@ -2491,6 +2658,8 @@ msgstr ""
 #: include/class/acc_ledger.class.php:239
 #: include/class/acc_ledger.class.php:234
 #: include/class/acc_ledger.class.php:238
+#: include/class/acc_ledger.class.php:234
+#: include/class/acc_ledger.class.php:238
 msgid "Cette opération n'existe pas"
 msgstr ""
 
@@ -2503,6 +2672,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:229
 #: include/class/acc_ledger.class.php:247
 #: include/class/acc_ledger.class.php:246
+#: include/class/acc_ledger.class.php:246
 msgid "PERIODE FERMEE"
 msgstr ""
 
@@ -2529,6 +2699,12 @@ msgstr ""
 #: include/class/follow_up.class.php:775 include/class/follow_up.class.php:688
 #: include/class/acc_ledger_search.class.php:763
 #: include/class/acc_ledger_search.class.php:1032
+#: include/class/follow_up.class.php:711
+#: include/class/acc_ledger_search.class.php:786
+#: include/class/acc_ledger_search.class.php:1055
+#: include/class/follow_up.class.php:711
+#: include/class/acc_ledger_search.class.php:786
+#: include/class/acc_ledger_search.class.php:1055
 msgid "Aucun enregistrement trouvé"
 msgstr ""
 
@@ -2555,6 +2731,10 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:963
 #: include/class/acc_ledger_search.class.php:794
 #: include/class/acc_ledger_search.class.php:1052
+#: include/class/acc_ledger_search.class.php:817
+#: include/class/acc_ledger_search.class.php:1075
+#: include/class/acc_ledger_search.class.php:817
+#: include/class/acc_ledger_search.class.php:1075
 msgid "Concerne"
 msgstr ""
 
@@ -2583,6 +2763,10 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:877
 #: include/class/acc_ledger_search.class.php:792
 #: include/class/acc_ledger_search.class.php:966
+#: include/class/acc_ledger_search.class.php:815
+#: include/class/acc_ledger_search.class.php:989
+#: include/class/acc_ledger_search.class.php:815
+#: include/class/acc_ledger_search.class.php:989
 #: include/template/ledger_detail_ven.php:86
 msgid "Payé"
 msgstr ""
@@ -2596,6 +2780,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:428
 #: include/class/acc_ledger.class.php:443
 #: include/class/acc_ledger.class.php:442
+#: include/class/acc_ledger.class.php:442
 msgid "Parametres journaux non trouves"
 msgstr ""
 
@@ -2822,13 +3007,44 @@ msgstr ""
 #: include/class/acc_ledger.class.php:830
 #: include/class/acc_ledger_purchase.class.php:1832 include/fiche.inc.php:540
 #: include/class/acc_ledger_history_sale.class.php:252
+#: include/class/acc_ledger_search.class.php:724
+#: include/class/acc_ledger_search.class.php:1046
+#: include/class/acc_ledger_history_purchase.class.php:264
+#: include/class/acc_ledger.class.php:818
+#: include/class/print_ledger_misc.class.php:42
+#: include/class/fiche.class.php:1424 include/class/fiche.class.php:1499
+#: include/class/card_attribut_mtable.class.php:52
+#: include/class/acc_ledger_purchase.class.php:1418
+#: include/class/acc_ledger_purchase.class.php:1869
+#: include/class/acc_ledger_sold.class.php:690
+#: include/class/acc_ledger_sold.class.php:1391
+#: include/class/print_ledger_simple.class.php:97
+#: include/class/contact_option_ref_mtable.class.php:45
+#: include/class/acc_account_ledger.class.php:384
+#: include/class/print_ledger_detail_item.class.php:56
+#: include/class/acc_ledger_history_generic.class.php:684
+#: include/class/acc_ledger_history_generic.class.php:771
+#: include/class/anc_grandlivre.class.php:225
+#: include/ajax/ajax_display_letter.php:68
+#: include/export/export_printtva_pdf.php:47
+#: include/export/export_ledger_csv.php:227
+#: include/export/export_histo_csv.php:41
+#: include/template/form_ledger_detail.php:25
+#: include/template/detail-action.php:102 include/lib/ac_common.php:1220
+#: include/class/acc_ledger_search.class.php:747
+#: include/class/acc_ledger_search.class.php:1069
+#: include/class/anc_grandlivre.class.php:226
+#: include/export/export_poste_detail_pdf.php:93
+#: include/template/detail-action.php:104
+#: include/template/action_search_result.php:45 include/fiche.inc.php:540
+#: include/class/acc_ledger_history_sale.class.php:252
 #: include/class/anc_operation.class.php:297
 #: include/class/anc_group_operation.class.php:111
 #: include/class/acc_reconciliation.class.php:483
 #: include/class/acc_reconciliation.class.php:491
 #: include/class/acc_reconciliation.class.php:507
-#: include/class/acc_ledger_search.class.php:724
-#: include/class/acc_ledger_search.class.php:1046
+#: include/class/acc_ledger_search.class.php:747
+#: include/class/acc_ledger_search.class.php:1069
 #: include/class/acc_ledger_history_purchase.class.php:264
 #: include/class/acc_ledger.class.php:601
 #: include/class/acc_ledger.class.php:818
@@ -2850,11 +3066,11 @@ msgstr ""
 #: include/class/acc_ledger_history_generic.class.php:771
 #: include/class/balance_age.class.php:147
 #: include/class/pdf_operation.class.php:67
-#: include/class/anc_grandlivre.class.php:225 include/audit_log.php:37
+#: include/class/anc_grandlivre.class.php:226 include/audit_log.php:37
 #: include/ajax/ajax_display_letter.php:68
 #: include/export/export_printtva_pdf.php:47
 #: include/export/export_ledger_csv.php:227
-#: include/export/export_poste_detail_pdf.php:92
+#: include/export/export_poste_detail_pdf.php:93
 #: include/export/export_gl_csv.php:96
 #: include/export/export_poste_detail_csv.php:78
 #: include/export/export_poste_detail_csv.php:198
@@ -2873,14 +3089,14 @@ msgstr ""
 #: include/template/form_ledger_fin.php:39
 #: include/template/acc_ledger_history_sale_detail.php:34
 #: include/template/ledger_detail_ven.php:32
-#: include/template/detail-action.php:102
+#: include/template/detail-action.php:104
 #: include/template/acc_ledger_history_purchase_oneline.php:35
 #: include/template/letter_all.php:23
 #: include/template/acc_ledger_history_sale_oneline.php:32
 #: include/template/acc_ledger_history_financial_oneline.php:31
 #: include/template/acc_ledger_history_purchase_detail.php:33
 #: include/template/stock_inv.php:37
-#: include/template/action_search_result.php:44
+#: include/template/action_search_result.php:45
 #: include/template/acc_ledger_history_sale_extended.php:31
 #: include/template/ledger_detail_ach.php:24
 #: include/template/letter_prop.php:25 include/template/letter_prop.php:68
@@ -2915,6 +3131,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1415
 #: include/class/acc_ledger.class.php:604
 #: include/class/acc_ledger.class.php:620
+#: include/class/acc_ledger_purchase.class.php:1426
+#: include/class/acc_ledger_sold.class.php:696
 #: include/class/acc_ledger.class.php:604
 #: include/class/acc_ledger_purchase.class.php:1426
 #: include/class/acc_ledger_sold.class.php:696
@@ -3032,6 +3250,14 @@ msgstr ""
 #: include/class/acc_ledger.class.php:627
 #: include/class/acc_ledger.class.php:902
 #: include/class/acc_ledger_purchase.class.php:1840 include/fiche.inc.php:417
+#: include/class/acc_ledger.class.php:890 include/class/fiche.class.php:1501
+#: include/class/acc_ledger_purchase.class.php:1877
+#: include/class/acc_ledger_sold.class.php:1399
+#: include/class/pre_op_advanced.class.php:199
+#: include/class/acc_ledger_history_generic.class.php:772
+#: include/class/anc_grandlivre.class.php:226
+#: include/ajax/ajax_display_letter.php:64 include/database.item.php:63
+#: include/class/anc_grandlivre.class.php:227 include/fiche.inc.php:417
 #: include/class/acc_ledger.class.php:611
 #: include/class/acc_ledger.class.php:890 include/class/fiche.class.php:1501
 #: include/class/anc_listing.class.php:80
@@ -3041,7 +3267,7 @@ msgstr ""
 #: include/class/anc_table.class.php:441
 #: include/class/print_ledger_detail_item.class.php:157
 #: include/class/acc_ledger_history_generic.class.php:772
-#: include/class/anc_grandlivre.class.php:226
+#: include/class/anc_grandlivre.class.php:227
 #: include/ajax/ajax_display_letter.php:64
 #: include/export/export_poste_detail_csv.php:79
 #: include/export/export_poste_detail_csv.php:194
@@ -3142,6 +3368,18 @@ msgstr ""
 #: include/class/acc_ledger_history_generic.class.php:774
 #: include/class/acc_ledger.class.php:629
 #: include/class/acc_ledger.class.php:905 include/fiche.inc.php:418
+#: include/class/anc_group_operation.class.php:138
+#: include/class/acc_ledger.class.php:893 include/class/fiche.class.php:1506
+#: include/class/acc_account_ledger.class.php:391
+#: include/class/pre_op_advanced.class.php:202
+#: include/class/acc_ledger_history_generic.class.php:775
+#: include/class/anc_grandlivre.class.php:233
+#: include/export/export_balance_csv.php:79
+#: include/template/ledger_detail_bottom.php:96
+#: include/operation_ods_new.inc.php:85
+#: include/class/anc_grandlivre.class.php:234
+#: include/export/export_poste_detail_pdf.php:248
+#: include/template/ledger_detail_bottom.php:97 include/fiche.inc.php:418
 #: include/class/anticipation.class.php:420
 #: include/class/anc_group_operation.class.php:138
 #: include/class/acc_ledger.class.php:613
@@ -3152,9 +3390,9 @@ msgstr ""
 #: include/class/acc_account_ledger.class.php:391
 #: include/class/pre_op_advanced.class.php:202
 #: include/class/acc_ledger_history_generic.class.php:775
-#: include/class/anc_grandlivre.class.php:233
+#: include/class/anc_grandlivre.class.php:234
 #: include/export/export_balance_csv.php:79
-#: include/export/export_poste_detail_pdf.php:247
+#: include/export/export_poste_detail_pdf.php:248
 #: include/export/export_gl_csv.php:96
 #: include/export/export_poste_detail_csv.php:88
 #: include/export/export_gl_pdf.php:88
@@ -3163,7 +3401,7 @@ msgstr ""
 #: include/impress_gl_comptes.inc.php:216
 #: include/template/ledger_detail_misc.php:102
 #: include/template/operation_detail_misc.php:35
-#: include/template/ledger_detail_bottom.php:96
+#: include/template/ledger_detail_bottom.php:97
 #: include/template/letter_all.php:35 include/template/anc_balance_group.php:49
 #: include/template/letter_prop.php:37 include/template/letter_prop.php:80
 #: include/operation_ods_new.inc.php:85 include/anc_od.inc.php:148
@@ -3241,6 +3479,16 @@ msgstr ""
 #: include/class/pdfbalance_simple.class.php:57
 #: include/class/acc_ledger_history_generic.class.php:775
 #: include/class/acc_ledger.class.php:630 include/fiche.inc.php:419
+#: include/class/fiche.class.php:1507
+#: include/class/acc_account_ledger.class.php:392
+#: include/class/acc_ledger_history_generic.class.php:776
+#: include/class/anc_grandlivre.class.php:234
+#: include/export/export_balance_csv.php:79
+#: include/template/ledger_detail_bottom.php:97
+#: include/operation_ods_new.inc.php:86
+#: include/class/anc_grandlivre.class.php:235
+#: include/export/export_poste_detail_pdf.php:251
+#: include/template/ledger_detail_bottom.php:98 include/fiche.inc.php:419
 #: include/class/anticipation.class.php:421
 #: include/class/acc_ledger.class.php:614
 #: include/class/pdfbalance_simple.class.php:57
@@ -3248,9 +3496,9 @@ msgstr ""
 #: include/class/anc_balance_double.class.php:100
 #: include/class/acc_account_ledger.class.php:392
 #: include/class/acc_ledger_history_generic.class.php:776
-#: include/class/anc_grandlivre.class.php:234
+#: include/class/anc_grandlivre.class.php:235
 #: include/export/export_balance_csv.php:79
-#: include/export/export_poste_detail_pdf.php:250
+#: include/export/export_poste_detail_pdf.php:251
 #: include/export/export_gl_csv.php:96
 #: include/export/export_poste_detail_csv.php:89
 #: include/export/export_gl_pdf.php:88
@@ -3258,7 +3506,7 @@ msgstr ""
 #: include/impress_gl_comptes.inc.php:215
 #: include/template/ledger_detail_misc.php:103
 #: include/template/operation_detail_misc.php:36
-#: include/template/ledger_detail_bottom.php:97
+#: include/template/ledger_detail_bottom.php:98
 #: include/template/letter_all.php:38 include/template/letter_prop.php:40
 #: include/template/letter_prop.php:83 include/operation_ods_new.inc.php:86
 #: include/anc_od.inc.php:149 include/verif_bilan.inc.php:74
@@ -3322,7 +3570,13 @@ msgstr ""
 #: include/template/acc_ledger_history_sale_extended.php:161
 #: include/class/acc_ledger_history_generic.class.php:741
 #: include/class/acc_ledger.class.php:740 include/fiche.inc.php:459
-#: include/class/acc_ledger.class.php:724 include/class/fiche.class.php:1589
+#: include/class/fiche.class.php:1589
+#: include/class/acc_ledger_purchase.class.php:1601
+#: include/class/acc_ledger_sold.class.php:848
+#: include/class/acc_account_ledger.class.php:431
+#: include/class/acc_ledger_history_generic.class.php:742
+#: include/fiche.inc.php:459 include/class/acc_ledger.class.php:724
+#: include/class/fiche.class.php:1589
 #: include/class/acc_ledger_purchase.class.php:1601
 #: include/class/acc_ledger_sold.class.php:848
 #: include/class/acc_account_ledger.class.php:431
@@ -3390,6 +3644,9 @@ msgstr ""
 #: include/class/acc_ledger.class.php:841
 #: include/class/acc_ledger_purchase.class.php:1057
 #: include/class/acc_ledger_sold.class.php:1079
+#: include/class/acc_ledger.class.php:841
+#: include/class/acc_ledger_purchase.class.php:1057
+#: include/class/acc_ledger_sold.class.php:1079
 #: include/class/acc_ledger_fin.class.php:294
 msgid "Aucune période ouverte"
 msgstr ""
@@ -3430,6 +3687,9 @@ msgstr ""
 #: include/class/acc_ledger.class.php:846
 #: include/class/acc_ledger_purchase.class.php:1063
 #: include/class/acc_ledger_sold.class.php:1083
+#: include/class/acc_ledger.class.php:846
+#: include/class/acc_ledger_purchase.class.php:1063
+#: include/class/acc_ledger_sold.class.php:1083
 msgid "Période comptable"
 msgstr ""
 
@@ -3539,8 +3799,20 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1874
 #: include/class/acc_ledger_sold.class.php:1396
 #: include/class/print_ledger_simple.class.php:96
+#: include/class/anc_grandlivre.class.php:231 include/lib/ac_common.php:1222
+#: include/class/acc_ledger_search.class.php:755
+#: include/class/acc_ledger_search.class.php:1070
+#: include/class/anc_grandlivre.class.php:232
+#: include/class/acc_ledger_history_sale.class.php:255
+#: include/class/acc_ledger_search.class.php:755
+#: include/class/acc_ledger_search.class.php:1070
+#: include/class/acc_ledger_history_purchase.class.php:267
+#: include/class/acc_ledger.class.php:862
+#: include/class/acc_ledger_purchase.class.php:1874
+#: include/class/acc_ledger_sold.class.php:1396
+#: include/class/print_ledger_simple.class.php:96
 #: include/class/pdf_operation.class.php:79
-#: include/class/anc_grandlivre.class.php:231
+#: include/class/anc_grandlivre.class.php:232
 #: include/export/export_gl_csv.php:96 include/export/export_gl_pdf.php:88
 #: include/template/ledger_detail_misc.php:62
 #: include/template/print_ledger_simple.php:6
@@ -3672,6 +3944,17 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:1051
 #: include/class/acc_ledger.class.php:892
 #: include/class/print_ledger_misc.class.php:47
+#: include/class/fiche.class.php:1426
+#: include/class/acc_ledger_purchase.class.php:1463
+#: include/class/acc_ledger_sold.class.php:733
+#: include/class/pre_op_advanced.class.php:201 include/lib/ac_common.php:1225
+#: include/class/acc_ledger_search.class.php:761
+#: include/class/acc_ledger_search.class.php:1074 include/fiche.inc.php:544
+#: include/class/anc_group_operation.class.php:137
+#: include/class/acc_ledger_search.class.php:761
+#: include/class/acc_ledger_search.class.php:1074
+#: include/class/acc_ledger.class.php:892
+#: include/class/print_ledger_misc.class.php:47
 #: include/class/fiche.class.php:1426 include/class/anc_listing.class.php:86
 #: include/class/acc_ledger_purchase.class.php:1463
 #: include/class/acc_ledger_sold.class.php:733
@@ -3741,6 +4024,8 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1268
 #: include/class/acc_ledger.class.php:1121
 #: include/class/acc_ledger.class.php:1264
+#: include/class/acc_ledger.class.php:1121
+#: include/class/acc_ledger.class.php:1264
 #, php-format
 msgid "La fiche %s n'a pas de poste comptable"
 msgstr ""
@@ -3756,6 +4041,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1114
 #: include/class/acc_ledger.class.php:1130
 #: include/class/acc_ledger.class.php:1126
+#: include/class/acc_ledger.class.php:1126
 msgid "Poste Inexistant pour la fiche ["
 msgstr ""
 
@@ -3792,6 +4078,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1128
 #: include/class/acc_ledger.class.php:1144
 #: include/class/acc_ledger.class.php:1140
+#: include/class/acc_ledger.class.php:1140
 msgid "Poste invalide ["
 msgstr ""
 
@@ -3806,6 +4093,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1131
 #: include/class/acc_ledger.class.php:1147
 #: include/class/acc_ledger.class.php:1143
+#: include/class/acc_ledger.class.php:1143
 msgid "Poste Inexistant ["
 msgstr ""
 
@@ -3820,6 +4108,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1158
 #: include/class/acc_ledger.class.php:1174
 #: include/class/acc_ledger.class.php:1170
+#: include/class/acc_ledger.class.php:1170
 msgid "Balance incorrecte "
 msgstr ""
 
@@ -3859,6 +4148,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2214
 #: include/class/acc_ledger.class.php:2230
 #: include/class/acc_ledger.class.php:2249
+#: include/class/acc_ledger.class.php:2249
 msgid "Journal n'existe pas"
 msgstr ""
 
@@ -3883,6 +4173,8 @@ msgstr ""
 #: include/class/print_ledger_simple.class.php:274
 #: include/class/acc_ledger_purchase.class.php:1722
 #: include/class/print_ledger_simple.class.php:297
+#: include/class/acc_ledger_purchase.class.php:1722
+#: include/class/print_ledger_simple.class.php:297
 msgid "Payé par"
 msgstr ""
 
@@ -3891,6 +4183,7 @@ msgstr ""
 #: include/class/class_acc_ledger_purchase.php:84
 #: include/class/acc_ledger_purchase.class.php:84
 #: include/class/acc_ledger_purchase.class.php:86
+#: include/class/acc_ledger_purchase.class.php:86
 msgid "Vous n'avez pas donné de fournisseur"
 msgstr ""
 
@@ -3899,6 +4192,7 @@ msgstr ""
 #: include/class/class_acc_ledger_purchase.php:120
 #: include/class/acc_ledger_purchase.class.php:120
 #: include/class/acc_ledger_purchase.class.php:122
+#: include/class/acc_ledger_purchase.class.php:122
 msgid " vous ne pouvez pas encoder à une  date antérieure dans ce journal"
 msgstr ""
 
@@ -3968,6 +4262,13 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:225
 #: include/class/acc_ledger_purchase.class.php:132
 #: include/class/acc_ledger_purchase.class.php:157
+#: include/class/acc_ledger_purchase.class.php:176
+#: include/class/acc_ledger_purchase.class.php:182
+#: include/class/acc_ledger_purchase.class.php:187
+#: include/class/acc_ledger_purchase.class.php:202
+#: include/class/acc_ledger_purchase.class.php:227
+#: include/class/acc_ledger_purchase.class.php:132
+#: include/class/acc_ledger_purchase.class.php:157
 #: include/class/acc_ledger_purchase.class.php:174
 #: include/class/acc_ledger_purchase.class.php:176
 #: include/class/acc_ledger_purchase.class.php:182
@@ -4004,6 +4305,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:200
 #: include/class/acc_ledger_purchase.class.php:132
 #: include/class/acc_ledger_purchase.class.php:202
+#: include/class/acc_ledger_purchase.class.php:132
+#: include/class/acc_ledger_purchase.class.php:202
 #: include/class/acc_ledger_sold.class.php:129
 #: include/class/acc_ledger_sold.class.php:171
 msgid "n'a pas de poste comptable"
@@ -4028,6 +4331,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:219
 #: include/class/acc_ledger_purchase.class.php:151
 #: include/class/acc_ledger_purchase.class.php:221
+#: include/class/acc_ledger_purchase.class.php:151
+#: include/class/acc_ledger_purchase.class.php:221
 #: include/class/acc_ledger_sold.class.php:145
 #: include/class/acc_ledger_sold.class.php:204
 msgid "Pour la fiche "
@@ -4046,6 +4351,7 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:145
 #: include/class/acc_ledger_sold.class.php:204
 #: include/class/acc_ledger_purchase.class.php:151
+#: include/class/acc_ledger_purchase.class.php:151
 #: include/class/acc_ledger_sold.class.php:145
 #: include/class/acc_ledger_sold.class.php:204
 msgid " le poste comptable ["
@@ -4067,6 +4373,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:219
 #: include/class/acc_ledger_purchase.class.php:151
 #: include/class/acc_ledger_purchase.class.php:221
+#: include/class/acc_ledger_purchase.class.php:151
+#: include/class/acc_ledger_purchase.class.php:221
 #: include/class/acc_ledger_sold.class.php:204
 msgid "n'existe pas"
 msgstr ""
@@ -4090,6 +4398,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:225
 #: include/class/acc_ledger_purchase.class.php:157
 #: include/class/acc_ledger_purchase.class.php:227
+#: include/class/acc_ledger_purchase.class.php:157
+#: include/class/acc_ledger_purchase.class.php:227
 #: include/class/acc_ledger_sold.class.php:152
 #: include/class/acc_ledger_sold.class.php:210
 msgid "n'est pas accessible à ce journal"
@@ -4100,6 +4410,7 @@ msgstr ""
 #: include/class/class_acc_ledger_purchase.php:172
 #: include/class/acc_ledger_purchase.class.php:172
 #: include/class/acc_ledger_purchase.class.php:174
+#: include/class/acc_ledger_purchase.class.php:174
 msgid "a un montant invalide"
 msgstr ""
 
@@ -4108,6 +4419,7 @@ msgstr ""
 #: include/class/class_acc_ledger_purchase.php:174
 #: include/class/acc_ledger_purchase.class.php:174
 #: include/class/acc_ledger_purchase.class.php:176
+#: include/class/acc_ledger_purchase.class.php:176
 msgid "a une quantité invalide"
 msgstr ""
 
@@ -4129,6 +4441,8 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:180
 #: include/class/acc_ledger_purchase.class.php:182
 #: include/class/acc_ledger_purchase.class.php:187
+#: include/class/acc_ledger_purchase.class.php:182
+#: include/class/acc_ledger_purchase.class.php:187
 #: include/class/acc_ledger_sold.class.php:176
 #: include/class/acc_ledger_sold.class.php:180
 msgid "a un code tva invalide"
@@ -4145,6 +4459,7 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:190
 #: include/class/acc_ledger_purchase.class.php:193
 #: include/class/acc_ledger_purchase.class.php:195
+#: include/class/acc_ledger_purchase.class.php:195
 #: include/class/acc_ledger_sold.class.php:190
 msgid " La TVA "
 msgstr ""
@@ -4155,6 +4470,7 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:220
 #: include/class/acc_ledger_purchase.class.php:219
 #: include/class/acc_ledger_purchase.class.php:221
+#: include/class/acc_ledger_purchase.class.php:221
 msgid " le poste comptable"
 msgstr ""
 
@@ -4164,6 +4480,7 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:244
 #: include/class/acc_ledger_purchase.class.php:243
 #: include/class/acc_ledger_purchase.class.php:245
+#: include/class/acc_ledger_purchase.class.php:245
 msgid "ce code n'a pas de poste comptable, créez ce poste : ["
 msgstr ""
 
@@ -4173,6 +4490,7 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:254
 #: include/class/acc_ledger_purchase.class.php:253
 #: include/class/acc_ledger_purchase.class.php:255
+#: include/class/acc_ledger_purchase.class.php:255
 #, php-format
 msgid "Pour la fiche %s, le compte contrepartie %s n'existe pas"
 msgstr ""
@@ -4188,6 +4506,7 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:214
 #: include/class/acc_ledger_purchase.class.php:265
 #: include/class/acc_ledger_purchase.class.php:267
+#: include/class/acc_ledger_purchase.class.php:267
 #: include/class/acc_ledger_sold.class.php:214
 msgid "Il n'y a aucune marchandise"
 msgstr ""
@@ -4215,6 +4534,9 @@ msgstr ""
 #: include/class/pre_op_ach.class.php:263
 #: include/class/acc_ledger_purchase.class.php:1019
 #: include/class/acc_ledger_purchase.class.php:1447
+#: include/class/pre_op_ach.class.php:263
+#: include/class/acc_ledger_purchase.class.php:1019
+#: include/class/acc_ledger_purchase.class.php:1447
 msgid "Détail articles achetés"
 msgstr ""
 
@@ -4234,6 +4556,7 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1130
 #: include/class/acc_ledger_purchase.class.php:1133
 #: include/class/acc_ledger_purchase.class.php:1144
+#: include/class/acc_ledger_purchase.class.php:1144
 msgid "Fournisseur "
 msgstr ""
 
@@ -4283,6 +4606,11 @@ msgstr ""
 #: include/class/acc_ledger_history_purchase.class.php:268
 #: include/class/acc_ledger_purchase.class.php:1314
 #: include/class/acc_ledger_purchase.class.php:1441
+#: include/class/print_ledger_simple.class.php:102 include/database.item.php:12
+#: include/class/acc_ledger_history_sale.class.php:256
+#: include/class/acc_ledger_history_purchase.class.php:268
+#: include/class/acc_ledger_purchase.class.php:1314
+#: include/class/acc_ledger_purchase.class.php:1441
 #: include/class/print_ledger_simple.class.php:102
 #: include/class/pdf_operation.class.php:100 include/balance_age.inc.php:36
 #: include/template/print_ledger_simple.php:10
@@ -4353,6 +4681,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1385
 #: include/class/acc_ledger_purchase.class.php:1396
 #: include/class/acc_ledger_sold.class.php:667
+#: include/class/acc_ledger_purchase.class.php:1396
+#: include/class/acc_ledger_sold.class.php:667
 msgid "Détail opération "
 msgstr ""
 
@@ -4407,6 +4737,12 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1411
 #: include/class/acc_ledger_purchase.class.php:1414
 #: include/class/acc_ledger_sold.class.php:677
+#: include/class/acc_ledger_sold.class.php:685
+#: include/template/form_ledger_detail.php:51
+#: include/class/acc_ledger_purchase.class.php:1406
+#: include/class/acc_ledger_purchase.class.php:1411
+#: include/class/acc_ledger_purchase.class.php:1414
+#: include/class/acc_ledger_sold.class.php:677
 #: include/class/acc_ledger_sold.class.php:682
 #: include/class/acc_ledger_sold.class.php:685
 #: include/template/form_ledger_detail.php:51
@@ -4437,6 +4773,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1401
 #: include/compta_ods.inc.php:99
 #: include/class/acc_ledger_purchase.class.php:1412
+#: include/class/acc_ledger_sold.class.php:683
+#: include/class/acc_ledger_purchase.class.php:1412
 #: include/class/acc_ledger_sold.class.php:683 include/opening.inc.php:87
 #: include/compta_ods.inc.php:99
 msgid "Attention numéro pièce existante, elle a du être adaptée"
@@ -4479,6 +4817,12 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:693
 #: include/export/export_histo_csv.php:42
 #: include/template/form_ledger_detail.php:33
+#: include/class/acc_ledger_search.class.php:751
+#: include/class/acc_ledger_search.class.php:751
+#: include/class/acc_ledger_purchase.class.php:1421
+#: include/class/acc_ledger_sold.class.php:693
+#: include/export/export_histo_csv.php:42
+#: include/template/form_ledger_detail.php:33
 #: include/template/ledger_detail_ven.php:40
 #: include/template/ledger_detail_ach.php:31
 msgid "Echeance"
@@ -4529,13 +4873,29 @@ msgstr ""
 #: unit-test/include/class/print_ledger_fin.classTest.php:83
 #: unit-test/include/class/print_ledger_fin.classTest.php:95
 #: unit-test/include/class/print_ledger_fin.classTest.php:106
-#: include/compta_fin_saldo.inc.php:49
 #: include/class/acc_ledger_search.class.php:1043
 #: include/class/operation_predef_mtable.class.php:51
 #: include/class/acc_ledger_purchase.class.php:1433
 #: include/class/acc_ledger_sold.class.php:703
+#: include/export/export_printtva_csv.php:51
+#: include/export/export_printtva_csv.php:70
+#: include/export/export_ledger_pdf.php:84
+#: include/export/export_histo_csv.php:40
+#: include/template/pre_operation_display.php:38
+#: include/class/acc_ledger_search.class.php:1066
+#: include/export/export_poste_detail_pdf.php:97
+#: unit-test/include/class/print_ledger_detail.classTest.php:75
+#: unit-test/include/class/print_ledger_fin.classTest.php:72
+#: unit-test/include/class/print_ledger_fin.classTest.php:83
+#: unit-test/include/class/print_ledger_fin.classTest.php:95
+#: unit-test/include/class/print_ledger_fin.classTest.php:106
+#: include/compta_fin_saldo.inc.php:49
+#: include/class/acc_ledger_search.class.php:1066
+#: include/class/operation_predef_mtable.class.php:51
+#: include/class/acc_ledger_purchase.class.php:1433
+#: include/class/acc_ledger_sold.class.php:703
 #: include/class/pdf_operation.class.php:62
-#: include/export/export_poste_detail_pdf.php:96
+#: include/export/export_poste_detail_pdf.php:97
 #: include/export/export_printtva_csv.php:51
 #: include/export/export_printtva_csv.php:70
 #: include/export/export_ledger_pdf.php:84
@@ -4591,11 +4951,17 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1451
 #: include/class/acc_ledger_sold.class.php:721
 #: include/class/print_ledger_detail_item.class.php:58
+#: include/upgrade-plugin.php:71
+#: include/template/follow_up_other_concerned_display_table.php:42
+#: include/class/acc_ledger_purchase.class.php:1451
+#: include/class/acc_ledger_sold.class.php:721
+#: include/class/print_ledger_detail_item.class.php:58
 #: include/ajax/ajax_add_menu.php:156 include/ajax/ajax_add_menu.php:211
 #: include/ajax/ajax_plugin_detail.php:39
 #: include/ajax/ajax_get_menu_detail.php:60 include/anc_group.inc.php:62
 #: include/template/stock_summary_list.php:45
 #: include/template/ledger_detail_ven.php:151
+#: include/template/follow_up_other_concerned_display_table.php:42
 #: include/template/ledger_detail_ach.php:149 include/upgrade-plugin.php:71
 #: include/menu.inc.php:108
 msgid "Code"
@@ -4626,6 +4992,9 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1452
 #: include/class/acc_ledger_sold.class.php:722
 #: include/template/form_ledger_detail.php:75
+#: include/class/acc_ledger_purchase.class.php:1452
+#: include/class/acc_ledger_sold.class.php:722
+#: include/template/form_ledger_detail.php:75
 #: include/template/predf_ledger_detail.php:17
 msgid "Dénomination"
 msgstr ""
@@ -4650,6 +5019,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1442
 #: include/class/acc_ledger_purchase.class.php:1453
 #: include/class/acc_ledger_sold.class.php:723
+#: include/class/acc_ledger_purchase.class.php:1453
+#: include/class/acc_ledger_sold.class.php:723
 msgid "prix"
 msgstr ""
 
@@ -4718,6 +5089,13 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:724
 #: include/class/acc_ledger_sold.class.php:1414
 #: include/template/follow_up_detail_display.php:53
+#: include/template/form_ledger_detail.php:85
+#: include/template/newEmptyPHP_NOALYSS.php:38
+#: include/class/acc_ledger_purchase.class.php:1454
+#: include/class/acc_ledger_purchase.class.php:1892
+#: include/class/acc_ledger_sold.class.php:724
+#: include/class/acc_ledger_sold.class.php:1414
+#: include/template/follow_up_detail_display.php:53
 #: include/template/form_ledger_detail.php:78
 #: include/template/form_ledger_detail.php:85
 #: include/template/predf_ledger_detail.php:20
@@ -4751,6 +5129,9 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1458
 #: include/class/acc_ledger_sold.class.php:728
 #: include/template/form_ledger_detail.php:80
+#: include/class/acc_ledger_purchase.class.php:1458
+#: include/class/acc_ledger_sold.class.php:728
+#: include/template/form_ledger_detail.php:80
 #: include/template/predf_ledger_detail.php:22
 msgid "tva"
 msgstr ""
@@ -4824,6 +5205,16 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1890
 #: include/class/acc_ledger_sold.class.php:729
 #: include/class/acc_ledger_sold.class.php:1412
+#: include/export/export_printtva_pdf.php:59
+#: include/export/export_printtva_pdf.php:216
+#: include/export/export_printtva_csv.php:55
+#: include/export/export_printtva_csv.php:75
+#: include/template/follow_up_detail_display.php:55
+#: include/template/newEmptyPHP_NOALYSS.php:40
+#: include/class/acc_ledger_purchase.class.php:1459
+#: include/class/acc_ledger_purchase.class.php:1890
+#: include/class/acc_ledger_sold.class.php:729
+#: include/class/acc_ledger_sold.class.php:1412
 #: include/class/pdf_operation.class.php:153
 #: include/class/pdf_operation.class.php:198
 #: include/export/export_printtva_pdf.php:59
@@ -4863,6 +5254,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1449
 #: include/class/acc_ledger_purchase.class.php:1460
 #: include/class/acc_ledger_sold.class.php:730
+#: include/class/acc_ledger_purchase.class.php:1460
+#: include/class/acc_ledger_sold.class.php:730
 #: include/class/pdf_operation.class.php:151
 #: include/class/pdf_operation.class.php:196
 msgid "Montant HTVA"
@@ -4898,6 +5291,10 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:731
 #: include/template/follow_up_detail_display.php:56
 #: include/template/newEmptyPHP_NOALYSS.php:41
+#: include/class/acc_ledger_purchase.class.php:1461
+#: include/class/acc_ledger_sold.class.php:731
+#: include/template/follow_up_detail_display.php:56
+#: include/template/newEmptyPHP_NOALYSS.php:41
 msgid "Montant TVAC"
 msgstr ""
 
@@ -4925,7 +5322,10 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1549
 #: include/class/acc_ledger_purchase.class.php:1560
 #: include/class/acc_ledger_sold.class.php:807
-#: include/lib/message_javascript.php:59
+#: include/lib/message_javascript.php:60
+#: include/class/acc_ledger_purchase.class.php:1560
+#: include/class/acc_ledger_sold.class.php:807
+#: include/lib/message_javascript.php:60
 msgid "Attention Différence entre TVA calculée et donnée"
 msgstr ""
 
@@ -4942,6 +5342,7 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1627
 #: include/class/acc_ledger_purchase.class.php:1630
 #: include/class/acc_ledger_purchase.class.php:1643
+#: include/class/acc_ledger_purchase.class.php:1643
 msgid "Vérifiez imputation analytique"
 msgstr ""
 
@@ -4972,6 +5373,9 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1659
 #: include/class/acc_ledger_sold.class.php:904
 #: include/template/predf_ledger_detail.php:77
+#: include/class/acc_ledger_purchase.class.php:1659
+#: include/class/acc_ledger_sold.class.php:904
+#: include/template/predf_ledger_detail.php:77
 msgid "Total TVA"
 msgstr ""
 
@@ -5002,6 +5406,9 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1660
 #: include/class/acc_ledger_sold.class.php:905
 #: include/template/predf_ledger_detail.php:78
+#: include/class/acc_ledger_purchase.class.php:1660
+#: include/class/acc_ledger_sold.class.php:905
+#: include/template/predf_ledger_detail.php:78
 msgid "Total TVAC"
 msgstr ""
 
@@ -5030,6 +5437,8 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:946
 #: include/class/acc_ledger_purchase.class.php:1724
 #: include/class/acc_ledger_sold.class.php:950
+#: include/class/acc_ledger_purchase.class.php:1724
+#: include/class/acc_ledger_sold.class.php:950
 msgid "Déduction acompte "
 msgstr ""
 
@@ -5058,6 +5467,8 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:947
 #: include/class/acc_ledger_purchase.class.php:1725
 #: include/class/acc_ledger_sold.class.php:951
+#: include/class/acc_ledger_purchase.class.php:1725
+#: include/class/acc_ledger_sold.class.php:951
 msgid "Libellé :"
 msgstr ""
 
@@ -5089,6 +5500,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1732
 #: include/class/acc_ledger_purchase.class.php:1756
 #: include/class/acc_ledger_sold.class.php:990
+#: include/class/acc_ledger_purchase.class.php:1756
+#: include/class/acc_ledger_sold.class.php:990
 #: include/operation_ods_confirm.inc.php:76
 msgid "Ajoutez une pièce justificative "
 msgstr ""
@@ -5108,6 +5521,7 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1732
 #: include/class/acc_ledger_purchase.class.php:1738
 #: include/class/acc_ledger_purchase.class.php:1762
+#: include/class/acc_ledger_purchase.class.php:1762
 msgid "ou générer un document"
 msgstr ""
 
@@ -5137,6 +5551,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1749
 #: include/class/acc_ledger_purchase.class.php:1773
 #: include/class/acc_ledger_sold.class.php:1007
+#: include/class/acc_ledger_purchase.class.php:1773
+#: include/class/acc_ledger_sold.class.php:1007
 msgid "Numero de bon de commande : "
 msgstr ""
 
@@ -5166,6 +5582,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1750
 #: include/class/acc_ledger_purchase.class.php:1774
 #: include/class/acc_ledger_sold.class.php:1008
+#: include/class/acc_ledger_purchase.class.php:1774
+#: include/class/acc_ledger_sold.class.php:1008
 msgid "Autre information : "
 msgstr ""
 
@@ -5194,6 +5612,7 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:1035
 #: include/class/acc_ledger_purchase.class.php:1782
 #: include/class/acc_ledger_purchase.class.php:1806
+#: include/class/acc_ledger_purchase.class.php:1806
 msgid "Echeance dépassée"
 msgstr ""
 
@@ -5222,6 +5641,7 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:1037
 #: include/class/acc_ledger_purchase.class.php:1784
 #: include/class/acc_ledger_purchase.class.php:1808
+#: include/class/acc_ledger_purchase.class.php:1808
 msgid "Non Payée"
 msgstr ""
 
@@ -5254,6 +5674,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1793
 #: include/history_operation.inc.php:168
 #: include/class/acc_ledger_purchase.class.php:1817
+#: include/history_operation.inc.php:168
+#: include/class/acc_ledger_purchase.class.php:1817
 msgid "Mise à jour paiement"
 msgstr ""
 
@@ -5353,6 +5775,12 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:710
 #: include/class/acc_ledger_sold.class.php:1050
 #: include/class/acc_ledger_sold.class.php:1306
+#: include/class/print_ledger_simple.class.php:100 include/database.item.php:16
+#: include/class/pre_op_ach.class.php:394
+#: include/class/pre_op_ven.class.php:392
+#: include/class/acc_ledger_sold.class.php:710
+#: include/class/acc_ledger_sold.class.php:1050
+#: include/class/acc_ledger_sold.class.php:1306
 #: include/class/print_ledger_simple.class.php:100
 #: include/class/pdf_operation.class.php:103 include/balance_age.inc.php:35
 #: include/template/print_ledger_simple.php:10
@@ -5392,6 +5820,9 @@ msgstr ""
 #: include/class/pre_op_ven.class.php:261
 #: include/class/acc_ledger_sold.class.php:717
 #: include/class/acc_ledger_sold.class.php:1182
+#: include/class/pre_op_ven.class.php:261
+#: include/class/acc_ledger_sold.class.php:717
+#: include/class/acc_ledger_sold.class.php:1182
 msgid "Détail articles vendus"
 msgstr ""
 
@@ -5404,6 +5835,7 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:867
 #: include/class/acc_ledger_sold.class.php:884
 #: include/class/acc_ledger_sold.class.php:888
+#: include/class/acc_ledger_sold.class.php:888
 msgid "Vérifiez Imputation Analytique"
 msgstr ""
 
@@ -5417,6 +5849,7 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:983
 #: include/class/acc_ledger_sold.class.php:992
 #: include/class/acc_ledger_sold.class.php:996
+#: include/class/acc_ledger_sold.class.php:996
 msgid "ou générer une facture"
 msgstr ""
 
@@ -5434,6 +5867,7 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:1081
 #: include/class/acc_ledger_sold.class.php:1090
 #: include/class/acc_ledger_sold.class.php:1057
+#: include/class/acc_ledger_sold.class.php:1057
 #: include/class/pdf_operation.class.php:70
 msgid "Echéance"
 msgstr ""
@@ -5652,14 +6086,41 @@ msgstr ""
 #: include/class/print_ledger_simple.class.php:108
 #: include/template/param_jrn.php:129 include/modele.inc.php:249
 #: include/modele.inc.php:363 include/database.item.php:160
-#: include/compta_fin_saldo.inc.php:50
-#: include/class/tva_rate_mtable.class.php:50
-#: include/class/anc_account_table.class.php:49
 #: include/class/acc_ledger_search.class.php:740
 #: include/class/acc_ledger_search.class.php:1049
 #: include/class/acc_ledger_search.class.php:1194
 #: include/class/operation_predef_mtable.class.php:54
 #: include/class/fiche.class.php:1425 include/class/fiche.class.php:1504
+#: include/class/anc_plan.class.php:139 include/class/anc_plan.class.php:155
+#: include/class/print_ledger_simple.class.php:105
+#: include/class/user.class.php:994
+#: include/class/acc_account_ledger.class.php:389
+#: include/export/export_histo_csv.php:47
+#: include/template/follow_up_detail_display.php:51
+#: include/template/tag_select.php:25 include/template/detail-action.php:260
+#: include/template/detail-action.php:280
+#: include/template/detail-action.php:287
+#: include/template/detail-action.php:330
+#: include/template/detail-action.php:486
+#: include/template/tag_search_select.php:24 include/template/tag_list.php:16
+#: include/template/param_jrn.php:130
+#: include/template/newEmptyPHP_NOALYSS.php:36
+#: include/template/card_multiple_result.php:20 include/lib/ac_common.php:1223
+#: include/upgrade-plugin.php:65 include/class/acc_ledger_search.class.php:763
+#: include/class/acc_ledger_search.class.php:1072
+#: include/class/acc_ledger_search.class.php:1217
+#: include/template/detail-action.php:284
+#: include/template/detail-action.php:291
+#: include/template/detail-action.php:499 include/template/tag_detail.php:26
+#: include/dossier.inc.php:231 include/dossier.inc.php:345
+#: include/compta_fin_saldo.inc.php:50
+#: include/class/tva_rate_mtable.class.php:50
+#: include/class/anc_account_table.class.php:49
+#: include/class/acc_ledger_search.class.php:763
+#: include/class/acc_ledger_search.class.php:1072
+#: include/class/acc_ledger_search.class.php:1217
+#: include/class/operation_predef_mtable.class.php:54
+#: include/class/fiche.class.php:1425 include/class/fiche.class.php:1504
 #: include/class/anc_listing.class.php:83 include/class/anc_plan.class.php:139
 #: include/class/anc_plan.class.php:155
 #: include/class/print_ledger_simple.class.php:105
@@ -5683,18 +6144,17 @@ msgstr ""
 #: include/template/action_display_short.php:114
 #: include/template/acc_ledger_history_sale_detail.php:38
 #: include/template/ledger_detail_ven.php:127
-#: include/template/detail-action.php:260
-#: include/template/detail-action.php:280
-#: include/template/detail-action.php:287
-#: include/template/detail-action.php:330
-#: include/template/detail-action.php:486 include/template/profile.php:37
+#: include/template/detail-action.php:264
+#: include/template/detail-action.php:284
+#: include/template/detail-action.php:291
+#: include/template/detail-action.php:499 include/template/profile.php:37
 #: include/template/tag_search_select.php:24
 #: include/template/acc_ledger_history_purchase_oneline.php:50
 #: include/template/letter_all.php:32 include/template/menu_detail.php:43
 #: include/template/pcmn_update.php:38
 #: include/template/acc_ledger_history_sale_oneline.php:47
 #: include/template/acc_ledger_history_purchase_detail.php:37
-#: include/template/category_of_card.php:28 include/template/tag_detail.php:24
+#: include/template/category_of_card.php:28 include/template/tag_detail.php:26
 #: include/template/tag_list.php:16
 #: include/template/acc_ledger_history_sale_extended.php:46
 #: include/template/ledger_detail_ach.php:119
@@ -5703,7 +6163,7 @@ msgstr ""
 #: include/template/newEmptyPHP_NOALYSS.php:36
 #: include/template/card_multiple_result.php:20
 #: include/template/operation_detail_ven.php:36 include/database.item.php:156
-#: include/dossier.inc.php:228 include/dossier.inc.php:342
+#: include/dossier.inc.php:231 include/dossier.inc.php:345
 #: include/profile.inc.php:361 include/lib/ac_common.php:1223
 #: include/upgrade-plugin.php:65 include/menu.inc.php:110
 msgid "Description"
@@ -5727,6 +6187,9 @@ msgstr ""
 #: include/class/anc_account_table.class.php:50 include/database.item.php:9
 #: include/database.item.php:51 include/export/export_anc_axis_csv.php:47
 #: include/database.item.php:52 include/class/follow_up.class.php:625
+#: include/template/tag_search_select.php:64
+#: include/template/tag_search_select.php:70 include/database.item.php:8
+#: include/class/follow_up.class.php:641 include/class/follow_up.class.php:641
 #: include/class/anc_account_table.class.php:50
 #: include/export/export_anc_axis_csv.php:47
 #: include/template/tag_search_select.php:64
@@ -5766,8 +6229,10 @@ msgstr ""
 #: include/class/anc_listing.class.php:79
 #: include/class/anc_grandlivre.class.php:215
 #: include/class/anc_listing.class.php:81
-#: include/class/anc_listing.class.php:81
 #: include/class/anc_grandlivre.class.php:227
+#: include/class/anc_grandlivre.class.php:228
+#: include/class/anc_listing.class.php:81
+#: include/class/anc_grandlivre.class.php:228
 msgid "Quick_code"
 msgstr ""
 
@@ -5815,6 +6280,7 @@ msgstr ""
 #: include/class/class_anc_group_operation.php:190
 #: include/class/anc_group_operation.class.php:207
 #: include/class/anticipation.class.php:431 include/template/stock_inv.php:106
+#: include/class/anc_group_operation.class.php:208
 #: include/class/anticipation.class.php:431
 #: include/class/anc_group_operation.class.php:208
 #: include/template/stock_inv.php:106
@@ -5848,7 +6314,7 @@ msgstr ""
 #: include/class/pdf_operation.class.php:250
 #: include/class/anc_listing.class.php:87
 #: include/class/pdfbalance_simple.class.php:59 include/fiche.inc.php:421
-#: include/class/pdfbalance_simple.class.php:59
+#: include/fiche.inc.php:421 include/class/pdfbalance_simple.class.php:59
 #: include/class/anc_listing.class.php:87
 #: include/class/pdf_operation.class.php:250
 #: include/ajax/ajax_anc_detail_operation.php:57
@@ -5859,12 +6325,14 @@ msgstr ""
 
 #: include/class_anc_print.php:93 include/class_anc_print.php:94
 #: include/class/class_anc_print.php:94 include/class/class_anc_print.php:96
-#: include/class/anc_print.class.php:96 include/class/anc_print.class.php:96
+#: include/class/anc_print.class.php:96 include/class/anc_print.class.php:97
+#: include/class/anc_print.class.php:97
 msgid "Aucun plan défini"
 msgstr ""
 
 #: include/class_anc_print.php:120 include/lib/message_javascript.php:68
-#: include/lib/message_javascript.php:70 include/lib/message_javascript.php:70
+#: include/lib/message_javascript.php:70 include/lib/message_javascript.php:71
+#: include/lib/message_javascript.php:71
 msgid "Les dates sont en format DD.MM.YYYY"
 msgstr ""
 
@@ -5877,7 +6345,8 @@ msgstr ""
 #: include/class_anc_print.php:130 include/class_anc_print.php:177
 #: include/class_anc_print.php:179 include/class/class_anc_print.php:179
 #: include/class/class_anc_print.php:181 include/class/anc_print.class.php:175
-#: include/class/anc_print.class.php:181 include/class/anc_print.class.php:181
+#: include/class/anc_print.class.php:181 include/class/anc_print.class.php:182
+#: include/class/anc_print.class.php:182
 msgid "Entre l'activité "
 msgstr ""
 
@@ -5891,13 +6360,14 @@ msgstr ""
 #: include/class_anc_print.php:137 include/class_anc_print.php:179
 #: include/class_anc_print.php:181 include/class/class_anc_print.php:181
 #: include/class/class_anc_print.php:183 include/class/anc_print.class.php:177
-#: include/class/anc_print.class.php:183 include/class/anc_print.class.php:183
+#: include/class/anc_print.class.php:183 include/class/anc_print.class.php:184
+#: include/class/anc_print.class.php:184
 msgid " et l'activité "
 msgstr ""
 
 #: include/class_anc_print.php:140 include/class_anc_print.php:181
 #: include/lib/message_javascript.php:73 include/lib/message_javascript.php:75
-#: include/lib/message_javascript.php:75
+#: include/lib/message_javascript.php:76 include/lib/message_javascript.php:76
 msgid "Selectionnez le plan qui vous intéresse avant de cliquer sur Recherche"
 msgstr ""
 
@@ -5955,7 +6425,7 @@ msgstr ""
 #: include/class/anticipation.class.php:293 include/database.item.php:71
 #: include/template/acc_ledger_history_financial_oneline.php:31
 #: include/template/acc_ledger_history_financial_oneline.php:32
-#: include/class/anticipation.class.php:293
+#: include/database.item.php:70 include/class/anticipation.class.php:293
 #: include/template/form_ledger_fin.php:25
 #: include/template/acc_ledger_history_financial_oneline.php:32
 #: include/database.item.php:70
@@ -5983,8 +6453,10 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:940
 #: include/class/acc_ledger_search.class.php:948
 #: include/class/acc_ledger_search.class.php:961
-#: include/class/calendar.class.php:136
 #: include/class/acc_ledger_search.class.php:1050
+#: include/class/acc_ledger_search.class.php:1073
+#: include/class/calendar.class.php:136
+#: include/class/acc_ledger_search.class.php:1073
 msgid "Notes"
 msgstr ""
 
@@ -6083,6 +6555,8 @@ msgstr ""
 #: include/class/fiche.class.php:562 include/lib/html_input.class.php:386
 #: include/class/fiche.class.php:434 include/class/fiche.class.php:564
 #: include/class/fiche.class.php:433 include/class/fiche.class.php:563
+#: include/class/fiche.class.php:576
+#: include/ajax/ajax_add_concerned_card.php:81
 #: include/class/document_modele.class.php:68 include/class/fiche.class.php:434
 #: include/class/fiche.class.php:576
 #: include/ajax/ajax_add_concerned_card.php:81
@@ -6190,15 +6664,21 @@ msgstr ""
 #: include/lib/manage_table_sql.class.php:768
 #: include/template/ledger_detail_bottom.php:325 include/modele.inc.php:317
 #: include/class/periode.class.php:598 include/class/periode.class.php:603
+#: include/class/document_type.class.php:84 include/class/periode.class.php:604
+#: include/template/ledger_detail_bottom.php:344
+#: include/lib/manage_table_sql.class.php:820 include/user_detail.inc.php:203
+#: include/class/periode.class.php:600 include/class/periode.class.php:605
+#: include/template/ledger_detail_bottom.php:361 include/dossier.inc.php:284
+#: include/dossier.inc.php:293 include/user_detail.inc.php:203
 #: include/class/anc_operation.class.php:317
 #: include/class/document_modele.class.php:71
-#: include/class/document_type.class.php:84 include/class/periode.class.php:599
-#: include/class/periode.class.php:604 include/ajax/ajax_view_mod_stock.php:55
+#: include/class/document_type.class.php:84 include/class/periode.class.php:600
+#: include/class/periode.class.php:605 include/ajax/ajax_view_mod_stock.php:55
 #: include/ajax/ajax_admin.php:268 include/ajax/ajax_admin.php:293
 #: include/modele.inc.php:317 include/compta_fin.inc.php:150
-#: include/anc_group.inc.php:88 include/template/ledger_detail_bottom.php:344
+#: include/anc_group.inc.php:88 include/template/ledger_detail_bottom.php:361
 #: include/template/anc_key_input.php:212 include/forecast.inc.php:347
-#: include/dossier.inc.php:281 include/dossier.inc.php:290
+#: include/dossier.inc.php:284 include/dossier.inc.php:293
 #: include/lib/manage_table_sql.class.php:820
 msgid "Effacer"
 msgstr ""
@@ -6297,7 +6777,7 @@ msgstr ""
 #: include/ext/rapport_avance/include/rapav_declaration.class.php:361
 #: include/ext/rapport_avance/include/rapav_declaration.class.php:434
 #: include/class/document.class.php:311 include/class/document.class.php:285
-#: include/class/document.class.php:290
+#: include/class/document.class.php:290 include/class/document.class.php:290
 msgid "Ne peut pas sauver "
 msgstr ""
 
@@ -6332,11 +6812,13 @@ msgstr ""
 #: include/class/anc_operation.class.php:318
 #: include/class/anc_operation.class.php:319
 #: include/lib/manage_table_sql.class.php:755
+#: include/class/document_type.class.php:77
+#: include/lib/manage_table_sql.class.php:807 include/dossier.inc.php:286
 #: include/class/anc_operation.class.php:319
 #: include/class/document_modele.class.php:92
 #: include/class/document_type.class.php:77
 #: include/ajax/ajax_get_profile.php:90 include/ajax/ajax_view_action.php:47
-#: include/stock_cfg.inc.php:110 include/dossier.inc.php:283
+#: include/stock_cfg.inc.php:110 include/dossier.inc.php:286
 #: include/lib/manage_table_sql.class.php:807
 msgid "Modifier"
 msgstr ""
@@ -6349,6 +6831,7 @@ msgstr ""
 #: include/ajax/ajax_plugin_detail.php:32
 #: include/class/class_document_type.php:83 include/ajax/ajax_add_menu.php:137
 #: include/ajax/ajax_add_menu.php:145 include/class/document_type.class.php:83
+#: include/class/document_type.class.php:85
 #: include/class/document_type.class.php:85 include/ajax/ajax_add_menu.php:145
 #: include/ajax/ajax_plugin_detail.php:32
 #: include/ajax/ajax_get_menu_detail.php:53
@@ -6374,7 +6857,9 @@ msgstr ""
 #: include/class_fiche_def.php:452 include/ajax/ajax_plugin_detail.php:35
 #: include/class/class_fiche_def.php:452
 #: include/class/anc_account_table.class.php:48
-#: include/class/fiche_def.class.php:453 include/class/fiche_def.class.php:453
+#: include/class/fiche_def.class.php:453
+#: include/class/document_state_mtable.php:43
+#: include/class/fiche_def.class.php:453
 #: include/class/anc_account_table.class.php:48
 #: include/class/document_state_mtable.php:43
 #: include/ajax/ajax_plugin_detail.php:35
@@ -6407,7 +6892,8 @@ msgstr ""
 #: include/class_fiche_def.php:776 include/class_fiche_def.php:788
 #: include/class/class_fiche_def.php:787 include/operation_ods_new.inc.php:95
 #: include/class/fiche_def.class.php:788 include/operation_ods_new.inc.php:98
-#: include/class/fiche_def.class.php:788 include/operation_ods_new.inc.php:99
+#: include/operation_ods_new.inc.php:99 include/class/fiche_def.class.php:788
+#: include/operation_ods_new.inc.php:99
 msgid "Sauvez"
 msgstr ""
 
@@ -6434,10 +6920,10 @@ msgstr ""
 #: include/class/fiche_def.class.php:791 include/class/fiche_def.class.php:796
 #: include/ajax/ajax_create_menu.php:13 include/template/stock_inv.php:33
 #: include/lib/message_javascript.php:78 include/lib/message_javascript.php:80
-#: include/class/fiche_def.class.php:791 include/class/fiche_def.class.php:796
-#: include/ajax/ajax_add_menu.php:200 include/ajax/ajax_create_menu.php:13
-#: include/template/stock_inv.php:33 include/template/fiche_list.php:30
-#: include/lib/message_javascript.php:80
+#: include/lib/message_javascript.php:81 include/class/fiche_def.class.php:791
+#: include/class/fiche_def.class.php:796 include/ajax/ajax_add_menu.php:200
+#: include/ajax/ajax_create_menu.php:13 include/template/stock_inv.php:33
+#: include/template/fiche_list.php:30 include/lib/message_javascript.php:81
 msgid "Vous confirmez ?"
 msgstr ""
 
@@ -6495,6 +6981,8 @@ msgstr ""
 #: include/class/acc_ledger_history_generic.class.php:684
 #: include/class/fiche.class.php:1500
 #: include/class/acc_ledger_history_generic.class.php:685
+#: include/class/fiche.class.php:1500
+#: include/class/acc_ledger_history_generic.class.php:685
 #: include/export/export_poste_detail_csv.php:80
 #: include/export/export_fiche_detail_csv.php:71
 #: include/template/impress_reconciliation.php:16
@@ -6510,6 +6998,7 @@ msgstr ""
 #: include/class/acc_account_ledger.class.php:395
 #: include/class/fiche.class.php:1458 include/class/fiche.class.php:1460
 #: include/class/acc_account_ledger.class.php:387
+#: include/class/acc_account_ledger.class.php:387
 #: include/export/export_fiche_detail_csv.php:72
 msgid "Code interne"
 msgstr ""
@@ -6551,12 +7040,15 @@ msgstr ""
 #: include/class/fiche.class.php:1778 include/class/fiche.class.php:1779
 #: include/database.item.php:167 include/fiche.inc.php:415
 #: include/class/fiche.class.php:1805
+#: include/template/ledger_detail_bottom.php:94
+#: include/template/ledger_detail_bottom.php:95 include/fiche.inc.php:415
+#: include/class/fiche.class.php:1805
 #: include/class/acc_ledger_fin.class.php:753
 #: include/ajax/ajax_boxcard_search.php:50
 #: include/template/ledger_detail_misc.php:100
 #: include/template/operation_detail_misc.php:33
 #: include/template/operation_detail_ach.php:35
-#: include/template/ledger_detail_bottom.php:94
+#: include/template/ledger_detail_bottom.php:95
 #: include/template/ledger_detail_ven.php:126
 #: include/template/ledger_detail_ach.php:118
 #: include/template/fiche_list.php:34
@@ -6576,8 +7068,9 @@ msgstr ""
 #: include/class/fiche.class.php:1758 include/class/fiche.class.php:1761
 #: include/class/fiche.class.php:1763 include/class/fiche.class.php:1781
 #: include/class/fiche.class.php:1782 include/class/fiche.class.php:1808
-#: include/audit_log.php:38 include/ajax/ajax_mod_stock_repo.php:47
-#: include/stock_cfg.inc.php:66 include/export/export_stock_resume_list.php:38
+#: include/class/fiche.class.php:1808 include/audit_log.php:38
+#: include/ajax/ajax_mod_stock_repo.php:47 include/stock_cfg.inc.php:66
+#: include/export/export_stock_resume_list.php:38
 #: include/template/stock_summary_list.php:39
 msgid "Adresse"
 msgstr ""
@@ -6589,7 +7082,7 @@ msgstr ""
 #: include/class/class_fiche.php:1605 include/class/fiche.class.php:1759
 #: include/class/fiche.class.php:1762 include/class/fiche.class.php:1764
 #: include/class/fiche.class.php:1782 include/class/fiche.class.php:1783
-#: include/class/fiche.class.php:1809
+#: include/class/fiche.class.php:1809 include/class/fiche.class.php:1809
 msgid "Total débit"
 msgstr ""
 
@@ -6600,7 +7093,7 @@ msgstr ""
 #: include/class/class_fiche.php:1606 include/class/fiche.class.php:1760
 #: include/class/fiche.class.php:1763 include/class/fiche.class.php:1765
 #: include/class/fiche.class.php:1783 include/class/fiche.class.php:1784
-#: include/class/fiche.class.php:1810
+#: include/class/fiche.class.php:1810 include/class/fiche.class.php:1810
 msgid "Total crédit"
 msgstr ""
 
@@ -6623,6 +7116,7 @@ msgstr ""
 #: include/class/anc_balance_double.class.php:101
 #: include/class/fiche.class.php:1785 include/export/export_balance_pdf.php:136
 #: include/class/pdfbalance_simple.class.php:58 include/fiche.inc.php:420
+#: include/class/fiche.class.php:1811 include/fiche.inc.php:420
 #: include/class/acc_bilan.class.php:176
 #: include/class/pdfbalance_simple.class.php:58
 #: include/class/fiche.class.php:1811 include/class/anc_listing.class.php:120
@@ -6640,6 +7134,7 @@ msgstr ""
 #: include/class_follow_up.php:421 include/class/class_follow_up.php:421
 #: include/class/class_follow_up.php:411 include/class/follow_up.class.php:411
 #: include/class/follow_up.class.php:412 include/class/follow_up.class.php:419
+#: include/class/follow_up.class.php:421 include/class/follow_up.class.php:421
 msgid "Génére le document"
 msgstr ""
 
@@ -6655,6 +7150,8 @@ msgstr ""
 #: include/class/follow_up.class.php:1203
 #: include/class/follow_up.class.php:1204
 #: include/class/follow_up.class.php:1121
+#: include/class/follow_up.class.php:1153
+#: include/class/follow_up.class.php:1153
 msgid "Tous les types"
 msgstr ""
 
@@ -6684,6 +7181,8 @@ msgstr ""
 #: include/class/follow_up.class.php:1219
 #: include/class/follow_up.class.php:1220
 #: include/class/follow_up.class.php:1137
+#: include/class/follow_up.class.php:1169
+#: include/class/follow_up.class.php:1169
 msgid "Aucun"
 msgstr ""
 
@@ -6699,6 +7198,8 @@ msgstr ""
 #: include/class/follow_up.class.php:1243
 #: include/class/follow_up.class.php:1244
 #: include/class/follow_up.class.php:1161
+#: include/class/follow_up.class.php:1193
+#: include/class/follow_up.class.php:1193
 msgid "Tous les profiles"
 msgstr ""
 
@@ -6709,6 +7210,8 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:1077
 #: include/class/acc_ledger_search.class.php:1090
 #: include/class/acc_ledger_search.class.php:1179
+#: include/class/acc_ledger_search.class.php:1202
+#: include/class/acc_ledger_search.class.php:1202
 msgid "Filtre "
 msgstr ""
 
@@ -6786,12 +7289,20 @@ msgstr ""
 #: include/template/ledger_detail_bottom.php:303
 #: include/template/ledger_detail_bottom.php:299
 #: include/template/ledger_detail_bottom.php:300 include/ajax/ajax_card.php:313
-#: html/user_login.php:106 html/recherche.php:92 html/recherche.php:144
+#: html/recherche.php:92 html/recherche.php:144
 #: include/class/extension.class.php:276 include/ajax/ajax_card.php:319
 #: include/template/ledger_detail_bottom.php:317
 #: include/template/ledger_detail_bottom.php:318
+#: include/template/action_search.php:169 html/recherche.php:154
+#: include/template/ledger_detail_bottom.php:334
+#: include/template/ledger_detail_bottom.php:335
+#: include/template/action_search.php:171 include/user.inc.php:90
+#: html/user_login.php:106 html/recherche.php:92 html/recherche.php:154
+#: include/class/extension.class.php:276 include/ajax/ajax_card.php:319
+#: include/template/ledger_detail_bottom.php:334
+#: include/template/ledger_detail_bottom.php:335
 #: include/template/ledger_detail_top.php:16
-#: include/template/action_search.php:169 include/user.inc.php:88
+#: include/template/action_search.php:171 include/user.inc.php:90
 #: include/lib/html_input.class.php:434 include/lib/html_input.class.php:449
 #, php-format
 msgid "Fermer"
@@ -6802,7 +7313,7 @@ msgstr ""
 #: include/lib/class_ibutton.php:63 include/compta_fin_rec.inc.php:221
 #: include/lib/class_html_input.php:333 include/lib/class_html_input.php:334
 #: include/lib/ibutton.class.php:63 include/compta_fin_rec.inc.php:258
-#: include/lib/ibutton.class.php:63
+#: include/compta_fin_rec.inc.php:258 include/lib/ibutton.class.php:63
 msgid "Inverser la sélection"
 msgstr ""
 
@@ -6821,7 +7332,8 @@ msgstr ""
 #: include/class_ibutton.php:82 include/class_ibutton.php:84
 #: include/lib/class_ibutton.php:84 include/lib/ibutton.class.php:84
 #: include/lib/message_javascript.php:97 include/lib/message_javascript.php:99
-#: include/lib/message_javascript.php:99
+#: include/lib/message_javascript.php:100
+#: include/lib/message_javascript.php:100
 msgid "Calculatrice"
 msgstr ""
 
@@ -6878,6 +7390,7 @@ msgstr ""
 #: include/class/class_pre_op_ach.php:197
 #: include/class/pre_op_ach.class.php:197
 #: include/class/pre_op_ach.class.php:200
+#: include/class/pre_op_ach.class.php:200
 msgid "En-tête facture fournisseur"
 msgstr ""
 
@@ -6895,6 +7408,7 @@ msgstr ""
 #: include/class/class_pre_op_ven.php:201
 #: include/class/pre_op_ven.class.php:201
 #: include/class/pre_op_ven.class.php:196
+#: include/class/pre_op_ven.class.php:196
 msgid "En-tête facture client"
 msgstr ""
 
@@ -6907,6 +7421,7 @@ msgstr ""
 #: include/export/export_security_pdf.php:137
 #: include/class/profile_menu.class.php:246
 #: include/class/profile_menu.class.php:271
+#: include/class/profile_menu.class.php:272
 #: include/class/profile_menu.class.php:246
 #: include/class/profile_menu.class.php:272
 #: include/export/export_security_pdf.php:137
@@ -6924,6 +7439,8 @@ msgstr ""
 #: include/class/profile_menu.class.php:272
 #: include/class/profile_menu.class.php:248
 #: include/class/profile_menu.class.php:273
+#: include/class/profile_menu.class.php:248
+#: include/class/profile_menu.class.php:273
 #: include/export/export_security_pdf.php:147
 msgid "Ecriture"
 msgstr ""
@@ -6943,6 +7460,9 @@ msgstr ""
 #: include/param_sec.inc.php:339 include/class/profile_menu.class.php:249
 #: include/class/profile_menu.class.php:274 include/param_sec.inc.php:154
 #: include/param_sec.inc.php:264 include/param_sec.inc.php:271
+#: include/param_sec.inc.php:354 include/class/profile_menu.class.php:249
+#: include/class/profile_menu.class.php:274 include/param_sec.inc.php:154
+#: include/param_sec.inc.php:264 include/param_sec.inc.php:271
 #: include/param_sec.inc.php:354
 msgid "Aucun accès"
 msgstr ""
@@ -6970,7 +7490,7 @@ msgstr ""
 #: include/class_user.php:932 include/class_user.php:933
 #: include/class/class_user.php:933 include/class/class_user.php:921
 #: include/class/user.class.php:921 include/class/user.class.php:945
-#: include/class/user.class.php:948
+#: include/class/user.class.php:948 include/class/user.class.php:948
 msgid "Dossier non accessible"
 msgstr ""
 
@@ -6979,22 +7499,26 @@ msgstr ""
 #: include/class/class_user.php:1212 include/class/class_user.php:1200
 #: include/class/class_user.php:1238 include/class/class_user.php:1236
 #: include/class/user.class.php:1236 include/class/user.class.php:1261
-#: include/class/user.class.php:1284
+#: include/class/user.class.php:1284 include/class/user.class.php:1299
+#: include/class/user.class.php:1299
 msgid "Les mots de passe ne correspondent pas. Mot de passe inchangé"
 msgstr ""
 
 #: include/company.inc.php:35 include/company.inc.php:54
 #: include/company.inc.php:58 include/company.inc.php:62
+#: include/company.inc.php:62
 msgid "obligatoire"
 msgstr ""
 
 #: include/company.inc.php:36 include/company.inc.php:55
 #: include/company.inc.php:59 include/company.inc.php:63
+#: include/company.inc.php:63
 msgid "optionnel"
 msgstr ""
 
 #: include/company.inc.php:37 include/company.inc.php:56
 #: include/company.inc.php:60 include/company.inc.php:64
+#: include/company.inc.php:64
 msgid "non utilisé"
 msgstr ""
 
@@ -7011,7 +7535,10 @@ msgstr ""
 #: include/template/profile_menu_display_submenu.php:65
 #: include/user_detail.inc.php:158
 #: include/template/profile_menu_display_module.php:81
-#: include/user_detail.inc.php:158 include/class/tva_rate_mtable.class.php:56
+#: include/class/tva_rate_mtable.class.php:56 include/company.inc.php:71
+#: include/company.inc.php:74 include/company.inc.php:112
+#: include/user_detail.inc.php:169 include/user_detail.inc.php:169
+#: include/class/tva_rate_mtable.class.php:56
 #: include/template/profile_menu_display_submenu.php:65
 #: include/template/profile_menu_display_module.php:81
 #: include/company.inc.php:67 include/company.inc.php:71
@@ -7033,7 +7560,11 @@ msgstr ""
 #: include/user_detail.inc.php:159
 #: include/template/profile_menu_display_module.php:81
 #: include/class/acc_plan_mtable.class.php:59
-#: include/class/acc_plan_mtable.class.php:65 include/user_detail.inc.php:159
+#: include/class/acc_plan_mtable.class.php:65
+#: include/class/tva_rate_mtable.class.php:57
+#: include/class/acc_plan_mtable.class.php:66 include/company.inc.php:72
+#: include/company.inc.php:75 include/company.inc.php:113
+#: include/user_detail.inc.php:170 include/user_detail.inc.php:170
 #: include/class/tva_rate_mtable.class.php:57
 #: include/class/acc_plan_mtable.class.php:66
 #: include/template/profile_menu_display_submenu.php:65
@@ -7045,6 +7576,7 @@ msgstr ""
 
 #: include/company.inc.php:97 include/company.inc.php:116
 #: include/company.inc.php:120 include/company.inc.php:128
+#: include/company.inc.php:128
 msgid "Nom société"
 msgstr ""
 
@@ -7055,8 +7587,9 @@ msgstr ""
 #: include/template/stock_summary_list.php:42 include/company.inc.php:118
 #: include/ext/sav/include/template/sas_display_detail.php:115
 #: include/ajax/ajax_mod_stock_repo.php:71 include/company.inc.php:122
-#: include/ajax/ajax_mod_stock_repo.php:71 include/stock_cfg.inc.php:69
-#: include/template/stock_summary_list.php:42 include/company.inc.php:130
+#: include/company.inc.php:130 include/ajax/ajax_mod_stock_repo.php:71
+#: include/stock_cfg.inc.php:69 include/template/stock_summary_list.php:42
+#: include/company.inc.php:130
 msgid "Téléphone"
 msgstr ""
 
@@ -7066,27 +7599,32 @@ msgstr ""
 #: include/database.item.php:164 include/database.item.php:157
 #: include/database.item.php:158 include/company.inc.php:124
 #: include/database.item.php:166 include/database.item.php:169
-#: include/database.item.php:165 include/company.inc.php:132
+#: include/company.inc.php:132 include/database.item.php:165
+#: include/company.inc.php:132
 msgid "Fax"
 msgstr ""
 
 #: include/company.inc.php:103 include/company.inc.php:122
 #: include/company.inc.php:126 include/company.inc.php:134
+#: include/company.inc.php:134
 msgid "Rue "
 msgstr ""
 
 #: include/company.inc.php:105 include/company.inc.php:124
 #: include/company.inc.php:128 include/company.inc.php:136
+#: include/company.inc.php:136
 msgid "Numéro"
 msgstr ""
 
 #: include/company.inc.php:107 include/company.inc.php:126
 #: include/company.inc.php:130 include/company.inc.php:138
+#: include/company.inc.php:138
 msgid "Code Postal"
 msgstr ""
 
 #: include/company.inc.php:109 include/company.inc.php:128
 #: include/company.inc.php:132 include/company.inc.php:140
+#: include/company.inc.php:140
 msgid "Commune"
 msgstr ""
 
@@ -7095,7 +7633,7 @@ msgstr ""
 #: include/template/stock_summary_list.php:41 include/company.inc.php:130
 #: include/ext/sav/include/template/sas_display_detail.php:107
 #: include/ajax/ajax_mod_stock_repo.php:63 include/company.inc.php:134
-#: include/export/export_stock_resume_list.php:38
+#: include/export/export_stock_resume_list.php:38 include/company.inc.php:142
 #: include/ajax/ajax_mod_stock_repo.php:63 include/stock_cfg.inc.php:68
 #: include/export/export_stock_resume_list.php:38
 #: include/template/stock_summary_list.php:41 include/company.inc.php:142
@@ -7104,51 +7642,61 @@ msgstr ""
 
 #: include/company.inc.php:113 include/company.inc.php:132
 #: include/company.inc.php:136 include/company.inc.php:144
+#: include/company.inc.php:144
 msgid "Numéro de Tva"
 msgstr ""
 
 #: include/company.inc.php:114 include/company.inc.php:133
 #: include/company.inc.php:137 include/company.inc.php:145
+#: include/company.inc.php:145
 msgid "Utilisation de la compta. analytique"
 msgstr ""
 
 #: include/company.inc.php:115 include/company.inc.php:134
 #: include/company.inc.php:138 include/company.inc.php:152
+#: include/company.inc.php:152
 msgid "Utilisation des stocks"
 msgstr ""
 
 #: include/company.inc.php:117 include/company.inc.php:136
 #: include/company.inc.php:140 include/company.inc.php:154
+#: include/company.inc.php:154
 msgid "Utilisation du mode strict "
 msgstr ""
 
 #: include/company.inc.php:118 include/company.inc.php:137
 #: include/company.inc.php:141 include/company.inc.php:155
+#: include/company.inc.php:155
 msgid "Assujetti à la tva"
 msgstr ""
 
 #: include/company.inc.php:119 include/company.inc.php:138
 #: include/company.inc.php:142 include/company.inc.php:156
+#: include/company.inc.php:156
 msgid "Suggérer le numéro de pièce justificative"
 msgstr ""
 
 #: include/company.inc.php:120 include/company.inc.php:139
 #: include/company.inc.php:143 include/company.inc.php:157
+#: include/company.inc.php:157
 msgid "Suggérer la date"
 msgstr ""
 
 #: include/company.inc.php:121 include/company.inc.php:140
 #: include/company.inc.php:144 include/company.inc.php:158
+#: include/company.inc.php:158
 msgid "Afficher la période comptable pour éviter les erreurs de date"
 msgstr ""
 
 #: include/company.inc.php:122 include/company.inc.php:141
 #: include/company.inc.php:145 include/company.inc.php:159
+#: include/company.inc.php:159
 msgid "Utilisez des postes comptables alphanumérique"
 msgstr ""
 
 #: include/company.inc.php:123 include/company.inc.php:142
 #: include/company.inc.php:146 include/company.inc.php:160
+#: include/company.inc.php:160
 msgid "Changer le libellé des détails"
 msgstr ""
 
@@ -7163,6 +7711,7 @@ msgstr ""
 #: include/compta_ach.inc.php:167 include/compta_ven.inc.php:122
 #: include/ext/tva/ajax.php:111 include/compta_ven.inc.php:120
 #: include/compta_ach.inc.php:112 include/compta_ach.inc.php:165
+#: include/compta_ach.inc.php:111 include/compta_ach.inc.php:164
 #: include/compta_ven.inc.php:120 include/compta_ach.inc.php:111
 #: include/compta_ach.inc.php:164 include/compta_fin.inc.php:116
 msgid "Enregistrement"
@@ -7178,8 +7727,9 @@ msgstr ""
 #: include/compta_ven.inc.php:119 include/compta_ach.inc.php:115
 #: include/compta_ven.inc.php:123 include/operation_ods_confirm.inc.php:90
 #: include/compta_ven.inc.php:121 include/compta_ach.inc.php:113
-#: include/compta_ven.inc.php:121 include/compta_ach.inc.php:112
-#: include/compta_fin.inc.php:85 include/operation_ods_confirm.inc.php:90
+#: include/compta_ach.inc.php:112 include/compta_ven.inc.php:121
+#: include/compta_ach.inc.php:112 include/compta_fin.inc.php:85
+#: include/operation_ods_confirm.inc.php:90
 msgid "Corriger"
 msgstr ""
 
@@ -7207,6 +7757,8 @@ msgstr ""
 #: include/compta_ven.inc.php:339 include/compta_ven.inc.php:337
 #: include/compta_ach.inc.php:294 include/compta_ven.inc.php:329
 #: include/compta_ach.inc.php:295 include/template/form_ledger_detail.php:131
+#: include/template/predf_ledger_detail.php:59 include/compta_ven.inc.php:329
+#: include/compta_ach.inc.php:295 include/template/form_ledger_detail.php:131
 #: include/template/predf_ledger_detail.php:59
 msgid "Actualiser"
 msgstr ""
@@ -7223,13 +7775,16 @@ msgstr ""
 #: include/compta_ach.inc.php:299 include/compta_ven.inc.php:341
 #: include/compta_ven.inc.php:339 include/compta_ach.inc.php:297
 #: include/compta_ven.inc.php:331 include/compta_ach.inc.php:298
+#: include/compta_ven.inc.php:331 include/compta_ach.inc.php:298
 msgid "Effacer "
 msgstr ""
 
 #: include/compta_fin.inc.php:83 include/compta_fin.inc.php:84
 #: include/operation_ods_confirm.inc.php:78 include/ext/importbank/ajax.php:232
 #: include/ext/importbank/ajax.php:237 include/ext/importbank/ajax.php:238
-#: include/operation_ods_confirm.inc.php:89 include/compta_fin.inc.php:84
+#: include/operation_ods_confirm.inc.php:89 include/user_detail.inc.php:197
+#: include/user_detail.inc.php:218 include/user_detail.inc.php:197
+#: include/user_detail.inc.php:218 include/compta_fin.inc.php:84
 #: include/operation_ods_confirm.inc.php:89
 msgid "Confirmer"
 msgstr ""
@@ -7242,15 +7797,16 @@ msgstr ""
 #: include/bank.inc.php:49 include/bank.inc.php:48 include/adm.inc.php:54
 #: include/contact.inc.php:53 include/customer.inc.php:53
 #: include/manager.inc.php:56 include/supplier.inc.php:55
-#: include/adm.inc.php:51 include/customer.inc.php:54 include/bank.inc.php:48
-#: include/adm.inc.php:51 include/supplier.inc.php:55
-#: include/contact.inc.php:54 include/customer.inc.php:54
-#: include/manager.inc.php:56
+#: include/adm.inc.php:51 include/customer.inc.php:54
+#: include/contact.inc.php:54 include/bank.inc.php:48 include/adm.inc.php:51
+#: include/supplier.inc.php:55 include/contact.inc.php:54
+#: include/customer.inc.php:54 include/manager.inc.php:56
 msgid "Vous  ne pouvez pas enlever de fiche"
 msgstr ""
 
 #: include/contact.inc.php:90 include/contact.inc.php:94
 #: include/contact.inc.php:95 include/contact.inc.php:96
+#: include/contact.inc.php:96
 msgid "Société :"
 msgstr ""
 
@@ -7280,6 +7836,11 @@ msgstr ""
 #: include/template/tax_summary_display.php:176 include/database.item.php:235
 #: include/database.item.php:254 include/class/acc_ledger_search.class.php:1188
 #: include/class/operation_predef_mtable.class.php:172
+#: include/database.item.php:3 include/database.item.php:67
+#: include/database.item.php:219 include/database.item.php:231
+#: include/class/acc_ledger_search.class.php:1211
+#: include/class/acc_ledger_search.class.php:1211
+#: include/class/operation_predef_mtable.class.php:172
 #: include/template/tax_summary_display.php:176 include/database.item.php:3
 #: include/database.item.php:67 include/database.item.php:219
 #: include/database.item.php:231 include/cfgledger.inc.php:171
@@ -7289,54 +7850,63 @@ msgstr ""
 #: include/database.item.php:2 include/database.item.php:5
 #: include/database.item.php:7 include/database.item.php:10
 #: include/database.item.php:4 include/database.item.php:3
+#: include/database.item.php:3
 msgid "Nouvel achat ou dépense"
 msgstr ""
 
 #: include/database.item.php:3 include/database.item.php:6
 #: include/database.item.php:8 include/database.item.php:11
 #: include/database.item.php:5 include/database.item.php:4
+#: include/database.item.php:4
 msgid "Historique des imputations analytiques"
 msgstr ""
 
 #: include/database.item.php:4 include/database.item.php:7
 #: include/database.item.php:9 include/database.item.php:12
 #: include/database.item.php:6 include/database.item.php:5
+#: include/database.item.php:5
 msgid "Balance simple"
 msgstr ""
 
 #: include/database.item.php:4 include/database.item.php:7
 #: include/database.item.php:9 include/database.item.php:12
 #: include/database.item.php:6 include/database.item.php:5
+#: include/database.item.php:5
 msgid "Balance simple des imputations analytiques"
 msgstr ""
 
 #: include/database.item.php:5 include/database.item.php:8
 #: include/database.item.php:10 include/database.item.php:13
 #: include/database.item.php:7 include/database.item.php:6
+#: include/database.item.php:6
 msgid "Tableau"
 msgstr ""
 
 #: include/database.item.php:5 include/database.item.php:8
 #: include/database.item.php:10 include/database.item.php:13
 #: include/database.item.php:7 include/database.item.php:6
+#: include/database.item.php:6
 msgid "Tableau lié à la comptabilité"
 msgstr ""
 
 #: include/database.item.php:6 include/database.item.php:9
 #: include/database.item.php:11 include/database.item.php:14
 #: include/database.item.php:8 include/database.item.php:7
+#: include/database.item.php:7
 msgid "Balance Analytique/comptabilité"
 msgstr ""
 
 #: include/database.item.php:6 include/database.item.php:9
 #: include/database.item.php:11 include/database.item.php:14
 #: include/database.item.php:8 include/database.item.php:7
+#: include/database.item.php:7
 msgid "Lien entre comptabilité et Comptabilité analytique"
 msgstr ""
 
 #: include/database.item.php:7 include/database.item.php:10
 #: include/database.item.php:12 include/database.item.php:15
 #: include/database.item.php:9 include/database.item.php:8
+#: include/database.item.php:8
 msgid "Balance par groupe"
 msgstr ""
 
@@ -7371,6 +7941,8 @@ msgstr ""
 #: include/template/acc_ledger_history_sale_extended.php:130
 #: include/class/print_ledger_detail_item.class.php:164
 #: include/class/acc_ledger_history_sale.class.php:260
+#: include/tax_summary.inc.php:43 include/database.item.php:9
+#: include/class/acc_ledger_history_sale.class.php:260
 #: include/class/print_ledger_detail_item.class.php:164
 #: include/class/pdf_operation.class.php:152
 #: include/class/pdf_operation.class.php:197
@@ -7392,6 +7964,7 @@ msgstr ""
 #: include/database.item.php:8 include/database.item.php:11
 #: include/database.item.php:13 include/database.item.php:16
 #: include/database.item.php:10 include/database.item.php:9
+#: include/database.item.php:9
 msgid "Config. de la tva"
 msgstr ""
 
@@ -7411,6 +7984,10 @@ msgstr ""
 #: include/template/tax_summary_display.php:29 include/database.item.php:234
 #: include/database.item.php:253 include/class/acc_ledger_search.class.php:1186
 #: include/class/operation_predef_mtable.class.php:176
+#: include/database.item.php:10 include/database.item.php:218
+#: include/class/acc_ledger_search.class.php:1209
+#: include/class/acc_ledger_search.class.php:1209
+#: include/class/operation_predef_mtable.class.php:176
 #: include/template/tax_summary_display.php:29 include/database.item.php:10
 #: include/database.item.php:218 include/database.item.php:230
 #: include/cfgledger.inc.php:173
@@ -7420,24 +7997,28 @@ msgstr ""
 #: include/database.item.php:9 include/database.item.php:12
 #: include/database.item.php:14 include/database.item.php:17
 #: include/database.item.php:11 include/database.item.php:10
+#: include/database.item.php:10
 msgid "Nouvelle vente ou recette"
 msgstr ""
 
 #: include/database.item.php:10 include/database.item.php:13
 #: include/database.item.php:15 include/database.item.php:18
 #: include/database.item.php:12 include/database.item.php:11
+#: include/database.item.php:11
 msgid "Config. Menu"
 msgstr ""
 
 #: include/database.item.php:10 include/database.item.php:13
 #: include/database.item.php:15 include/database.item.php:18
 #: include/database.item.php:12 include/database.item.php:11
+#: include/database.item.php:11
 msgid "Configuration des menus et plugins"
 msgstr ""
 
 #: include/database.item.php:11 include/database.item.php:14
 #: include/database.item.php:16 include/database.item.php:19
 #: include/database.item.php:13 include/database.item.php:12
+#: include/database.item.php:12
 msgid "Suivi fournisseur"
 msgstr ""
 
@@ -7447,6 +8028,7 @@ msgstr ""
 #: include/database.item.php:116 include/database.item.php:17
 #: include/database.item.php:20 include/database.item.php:14
 #: include/database.item.php:112 include/database.item.php:13
+#: include/database.item.php:113 include/database.item.php:13
 #: include/database.item.php:113
 msgid "Opérations diverses"
 msgstr ""
@@ -7454,12 +8036,14 @@ msgstr ""
 #: include/database.item.php:12 include/database.item.php:15
 #: include/database.item.php:17 include/database.item.php:20
 #: include/database.item.php:14 include/database.item.php:13
+#: include/database.item.php:13
 msgid "OD analytique"
 msgstr ""
 
 #: include/database.item.php:13 include/database.item.php:16
 #: include/database.item.php:18 include/database.item.php:21
 #: include/database.item.php:15 include/database.item.php:14
+#: include/database.item.php:14
 msgid "Création de rapport"
 msgstr ""
 
@@ -7479,14 +8063,14 @@ msgstr ""
 #: include/database.item.php:108 include/database.item.php:105
 #: include/database.item.php:104 include/database.item.php:21
 #: include/database.item.php:24 include/database.item.php:17
-#: include/database.item.php:16
+#: include/database.item.php:16 include/database.item.php:16
 msgid "Suivi client"
 msgstr ""
 
 #: include/database.item.php:16 include/database.item.php:19
 #: include/database.item.php:23 include/database.item.php:22
 #: include/database.item.php:25 include/database.item.php:18
-#: include/database.item.php:17
+#: include/database.item.php:17 include/database.item.php:17
 msgid "Historique stock"
 msgstr ""
 
@@ -7498,7 +8082,7 @@ msgstr ""
 #: include/database.item.php:17 include/database.item.php:20
 #: include/database.item.php:24 include/database.item.php:23
 #: include/database.item.php:26 include/database.item.php:19
-#: include/database.item.php:18
+#: include/database.item.php:18 include/database.item.php:18
 msgid "Export Historique"
 msgstr ""
 
@@ -7568,7 +8152,7 @@ msgstr ""
 #: include/database.item.php:32 include/database.item.php:35
 #: include/database.item.php:39 include/database.item.php:38
 #: include/database.item.php:41 include/database.item.php:34
-#: include/database.item.php:33
+#: include/database.item.php:33 include/database.item.php:33
 msgid "Export Sécurité"
 msgstr ""
 
@@ -7577,14 +8161,15 @@ msgstr ""
 #: include/database.item.php:40 include/database.item.php:42
 #: include/database.item.php:39 include/database.item.php:41
 #: include/database.item.php:44 include/database.item.php:37
-#: include/database.item.php:34 include/database.item.php:36
+#: include/database.item.php:34 include/database.item.php:34
+#: include/database.item.php:36
 msgid "Export Comptabilité analytique"
 msgstr ""
 
 #: include/database.item.php:34 include/database.item.php:37
 #: include/database.item.php:41 include/database.item.php:40
 #: include/database.item.php:43 include/database.item.php:36
-#: include/database.item.php:35
+#: include/database.item.php:35 include/database.item.php:35
 msgid "Export Comptabilité analytique balance simple"
 msgstr ""
 
@@ -7609,63 +8194,63 @@ msgstr ""
 #: include/database.item.php:40 include/database.item.php:43
 #: include/database.item.php:47 include/database.item.php:46
 #: include/database.item.php:49 include/database.item.php:42
-#: include/database.item.php:41
+#: include/database.item.php:41 include/database.item.php:41
 msgid "Export Tableau Analytique"
 msgstr ""
 
 #: include/database.item.php:41 include/database.item.php:44
 #: include/database.item.php:48 include/database.item.php:47
 #: include/database.item.php:50 include/database.item.php:43
-#: include/database.item.php:42
+#: include/database.item.php:42 include/database.item.php:42
 msgid "Export Historique Compt. Analytique"
 msgstr ""
 
 #: include/database.item.php:42 include/database.item.php:45
 #: include/database.item.php:49 include/database.item.php:48
 #: include/database.item.php:51 include/database.item.php:44
-#: include/database.item.php:43
+#: include/database.item.php:43 include/database.item.php:43
 msgid "Export Balance groupe analytique"
 msgstr ""
 
 #: include/database.item.php:43 include/database.item.php:46
 #: include/database.item.php:50 include/database.item.php:49
 #: include/database.item.php:52 include/database.item.php:45
-#: include/database.item.php:44
+#: include/database.item.php:44 include/database.item.php:44
 msgid "Export Bilan"
 msgstr ""
 
 #: include/database.item.php:44 include/database.item.php:47
 #: include/database.item.php:51 include/database.item.php:50
 #: include/database.item.php:53 include/database.item.php:46
-#: include/database.item.php:45
+#: include/database.item.php:45 include/database.item.php:45
 msgid "Impression Grand-Livre"
 msgstr ""
 
 #: include/database.item.php:45 include/database.item.php:48
 #: include/database.item.php:52 include/database.item.php:51
 #: include/database.item.php:54 include/database.item.php:47
-#: include/database.item.php:46
+#: include/database.item.php:46 include/database.item.php:46
 msgid "Export définition d'un raport"
 msgstr ""
 
 #: include/database.item.php:46 include/database.item.php:49
 #: include/database.item.php:53 include/database.item.php:52
 #: include/database.item.php:55 include/database.item.php:48
-#: include/database.item.php:47
+#: include/database.item.php:47 include/database.item.php:47
 msgid "Export Action Gestion"
 msgstr ""
 
 #: include/database.item.php:47 include/database.item.php:50
 #: include/database.item.php:54 include/database.item.php:53
 #: include/database.item.php:56 include/database.item.php:49
-#: include/database.item.php:48
+#: include/database.item.php:48 include/database.item.php:48
 msgid "Export Historique mouvement stock"
 msgstr ""
 
 #: include/database.item.php:48 include/database.item.php:51
 #: include/database.item.php:55 include/database.item.php:54
 #: include/database.item.php:57 include/database.item.php:50
-#: include/database.item.php:49
+#: include/database.item.php:49 include/database.item.php:49
 msgid "Export Résumé list stock"
 msgstr ""
 
@@ -7747,6 +8332,8 @@ msgstr ""
 #: include/database.item.php:223 include/cfgledger.inc.php:172
 #: include/database.item.php:55 include/database.item.php:255
 #: include/class/operation_predef_mtable.class.php:180
+#: include/database.item.php:232
+#: include/class/operation_predef_mtable.class.php:180
 #: include/database.item.php:54 include/database.item.php:232
 #: include/cfgledger.inc.php:172
 msgid "Opérations Diverses"
@@ -7839,7 +8426,7 @@ msgstr ""
 #: include/database.item.php:70 include/database.item.php:68
 #: include/database.item.php:67 include/database.item.php:66
 #: include/database.item.php:69 include/database.item.php:63
-#: include/database.item.php:62
+#: include/database.item.php:62 include/database.item.php:62
 msgid "Historique opérations diverses"
 msgstr ""
 
@@ -7847,7 +8434,7 @@ msgstr ""
 #: include/database.item.php:71 include/database.item.php:69
 #: include/database.item.php:68 include/database.item.php:67
 #: include/database.item.php:70 include/database.item.php:64
-#: include/database.item.php:63
+#: include/database.item.php:63 include/database.item.php:63
 msgid "Impression du détail d'un poste comptable"
 msgstr ""
 
@@ -7856,6 +8443,7 @@ msgstr ""
 #: include/database.item.php:70 include/database.item.php:69
 #: include/database.item.php:68 include/database.item.php:71
 #: include/database.item.php:65 include/database.item.php:64
+#: include/database.item.php:64
 msgid "Rapport"
 msgstr ""
 
@@ -7863,7 +8451,7 @@ msgstr ""
 #: include/database.item.php:72 include/database.item.php:70
 #: include/database.item.php:69 include/database.item.php:68
 #: include/database.item.php:71 include/database.item.php:65
-#: include/database.item.php:64
+#: include/database.item.php:64 include/database.item.php:64
 msgid "Impression de rapport"
 msgstr ""
 
@@ -7879,6 +8467,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:373
 #: include/class/acc_ledger.class.php:391
 #: include/class/acc_ledger.class.php:390 include/database.item.php:65
+#: include/class/acc_ledger.class.php:390 include/database.item.php:65
 msgid "Grand Livre"
 msgstr ""
 
@@ -7886,7 +8475,7 @@ msgstr ""
 #: include/database.item.php:73 include/database.item.php:71
 #: include/database.item.php:70 include/database.item.php:69
 #: include/database.item.php:72 include/database.item.php:66
-#: include/database.item.php:65
+#: include/database.item.php:65 include/database.item.php:65
 msgid "Impression du grand livre"
 msgstr ""
 
@@ -7894,7 +8483,7 @@ msgstr ""
 #: include/database.item.php:74 include/database.item.php:72
 #: include/database.item.php:71 include/database.item.php:70
 #: include/database.item.php:73 include/database.item.php:67
-#: include/database.item.php:66
+#: include/database.item.php:66 include/database.item.php:66
 msgid "Impression des balances comptables"
 msgstr ""
 
@@ -7902,7 +8491,7 @@ msgstr ""
 #: include/database.item.php:75 include/database.item.php:73
 #: include/database.item.php:72 include/database.item.php:71
 #: include/database.item.php:74 include/database.item.php:68
-#: include/database.item.php:67
+#: include/database.item.php:67 include/database.item.php:67
 msgid "Menu achat"
 msgstr ""
 
@@ -7910,7 +8499,7 @@ msgstr ""
 #: include/database.item.php:76 include/database.item.php:74
 #: include/database.item.php:73 include/database.item.php:72
 #: include/database.item.php:75 include/database.item.php:69
-#: include/database.item.php:68
+#: include/database.item.php:68 include/database.item.php:68
 msgid "Menu et profil"
 msgstr ""
 
@@ -7918,7 +8507,7 @@ msgstr ""
 #: include/database.item.php:76 include/database.item.php:74
 #: include/database.item.php:73 include/database.item.php:72
 #: include/database.item.php:75 include/database.item.php:69
-#: include/database.item.php:68
+#: include/database.item.php:68 include/database.item.php:68
 msgid "Menu "
 msgstr ""
 
@@ -7934,7 +8523,9 @@ msgstr ""
 #: include/database.item.php:73 include/ajax/ajax_get_profile.php:114
 #: include/database.item.php:76 include/ajax/ajax_get_profile.php:120
 #: include/database.item.php:70 include/database.item.php:115
-#: include/ajax/ajax_get_profile.php:119 include/template/menu_detail.php:18
+#: include/ajax/ajax_get_profile.php:119 include/database.item.php:69
+#: include/database.item.php:116 include/ajax/ajax_get_profile.php:119
+#: include/template/menu_detail.php:18
 #: include/template/action_other_action.php:22 include/database.item.php:69
 #: include/database.item.php:116 include/menu.inc.php:127
 msgid "Impression"
@@ -7944,7 +8535,7 @@ msgstr ""
 #: include/database.item.php:77 include/database.item.php:75
 #: include/database.item.php:74 include/database.item.php:73
 #: include/database.item.php:76 include/database.item.php:70
-#: include/database.item.php:69
+#: include/database.item.php:69 include/database.item.php:69
 msgid "Menu impression"
 msgstr ""
 
@@ -7952,7 +8543,7 @@ msgstr ""
 #: include/database.item.php:78 include/database.item.php:76
 #: include/database.item.php:75 include/database.item.php:74
 #: include/database.item.php:77 include/database.item.php:71
-#: include/database.item.php:70
+#: include/database.item.php:70 include/database.item.php:70
 msgid "Information Banque"
 msgstr ""
 
@@ -7960,7 +8551,7 @@ msgstr ""
 #: include/database.item.php:79 include/database.item.php:77
 #: include/database.item.php:76 include/database.item.php:75
 #: include/database.item.php:78 include/database.item.php:72
-#: include/database.item.php:71
+#: include/database.item.php:71 include/database.item.php:71
 msgid "Grand'Livre"
 msgstr ""
 
@@ -7968,21 +8559,21 @@ msgstr ""
 #: include/database.item.php:79 include/database.item.php:77
 #: include/database.item.php:76 include/database.item.php:75
 #: include/database.item.php:78 include/database.item.php:72
-#: include/database.item.php:71
+#: include/database.item.php:71 include/database.item.php:71
 msgid "Grand livre analytique"
 msgstr ""
 
 #: include/database.item.php:71 include/database.item.php:74
 #: include/database.item.php:14 include/database.item.php:76
 #: include/database.item.php:79 include/database.item.php:73
-#: include/database.item.php:72
+#: include/database.item.php:72 include/database.item.php:72
 msgid "Gestion"
 msgstr ""
 
 #: include/database.item.php:71 include/database.item.php:74
 #: include/database.item.php:14 include/database.item.php:76
 #: include/database.item.php:79 include/database.item.php:73
-#: include/database.item.php:72
+#: include/database.item.php:72 include/database.item.php:72
 msgid "Module gestion"
 msgstr ""
 
@@ -7994,7 +8585,8 @@ msgstr ""
 #: include/lib/user_menu.php:143 include/database.item.php:75
 #: include/lib/user_menu.php:81 include/lib/user_menu.php:100
 #: include/database.item.php:74 include/lib/user_menu.php:80
-#: include/lib/user_menu.php:99
+#: include/lib/user_menu.php:99 include/database.item.php:74
+#: include/lib/user_menu.php:80 include/lib/user_menu.php:99
 msgid "Accueil"
 msgstr ""
 
@@ -8004,7 +8596,7 @@ msgstr ""
 #: include/class/class_pdf_operation.php:371
 #: include/template/security_list_action.php:63
 #: include/class/pdf_operation.class.php:371 include/database.item.php:76
-#: include/template/security_list_action.php:66
+#: include/template/security_list_action.php:66 include/database.item.php:75
 #: include/class/pdf_operation.class.php:371
 #: include/template/security_list_action.php:67 include/database.item.php:75
 msgid "Comptabilité"
@@ -8013,7 +8605,7 @@ msgstr ""
 #: include/database.item.php:74 include/database.item.php:77
 #: include/database.item.php:82 include/database.item.php:80
 #: include/database.item.php:79 include/database.item.php:76
-#: include/database.item.php:75
+#: include/database.item.php:75 include/database.item.php:75
 msgid "Module comptabilité"
 msgstr ""
 
@@ -8026,14 +8618,15 @@ msgstr ""
 #: include/database.item.php:190 include/database.item.php:180
 #: include/database.item.php:181 include/database.item.php:184
 #: include/database.item.php:77 include/database.item.php:197
-#: include/database.item.php:76 include/database.item.php:190
+#: include/database.item.php:76 include/database.item.php:76
+#: include/database.item.php:190
 msgid "Divers"
 msgstr ""
 
 #: include/database.item.php:75 include/database.item.php:78
 #: include/database.item.php:83 include/database.item.php:81
 #: include/database.item.php:80 include/database.item.php:77
-#: include/database.item.php:76
+#: include/database.item.php:76 include/database.item.php:76
 msgid "Paramètres divers"
 msgstr ""
 
@@ -8044,7 +8637,8 @@ msgstr ""
 #: include/lib/user_menu.php:125 include/lib/user_menu.php:144
 #: include/database.item.php:107 include/database.item.php:101
 #: include/database.item.php:99 include/lib/user_menu.php:82
-#: include/lib/user_menu.php:101 include/database.item.php:103
+#: include/lib/user_menu.php:101 include/lib/user_menu.php:81
+#: include/lib/user_menu.php:100 include/database.item.php:103
 #: include/lib/user_menu.php:81 include/lib/user_menu.php:100
 msgid "Sortie"
 msgstr ""
@@ -8063,7 +8657,8 @@ msgstr ""
 #: include/template/action_search.php:56 include/database.item.php:84
 #: include/param_sec.inc.php:217 include/database.item.php:78
 #: include/param_sec.inc.php:221 include/template/action_search.php:52
-#: include/database.item.php:76 include/template/user_sec_profile.php:35
+#: include/database.item.php:76 include/param_sec.inc.php:226
+#: include/template/user_sec_profile.php:35
 #: include/template/action_search.php:52 include/database.item.php:77
 #: include/param_sec.inc.php:226
 msgid "Profil"
@@ -8112,148 +8707,148 @@ msgstr ""
 #: include/database.item.php:82 include/database.item.php:85
 #: include/database.item.php:90 include/database.item.php:87
 #: include/database.item.php:86 include/database.item.php:84
-#: include/database.item.php:83
+#: include/database.item.php:83 include/database.item.php:83
 msgid "Balance croisée double"
 msgstr ""
 
 #: include/database.item.php:82 include/database.item.php:85
 #: include/database.item.php:90 include/database.item.php:87
 #: include/database.item.php:86 include/database.item.php:84
-#: include/database.item.php:83
+#: include/database.item.php:83 include/database.item.php:83
 msgid "Balance double croisées des imputations analytiques"
 msgstr ""
 
 #: include/database.item.php:83 include/database.item.php:86
 #: include/database.item.php:91 include/database.item.php:88
 #: include/database.item.php:87 include/database.item.php:85
-#: include/database.item.php:84
+#: include/database.item.php:84 include/database.item.php:84
 msgid "Sociétés"
 msgstr ""
 
 #: include/database.item.php:83 include/database.item.php:86
 #: include/database.item.php:91 include/database.item.php:88
 #: include/database.item.php:87 include/database.item.php:85
-#: include/database.item.php:84
+#: include/database.item.php:84 include/database.item.php:84
 msgid "Parametre societe"
 msgstr ""
 
 #: include/database.item.php:84 include/database.item.php:87
 #: include/database.item.php:92 include/database.item.php:89
 #: include/database.item.php:88 include/database.item.php:86
-#: include/database.item.php:85
+#: include/database.item.php:85 include/database.item.php:85
 msgid "Gestion des périodes"
 msgstr ""
 
 #: include/database.item.php:85 include/database.item.php:88
 #: include/database.item.php:93 include/database.item.php:90
 #: include/database.item.php:89 include/database.item.php:87
-#: include/database.item.php:86
+#: include/database.item.php:86 include/database.item.php:86
 msgid "Vérification "
 msgstr ""
 
 #: include/database.item.php:85 include/database.item.php:88
 #: include/database.item.php:93 include/database.item.php:90
 #: include/database.item.php:89 include/database.item.php:87
-#: include/database.item.php:86
+#: include/database.item.php:86 include/database.item.php:86
 msgid "Vérification de la comptabilité"
 msgstr ""
 
 #: include/database.item.php:86 include/database.item.php:89
 #: include/database.item.php:94 include/database.item.php:91
 #: include/database.item.php:90 include/database.item.php:88
-#: include/database.item.php:87
+#: include/database.item.php:87 include/database.item.php:87
 msgid "Ecriture Ouverture"
 msgstr ""
 
 #: include/database.item.php:86 include/database.item.php:89
 #: include/database.item.php:94 include/database.item.php:91
 #: include/database.item.php:90 include/database.item.php:88
-#: include/database.item.php:87
+#: include/database.item.php:87 include/database.item.php:87
 msgid "Ecriture d'ouverture"
 msgstr ""
 
 #: include/database.item.php:87 include/database.item.php:90
 #: include/database.item.php:95 include/database.item.php:92
 #: include/database.item.php:91 include/database.item.php:89
-#: include/database.item.php:88
+#: include/database.item.php:88 include/database.item.php:88
 msgid "Config. modèle de document"
 msgstr ""
 
 #: include/database.item.php:88 include/database.item.php:91
 #: include/database.item.php:96 include/database.item.php:93
 #: include/database.item.php:92 include/database.item.php:90
-#: include/database.item.php:89
+#: include/database.item.php:89 include/database.item.php:89
 msgid "journaux"
 msgstr ""
 
 #: include/database.item.php:88 include/database.item.php:91
 #: include/database.item.php:96 include/database.item.php:93
 #: include/database.item.php:92 include/database.item.php:90
-#: include/database.item.php:89
+#: include/database.item.php:89 include/database.item.php:89
 msgid "Configuration des journaux"
 msgstr ""
 
 #: include/database.item.php:89 include/database.item.php:92
 #: include/database.item.php:97 include/database.item.php:94
 #: include/database.item.php:93 include/export/export_security_pdf.php:89
-#: include/database.item.php:91 include/export/export_security_pdf.php:89
-#: include/database.item.php:90
+#: include/database.item.php:91 include/database.item.php:90
+#: include/export/export_security_pdf.php:89 include/database.item.php:90
 msgid "Sécurité"
 msgstr ""
 
 #: include/database.item.php:89 include/database.item.php:92
 #: include/database.item.php:97 include/database.item.php:94
 #: include/database.item.php:93 include/database.item.php:91
-#: include/database.item.php:90
+#: include/database.item.php:90 include/database.item.php:90
 msgid "configuration de la sécurité"
 msgstr ""
 
 #: include/database.item.php:90 include/database.item.php:93
 #: include/database.item.php:98 include/database.item.php:95
 #: include/database.item.php:94 include/database.item.php:92
-#: include/database.item.php:91
+#: include/database.item.php:91 include/database.item.php:91
 msgid "Attribut de fiche"
 msgstr ""
 
 #: include/database.item.php:90 include/database.item.php:93
 #: include/database.item.php:98 include/database.item.php:95
 #: include/database.item.php:94 include/database.item.php:92
-#: include/database.item.php:91
+#: include/database.item.php:91 include/database.item.php:91
 msgid "Gestion des attributs de fiches "
 msgstr ""
 
 #: include/database.item.php:91 include/database.item.php:94
 #: include/database.item.php:99 include/database.item.php:96
 #: include/database.item.php:95 include/database.item.php:93
-#: include/database.item.php:92
+#: include/database.item.php:92 include/database.item.php:92
 msgid "Etat des stock"
 msgstr ""
 
 #: include/database.item.php:92 include/database.item.php:95
 #: include/database.item.php:100 include/database.item.php:97
 #: include/database.item.php:96 include/database.item.php:94
-#: include/database.item.php:93
+#: include/database.item.php:93 include/database.item.php:93
 msgid "Modification Stocks"
 msgstr ""
 
 #: include/database.item.php:92 include/database.item.php:95
 #: include/database.item.php:100 include/database.item.php:97
 #: include/database.item.php:96 include/database.item.php:94
-#: include/database.item.php:93
+#: include/database.item.php:93 include/database.item.php:93
 msgid "Modification des stocks (inventaire)"
 msgstr ""
 
 #: include/database.item.php:93 include/database.item.php:96
 #: include/database.item.php:101 include/database.item.php:98
 #: include/database.item.php:97 include/database.item.php:95
-#: include/database.item.php:94
+#: include/database.item.php:94 include/database.item.php:94
 msgid "Histo. Changement"
 msgstr ""
 
 #: include/database.item.php:93 include/database.item.php:96
 #: include/database.item.php:101 include/database.item.php:98
 #: include/database.item.php:97 include/database.item.php:95
-#: include/database.item.php:94
+#: include/database.item.php:94 include/database.item.php:94
 msgid "Liste des changements manuels des stocks"
 msgstr ""
 
@@ -8261,15 +8856,15 @@ msgstr ""
 #: include/database.item.php:102 include/ajax_navigator.php:23
 #: include/database.item.php:99 include/database.item.php:98
 #: include/ajax/ajax_navigator.php:23 include/database.item.php:96
-#: include/ajax/ajax_navigator.php:28 include/ajax/ajax_navigator.php:28
-#: include/database.item.php:95
+#: include/ajax/ajax_navigator.php:28 include/database.item.php:95
+#: include/ajax/ajax_navigator.php:28 include/database.item.php:95
 msgid "Navigateur"
 msgstr ""
 
 #: include/database.item.php:94 include/database.item.php:97
 #: include/database.item.php:102 include/database.item.php:99
 #: include/database.item.php:98 include/database.item.php:96
-#: include/database.item.php:95
+#: include/database.item.php:95 include/database.item.php:95
 msgid "Menu simplifié pour retrouver rapidement un menu"
 msgstr ""
 
@@ -8280,27 +8875,28 @@ msgstr ""
 #: include/database.item.php:110 include/database.item.php:101
 #: include/database.item.php:109 include/database.item.php:99
 #: include/database.item.php:98 include/database.item.php:106
+#: include/database.item.php:98 include/database.item.php:106
 msgid "Rapprochement"
 msgstr ""
 
 #: include/database.item.php:97 include/database.item.php:100
 #: include/database.item.php:105 include/database.item.php:102
 #: include/database.item.php:101 include/database.item.php:99
-#: include/database.item.php:98
+#: include/database.item.php:98 include/database.item.php:98
 msgid "Rapprochement bancaire"
 msgstr ""
 
 #: include/database.item.php:98 include/database.item.php:101
 #: include/database.item.php:106 include/database.item.php:103
 #: include/database.item.php:102 include/database.item.php:100
-#: include/database.item.php:99
+#: include/database.item.php:99 include/database.item.php:99
 msgid "Soldes"
 msgstr ""
 
 #: include/database.item.php:98 include/database.item.php:101
 #: include/database.item.php:106 include/database.item.php:103
 #: include/database.item.php:102 include/database.item.php:100
-#: include/database.item.php:99
+#: include/database.item.php:99 include/database.item.php:99
 msgid "Solde des comptes en banques, caisse..."
 msgstr ""
 
@@ -8344,63 +8940,63 @@ msgstr ""
 #: include/database.item.php:102 include/database.item.php:105
 #: include/database.item.php:111 include/database.item.php:108
 #: include/database.item.php:107 include/database.item.php:103
-#: include/database.item.php:104
+#: include/database.item.php:104 include/database.item.php:104
 msgid "Historique vente"
 msgstr ""
 
 #: include/database.item.php:102 include/database.item.php:105
 #: include/database.item.php:111 include/database.item.php:108
 #: include/database.item.php:107 include/database.item.php:103
-#: include/database.item.php:104
+#: include/database.item.php:104 include/database.item.php:104
 msgid "Historique des ventes"
 msgstr ""
 
 #: include/database.item.php:103 include/database.item.php:106
 #: include/database.item.php:112 include/database.item.php:109
 #: include/database.item.php:108 include/database.item.php:104
-#: include/database.item.php:105
+#: include/database.item.php:105 include/database.item.php:105
 msgid "Historique financier"
 msgstr ""
 
 #: include/database.item.php:104 include/database.item.php:107
 #: include/database.item.php:113 include/database.item.php:110
 #: include/database.item.php:109 include/database.item.php:105
-#: include/database.item.php:106
+#: include/database.item.php:106 include/database.item.php:106
 msgid "Impression des rapprochements"
 msgstr ""
 
 #: include/database.item.php:105 include/database.item.php:108
 #: include/database.item.php:114 include/database.item.php:111
 #: include/database.item.php:110 include/database.item.php:106
-#: include/database.item.php:107
+#: include/database.item.php:107 include/database.item.php:107
 msgid "Bilan"
 msgstr ""
 
 #: include/database.item.php:105 include/database.item.php:108
 #: include/database.item.php:114 include/database.item.php:111
 #: include/database.item.php:110 include/database.item.php:106
-#: include/database.item.php:107
+#: include/database.item.php:107 include/database.item.php:107
 msgid "Impression de bilan"
 msgstr ""
 
 #: include/database.item.php:106 include/database.item.php:109
 #: include/database.item.php:115 include/database.item.php:112
 #: include/database.item.php:111 include/database.item.php:107
-#: include/database.item.php:108
+#: include/database.item.php:108 include/database.item.php:108
 msgid "Configuration des dépôts"
 msgstr ""
 
 #: include/database.item.php:106 include/database.item.php:109
 #: include/database.item.php:115 include/database.item.php:112
 #: include/database.item.php:111 include/database.item.php:107
-#: include/database.item.php:108
+#: include/database.item.php:108 include/database.item.php:108
 msgid "Configuration dépôts"
 msgstr ""
 
 #: include/database.item.php:107 include/database.item.php:110
 #: include/database.item.php:116 include/database.item.php:113
 #: include/database.item.php:112 include/database.item.php:108
-#: include/database.item.php:109
+#: include/database.item.php:109 include/database.item.php:109
 msgid "Stock"
 msgstr ""
 
@@ -8416,92 +9012,92 @@ msgstr ""
 #: include/ext/import_doli/include/template/test_file.php:27
 #: include/ext/import_card/include/template/input_file.php:36
 #: include/ext/import_card/include/template/input_format.php:25
-#: include/database.item.php:109 include/template/fiche_def_input.php:6
-#: include/database.item.php:110
+#: include/database.item.php:109 include/database.item.php:110
+#: include/template/fiche_def_input.php:6 include/database.item.php:110
 msgid "Catégorie de fiche"
 msgstr ""
 
 #: include/database.item.php:108 include/database.item.php:111
 #: include/database.item.php:117 include/database.item.php:114
 #: include/database.item.php:113 include/database.item.php:109
-#: include/database.item.php:110
+#: include/database.item.php:110 include/database.item.php:110
 msgid "Gestion catégorie de fiche"
 msgstr ""
 
 #: include/database.item.php:109 include/database.item.php:112
 #: include/database.item.php:118 include/database.item.php:115
 #: include/database.item.php:114 include/database.item.php:110
-#: include/database.item.php:111
+#: include/database.item.php:111 include/database.item.php:111
 msgid "Configuration de catégorie de fiches"
 msgstr ""
 
 #: include/database.item.php:110 include/database.item.php:113
 #: include/database.item.php:119 include/database.item.php:116
 #: include/database.item.php:115 include/database.item.php:111
-#: include/database.item.php:112
+#: include/database.item.php:112 include/database.item.php:112
 msgid "Etat des documents"
 msgstr ""
 
 #: include/database.item.php:111 include/database.item.php:114
 #: include/database.item.php:120 include/database.item.php:117
 #: include/database.item.php:116 include/database.item.php:112
-#: include/database.item.php:113
+#: include/database.item.php:113 include/database.item.php:113
 msgid "Menu opérations diverses"
 msgstr ""
 
 #: include/database.item.php:112 include/database.item.php:115
 #: include/database.item.php:121 include/database.item.php:118
 #: include/database.item.php:117 include/database.item.php:113
-#: include/database.item.php:114
+#: include/database.item.php:114 include/database.item.php:114
 msgid "Impression Journaux"
 msgstr ""
 
 #: include/database.item.php:112 include/database.item.php:115
 #: include/database.item.php:121 include/database.item.php:118
 #: include/database.item.php:117 include/database.item.php:113
-#: include/database.item.php:114
+#: include/database.item.php:114 include/database.item.php:114
 msgid "Impression des journaux"
 msgstr ""
 
 #: include/database.item.php:113 include/database.item.php:116
 #: include/database.item.php:122 include/database.item.php:119
 #: include/database.item.php:118 include/database.item.php:114
-#: include/database.item.php:115
+#: include/database.item.php:115 include/database.item.php:115
 msgid "Vente / Recette"
 msgstr ""
 
 #: include/database.item.php:113 include/database.item.php:116
 #: include/database.item.php:122 include/database.item.php:119
 #: include/database.item.php:118 include/database.item.php:114
-#: include/database.item.php:115
+#: include/database.item.php:115 include/database.item.php:115
 msgid "Menu ventes et recettes"
 msgstr ""
 
 #: include/database.item.php:114 include/database.item.php:117
 #: include/database.item.php:123 include/database.item.php:120
 #: include/database.item.php:119 include/database.item.php:115
-#: include/database.item.php:116
+#: include/database.item.php:116 include/database.item.php:116
 msgid "Impression compta. analytique"
 msgstr ""
 
 #: include/database.item.php:115 include/database.item.php:118
 #: include/database.item.php:124 include/database.item.php:121
 #: include/database.item.php:120 include/database.item.php:116
-#: include/database.item.php:117
+#: include/database.item.php:117 include/database.item.php:117
 msgid "Compta Analytique"
 msgstr ""
 
 #: include/database.item.php:115 include/database.item.php:118
 #: include/database.item.php:124 include/database.item.php:121
 #: include/database.item.php:120 include/database.item.php:116
-#: include/database.item.php:117
+#: include/database.item.php:117 include/database.item.php:117
 msgid "Module comptabilité analytique"
 msgstr ""
 
 #: include/database.item.php:116 include/database.item.php:119
 #: include/database.item.php:125 include/database.item.php:122
 #: include/database.item.php:121 include/database.item.php:117
-#: include/database.item.php:118
+#: include/database.item.php:118 include/database.item.php:118
 msgid "Tableau de bord"
 msgstr ""
 
@@ -8510,14 +9106,15 @@ msgstr ""
 #: include/database.item.php:123 include/database.item.php:122
 #: include/balance.inc.php:92 include/balance.inc.php:93
 #: include/balance.inc.php:96 include/database.item.php:118
-#: include/balance.inc.php:96 include/database.item.php:119
+#: include/database.item.php:119 include/balance.inc.php:96
+#: include/database.item.php:119
 msgid "Avancé"
 msgstr ""
 
 #: include/database.item.php:117 include/database.item.php:120
 #: include/database.item.php:126 include/database.item.php:123
 #: include/database.item.php:122 include/database.item.php:118
-#: include/database.item.php:119
+#: include/database.item.php:119 include/database.item.php:119
 msgid "Menu avancé"
 msgstr ""
 
@@ -8538,6 +9135,7 @@ msgstr ""
 #: include/database.item.php:128 include/database.item.php:124
 #: include/database.item.php:123 include/database.item.php:127
 #: include/database.item.php:121 include/database.item.php:120
+#: include/database.item.php:120
 msgid "Trésorerie"
 msgstr ""
 
@@ -8545,6 +9143,7 @@ msgstr ""
 #: include/database.item.php:128 include/database.item.php:124
 #: include/database.item.php:123 include/database.item.php:127
 #: include/database.item.php:121 include/database.item.php:120
+#: include/database.item.php:120
 msgid "Menu Financier"
 msgstr ""
 
@@ -8552,6 +9151,7 @@ msgstr ""
 #: include/database.item.php:129 include/database.item.php:125
 #: include/database.item.php:124 include/database.item.php:128
 #: include/database.item.php:122 include/database.item.php:121
+#: include/database.item.php:121
 msgid "Liste Suivi"
 msgstr ""
 
@@ -8559,6 +9159,7 @@ msgstr ""
 #: include/database.item.php:129 include/database.item.php:125
 #: include/database.item.php:124 include/database.item.php:128
 #: include/database.item.php:122 include/database.item.php:121
+#: include/database.item.php:121
 msgid "Document de suivi sous forme de liste"
 msgstr ""
 
@@ -8566,6 +9167,7 @@ msgstr ""
 #: include/database.item.php:130 include/database.item.php:126
 #: include/database.item.php:125 include/database.item.php:129
 #: include/database.item.php:123 include/database.item.php:122
+#: include/database.item.php:122
 msgid "Moyen de paiement"
 msgstr ""
 
@@ -8573,6 +9175,7 @@ msgstr ""
 #: include/database.item.php:130 include/database.item.php:126
 #: include/database.item.php:125 include/database.item.php:129
 #: include/database.item.php:123 include/database.item.php:122
+#: include/database.item.php:122
 msgid "Config. des méthodes de paiement"
 msgstr ""
 
@@ -8584,8 +9187,9 @@ msgstr ""
 #: include/admin_repo.inc.php:63 include/database.item.php:130
 #: html/user_login.php:160 include/admin_repo.inc.php:65
 #: include/database.item.php:124 html/user_login.php:166
-#: html/user_login.php:143 html/user_login.php:143
-#: include/admin_repo.inc.php:65 include/database.item.php:123
+#: html/user_login.php:143 include/database.item.php:123
+#: html/user_login.php:143 include/admin_repo.inc.php:65
+#: include/database.item.php:123
 msgid "Administration"
 msgstr ""
 
@@ -8593,6 +9197,7 @@ msgstr ""
 #: include/database.item.php:131 include/database.item.php:127
 #: include/database.item.php:126 include/database.item.php:130
 #: include/database.item.php:124 include/database.item.php:123
+#: include/database.item.php:123
 msgid "Suivi administration, banque"
 msgstr ""
 
@@ -8600,6 +9205,7 @@ msgstr ""
 #: include/database.item.php:132 include/database.item.php:128
 #: include/database.item.php:127 include/database.item.php:131
 #: include/database.item.php:125 include/database.item.php:124
+#: include/database.item.php:124
 msgid "Prévision"
 msgstr ""
 
@@ -8607,6 +9213,7 @@ msgstr ""
 #: include/database.item.php:133 include/database.item.php:129
 #: include/database.item.php:128 include/database.item.php:132
 #: include/database.item.php:126 include/database.item.php:125
+#: include/database.item.php:125
 msgid "Export opérations rapprochées"
 msgstr ""
 
@@ -8614,6 +9221,7 @@ msgstr ""
 #: include/database.item.php:133 include/database.item.php:129
 #: include/database.item.php:128 include/database.item.php:132
 #: include/database.item.php:126 include/database.item.php:125
+#: include/database.item.php:125
 msgid "Export opérations rapprochées en CSV"
 msgstr ""
 
@@ -8629,10 +9237,13 @@ msgstr ""
 #: include/user.inc.php:173 include/export/export_security_pdf.php:112
 #: html/user_login.php:109 include/database.item.php:127
 #: include/param_sec.inc.php:99 include/param_sec.inc.php:158
-#: html/user_login.php:115 html/user_login.php:115
-#: include/user_detail.inc.php:175 include/export/export_security_pdf.php:112
-#: include/user.inc.php:173 include/database.item.php:126
+#: html/user_login.php:115 include/database.item.php:126
 #: include/param_sec.inc.php:100 include/param_sec.inc.php:163
+#: include/user_detail.inc.php:186 include/user.inc.php:175
+#: html/user_login.php:115 include/user_detail.inc.php:186
+#: include/export/export_security_pdf.php:112 include/user.inc.php:175
+#: include/database.item.php:126 include/param_sec.inc.php:100
+#: include/param_sec.inc.php:163
 msgid "Administrateur"
 msgstr ""
 
@@ -8640,6 +9251,7 @@ msgstr ""
 #: include/database.item.php:134 include/database.item.php:130
 #: include/database.item.php:129 include/database.item.php:133
 #: include/database.item.php:127 include/database.item.php:126
+#: include/database.item.php:126
 msgid "Suivi des gérants, administrateurs et salariés"
 msgstr ""
 
@@ -8650,8 +9262,9 @@ msgstr ""
 #: include/database.item.php:130 include/ajax/ajax_add_menu.php:156
 #: include/ajax/ajax_get_menu_detail.php:71 include/ajax/ajax_add_menu.php:157
 #: include/database.item.php:134 include/ajax/ajax_add_menu.php:165
-#: include/database.item.php:128 include/ajax/ajax_add_menu.php:165
-#: include/ajax/ajax_get_menu_detail.php:71 include/database.item.php:127
+#: include/database.item.php:128 include/database.item.php:127
+#: include/ajax/ajax_add_menu.php:165 include/ajax/ajax_get_menu_detail.php:71
+#: include/database.item.php:127
 msgid "Menu par défaut"
 msgstr ""
 
@@ -8659,6 +9272,7 @@ msgstr ""
 #: include/database.item.php:135 include/database.item.php:131
 #: include/database.item.php:130 include/database.item.php:134
 #: include/database.item.php:128 include/database.item.php:127
+#: include/database.item.php:127
 msgid "Configuration des menus par défaut"
 msgstr ""
 
@@ -8666,6 +9280,7 @@ msgstr ""
 #: include/database.item.php:136 include/database.item.php:132
 #: include/database.item.php:131 include/database.item.php:135
 #: include/database.item.php:129 include/database.item.php:128
+#: include/database.item.php:128
 msgid "Agenda"
 msgstr ""
 
@@ -8676,6 +9291,8 @@ msgstr ""
 #: include/database.item.php:151 include/database.item.php:181
 #: include/template/action_document_type_mtable_input.php:75
 #: include/database.item.php:177
+#: include/template/action_document_type_mtable_input.php:75
+#: include/database.item.php:177
 msgid "Prix vente"
 msgstr ""
 
@@ -8686,6 +9303,8 @@ msgstr ""
 #: include/database.item.php:152 include/database.item.php:182
 #: include/template/action_document_type_mtable_input.php:76
 #: include/database.item.php:178
+#: include/template/action_document_type_mtable_input.php:76
+#: include/database.item.php:178
 msgid "Prix achat"
 msgstr ""
 
@@ -8694,7 +9313,7 @@ msgstr ""
 #: include/database.item.php:178 include/database.item.php:137
 #: include/database.item.php:138 include/database.item.php:139
 #: include/database.item.php:144 include/database.item.php:149
-#: include/database.item.php:145
+#: include/database.item.php:145 include/database.item.php:145
 msgid "Durée Amortissement"
 msgstr ""
 
@@ -8703,7 +9322,7 @@ msgstr ""
 #: include/database.item.php:179 include/database.item.php:138
 #: include/database.item.php:139 include/database.item.php:140
 #: include/database.item.php:145 include/database.item.php:150
-#: include/database.item.php:146
+#: include/database.item.php:146 include/database.item.php:146
 msgid "Montant initial"
 msgstr ""
 
@@ -8712,7 +9331,7 @@ msgstr ""
 #: include/database.item.php:180 include/database.item.php:139
 #: include/database.item.php:140 include/database.item.php:141
 #: include/database.item.php:146 include/database.item.php:151
-#: include/database.item.php:147
+#: include/database.item.php:147 include/database.item.php:147
 msgid "TVA non déductible"
 msgstr ""
 
@@ -8721,7 +9340,7 @@ msgstr ""
 #: include/database.item.php:181 include/database.item.php:140
 #: include/database.item.php:141 include/database.item.php:142
 #: include/database.item.php:147 include/database.item.php:152
-#: include/database.item.php:148
+#: include/database.item.php:148 include/database.item.php:148
 msgid "TVA non déductible récupérable par l'impôt"
 msgstr ""
 
@@ -8730,7 +9349,7 @@ msgstr ""
 #: include/database.item.php:182 include/database.item.php:141
 #: include/database.item.php:142 include/database.item.php:143
 #: include/database.item.php:148 include/database.item.php:153
-#: include/database.item.php:149
+#: include/database.item.php:149 include/database.item.php:149
 msgid "Partie fiscalement non déductible"
 msgstr ""
 
@@ -8739,7 +9358,7 @@ msgstr ""
 #: include/database.item.php:183 include/database.item.php:142
 #: include/database.item.php:143 include/database.item.php:144
 #: include/database.item.php:149 include/database.item.php:154
-#: include/database.item.php:150
+#: include/database.item.php:150 include/database.item.php:150
 msgid "Dépense  charge du grant (partie privé) "
 msgstr ""
 
@@ -8748,7 +9367,7 @@ msgstr ""
 #: include/database.item.php:184 include/database.item.php:143
 #: include/database.item.php:144 include/database.item.php:145
 #: include/database.item.php:150 include/database.item.php:155
-#: include/database.item.php:151
+#: include/database.item.php:151 include/database.item.php:151
 msgid "Compte bancaire"
 msgstr ""
 
@@ -8760,6 +9379,7 @@ msgstr ""
 #: include/database.item.php:152 include/database.item.php:151
 #: include/database.item.php:144 include/database.item.php:145
 #: include/database.item.php:153 include/database.item.php:156
+#: include/lettering.account.inc.php:82 include/lettering.card.inc.php:78
 #: include/lettering.account.inc.php:82 include/lettering.gestion.inc.php:27
 #: include/database.item.php:152 include/lettering.card.inc.php:78
 msgid "Date début"
@@ -8893,9 +9513,14 @@ msgstr ""
 #: include/database.item.php:165 include/user.inc.php:81
 #: include/user.inc.php:145 include/class/balance_age.class.php:146
 #: include/database.item.php:170 include/database.item.php:173
+#: include/database.item.php:169
+#: include/template/follow_up_other_concerned_display_table.php:48
+#: include/user.inc.php:83 include/user.inc.php:147
 #: include/class/balance_age.class.php:146
-#: include/template/todo_list_list_user.php:43 include/user.inc.php:81
-#: include/user.inc.php:145 include/database.item.php:169
+#: include/template/todo_list_list_user.php:43
+#: include/template/follow_up_other_concerned_display_table.php:48
+#: include/user.inc.php:83 include/user.inc.php:147
+#: include/database.item.php:169
 msgid "Prénom"
 msgstr ""
 
@@ -8942,6 +9567,8 @@ msgstr ""
 #: include/class/periode_ledger_table.class.php:99
 #: include/class/periode.class.php:520 include/database.item.php:179
 #: include/class/periode.class.php:522 include/class/periode.class.php:523
+#: include/ajax/ajax_display_letter.php:134 include/database.item.php:175
+#: include/class/periode.class.php:523
 #: include/class/periode_ledger_table.class.php:99
 #: include/ajax/ajax_display_letter.php:134 include/database.item.php:175
 msgid "Date Fin"
@@ -8951,7 +9578,7 @@ msgstr ""
 #: include/database.item.php:170 include/database.item.php:169
 #: include/database.item.php:168 include/database.item.php:172
 #: include/database.item.php:177 include/database.item.php:180
-#: include/database.item.php:176
+#: include/database.item.php:176 include/database.item.php:176
 msgid "Gestion stock"
 msgstr ""
 
@@ -8960,6 +9587,7 @@ msgstr ""
 #: include/database.item.php:169 include/database.item.php:173
 #: include/database.item.php:178 include/database.item.php:183
 #: include/template/card_multiple_result.php:18 include/database.item.php:179
+#: include/template/card_multiple_result.php:18 include/database.item.php:179
 msgid "Société"
 msgstr ""
 
@@ -8968,7 +9596,7 @@ msgstr ""
 #: include/database.item.php:192 include/database.item.php:172
 #: include/database.item.php:173 include/database.item.php:176
 #: include/database.item.php:184 include/database.item.php:189
-#: include/database.item.php:182
+#: include/database.item.php:182 include/database.item.php:182
 msgid "Document Interne"
 msgstr ""
 
@@ -8977,7 +9605,7 @@ msgstr ""
 #: include/database.item.php:196 include/database.item.php:173
 #: include/database.item.php:174 include/database.item.php:177
 #: include/database.item.php:185 include/database.item.php:190
-#: include/database.item.php:183
+#: include/database.item.php:183 include/database.item.php:183
 msgid "Bons de commande client"
 msgstr ""
 
@@ -8986,7 +9614,7 @@ msgstr ""
 #: include/database.item.php:195 include/database.item.php:174
 #: include/database.item.php:175 include/database.item.php:178
 #: include/database.item.php:186 include/database.item.php:191
-#: include/database.item.php:184
+#: include/database.item.php:184 include/database.item.php:184
 msgid "Bon de commande Fournisseur"
 msgstr ""
 
@@ -9001,7 +9629,8 @@ msgstr ""
 #: include/ext/invoicing/include/invoice_to_zip.inc.php:76
 #: include/compta_ach.inc.php:89 include/compta_ven.inc.php:96
 #: include/database.item.php:179 include/database.item.php:187
-#: include/database.item.php:192 include/compta_ven.inc.php:94
+#: include/database.item.php:192 include/compta_ach.inc.php:86
+#: include/database.item.php:185 include/compta_ven.inc.php:94
 #: include/compta_ach.inc.php:86 include/database.item.php:185
 msgid "Facture"
 msgstr ""
@@ -9011,6 +9640,7 @@ msgstr ""
 #: include/database.item.php:176 include/database.item.php:177
 #: include/database.item.php:180 include/database.item.php:188
 #: include/database.item.php:193 include/database.item.php:186
+#: include/database.item.php:186
 msgid "Lettre de rappel"
 msgstr ""
 
@@ -9019,6 +9649,7 @@ msgstr ""
 #: include/database.item.php:177 include/database.item.php:178
 #: include/database.item.php:181 include/database.item.php:189
 #: include/database.item.php:194 include/database.item.php:187
+#: include/database.item.php:187
 msgid "Courrier"
 msgstr ""
 
@@ -9027,6 +9658,7 @@ msgstr ""
 #: include/database.item.php:178 include/database.item.php:179
 #: include/database.item.php:182 include/database.item.php:190
 #: include/database.item.php:195 include/database.item.php:188
+#: include/database.item.php:188
 msgid "Proposition"
 msgstr ""
 
@@ -9039,8 +9671,9 @@ msgstr ""
 #: include/database.item.php:180 include/database.item.php:183
 #: include/user.inc.php:84 include/database.item.php:191
 #: include/ajax/ajax_preference.php:74 include/ajax/ajax_preference.php:85
-#: include/database.item.php:196 include/ajax/ajax_preference.php:85
-#: include/user.inc.php:84 include/database.item.php:189
+#: include/database.item.php:196 include/database.item.php:189
+#: include/user.inc.php:86 include/ajax/ajax_preference.php:85
+#: include/user.inc.php:86 include/database.item.php:189
 msgid "Email"
 msgstr ""
 
@@ -9049,6 +9682,7 @@ msgstr ""
 #: include/database.item.php:193 include/database.item.php:181
 #: include/database.item.php:182 include/database.item.php:185
 #: include/database.item.php:198 include/database.item.php:191
+#: include/database.item.php:191
 msgid "Note de frais"
 msgstr ""
 
@@ -9057,6 +9691,7 @@ msgstr ""
 #: include/database.item.php:182 include/database.item.php:183
 #: include/database.item.php:186 include/database.item.php:194
 #: include/database.item.php:199 include/database.item.php:192
+#: include/database.item.php:192
 msgid "Réception commande Fournisseur"
 msgstr ""
 
@@ -9065,6 +9700,7 @@ msgstr ""
 #: include/database.item.php:183 include/database.item.php:184
 #: include/database.item.php:187 include/database.item.php:195
 #: include/database.item.php:200 include/database.item.php:193
+#: include/database.item.php:193
 msgid "Réception commande Client"
 msgstr ""
 
@@ -9073,6 +9709,7 @@ msgstr ""
 #: include/database.item.php:184 include/database.item.php:185
 #: include/database.item.php:188 include/database.item.php:196
 #: include/database.item.php:201 include/database.item.php:194
+#: include/database.item.php:194
 msgid "Réception magazine"
 msgstr ""
 
@@ -9080,7 +9717,7 @@ msgstr ""
 #: include/database.item.php:210 include/database.item.php:187
 #: include/database.item.php:188 include/database.item.php:191
 #: include/database.item.php:202 include/database.item.php:207
-#: include/database.item.php:197
+#: include/database.item.php:197 include/database.item.php:197
 msgid "Ajout de fiche"
 msgstr ""
 
@@ -9088,7 +9725,7 @@ msgstr ""
 #: include/database.item.php:211 include/database.item.php:188
 #: include/database.item.php:189 include/database.item.php:192
 #: include/database.item.php:203 include/database.item.php:208
-#: include/database.item.php:198
+#: include/database.item.php:198 include/database.item.php:198
 msgid "Création, modification et effacement de fiche"
 msgstr ""
 
@@ -9096,7 +9733,7 @@ msgstr ""
 #: include/database.item.php:212 include/database.item.php:189
 #: include/database.item.php:190 include/database.item.php:193
 #: include/database.item.php:204 include/database.item.php:209
-#: include/database.item.php:199
+#: include/database.item.php:199 include/database.item.php:199
 msgid "création, modification et effacement de catégorie de fiche"
 msgstr ""
 
@@ -9104,7 +9741,7 @@ msgstr ""
 #: include/database.item.php:213 include/database.item.php:190
 #: include/database.item.php:191 include/database.item.php:194
 #: include/database.item.php:205 include/database.item.php:210
-#: include/database.item.php:200
+#: include/database.item.php:200 include/database.item.php:200
 msgid "Effacer les documents du suivi"
 msgstr ""
 
@@ -9112,7 +9749,7 @@ msgstr ""
 #: include/database.item.php:214 include/database.item.php:191
 #: include/database.item.php:192 include/database.item.php:195
 #: include/database.item.php:206 include/database.item.php:211
-#: include/database.item.php:201
+#: include/database.item.php:201 include/database.item.php:201
 msgid "Voir les documents du suivi"
 msgstr ""
 
@@ -9120,7 +9757,7 @@ msgstr ""
 #: include/database.item.php:215 include/database.item.php:192
 #: include/database.item.php:193 include/database.item.php:196
 #: include/database.item.php:207 include/database.item.php:212
-#: include/database.item.php:202
+#: include/database.item.php:202 include/database.item.php:202
 msgid "Modifier le type de document"
 msgstr ""
 
@@ -9132,6 +9769,7 @@ msgstr ""
 #: include/database.item.php:203 include/database.item.php:204
 #: include/database.item.php:206 include/database.item.php:220
 #: include/database.item.php:210 include/database.item.php:212
+#: include/database.item.php:210 include/database.item.php:212
 msgid "Caisse"
 msgstr ""
 
@@ -9139,7 +9777,7 @@ msgstr ""
 #: include/database.item.php:219 include/database.item.php:224
 #: include/database.item.php:201 include/database.item.php:202
 #: include/database.item.php:205 include/database.item.php:203
-#: include/database.item.php:211
+#: include/database.item.php:211 include/database.item.php:211
 msgid "Paiement électronique"
 msgstr ""
 
@@ -9148,7 +9786,7 @@ msgstr ""
 #: include/database.item.php:226 include/database.item.php:203
 #: include/database.item.php:204 include/database.item.php:207
 #: include/database.item.php:221 include/database.item.php:205
-#: include/database.item.php:213
+#: include/database.item.php:213 include/database.item.php:213
 msgid "Par gérant ou administrateur"
 msgstr ""
 
@@ -9167,6 +9805,9 @@ msgstr ""
 #: include/database.item.php:233 include/database.item.php:252
 #: include/class/acc_ledger_search.class.php:1184 include/database.item.php:217
 #: include/database.item.php:229 include/lib/user_menu.php:135
+#: include/class/acc_ledger_search.class.php:1207
+#: include/class/acc_ledger_search.class.php:1207 include/database.item.php:217
+#: include/database.item.php:229 include/lib/user_menu.php:135
 #: include/cfgledger.inc.php:170
 msgid "Financier"
 msgstr ""
@@ -9177,6 +9818,7 @@ msgstr ""
 #: include/database.item.php:209 include/database.item.php:212
 #: include/database.item.php:229 include/database.item.php:210
 #: include/database.item.php:232 include/database.item.php:216
+#: include/database.item.php:216
 msgid "Opération Diverses"
 msgstr ""
 
@@ -9186,6 +9828,7 @@ msgstr ""
 #: include/database.item.php:213 include/database.item.php:216
 #: include/database.item.php:236 include/database.item.php:214
 #: include/database.item.php:245 include/database.item.php:226
+#: include/database.item.php:226
 msgid ""
 "Concerne tous les achats, factures reçues, notes de crédit reçues et notes "
 "de frais"
@@ -9196,6 +9839,7 @@ msgstr ""
 #: include/database.item.php:214 include/database.item.php:217
 #: include/database.item.php:237 include/database.item.php:215
 #: include/database.item.php:243 include/database.item.php:224
+#: include/database.item.php:224
 msgid ""
 "Concerne tous les mouvements financiers (comptes en banque, caisses, visa...)"
 msgstr ""
@@ -9206,6 +9850,7 @@ msgstr ""
 #: include/database.item.php:215 include/database.item.php:218
 #: include/database.item.php:238 include/database.item.php:216
 #: include/database.item.php:242 include/database.item.php:223
+#: include/database.item.php:223
 msgid ""
 "Concerne toutes les opérations comme les amortissements, les comptes TVA, ..."
 msgstr ""
@@ -9216,6 +9861,7 @@ msgstr ""
 #: include/database.item.php:216 include/database.item.php:219
 #: include/database.item.php:239 include/database.item.php:217
 #: include/database.item.php:244 include/database.item.php:225
+#: include/database.item.php:225
 msgid "Concerne toutes les ventes, notes de crédit envoyées"
 msgstr ""
 
@@ -9260,7 +9906,8 @@ msgstr ""
 
 #: include/dossier.inc.php:76 include/dossier.inc.php:97
 #: include/dossier.inc.php:103 include/dossier.inc.php:106
-#: include/dossier.inc.php:111 include/dossier.inc.php:111
+#: include/dossier.inc.php:111 include/dossier.inc.php:113
+#: include/dossier.inc.php:113
 msgid ""
 "Desole la creation de ce dossier a echoue,\n"
 " la cause la plus probable est deux fois le même nom de dossier"
@@ -9268,13 +9915,15 @@ msgstr ""
 
 #: include/dossier.inc.php:94 include/dossier.inc.php:115
 #: include/dossier.inc.php:126 include/dossier.inc.php:129
-#: include/dossier.inc.php:134 include/dossier.inc.php:134
+#: include/dossier.inc.php:134 include/dossier.inc.php:136
+#: include/dossier.inc.php:136
 msgid " est une année invalide"
 msgstr ""
 
 #: include/dossier.inc.php:111 include/dossier.inc.php:132
 #: include/dossier.inc.php:143 include/dossier.inc.php:146
-#: include/dossier.inc.php:151 include/dossier.inc.php:151
+#: include/dossier.inc.php:151 include/dossier.inc.php:153
+#: include/dossier.inc.php:153
 msgid " Base de donnée "
 msgstr ""
 
@@ -9284,7 +9933,8 @@ msgstr ""
 #: include/dossier.inc.php:391 include/dossier.inc.php:392
 #: include/dossier.inc.php:147 include/dossier.inc.php:408
 #: include/dossier.inc.php:152 include/dossier.inc.php:413
-#: include/dossier.inc.php:152 include/dossier.inc.php:413
+#: include/dossier.inc.php:154 include/dossier.inc.php:417
+#: include/dossier.inc.php:154 include/dossier.inc.php:417
 msgid "est accèdée, déconnectez-vous d'abord"
 msgstr ""
 
@@ -9299,8 +9949,9 @@ msgstr ""
 #: include/dossier.inc.php:214 include/modele.inc.php:261
 #: include/dossier.inc.php:217 include/dossier.inc.php:222
 #: include/modele.inc.php:262 include/modele.inc.php:263
+#: include/ajax/ajax_add_concerned_card.php:138 include/dossier.inc.php:225
 #: include/ajax/ajax_add_concerned_card.php:138 include/modele.inc.php:263
-#: include/anc_group.inc.php:81 include/dossier.inc.php:222
+#: include/anc_group.inc.php:81 include/dossier.inc.php:225
 msgid "Ajouter"
 msgstr ""
 
@@ -9312,7 +9963,8 @@ msgstr ""
 #: include/upgrade.inc.php:79 include/dossier.inc.php:271
 #: include/dossier.inc.php:276 include/upgrade.inc.php:80
 #: include/class/dossier.class.php:379 include/class/dossier.class.php:385
-#: include/dossier.inc.php:276
+#: include/dossier.inc.php:279 include/class/dossier.class.php:385
+#: include/dossier.inc.php:279
 msgid "Dossier inexistant"
 msgstr ""
 
@@ -9323,21 +9975,24 @@ msgstr ""
 #: include/modele.inc.php:314 include/dossier.inc.php:281
 #: include/dossier.inc.php:286 include/modele.inc.php:315
 #: include/modele.inc.php:320 include/modele.inc.php:321
-#: include/modele.inc.php:321 include/dossier.inc.php:286
+#: include/dossier.inc.php:289 include/modele.inc.php:321
+#: include/dossier.inc.php:289
 msgid "Backup"
 msgstr ""
 
 #: include/dossier.inc.php:254 include/dossier.inc.php:251
 #: include/dossier.inc.php:273 include/dossier.inc.php:307
 #: include/dossier.inc.php:308 include/dossier.inc.php:311
-#: include/dossier.inc.php:316 include/dossier.inc.php:316
+#: include/dossier.inc.php:316 include/dossier.inc.php:319
+#: include/dossier.inc.php:319
 msgid "pas de modèle disponible"
 msgstr ""
 
 #: include/dossier.inc.php:275 include/dossier.inc.php:272
 #: include/dossier.inc.php:294 include/dossier.inc.php:330
 #: include/dossier.inc.php:331 include/dossier.inc.php:334
-#: include/dossier.inc.php:339 include/dossier.inc.php:339
+#: include/dossier.inc.php:339 include/dossier.inc.php:342
+#: include/dossier.inc.php:342
 msgid "Nom du dossier"
 msgstr ""
 
@@ -9349,8 +10004,9 @@ msgstr ""
 #: include/dossier.inc.php:353 include/compta_ach.inc.php:89
 #: include/compta_ach.inc.php:91 include/compta_ven.inc.php:98
 #: include/dossier.inc.php:358 include/upgrade.inc.php:36
+#: include/compta_ach.inc.php:88 include/dossier.inc.php:361
 #: include/compta_ven.inc.php:96 include/compta_ach.inc.php:88
-#: include/dossier.inc.php:358 include/upgrade.inc.php:36
+#: include/dossier.inc.php:361 include/upgrade.inc.php:36
 #: include/operation_ods_confirm.inc.php:51
 msgid "Modèle"
 msgstr ""
@@ -9358,7 +10014,8 @@ msgstr ""
 #: include/dossier.inc.php:286 include/dossier.inc.php:283
 #: include/dossier.inc.php:305 include/dossier.inc.php:341
 #: include/dossier.inc.php:342 include/dossier.inc.php:358
-#: include/dossier.inc.php:363 include/dossier.inc.php:363
+#: include/dossier.inc.php:363 include/dossier.inc.php:366
+#: include/dossier.inc.php:366
 msgid "Creation Dossier"
 msgstr ""
 
@@ -9390,7 +10047,6 @@ msgstr ""
 #: include/ajax_admin.php:228 include/ajax/ajax_admin.php:228
 #: include/ajax/ajax_admin.php:232 include/ajax/ajax_admin.php:239
 #: include/ajax/ajax_admin.php:260 include/ajax/ajax_admin.php:264
-#: include/ajax/ajax_admin.php:264
 msgid "Cochez la case si vous êtes sûr de vouloir effacer ce dossier"
 msgstr ""
 
@@ -9401,21 +10057,23 @@ msgstr ""
 #: include/modele.inc.php:396 include/dossier.inc.php:377
 #: include/dossier.inc.php:382 include/modele.inc.php:397
 #: include/modele.inc.php:402 include/modele.inc.php:403
-#: include/modele.inc.php:403 include/dossier.inc.php:382
+#: include/modele.inc.php:403
 msgid "Désolé, vous n'avez pas coché la case"
 msgstr ""
 
 #: include/dossier.inc.php:355 include/dossier.inc.php:311
 #: include/dossier.inc.php:334 include/dossier.inc.php:370
 #: include/dossier.inc.php:371 include/dossier.inc.php:387
-#: include/dossier.inc.php:392 include/dossier.inc.php:392
+#: include/dossier.inc.php:392 include/dossier.inc.php:396
+#: include/dossier.inc.php:396
 msgid "inexistant"
 msgstr ""
 
 #: include/dossier.inc.php:365 include/dossier.inc.php:321
 #: include/dossier.inc.php:354 include/dossier.inc.php:390
 #: include/dossier.inc.php:391 include/dossier.inc.php:407
-#: include/dossier.inc.php:412 include/dossier.inc.php:412
+#: include/dossier.inc.php:412 include/dossier.inc.php:416
+#: include/dossier.inc.php:416
 msgid "Base de donnée "
 msgstr ""
 
@@ -9427,6 +10085,7 @@ msgstr ""
 #: include/export/export_fiche_balance_csv.php:154 include/fiche.inc.php:517
 #: include/fiche.inc.php:519 include/fiche.inc.php:528
 #: include/class/print_ledger_simple.class.php:101 include/fiche.inc.php:541
+#: include/class/print_ledger_simple.class.php:98 include/fiche.inc.php:541
 #: include/class/print_ledger_simple.class.php:98
 #: include/export/export_fiche_balance_csv.php:154
 msgid "ref"
@@ -9490,6 +10149,13 @@ msgstr ""
 #: include/class/acc_ledger_history_generic.class.php:769
 #: include/class/acc_ledger_sold.class.php:1412
 #: include/class/acc_ledger_purchase.class.php:1838 include/fiche.inc.php:542
+#: include/class/print_ledger_misc.class.php:44
+#: include/class/fiche.class.php:1502
+#: include/class/acc_ledger_purchase.class.php:1875
+#: include/class/acc_ledger_sold.class.php:1397
+#: include/class/acc_ledger_history_generic.class.php:770
+#: include/class/anc_grandlivre.class.php:232
+#: include/class/anc_grandlivre.class.php:233 include/fiche.inc.php:542
 #: include/class/acc_reconciliation.class.php:492
 #: include/class/print_ledger_misc.class.php:44
 #: include/class/fiche.class.php:1502
@@ -9497,7 +10163,7 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:1397
 #: include/class/acc_ledger_history_generic.class.php:770
 #: include/class/balance_age.class.php:149
-#: include/class/anc_grandlivre.class.php:232
+#: include/class/anc_grandlivre.class.php:233
 #: include/export/export_poste_detail_csv.php:85
 #: include/export/export_poste_detail_csv.php:197
 #: include/export/export_fiche_balance_csv.php:155
@@ -9517,7 +10183,8 @@ msgstr ""
 #: include/export/export_fiche_balance_csv.php:155
 #: include/export/export_fiche_balance_csv.php:156 include/fiche.inc.php:519
 #: include/fiche.inc.php:521 include/fiche.inc.php:530
-#: include/fiche.inc.php:543 include/export/export_fiche_balance_csv.php:156
+#: include/fiche.inc.php:543 include/fiche.inc.php:543
+#: include/export/export_fiche_balance_csv.php:156
 msgid "Comm"
 msgstr ""
 
@@ -9547,6 +10214,8 @@ msgstr ""
 #: include/class/anc_grandlivre.class.php:222 include/fiche.inc.php:523
 #: include/fiche.inc.php:532 include/fiche.inc.php:545
 #: include/class/anc_grandlivre.class.php:235
+#: include/class/anc_grandlivre.class.php:236 include/fiche.inc.php:545
+#: include/class/anc_grandlivre.class.php:236
 #: include/export/export_poste_detail_csv.php:90
 #: include/export/export_fiche_detail_csv.php:79
 #: include/export/export_fiche_balance_csv.php:159
@@ -9563,7 +10232,7 @@ msgstr ""
 #: include/export/export_fiche_detail_csv.php:80
 #: include/export/export_poste_detail_csv.php:91 include/fiche.inc.php:524
 #: include/fiche.inc.php:533 include/fiche.inc.php:546
-#: include/export/export_poste_detail_csv.php:91
+#: include/fiche.inc.php:546 include/export/export_poste_detail_csv.php:91
 #: include/export/export_fiche_detail_csv.php:80
 #: include/export/export_fiche_balance_csv.php:161
 msgid "Let."
@@ -9657,14 +10326,14 @@ msgstr ""
 #: include/fiche.inc.php:175 include/fiche.inc.php:179
 #: include/fiche.inc.php:181 include/fiche.inc.php:182
 #: include/fiche.inc.php:183 include/fiche.inc.php:184
-#: include/fiche.inc.php:185
+#: include/fiche.inc.php:185 include/fiche.inc.php:185
 msgid "Fiche non effacées"
 msgstr ""
 
 #: include/fiche.inc.php:176 include/fiche.inc.php:180
 #: include/fiche.inc.php:182 include/fiche.inc.php:183
 #: include/fiche.inc.php:184 include/fiche.inc.php:185
-#: include/fiche.inc.php:186
+#: include/fiche.inc.php:186 include/fiche.inc.php:186
 msgid " Ces fiches n'ont pas été effacées  "
 msgstr ""
 
@@ -9674,7 +10343,9 @@ msgstr ""
 #: include/fiche.inc.php:133 include/fiche.inc.php:387
 #: include/fiche.inc.php:134 include/fiche.inc.php:388
 #: include/fiche.inc.php:395 include/fiche.inc.php:135
-#: include/fiche.inc.php:405
+#: include/fiche.inc.php:405 include/export/export_fiche_pdf.php:73
+#: include/fiche.inc.php:135 include/fiche.inc.php:405
+#: include/export/export_fiche_pdf.php:73
 msgid "Aucune fiche trouvée"
 msgstr ""
 
@@ -9682,6 +10353,7 @@ msgstr ""
 #: include/fiche.inc.php:390 include/fiche.inc.php:393
 #: include/fiche.inc.php:394 include/fiche.inc.php:395
 #: include/fiche.inc.php:402 include/fiche.inc.php:412
+#: include/fiche.inc.php:412
 msgid "Filtre rapide:"
 msgstr ""
 
@@ -9737,6 +10409,7 @@ msgstr ""
 
 #: include/impress_bilan.inc.php:64 include/impress_bilan.inc.php:71
 #: include/impress_bilan.inc.php:78 include/impress_bilan.inc.php:81
+#: include/impress_bilan.inc.php:81
 msgid "Verification comptabilite"
 msgstr ""
 
@@ -9773,15 +10446,15 @@ msgstr ""
 #: include/balance.inc.php:183 include/balance.inc.php:195
 #: include/balance.inc.php:196 include/impress_jrn.inc.php:146
 #: include/impress_rapport.inc.php:286 include/balance.inc.php:199
-#: include/impress_jrn.inc.php:160 include/balance.inc.php:199
-#: include/impress_gl_comptes.inc.php:100 include/impress_jrn.inc.php:174
-#: include/impress_rec.inc.php:79 include/impress_rapport.inc.php:286
-#: include/impress_poste.inc.php:114
+#: include/impress_jrn.inc.php:160 include/impress_jrn.inc.php:174
+#: include/balance.inc.php:199 include/impress_gl_comptes.inc.php:100
+#: include/impress_jrn.inc.php:174 include/impress_rec.inc.php:79
+#: include/impress_rapport.inc.php:286 include/impress_poste.inc.php:114
 msgid "Visualisation"
 msgstr ""
 
 #: include/lettering.account.inc.php:47 include/lettering.account.inc.php:53
-#: include/lettering.account.inc.php:55
+#: include/lettering.account.inc.php:55 include/lettering.account.inc.php:55
 msgid "Lettrage pour le poste comptable "
 msgstr ""
 
@@ -9790,6 +10463,7 @@ msgstr ""
 #: include/lettering.card.inc.php:76 include/lettering.gestion.inc.php:74
 #: include/lettering.gestion.inc.php:73 include/lettering.account.inc.php:67
 #: include/lettering.account.inc.php:80 include/lettering.account.inc.php:124
+#: include/lettering.account.inc.php:76 include/lettering.card.inc.php:71
 #: include/lettering.account.inc.php:76 include/lettering.gestion.inc.php:73
 #: include/lettering.card.inc.php:71
 msgid "Date malformée, désolé"
@@ -9799,6 +10473,7 @@ msgstr ""
 #: include/lettering.gestion.inc.php:34
 #: include/ext/tools/include/export_operation.inc.php:33
 #: include/lettering.gestion.inc.php:33 include/lettering.account.inc.php:85
+#: include/lettering.account.inc.php:86 include/lettering.card.inc.php:84
 #: include/lettering.account.inc.php:86 include/lettering.gestion.inc.php:33
 #: include/lettering.card.inc.php:84
 msgid "Date fin"
@@ -9807,6 +10482,7 @@ msgstr ""
 #: include/lettering.account.inc.php:84 include/lettering.card.inc.php:89
 #: include/lettering.gestion.inc.php:41 include/lettering.gestion.inc.php:40
 #: include/lettering.account.inc.php:92 include/lettering.account.inc.php:93
+#: include/lettering.card.inc.php:91 include/lettering.account.inc.php:93
 #: include/lettering.gestion.inc.php:40 include/lettering.card.inc.php:91
 msgid "Toutes opérations"
 msgstr ""
@@ -9814,6 +10490,7 @@ msgstr ""
 #: include/lettering.account.inc.php:85 include/lettering.card.inc.php:90
 #: include/lettering.gestion.inc.php:42 include/lettering.gestion.inc.php:41
 #: include/lettering.account.inc.php:93 include/impress_poste.inc.php:104
+#: include/lettering.account.inc.php:94 include/lettering.card.inc.php:92
 #: include/lettering.account.inc.php:94 include/lettering.gestion.inc.php:41
 #: include/lettering.card.inc.php:92 include/impress_poste.inc.php:104
 msgid "Opérations lettrées"
@@ -9821,6 +10498,7 @@ msgstr ""
 
 #: include/lettering.account.inc.php:86 include/lettering.card.inc.php:91
 #: include/lettering.account.inc.php:94 include/lettering.account.inc.php:95
+#: include/lettering.card.inc.php:93 include/lettering.account.inc.php:95
 #: include/lettering.card.inc.php:93
 msgid "Opérations lettrées montants différents"
 msgstr ""
@@ -9828,11 +10506,13 @@ msgstr ""
 #: include/lettering.account.inc.php:87 include/lettering.card.inc.php:92
 #: include/lettering.gestion.inc.php:43 include/lettering.gestion.inc.php:42
 #: include/lettering.account.inc.php:95 include/lettering.account.inc.php:96
+#: include/lettering.card.inc.php:94 include/lettering.account.inc.php:96
 #: include/lettering.gestion.inc.php:42 include/lettering.card.inc.php:94
 msgid "Opérations NON lettrées"
 msgstr ""
 
 #: include/lettering.card.inc.php:50 include/lettering.card.inc.php:51
+#: include/lettering.card.inc.php:51
 msgid "Lettrage pour la fiche "
 msgstr ""
 
@@ -9857,6 +10537,7 @@ msgstr ""
 #: include/ext/coprop/include/coprop_appel_fond.class.php:252
 #: include/operation_ods_new.inc.php:86
 #: include/class/acc_ledger_fin.class.php:645
+#: include/operation_ods_new.inc.php:87
 #: include/class/acc_ledger_fin.class.php:645
 #: include/operation_ods_new.inc.php:87 include/anc_od.inc.php:150
 msgid "Difference"
@@ -9894,6 +10575,8 @@ msgstr ""
 #: include/class/fiche.class.php:1761 include/class/fiche.class.php:1779
 #: include/class/fiche.class.php:1780 include/class/fiche.class.php:1806
 #: include/class/card_attribut_mtable.class.php:58
+#: include/class/fiche.class.php:1806
+#: include/class/card_attribut_mtable.class.php:58
 #: include/class/pdf_operation.class.php:246
 #: include/ajax/ajax_boxcard_search.php:65 include/template/pcmn_update.php:28
 #: include/template/pcmn_update.php:36 include/template/account_result.php:13
@@ -9908,6 +10591,7 @@ msgstr ""
 
 #: include/param_pcmn.inc.php:57 include/param_pcmn.inc.php:58
 #: include/class/contact_option_ref_mtable.class.php:37
+#: include/class/contact_option_ref_mtable.class.php:37
 msgid "Type "
 msgstr ""
 
@@ -9925,8 +10609,8 @@ msgstr ""
 #: include/ajax/ajax_admin.php:254 include/ajax/ajax_admin.php:280
 #: include/ajax/ajax_card.php:171 include/cfgledger.inc.php:139
 #: include/ajax/ajax_card.php:172 include/ajax/ajax_card.php:175
-#: include/ajax/ajax_admin.php:254 include/ajax/ajax_admin.php:280
-#: include/cfgledger.inc.php:139
+#: include/ajax/ajax_card.php:175 include/ajax/ajax_admin.php:254
+#: include/ajax/ajax_admin.php:280 include/cfgledger.inc.php:139
 msgid "Efface"
 msgstr ""
 
@@ -9995,6 +10679,7 @@ msgstr ""
 #: include/lib/user_menu.php:117 include/lib/user_menu.php:140
 #: include/lib/user_menu.php:74 include/lib/user_menu.php:97
 #: include/lib/user_menu.php:73 include/lib/user_menu.php:96
+#: include/lib/user_menu.php:73 include/lib/user_menu.php:96
 msgid "Utilisateurs"
 msgstr ""
 
@@ -10003,18 +10688,19 @@ msgstr ""
 #: include/lib/user_menu.php:117 include/lib/user_menu.php:140
 #: include/lib/user_menu.php:74 include/lib/user_menu.php:97
 #: include/lib/user_menu.php:73 include/lib/user_menu.php:96
+#: include/lib/user_menu.php:73 include/lib/user_menu.php:96
 msgid "Gestion des utilisateurs"
 msgstr ""
 
 #: include/user_menu.php:111 include/lib/user_menu.php:117
 #: include/lib/user_menu.php:118 include/lib/user_menu.php:75
-#: include/lib/user_menu.php:74
+#: include/lib/user_menu.php:74 include/lib/user_menu.php:74
 msgid "Dossiers"
 msgstr ""
 
 #: include/user_menu.php:111 include/lib/user_menu.php:117
 #: include/lib/user_menu.php:118 include/lib/user_menu.php:75
-#: include/lib/user_menu.php:74
+#: include/lib/user_menu.php:74 include/lib/user_menu.php:74
 msgid "Gestion des dossiers"
 msgstr ""
 
@@ -10023,25 +10709,26 @@ msgstr ""
 #: include/modele.inc.php:274 include/lib/user_menu.php:119
 #: include/modele.inc.php:257 include/modele.inc.php:258
 #: include/lib/user_menu.php:76 include/modele.inc.php:259
-#: include/modele.inc.php:259 include/lib/user_menu.php:75
+#: include/lib/user_menu.php:75 include/modele.inc.php:259
+#: include/lib/user_menu.php:75
 msgid "Modèles"
 msgstr ""
 
 #: include/user_menu.php:112 include/lib/user_menu.php:118
 #: include/lib/user_menu.php:119 include/lib/user_menu.php:76
-#: include/lib/user_menu.php:75
+#: include/lib/user_menu.php:75 include/lib/user_menu.php:75
 msgid "Gestion des modèles"
 msgstr ""
 
 #: include/user_menu.php:113 include/lib/user_menu.php:119
 #: include/lib/user_menu.php:120 include/lib/user_menu.php:77
-#: include/lib/user_menu.php:76
+#: include/lib/user_menu.php:76 include/lib/user_menu.php:76
 msgid "Restaure"
 msgstr ""
 
 #: include/user_menu.php:113 include/lib/user_menu.php:119
 #: include/lib/user_menu.php:120 include/lib/user_menu.php:77
-#: include/lib/user_menu.php:76
+#: include/lib/user_menu.php:76 include/lib/user_menu.php:76
 msgid "Restaure une base de données"
 msgstr ""
 
@@ -10050,6 +10737,7 @@ msgstr ""
 #: include/lib/user_menu.php:122 include/lib/user_menu.php:141
 #: include/lib/user_menu.php:79 include/lib/user_menu.php:98
 #: include/lib/user_menu.php:78 include/lib/user_menu.php:97
+#: include/lib/user_menu.php:78 include/lib/user_menu.php:97
 msgid "Audit"
 msgstr ""
 
@@ -10058,48 +10746,56 @@ msgstr ""
 #: include/lib/user_menu.php:122 include/lib/user_menu.php:141
 #: include/lib/user_menu.php:79 include/lib/user_menu.php:98
 #: include/lib/user_menu.php:78 include/lib/user_menu.php:97
+#: include/lib/user_menu.php:78 include/lib/user_menu.php:97
 msgid "Utilisateurs qui se sont connectés"
 msgstr ""
 
 #: include/user_menu.php:147 include/user_menu.php:151
 #: include/lib/user_menu.php:160 include/lib/user_menu.php:173
 #: include/lib/user_menu.php:131 include/lib/user_menu.php:130
+#: include/lib/user_menu.php:130
 msgid " Hors Bilan"
 msgstr ""
 
 #: include/user_menu.php:148 include/user_menu.php:152
 #: include/lib/user_menu.php:161 include/lib/user_menu.php:174
 #: include/lib/user_menu.php:132 include/lib/user_menu.php:131
+#: include/lib/user_menu.php:131
 msgid " Immobilisé"
 msgstr ""
 
 #: include/user_menu.php:149 include/user_menu.php:153
 #: include/lib/user_menu.php:162 include/lib/user_menu.php:175
 #: include/lib/user_menu.php:133 include/lib/user_menu.php:132
+#: include/lib/user_menu.php:132
 msgid "Actif a un an au plus"
 msgstr ""
 
 #: include/user_menu.php:150 include/user_menu.php:154
 #: include/lib/user_menu.php:163 include/lib/user_menu.php:176
 #: include/lib/user_menu.php:134 include/lib/user_menu.php:133
+#: include/lib/user_menu.php:133
 msgid "Stock et commande"
 msgstr ""
 
 #: include/user_menu.php:151 include/user_menu.php:155
 #: include/lib/user_menu.php:164 include/lib/user_menu.php:177
 #: include/lib/user_menu.php:135 include/lib/user_menu.php:134
+#: include/lib/user_menu.php:134
 msgid "Compte tiers"
 msgstr ""
 
 #: include/user_menu.php:153 include/user_menu.php:157
 #: include/lib/user_menu.php:166 include/lib/user_menu.php:179
 #: include/lib/user_menu.php:137 include/lib/user_menu.php:136
+#: include/lib/user_menu.php:136
 msgid "Charges"
 msgstr ""
 
 #: include/user_menu.php:154 include/user_menu.php:158
 #: include/lib/user_menu.php:167 include/lib/user_menu.php:180
 #: include/lib/user_menu.php:138 include/lib/user_menu.php:137
+#: include/lib/user_menu.php:137
 msgid "Produits"
 msgstr ""
 
@@ -10108,11 +10804,13 @@ msgstr ""
 #: include/lib/user_menu.php:168 include/lib/user_menu.php:169
 #: include/lib/user_menu.php:181 include/lib/user_menu.php:182
 #: include/lib/user_menu.php:139 include/lib/user_menu.php:140
-#: include/lib/user_menu.php:138 include/lib/user_menu.php:139
+#: include/lib/user_menu.php:138 include/lib/user_menu.php:138
+#: include/lib/user_menu.php:139
 msgid "Hors Comptabilité"
 msgstr ""
 
 #: include/template/account_result.php:6 include/template/card_result.php:6
+#: include/template/card_multiple_result.php:7
 #: include/template/card_result.php:6 include/template/account_result.php:6
 #: include/template/card_multiple_result.php:7
 msgid "Résultats"
@@ -10140,8 +10838,16 @@ msgstr ""
 #: include/template/action_search.php:81 include/template/action_search.php:115
 #: include/template/action_search.php:129 include/class/tag.class.php:85
 #: include/class/follow_up.class.php:623 include/class/tag.class.php:90
-#: include/template/tag_choose.php:5 include/template/action_search.php:130
-#: include/cfgtags.inc.php:38
+#: include/template/action_search.php:130 include/cfgtags.inc.php:38
+#: include/class/follow_up.class.php:639 include/class/tag_action.class.php:54
+#: include/class/tag_operation.class.php:192
+#: include/ajax/ajax_tag_detail.php:19
+#: include/template/ledger_detail_bottom.php:47
+#: include/class/follow_up.class.php:639 include/class/tag_action.class.php:54
+#: include/class/tag_operation.class.php:192
+#: include/ajax/ajax_tag_detail.php:19 include/template/tag_choose.php:5
+#: include/template/ledger_detail_bottom.php:47
+#: include/template/action_search.php:130 include/cfgtags.inc.php:38
 msgid "Etiquette"
 msgstr ""
 
@@ -10155,9 +10861,11 @@ msgstr ""
 #: include/template/action_search.php:51
 #: include/template/action_display_short.php:97
 #: include/template/action_search.php:47 include/template/action_show.php:39
+#: include/template/detail-action.php:41
+#: include/template/action_search_result.php:54
 #: include/template/action_display_short.php:97
-#: include/template/detail-action.php:40
-#: include/template/action_search_result.php:53
+#: include/template/detail-action.php:41
+#: include/template/action_search_result.php:54
 #: include/template/action_show.php:39 include/template/action_search.php:47
 msgid "Destinataire"
 msgstr ""
@@ -10172,7 +10880,9 @@ msgstr ""
 #: include/template/detail-action.php:123 include/template/action_search.php:60
 #: include/template/action_search.php:56 include/class/follow_up.class.php:628
 #: include/template/detail-action.php:130 include/template/ledger_search.php:83
-#: include/template/action_search.php:56
+#: include/class/follow_up.class.php:647 include/template/detail-action.php:132
+#: include/class/follow_up.class.php:647 include/template/detail-action.php:132
+#: include/template/ledger_search.php:83 include/template/action_search.php:56
 msgid "Etat"
 msgstr ""
 
@@ -10270,9 +10980,10 @@ msgstr ""
 #: include/ajax/ajax_calendar_zoom.php:26 include/lib/html_input.class.php:991
 #: include/ajax/ajax_calendar_zoom.php:32 include/lib/html_input.class.php:992
 #: include/lib/html_input.class.php:1007 include/lib/html_input.class.php:1008
+#: include/lib/html_input.class.php:1041 include/lib/html_input.class.php:1042
 #: include/ajax/ajax_calendar_zoom.php:32 include/template/calendar-list.php:34
 #: include/template/dashboard.php:6 include/impress_rapport.inc.php:234
-#: include/lib/html_input.class.php:1041
+#: include/lib/html_input.class.php:1042
 msgid "Calendrier"
 msgstr ""
 
@@ -10320,9 +11031,11 @@ msgstr ""
 #: include/template/detail-action.php:258 include/template/dashboard.php:348
 #: include/ext/invoicing/include/invoice_send_mail_input.inc.php:139
 #: include/template/action_show.php:40 include/template/dashboard.php:346
-#: include/class/follow_up.class.php:627
+#: include/class/follow_up.class.php:627 include/class/follow_up.class.php:645
+#: include/template/action_search_result.php:51
+#: include/class/follow_up.class.php:645
 #: include/template/todo_list_display.php:54
-#: include/template/action_search_result.php:50
+#: include/template/action_search_result.php:51
 #: include/template/action_show.php:40 include/template/dashboard.php:346
 msgid "Titre"
 msgstr ""
@@ -10332,12 +11045,12 @@ msgid "Informations générales"
 msgstr ""
 
 #: include/template/detail-action.php:19 include/template/detail-action.php:12
-#: include/template/detail-action.php:12
+#: include/template/detail-action.php:13 include/template/detail-action.php:13
 msgid "N° document"
 msgstr ""
 
 #: include/template/detail-action.php:27 include/template/detail-action.php:20
-#: include/template/detail-action.php:20
+#: include/template/detail-action.php:21 include/template/detail-action.php:21
 msgid "Reference"
 msgstr ""
 
@@ -10347,8 +11060,10 @@ msgstr ""
 #: include/template/detail-action.php:104
 #: include/template/action_display_short.php:88
 #: include/template/action_display_short.php:89
-#: include/template/action_display_short.php:89
 #: include/template/detail-action.php:111
+#: include/template/detail-action.php:113
+#: include/template/action_display_short.php:89
+#: include/template/detail-action.php:113
 msgid "Heure"
 msgstr ""
 
@@ -10357,6 +11072,8 @@ msgstr ""
 #: include/template/detail-action.php:115
 #: include/template/detail-action.php:114
 #: include/template/detail-action.php:121
+#: include/template/detail-action.php:123
+#: include/template/detail-action.php:123
 msgid "Date limite"
 msgstr ""
 
@@ -10384,16 +11101,24 @@ msgstr ""
 #: include/class/fiche.class.php:1463
 #: include/class/acc_ledger_search.class.php:1106
 #: include/class/fiche.class.php:1477 include/class/fiche.class.php:1478
-#: include/user_detail.inc.php:168
 #: include/class/acc_ledger_search.class.php:1195
 #: include/class/fiche.class.php:1505
 #: include/class/card_attribut_mtable.class.php:40
 #: include/class/acc_account_ledger.class.php:390
+#: include/user_detail.inc.php:179
+#: include/class/acc_ledger_search.class.php:1218
+#: include/template/detail-action.php:30
+#: include/template/action_search_result.php:57 include/user.inc.php:149
+#: include/user_detail.inc.php:179
+#: include/class/acc_ledger_search.class.php:1218
+#: include/class/fiche.class.php:1505
+#: include/class/card_attribut_mtable.class.php:40
+#: include/class/acc_account_ledger.class.php:390
 #: include/class/acc_plan_mtable.class.php:46
-#: include/export/export_gl_csv.php:96 include/template/detail-action.php:29
+#: include/export/export_gl_csv.php:96 include/template/detail-action.php:30
 #: include/template/menu_detail.php:51 include/template/pcmn_update.php:42
-#: include/template/action_search_result.php:56
-#: include/template/impress_cat_card.php:10 include/user.inc.php:147
+#: include/template/action_search_result.php:57
+#: include/template/impress_cat_card.php:10 include/user.inc.php:149
 #: include/menu.inc.php:111
 msgid "Type"
 msgstr ""
@@ -10405,8 +11130,10 @@ msgstr ""
 #: include/template/detail-action.php:133
 #: include/template/action_display_short.php:99
 #: include/template/action_display_short.php:100
-#: include/template/action_display_short.php:100
 #: include/template/detail-action.php:140
+#: include/template/detail-action.php:142
+#: include/template/action_display_short.php:100
+#: include/template/detail-action.php:142
 msgid "Priorité"
 msgstr ""
 
@@ -10436,6 +11163,10 @@ msgstr ""
 #: include/class/follow_up.class.php:2018
 #: include/class/follow_up.class.php:1906
 #: include/class/follow_up.class.php:1971
+#: include/class/follow_up.class.php:1880
+#: include/class/follow_up.class.php:1945
+#: include/class/follow_up.class.php:1880
+#: include/class/follow_up.class.php:1945
 #, php-format
 msgid "Voulez-vous effacer cette action "
 msgstr ""
@@ -10493,15 +11224,27 @@ msgstr ""
 #: include/class/print_ledger_misc.class.php:46
 #: include/class/acc_ledger_purchase.class.php:1878
 #: include/class/acc_ledger_sold.class.php:1400
+#: include/class/acc_ledger_history_generic.class.php:688
+#: include/template/action_document_type_mtable_input.php:113
+#: include/template/detail-action.php:297
+#: include/template/detail-action.php:327
+#: include/template/detail-action.php:332
+#: include/template/detail-action.php:301
+#: include/template/detail-action.php:339
+#: include/template/detail-action.php:342
+#: include/class/print_ledger_misc.class.php:46
+#: include/class/acc_ledger_purchase.class.php:1878
+#: include/class/acc_ledger_sold.class.php:1400
 #: include/class/acc_ledger_fin.class.php:550
 #: include/class/acc_ledger_history_generic.class.php:688
 #: include/class/pdf_operation.class.php:82
 #: include/export/export_stock_histo_csv.php:44
 #: include/template/action_document_type_mtable_input.php:113
 #: include/template/form_ledger_fin.php:42
-#: include/template/detail-action.php:297
+#: include/template/detail-action.php:301
 #: include/template/detail-action.php:327
-#: include/template/detail-action.php:332 include/stock_inv_histo.inc.php:78
+#: include/template/detail-action.php:339
+#: include/template/detail-action.php:342 include/stock_inv_histo.inc.php:78
 msgid "Commentaire"
 msgstr ""
 
@@ -10527,6 +11270,8 @@ msgstr ""
 #: include/template/detail-action.php:317
 #: include/template/follow_up_detail_display.php:52
 #: include/template/newEmptyPHP_NOALYSS.php:37
+#: include/template/follow_up_detail_display.php:52
+#: include/template/newEmptyPHP_NOALYSS.php:37
 msgid "prix unitaire"
 msgstr ""
 
@@ -10579,6 +11324,12 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1852
 #: include/class/acc_ledger_purchase.class.php:1889
 #: include/class/acc_ledger_sold.class.php:1411
+#: include/export/export_printtva_pdf.php:59
+#: include/export/export_printtva_pdf.php:216
+#: include/template/follow_up_detail_display.php:54
+#: include/template/newEmptyPHP_NOALYSS.php:39
+#: include/class/acc_ledger_purchase.class.php:1889
+#: include/class/acc_ledger_sold.class.php:1411
 #: include/class/print_ledger_detail_item.class.php:163
 #: include/export/export_printtva_pdf.php:59
 #: include/export/export_printtva_pdf.php:216
@@ -10634,6 +11385,7 @@ msgstr ""
 #: include/template/detail-action.php:379
 #: include/ext/invoicing/include/invoicing.inc.php:100
 #: include/template/detail-action.php:411
+#: include/template/detail-action.php:424
 msgid "Document à générer"
 msgstr ""
 
@@ -10648,6 +11400,8 @@ msgstr ""
 #: include/template/detail-action.php:407
 #: include/template/detail-action.php:405
 #: include/template/detail-action.php:401
+#: include/template/detail-action.php:414
+#: include/template/detail-action.php:414
 msgid "Pièces attachées"
 msgstr ""
 
@@ -10662,6 +11416,8 @@ msgstr ""
 #: include/template/detail-action.php:442
 #: include/template/detail-action.php:440
 #: include/template/detail-action.php:453
+#: include/template/detail-action.php:466
+#: include/template/detail-action.php:466
 #, php-format
 msgid "Voulez-vous effacer le document"
 msgstr ""
@@ -10677,6 +11433,8 @@ msgstr ""
 #: include/template/detail-action.php:465
 #: include/template/detail-action.php:463
 #: include/template/detail-action.php:476
+#: include/template/detail-action.php:489
+#: include/template/detail-action.php:489
 msgid "Je ne peux pas ajouter de fichier"
 msgstr ""
 
@@ -10686,11 +11444,13 @@ msgstr ""
 
 #: include/template/document_mod_change.php:56
 #: include/template/action_document_type_mtable_input.php:39
+#: include/template/action_document_type_mtable_input.php:39
 msgid "numéro actuel"
 msgstr ""
 
 #: include/template/document_mod_change.php:71
 #: include/template/action_document_type_mtable_input.php:36
+#: include/template/action_document_type_mtable_input.php:36
 msgid "Prochain numéro"
 msgstr ""
 
@@ -10765,6 +11525,7 @@ msgstr ""
 #: include/template/form_ledger_detail.php:70
 #: include/template/form_ledger_detail.php:74
 #: include/template/form_ledger_detail.php:77
+#: include/template/form_ledger_detail.php:77
 #: include/template/predf_ledger_detail.php:19
 msgid "prix/unité htva"
 msgstr ""
@@ -10805,6 +11566,10 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1891
 #: include/class/acc_ledger_sold.class.php:1413
 #: include/template/form_ledger_detail.php:79
+#: include/template/predf_ledger_detail.php:76
+#: include/class/acc_ledger_purchase.class.php:1891
+#: include/class/acc_ledger_sold.class.php:1413
+#: include/template/form_ledger_detail.php:79
 #: include/template/predf_ledger_detail.php:21
 #: include/template/predf_ledger_detail.php:76
 msgid "Total HTVA"
@@ -10815,6 +11580,7 @@ msgstr ""
 #: include/template/form_ledger_detail.php:74
 #: include/template/form_ledger_detail.php:78
 #: include/template/form_ledger_detail.php:81
+#: include/template/form_ledger_detail.php:81
 #: include/template/predf_ledger_detail.php:23
 msgid "tot.tva"
 msgstr ""
@@ -10824,6 +11590,7 @@ msgstr ""
 #: include/template/form_ledger_detail.php:75
 #: include/template/form_ledger_detail.php:79
 #: include/template/form_ledger_detail.php:82
+#: include/template/form_ledger_detail.php:82
 #: include/template/predf_ledger_detail.php:24
 msgid "tvac"
 msgstr ""
@@ -10833,6 +11600,7 @@ msgstr ""
 #: include/template/form_ledger_detail.php:77
 #: include/template/form_ledger_detail.php:81
 #: include/template/form_ledger_detail.php:84
+#: include/template/form_ledger_detail.php:84
 #: include/template/predf_ledger_detail.php:26
 msgid "prix/unité "
 msgstr ""
@@ -10845,6 +11613,7 @@ msgstr ""
 #: include/template/form_ledger_detail.php:83
 #: include/template/impress_reconciliation.php:65
 #: include/template/form_ledger_detail.php:86
+#: include/template/form_ledger_detail.php:86
 #: include/template/predf_ledger_detail.php:28
 #: include/template/impress_reconciliation.php:65
 msgid "Total "
@@ -10914,6 +11683,8 @@ msgstr ""
 #: include/class/anc_listing.class.php:118
 #: include/class/anc_balance_double.class.php:83
 #: include/class/anc_balance_double.class.php:278
+#: include/template/form_ledger_detail.php:116
+#: include/template/predf_ledger_detail.php:80
 #: include/class/anc_listing.class.php:115
 #: include/class/anc_listing.class.php:117
 #: include/class/anc_listing.class.php:118
@@ -10988,7 +11759,8 @@ msgstr ""
 #: include/template/stock_histo_search.php:47 include/class_anc_print.php:159
 #: include/class/class_anc_print.php:159 include/class/class_anc_print.php:161
 #: include/class/anc_print.class.php:155 include/class/anc_print.class.php:153
-#: include/impress_jrn.inc.php:143 include/class/anc_print.class.php:153
+#: include/impress_jrn.inc.php:143 include/class/anc_print.class.php:154
+#: include/class/anc_print.class.php:154
 #: include/template/impress_cat_card.php:18
 #: include/template/stock_histo_search.php:47 include/impress_jrn.inc.php:143
 msgid "Jusque"
@@ -11019,6 +11791,7 @@ msgstr ""
 #: include/stock_inv_histo.inc.php:107
 #: include/ajax/ajax_anc_detail_operation.php:44
 #: include/class/pdf_operation.class.php:405
+#: include/template/action_document_type_mtable_input.php:66
 #: include/class/pdf_operation.class.php:405
 #: include/ajax/ajax_anc_detail_operation.php:44
 #: include/template/action_document_type_mtable_input.php:66
@@ -11103,6 +11876,9 @@ msgstr ""
 #: include/class/acc_ledger_history_sale.class.php:259
 #: include/class/acc_ledger_history_purchase.class.php:271
 #: include/class/print_ledger_simple.class.php:107
+#: include/class/acc_ledger_history_sale.class.php:259
+#: include/class/acc_ledger_history_purchase.class.php:271
+#: include/class/print_ledger_simple.class.php:107
 #: include/class/print_ledger_detail_item.class.php:161
 #: include/template/operation_detail_ach.php:52
 #: include/template/acc_ledger_history_purchase_extended.php:49
@@ -11122,6 +11898,8 @@ msgstr ""
 #: include/class/print_ledger_simple.class.php:114
 #: include/class/print_ledger_simple.class.php:111
 #: include/export/export_printtva_pdf.php:217
+#: include/class/print_ledger_simple.class.php:111
+#: include/export/export_printtva_pdf.php:217
 #: include/template/ledger_detail_ach.php:134
 msgid "TVA ND"
 msgstr ""
@@ -11154,6 +11932,7 @@ msgstr ""
 #: include/template/acc_ledger_history_sale_extended.php:132
 #: include/class/print_ledger_detail_item.class.php:165
 #: include/class/print_ledger_detail_item.class.php:64
+#: include/class/print_ledger_detail_item.class.php:64
 #: include/class/print_ledger_detail_item.class.php:165
 #: include/template/operation_detail_ach.php:55
 #: include/template/acc_ledger_history_purchase_extended.php:55
@@ -11209,6 +11988,8 @@ msgstr ""
 #: include/template/ledger_detail_bottom.php:333
 #: include/template/ledger_detail_bottom.php:346
 #: include/template/ledger_detail_bottom.php:374
+#: include/template/ledger_detail_bottom.php:391
+#: include/template/ledger_detail_bottom.php:391
 msgid "Extourner"
 msgstr ""
 
@@ -11235,8 +12016,8 @@ msgstr ""
 #: include/template/ledger_search.php:25 include/template/ledger_search.php:33
 #: include/template/ledger_search.php:51 include/template/ledger_search.php:26
 #: include/template/ledger_search.php:35 include/template/ledger_search.php:54
-#: include/template/ledger_search.php:26 include/template/ledger_search.php:35
-#: include/template/ledger_search.php:56
+#: include/template/ledger_search.php:56 include/template/ledger_search.php:26
+#: include/template/ledger_search.php:35 include/template/ledger_search.php:56
 msgid "et"
 msgstr ""
 
@@ -11256,12 +12037,12 @@ msgid "Et compris entre les montants"
 msgstr ""
 
 #: include/template/ledger_search.php:56 include/template/ledger_search.php:59
-#: include/template/ledger_search.php:63
+#: include/template/ledger_search.php:63 include/template/ledger_search.php:63
 msgid "Et utilisant la fiche (quick code)"
 msgstr ""
 
 #: include/template/ledger_search.php:64 include/template/ledger_search.php:67
-#: include/template/ledger_search.php:71
+#: include/template/ledger_search.php:71 include/template/ledger_search.php:71
 msgid "Et utilisant le poste comptable"
 msgstr ""
 
@@ -11282,12 +12063,14 @@ msgstr ""
 #: include/export/export_poste_detail_pdf.php:94
 #: include/template/acc_ledger_history_purchase_detail.php:35
 #: include/template/acc_ledger_history_sale_detail.php:36
-#: include/export/export_poste_detail_pdf.php:94
+#: include/export/export_poste_detail_pdf.php:95
+#: include/template/action_search_result.php:48
+#: include/export/export_poste_detail_pdf.php:95
 #: include/template/print_ledger_simple.php:9
 #: include/template/acc_ledger_history_sale_detail.php:36
 #: include/template/letter_all.php:26
 #: include/template/acc_ledger_history_purchase_detail.php:35
-#: include/template/action_search_result.php:47
+#: include/template/action_search_result.php:48
 #: include/template/letter_prop.php:28 include/template/letter_prop.php:71
 msgid "Ref"
 msgstr ""
@@ -11318,6 +12101,7 @@ msgstr ""
 #: include/payment_middle.inc.php:122
 #: include/class/payment_method_mtable.class.php:40
 #: include/class/payment_method_mtable.class.php:41
+#: include/class/payment_method_mtable.class.php:41
 #: include/template/new_mod_payment.php:28
 msgid "Type de fiche"
 msgstr ""
@@ -11385,24 +12169,26 @@ msgstr ""
 #: include/template/param_jrn.php:78 include/template/param_jrn.php:85
 #: include/template/param_jrn.php:6
 #: include/class/operation_predef_mtable.class.php:53
+#: include/class/operation_predef_mtable.class.php:53
 #: include/template/param_jrn.php:6
 msgid "Type de journal"
 msgstr ""
 
 #: include/template/param_jrn.php:84 include/template/param_jrn.php:91
 #: include/template/param_jrn.php:93 include/template/param_jrn.php:137
-#: include/template/param_jrn.php:138
+#: include/template/param_jrn.php:138 include/template/param_jrn.php:138
 msgid "Préfixe code interne"
 msgstr ""
 
 #: include/template/param_jrn.php:88 include/template/param_jrn.php:95
 #: include/template/param_jrn.php:97 include/template/param_jrn.php:141
-#: include/template/param_jrn.php:142
+#: include/template/param_jrn.php:142 include/template/param_jrn.php:142
 msgid "Préfixe pièce justificative"
 msgstr ""
 
 #: include/template/param_jrn.php:94 include/lib/message_javascript.php:70
-#: include/lib/message_javascript.php:72 include/lib/message_javascript.php:72
+#: include/lib/message_javascript.php:72 include/lib/message_javascript.php:73
+#: include/lib/message_javascript.php:73
 msgid ""
 "Le préfixe des pièces doit être différent pour chaque journal, on peut aussi "
 "utiliser l'année"
@@ -11415,12 +12201,14 @@ msgstr ""
 #: include/template/param_jrn.php:102 include/template/param_jrn.php:99
 #: include/template/param_jrn.php:106 include/template/param_jrn.php:108
 #: include/template/param_jrn.php:152 include/template/param_jrn.php:153
+#: include/template/param_jrn.php:153
 msgid "Dernière pièce numérotée"
 msgstr ""
 
 #: include/template/param_jrn.php:110 include/template/param_jrn.php:108
 #: include/template/param_jrn.php:115 include/template/param_jrn.php:117
 #: include/template/param_jrn.php:161 include/template/param_jrn.php:162
+#: include/template/param_jrn.php:162
 msgid "N° pièce justificative"
 msgstr ""
 
@@ -11429,7 +12217,8 @@ msgid "La numérotation est propre à chaque journal"
 msgstr ""
 
 #: include/template/param_jrn.php:118 include/lib/message_javascript.php:71
-#: include/lib/message_javascript.php:73 include/lib/message_javascript.php:73
+#: include/lib/message_javascript.php:73 include/lib/message_javascript.php:74
+#: include/lib/message_javascript.php:74
 msgid "Laissez à 0 pour ne pas changer le numéro"
 msgstr ""
 
@@ -11541,6 +12330,7 @@ msgstr ""
 #: include/ext/amortis/raw.php:100 include/export/export_histo_csv.php:41
 #: include/export/export_histo_csv.php:42
 #: include/export/export_histo_csv.php:45
+#: include/export/export_histo_csv.php:45
 msgid "qcode"
 msgstr ""
 
@@ -11585,6 +12375,7 @@ msgstr ""
 #: include/database.item.php:143 include/database.item.php:139
 #: include/database.item.php:138 include/database.item.php:131
 #: include/database.item.php:129 include/database.item.php:130
+#: include/database.item.php:130
 msgid "Clef de répartition"
 msgstr ""
 
@@ -11688,8 +12479,8 @@ msgstr ""
 #: include/lib/http_input.class.php:121 include/class/acc_ledger.class.php:89
 #: include/lib/http_input.class.php:123 include/class/periode.class.php:237
 #: include/class/acc_ledger.class.php:91 include/class/periode.class.php:239
-#: include/class/acc_ledger.class.php:89 include/class/periode.class.php:239
-#: include/lib/http_input.class.php:161
+#: include/lib/http_input.class.php:161 include/class/acc_ledger.class.php:89
+#: include/class/periode.class.php:239 include/lib/http_input.class.php:161
 msgid "Paramètre invalide"
 msgstr ""
 
@@ -11737,8 +12528,8 @@ msgstr ""
 #: include/ext/importbank/include/template/confirm_transfer.php:285
 #: include/verif_bilan.inc.php:152 include/verif_bilan.inc.php:214
 #: include/verif_bilan.inc.php:217 include/verif_bilan.inc.php:219
-#: include/audit_log.php:40 include/verif_bilan.inc.php:150
-#: include/verif_bilan.inc.php:217
+#: include/verif_bilan.inc.php:150 include/audit_log.php:40
+#: include/verif_bilan.inc.php:150 include/verif_bilan.inc.php:217
 msgid "Résultat"
 msgstr ""
 
@@ -11830,6 +12621,7 @@ msgid "Paramètre pour la TVA"
 msgstr ""
 
 #: include/ext/tools/index.php:41 include/tax_summary.inc.php:41
+#: include/tax_summary.inc.php:41
 msgid "Opération"
 msgstr ""
 
@@ -11853,6 +12645,7 @@ msgstr ""
 #: include/class/periode_ledger_table.class.php:100
 #: include/template/stock_inv.php:126 include/ajax/ajax_preference.php:142
 #: include/class/periode.class.php:521 include/class/periode.class.php:523
+#: include/impress_bilan.inc.php:52 include/class/periode.class.php:524
 #: include/compta_fin_saldo.inc.php:43 include/impress_bilan.inc.php:52
 #: include/class/periode.class.php:524
 #: include/class/periode_ledger_table.class.php:100 include/bank.inc.php:72
@@ -11906,7 +12699,8 @@ msgstr ""
 #: include/ext/tva/ext_tvagen.class.php:114
 #: include/lib/message_javascript.php:94 include/lib/message_javascript.php:96
 #: include/tax_summary.inc.php:43 include/tax_summary.inc.php:52
-#: include/lib/message_javascript.php:96
+#: include/lib/message_javascript.php:97 include/tax_summary.inc.php:52
+#: include/lib/message_javascript.php:97
 msgid "Afficher"
 msgstr ""
 
@@ -12141,7 +12935,8 @@ msgstr ""
 #: include/dossier.inc.php:303 include/dossier.inc.php:339
 #: include/dossier.inc.php:340 include/dossier.inc.php:356
 #: include/dossier.inc.php:361 include/template/periode_add_exercice.php:41
-#: include/template/periode_add_exercice.php:41 include/dossier.inc.php:361
+#: include/dossier.inc.php:364 include/template/periode_add_exercice.php:41
+#: include/dossier.inc.php:364
 msgid "Année"
 msgstr ""
 
@@ -12188,6 +12983,8 @@ msgstr ""
 #: include/ajax/ajax_add_concerned_card.php:48 include/ajax/ajax_card.php:378
 #: include/ajax/ajax_card.php:379 include/ajax/ajax_card.php:113
 #: include/ajax/ajax_card.php:412 include/ajax/ajax_add_concerned_card.php:56
+#: include/ajax/ajax_card.php:113 include/ajax/ajax_card.php:412
+#: include/ajax/ajax_add_concerned_card.php:56
 #: include/export/export_fiche_detail_pdf.php:53
 msgid "Détail fiche"
 msgstr ""
@@ -12218,7 +13015,8 @@ msgstr ""
 #: include/ext/amortis/include/am_card.class.php:235
 #: include/template/periode_add_exercice.php:92
 #: include/ext/amortis/include/am_card.class.php:267
-#: include/template/periode_add_exercice.php:92
+#: include/template/periode_add_exercice.php:101
+#: include/template/periode_add_exercice.php:101
 msgid "Année invalide"
 msgstr ""
 
@@ -12244,6 +13042,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1105
 #: include/class/acc_ledger.class.php:1121
 #: include/class/acc_ledger.class.php:1117
+#: include/class/acc_ledger.class.php:1117
 #: include/class/acc_compute.class.php:195
 msgid "Montant invalide"
 msgstr ""
@@ -12262,7 +13061,7 @@ msgstr ""
 
 #: include/ext/amortis/include/class_am_card.php:245 html/fid_card.php:169
 #: html/fid_card.php:170 html/fid_card.php:175 html/fid_card.php:174
-#: html/fid_card.php:176
+#: html/fid_card.php:176 html/fid_card.php:176
 msgid "Non trouvé"
 msgstr ""
 
@@ -12315,6 +13114,8 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:699
 #: include/class/acc_ledger_fin.class.php:753
 #: include/class/acc_ledger_search.class.php:785
+#: include/class/acc_ledger_search.class.php:808
+#: include/class/acc_ledger_search.class.php:808
 #: include/class/acc_ledger_fin.class.php:753
 msgid "n° interne"
 msgstr ""
@@ -12348,6 +13149,7 @@ msgstr ""
 #: include/lib/manage_table_sql.class.php:1092
 #: include/lib/manage_table_sql.class.php:1136
 #: include/lib/manage_table_sql.class.php:1192
+#: include/lib/manage_table_sql.class.php:1192
 msgid "Effacé"
 msgstr ""
 
@@ -12388,12 +13190,20 @@ msgstr ""
 #: include/fiche.inc.php:242 include/fiche.inc.php:302
 #: include/fiche.inc.php:340 include/class/fiche.class.php:1620
 #: include/class/fiche.class.php:2215 include/class/tax_summary.class.php:334
-#: html/popup.php:113 include/fiche.inc.php:252 include/fiche.inc.php:312
+#: include/fiche.inc.php:252 include/fiche.inc.php:312
+#: include/fiche.inc.php:350 include/class/tax_summary.class.php:437
+#: include/class/fiche.class.php:1646 include/class/fiche.class.php:2242
+#: include/class/acc_account_ledger.class.php:727
+#: include/template/detail-action.php:88
+#: include/ajax/ajax_action_concerned_list.php:49
+#: include/template/detail-action.php:90 html/popup.php:113
+#: include/fiche.inc.php:252 include/fiche.inc.php:312
 #: include/fiche.inc.php:350 include/anc_pa.inc.php:123
 #: include/class/tax_summary.class.php:437 include/class/fiche.class.php:1646
 #: include/class/fiche.class.php:2242
 #: include/class/acc_account_ledger.class.php:727
-#: include/template/detail-action.php:88 include/balance_card_ageing.inc.php:53
+#: include/ajax/ajax_action_concerned_list.php:49
+#: include/template/detail-action.php:90 include/balance_card_ageing.inc.php:53
 msgid "Export CSV"
 msgstr ""
 
@@ -12503,6 +13313,9 @@ msgstr ""
 #: include/class/print_ledger_detail_item.class.php:156
 #: include/class/acc_ledger_history_generic.class.php:772
 #: include/class/acc_account_ledger.class.php:386
+#: include/class/acc_ledger_history_generic.class.php:773
+#: include/export/export_ledger_csv.php:229
+#: include/class/acc_account_ledger.class.php:386
 #: include/class/print_ledger_detail_item.class.php:156
 #: include/class/acc_ledger_history_generic.class.php:773
 #: include/class/balance_age.class.php:144
@@ -12550,8 +13363,9 @@ msgstr ""
 #: include/ext/invoicing/include/template/recorded_message_display.php:27
 #: include/compta_ach.inc.php:111 include/compta_ven.inc.php:118
 #: include/operation_ods_confirm.inc.php:68 include/compta_ven.inc.php:116
-#: include/compta_ach.inc.php:109 include/compta_ven.inc.php:116
-#: include/compta_ach.inc.php:108 include/operation_ods_confirm.inc.php:68
+#: include/compta_ach.inc.php:109 include/compta_ach.inc.php:108
+#: include/compta_ven.inc.php:116 include/compta_ach.inc.php:108
+#: include/operation_ods_confirm.inc.php:68
 msgid "Message"
 msgstr ""
 
@@ -13143,6 +13957,8 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:936
 #: include/class/acc_ledger_search.class.php:949
 #: include/class/acc_ledger_search.class.php:1038
+#: include/class/acc_ledger_search.class.php:1061
+#: include/class/acc_ledger_search.class.php:1061
 #: include/template/fiche_list.php:49
 msgid "Selection"
 msgstr ""
@@ -13293,6 +14109,7 @@ msgstr ""
 #: include/ext/rapport_avance/include/template/parameter_send_mail_input.php:23
 #: include/ext/rapport_avance/include/template/parameter_send_mail_input.php:27
 #: scenario/HtmlInput.test.php:89 scenario/HtmlInput.test.php:106
+#: scenario/HtmlInput.test.php:106
 msgid "Envoi"
 msgstr ""
 
@@ -13315,7 +14132,8 @@ msgstr ""
 #: include/ext/transform/include/template/listing_assujetti_declarant.php:54
 #: include/ext/transform/include/template/listing_assujetti_representative.php:54
 #: include/user_detail.inc.php:130 include/user_detail.inc.php:126
-#: include/user_detail.inc.php:135 include/user_detail.inc.php:135
+#: include/user_detail.inc.php:135 include/user_detail.inc.php:146
+#: include/user_detail.inc.php:146
 msgid "email"
 msgstr ""
 
@@ -13347,6 +14165,7 @@ msgstr ""
 #: include/ajax/ajax_card.php:181 include/ajax/ajax_card.php:182
 #: include/ajax/ajax_card.php:185 include/ajax/ajax_card.php:191
 #: include/ajax/ajax_card.php:192 include/ajax/ajax_card.php:195
+#: include/ajax/ajax_card.php:195
 msgid "Nouvelle fiche"
 msgstr ""
 
@@ -13361,6 +14180,7 @@ msgstr ""
 #: include/ajax/ajax_card.php:334 include/ajax/ajax_card.php:280
 #: include/ajax/ajax_card.php:337 include/ajax/ajax_card.php:281
 #: include/ajax/ajax_card.php:338 include/ajax/ajax_card.php:287
+#: include/ajax/ajax_card.php:357 include/ajax/ajax_card.php:287
 #: include/ajax/ajax_card.php:357
 msgid "Choix de la catégorie"
 msgstr ""
@@ -13374,7 +14194,7 @@ msgstr ""
 #: html/ajax_card.php:343 include/ajax/ajax_card.php:323
 #: include/ajax/ajax_card.php:324 include/ajax/ajax_card.php:342
 #: include/ajax/ajax_card.php:345 include/ajax/ajax_card.php:346
-#: include/ajax/ajax_card.php:358
+#: include/ajax/ajax_card.php:358 include/ajax/ajax_card.php:358
 msgid "Fiche sauvée"
 msgstr ""
 
@@ -13383,6 +14203,7 @@ msgstr ""
 #: include/ajax/ajax_card.php:452 include/ajax/ajax_card.php:453
 #: include/ajax/ajax_card.php:486 include/ajax/ajax_card.php:490
 #: include/ajax/ajax_card.php:491 include/ajax/ajax_card.php:567
+#: include/ajax/ajax_card.php:566 include/ajax/ajax_card.php:566
 msgid " de contacts"
 msgstr ""
 
@@ -13392,6 +14213,7 @@ msgstr ""
 #: include/ajax/ajax_card.php:544 include/ajax/ajax_card.php:545
 #: include/ajax/ajax_card.php:578 include/ajax/ajax_card.php:582
 #: include/ajax/ajax_card.php:605 include/ajax/ajax_card.php:684
+#: include/ajax/ajax_card.php:683 include/ajax/ajax_card.php:683
 msgid "Détail fiche (sauvée)"
 msgstr ""
 
@@ -13403,8 +14225,8 @@ msgstr ""
 #: include/ajax/ajax_history.php:58 include/ajax/ajax_history.php:141
 #: include/ajax/ajax_history.php:61 include/ajax/ajax_history.php:146
 #: include/ajax/ajax_history.php:147 include/ajax/ajax_history.php:148
-#: include/balance_card.inc.php:37 include/ajax/ajax_history.php:61
-#: include/ajax/ajax_history.php:148
+#: include/balance_card.inc.php:37 include/balance_card.inc.php:37
+#: include/ajax/ajax_history.php:61 include/ajax/ajax_history.php:148
 msgid ""
 "erreur aucune période par défaut, allez dans préférence pour en choisir une"
 msgstr ""
@@ -13437,8 +14259,8 @@ msgstr ""
 #: include/ajax/ajax_history.php:117 include/ajax/ajax_history.php:202
 #: include/ajax/ajax_history.php:121 include/ajax/ajax_history.php:207
 #: include/ajax/ajax_history.php:208 include/ajax/ajax_history.php:209
-#: include/balance_card.inc.php:71 include/ajax/ajax_history.php:121
-#: include/ajax/ajax_history.php:209
+#: include/balance_card.inc.php:71 include/balance_card.inc.php:71
+#: include/ajax/ajax_history.php:121 include/ajax/ajax_history.php:209
 msgid "Aucune opération pour l'exercice courant"
 msgstr ""
 
@@ -13454,7 +14276,8 @@ msgstr ""
 #: include/ajax/ajax_ledger.php:239 include/ajax/ajax_ledger.php:352
 #: include/ajax/ajax_ledger.php:243 include/ajax/ajax_ledger.php:356
 #: include/ajax/ajax_ledger.php:244 include/ajax/ajax_ledger.php:357
-#: include/ajax/ajax_ledger.php:244 include/ajax/ajax_ledger.php:357
+#: include/ajax/ajax_ledger.php:245 include/ajax/ajax_ledger.php:358
+#: include/ajax/ajax_ledger.php:245 include/ajax/ajax_ledger.php:358
 msgid "Chargement"
 msgstr ""
 
@@ -13470,8 +14293,12 @@ msgstr ""
 #: include/ajax/ajax_ledger.php:544
 #: include/template/ledger_detail_bottom.php:355
 #: include/template/ledger_detail_bottom.php:352
-#: include/ajax/ajax_ledger.php:545 include/ajax/ajax_ledger.php:545
+#: include/ajax/ajax_ledger.php:545
 #: include/template/ledger_detail_bottom.php:380
+#: include/ajax/ajax_ledger.php:546
+#: include/template/ledger_detail_bottom.php:397
+#: include/ajax/ajax_ledger.php:546
+#: include/template/ledger_detail_bottom.php:397
 msgid "entrez une date"
 msgstr ""
 
@@ -13497,12 +14324,16 @@ msgstr ""
 #: include/export/export_ledger_csv.php:217
 #: include/export/export_ledger_csv.php:225
 #: include/template/ledger_detail_bottom.php:213
+#: include/ajax/ajax_display_letter.php:69
+#: include/export/export_ledger_csv.php:233
+#: include/template/ledger_detail_bottom.php:231
+#: include/template/ledger_detail_bottom.php:232
 #: include/class/acc_reconciliation.class.php:489
 #: include/class/acc_reconciliation.class.php:497
 #: include/class/acc_reconciliation.class.php:513
 #: include/ajax/ajax_display_letter.php:69
 #: include/export/export_ledger_csv.php:233
-#: include/template/ledger_detail_bottom.php:231
+#: include/template/ledger_detail_bottom.php:232
 #: include/template/ledger_detail_fin.php:60
 msgid "montant"
 msgstr ""
@@ -13512,6 +14343,7 @@ msgstr ""
 #: include/ajax/ajax_display_letter.php:211
 #: include/ajax/ajax_display_letter.php:216
 #: include/ajax/ajax_display_letter.php:223
+#: include/ajax/ajax_display_letter.php:223
 msgid "Mauvais type objet"
 msgstr ""
 
@@ -13520,7 +14352,7 @@ msgid "Vous n\\'êtes pas administrateur"
 msgstr ""
 
 #: html/fid_card.php:164 html/fid_card.php:165 html/fid_card.php:170
-#: html/fid_card.php:169 html/fid_card.php:171
+#: html/fid_card.php:169 html/fid_card.php:171 html/fid_card.php:171
 #, php-format
 msgid "Résultat limité à 12"
 msgstr ""
@@ -13555,10 +14387,15 @@ msgstr ""
 #: include/class/fiche.class.php:2213 include/class/fiche.class.php:1604
 #: include/class/fiche.class.php:2236 include/class/fiche.class.php:1605
 #: include/class/fiche.class.php:2237 include/class/tax_summary.class.php:350
-#: html/popup.php:114 include/class/tax_summary.class.php:453
-#: include/class/fiche.class.php:1631 include/class/fiche.class.php:2264
+#: include/class/tax_summary.class.php:453 include/class/fiche.class.php:1631
+#: include/class/fiche.class.php:2264
 #: include/class/acc_account_ledger.class.php:749
 #: include/template/ledger_detail_bottom.php:359
+#: include/template/ledger_detail_bottom.php:376 html/popup.php:114
+#: include/class/tax_summary.class.php:453 include/class/fiche.class.php:1631
+#: include/class/fiche.class.php:2264
+#: include/class/acc_account_ledger.class.php:749
+#: include/template/ledger_detail_bottom.php:376
 msgid "Export PDF"
 msgstr ""
 
@@ -13570,8 +14407,8 @@ msgstr ""
 #: include/admin_repo.inc.php:146 include/stock_inv_histo.inc.php:84
 #: include/user.inc.php:173 html/user_login.php:109
 #: include/admin_repo.inc.php:148 html/user_login.php:115
-#: html/user_login.php:115 include/audit_log.php:36
-#: include/admin_repo.inc.php:148 include/user.inc.php:173
+#: include/user.inc.php:175 html/user_login.php:115 include/audit_log.php:36
+#: include/admin_repo.inc.php:148 include/user.inc.php:175
 #: include/stock_inv_histo.inc.php:84
 msgid "Utilisateur"
 msgstr ""
@@ -13587,7 +14424,7 @@ msgstr ""
 #: include/lib/ac_common.php:629 include/lib/ac_common.php:630
 #: include/lib/ac_common.php:641 include/lib/ac_common.php:642
 #: include/lib/ac_common.php:644 include/lib/ac_common.php:660
-#: include/lib/ac_common.php:670
+#: include/lib/ac_common.php:670 include/lib/ac_common.php:670
 #, php-format
 msgid ""
 "Attention periode \n"
@@ -13602,7 +14439,7 @@ msgstr ""
 #: include/lib/ac_common.php:812 include/lib/ac_common.php:823
 #: include/lib/ac_common.php:824 include/lib/ac_common.php:836
 #: include/lib/ac_common.php:838 include/lib/ac_common.php:854
-#: include/lib/ac_common.php:864
+#: include/lib/ac_common.php:864 include/lib/ac_common.php:864
 msgid "Données non disponibles"
 msgstr ""
 
@@ -13628,6 +14465,7 @@ msgstr ""
 #: include/lib/ac_common.php:1172 include/lib/ac_common.php:1173
 #: include/lib/ac_common.php:1185 include/lib/ac_common.php:1187
 #: include/lib/ac_common.php:1211 include/lib/ac_common.php:1221
+#: include/lib/ac_common.php:1221
 msgid "Code Interne"
 msgstr ""
 
@@ -13649,17 +14487,21 @@ msgstr ""
 #: include/template/ledger_detail_bottom.php:284
 #: include/template/tax_summary_display.php:105
 #: include/template/tax_summary_display.php:277
+#: include/template/ledger_detail_bottom.php:302 include/lib/ac_common.php:1257
+#: include/template/ledger_detail_bottom.php:303
+#: include/lib/message_javascript.php:103
 #: include/export/export_fiche_detail_csv.php:60
 #: include/template/tax_summary_display.php:105
 #: include/template/tax_summary_display.php:277
-#: include/template/ledger_detail_bottom.php:302 include/lib/ac_common.php:1257
-#: include/lib/message_javascript.php:102
+#: include/template/ledger_detail_bottom.php:303 include/lib/ac_common.php:1257
+#: include/lib/message_javascript.php:103
 msgid "Aucune donnée"
 msgstr ""
 
 #: include/action.common.inc.php:277 include/action.common.inc.php:281
 #: include/action.common.inc.php:272 include/action.common.inc.php:276
 #: include/action.common.inc.php:315 include/action.common.inc.php:320
+#: include/action.common.inc.php:315 include/action.common.inc.php:320
 msgid "Action Sauvée"
 msgstr ""
 
@@ -13685,11 +14527,13 @@ msgstr ""
 
 #: include/ajax_anc_search.php:65 include/ajax/ajax_anc_search.php:65
 #: include/ajax/ajax_anc_search.php:67 include/ajax/ajax_anc_search.php:70
+#: include/ajax/ajax_anc_search.php:70
 msgid "Ce plan n'existe pas"
 msgstr ""
 
 #: include/ajax_anc_search.php:74 include/ajax/ajax_anc_search.php:74
 #: include/ajax/ajax_anc_search.php:76 include/ajax/ajax_anc_search.php:79
+#: include/ajax/ajax_anc_search.php:79
 msgid "Aucun poste trouvé"
 msgstr ""
 
@@ -13697,6 +14541,8 @@ msgstr ""
 #: include/ajax/ajax_anc_search.php:78 include/ajax/ajax_anc_search.php:79
 #: include/class/card_attribut_mtable.class.php:54
 #: include/class/contact_option_ref_mtable.class.php:44
+#: include/class/card_attribut_mtable.class.php:54
+#: include/class/contact_option_ref_mtable.class.php:44
 msgid "Choix"
 msgstr ""
 
@@ -13752,7 +14598,8 @@ msgstr ""
 #: include/ajax_fiche_def_detail.php:40
 #: include/ajax/ajax_fiche_def_detail.php:40 include/param_sec.inc.php:135
 #: include/param_sec.inc.php:141 include/ajax/ajax_fiche_def_detail.php:41
-#: include/ajax/ajax_fiche_def_detail.php:41 include/param_sec.inc.php:146
+#: include/param_sec.inc.php:146 include/ajax/ajax_fiche_def_detail.php:41
+#: include/param_sec.inc.php:146
 msgid "Retour à la liste"
 msgstr ""
 
@@ -13798,6 +14645,7 @@ msgstr ""
 
 #: include/ajax_mod_predf_op.php:32 include/ajax/ajax_mod_predf_op.php:32
 #: include/ajax/ajax_mod_predf_op.php:31 include/ajax/ajax_mod_predf_op.php:44
+#: include/ajax/ajax_mod_predf_op.php:44
 msgid "Modification du nom"
 msgstr ""
 
@@ -13810,6 +14658,9 @@ msgstr ""
 #: include/class/pre_operation.class.php:74
 #: include/ajax/ajax_mod_predf_op.php:56
 #: include/template/pre_operation_display.php:34
+#: include/class/pre_operation.class.php:74
+#: include/ajax/ajax_mod_predf_op.php:56
+#: include/template/pre_operation_display.php:34
 msgid "Description (max 50 car.)"
 msgstr ""
 
@@ -13876,7 +14727,8 @@ msgid "Détail du dossier ou tag"
 msgstr ""
 
 #: include/ajax_tag_list.php:30 include/ajax/ajax_tag_list.php:30
-#: include/ajax/ajax_tag_list.php:34 include/ajax/ajax_tag_list.php:34
+#: include/ajax/ajax_tag_list.php:34 include/ajax/ajax_operation_tag.php:65
+#: include/ajax/ajax_operation_tag.php:65 include/ajax/ajax_tag_list.php:34
 msgid "Ajout d'un tag"
 msgstr ""
 
@@ -13891,6 +14743,8 @@ msgstr ""
 #: include/class/pre_operation.class.php:250
 #: include/class/pre_operation.class.php:312
 #: include/class/pre_operation.class.php:315
+#: include/class/pre_operation.class.php:312
+#: include/class/pre_operation.class.php:315
 #: include/ajax/ajax_update_predef.php:55
 msgid "Modèle d'opérations"
 msgstr ""
@@ -13929,7 +14783,8 @@ msgstr ""
 #: include/ext/import_card/include/import_card.class.php:340
 #: include/upgrade-plugin.php:101 include/upgrade-template.php:39
 #: include/upgrade-plugin.php:113 include/upgrade-template.php:51
-#: include/upgrade-template.php:51 include/upgrade-plugin.php:116
+#: include/upgrade-plugin.php:116 include/upgrade-template.php:51
+#: include/upgrade-plugin.php:116
 msgid "Mise à jour"
 msgstr ""
 
@@ -14015,6 +14870,7 @@ msgstr ""
 #: include/template/action_search.php:63 include/template/action_search.php:77
 #: include/template/action_search.php:111
 #: include/template/action_search.php:107 include/template/action_search.php:60
+#: include/template/action_search.php:60
 msgid "Affiche aussi les actions fermées"
 msgstr ""
 
@@ -14028,8 +14884,12 @@ msgstr ""
 #: include/ajax/ajax_search_operation.php:134
 #: include/ajax/ajax_search_operation.php:135
 #: include/ajax/ajax_search_operation.php:140
-#: include/template/action_search_result.php:32
-#: include/template/action_search_result.php:88
+#: include/template/action_search_result.php:33
+#: include/template/action_search_result.php:90
+#: include/ajax/ajax_search_operation.php:135
+#: include/ajax/ajax_search_operation.php:140
+#: include/template/action_search_result.php:33
+#: include/template/action_search_result.php:90
 msgid "Mettre à jour"
 msgstr ""
 
@@ -14106,17 +14966,22 @@ msgstr ""
 #: include/card_attr.inc.php:77 include/card_attr.inc.php:78
 #: include/class/card_attribut_mtable.class.php:51
 #: include/class/contact_option_ref_mtable.class.php:42
+#: include/class/card_attribut_mtable.class.php:51
+#: include/class/contact_option_ref_mtable.class.php:42
 msgid "Texte"
 msgstr ""
 
 #: include/card_attr.inc.php:78 include/card_attr.inc.php:79
 #: include/class/card_attribut_mtable.class.php:53
 #: include/class/contact_option_ref_mtable.class.php:43
+#: include/class/card_attribut_mtable.class.php:53
+#: include/class/contact_option_ref_mtable.class.php:43
 msgid "Nombre"
 msgstr ""
 
 #: include/card_attr.inc.php:80 include/card_attr.inc.php:81
 #: include/class/card_attribut_mtable.class.php:56
+#: include/class/card_attribut_mtable.class.php:56
 msgid "Zone de texte"
 msgstr ""
 
@@ -14127,8 +14992,9 @@ msgstr ""
 #: include/dossier.inc.php:218 include/modele.inc.php:245
 #: include/dossier.inc.php:221 include/dossier.inc.php:226
 #: include/modele.inc.php:246 include/class/tva_rate_mtable.class.php:47
-#: include/modele.inc.php:247 include/class/tva_rate_mtable.class.php:47
-#: include/modele.inc.php:247 include/dossier.inc.php:226
+#: include/modele.inc.php:247 include/dossier.inc.php:229
+#: include/class/tva_rate_mtable.class.php:47 include/modele.inc.php:247
+#: include/dossier.inc.php:229
 msgid "id"
 msgstr ""
 
@@ -14136,7 +15002,8 @@ msgstr ""
 #: include/card_attr.inc.php:96 include/dossier.inc.php:204
 #: include/dossier.inc.php:238 include/dossier.inc.php:239
 #: include/dossier.inc.php:242 include/dossier.inc.php:247
-#: include/class/card_attribut_mtable.class.php:41 include/dossier.inc.php:247
+#: include/class/card_attribut_mtable.class.php:41 include/dossier.inc.php:250
+#: include/class/card_attribut_mtable.class.php:41 include/dossier.inc.php:250
 msgid "Taille"
 msgstr ""
 
@@ -14160,6 +15027,7 @@ msgid "Journal inexistant"
 msgstr ""
 
 #: include/cfgtags.inc.php:51 include/cfgtags.inc.php:66
+#: include/cfgtags.inc.php:66
 msgid ""
 "Vous pouvez utiliser ceci comme des étiquettes pour marquer des documents "
 "ou \n"
@@ -14314,6 +15182,7 @@ msgstr ""
 #: include/class/class_acc_bilan.php:257 include/class/class_acc_bilan.php:273
 #: include/class/acc_bilan.class.php:273 include/class/acc_bilan.class.php:276
 #: include/class/acc_bilan.class.php:278 include/class/acc_bilan.class.php:279
+#: include/class/acc_bilan.class.php:279
 msgid "Aucun enregistrement trouve"
 msgstr ""
 
@@ -14332,7 +15201,8 @@ msgstr ""
 #: include/class/acc_bilan.class.php:711 include/class/acc_bilan.class.php:374
 #: include/class/acc_bilan.class.php:690 include/class/acc_bilan.class.php:713
 #: include/class/acc_bilan.class.php:375 include/class/acc_bilan.class.php:695
-#: include/class/acc_bilan.class.php:718
+#: include/class/acc_bilan.class.php:718 include/class/acc_bilan.class.php:375
+#: include/class/acc_bilan.class.php:695 include/class/acc_bilan.class.php:718
 msgid "erreur Ouverture fichier"
 msgstr ""
 
@@ -14341,7 +15211,7 @@ msgstr ""
 #: include/class/class_acc_bilan.php:668 include/class/class_acc_bilan.php:685
 #: include/class/acc_bilan.class.php:686 include/class/acc_bilan.class.php:689
 #: include/class/acc_bilan.class.php:694 include/class/acc_bilan.class.php:696
-#: include/class/acc_bilan.class.php:701
+#: include/class/acc_bilan.class.php:701 include/class/acc_bilan.class.php:701
 msgid "erreur écriture fichier"
 msgstr ""
 
@@ -14353,6 +15223,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:116
 #: include/class/acc_ledger.class.php:134
 #: include/class/acc_ledger.class.php:133
+#: include/class/acc_ledger.class.php:133
 msgid " Tous les journaux"
 msgstr ""
 
@@ -14365,6 +15236,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:203
 #: include/class/acc_ledger.class.php:221
 #: include/class/acc_ledger.class.php:220
+#: include/class/acc_ledger.class.php:220
 msgid "this->jr_id is not set ou opération inconnue"
 msgstr ""
 
@@ -14379,6 +15251,9 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:937
 #: include/class/acc_ledger_search.class.php:950
 #: include/class/acc_ledger_search.class.php:1039
+#: include/export/export_histo_csv.php:39
+#: include/class/acc_ledger_search.class.php:1062
+#: include/class/acc_ledger_search.class.php:1062
 #: include/export/export_histo_csv.php:39 include/template/letter_prop.php:31
 #: include/template/letter_prop.php:74
 msgid "Internal"
@@ -14393,6 +15268,8 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:946
 #: include/class/acc_ledger_search.class.php:959
 #: include/class/acc_ledger_search.class.php:1048
+#: include/class/acc_ledger_search.class.php:1071
+#: include/class/acc_ledger_search.class.php:1071
 msgid "tiers"
 msgstr ""
 
@@ -14415,6 +15292,10 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:1058
 #: include/class/acc_ledger_search.class.php:939
 #: include/class/acc_ledger_search.class.php:1147
+#: include/class/acc_ledger_search.class.php:962
+#: include/class/acc_ledger_search.class.php:1170
+#: include/class/acc_ledger_search.class.php:962
+#: include/class/acc_ledger_search.class.php:1170
 msgid "Opération annulée"
 msgstr ""
 
@@ -14450,6 +15331,12 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:730
 #: include/class/acc_ledger_history_purchase.class.php:265
 #: include/class/acc_ledger.class.php:2480
+#: include/export/export_histo_csv.php:43 include/tax_summary.inc.php:42
+#: include/class/acc_ledger_search.class.php:753
+#: include/class/acc_ledger_history_sale.class.php:253
+#: include/class/acc_ledger_search.class.php:753
+#: include/class/acc_ledger_history_purchase.class.php:265
+#: include/class/acc_ledger.class.php:2480
 #: include/class/pdf_operation.class.php:73
 #: include/export/export_histo_csv.php:43
 #: include/template/print_ledger_simple.php:8
@@ -14503,6 +15390,16 @@ msgstr ""
 #: include/class/acc_ledger_history_generic.class.php:687
 #: include/class/anc_grandlivre.class.php:229
 #: include/export/export_ledger_csv.php:230
+#: include/export/export_histo_csv.php:46
+#: include/class/acc_ledger_search.class.php:759
+#: include/class/anc_grandlivre.class.php:230
+#: include/class/acc_ledger_search.class.php:759
+#: include/class/print_ledger_misc.class.php:45
+#: include/class/fiche.class.php:1503
+#: include/class/acc_account_ledger.class.php:388
+#: include/class/acc_ledger_history_generic.class.php:687
+#: include/class/anc_grandlivre.class.php:230
+#: include/export/export_ledger_csv.php:230
 #: include/export/export_poste_detail_csv.php:86
 #: include/export/export_poste_detail_csv.php:199
 #: include/export/export_fiche_detail_csv.php:75
@@ -14522,6 +15419,8 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:868
 #: include/class/acc_ledger_search.class.php:881
 #: include/class/acc_ledger_search.class.php:970
+#: include/class/acc_ledger_search.class.php:993
+#: include/class/acc_ledger_search.class.php:993
 msgid "Non payé"
 msgstr ""
 
@@ -14548,6 +15447,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1207
 #: include/class/acc_ledger.class.php:1223
 #: include/class/acc_ledger.class.php:1219
+#: include/class/acc_ledger.class.php:1219
 msgid ""
 "Attention : il vaut mieux utiliser les fiches que les postes comptables "
 msgstr ""
@@ -14565,6 +15465,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1309
 #: include/class/acc_ledger.class.php:1325
 #: include/class/acc_ledger.class.php:1321
+#: include/class/acc_ledger.class.php:1321
 msgid "Balance incorrecte"
 msgstr ""
 
@@ -14580,6 +15481,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1351
 #: include/class/acc_ledger.class.php:1367
 #: include/class/acc_ledger.class.php:1365
+#: include/class/acc_ledger.class.php:1365
 msgid "OPERATION ANNULEE "
 msgstr ""
 
@@ -14595,6 +15497,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1674
 #: include/class/acc_ledger.class.php:1690
 #: include/class/acc_ledger.class.php:1680
+#: include/class/acc_ledger.class.php:1680
 msgid "Celui qui paie n' a pas de poste comptable"
 msgstr ""
 
@@ -14610,6 +15513,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1692
 #: include/class/acc_ledger.class.php:1708
 #: include/class/acc_ledger.class.php:1698
+#: include/class/acc_ledger.class.php:1698
 #, php-format
 msgid "Pour la fiche %s le poste comptable [%s] n'existe pas"
 msgstr ""
@@ -14627,6 +15531,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2118
 #: include/class/acc_ledger.class.php:2134
 #: include/class/acc_ledger.class.php:2153
+#: include/class/acc_ledger.class.php:2153
 msgid "Journaux de vente"
 msgstr ""
 
@@ -14668,6 +15573,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2322
 #: include/class/acc_ledger.class.php:2344
 #: include/class/acc_ledger.class.php:2368
+#: include/class/acc_ledger.class.php:2368
 msgid "Nombre de ligne incorrect"
 msgstr ""
 
@@ -14685,6 +15591,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2327
 #: include/class/acc_ledger.class.php:2349
 #: include/class/acc_ledger.class.php:2373
+#: include/class/acc_ledger.class.php:2373
 msgid "Un journal avec ce nom existe déjà"
 msgstr ""
 
@@ -14733,6 +15640,9 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2381
 #: include/class/acc_ledger.class.php:2456
 #: include/class/acc_ledger.class.php:2638
+#: include/class/acc_ledger.class.php:2381
+#: include/class/acc_ledger.class.php:2456
+#: include/class/acc_ledger.class.php:2638
 msgid "Aucun compte en banque n'est donné"
 msgstr ""
 
@@ -14751,6 +15661,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2492
 #: include/class/acc_ledger.class.php:2523
 #: include/class/acc_ledger.class.php:2553
+#: include/class/acc_ledger.class.php:2553
 msgid "choix du type de journal"
 msgstr ""
 
@@ -14769,6 +15680,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2593
 #: include/class/acc_ledger.class.php:2632
 #: include/class/acc_ledger.class.php:2656
+#: include/class/acc_ledger.class.php:2656
 msgid "Impossible d'effacer un journal qui contient des opérations"
 msgstr ""
 
@@ -14787,6 +15699,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2709
 #: include/class/acc_ledger.class.php:2748
 #: include/class/acc_ledger.class.php:2772
+#: include/class/acc_ledger.class.php:2772
 msgid "Action non accessible"
 msgstr ""
 
@@ -14794,9 +15707,9 @@ msgstr ""
 #: include/export/export_gl_csv.php:95 include/export/export_gl_csv.php:90
 #: include/template/action_search.php:133 include/export/export_gl_csv.php:96
 #: include/export/export_gl_pdf.php:88 include/template/action_search.php:115
-#: include/template/action_show.php:38 include/export/export_gl_csv.php:96
-#: include/export/export_gl_pdf.php:88 include/template/action_show.php:38
-#: include/template/action_search.php:116
+#: include/template/action_show.php:38 include/template/action_search.php:116
+#: include/export/export_gl_csv.php:96 include/export/export_gl_pdf.php:88
+#: include/template/action_show.php:38 include/template/action_search.php:116
 msgid "Référence"
 msgstr ""
 
@@ -14804,6 +15717,7 @@ msgstr ""
 #: include/template/action_search.php:139
 #: include/template/action_search.php:121
 #: include/template/action_search.php:122
+#: include/template/action_search.php:122
 msgid "Numéro document"
 msgstr ""
 
@@ -14824,6 +15738,8 @@ msgstr ""
 #: include/template/dashboard.php:105 include/template/dashboard.php:71
 #: include/template/dashboard.php:75 include/template/dashboard.php:54
 #: include/class/contact_option_ref_mtable.class.php:38
+#: include/class/document_state_mtable.php:44
+#: include/class/contact_option_ref_mtable.class.php:38
 #: include/class/document_state_mtable.php:44 include/template/dashboard.php:54
 msgid "Action"
 msgstr ""
@@ -14913,6 +15829,8 @@ msgstr ""
 #: include/template/detail-action.php:191
 #: include/template/detail-action.php:166
 #: include/template/detail-action.php:173
+#: include/template/detail-action.php:175
+#: include/template/detail-action.php:175
 msgid "Actions concernées"
 msgstr ""
 
@@ -14926,6 +15844,8 @@ msgstr ""
 #: include/template/detail-action.php:247
 #: include/template/detail-action.php:249
 #: include/template/detail-action.php:336
+#: include/template/detail-action.php:346
+#: include/template/detail-action.php:346
 #, php-format
 msgid "Voulez-vous effacer ce commentaire"
 msgstr ""
@@ -14941,6 +15861,8 @@ msgstr ""
 #: include/template/detail-action.php:480
 #: include/template/detail-action.php:478
 #: include/template/detail-action.php:491
+#: include/template/detail-action.php:504
+#: include/template/detail-action.php:504
 msgid "Ajouter un fichier"
 msgstr ""
 
@@ -14968,11 +15890,13 @@ msgstr ""
 
 #: include/template/fiche_list.php:87 include/template/fiche_list.php:89
 #: include/template/fiche_list.php:91 include/template/fiche_list.php:96
+#: include/template/fiche_list.php:96
 msgid "Effacer la sélection "
 msgstr ""
 
 #: include/template/fiche_list.php:89 include/template/fiche_list.php:91
 #: include/template/fiche_list.php:93 include/template/fiche_list.php:98
+#: include/template/fiche_list.php:98
 msgid "Déplacer la sélection  vers"
 msgstr ""
 
@@ -15067,6 +15991,11 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1870
 #: include/class/acc_ledger_sold.class.php:1392
 #: include/export/export_ledger_csv.php:146
+#: include/class/acc_ledger_history_sale.class.php:273
+#: include/class/acc_ledger_history_purchase.class.php:288
+#: include/class/acc_ledger_purchase.class.php:1870
+#: include/class/acc_ledger_sold.class.php:1392
+#: include/export/export_ledger_csv.php:146
 #: include/template/acc_ledger_history_purchase_extended.php:34
 #: include/template/ledger_detail_ven.php:45
 #: include/template/acc_ledger_history_purchase_oneline.php:38
@@ -15085,6 +16014,8 @@ msgstr ""
 #: include/template/ledger_detail_bottom.php:143
 #: include/template/ledger_detail_bottom.php:148
 #: include/template/ledger_detail_bottom.php:153
+#: include/template/ledger_detail_bottom.php:154
+#: include/template/ledger_detail_bottom.php:154
 msgid " Bon de commande"
 msgstr ""
 
@@ -15094,6 +16025,8 @@ msgstr ""
 #: include/template/ledger_detail_bottom.php:146
 #: include/template/ledger_detail_bottom.php:151
 #: include/template/ledger_detail_bottom.php:156
+#: include/template/ledger_detail_bottom.php:157
+#: include/template/ledger_detail_bottom.php:157
 msgid "Autre information"
 msgstr ""
 
@@ -15126,6 +16059,9 @@ msgstr ""
 #: include/class/acc_ledger_history_sale.class.php:257
 #: include/class/acc_ledger_history_purchase.class.php:269
 #: include/export/export_histo_csv.php:48
+#: include/class/acc_ledger_history_sale.class.php:257
+#: include/class/acc_ledger_history_purchase.class.php:269
+#: include/export/export_histo_csv.php:48
 #: include/template/security_list_action.php:73
 #: include/template/dashboard.php:344
 msgid "Note"
@@ -15140,10 +16076,12 @@ msgid "Solde crédit"
 msgstr ""
 
 #: include/template/letter_all.php:115 include/export/export_balance_csv.php:79
+#: include/export/export_balance_csv.php:79
 msgid "Solde débiteur"
 msgstr ""
 
 #: include/template/letter_all.php:117 include/export/export_balance_csv.php:79
+#: include/export/export_balance_csv.php:79
 msgid "Solde créditeur"
 msgstr ""
 
@@ -15224,7 +16162,8 @@ msgstr ""
 #: include/template/periode_add_exercice.php:21
 #: include/template/periode_add_exercice.php:22
 #: include/template/periode_add_exercice.php:74
-#: include/template/periode_add_exercice.php:74
+#: include/template/periode_add_exercice.php:76
+#: include/template/periode_add_exercice.php:76
 msgid "Ajout d'un exercice comptable"
 msgstr ""
 
@@ -15272,8 +16211,8 @@ msgstr ""
 #: include/compta_ven.inc.php:92 include/compta_ach.inc.php:86
 #: include/compta_ven.inc.php:95 include/compta_ach.inc.php:88
 #: include/compta_ach.inc.php:90 include/compta_ven.inc.php:97
-#: include/compta_ven.inc.php:95 include/compta_ach.inc.php:87
-#: include/template/stock_histo_search.php:51
+#: include/compta_ach.inc.php:87 include/compta_ven.inc.php:95
+#: include/compta_ach.inc.php:87 include/template/stock_histo_search.php:51
 msgid "Dépôt"
 msgstr ""
 
@@ -15343,13 +16282,13 @@ msgstr ""
 
 #: include/template/tag_choose.php:8 include/template/tag_search_select.php:8
 #: include/template/tag_select.php:8 include/template/tag_select.php:12
-#: include/template/tag_select.php:14 include/template/tag_choose.php:8
-#: include/template/tag_search_select.php:8
+#: include/template/tag_select.php:14 include/template/tag_select.php:14
+#: include/template/tag_choose.php:8 include/template/tag_search_select.php:8
 msgid "Aucune étiquette disponible"
 msgstr ""
 
 #: include/template/tag_detail.php:15 include/template/tag_detail.php:21
-#: include/template/tag_detail.php:21
+#: include/template/tag_detail.php:23 include/template/tag_detail.php:23
 msgid "Etiquette (tag)"
 msgstr ""
 
@@ -15361,7 +16300,8 @@ msgstr ""
 #: include/template/tag_select.php:16 include/template/tag_list.php:12
 #: include/template/tag_search_select.php:18 include/template/tag_select.php:20
 #: include/template/tag_select.php:22 include/template/tag_search_select.php:21
-#: include/template/tag_list.php:13
+#: include/template/tag_list.php:13 include/template/tag_select.php:22
+#: include/template/tag_search_select.php:21 include/template/tag_list.php:13
 msgid "Tag"
 msgstr ""
 
@@ -15460,8 +16400,9 @@ msgstr ""
 #: include/lib/ac_common.php:343 include/action.common.inc.php:144
 #: include/action.common.inc.php:295 include/lib/ac_common.php:345
 #: include/lib/ac_common.php:361 include/action.common.inc.php:146
-#: include/action.common.inc.php:324 include/forecast.inc.php:359
-#: include/lib/ac_common.php:371
+#: include/action.common.inc.php:324 include/lib/ac_common.php:371
+#: include/action.common.inc.php:146 include/action.common.inc.php:324
+#: include/forecast.inc.php:359 include/lib/ac_common.php:371
 msgid "Erreur"
 msgstr ""
 
@@ -15472,6 +16413,8 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:1073
 #: include/class/acc_ledger_search.class.php:1086
 #: include/class/acc_ledger_search.class.php:1175 include/param_sec.inc.php:228
+#: include/class/acc_ledger_search.class.php:1198
+#: include/class/acc_ledger_search.class.php:1198 include/param_sec.inc.php:228
 msgid "Journaux"
 msgstr ""
 
@@ -15498,6 +16441,10 @@ msgstr ""
 #: include/lib/html_input.class.php:1033 include/lib/html_input.class.php:1034
 #: include/class/acc_ledger_search.class.php:114
 #: include/lib/html_input.class.php:1067
+#: include/class/acc_ledger_search.class.php:116
+#: include/lib/html_input.class.php:1068
+#: include/class/acc_ledger_search.class.php:116
+#: include/lib/html_input.class.php:1068
 msgid "choix des journaux"
 msgstr ""
 
@@ -15526,6 +16473,7 @@ msgstr ""
 #: include/ajax/ajax_display_letter.php:114
 #: include/ajax/ajax_display_letter.php:119
 #: include/ajax/ajax_display_letter.php:137
+#: include/ajax/ajax_display_letter.php:137
 msgid "Debit / Credit"
 msgstr ""
 
@@ -15534,7 +16482,7 @@ msgstr ""
 msgid "Appel invalide"
 msgstr ""
 
-#: html/export.php:53 html/export.php:54
+#: html/export.php:53 html/export.php:54 html/export.php:54
 msgid "Export impossible"
 msgstr ""
 
@@ -15599,6 +16547,8 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1512
 #: include/class/acc_ledger.class.php:1485
 #: include/class/acc_ledger.class.php:1502
+#: include/class/acc_ledger.class.php:1485
+#: include/class/acc_ledger.class.php:1502
 msgid "get_default_card p_ledger_side is invalide ["
 msgstr ""
 
@@ -15631,6 +16581,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1831
 #: include/class/acc_ledger_purchase.class.php:1868
 #: include/class/acc_ledger_sold.class.php:1390
+#: include/class/acc_ledger_purchase.class.php:1868
+#: include/class/acc_ledger_sold.class.php:1390
 msgid "Numéro opération"
 msgstr ""
 
@@ -15662,6 +16614,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1834
 #: include/class/acc_ledger_purchase.class.php:1871
 #: include/class/acc_ledger_sold.class.php:1393
+#: include/class/acc_ledger_purchase.class.php:1871
+#: include/class/acc_ledger_sold.class.php:1393
 msgid "Date échéance"
 msgstr ""
 
@@ -15697,6 +16651,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1839
 #: include/class/acc_ledger_purchase.class.php:1876
 #: include/class/acc_ledger_sold.class.php:1398
+#: include/class/acc_ledger_purchase.class.php:1876
+#: include/class/acc_ledger_sold.class.php:1398
 #: include/export/export_poste_detail_csv.php:81
 #: include/export/export_fiche_detail_csv.php:73
 msgid "Code journal"
@@ -15730,6 +16686,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1842
 #: include/class/acc_ledger_purchase.class.php:1879
 #: include/class/acc_ledger_sold.class.php:1401
+#: include/class/acc_ledger_purchase.class.php:1879
+#: include/class/acc_ledger_sold.class.php:1401
 msgid "Code Item"
 msgstr ""
 
@@ -15761,6 +16719,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1843
 #: include/class/acc_ledger_purchase.class.php:1880
 #: include/class/acc_ledger_sold.class.php:1402
+#: include/class/acc_ledger_purchase.class.php:1880
+#: include/class/acc_ledger_sold.class.php:1402
 msgid "N° fiche"
 msgstr ""
 
@@ -15792,6 +16752,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1844
 #: include/class/acc_ledger_purchase.class.php:1881
 #: include/class/acc_ledger_sold.class.php:1403
+#: include/class/acc_ledger_purchase.class.php:1881
+#: include/class/acc_ledger_sold.class.php:1403
 msgid "Nom fiche"
 msgstr ""
 
@@ -15823,6 +16785,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1845
 #: include/class/acc_ledger_purchase.class.php:1882
 #: include/class/acc_ledger_sold.class.php:1404
+#: include/class/acc_ledger_purchase.class.php:1882
+#: include/class/acc_ledger_sold.class.php:1404
 msgid "N° fiche fournisseur"
 msgstr ""
 
@@ -15854,6 +16818,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1846
 #: include/class/acc_ledger_purchase.class.php:1883
 #: include/class/acc_ledger_sold.class.php:1405
+#: include/class/acc_ledger_purchase.class.php:1883
+#: include/class/acc_ledger_sold.class.php:1405
 msgid "Nom fournisseur"
 msgstr ""
 
@@ -15885,6 +16851,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1847
 #: include/class/acc_ledger_purchase.class.php:1884
 #: include/class/acc_ledger_sold.class.php:1406
+#: include/class/acc_ledger_purchase.class.php:1884
+#: include/class/acc_ledger_sold.class.php:1406
 msgid "Code fournisseur"
 msgstr ""
 
@@ -15916,6 +16884,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1848
 #: include/class/acc_ledger_purchase.class.php:1885
 #: include/class/acc_ledger_sold.class.php:1407
+#: include/class/acc_ledger_purchase.class.php:1885
+#: include/class/acc_ledger_sold.class.php:1407
 msgid "Nom TVA"
 msgstr ""
 
@@ -15947,6 +16917,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1849
 #: include/class/acc_ledger_purchase.class.php:1886
 #: include/class/acc_ledger_sold.class.php:1408
+#: include/class/acc_ledger_purchase.class.php:1886
+#: include/class/acc_ledger_sold.class.php:1408
 msgid "Commentaire TVA"
 msgstr ""
 
@@ -15981,6 +16953,9 @@ msgstr ""
 #: include/class/acc_ledger_history_sale.class.php:261
 #: include/class/acc_ledger_purchase.class.php:1887
 #: include/class/acc_ledger_sold.class.php:1409
+#: include/class/acc_ledger_history_sale.class.php:261
+#: include/class/acc_ledger_purchase.class.php:1887
+#: include/class/acc_ledger_sold.class.php:1409
 msgid "TVA annulée"
 msgstr ""
 
@@ -16020,6 +16995,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1856
 #: include/class/acc_ledger_purchase.class.php:1893
 #: include/class/acc_ledger_sold.class.php:1415
+#: include/class/acc_ledger_purchase.class.php:1893
+#: include/class/acc_ledger_sold.class.php:1415
 msgid "PU"
 msgstr ""
 
@@ -16040,6 +17017,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1857
 #: include/class/acc_ledger_purchase.class.php:1894
 #: include/export/export_printtva_csv.php:77
+#: include/class/acc_ledger_purchase.class.php:1894
+#: include/export/export_printtva_csv.php:77
 msgid "Montant ND"
 msgstr ""
 
@@ -16058,6 +17037,7 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1852
 #: include/class/acc_ledger_purchase.class.php:1858
 #: include/class/acc_ledger_purchase.class.php:1895
+#: include/class/acc_ledger_purchase.class.php:1895
 msgid "Montant TVA ND"
 msgstr ""
 
@@ -16076,6 +17056,7 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1853
 #: include/class/acc_ledger_purchase.class.php:1859
 #: include/class/acc_ledger_purchase.class.php:1896
+#: include/class/acc_ledger_purchase.class.php:1896
 msgid "TVA récup."
 msgstr ""
 
@@ -16107,6 +17088,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1860
 #: include/class/acc_ledger_purchase.class.php:1897
 #: include/class/acc_ledger_sold.class.php:1416
+#: include/class/acc_ledger_purchase.class.php:1897
+#: include/class/acc_ledger_sold.class.php:1416
 msgid "HTVA Opération"
 msgstr ""
 
@@ -16138,6 +17121,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1861
 #: include/class/acc_ledger_purchase.class.php:1898
 #: include/class/acc_ledger_sold.class.php:1417
+#: include/class/acc_ledger_purchase.class.php:1898
+#: include/class/acc_ledger_sold.class.php:1417
 msgid "TVA Opération"
 msgstr ""
 
@@ -16154,6 +17139,10 @@ msgstr ""
 #: include/class/anc_grandlivre.class.php:170
 #: include/class/anc_grandlivre.class.php:174
 #: include/class/anc_grandlivre.class.php:182
+#: include/class/anc_grandlivre.class.php:175
+#: include/class/anc_grandlivre.class.php:183
+#: include/class/anc_grandlivre.class.php:175
+#: include/class/anc_grandlivre.class.php:183
 msgid "Export des pièces en PDF"
 msgstr ""
 
@@ -16199,14 +17188,14 @@ msgstr ""
 #: include/class_anc_key.php:335 include/class_anc_key.php:337
 #: include/class/class_anc_key.php:338 include/class/class_anc_key.php:339
 #: include/class/class_anc_key.php:340 include/class/anc_key.class.php:349
-#: include/class/anc_key.class.php:350
+#: include/class/anc_key.class.php:350 include/class/anc_key.class.php:350
 msgid "Nouvelle clef"
 msgstr ""
 
 #: include/class_anc_key.php:336 include/class_anc_key.php:338
 #: include/class/class_anc_key.php:339 include/class/class_anc_key.php:340
 #: include/class/class_anc_key.php:341 include/class/anc_key.class.php:350
-#: include/class/anc_key.class.php:351
+#: include/class/anc_key.class.php:351 include/class/anc_key.class.php:351
 msgid "Description de la nouvelle clef"
 msgstr ""
 
@@ -16370,6 +17359,7 @@ msgstr ""
 #: include/template/detail-action.php:390
 #: include/template/detail-action.php:392
 #: include/template/follow_up_detail_display.php:203
+#: include/template/follow_up_detail_display.php:203
 msgid "Transformer en facture"
 msgstr ""
 
@@ -16382,6 +17372,7 @@ msgstr ""
 #: include/template/ledger_detail_bottom.php:33
 #: include/template/ledger_detail_bottom.php:38
 #: include/template/ledger_detail_bottom.php:43
+#: include/template/ledger_detail_bottom.php:43
 msgid "Opérations liées"
 msgstr ""
 
@@ -16390,7 +17381,8 @@ msgstr ""
 #: include/ext/invoicing/include/acc_ledger_sold_generate.class.php:118
 #: include/export/export_poste_detail_pdf.php:182
 #: include/ext/invoicing/include/acc_ledger_sold_generate.class.php:119
-#: include/export/export_poste_detail_pdf.php:182
+#: include/export/export_poste_detail_pdf.php:183
+#: include/export/export_poste_detail_pdf.php:183
 msgid "D"
 msgstr ""
 
@@ -16483,28 +17475,32 @@ msgstr ""
 #: include/ajax_mod_periode.php:55 include/ajax/ajax_mod_periode.php:55
 #: include/ajax/ajax_periode.php:171 include/class/periode.class.php:702
 #: include/class/periode.class.php:704 include/class/periode.class.php:706
-#: include/class/periode.class.php:707 include/ajax/ajax_periode.php:171
+#: include/class/periode.class.php:707 include/class/periode.class.php:708
+#: include/class/periode.class.php:708 include/ajax/ajax_periode.php:171
 msgid " Début période : "
 msgstr ""
 
 #: include/ajax_mod_periode.php:56 include/ajax/ajax_mod_periode.php:56
 #: include/ajax/ajax_periode.php:172 include/class/periode.class.php:703
 #: include/class/periode.class.php:705 include/class/periode.class.php:707
-#: include/class/periode.class.php:708 include/ajax/ajax_periode.php:172
+#: include/class/periode.class.php:708 include/class/periode.class.php:709
+#: include/class/periode.class.php:709 include/ajax/ajax_periode.php:172
 msgid " Fin période : "
 msgstr ""
 
 #: include/ajax_mod_periode.php:57 include/ajax/ajax_mod_periode.php:57
 #: include/ajax/ajax_periode.php:173 include/class/periode.class.php:704
 #: include/class/periode.class.php:706 include/class/periode.class.php:708
-#: include/class/periode.class.php:709 include/ajax/ajax_periode.php:173
+#: include/class/periode.class.php:709 include/class/periode.class.php:710
+#: include/class/periode.class.php:710 include/ajax/ajax_periode.php:173
 msgid " Exercice : "
 msgstr ""
 
 #: include/ajax_mod_periode.php:59 include/ajax/ajax_mod_periode.php:59
 #: include/ajax/ajax_periode.php:175 include/class/periode.class.php:706
 #: include/class/periode.class.php:708 include/class/periode.class.php:710
-#: include/class/periode.class.php:711 include/ajax/ajax_periode.php:175
+#: include/class/periode.class.php:711 include/class/periode.class.php:712
+#: include/class/periode.class.php:712 include/ajax/ajax_periode.php:175
 msgid "sauver"
 msgstr ""
 
@@ -16517,6 +17513,7 @@ msgstr ""
 #: include/ajax/ajax_search_operation.php:122
 #: include/ajax/ajax_search_operation.php:124
 #: include/ajax/ajax_search_operation.php:129
+#: include/ajax/ajax_search_operation.php:129
 msgid "Liste limitée à "
 msgstr ""
 
@@ -16525,6 +17522,7 @@ msgstr ""
 #: include/ajax/ajax_search_operation.php:122
 #: include/ajax/ajax_search_operation.php:124
 #: include/ajax/ajax_search_operation.php:129
+#: include/ajax/ajax_search_operation.php:129
 msgid " enregistrements. Le nombre d'enregistrements trouvés est de "
 msgstr ""
 
@@ -16549,6 +17547,7 @@ msgstr ""
 #: include/class/class_acc_bilan.php:250 include/class/class_acc_bilan.php:266
 #: include/class/acc_bilan.class.php:266 include/class/acc_bilan.class.php:269
 #: include/class/acc_bilan.class.php:271 include/class/acc_bilan.class.php:272
+#: include/class/acc_bilan.class.php:272
 msgid "le formulaire id n'est pas donnee"
 msgstr ""
 
@@ -16556,7 +17555,7 @@ msgstr ""
 #: include/class/class_acc_bilan.php:637 include/class/class_acc_bilan.php:654
 #: include/class/acc_bilan.class.php:655 include/class/acc_bilan.class.php:658
 #: include/class/acc_bilan.class.php:663 include/class/acc_bilan.class.php:665
-#: include/class/acc_bilan.class.php:670
+#: include/class/acc_bilan.class.php:670 include/class/acc_bilan.class.php:670
 msgid "Ouverture fichier impossible"
 msgstr ""
 
@@ -16568,9 +17567,11 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:575
 #: include/class/anc_operation.class.php:294 include/fiche.inc.php:94
 #: include/class/acc_ledger_search.class.php:588
-#: include/class/anc_operation.class.php:295 include/fiche.inc.php:94
 #: include/class/anc_operation.class.php:295
 #: include/class/acc_ledger_search.class.php:674
+#: include/class/acc_ledger_search.class.php:697 include/fiche.inc.php:94
+#: include/class/anc_operation.class.php:295
+#: include/class/acc_ledger_search.class.php:697
 msgid "Chercher"
 msgstr ""
 
@@ -16587,7 +17588,7 @@ msgid ""
 msgstr ""
 
 #: include/impress_bilan.inc.php:82 include/impress_bilan.inc.php:89
-#: include/impress_bilan.inc.php:93
+#: include/impress_bilan.inc.php:93 include/impress_bilan.inc.php:93
 msgid "Etape 2 :Impression"
 msgstr ""
 
@@ -16636,6 +17637,7 @@ msgstr ""
 #: include/ajax/ajax_card.php:278 include/ajax/ajax_card.php:279
 #: include/ajax/ajax_card.php:285 include/ajax/ajax_card.php:287
 #: include/ajax/ajax_card.php:288 include/ajax/ajax_card.php:294
+#: include/ajax/ajax_card.php:294
 msgid "Choisissez une catégorie svp"
 msgstr ""
 
@@ -16644,6 +17646,7 @@ msgstr ""
 #: include/ajax/ajax_card.php:456 include/ajax/ajax_card.php:457
 #: include/ajax/ajax_card.php:490 include/ajax/ajax_card.php:494
 #: include/ajax/ajax_card.php:495 include/ajax/ajax_card.php:571
+#: include/ajax/ajax_card.php:570 include/ajax/ajax_card.php:570
 msgid " Banque"
 msgstr ""
 
@@ -16728,6 +17731,8 @@ msgstr ""
 #: include/class/acc_bilan.class.php:375 include/class/acc_bilan.class.php:396
 #: include/class/acc_bilan.class.php:300 include/class/acc_bilan.class.php:312
 #: include/class/acc_bilan.class.php:376 include/class/acc_bilan.class.php:397
+#: include/class/acc_bilan.class.php:300 include/class/acc_bilan.class.php:312
+#: include/class/acc_bilan.class.php:376 include/class/acc_bilan.class.php:397
 msgid "Echec ouverture fichier "
 msgstr ""
 
@@ -16751,6 +17756,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2188
 #: include/class/acc_ledger.class.php:2204
 #: include/class/acc_ledger.class.php:2223
+#: include/class/acc_ledger.class.php:2223
 msgid "Ajout journal"
 msgstr ""
 
@@ -16768,6 +17774,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2779
 #: include/class/acc_ledger.class.php:2818
 #: include/class/acc_ledger.class.php:2842
+#: include/class/acc_ledger.class.php:2842
 msgid "Dans le dépôt"
 msgstr ""
 
@@ -16788,7 +17795,7 @@ msgstr ""
 #: include/class_document.php:199 include/class_document.php:200
 #: include/class/class_document.php:200 include/class/class_document.php:201
 #: include/class/class_document.php:207 include/class/document.class.php:207
-#: include/class/document.class.php:212
+#: include/class/document.class.php:212 include/class/document.class.php:212
 msgid "Ne peut pas créer le répertoire "
 msgstr ""
 
@@ -16801,49 +17808,49 @@ msgstr ""
 #: include/class_extension.php:239 include/class_extension.php:254
 #: include/class/class_extension.php:254 include/class/class_extension.php:262
 #: include/class/extension.class.php:262 include/class/extension.class.php:290
-#: include/class/extension.class.php:296
+#: include/class/extension.class.php:296 include/class/extension.class.php:296
 msgid "Manque plugin"
 msgstr ""
 
 #: include/class_extension.php:244 include/class_extension.php:259
 #: include/class/class_extension.php:259 include/class/class_extension.php:267
 #: include/class/extension.class.php:267 include/class/extension.class.php:296
-#: include/class/extension.class.php:302
+#: include/class/extension.class.php:302 include/class/extension.class.php:302
 msgid "Manque nom"
 msgstr ""
 
 #: include/class_extension.php:245 include/class_extension.php:260
 #: include/class/class_extension.php:260 include/class/class_extension.php:268
 #: include/class/extension.class.php:268 include/class/extension.class.php:298
-#: include/class/extension.class.php:304
+#: include/class/extension.class.php:304 include/class/extension.class.php:304
 msgid "Manque description"
 msgstr ""
 
 #: include/class_extension.php:246 include/class_extension.php:261
 #: include/class/class_extension.php:261 include/class/class_extension.php:269
 #: include/class/extension.class.php:269 include/class/extension.class.php:300
-#: include/class/extension.class.php:306
+#: include/class/extension.class.php:306 include/class/extension.class.php:306
 msgid "Manque code"
 msgstr ""
 
 #: include/class_extension.php:247 include/class_extension.php:262
 #: include/class/class_extension.php:262 include/class/class_extension.php:270
 #: include/class/extension.class.php:270 include/class/extension.class.php:302
-#: include/class/extension.class.php:308
+#: include/class/extension.class.php:308 include/class/extension.class.php:308
 msgid "Manque auteur"
 msgstr ""
 
 #: include/class_extension.php:248 include/class_extension.php:263
 #: include/class/class_extension.php:263 include/class/class_extension.php:271
 #: include/class/extension.class.php:271 include/class/extension.class.php:304
-#: include/class/extension.class.php:310
+#: include/class/extension.class.php:310 include/class/extension.class.php:310
 msgid "Manque répertoire racine"
 msgstr ""
 
 #: include/class_extension.php:249 include/class_extension.php:264
 #: include/class/class_extension.php:264 include/class/class_extension.php:272
 #: include/class/extension.class.php:272 include/class/extension.class.php:306
-#: include/class/extension.class.php:312
+#: include/class/extension.class.php:312 include/class/extension.class.php:312
 msgid "Manque fichier à inclure"
 msgstr ""
 
@@ -16916,6 +17923,8 @@ msgstr ""
 #: include/class/follow_up.class.php:1694
 #: include/class/follow_up.class.php:1695
 #: include/class/follow_up.class.php:1643
+#: include/class/follow_up.class.php:1675
+#: include/class/follow_up.class.php:1675
 msgid "Type action invalide"
 msgstr ""
 
@@ -16927,6 +17936,7 @@ msgstr ""
 #: include/lib/html_input.class.php:1025 include/lib/html_input.class.php:1083
 #: include/lib/html_input.class.php:1084 include/lib/html_input.class.php:1099
 #: include/lib/html_input.class.php:1100 include/lib/html_input.class.php:1133
+#: include/lib/html_input.class.php:1134 include/lib/html_input.class.php:1134
 #, php-format
 msgid "Voulez-vous effacer cette relation "
 msgstr ""
@@ -16939,6 +17949,8 @@ msgstr ""
 #: include/lib/html_input.class.php:1037 include/lib/html_input.class.php:1095
 #: include/lib/html_input.class.php:1096 include/lib/html_input.class.php:1111
 #: include/lib/html_input.class.php:1112 include/lib/html_input.class.php:1145
+#: include/class/follow_up_other_concerned.class.php:135
+#: include/class/follow_up_other_concerned.class.php:135
 msgid "Ajout autres"
 msgstr ""
 
@@ -16947,6 +17959,8 @@ msgstr ""
 #: include/lib/data_sql.class.php:248 include/lib/database_core.class.php:168
 #: include/lib/database_core.class.php:170
 #: include/lib/noalyss_sql.class.php:379 include/lib/data_sql.class.php:278
+#: include/lib/database_core.class.php:170
+#: include/lib/noalyss_sql.class.php:379 include/lib/data_sql.class.php:278
 msgid "Erreur : exec_sql attend un array"
 msgstr ""
 
@@ -16987,34 +18001,38 @@ msgstr ""
 #: include/compta_ach.inc.php:82 include/compta_ach.inc.php:85
 #: include/compta_ven.inc.php:94 include/compta_ach.inc.php:87
 #: include/compta_ach.inc.php:89 include/compta_ven.inc.php:96
-#: include/compta_ven.inc.php:94 include/compta_ach.inc.php:86
+#: include/compta_ach.inc.php:86 include/compta_ven.inc.php:94
+#: include/compta_ach.inc.php:86
 msgid "Générer une facture ou charger un document"
 msgstr ""
 
 #: include/compta_ach.inc.php:83 include/compta_ach.inc.php:86
 #: include/compta_ven.inc.php:95 include/compta_ach.inc.php:88
 #: include/compta_ach.inc.php:90 include/compta_ven.inc.php:97
-#: include/compta_ven.inc.php:95 include/compta_ach.inc.php:87
+#: include/compta_ach.inc.php:87 include/compta_ven.inc.php:95
+#: include/compta_ach.inc.php:87
 msgid "Choix du dépôt"
 msgstr ""
 
 #: include/compta_ach.inc.php:84 include/compta_ach.inc.php:87
 #: include/compta_ven.inc.php:96 include/operation_ods_confirm.inc.php:51
 #: include/compta_ach.inc.php:89 include/compta_ach.inc.php:91
-#: include/compta_ven.inc.php:98 include/compta_ven.inc.php:96
-#: include/compta_ach.inc.php:88 include/operation_ods_confirm.inc.php:51
+#: include/compta_ven.inc.php:98 include/compta_ach.inc.php:88
+#: include/compta_ven.inc.php:96 include/compta_ach.inc.php:88
+#: include/operation_ods_confirm.inc.php:51
 msgid "Modèle à sauver"
 msgstr ""
 
 #: include/fiche.inc.php:278 include/fiche.inc.php:279
-#: include/fiche.inc.php:293
+#: include/fiche.inc.php:293 include/fiche.inc.php:293
 msgid "Date invalide !"
 msgstr ""
 
 #: include/fiche.inc.php:290 include/fiche.inc.php:363
 #: include/fiche.inc.php:366 include/fiche.inc.php:367
 #: include/fiche.inc.php:368 include/fiche.inc.php:375
-#: include/fiche.inc.php:385
+#: include/fiche.inc.php:385 include/export/export_fiche_pdf.php:63
+#: include/fiche.inc.php:385 include/export/export_fiche_pdf.php:63
 msgid "Cette catégorie n'ayant pas de poste comptable n'a pas de balance"
 msgstr ""
 
@@ -17104,33 +18122,33 @@ msgid "Vérification des journaux"
 msgstr ""
 
 #: include/verif_bilan.inc.php:78 include/verif_bilan.inc.php:105
-#: include/verif_bilan.inc.php:103
+#: include/verif_bilan.inc.php:103 include/verif_bilan.inc.php:103
 msgid "Grand livre"
 msgstr ""
 
 #: include/verif_bilan.inc.php:84 include/verif_bilan.inc.php:111
-#: include/verif_bilan.inc.php:109
+#: include/verif_bilan.inc.php:109 include/verif_bilan.inc.php:109
 msgid "Vérification des comptes"
 msgstr ""
 
 #: include/verif_bilan.inc.php:96 include/verif_bilan.inc.php:123
-#: include/verif_bilan.inc.php:121
+#: include/verif_bilan.inc.php:121 include/verif_bilan.inc.php:121
 msgid "Vérification des fiches"
 msgstr ""
 
 #: include/verif_bilan.inc.php:99 include/verif_bilan.inc.php:126
-#: include/verif_bilan.inc.php:124
+#: include/verif_bilan.inc.php:124 include/verif_bilan.inc.php:124
 msgid "Fiches ayant changé de poste comptable"
 msgstr ""
 
 #: include/verif_bilan.inc.php:117 include/verif_bilan.inc.php:153
-#: include/verif_bilan.inc.php:151
+#: include/verif_bilan.inc.php:151 include/verif_bilan.inc.php:151
 msgid "Attention "
 msgstr ""
 
 #: include/verif_bilan.inc.php:127 include/verif_bilan.inc.php:165
 #: include/verif_bilan.inc.php:168 include/verif_bilan.inc.php:169
-#: include/verif_bilan.inc.php:167
+#: include/verif_bilan.inc.php:167 include/verif_bilan.inc.php:167
 msgid "Hist."
 msgstr ""
 
@@ -17163,25 +18181,28 @@ msgstr ""
 
 #: include/template/detail-action.php:64 include/template/detail-action.php:67
 #: include/template/detail-action.php:72 include/template/detail-action.php:71
-#: include/template/detail-action.php:72
+#: include/template/detail-action.php:73 include/template/detail-action.php:73
 msgid "Autres concernés"
 msgstr ""
 
 #: include/template/ledger_detail_bottom.php:31
 #: include/template/ledger_detail_bottom.php:36
 #: include/template/ledger_detail_bottom.php:41
+#: include/template/ledger_detail_bottom.php:41
 msgid "Ecriture Comptable"
 msgstr ""
 
 #: include/template/ledger_detail_bottom.php:35
 #: include/template/ledger_detail_bottom.php:40
 #: include/template/ledger_detail_bottom.php:45
+#: include/template/ledger_detail_bottom.php:45
 msgid "Actions Gestion"
 msgstr ""
 
 #: include/template/ledger_detail_bottom.php:36
 #: include/template/ledger_detail_bottom.php:41
 #: include/template/ledger_detail_bottom.php:46
+#: include/template/ledger_detail_bottom.php:46
 msgid "Comptabilité Analytique"
 msgstr ""
 
@@ -17194,6 +18215,8 @@ msgstr ""
 #: include/template/ledger_detail_bottom.php:292
 #: include/template/ledger_detail_bottom.php:289
 #: include/template/ledger_detail_bottom.php:307
+#: include/template/ledger_detail_bottom.php:308
+#: include/template/ledger_detail_bottom.php:308
 msgid "Non utilisée"
 msgstr ""
 
@@ -17217,6 +18240,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2337
 #: include/class/acc_ledger.class.php:2359
 #: include/class/acc_ledger.class.php:2385
+#: include/class/acc_ledger.class.php:2385
 msgid "Choix du type de journal est obligatoire"
 msgstr ""
 
@@ -17243,6 +18267,8 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1851
 #: include/class/acc_ledger_purchase.class.php:1888
 #: include/class/acc_ledger_sold.class.php:1410
+#: include/class/acc_ledger_purchase.class.php:1888
+#: include/class/acc_ledger_sold.class.php:1410
 msgid "TVA Non Payé"
 msgstr ""
 
@@ -17259,6 +18285,7 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1856
 #: include/class/acc_ledger_purchase.class.php:1862
 #: include/class/acc_ledger_purchase.class.php:1899
+#: include/class/acc_ledger_purchase.class.php:1899
 msgid "TVA NP opération"
 msgstr ""
 
@@ -17268,6 +18295,7 @@ msgstr ""
 #: include/class/pdf_operation.class.php:76
 #: include/class/print_ledger_detail_item.class.php:58
 #: include/class/print_ledger_detail_item.class.php:57
+#: include/class/print_ledger_detail_item.class.php:57
 #: include/class/pdf_operation.class.php:76
 msgid "Numéro interne"
 msgstr ""
@@ -17276,6 +18304,7 @@ msgstr ""
 #: include/class/class_print_ledger_detail_item.php:61
 #: include/class/print_ledger_detail_item.class.php:61
 #: include/class/print_ledger_detail_item.class.php:60
+#: include/class/print_ledger_detail_item.class.php:60
 msgid "Tot HTVA"
 msgstr ""
 
@@ -17283,6 +18312,7 @@ msgstr ""
 #: include/class/class_print_ledger_detail_item.php:62
 #: include/class/print_ledger_detail_item.class.php:62
 #: include/class/print_ledger_detail_item.class.php:61
+#: include/class/print_ledger_detail_item.class.php:61
 msgid "Tot TVA NP"
 msgstr ""
 
@@ -17290,6 +18320,7 @@ msgstr ""
 #: include/class/class_print_ledger_detail_item.php:64
 #: include/class/print_ledger_detail_item.class.php:64
 #: include/class/print_ledger_detail_item.class.php:63
+#: include/class/print_ledger_detail_item.class.php:63
 msgid "Tot TVA"
 msgstr ""
 
@@ -17338,14 +18369,15 @@ msgstr ""
 #: include/export/export_fiche_detail_csv.php:182
 #: include/export/export_fiche_detail_pdf.php:122
 #: include/export/export_poste_detail_pdf.php:138
-#: include/export/export_poste_detail_pdf.php:138
+#: include/export/export_poste_detail_pdf.php:139
+#: include/export/export_poste_detail_pdf.php:139
 #: include/export/export_fiche_detail_pdf.php:122
 #: include/export/export_fiche_detail_csv.php:182
 msgid "totaux"
 msgstr ""
 
 #: include/impress_bilan.inc.php:87 include/impress_bilan.inc.php:94
-#: include/impress_bilan.inc.php:98
+#: include/impress_bilan.inc.php:98 include/impress_bilan.inc.php:98
 msgid "Pour une vérification complète, allez dans "
 msgstr ""
 
@@ -17377,6 +18409,8 @@ msgstr ""
 #: include/class/print_ledger_detail_item.class.php:162
 #: include/class/acc_ledger_history_purchase.class.php:275
 #: include/class/print_ledger_simple.class.php:113
+#: include/class/acc_ledger_history_purchase.class.php:275
+#: include/class/print_ledger_simple.class.php:113
 #: include/class/print_ledger_detail_item.class.php:162
 #: include/template/operation_detail_ach.php:53
 #: include/template/operation_detail_ven.php:45
@@ -17461,14 +18495,14 @@ msgstr ""
 #: include/database.item.php:2 include/database.item.php:142
 #: include/database.item.php:138 include/database.item.php:137
 #: include/database.item.php:130 include/database.item.php:128
-#: include/database.item.php:129
+#: include/database.item.php:129 include/database.item.php:129
 msgid "Export pièce PDF"
 msgstr ""
 
 #: include/database.item.php:4 include/database.item.php:144
 #: include/database.item.php:140 include/database.item.php:139
 #: include/database.item.php:132 include/database.item.php:130
-#: include/database.item.php:131
+#: include/database.item.php:131 include/database.item.php:131
 msgid "Configuration extension"
 msgstr ""
 
@@ -17485,6 +18519,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2798
 #: include/class/acc_ledger.class.php:2837
 #: include/class/acc_ledger.class.php:2861
+#: include/class/acc_ledger.class.php:2861
 msgid "Nouvelle opération"
 msgstr ""
 
@@ -17517,6 +18552,7 @@ msgstr ""
 #: include/ext/amortis/include/class_amortissement_material_pdf.php:33
 #: include/ext/amortis/include/amortissement_material_pdf.class.php:33
 #: include/template/card_multiple_result.php:17
+#: include/template/card_multiple_result.php:17
 msgid "QCode"
 msgstr ""
 
@@ -17689,6 +18725,7 @@ msgstr ""
 #: include/ajax/ajax_card.php:274 include/ajax/ajax_card.php:275
 #: include/ajax/ajax_card.php:283 include/ajax/ajax_card.php:285
 #: include/ajax/ajax_card.php:286 include/ajax/ajax_card.php:292
+#: include/ajax/ajax_card.php:292
 msgid ""
 "Choisissez la catégorie de fiche à laquelle vous aimeriez ajouter une fiche"
 msgstr ""
@@ -17710,8 +18747,8 @@ msgstr ""
 #: include/balance.inc.php:47 include/impress_bilan.inc.php:51
 #: include/impress_jrn.inc.php:86 include/ext/bilan_interne/index.php:56
 #: include/balance.inc.php:51 include/impress_jrn.inc.php:104
-#: include/impress_bilan.inc.php:54 include/balance.inc.php:51
-#: include/impress_jrn.inc.php:104
+#: include/impress_bilan.inc.php:54 include/impress_bilan.inc.php:54
+#: include/balance.inc.php:51 include/impress_jrn.inc.php:104
 msgid "Choisissez un autre exercice"
 msgstr ""
 
@@ -17745,7 +18782,8 @@ msgstr ""
 #: html/ajax_ledger.php:186 html/ajax_ledger.php:187
 #: include/ajax/ajax_ledger.php:164 include/ajax/ajax_ledger.php:167
 #: include/ajax/ajax_ledger.php:168 include/ajax/ajax_ledger.php:172
-#: include/ajax/ajax_ledger.php:173 include/ajax/ajax_ledger.php:173
+#: include/ajax/ajax_ledger.php:173 include/ajax/ajax_ledger.php:174
+#: include/ajax/ajax_ledger.php:174
 msgid "Effacement refusé"
 msgstr ""
 
@@ -17806,27 +18844,32 @@ msgid "Erreur : paramètre invalide"
 msgstr ""
 
 #: html/test_class.php:213 dev/test/test_class.php:209
-#: dev-2/test/test_class.php:209 dev/test/test_class.php:209
+#: dev-2/test/test_class.php:209 dev-2/test/test_class.php:209
+#: dev/test/test_class.php:209
 msgid "Bienvenu sur mon site"
 msgstr ""
 
 #: html/test_class.php:214 dev/test/test_class.php:210
-#: dev-2/test/test_class.php:210 dev/test/test_class.php:210
+#: dev-2/test/test_class.php:210 dev-2/test/test_class.php:210
+#: dev/test/test_class.php:210
 msgid "Essayer de vous y amuser"
 msgstr ""
 
 #: html/test_class.php:218 dev/test/test_class.php:214
-#: dev-2/test/test_class.php:214 dev/test/test_class.php:214
+#: dev-2/test/test_class.php:214 dev-2/test/test_class.php:214
+#: dev/test/test_class.php:214
 msgid "Choississez votre langue"
 msgstr ""
 
 #: html/test_class.php:231 dev/test/test_class.php:227
-#: dev-2/test/test_class.php:227 dev/test/test_class.php:227
+#: dev-2/test/test_class.php:227 dev-2/test/test_class.php:227
+#: dev/test/test_class.php:227
 msgid "Change de langue"
 msgstr ""
 
 #: html/test_class.php:239 dev/test/test_class.php:235
-#: dev-2/test/test_class.php:235 dev/test/test_class.php:235
+#: dev-2/test/test_class.php:235 dev-2/test/test_class.php:235
+#: dev/test/test_class.php:235
 msgid "Fin de programme"
 msgstr ""
 
@@ -17837,6 +18880,7 @@ msgstr ""
 #: include/lib/ac_common.php:971 include/lib/ac_common.php:972
 #: include/lib/ac_common.php:984 include/lib/ac_common.php:986
 #: include/lib/ac_common.php:1002 include/lib/ac_common.php:1012
+#: include/lib/ac_common.php:1012
 msgid ""
 "Utilisateur n'a pas de profil, votre administrateur doit en configurer un "
 "dans CFGSEC"
@@ -17868,7 +18912,8 @@ msgstr ""
 #: include/ajax_admin.php:57 include/user_detail.inc.php:226
 #: include/ajax/ajax_admin.php:57 include/user_detail.inc.php:235
 #: include/ajax/ajax_admin.php:54 include/ajax/ajax_admin.php:62
-#: include/user_detail.inc.php:235 include/ajax/ajax_admin.php:62
+#: include/user_detail.inc.php:273 include/user_detail.inc.php:273
+#: include/ajax/ajax_admin.php:62
 msgid "Enleve"
 msgstr ""
 
@@ -18007,9 +19052,12 @@ msgstr ""
 #: include/operation_ods_confirm.inc.php:53 include/compta_ach.inc.php:90
 #: include/compta_ach.inc.php:92 include/compta_ven.inc.php:99
 #: include/ajax/ajax_ledger.php:564 include/class/acc_operation.class.php:729
-#: include/ajax/ajax_ledger.php:565 include/compta_ven.inc.php:97
-#: include/class/acc_operation.class.php:729 include/ajax/ajax_ledger.php:565
-#: include/compta_ach.inc.php:89 include/template/ledger_detail_bottom.php:349
+#: include/ajax/ajax_ledger.php:565 include/compta_ach.inc.php:89
+#: include/template/ledger_detail_bottom.php:349
+#: include/ajax/ajax_ledger.php:566
+#: include/template/ledger_detail_bottom.php:366 include/compta_ven.inc.php:97
+#: include/class/acc_operation.class.php:729 include/ajax/ajax_ledger.php:566
+#: include/compta_ach.inc.php:89 include/template/ledger_detail_bottom.php:366
 #: include/operation_ods_confirm.inc.php:53
 msgid "Extourne"
 msgstr ""
@@ -18018,8 +19066,9 @@ msgstr ""
 #: include/operation_ods_confirm.inc.php:61
 #: include/operation_ods_confirm.inc.php:62 include/compta_ach.inc.php:104
 #: include/compta_ach.inc.php:106 include/compta_ven.inc.php:113
-#: include/compta_ven.inc.php:111 include/compta_ven.inc.php:111
-#: include/compta_ach.inc.php:103 include/operation_ods_confirm.inc.php:62
+#: include/compta_ven.inc.php:111 include/compta_ach.inc.php:103
+#: include/compta_ven.inc.php:111 include/compta_ach.inc.php:103
+#: include/operation_ods_confirm.inc.php:62
 msgid "Extourne opération"
 msgstr ""
 
@@ -18038,8 +19087,9 @@ msgstr ""
 #: include/compta_ven.inc.php:209 include/compta_ach.inc.php:197
 #: include/compta_ods.inc.php:121 include/compta_ven.inc.php:214
 #: include/compta_ods.inc.php:123 include/compta_ven.inc.php:212
-#: include/compta_ach.inc.php:195 include/compta_ven.inc.php:212
-#: include/compta_ods.inc.php:123 include/compta_ach.inc.php:194
+#: include/compta_ach.inc.php:195 include/compta_ach.inc.php:194
+#: include/compta_ven.inc.php:212 include/compta_ods.inc.php:123
+#: include/compta_ach.inc.php:194
 msgid "Opération non extournée"
 msgstr ""
 
@@ -18049,15 +19099,16 @@ msgstr ""
 #: include/compta_ven.inc.php:217 include/compta_ach.inc.php:205
 #: include/compta_ods.inc.php:130 include/compta_ven.inc.php:222
 #: include/compta_ods.inc.php:132 include/compta_ven.inc.php:220
-#: include/compta_ach.inc.php:203 include/compta_ven.inc.php:220
-#: include/compta_ods.inc.php:132 include/compta_ach.inc.php:202
+#: include/compta_ach.inc.php:203 include/compta_ach.inc.php:202
+#: include/compta_ven.inc.php:220 include/compta_ods.inc.php:132
+#: include/compta_ach.inc.php:202
 msgid "Date invalide, opération non extournée"
 msgstr ""
 
 #: include/dossier.inc.php:242 include/dossier.inc.php:264
 #: include/dossier.inc.php:298 include/dossier.inc.php:299
 #: include/dossier.inc.php:302 include/dossier.inc.php:307
-#: include/dossier.inc.php:307
+#: include/dossier.inc.php:310 include/dossier.inc.php:310
 msgid "Ajout d'un dossier"
 msgstr ""
 
@@ -18078,8 +19129,8 @@ msgstr ""
 #: include/dossier.inc.php:239 include/modele.inc.php:280
 #: include/dossier.inc.php:242 include/dossier.inc.php:247
 #: include/modele.inc.php:281 include/modele.inc.php:286
-#: include/modele.inc.php:287 include/modele.inc.php:287
-#: include/dossier.inc.php:247
+#: include/modele.inc.php:287 include/dossier.inc.php:250
+#: include/modele.inc.php:287 include/dossier.inc.php:250
 msgid "Nom base de données"
 msgstr ""
 
@@ -18105,28 +19156,30 @@ msgstr ""
 #: include/user_detail.inc.php:152 include/user.inc.php:129
 #: include/class/acc_plan_mtable.class.php:49
 #: include/template/tag_detail.php:15
-#: include/class/acc_plan_mtable.class.php:55 include/user_detail.inc.php:152
-#: include/class/acc_plan_mtable.class.php:55
+#: include/class/acc_plan_mtable.class.php:55 include/template/tag_list.php:20
+#: include/user_detail.inc.php:163 include/user.inc.php:131
+#: include/user_detail.inc.php:163 include/class/acc_plan_mtable.class.php:55
 #: include/template/tag_detail.php:15 include/template/tag_list.php:20
-#: include/user.inc.php:129
+#: include/user.inc.php:131
 msgid "Actif"
 msgstr ""
 
 #: include/user_detail.inc.php:169 include/user_detail.inc.php:165
 #: include/user_detail.inc.php:174 include/param_sec.inc.php:147
 #: include/export/export_security_pdf.php:66 include/param_sec.inc.php:153
-#: include/user_detail.inc.php:174 include/export/export_security_pdf.php:66
+#: include/param_sec.inc.php:158 include/user_detail.inc.php:185
+#: include/user_detail.inc.php:185 include/export/export_security_pdf.php:66
 #: include/param_sec.inc.php:158
 msgid "Utilisateur normal"
 msgstr ""
 
 #: include/user.inc.php:73 include/user.inc.php:74 include/user.inc.php:76
-#: include/user.inc.php:76
+#: include/user.inc.php:78 include/user.inc.php:78
 msgid "Ajout Utilisateur"
 msgstr ""
 
 #: include/user.inc.php:77 include/user.inc.php:78 include/user.inc.php:80
-#: include/user.inc.php:80
+#: include/user.inc.php:82 include/user.inc.php:82
 msgid "login"
 msgstr ""
 
@@ -18135,17 +19188,19 @@ msgstr ""
 #: html/install.php:593 html/install.php:208 html/install.php:555
 #: include/user.inc.php:83 html/install.php:215 html/install.php:545
 #: html/install.php:551 html/install.php:218 html/install.php:554
-#: html/install.php:265 html/install.php:604 include/user.inc.php:83
+#: html/install.php:265 html/install.php:604 html/install.php:270
+#: html/install.php:610 include/user.inc.php:85 html/install.php:270
+#: html/install.php:610 include/user.inc.php:85
 msgid "Mot de passe"
 msgstr ""
 
 #: include/user.inc.php:93 include/user.inc.php:94 include/user.inc.php:96
-#: include/user.inc.php:96
+#: include/user.inc.php:98 include/user.inc.php:98
 msgid "Le login ne peut être vide"
 msgstr ""
 
 #: include/user.inc.php:98 include/user.inc.php:99 include/user.inc.php:101
-#: include/user.inc.php:101
+#: include/user.inc.php:103 include/user.inc.php:103
 msgid "Le mot de passe ne peut être vide"
 msgstr ""
 
@@ -18192,6 +19247,8 @@ msgstr ""
 #: include/template/ledger_detail_bottom.php:351
 #: include/template/ledger_detail_bottom.php:348
 #: include/template/ledger_detail_bottom.php:376
+#: include/template/ledger_detail_bottom.php:393
+#: include/template/ledger_detail_bottom.php:393
 msgid ""
 "Extourner une opération vous permet de l'annuler par son écriture inverse"
 msgstr ""
@@ -18210,8 +19267,9 @@ msgstr ""
 
 #: include/template/todo_list_list_user.php:37 include/user.inc.php:122
 #: include/user.inc.php:123 include/param_sec.inc.php:57
-#: include/user.inc.php:125 include/template/todo_list_list_user.php:37
-#: include/user.inc.php:125 include/param_sec.inc.php:57
+#: include/user.inc.php:125 include/user.inc.php:127
+#: include/template/todo_list_list_user.php:37 include/user.inc.php:127
+#: include/param_sec.inc.php:57
 msgid "Login"
 msgstr ""
 
@@ -18312,7 +19370,8 @@ msgstr ""
 #: include/ext/sav/include/sav_repair_card_sql.class.php:67
 #: include/ext/sav/include/sav_repair_card_sql.class.php:72
 #: include/class/periode_ledger_table.class.php:145
-#: include/class/periode_ledger_table.class.php:145
+#: include/class/periode_ledger_table.class.php:146
+#: include/class/periode_ledger_table.class.php:146
 msgid "Fermé"
 msgstr ""
 
@@ -18378,6 +19437,7 @@ msgstr ""
 #: include/ajax/ajax_display_letter.php:103 include/class/periode.class.php:517
 #: include/class/periode_ledger_table.class.php:98
 #: include/class/periode.class.php:519 include/class/periode.class.php:521
+#: include/class/periode.class.php:522 include/ajax/ajax_display_letter.php:119
 #: include/class/periode.class.php:522
 #: include/class/periode_ledger_table.class.php:98
 #: include/ajax/ajax_display_letter.php:119
@@ -18427,6 +19487,7 @@ msgstr ""
 #: include/class/fiche.class.php:1378 include/class/fiche.class.php:1379
 #: include/class/fiche.class.php:1381 include/class/fiche.class.php:1395
 #: include/class/fiche.class.php:1396 include/class/fiche.class.php:1423
+#: include/class/fiche.class.php:1423
 msgid "n° de pièce / Code interne"
 msgstr ""
 
@@ -18436,6 +19497,7 @@ msgstr ""
 #: include/class/fiche.class.php:1382 include/class/fiche.class.php:1383
 #: include/class/fiche.class.php:1385 include/class/fiche.class.php:1399
 #: include/class/fiche.class.php:1400 include/class/fiche.class.php:1427
+#: include/class/fiche.class.php:1427
 msgid "Débit/Crédit"
 msgstr ""
 
@@ -18452,6 +19514,8 @@ msgstr ""
 #: include/class/fiche.class.php:1422 include/class/fiche.class.php:1553
 #: include/fiche.inc.php:612 include/class/fiche.class.php:1449
 #: include/class/fiche.class.php:1579
+#: include/class/acc_account_ledger.class.php:467 include/fiche.inc.php:612
+#: include/class/fiche.class.php:1449 include/class/fiche.class.php:1579
 #: include/class/acc_account_ledger.class.php:467
 msgid "solde débiteur"
 msgstr ""
@@ -18468,6 +19532,8 @@ msgstr ""
 #: include/class/fiche.class.php:1422 include/class/fiche.class.php:1553
 #: include/class/fiche.class.php:1449 include/class/fiche.class.php:1579
 #: include/class/acc_account_ledger.class.php:467
+#: include/class/fiche.class.php:1449 include/class/fiche.class.php:1579
+#: include/class/acc_account_ledger.class.php:467
 msgid "solde créditeur"
 msgstr ""
 
@@ -18476,19 +19542,19 @@ msgid "Aller"
 msgstr ""
 
 #: include/user.inc.php:84 include/user.inc.php:85 include/user.inc.php:87
-#: include/user.inc.php:87
+#: include/user.inc.php:89 include/user.inc.php:89
 msgid "Créer Utilisateur"
 msgstr ""
 
 #: include/user.inc.php:109 include/user.inc.php:110 include/user.inc.php:112
-#: include/user.inc.php:112
+#: include/user.inc.php:114 include/user.inc.php:114
 msgid "Ajout utilisateur"
 msgstr ""
 
 #: include/user.inc.php:124 include/restore.inc.php:219
 #: include/user.inc.php:125 include/restore.inc.php:220
 #: include/restore.inc.php:221 include/restore.inc.php:222
-#: include/user.inc.php:127 include/user.inc.php:127
+#: include/user.inc.php:127 include/user.inc.php:129 include/user.inc.php:129
 #: include/restore.inc.php:222
 msgid "Dossier"
 msgstr ""
@@ -18505,14 +19571,14 @@ msgstr ""
 #: include/dossier.inc.php:159 include/dossier.inc.php:179
 #: include/dossier.inc.php:213 include/dossier.inc.php:214
 #: include/dossier.inc.php:217 include/dossier.inc.php:222
-#: include/dossier.inc.php:222
+#: include/dossier.inc.php:225 include/dossier.inc.php:225
 msgid "Ajouter un dossier"
 msgstr ""
 
 #: include/dossier.inc.php:331 include/dossier.inc.php:367
 #: include/dossier.inc.php:403 include/dossier.inc.php:404
 #: include/dossier.inc.php:420 include/dossier.inc.php:425
-#: include/dossier.inc.php:425
+#: include/dossier.inc.php:429 include/dossier.inc.php:429
 #, php-format
 msgid "Le dossier %s est effacé"
 msgstr ""
@@ -18520,7 +19586,7 @@ msgstr ""
 #: include/dossier.inc.php:150 include/dossier.inc.php:170
 #: include/dossier.inc.php:204 include/dossier.inc.php:205
 #: include/dossier.inc.php:208 include/dossier.inc.php:213
-#: include/dossier.inc.php:213
+#: include/dossier.inc.php:216 include/dossier.inc.php:216
 msgid "Dossier Management"
 msgstr ""
 
@@ -18670,11 +19736,13 @@ msgstr ""
 #: include/ajax/ajax_card.php:460 include/ajax/ajax_card.php:461
 #: include/ajax/ajax_card.php:494 include/ajax/ajax_card.php:498
 #: include/ajax/ajax_card.php:499 include/ajax/ajax_card.php:575
+#: include/ajax/ajax_card.php:574 include/ajax/ajax_card.php:574
 msgid " Employé ou administrateur"
 msgstr ""
 
 #: include/param_sec.inc.php:91 include/param_sec.inc.php:95
 #: include/param_sec.inc.php:97 include/param_sec.inc.php:98
+#: include/param_sec.inc.php:98
 msgid "Utilisateur Normal"
 msgstr ""
 
@@ -18719,7 +19787,8 @@ msgstr ""
 #: html/ajax_misc.php:290 html/ajax_misc.php:382 html/ajax_misc.php:384
 #: html/ajax_misc.php:390 include/lib/message_javascript.php:90
 #: include/lib/message_javascript.php:92 html/ajax_misc.php:392
-#: html/ajax_misc.php:396 include/lib/message_javascript.php:92
+#: html/ajax_misc.php:396 include/lib/message_javascript.php:93
+#: include/lib/message_javascript.php:93
 msgid "Action non autorisée"
 msgstr ""
 
@@ -18727,24 +19796,26 @@ msgstr ""
 #: html/ajax_misc.php:307 html/ajax_misc.php:399 html/ajax_misc.php:401
 #: html/ajax_misc.php:407 html/ajax_misc.php:409 html/ajax_misc.php:413
 #: include/class/action_document_type_mtable.class.php:149
+#: include/class/action_document_type_mtable.class.php:149
 msgid "Des actions dépendent de cette catégorie"
 msgstr ""
 
 #: html/do.php:196 html/do.php:224 html/do.php:237 html/do.php:239
 #: html/do.php:236 html/do.php:273 html/do.php:285 html/do.php:295
-#: html/do.php:264 html/do.php:266
+#: html/do.php:264 html/do.php:266 html/do.php:266
 msgid "Erreur menu"
 msgstr ""
 
 #: html/do.php:210 html/do.php:211 html/do.php:239 html/do.php:252
 #: html/do.php:254 html/do.php:251 html/do.php:288 html/do.php:300
-#: html/do.php:310 html/do.php:279 html/do.php:281
+#: html/do.php:310 html/do.php:279 html/do.php:281 html/do.php:281
 msgid "Accès menu impossible"
 msgstr ""
 
 #: html/do.php:219 html/do.php:224 html/do.php:252 html/do.php:265
 #: html/do.php:268 html/do.php:270 html/do.php:307 html/do.php:319
 #: html/do.php:329 html/do.php:331 html/do.php:300 html/do.php:302
+#: html/do.php:302
 msgid "Aucun profil utilisateur"
 msgstr ""
 
@@ -18754,6 +19825,7 @@ msgstr ""
 #: include/lib/ac_common.php:824 include/lib/ac_common.php:825
 #: include/lib/ac_common.php:837 include/lib/ac_common.php:839
 #: include/lib/ac_common.php:855 include/lib/ac_common.php:865
+#: include/lib/ac_common.php:865
 msgid ""
 "Veuillez vous reconnecter soit dans une autre fenêtre soit  en cliquant sur "
 "le lien"
@@ -18765,6 +19837,7 @@ msgstr ""
 #: include/lib/ac_common.php:828 include/lib/ac_common.php:829
 #: include/lib/ac_common.php:841 include/lib/ac_common.php:843
 #: include/lib/ac_common.php:859 include/lib/ac_common.php:869
+#: include/lib/ac_common.php:869
 msgid "Se reconnecter pour revenir ici"
 msgstr ""
 
@@ -18774,6 +19847,7 @@ msgstr ""
 #: include/lib/ac_common.php:834 include/lib/ac_common.php:835
 #: include/lib/ac_common.php:847 include/lib/ac_common.php:849
 #: include/lib/ac_common.php:865 include/lib/ac_common.php:875
+#: include/lib/ac_common.php:875
 msgid "Cliquez ici pour vous reconnecter dans une autre page"
 msgstr ""
 
@@ -18786,6 +19860,7 @@ msgstr ""
 #: include/action.common.inc.php:208 include/action.common.inc.php:213
 #: include/action.common.inc.php:215 include/action.common.inc.php:216
 #: include/action.common.inc.php:222 include/action.common.inc.php:243
+#: include/action.common.inc.php:243
 msgid "Efface cet événement "
 msgstr ""
 
@@ -18808,8 +19883,10 @@ msgstr ""
 #: include/lib/http_input.class.php:65 include/lib/http_input.class.php:73
 #: include/ajax/ajax_gestion.php:81 include/lib/http_input.class.php:62
 #: include/lib/http_input.class.php:72 include/lib/http_input.class.php:80
-#: include/ajax/ajax_gestion.php:81 include/lib/http_input.class.php:92
-#: include/lib/http_input.class.php:106 include/lib/http_input.class.php:118
+#: include/lib/http_input.class.php:92 include/lib/http_input.class.php:106
+#: include/lib/http_input.class.php:118 include/ajax/ajax_gestion.php:81
+#: include/lib/http_input.class.php:92 include/lib/http_input.class.php:106
+#: include/lib/http_input.class.php:118
 msgid "Type invalide"
 msgstr ""
 
@@ -18840,6 +19917,7 @@ msgstr ""
 
 #: include/ajax_get_profile.php:123 include/ajax/ajax_get_profile.php:123
 #: include/ajax/ajax_get_profile.php:129 include/ajax/ajax_get_profile.php:128
+#: include/ajax/ajax_get_profile.php:128
 msgid "Dépôt de stock accessible"
 msgstr ""
 
@@ -18847,7 +19925,8 @@ msgstr ""
 #: include/ajax/ajax_mod_periode.php:60 include/ajax/ajax_mod_periode.php:78
 #: include/ajax/ajax_periode.php:176 include/class/periode.class.php:707
 #: include/class/periode.class.php:709 include/class/periode.class.php:711
-#: include/class/periode.class.php:712 include/ajax/ajax_periode.php:176
+#: include/class/periode.class.php:712 include/class/periode.class.php:713
+#: include/class/periode.class.php:713 include/ajax/ajax_periode.php:176
 msgid "fermer"
 msgstr ""
 
@@ -18860,6 +19939,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2119
 #: include/class/acc_ledger.class.php:2135
 #: include/class/acc_ledger.class.php:2154
+#: include/class/acc_ledger.class.php:2154
 msgid "Journaux d'achat"
 msgstr ""
 
@@ -18872,6 +19952,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2120
 #: include/class/acc_ledger.class.php:2136
 #: include/class/acc_ledger.class.php:2155
+#: include/class/acc_ledger.class.php:2155
 msgid "Journaux Financier"
 msgstr ""
 
@@ -18884,6 +19965,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2121
 #: include/class/acc_ledger.class.php:2137
 #: include/class/acc_ledger.class.php:2156
+#: include/class/acc_ledger.class.php:2156
 msgid "Journaux d'Opérations diverses"
 msgstr ""
 
@@ -18898,6 +19980,8 @@ msgstr ""
 #: include/class/class_follow_up.php:129 include/class/follow_up.class.php:128
 #: include/class/follow_up.class.php:129 include/class/follow_up.class.php:130
 #: include/class/follow_up.class.php:135 include/class/follow_up.class.php:136
+#: include/class/follow_up.class.php:137 include/class/follow_up.class.php:138
+#: include/class/follow_up.class.php:137 include/class/follow_up.class.php:138
 msgid "Securité"
 msgstr ""
 
@@ -18910,6 +19994,8 @@ msgstr ""
 #: include/class/follow_up.class.php:1780
 #: include/class/follow_up.class.php:1781
 #: include/class/follow_up.class.php:1731
+#: include/class/follow_up.class.php:1705
+#: include/class/follow_up.class.php:1705
 msgid "SECURITE : Ajout impossible"
 msgstr ""
 
@@ -18923,8 +20009,9 @@ msgstr ""
 #: include/template/action_display_short.php:81
 #: include/lib/html_input.class.php:1103 include/lib/html_input.class.php:1104
 #: include/lib/html_input.class.php:1119 include/lib/html_input.class.php:1120
+#: include/lib/html_input.class.php:1153 include/lib/html_input.class.php:1145
 #: include/template/action_display_short.php:81
-#: include/lib/html_input.class.php:1153
+#: include/lib/html_input.class.php:1145
 msgid "Nouvel événement"
 msgstr ""
 
@@ -18935,6 +20022,8 @@ msgstr ""
 #: include/class/print_ledger.class.php:115
 #: include/class/print_ledger.class.php:150
 #: include/class/print_ledger.class.php:194
+#: include/class/print_ledger.class.php:150
+#: include/class/print_ledger.class.php:194
 msgid "Ce journal ne peut être imprimé en mode simple"
 msgstr ""
 
@@ -18942,6 +20031,7 @@ msgstr ""
 #: include/class/class_user.php:974 include/class/class_user.php:962
 #: include/class/class_user.php:961 include/class/user.class.php:961
 #: include/class/user.class.php:985 include/class/user.class.php:988
+#: include/class/user.class.php:988
 msgid "Id"
 msgstr ""
 
@@ -18949,6 +20039,7 @@ msgstr ""
 #: include/class/class_user.php:986 include/class/class_user.php:974
 #: include/class/class_user.php:973 include/class/user.class.php:973
 #: include/class/user.class.php:997 include/class/user.class.php:1000
+#: include/class/user.class.php:1000
 msgid "Aucun dossier disponible"
 msgstr ""
 
@@ -18994,6 +20085,9 @@ msgstr ""
 #: include/template/action_display_short.php:58
 #: include/class/follow_up.class.php:262 include/class/document.class.php:1413
 #: include/class/follow_up.class.php:269 include/class/follow_up.class.php:725
+#: include/class/follow_up.class.php:271 include/class/follow_up.class.php:758
+#: include/class/document.class.php:1413 include/class/follow_up.class.php:271
+#: include/class/follow_up.class.php:758
 #: include/template/action_display_short.php:58
 msgid "Haute"
 msgstr ""
@@ -19014,7 +20108,9 @@ msgstr ""
 #: include/class/class_follow_up.php:263 include/class/follow_up.class.php:263
 #: include/template/action_display_short.php:60
 #: include/class/follow_up.class.php:264 include/class/document.class.php:1413
-#: include/class/follow_up.class.php:271
+#: include/class/follow_up.class.php:271 include/class/follow_up.class.php:273
+#: include/class/follow_up.class.php:764 include/class/document.class.php:1413
+#: include/class/follow_up.class.php:273 include/class/follow_up.class.php:764
 #: include/template/action_display_short.php:60
 msgid "Basse"
 msgstr ""
@@ -19028,6 +20124,8 @@ msgstr ""
 #: include/template/detail-action.php:144
 #: include/template/detail-action.php:143 include/ajax/ajax_get_profile.php:58
 #: include/template/detail-action.php:150
+#: include/template/detail-action.php:152 include/ajax/ajax_get_profile.php:58
+#: include/template/detail-action.php:152
 msgid "Groupe Gestion"
 msgstr ""
 
@@ -19037,6 +20135,8 @@ msgstr ""
 #: include/template/ledger_detail_bottom.php:195
 #: include/template/ledger_detail_bottom.php:192
 #: include/template/ledger_detail_bottom.php:211
+#: include/template/ledger_detail_bottom.php:212
+#: include/template/ledger_detail_bottom.php:212
 msgid "vous confirmez?"
 msgstr ""
 
@@ -19075,7 +20175,9 @@ msgstr ""
 
 #: include/cfgfiche.inc.php:143 include/profile.inc.php:355
 #: include/cfgfiche.inc.php:158 include/profile.inc.php:336
-#: include/cfgfiche.inc.php:159 include/cfgfiche.inc.php:159
+#: include/cfgfiche.inc.php:159
+#: include/class/card_attribut_mtable.class.php:169
+#: include/cfgfiche.inc.php:159
 #: include/class/card_attribut_mtable.class.php:169 include/profile.inc.php:336
 msgid "Doublon"
 msgstr ""
@@ -19124,7 +20226,8 @@ msgstr ""
 #: include/user.inc.php:176 include/user.inc.php:178
 #: include/ext/importbank/include/import_bank.class.php:136
 #: include/template/tag_search_select.php:14
-#: include/template/tag_search_select.php:17 include/user.inc.php:178
+#: include/template/tag_search_select.php:17 include/user.inc.php:180
+#: include/template/tag_search_select.php:17 include/user.inc.php:180
 msgid "Tous"
 msgstr ""
 
@@ -19209,6 +20312,7 @@ msgstr ""
 #: include/class/pre_operation.class.php:56
 #: include/class/pre_operation.class.php:57
 #: include/class/pre_operation.class.php:67
+#: include/class/pre_operation.class.php:67
 msgid "Donnez un nom pour sauver cette opération comme modèle"
 msgstr ""
 
@@ -19239,19 +20343,19 @@ msgstr ""
 #: include/lib/class_database.php:429 include/lib/class_database.php:434
 #: include/lib/database.class.php:433 include/lib/database.class.php:442
 #: include/lib/database.class.php:443 include/class/database.class.php:125
-#: include/class/database.class.php:128
+#: include/class/database.class.php:128 include/class/database.class.php:128
 msgid "Base de donnée vide"
 msgstr ""
 
 #: include/dossier.inc.php:195 include/dossier.inc.php:196
 #: include/dossier.inc.php:199 include/dossier.inc.php:204
-#: include/dossier.inc.php:204
+#: include/dossier.inc.php:206 include/dossier.inc.php:206
 msgid "Echec création "
 msgstr ""
 
 #: include/dossier.inc.php:318 include/dossier.inc.php:319
 #: include/dossier.inc.php:322 include/dossier.inc.php:327
-#: include/dossier.inc.php:327
+#: include/dossier.inc.php:330 include/dossier.inc.php:330
 msgid "Aucun modèle (dossier vide, devant être restauré manuellement)"
 msgstr ""
 
@@ -19266,13 +20370,15 @@ msgstr ""
 #: html/recherche.php:126 html/recherche.php:129
 #: include/history_operation.inc.php:167 include/history_operation.inc.php:178
 #: html/recherche.php:141 include/history_operation.inc.php:192
+#: html/recherche.php:151 include/history_operation.inc.php:203
+#: html/recherche.php:151 include/history_operation.inc.php:203
 msgid "Export vers CSV"
 msgstr ""
 
 #: include/class_fiche.php:557 include/class/class_fiche.php:557
 #: include/class/class_fiche.php:558 include/class/fiche.class.php:564
 #: include/class/fiche.class.php:566 include/class/fiche.class.php:565
-#: include/class/fiche.class.php:578
+#: include/class/fiche.class.php:578 include/class/fiche.class.php:578
 msgid "id fiche"
 msgstr ""
 
@@ -19280,7 +20386,7 @@ msgstr ""
 #: include/class/class_fiche.php:1024 include/class/class_fiche.php:1027
 #: include/class/fiche.class.php:1117 include/class/fiche.class.php:1119
 #: include/class/fiche.class.php:1133 include/class/fiche.class.php:1134
-#: include/class/fiche.class.php:1161
+#: include/class/fiche.class.php:1161 include/class/fiche.class.php:1161
 msgid "Impossible cette fiche est utilisée dans un journal"
 msgstr ""
 
@@ -19310,6 +20416,7 @@ msgstr ""
 #: include/database.item.php:144 include/database.item.php:143
 #: include/database.item.php:6 include/database.item.php:135
 #: include/database.item.php:133 include/database.item.php:134
+#: include/database.item.php:134
 msgid "Export Balance agée"
 msgstr ""
 
@@ -19344,35 +20451,35 @@ msgstr ""
 #: include/database.item.php:216 include/database.item.php:193
 #: include/database.item.php:194 include/database.item.php:197
 #: include/database.item.php:208 include/database.item.php:213
-#: include/database.item.php:203
+#: include/database.item.php:203 include/database.item.php:203
 msgid "Enlever une pièce justificative"
 msgstr ""
 
 #: include/database.item.php:217 include/database.item.php:194
 #: include/database.item.php:195 include/database.item.php:198
 #: include/database.item.php:209 include/database.item.php:214
-#: include/database.item.php:204
+#: include/database.item.php:204 include/database.item.php:204
 msgid "Effacer une opération "
 msgstr ""
 
 #: include/database.item.php:218 include/database.item.php:195
 #: include/database.item.php:196 include/database.item.php:199
 #: include/database.item.php:210 include/database.item.php:215
-#: include/database.item.php:205
+#: include/database.item.php:205 include/database.item.php:205
 msgid "Partager une note"
 msgstr ""
 
 #: include/database.item.php:219 include/database.item.php:196
 #: include/database.item.php:197 include/database.item.php:200
 #: include/database.item.php:211 include/database.item.php:216
-#: include/database.item.php:206
+#: include/database.item.php:206 include/database.item.php:206
 msgid "Créer une note publique"
 msgstr ""
 
 #: include/database.item.php:220 include/database.item.php:197
 #: include/database.item.php:198 include/database.item.php:201
 #: include/database.item.php:212 include/database.item.php:217
-#: include/database.item.php:207
+#: include/database.item.php:207 include/database.item.php:207
 msgid "Effacer une note publique"
 msgstr ""
 
@@ -19387,14 +20494,14 @@ msgstr ""
 #: html/ajax_misc.php:571 html/ajax_misc.php:613 html/ajax_misc.php:408
 #: html/ajax_misc.php:434 html/ajax_misc.php:546 html/ajax_misc.php:548
 #: html/ajax_misc.php:554 html/ajax_misc.php:556 html/ajax_misc.php:560
-#: html/ajax_misc.php:525
+#: html/ajax_misc.php:525 html/ajax_misc.php:533 html/ajax_misc.php:533
 msgid "Ce plugin n'existe pas "
 msgstr ""
 
 #: html/ajax_misc.php:572 html/ajax_misc.php:614 html/ajax_misc.php:409
 #: html/ajax_misc.php:435 html/ajax_misc.php:547 html/ajax_misc.php:549
 #: html/ajax_misc.php:555 html/ajax_misc.php:557 html/ajax_misc.php:561
-#: html/ajax_misc.php:526
+#: html/ajax_misc.php:526 html/ajax_misc.php:534 html/ajax_misc.php:534
 msgid "Il y a une erreur, ce plugin n'existe pas"
 msgstr ""
 
@@ -19411,7 +20518,8 @@ msgstr ""
 #: html/install.php:215 html/install.php:257 include/opening.inc.php:140
 #: include/opening.inc.php:174 html/install.php:222 html/install.php:225
 #: html/install.php:267 html/install.php:272 html/install.php:315
-#: include/opening.inc.php:140 include/opening.inc.php:174
+#: html/install.php:278 html/install.php:321 html/install.php:278
+#: html/install.php:321 include/opening.inc.php:140 include/opening.inc.php:174
 msgid "Continuer"
 msgstr ""
 
@@ -19425,7 +20533,8 @@ msgid ""
 "Ne corrigez pas encore, cliquez continuer pour passer à l'étape suivante"
 msgstr ""
 
-#: include/template/detail-action.php:57 include/template/detail-action.php:57
+#: include/template/detail-action.php:57 include/template/detail-action.php:58
+#: include/template/detail-action.php:58
 msgid "Pas de catégorie de contact"
 msgstr ""
 
@@ -19453,19 +20562,22 @@ msgstr ""
 
 #: html/admin/setup.php:75 html/admin/setup.php:78 html/admin/setup.php:129
 #: html/install.php:131 html/install.php:130 html/install.php:136
-#: html/install.php:143 html/install.php:156
+#: html/install.php:143 html/install.php:156 html/install.php:160
+#: html/install.php:160
 msgid "Désactiver le changement de langue (requis pour MacOSX)"
 msgstr ""
 
 #: html/admin/setup.php:76 html/admin/setup.php:79 html/admin/setup.php:130
 #: html/install.php:132 html/install.php:131 html/install.php:137
-#: html/install.php:144 html/install.php:157
+#: html/install.php:144 html/install.php:157 html/install.php:161
+#: html/install.php:161
 msgid "Le chemin vers le repertoire contenant psql, pg_dump..."
 msgstr ""
 
 #: html/admin/setup.php:77 html/admin/setup.php:80 html/admin/setup.php:131
 #: html/install.php:133 html/install.php:132 html/install.php:138
-#: html/install.php:145 html/install.php:158
+#: html/install.php:145 html/install.php:158 html/install.php:162
+#: html/install.php:162
 msgid "Utilisateur de la base de donnée postgresql"
 msgstr ""
 
@@ -19480,14 +20592,16 @@ msgstr ""
 
 #: html/admin/setup.php:80 html/admin/setup.php:83 html/admin/setup.php:134
 #: html/install.php:136 html/install.php:135 html/install.php:141
-#: html/install.php:148 html/install.php:161
+#: html/install.php:148 html/install.php:161 html/install.php:165
+#: html/install.php:165
 msgid ""
 "En version mono dossier, le nom de la base de données doit être mentionné"
 msgstr ""
 
 #: html/admin/setup.php:81 html/admin/setup.php:84 html/admin/setup.php:135
 #: html/install.php:137 html/install.php:136 html/install.php:142
-#: html/install.php:149 html/install.php:162
+#: html/install.php:149 html/install.php:162 html/install.php:166
+#: html/install.php:166
 msgid ""
 "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"
@@ -19507,18 +20621,21 @@ msgstr ""
 #: html/install.php:255 html/install.php:254 html/install.php:252
 #: html/install.php:257 html/install.php:263 html/install.php:214
 #: html/install.php:221 html/install.php:224 html/install.php:271
+#: html/install.php:277 html/install.php:277
 msgid "Les informations sont sauv&eacute;es vous pouvez continuer"
 msgstr ""
 
 #: html/admin/setup.php:199 html/admin/setup.php:217 html/admin/setup.php:219
 #: html/install.php:225 html/install.php:223 html/install.php:231
 #: html/install.php:182 html/install.php:189 html/install.php:205
+#: html/install.php:209 html/install.php:209
 msgid "Ecriture non possible"
 msgstr ""
 
 #: html/admin/setup.php:201 html/admin/setup.php:219 html/admin/setup.php:221
 #: html/install.php:227 html/install.php:225 html/install.php:233
 #: html/install.php:184 html/install.php:191 html/install.php:207
+#: html/install.php:211 html/install.php:211
 msgid ""
 "On ne peut pas écrire dans le répertoire de NOALYSS, changez-en les droits "
 msgstr ""
@@ -19527,6 +20644,7 @@ msgstr ""
 #: html/install.php:290 html/install.php:289 html/install.php:287
 #: html/install.php:293 html/install.php:299 html/install.php:250
 #: html/install.php:257 html/install.php:260 html/install.php:308
+#: html/install.php:314 html/install.php:314
 msgid "Entrez les informations nécessaires à noalyss"
 msgstr ""
 
@@ -19538,6 +20656,7 @@ msgstr ""
 #: html/install.php:320 html/install.php:319 html/install.php:317
 #: html/install.php:323 html/install.php:329 html/install.php:280
 #: html/install.php:287 html/install.php:290 html/install.php:339
+#: html/install.php:345 html/install.php:345
 msgid "Configuration"
 msgstr ""
 
@@ -19559,6 +20678,8 @@ msgstr ""
 #: html/install.php:351 html/install.php:360 html/install.php:369
 #: html/install.php:354 html/install.php:363 html/install.php:372
 #: html/install.php:403 html/install.php:412 html/install.php:421
+#: html/install.php:409 html/install.php:418 html/install.php:409
+#: html/install.php:418 html/install.php:427
 msgid "Avertissement"
 msgstr ""
 
@@ -19566,6 +20687,7 @@ msgstr ""
 #: html/install.php:413 html/install.php:412 html/install.php:410
 #: html/install.php:416 html/install.php:422 html/install.php:386
 #: html/install.php:353 html/install.php:356 html/install.php:405
+#: html/install.php:411 html/install.php:411
 msgid "max_execution_time devrait être de 60 minimum"
 msgstr ""
 
@@ -19573,7 +20695,8 @@ msgstr ""
 #: html/install.php:533 html/install.php:532 html/install.php:530
 #: html/install.php:536 html/install.php:528 html/install.php:534
 #: html/install.php:496 html/install.php:471 html/install.php:477
-#: html/install.php:480 html/install.php:529
+#: html/install.php:480 html/install.php:529 html/install.php:535
+#: html/install.php:535
 msgid "Commencer la mise à jour ou l'installation"
 msgstr ""
 
@@ -19581,7 +20704,7 @@ msgstr ""
 #: include/upgrade.inc.php:106 include/upgrade.inc.php:101
 #: include/upgrade.inc.php:102 include/upgrade.inc.php:104
 #: include/upgrade.inc.php:105 include/class/dossier.class.php:404
-#: include/class/dossier.class.php:410
+#: include/class/dossier.class.php:410 include/class/dossier.class.php:410
 msgid "Modèle inexistant"
 msgstr ""
 
@@ -19589,24 +20712,31 @@ msgstr ""
 #: html/install.php:345 html/install.php:344 html/install.php:342
 #: html/install.php:348 html/install.php:354 html/install.php:318
 #: html/install.php:327 html/install.php:330 html/install.php:379
+#: html/install.php:385 html/install.php:385
 msgid "Vous devez installer ou activer l'extension"
 msgstr ""
 
 #: html/admin/template_config_form.php:33
 #: include/template/template_config_form.php:33
 #: include/template/template_config_form.php:34
+#: include/template/template_config_form.php:60
+#: include/template/template_config_form.php:60
 msgid "Répertoire temporaire"
 msgstr ""
 
 #: html/admin/template_config_form.php:39
 #: include/template/template_config_form.php:39
 #: include/template/template_config_form.php:40
+#: include/template/template_config_form.php:66
+#: include/template/template_config_form.php:66
 msgid "Changement de langue"
 msgstr ""
 
 #: html/admin/template_config_form.php:43
 #: include/template/template_config_form.php:43
 #: include/template/template_config_form.php:44
+#: include/template/template_config_form.php:70
+#: include/template/template_config_form.php:70
 msgid "Chemin complet vers les executable de Postgresql"
 msgstr ""
 
@@ -19622,6 +20752,8 @@ msgstr ""
 #: include/template/template_config_form.php:63
 #: include/template/template_config_form.php:71
 #: include/template/template_config_form.php:81
+#: include/template/template_config_form.php:74
+#: include/template/template_config_form.php:74
 msgid "Mode Serveur mutualisé"
 msgstr ""
 
@@ -19629,6 +20761,8 @@ msgstr ""
 #: include/template/template_config_form.php:68
 #: include/template/template_config_form.php:76
 #: include/template/template_config_form.php:86
+#: include/template/template_config_form.php:79
+#: include/template/template_config_form.php:79
 msgid "Nom base de donnée"
 msgstr ""
 
@@ -19636,6 +20770,8 @@ msgstr ""
 #: include/template/template_config_form.php:80
 #: include/template/template_config_form.php:88
 #: include/template/template_config_form.php:100
+#: include/template/template_config_form.php:118
+#: include/template/template_config_form.php:118
 msgid ""
 "Attention : si vous installez sous windows n'utilisez pas le \\ mais plutôt "
 "le / dans les nom de répertoire (càd les chemins ou path)"
@@ -19652,21 +20788,21 @@ msgstr ""
 #: html/admin/setup.php:259 html/install.php:323 html/install.php:322
 #: html/install.php:320 html/install.php:326 html/install.php:332
 #: html/install.php:283 html/install.php:290 html/install.php:293
-#: html/install.php:342
+#: html/install.php:342 html/install.php:348 html/install.php:348
 msgid "Vous utilisez le domaine"
 msgstr ""
 
 #: html/admin/setup.php:272 html/install.php:336 html/install.php:335
 #: html/install.php:333 html/install.php:339 html/install.php:345
 #: html/install.php:309 html/install.php:316 html/install.php:319
-#: html/install.php:368
+#: html/install.php:368 html/install.php:374 html/install.php:374
 msgid "a une mauvaise valeur"
 msgstr ""
 
 #: html/admin/setup.php:357 html/install.php:421 html/install.php:420
 #: html/install.php:418 html/install.php:424 html/install.php:430
 #: html/install.php:394 html/install.php:361 html/install.php:364
-#: html/install.php:413
+#: html/install.php:413 html/install.php:419 html/install.php:419
 msgid "register_globals doit être à off"
 msgstr ""
 
@@ -19682,7 +20818,7 @@ msgstr ""
 #: html/install.php:456 html/install.php:462 html/install.php:454
 #: html/install.php:460 html/install.php:424 html/install.php:399
 #: html/install.php:405 html/install.php:408 scenario/180209.php:18
-#: html/install.php:457
+#: html/install.php:457 html/install.php:463 html/install.php:463
 msgid "Version base de données :"
 msgstr ""
 
@@ -19702,7 +20838,8 @@ msgstr ""
 #: html/install.php:471 include/admin_repo.inc.php:125 html/install.php:477
 #: html/install.php:439 include/admin_repo.inc.php:127 html/install.php:414
 #: include/admin_repo.inc.php:129 html/install.php:420 html/install.php:423
-#: html/install.php:472 include/admin_repo.inc.php:129
+#: html/install.php:472 html/install.php:478 html/install.php:478
+#: include/admin_repo.inc.php:129
 msgid "Paramètre base de données"
 msgstr ""
 
@@ -19710,6 +20847,7 @@ msgstr ""
 #: html/install.php:480 html/install.php:486 html/install.php:478
 #: html/install.php:484 html/install.php:446 html/install.php:421
 #: html/install.php:427 html/install.php:430 html/install.php:479
+#: html/install.php:485 html/install.php:485
 msgid ""
 "Vous devez installer le langage plpgsql pour permettre aux fonctions SQL de "
 "fonctionner."
@@ -19719,6 +20857,7 @@ msgstr ""
 #: html/install.php:481 html/install.php:487 html/install.php:479
 #: html/install.php:485 html/install.php:447 html/install.php:422
 #: html/install.php:428 html/install.php:431 html/install.php:480
+#: html/install.php:486 html/install.php:486
 msgid ""
 "Pour cela, sur la ligne de commande en tant qu\\'utilisateur postgres, "
 "faites createlang plpgsql template1"
@@ -19738,6 +20877,7 @@ msgstr ""
 #: html/install.php:523 html/install.php:529 html/install.php:521
 #: html/install.php:527 html/install.php:489 html/install.php:464
 #: html/install.php:470 html/install.php:473 html/install.php:522
+#: html/install.php:528 html/install.php:528
 #, php-format
 msgid "Il y a %s param&egrave;tre qui sont trop bas"
 msgstr ""
@@ -19745,14 +20885,16 @@ msgstr ""
 #: html/admin/setup.php:497 html/install.php:561 html/install.php:560
 #: html/install.php:558 html/install.php:569 html/install.php:567
 #: html/install.php:529 html/install.php:513 html/install.php:519
-#: html/install.php:522 html/install.php:572
+#: html/install.php:522 html/install.php:572 html/install.php:578
+#: html/install.php:578
 msgid "Creation of Modele 1"
 msgstr ""
 
 #: html/admin/setup.php:510 html/install.php:574 html/install.php:573
 #: html/install.php:571 html/install.php:582 html/install.php:580
 #: html/install.php:542 html/install.php:532 html/install.php:538
-#: html/install.php:541 html/install.php:591
+#: html/install.php:541 html/install.php:591 html/install.php:597
+#: html/install.php:597
 msgid "Creation of Modele 2"
 msgstr ""
 
@@ -19776,6 +20918,7 @@ msgstr ""
 #: html/install.php:610 html/install.php:626 html/install.php:618
 #: html/install.php:624 html/install.php:586 html/install.php:576
 #: html/install.php:582 html/install.php:585 html/install.php:635
+#: html/install.php:641 html/install.php:641
 msgid ""
 "soit noalyss/contrib/mono-dossier/mono-france.sql pour la comptabilité "
 "française"
@@ -19785,6 +20928,7 @@ msgstr ""
 #: html/install.php:611 html/install.php:627 html/install.php:619
 #: html/install.php:625 html/install.php:587 html/install.php:577
 #: html/install.php:583 html/install.php:586 html/install.php:636
+#: html/install.php:642 html/install.php:642
 msgid ""
 "soit noalyss/contrib/mono-dossier/mono-belge.sql pour la comptabilité belge"
 msgstr ""
@@ -19793,6 +20937,7 @@ msgstr ""
 #: html/install.php:612 html/install.php:628 html/install.php:620
 #: html/install.php:626 html/install.php:588 html/install.php:578
 #: html/install.php:584 html/install.php:587 html/install.php:637
+#: html/install.php:643 html/install.php:643
 msgid "soit y restaurer un backup ou un modèle"
 msgstr ""
 
@@ -19815,6 +20960,7 @@ msgstr ""
 #: html/install.php:683 html/install.php:676 html/install.php:655
 #: html/install.php:682 html/install.php:617 html/install.php:644
 #: html/install.php:607 html/install.php:614 html/install.php:667
+#: html/install.php:673 html/install.php:673
 msgid "Connectez-vous à NOALYSS"
 msgstr ""
 
@@ -19831,6 +20977,8 @@ msgstr ""
 #: include/class/dossier.class.php:395 html/install.php:398
 #: html/install.php:401 html/install.php:450
 #: include/class/dossier.class.php:373 include/class/dossier.class.php:401
+#: html/install.php:456 html/install.php:456
+#: include/class/dossier.class.php:373 include/class/dossier.class.php:401
 #: include/upgrade.inc.php:33
 msgid "Base de données"
 msgstr ""
@@ -19839,6 +20987,7 @@ msgstr ""
 #: html/install.php:588 html/install.php:601 html/install.php:593
 #: html/install.php:599 html/install.php:561 html/install.php:551
 #: html/install.php:557 html/install.php:560 html/install.php:610
+#: html/install.php:616 html/install.php:616
 msgid "Mise à jour du systeme"
 msgstr ""
 
@@ -19846,27 +20995,31 @@ msgstr ""
 #: html/install.php:589 html/install.php:602 html/install.php:594
 #: html/install.php:600 html/install.php:562 html/install.php:552
 #: html/install.php:558 html/install.php:561 html/install.php:611
+#: html/install.php:617 html/install.php:617
 msgid "Mise  à jour dossier"
 msgstr ""
 
 #: html/admin/setup.php:549 html/install.php:613 html/install.php:614
 #: html/install.php:621 html/install.php:637 html/install.php:629
 #: html/install.php:635 html/install.php:597 html/install.php:587
-#: html/install.php:594 html/install.php:647
+#: html/install.php:594 html/install.php:647 html/install.php:653
+#: html/install.php:653
 msgid "Mise à jour Repository"
 msgstr ""
 
 #: html/admin/setup.php:373 html/install.php:437 html/install.php:436
 #: html/install.php:434 html/install.php:440 html/install.php:432
 #: html/install.php:438 html/install.php:402 html/install.php:377
-#: html/install.php:380 html/install.php:429
+#: html/install.php:380 html/install.php:429 html/install.php:435
+#: html/install.php:435
 msgid "php.ini est bien configuré "
 msgstr ""
 
 #: html/admin/setup.php:375 html/install.php:439 html/install.php:438
 #: html/install.php:436 html/install.php:442 html/install.php:434
 #: html/install.php:440 html/install.php:404 html/install.php:379
-#: html/install.php:382 html/install.php:431
+#: html/install.php:382 html/install.php:431 html/install.php:437
+#: html/install.php:437
 msgid "php mal configuré "
 msgstr ""
 
@@ -19874,6 +21027,7 @@ msgstr ""
 #: html/install.php:503 html/install.php:509 html/install.php:501
 #: html/install.php:507 html/install.php:469 html/install.php:444
 #: html/install.php:450 html/install.php:453 html/install.php:502
+#: html/install.php:508 html/install.php:508
 #, php-format
 msgid "Attention le paramètre effective_cache_size est de %s au lieu de 1000"
 msgstr ""
@@ -19882,6 +21036,7 @@ msgstr ""
 #: html/install.php:520 html/install.php:526 html/install.php:518
 #: html/install.php:524 html/install.php:486 html/install.php:461
 #: html/install.php:467 html/install.php:470 html/install.php:519
+#: html/install.php:525 html/install.php:525
 msgid "La base de données est bien configurée "
 msgstr ""
 
@@ -19902,7 +21057,7 @@ msgstr ""
 
 #: include/database.item.php:7 include/database.item.php:10
 #: include/database.item.php:4 include/database.item.php:2
-#: include/database.item.php:3
+#: include/database.item.php:3 include/database.item.php:3
 msgid ""
 "Vous permet d'encoder des achats, dépenses, des notes de frais ou des notes "
 "de crédits, vous pouvez spécifier un bénéficiaire ou un autre moyen de "
@@ -19911,7 +21066,7 @@ msgstr ""
 
 #: include/database.item.php:13 include/database.item.php:16
 #: include/database.item.php:10 include/database.item.php:8
-#: include/database.item.php:9
+#: include/database.item.php:9 include/database.item.php:9
 msgid ""
 "Permet d'ajouter des taux de TVA ou de les modifier ainsi que les postes "
 "comptables de ces TVA, ces TVA sont utilisables dans les menus de vente et "
@@ -19920,31 +21075,31 @@ msgstr ""
 
 #: include/database.item.php:14 include/database.item.php:17
 #: include/database.item.php:11 include/database.item.php:9
-#: include/database.item.php:10
+#: include/database.item.php:10 include/database.item.php:10
 msgid "Encodage de tous vos revenus ou vente"
 msgstr ""
 
 #: include/database.item.php:15 include/database.item.php:18
 #: include/database.item.php:12 include/database.item.php:10
-#: include/database.item.php:11
+#: include/database.item.php:11 include/database.item.php:11
 msgid "Ajout de menu ou de plugins"
 msgstr ""
 
 #: include/database.item.php:16 include/database.item.php:19
 #: include/database.item.php:13 include/database.item.php:11
-#: include/database.item.php:12
+#: include/database.item.php:12 include/database.item.php:12
 msgid "Suivi des fournisseurs : devis, lettres, email...."
 msgstr ""
 
 #: include/database.item.php:17 include/database.item.php:20
 #: include/database.item.php:14 include/database.item.php:12
-#: include/database.item.php:13
+#: include/database.item.php:13 include/database.item.php:13
 msgid "Opérations diverses en Analytique"
 msgstr ""
 
 #: include/database.item.php:18 include/database.item.php:21
 #: include/database.item.php:15 include/database.item.php:13
-#: include/database.item.php:14
+#: include/database.item.php:14 include/database.item.php:14
 msgid ""
 "Création de rapport sur mesure, comme les ratios, vous permet de créer des "
 "graphiques de vos données (vente, achat...)"
@@ -19953,12 +21108,13 @@ msgstr ""
 #: include/database.item.php:19 include/database.item.php:22
 #: include/database.item.php:51 include/database.item.php:49
 #: include/database.item.php:62 include/database.item.php:61
+#: include/database.item.php:61
 msgid "Menu regroupant les plugins"
 msgstr ""
 
 #: include/database.item.php:21 include/database.item.php:24
 #: include/database.item.php:17 include/database.item.php:15
-#: include/database.item.php:16
+#: include/database.item.php:16 include/database.item.php:16
 msgid "Suivi client : devis, réunion, courrier, commande..."
 msgstr ""
 
@@ -20036,7 +21192,7 @@ msgstr ""
 
 #: include/database.item.php:66 include/database.item.php:69
 #: include/database.item.php:63 include/database.item.php:61
-#: include/database.item.php:62
+#: include/database.item.php:62 include/database.item.php:62
 msgid ""
 "Historique de toutes vos opérations dans les journaux d'opérations diverses "
 "un menu de recherche, vous permettra de retrouver rapidement l'opération qui "
@@ -20045,7 +21201,7 @@ msgstr ""
 
 #: include/database.item.php:68 include/database.item.php:71
 #: include/database.item.php:65 include/database.item.php:63
-#: include/database.item.php:64
+#: include/database.item.php:64 include/database.item.php:64
 msgid ""
 "Impression de rapport personnalisé, il est aussi possible d'exporter en CSV "
 "afin de faire des graphiques"
@@ -20053,49 +21209,49 @@ msgstr ""
 
 #: include/database.item.php:71 include/database.item.php:74
 #: include/database.item.php:68 include/database.item.php:66
-#: include/database.item.php:67
+#: include/database.item.php:67 include/database.item.php:67
 msgid "Regroupement pour les menus d'achats(nouvelle opération, historique...)"
 msgstr ""
 
 #: include/database.item.php:72 include/database.item.php:75
 #: include/database.item.php:69 include/database.item.php:67
-#: include/database.item.php:68
+#: include/database.item.php:68 include/database.item.php:68
 msgid "Regroupement pour les menus et les profils"
 msgstr ""
 
 #: include/database.item.php:74 include/database.item.php:77
 #: include/database.item.php:71 include/database.item.php:69
-#: include/database.item.php:70
+#: include/database.item.php:70 include/database.item.php:70
 msgid "Regroupement des menus des journaux de trésorerie"
 msgstr ""
 
 #: include/database.item.php:75 include/database.item.php:78
 #: include/database.item.php:72 include/database.item.php:70
-#: include/database.item.php:71
+#: include/database.item.php:71 include/database.item.php:71
 msgid "Grand livre pour la comptabilité analytique"
 msgstr ""
 
 #: include/database.item.php:77 include/database.item.php:80
 #: include/database.item.php:74 include/database.item.php:72
-#: include/database.item.php:73
+#: include/database.item.php:73 include/database.item.php:73
 msgid "Menu Lettrage"
 msgstr ""
 
 #: include/database.item.php:78 include/database.item.php:81
 #: include/database.item.php:75 include/database.item.php:73
-#: include/database.item.php:74
+#: include/database.item.php:74 include/database.item.php:74
 msgid "Choix de votre dossier"
 msgstr ""
 
 #: include/database.item.php:80 include/database.item.php:83
 #: include/database.item.php:77 include/database.item.php:75
-#: include/database.item.php:76
+#: include/database.item.php:76 include/database.item.php:76
 msgid "Menu de différents paramètres"
 msgstr ""
 
 #: include/database.item.php:81 include/database.item.php:84
 #: include/database.item.php:78 include/database.item.php:76
-#: include/database.item.php:77
+#: include/database.item.php:77 include/database.item.php:77
 msgid ""
 "Configuration des profils des utilisateurs, permet de fixer les journaux, "
 "profils dans les documents et stock que  ce profil peut utiliser. Cela "
@@ -20104,7 +21260,7 @@ msgstr ""
 
 #: include/database.item.php:83 include/database.item.php:86
 #: include/database.item.php:80 include/database.item.php:78
-#: include/database.item.php:79
+#: include/database.item.php:79 include/database.item.php:79
 msgid ""
 "Permet d'avoir la balance de toutes vos fiches, les résumés exportables en "
 "CSV, les historiques avec ou sans lettrages"
@@ -20112,7 +21268,7 @@ msgstr ""
 
 #: include/database.item.php:84 include/database.item.php:87
 #: include/database.item.php:81 include/database.item.php:79
-#: include/database.item.php:80
+#: include/database.item.php:80 include/database.item.php:80
 msgid ""
 "Préférence de l'utilisateur, apparence de l'application pour l'utilisateur, "
 "période par défaut et mot de passe"
@@ -20120,7 +21276,7 @@ msgstr ""
 
 #: include/database.item.php:85 include/database.item.php:88
 #: include/database.item.php:82 include/database.item.php:80
-#: include/database.item.php:81
+#: include/database.item.php:81 include/database.item.php:81
 msgid ""
 "Configuration des tags ou dossiers, on l'appele tag ou dossier suivant la "
 "façon dont vous utilisez \n"
@@ -20129,7 +21285,7 @@ msgstr ""
 
 #: include/database.item.php:88 include/database.item.php:91
 #: include/database.item.php:85 include/database.item.php:83
-#: include/database.item.php:84
+#: include/database.item.php:84 include/database.item.php:84
 msgid ""
 "Information sur votre société : nom, adresse... utilisé lors de la "
 "génération de documents"
@@ -20137,7 +21293,7 @@ msgstr ""
 
 #: include/database.item.php:89 include/database.item.php:92
 #: include/database.item.php:86 include/database.item.php:84
-#: include/database.item.php:85
+#: include/database.item.php:85 include/database.item.php:85
 msgid ""
 "Gestion des périodes : clôture, ajout de période, afin de créer des périodes "
 "vous pouvez aussi utiliser le plugin outil comptable"
@@ -20145,7 +21301,7 @@ msgstr ""
 
 #: include/database.item.php:90 include/database.item.php:93
 #: include/database.item.php:87 include/database.item.php:85
-#: include/database.item.php:86
+#: include/database.item.php:86 include/database.item.php:86
 msgid ""
 "Vérifie que votre comptabilité ne contient pas d'erreur de base, tels que "
 "l'équilibre entre le passif et l'actif, l'utilisation des postes "
@@ -20154,7 +21310,7 @@ msgstr ""
 
 #: include/database.item.php:91 include/database.item.php:94
 #: include/database.item.php:88 include/database.item.php:86
-#: include/database.item.php:87
+#: include/database.item.php:87 include/database.item.php:87
 msgid ""
 "Ecriture d'ouverture ou écriture à nouveau, reporte les soldes des comptes "
 "de l'année passé du poste comptable 0xxx à 5xxxx sur l'année courante"
@@ -20168,7 +21324,7 @@ msgstr ""
 
 #: include/database.item.php:93 include/database.item.php:96
 #: include/database.item.php:90 include/database.item.php:88
-#: include/database.item.php:89
+#: include/database.item.php:89 include/database.item.php:89
 msgid ""
 "Création et modification des journaux, préfixe des pièces justificatives, "
 "numérotation, catégories de fiches accessibles à ce journal"
@@ -20176,7 +21332,7 @@ msgstr ""
 
 #: include/database.item.php:94 include/database.item.php:97
 #: include/database.item.php:91 include/database.item.php:89
-#: include/database.item.php:90
+#: include/database.item.php:90 include/database.item.php:90
 msgid ""
 "Configuration de la sécurité, vous permet de donner un profil à vos "
 "utilisateurs, cela leur permettra d'utiliser ce que vous souhaitez qu'ils "
@@ -20185,7 +21341,7 @@ msgstr ""
 
 #: include/database.item.php:95 include/database.item.php:98
 #: include/database.item.php:92 include/database.item.php:90
-#: include/database.item.php:91
+#: include/database.item.php:91 include/database.item.php:91
 msgid ""
 "Permet d'ajouter de nouveaux attributs que vous pourrez par la suite ajouter "
 "à des catégories de fiches"
@@ -20193,19 +21349,19 @@ msgstr ""
 
 #: include/database.item.php:96 include/database.item.php:99
 #: include/database.item.php:93 include/database.item.php:91
-#: include/database.item.php:92
+#: include/database.item.php:92 include/database.item.php:92
 msgid "Etat des stock de l'exercice indiqué"
 msgstr ""
 
 #: include/database.item.php:97 include/database.item.php:100
 #: include/database.item.php:94 include/database.item.php:92
-#: include/database.item.php:93
+#: include/database.item.php:93 include/database.item.php:93
 msgid "Modification des stocks, menu utilisé pour l'inventaire"
 msgstr ""
 
 #: include/database.item.php:98 include/database.item.php:101
 #: include/database.item.php:95 include/database.item.php:93
-#: include/database.item.php:94
+#: include/database.item.php:94 include/database.item.php:94
 msgid ""
 "Liste des changements manuels des stocks, inventaire, transfert de "
 "marchandises entre dépôts..."
@@ -20213,7 +21369,7 @@ msgstr ""
 
 #: include/database.item.php:99 include/database.item.php:102
 #: include/database.item.php:96 include/database.item.php:94
-#: include/database.item.php:95
+#: include/database.item.php:95 include/database.item.php:95
 msgid ""
 "Le navigateur vous présente une liste de menu auquel vous avez accès et vous "
 "permet d'accèder plus rapidement au menu que vous souhaitez"
@@ -20221,7 +21377,7 @@ msgstr ""
 
 #: include/database.item.php:100 include/database.item.php:103
 #: include/database.item.php:97 include/database.item.php:95
-#: include/database.item.php:96
+#: include/database.item.php:96 include/database.item.php:96
 msgid ""
 "Historique de toutes vos opérations dans tous  les journaux auquels vous "
 "avez accès, vous permettra de retrouver rapidement l'opération qui vous "
@@ -20230,7 +21386,7 @@ msgstr ""
 
 #: include/database.item.php:101 include/database.item.php:104
 #: include/database.item.php:98 include/database.item.php:96
-#: include/database.item.php:97
+#: include/database.item.php:97 include/database.item.php:97
 msgid ""
 "Historique de toutes vos opérations un menu de recherche, vous permettra de "
 "retrouver rapidement l'opération qui vous intéresse"
@@ -20238,7 +21394,7 @@ msgstr ""
 
 #: include/database.item.php:102 include/database.item.php:105
 #: include/database.item.php:99 include/database.item.php:97
-#: include/database.item.php:98
+#: include/database.item.php:98 include/database.item.php:98
 msgid ""
 "Permet de faire correspondre vos extraits bancaires avec les opérations de "
 "vente ou d'achat, le lettrage se fait automatiquement"
@@ -20246,7 +21402,7 @@ msgstr ""
 
 #: include/database.item.php:103 include/database.item.php:106
 #: include/database.item.php:100 include/database.item.php:98
-#: include/database.item.php:99
+#: include/database.item.php:99 include/database.item.php:99
 msgid ""
 "Solde des journaux de trésorerie cela concerne les comptes en banques, "
 "caisse , les chèques... "
@@ -20254,7 +21410,7 @@ msgstr ""
 
 #: include/database.item.php:104 include/database.item.php:107
 #: include/database.item.php:101 include/database.item.php:99
-#: include/database.item.php:103
+#: include/database.item.php:103 include/database.item.php:103
 msgid "Déconnexion "
 msgstr ""
 
@@ -20276,7 +21432,7 @@ msgstr ""
 
 #: include/database.item.php:108 include/database.item.php:111
 #: include/database.item.php:105 include/database.item.php:103
-#: include/database.item.php:104
+#: include/database.item.php:104 include/database.item.php:104
 msgid ""
 "Historique de toutes vos opérations dans les journaux de vente un menu de "
 "recherche, vous permettra de retrouver rapidement l'opération qui vous "
@@ -20285,7 +21441,7 @@ msgstr ""
 
 #: include/database.item.php:109 include/database.item.php:112
 #: include/database.item.php:106 include/database.item.php:104
-#: include/database.item.php:105
+#: include/database.item.php:105 include/database.item.php:105
 msgid ""
 "Historique de toutes vos opérations dans les journaux de trésorerie un menu "
 "de recherche, vous permettra de retrouver rapidement l'opération qui vous "
@@ -20294,7 +21450,7 @@ msgstr ""
 
 #: include/database.item.php:110 include/database.item.php:113
 #: include/database.item.php:107 include/database.item.php:105
-#: include/database.item.php:106
+#: include/database.item.php:106 include/database.item.php:106
 msgid ""
 "Impression des rapprochements : opérations non rapprochées ou avec des "
 "montants différents"
@@ -20302,7 +21458,7 @@ msgstr ""
 
 #: include/database.item.php:111 include/database.item.php:114
 #: include/database.item.php:108 include/database.item.php:106
-#: include/database.item.php:107
+#: include/database.item.php:107 include/database.item.php:107
 msgid ""
 "Impression de bilan, ce module est basique, il est plus intéressant "
 "d'utiliser le plugin \"rapport avancés\""
@@ -20310,7 +21466,7 @@ msgstr ""
 
 #: include/database.item.php:112 include/database.item.php:115
 #: include/database.item.php:109 include/database.item.php:107
-#: include/database.item.php:108
+#: include/database.item.php:108 include/database.item.php:108
 msgid "Configuration des entrepots de dépôts"
 msgstr ""
 
@@ -20318,6 +21474,7 @@ msgstr ""
 #: include/database.item.php:116 include/database.item.php:118
 #: include/database.item.php:110 include/database.item.php:112
 #: include/database.item.php:108 include/database.item.php:109
+#: include/database.item.php:111 include/database.item.php:109
 #: include/database.item.php:111
 msgid ""
 "Permet d'ajouter de nouvelles catégorie de fiche, d'ajouter des attributs à "
@@ -20326,13 +21483,13 @@ msgstr ""
 
 #: include/database.item.php:114 include/database.item.php:117
 #: include/database.item.php:111 include/database.item.php:109
-#: include/database.item.php:110
+#: include/database.item.php:110 include/database.item.php:110
 msgid "Permet de changer le poste comptable de base des catégories de fiches"
 msgstr ""
 
 #: include/database.item.php:116 include/database.item.php:119
 #: include/database.item.php:113 include/database.item.php:111
-#: include/database.item.php:112
+#: include/database.item.php:112 include/database.item.php:112
 msgid ""
 "Permet d'ajouter des état pour les documents utilisés dans le suivi (à "
 "faire, à suivre...)"
@@ -20340,7 +21497,7 @@ msgstr ""
 
 #: include/database.item.php:117 include/database.item.php:120
 #: include/database.item.php:114 include/database.item.php:112
-#: include/database.item.php:113
+#: include/database.item.php:113 include/database.item.php:113
 msgid ""
 "Regroupement pour les menus d'opérations diverses (nouvelle opération, "
 "historique...)"
@@ -20348,7 +21505,7 @@ msgstr ""
 
 #: include/database.item.php:118 include/database.item.php:121
 #: include/database.item.php:115 include/database.item.php:113
-#: include/database.item.php:114
+#: include/database.item.php:114 include/database.item.php:114
 msgid ""
 "Impression des journaux avec les détails pour les parties privés, la TVA et "
 "ce qui est non déductibles en ce qui concerne les journaux de vente et "
@@ -20357,13 +21514,13 @@ msgstr ""
 
 #: include/database.item.php:119 include/database.item.php:122
 #: include/database.item.php:116 include/database.item.php:114
-#: include/database.item.php:115
+#: include/database.item.php:115 include/database.item.php:115
 msgid "Regroupement des menus ventes et recettes"
 msgstr ""
 
 #: include/database.item.php:122 include/database.item.php:125
 #: include/database.item.php:119 include/database.item.php:117
-#: include/database.item.php:118
+#: include/database.item.php:118 include/database.item.php:118
 msgid ""
 "Tableau de suivi, vous permet de voir en un coup d'oeil vos dernières "
 "opérations, un petit calendrier, une liste de chose à faire..."
@@ -20371,21 +21528,21 @@ msgstr ""
 
 #: include/database.item.php:123 include/database.item.php:126
 #: include/database.item.php:120 include/database.item.php:118
-#: include/database.item.php:119
+#: include/database.item.php:119 include/database.item.php:119
 msgid ""
 "Menu regroupant la création de rapport, la vérification de la comptabilité..."
 msgstr ""
 
 #: include/database.item.php:124 include/database.item.php:127
 #: include/database.item.php:121 include/database.item.php:119
-#: include/database.item.php:120
+#: include/database.item.php:120 include/database.item.php:120
 msgid ""
 "Regroupement pour les menus de trésorerie (nouvelle opération, historique...)"
 msgstr ""
 
 #: include/database.item.php:125 include/database.item.php:128
 #: include/database.item.php:122 include/database.item.php:120
-#: include/database.item.php:121
+#: include/database.item.php:121 include/database.item.php:121
 msgid ""
 "Liste de vos suivis, en fait de tous les documents, réunions ... dont vous "
 "avez besoin afin de suivre vos clients, fournisseurs ou administrations. Il "
@@ -20395,7 +21552,7 @@ msgstr ""
 
 #: include/database.item.php:126 include/database.item.php:129
 #: include/database.item.php:123 include/database.item.php:121
-#: include/database.item.php:122
+#: include/database.item.php:122 include/database.item.php:122
 msgid ""
 "Configuration des moyens de paiements que vous voulez utiliser dans les "
 "journaux de type VEN ou ACH, les moyens de paiement permettent de générer "
@@ -20405,13 +21562,13 @@ msgstr ""
 
 #: include/database.item.php:127 include/database.item.php:130
 #: include/database.item.php:124 include/database.item.php:122
-#: include/database.item.php:123
+#: include/database.item.php:123 include/database.item.php:123
 msgid "Suivi des administrations : courrrier, déclarations."
 msgstr ""
 
 #: include/database.item.php:128 include/database.item.php:131
 #: include/database.item.php:125 include/database.item.php:123
-#: include/database.item.php:124
+#: include/database.item.php:124 include/database.item.php:124
 msgid ""
 "Prévision de vos achats, revenus, permet de suivre l'évolution de votre "
 "société. Vos prévisions sont des formules sur les postes comptables et vous "
@@ -20420,7 +21577,7 @@ msgstr ""
 
 #: include/database.item.php:130 include/database.item.php:133
 #: include/database.item.php:127 include/database.item.php:125
-#: include/database.item.php:126
+#: include/database.item.php:126 include/database.item.php:126
 msgid ""
 "Suivi de vos salariés, managers ainsi que des administrateurs, pour les "
 "documents et les opérations comptables"
@@ -20428,7 +21585,7 @@ msgstr ""
 
 #: include/database.item.php:131 include/database.item.php:134
 #: include/database.item.php:128 include/database.item.php:126
-#: include/database.item.php:127
+#: include/database.item.php:127 include/database.item.php:127
 msgid ""
 "Configuration des menus par défaut, ces menus sont appelés par des actions "
 "dans d'autres menus"
@@ -20436,29 +21593,35 @@ msgstr ""
 
 #: include/database.item.php:132 include/database.item.php:135
 #: include/database.item.php:129 include/database.item.php:127
-#: include/database.item.php:128
+#: include/database.item.php:128 include/database.item.php:128
 msgid "Agenda, présentation du suivi sous forme d'agenda "
 msgstr ""
 
 #: include/database.item.php:133 include/database.item.php:136
 #: include/database.item.php:131 include/database.item.php:132
+#: include/database.item.php:132
 msgid "Ce menu vous présente  un menu rapide de vos menus préférés"
 msgstr ""
 
 #: html/admin/setup.php:132 html/install.php:134 html/install.php:133
 #: html/install.php:139 html/install.php:146 html/install.php:159
+#: html/install.php:163 html/install.php:163
 msgid "Mot de passe de l'utilisateur de Postgresql"
 msgstr ""
 
 #: html/admin/template_config_form.php:47
 #: include/template/template_config_form.php:47
 #: include/template/template_config_form.php:48
+#: include/template/template_config_form.php:96
+#: include/template/template_config_form.php:96
 msgid "Utilisateur Postgresql"
 msgstr ""
 
 #: html/admin/template_config_form.php:51
 #: include/template/template_config_form.php:51
 #: include/template/template_config_form.php:52
+#: include/template/template_config_form.php:100
+#: include/template/template_config_form.php:100
 msgid "Mot de passe de l'utilisateur Postgresql"
 msgstr ""
 
@@ -20486,6 +21649,7 @@ msgstr ""
 #: include/class/acc_account_ledger.class.php:763
 #: include/class/acc_account_ledger.class.php:766
 #: include/class/acc_account_ledger.class.php:758
+#: include/class/acc_account_ledger.class.php:758
 msgid "Filtre rapide"
 msgstr ""
 
@@ -20513,12 +21677,14 @@ msgid "Le fichier "
 msgstr ""
 
 #: html/install.php:135 html/install.php:134 html/install.php:140
-#: html/install.php:147 html/install.php:160
+#: html/install.php:147 html/install.php:160 html/install.php:164
+#: html/install.php:164
 msgid "Port pour postgresql"
 msgstr ""
 
 #: html/install.php:138 html/install.php:137 html/install.php:143
-#: html/install.php:150 html/install.php:163
+#: html/install.php:150 html/install.php:163 html/install.php:167
+#: html/install.php:167
 msgid "Serveur postgresql"
 msgstr ""
 
@@ -20528,12 +21694,14 @@ msgstr ""
 #: html/install.php:269 html/install.php:220
 #: include/ext/import_account/include/impacc_file.class.php:69
 #: html/install.php:227 html/install.php:230 html/install.php:277
+#: html/install.php:283 html/install.php:283
 msgid "Fichier non sauvé"
 msgstr ""
 
 #: html/install.php:264 html/install.php:263 html/install.php:261
 #: html/install.php:266 html/install.php:272 html/install.php:223
 #: html/install.php:230 html/install.php:233 html/install.php:280
+#: html/install.php:286 html/install.php:286
 #, php-format
 msgid "Créez ce fichier %s avec les informations suivantes "
 msgstr ""
@@ -20541,6 +21709,7 @@ msgstr ""
 #: html/install.php:268 html/install.php:267 html/install.php:265
 #: html/install.php:270 html/install.php:276 html/install.php:227
 #: html/install.php:234 html/install.php:237 html/install.php:284
+#: html/install.php:290 html/install.php:290
 msgid "Puis cliquez sur ce lien"
 msgstr ""
 
@@ -20550,13 +21719,15 @@ msgstr ""
 #: include/lib/user_menu.php:121 html/install.php:238
 #: include/upgrade-plugin.php:125 include/lib/user_menu.php:78
 #: html/install.php:285 include/lib/user_menu.php:77
-#: include/upgrade-plugin.php:128
+#: include/upgrade-plugin.php:128 html/install.php:291 html/install.php:291
+#: include/lib/user_menu.php:77 include/upgrade-plugin.php:128
 msgid "Installation"
 msgstr ""
 
 #: html/install.php:278 html/install.php:277 html/install.php:275
 #: html/install.php:281 html/install.php:287 html/install.php:238
 #: html/install.php:245 html/install.php:248 html/install.php:295
+#: html/install.php:301 html/install.php:301
 msgid ""
 "Impossible de se connecter à Postgresql, vérifiez les informations de "
 "connection"
@@ -20577,6 +21748,8 @@ msgstr ""
 #: include/ext/importbank/include/import_bank.class.php:463
 #: include/ext/importbank/include/import_bank.class.php:484
 #: include/modele.inc.php:412 include/modele.inc.php:413
+#: include/class/acc_ledger_history.class.php:85
+#: include/compta_fin_rec.inc.php:152 include/compta_fin_rec.inc.php:159
 #: include/class/acc_ledger_history.class.php:85 include/modele.inc.php:413
 #: include/compta_fin_rec.inc.php:152 include/compta_fin_rec.inc.php:159
 msgid "Donnée invalide"
@@ -20680,20 +21853,20 @@ msgstr ""
 
 #: include/upgrade.inc.php:50 include/upgrade.inc.php:45
 #: include/upgrade.inc.php:46 include/class/dossier.class.php:344
-#: include/class/dossier.class.php:350
+#: include/class/dossier.class.php:350 include/class/dossier.class.php:350
 msgid "Mise à jour de la base de données principale"
 msgstr ""
 
 #: include/upgrade.inc.php:65 include/upgrade.inc.php:60
 #: include/upgrade.inc.php:61 include/class/dossier.class.php:360
-#: include/class/dossier.class.php:366
+#: include/class/dossier.class.php:366 include/class/dossier.class.php:366
 msgid "Mise à jour dossiers"
 msgstr ""
 
 #: include/upgrade.inc.php:91 include/upgrade.inc.php:86
 #: include/upgrade.inc.php:87 include/upgrade.inc.php:88
 #: include/upgrade.inc.php:89 include/class/dossier.class.php:388
-#: include/class/dossier.class.php:394
+#: include/class/dossier.class.php:394 include/class/dossier.class.php:394
 msgid "Mise à jour modèles"
 msgstr ""
 
@@ -20705,12 +21878,16 @@ msgstr ""
 #: include/template/template_config_form.php:55
 #: include/template/template_config_form.php:63
 #: include/template/template_config_form.php:73
+#: include/template/template_config_form.php:104
+#: include/template/template_config_form.php:104
 msgid "Adresse Serveur Postgresql"
 msgstr ""
 
 #: include/template/template_config_form.php:59
 #: include/template/template_config_form.php:67
 #: include/template/template_config_form.php:77
+#: include/template/template_config_form.php:108
+#: include/template/template_config_form.php:108
 msgid "Port de Postgresql"
 msgstr ""
 
@@ -20721,6 +21898,7 @@ msgstr ""
 #: include/lib/user_menu.php:122 include/lib/user_menu.php:123
 #: include/lib/user_menu.php:142 include/lib/user_menu.php:80
 #: include/lib/user_menu.php:99 include/lib/user_menu.php:79
+#: include/lib/user_menu.php:98 include/lib/user_menu.php:79
 #: include/lib/user_menu.php:98
 msgid "Information système"
 msgstr ""
@@ -20775,8 +21953,13 @@ msgstr ""
 #: include/class/fiche.class.php:2247 html/ajax_misc.php:464
 #: include/lib/manage_table_sql.class.php:634 html/ajax_misc.php:468
 #: include/ajax/ajax_card.php:292 include/class/acc_ledger.class.php:2201
-#: html/ajax_misc.php:433 html/user_login.php:158
-#: include/compta_fin_saldo.inc.php:44
+#: html/ajax_misc.php:433 include/class/pre_operation.class.php:346
+#: include/class/acc_ledger.class.php:2220 include/class/fiche.class.php:2274
+#: include/ajax/ajax_card.php:298 include/compta_fin_rec.inc.php:263
+#: include/template/tag_select.php:18 include/template/tag_search_select.php:15
+#: include/lib/manage_table_sql.class.php:681 html/ajax_misc.php:441
+#: include/user.inc.php:140 include/dossier.inc.php:242 html/ajax_misc.php:441
+#: html/user_login.php:158 include/compta_fin_saldo.inc.php:44
 #: include/class/pre_operation.class.php:346
 #: include/class/acc_ledger.class.php:2220 include/class/fiche.class.php:2274
 #: include/class/anc_listing.class.php:76 include/ajax/ajax_card.php:298
@@ -20787,8 +21970,8 @@ msgstr ""
 #: include/template/todo_list_list_user.php:31
 #: include/template/anc_key_display_list.php:28
 #: include/template/tag_search_select.php:15
-#: include/template/fiche_def_list.php:32 include/user.inc.php:138
-#: include/dossier.inc.php:239 include/report.inc.php:142
+#: include/template/fiche_def_list.php:32 include/user.inc.php:140
+#: include/dossier.inc.php:242 include/report.inc.php:142
 #: include/lib/manage_table_sql.class.php:681
 #, php-format
 msgid "Cherche"
@@ -20894,9 +22077,10 @@ msgstr ""
 #: include/adm.inc.php:81 include/bank.inc.php:74 include/contact.inc.php:77
 #: include/customer.inc.php:77 include/manager.inc.php:81
 #: include/supplier.inc.php:81 include/adm.inc.php:78
-#: include/customer.inc.php:78 include/bank.inc.php:74 include/adm.inc.php:78
-#: include/supplier.inc.php:81 include/contact.inc.php:78
-#: include/customer.inc.php:78 include/manager.inc.php:81
+#: include/customer.inc.php:78 include/contact.inc.php:78
+#: include/bank.inc.php:74 include/adm.inc.php:78 include/supplier.inc.php:81
+#: include/contact.inc.php:78 include/customer.inc.php:78
+#: include/manager.inc.php:81
 msgid "Cherche "
 msgstr ""
 
@@ -21028,19 +22212,22 @@ msgstr ""
 msgid "Valide?"
 msgstr ""
 
-#: include/lib/message_javascript.php:31 include/lib/message_javascript.php:31
+#: include/lib/message_javascript.php:31 include/lib/message_javascript.php:32
+#: include/lib/message_javascript.php:32
 msgid ""
 "Cherchez en saisissant le quickcode, le poste comptable ou une partie du nom "
 "de la fiche ou de l'adresse"
 msgstr ""
 
-#: include/lib/message_javascript.php:32 include/lib/message_javascript.php:32
+#: include/lib/message_javascript.php:32 include/lib/message_javascript.php:33
+#: include/lib/message_javascript.php:33
 msgid ""
 "(optionnel) La description est un commentaire libre qui sert à identifier "
 "cette opération"
 msgstr ""
 
-#: include/lib/message_javascript.php:33 include/lib/message_javascript.php:33
+#: include/lib/message_javascript.php:33 include/lib/message_javascript.php:34
+#: include/lib/message_javascript.php:34
 msgid "Selectionnez le journal où l'opération doit être sauvée"
 msgstr ""
 
@@ -21052,140 +22239,167 @@ msgid ""
 "mettez \"Afficher la période comptable\" à non"
 msgstr ""
 
-#: include/lib/message_javascript.php:35 include/lib/message_javascript.php:35
+#: include/lib/message_javascript.php:35 include/lib/message_javascript.php:36
+#: include/lib/message_javascript.php:36
 msgid "(optionnel) L'échéance est la date limite de paiement"
 msgstr ""
 
-#: include/lib/message_javascript.php:36 include/lib/message_javascript.php:36
+#: include/lib/message_javascript.php:36 include/lib/message_javascript.php:37
+#: include/lib/message_javascript.php:37
 msgid ""
 "(optionnel)Le numéro d'extrait permet de retrouver plus facilement l'extrait "
 "de banque"
 msgstr ""
 
-#: include/lib/message_javascript.php:37 include/lib/message_javascript.php:37
+#: include/lib/message_javascript.php:37 include/lib/message_javascript.php:38
+#: include/lib/message_javascript.php:38
 msgid ""
 "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%"
 msgstr ""
 
-#: include/lib/message_javascript.php:38 include/lib/message_javascript.php:38
+#: include/lib/message_javascript.php:38 include/lib/message_javascript.php:39
+#: include/lib/message_javascript.php:39
 msgid ""
 "(optionnel) Ces champs servent à contrôler que les montants correspondent à "
 "l'extrait"
 msgstr ""
 
-#: include/lib/message_javascript.php:39 include/lib/message_javascript.php:39
+#: include/lib/message_javascript.php:39 include/lib/message_javascript.php:40
+#: include/lib/message_javascript.php:40
 msgid ""
 "(optionnel) Ce montant correspond au total tva, si vous le laissez à vide, "
 "il sera calculé automatiquement en fonction du taux"
 msgstr ""
 
-#: include/lib/message_javascript.php:40 include/lib/message_javascript.php:40
+#: include/lib/message_javascript.php:40 include/lib/message_javascript.php:41
+#: include/lib/message_javascript.php:41
 msgid ""
 "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é"
 msgstr ""
 
-#: include/lib/message_javascript.php:41 include/lib/message_javascript.php:41
+#: include/lib/message_javascript.php:41 include/lib/message_javascript.php:42
+#: include/lib/message_javascript.php:42
 msgid ""
 "ATTENTION changer le poste comptable d'une fiche <b>ne modifiera pas toutes "
 "les opérations</b> où cette fiche est utilisée"
 msgstr ""
 
-#: include/lib/message_javascript.php:42 include/lib/message_javascript.php:42
+#: include/lib/message_javascript.php:42 include/lib/message_javascript.php:43
+#: include/lib/message_javascript.php:43
 msgid "ATTENTION si le poste comptable est  vide, il sera créé automatiquement"
 msgstr ""
 
-#: include/lib/message_javascript.php:43 include/lib/message_javascript.php:43
+#: include/lib/message_javascript.php:43 include/lib/message_javascript.php:44
+#: include/lib/message_javascript.php:44
 msgid "Document généré uniquement si le mode de paiement est utilisé"
 msgstr ""
 
-#: include/lib/message_javascript.php:44 include/lib/message_javascript.php:44
+#: include/lib/message_javascript.php:44 include/lib/message_javascript.php:45
+#: include/lib/message_javascript.php:45
 msgid "Vous pouvez utiliser le % pour indiquer le poste parent"
 msgstr ""
 
-#: include/lib/message_javascript.php:45 include/lib/message_javascript.php:45
+#: include/lib/message_javascript.php:45 include/lib/message_javascript.php:46
+#: include/lib/message_javascript.php:46
 msgid "Attention, le poste comptable doit exister, il ne sera pas vérifié"
 msgstr ""
 
-#: include/lib/message_javascript.php:46 include/lib/message_javascript.php:46
+#: include/lib/message_javascript.php:46 include/lib/message_javascript.php:47
+#: include/lib/message_javascript.php:47
 msgid "Laissez à 0 pour ne rien changer"
 msgstr ""
 
-#: include/lib/message_javascript.php:47 include/lib/message_javascript.php:47
+#: include/lib/message_javascript.php:47 include/lib/message_javascript.php:48
+#: include/lib/message_javascript.php:48
 msgid "Vous devez donner la date par opération"
 msgstr ""
 
-#: include/lib/message_javascript.php:48 include/lib/message_javascript.php:48
+#: include/lib/message_javascript.php:48 include/lib/message_javascript.php:49
+#: include/lib/message_javascript.php:49
 msgid "Cliquez sur le titre d'une colonne pour trier"
 msgstr ""
 
-#: include/lib/message_javascript.php:49 include/lib/message_javascript.php:49
+#: include/lib/message_javascript.php:49 include/lib/message_javascript.php:50
+#: include/lib/message_javascript.php:50
 msgid ""
 "Donnez une partie du nom, prénom, de la description, du poste comptable, du n"
 "° de TVA,quick code ... "
 msgstr ""
 
-#: include/lib/message_javascript.php:50 include/lib/message_javascript.php:50
+#: include/lib/message_javascript.php:50 include/lib/message_javascript.php:51
+#: include/lib/message_javascript.php:51
 msgid ""
 "Donnez une partie du nom, de la description,  du n° de TVA du poste "
 "comptable ou du quick code"
 msgstr ""
 
-#: include/lib/message_javascript.php:51 include/lib/message_javascript.php:51
+#: include/lib/message_javascript.php:51 include/lib/message_javascript.php:52
+#: include/lib/message_javascript.php:52
 msgid ""
 "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"
 msgstr ""
 
-#: include/lib/message_javascript.php:52 include/lib/message_javascript.php:52
+#: include/lib/message_javascript.php:52 include/lib/message_javascript.php:53
+#: include/lib/message_javascript.php:53
 msgid "Donnez un nombre entre 0 & 100"
 msgstr ""
 
-#: include/lib/message_javascript.php:53 include/lib/message_javascript.php:53
+#: include/lib/message_javascript.php:53 include/lib/message_javascript.php:54
+#: include/lib/message_javascript.php:54
 msgid ""
 "Donnez une partie du nom du dossier,du nom, du prénom ou du login pour "
 "filtrer"
 msgstr ""
 
-#: include/lib/message_javascript.php:54 include/lib/message_javascript.php:54
+#: include/lib/message_javascript.php:54 include/lib/message_javascript.php:55
+#: include/lib/message_javascript.php:55
 msgid "Donnez une partie du nom du dossier ou de la description pour filtrer"
 msgstr ""
 
-#: include/lib/message_javascript.php:55 include/lib/message_javascript.php:55
+#: include/lib/message_javascript.php:55 include/lib/message_javascript.php:56
+#: include/lib/message_javascript.php:56
 msgid "Donnez une partie du poste comptable ou du libellé pour filtrer"
 msgstr ""
 
-#: include/lib/message_javascript.php:56 include/lib/message_javascript.php:56
+#: include/lib/message_javascript.php:56 include/lib/message_javascript.php:57
+#: include/lib/message_javascript.php:57
 msgid ""
 "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é"
 msgstr ""
 
-#: include/lib/message_javascript.php:57 include/lib/message_javascript.php:57
+#: include/lib/message_javascript.php:57 include/lib/message_javascript.php:58
+#: include/lib/message_javascript.php:58
 msgid "Donnez une partie du quickcode, nom, description... pour filtrer"
 msgstr ""
 
-#: include/lib/message_javascript.php:58 include/lib/message_javascript.php:58
+#: include/lib/message_javascript.php:58 include/lib/message_javascript.php:59
+#: include/lib/message_javascript.php:59
 msgid ""
 "Attention, <b>SI</b> la fiche a changé de poste comptable, c'est seulement "
 "le dernier qui est affiché"
 msgstr ""
 
-#: include/lib/message_javascript.php:60 include/lib/message_javascript.php:60
+#: include/lib/message_javascript.php:60 include/lib/message_javascript.php:61
+#: include/lib/message_javascript.php:61
 msgid ""
 "Si vous ne donnez pas de nom, ce sera le nom du fichier qui sera utilisé"
 msgstr ""
 
-#: include/lib/message_javascript.php:61 include/lib/message_javascript.php:61
+#: include/lib/message_javascript.php:61 include/lib/message_javascript.php:62
+#: include/lib/message_javascript.php:62
 msgid ""
 "Peut contenir une information telle que le message structuré sur le virement"
 msgstr ""
 
-#: include/lib/message_javascript.php:62 include/lib/message_javascript.php:62
+#: include/lib/message_javascript.php:62 include/lib/message_javascript.php:63
+#: include/lib/message_javascript.php:63
 msgid "Peut contenir un numéro de bon de commande"
 msgstr ""
 
@@ -21203,7 +22417,6 @@ msgid ""
 msgstr ""
 
 #: include/lib/message_javascript.php:64 include/lib/message_javascript.php:66
-#: include/lib/message_javascript.php:66
 msgid ""
 "le type vaut :<ul>\t<li> ME pour Menu</li>\t<li> PR pour les impressions </"
 "li>\t<li> PL pour les plugins</li>\t<li> SP pour des valeurs spéciales</li>"
@@ -21211,12 +22424,12 @@ msgid ""
 msgstr ""
 
 #: include/lib/message_javascript.php:65 include/lib/message_javascript.php:67
-#: include/lib/message_javascript.php:67
+#: include/lib/message_javascript.php:68 include/lib/message_javascript.php:68
 msgid "Cliquez sur le code AD pour ouvrir le menu dans un nouvel onglet"
 msgstr ""
 
 #: include/lib/message_javascript.php:66 include/lib/message_javascript.php:68
-#: include/lib/message_javascript.php:68
+#: include/lib/message_javascript.php:69 include/lib/message_javascript.php:69
 msgid "Cliquez sur le chemin pour ouvrir le menu"
 msgstr ""
 
@@ -21227,7 +22440,7 @@ msgid ""
 msgstr ""
 
 #: include/lib/message_javascript.php:69 include/lib/message_javascript.php:71
-#: include/lib/message_javascript.php:71
+#: include/lib/message_javascript.php:72 include/lib/message_javascript.php:72
 msgid ""
 "La numérotation est propre à chaque journal. Laissez à 0 pour ne pas changer "
 "le numéro"
@@ -21243,7 +22456,8 @@ msgstr ""
 msgid "Mettez le pourcentage à zéro pour effacer la ligne"
 msgstr ""
 
-#: include/lib/message_javascript.php:34 include/lib/message_javascript.php:34
+#: include/lib/message_javascript.php:34 include/lib/message_javascript.php:35
+#: include/lib/message_javascript.php:35
 msgid ""
 "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 "
@@ -21265,7 +22479,7 @@ msgid ""
 msgstr ""
 
 #: include/lib/message_javascript.php:67 include/lib/message_javascript.php:69
-#: include/lib/message_javascript.php:69
+#: include/lib/message_javascript.php:70 include/lib/message_javascript.php:70
 msgid ""
 "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"
@@ -21351,11 +22565,13 @@ msgstr ""
 
 #: include/param_sec.inc.php:228 include/param_sec.inc.php:162
 #: include/param_sec.inc.php:168 include/param_sec.inc.php:173
+#: include/param_sec.inc.php:173
 msgid "Cet utilisateur est administrateur, il a tous les droits"
 msgstr ""
 
 #: include/param_sec.inc.php:231 include/param_sec.inc.php:165
 #: include/param_sec.inc.php:171 include/param_sec.inc.php:176
+#: include/param_sec.inc.php:176
 msgid ""
 "Impossible de modifier cet utilisateur dans cet écran, il faut passer par\n"
 "\t\tl'écran administration -> utilisateur."
@@ -21363,11 +22579,13 @@ msgstr ""
 
 #: include/param_sec.inc.php:242 include/param_sec.inc.php:176
 #: include/param_sec.inc.php:182 include/param_sec.inc.php:187
+#: include/param_sec.inc.php:187
 msgid "L'utilisateur n'a pas accès à ce dossier"
 msgstr ""
 
 #: include/param_sec.inc.php:244 include/param_sec.inc.php:178
 #: include/param_sec.inc.php:184 include/param_sec.inc.php:189
+#: include/param_sec.inc.php:189
 msgid ""
 "Impossible de modifier cet utilisateur dans cet écran, il faut passer par\n"
 "\t\t\tl'écran administration -> utilisateur."
@@ -21375,21 +22593,25 @@ msgstr ""
 
 #: include/param_sec.inc.php:278 include/param_sec.inc.php:220
 #: include/param_sec.inc.php:224 include/param_sec.inc.php:262
+#: include/param_sec.inc.php:262
 msgid "Accès à tout"
 msgstr ""
 
 #: include/param_sec.inc.php:279 include/param_sec.inc.php:221
 #: include/param_sec.inc.php:225 include/param_sec.inc.php:263
+#: include/param_sec.inc.php:263
 msgid "Uniquement Lecture"
 msgstr ""
 
 #: include/param_sec.inc.php:320 include/param_sec.inc.php:260
 #: include/param_sec.inc.php:292 include/template/security_list_action.php:8
+#: include/template/security_list_action.php:8
 msgid "Toutes les actions"
 msgstr ""
 
 #: include/param_sec.inc.php:321 include/param_sec.inc.php:261
 #: include/param_sec.inc.php:293 include/template/security_list_action.php:9
+#: include/template/security_list_action.php:9
 msgid "Aucune action"
 msgstr ""
 
@@ -21424,6 +22646,7 @@ msgstr ""
 #: html/install.php:605 html/install.php:621 html/install.php:613
 #: html/install.php:619 html/install.php:581 html/install.php:571
 #: html/install.php:577 html/install.php:580 html/install.php:630
+#: html/install.php:636 html/install.php:636
 #, php-format
 msgid ""
 "La base de donnée %s est vide, \n"
@@ -21454,12 +22677,13 @@ msgstr ""
 
 #: include/export/export_fiche_balance_csv.php:57 include/fiche.inc.php:587
 #: include/fiche.inc.php:596 include/fiche.inc.php:609
-#: include/export/export_fiche_balance_csv.php:57
+#: include/fiche.inc.php:609 include/export/export_fiche_balance_csv.php:57
 msgid "solde"
 msgstr ""
 
 #: include/export/export_fiche_csv.php:36
 #: include/export/export_fiche_csv.php:37
+#: include/export/export_fiche_csv.php:37
 msgid "fiche"
 msgstr ""
 
@@ -21477,6 +22701,8 @@ msgstr ""
 #: include/export/export_histo_csv.php:40
 #: include/export/export_histo_csv.php:41
 #: include/class/print_ledger_misc.class.php:44 include/compta_ods.inc.php:96
+#: include/class/print_ledger_misc.class.php:43
+#: include/export/export_histo_csv.php:44
 #: include/class/print_ledger_misc.class.php:43 include/compta_ods.inc.php:96
 #: include/export/export_histo_csv.php:44
 msgid "Piece"
@@ -21486,6 +22712,7 @@ msgstr ""
 #: include/export/export_histo_csv.php:45
 #: include/export/export_histo_csv.php:46
 #: include/export/export_histo_csv.php:49
+#: include/export/export_histo_csv.php:49
 msgid "Montant opération"
 msgstr ""
 
@@ -21506,6 +22733,10 @@ msgstr ""
 #: include/class/acc_ledger_history_purchase.class.php:244
 #: include/class/acc_ledger_history_generic.class.php:762
 #: include/class/acc_ledger_history_sale.class.php:243
+#: include/class/acc_ledger_history_purchase.class.php:255
+#: include/class/acc_ledger_history_generic.class.php:763
+#: include/export/export_ledger_csv.php:49
+#: include/class/acc_ledger_history_sale.class.php:243
 #: include/class/acc_reconciliation.class.php:487
 #: include/class/acc_reconciliation.class.php:511
 #: include/class/acc_ledger_history_purchase.class.php:255
@@ -21539,6 +22770,10 @@ msgstr ""
 #: include/class/acc_ledger_history_purchase.class.php:266
 #: include/class/acc_ledger_history_generic.class.php:768
 #: include/export/export_ledger_csv.php:226
+#: include/class/acc_ledger_history_sale.class.php:254
+#: include/class/acc_ledger_history_purchase.class.php:266
+#: include/class/acc_ledger_history_generic.class.php:768
+#: include/export/export_ledger_csv.php:226
 msgid "operation"
 msgstr ""
 
@@ -21556,6 +22791,8 @@ msgstr ""
 #: include/class/acc_ledger_history_generic.class.php:768
 #: include/class/acc_ledger_history_generic.class.php:769
 #: include/export/export_ledger_csv.php:228
+#: include/class/acc_ledger_history_generic.class.php:769
+#: include/export/export_ledger_csv.php:228
 msgid "N° Pièce"
 msgstr ""
 
@@ -21567,6 +22804,7 @@ msgstr ""
 #: include/export/export_ledger_csv.php:215
 #: include/export/export_ledger_csv.php:223
 #: include/export/export_ledger_csv.php:231
+#: include/export/export_ledger_csv.php:231
 msgid "commentaire"
 msgstr ""
 
@@ -21582,6 +22820,8 @@ msgstr ""
 #: include/export/export_ledger_csv.php:216
 #: include/export/export_ledger_csv.php:224
 #: include/class/acc_ledger_history_generic.class.php:685
+#: include/class/acc_ledger_history_generic.class.php:686
+#: include/export/export_ledger_csv.php:232
 #: include/class/acc_reconciliation.class.php:484
 #: include/class/acc_ledger_history_generic.class.php:686
 #: include/export/export_ledger_csv.php:232
@@ -21606,6 +22846,8 @@ msgstr ""
 #: include/class/acc_ledger_history_purchase.class.php:255
 #: include/class/acc_ledger_history_purchase.class.php:259
 #: include/class/acc_ledger_history_sale.class.php:258
+#: include/class/acc_ledger_history_purchase.class.php:270
+#: include/class/acc_ledger_history_sale.class.php:258
 #: include/class/acc_reconciliation.class.php:508
 #: include/class/acc_ledger_history_purchase.class.php:270
 msgid "interne"
@@ -21619,6 +22861,7 @@ msgstr ""
 #: include/class/acc_ledger_history_purchase.class.php:257
 #: include/class/acc_ledger_history_purchase.class.php:261
 #: include/class/acc_ledger_history_purchase.class.php:272
+#: include/class/acc_ledger_history_purchase.class.php:272
 msgid "privé"
 msgstr ""
 
@@ -21630,6 +22873,7 @@ msgstr ""
 #: include/class/acc_ledger_history_purchase.class.php:258
 #: include/class/acc_ledger_history_purchase.class.php:262
 #: include/class/acc_ledger_history_purchase.class.php:273
+#: include/class/acc_ledger_history_purchase.class.php:273
 msgid "DNA"
 msgstr ""
 
@@ -21641,6 +22885,7 @@ msgstr ""
 #: include/class/acc_ledger_history_purchase.class.php:259
 #: include/class/acc_ledger_history_purchase.class.php:263
 #: include/class/acc_ledger_history_purchase.class.php:274
+#: include/class/acc_ledger_history_purchase.class.php:274
 msgid "tva non ded."
 msgstr ""
 
@@ -21752,21 +22997,22 @@ msgid "nom journal"
 msgstr ""
 
 #: include/compta_fin_rec.inc.php:151 include/compta_fin_rec.inc.php:188
+#: include/compta_fin_rec.inc.php:188
 msgid "Attention : Fichier non chargé"
 msgstr ""
 
 #: include/compta_fin_rec.inc.php:299 include/compta_fin_rec.inc.php:300
-#: include/compta_fin_rec.inc.php:341
+#: include/compta_fin_rec.inc.php:341 include/compta_fin_rec.inc.php:341
 msgid "Différence relevé"
 msgstr ""
 
 #: include/compta_fin_rec.inc.php:303 include/compta_fin_rec.inc.php:304
-#: include/compta_fin_rec.inc.php:345
+#: include/compta_fin_rec.inc.php:345 include/compta_fin_rec.inc.php:345
 msgid "Montant sélectionné"
 msgstr ""
 
 #: include/compta_fin_rec.inc.php:306 include/compta_fin_rec.inc.php:307
-#: include/compta_fin_rec.inc.php:348
+#: include/compta_fin_rec.inc.php:348 include/compta_fin_rec.inc.php:348
 msgid "Reste à selectionner"
 msgstr ""
 
@@ -21828,6 +23074,9 @@ msgstr ""
 #: html/install.php:632 html/install.php:552 html/install.php:635
 #: html/install.php:259 html/install.php:602 html/install.php:659
 #: html/install.php:688 include/class/follow_up.class.php:731
+#: html/install.php:264 html/install.php:608 html/install.php:694
+#: html/install.php:264 html/install.php:608 html/install.php:665
+#: html/install.php:694
 msgid "Important"
 msgstr ""
 
@@ -21838,12 +23087,15 @@ msgstr ""
 #: html/install.php:600 html/install.php:626 html/install.php:607
 #: html/install.php:633 html/install.php:217 html/install.php:636
 #: html/install.php:264 html/install.php:660 html/install.php:689
+#: html/install.php:269 html/install.php:695 html/install.php:269
+#: html/install.php:666 html/install.php:695
 msgid "Utilisateur administrateur"
 msgstr ""
 
 #: html/install.php:594 html/install.php:586 html/install.php:592
 #: html/install.php:554 html/install.php:544 html/install.php:550
-#: html/install.php:553 html/install.php:603
+#: html/install.php:553 html/install.php:603 html/install.php:609
+#: html/install.php:609
 msgid "Utilisateur  administrateur"
 msgstr ""
 
@@ -21855,6 +23107,7 @@ msgstr ""
 #: include/param_sec.inc.php:285 include/param_sec.inc.php:227
 #: include/param_sec.inc.php:280 include/param_sec.inc.php:258
 #: include/param_sec.inc.php:337 include/param_sec.inc.php:269
+#: include/param_sec.inc.php:352 include/param_sec.inc.php:269
 #: include/param_sec.inc.php:352
 msgid "Uniquement lecture"
 msgstr ""
@@ -21862,17 +23115,20 @@ msgstr ""
 #: include/param_sec.inc.php:286 include/param_sec.inc.php:228
 #: include/param_sec.inc.php:278 include/param_sec.inc.php:259
 #: include/param_sec.inc.php:335 include/param_sec.inc.php:270
+#: include/param_sec.inc.php:350 include/param_sec.inc.php:270
 #: include/param_sec.inc.php:350
 msgid "Lecture et écriture"
 msgstr ""
 
 #: include/param_sec.inc.php:319 include/param_sec.inc.php:259
 #: include/param_sec.inc.php:291 include/param_sec.inc.php:303
+#: include/param_sec.inc.php:303
 msgid "Actions"
 msgstr ""
 
 #: include/param_sec.inc.php:324 include/param_sec.inc.php:264
 #: include/param_sec.inc.php:321 include/param_sec.inc.php:336
+#: include/param_sec.inc.php:336
 msgid "imprime"
 msgstr ""
 
@@ -21882,23 +23138,27 @@ msgstr ""
 
 #: include/template/detail-action.php:167
 #: include/template/detail-action.php:174
+#: include/template/detail-action.php:176
+#: include/template/detail-action.php:176
 msgid "Opérations concernées"
 msgstr ""
 
 #: include/template/detail-action.php:168
 #: include/template/detail-action.php:175
+#: include/template/detail-action.php:177
+#: include/template/detail-action.php:177
 msgid "Dépendant"
 msgstr ""
 
 #: include/template/param_jrn.php:136 include/template/param_jrn.php:143
 #: include/template/param_jrn.php:145 include/template/param_jrn.php:190
-#: include/template/param_jrn.php:191
+#: include/template/param_jrn.php:191 include/template/param_jrn.php:191
 msgid "Services, fournitures ou biens  achetés (D)"
 msgstr ""
 
 #: include/template/param_jrn.php:139 include/template/param_jrn.php:146
 #: include/template/param_jrn.php:148 include/template/param_jrn.php:193
-#: include/template/param_jrn.php:194
+#: include/template/param_jrn.php:194 include/template/param_jrn.php:194
 msgid "Fournisseurs (C)"
 msgstr ""
 
@@ -21912,12 +23172,14 @@ msgstr ""
 
 #: include/template/param_jrn.php:251 include/template/param_jrn.php:258
 #: include/template/param_jrn.php:260 include/template/param_jrn.php:305
-#: include/template/param_jrn.php:306
+#: include/template/param_jrn.php:306 include/template/param_jrn.php:306
 msgid "Fiches utilisables (D/C)"
 msgstr ""
 
 #: include/template/template_config_form.php:56
 #: include/template/template_config_form.php:57
+#: include/template/template_config_form.php:38
+#: include/template/template_config_form.php:38
 msgid "Administrateur de noalyss"
 msgstr ""
 
@@ -21998,6 +23260,8 @@ msgstr ""
 #: include/class/follow_up.class.php:1921
 #: include/class/follow_up.class.php:1922
 #: include/class/follow_up.class.php:1871
+#: include/class/follow_up.class.php:1845
+#: include/class/follow_up.class.php:1845
 msgid "Principal"
 msgstr ""
 
@@ -22007,6 +23271,8 @@ msgstr ""
 #: include/class/follow_up.class.php:1948
 #: include/class/follow_up.class.php:1949
 #: include/class/follow_up.class.php:1901
+#: include/class/follow_up.class.php:1875
+#: include/class/follow_up.class.php:1875
 msgid "direct parent "
 msgstr ""
 
@@ -22099,8 +23365,10 @@ msgstr ""
 #: include/export/export_poste_detail_pdf.php:225
 #: include/export/export_poste_detail_pdf.php:128
 #: include/export/export_poste_detail_pdf.php:236
-#: include/export/export_poste_detail_pdf.php:128
-#: include/export/export_poste_detail_pdf.php:236
+#: include/export/export_poste_detail_pdf.php:129
+#: include/export/export_poste_detail_pdf.php:237
+#: include/export/export_poste_detail_pdf.php:129
+#: include/export/export_poste_detail_pdf.php:237
 msgid " C "
 msgstr ""
 
@@ -22108,14 +23376,17 @@ msgstr ""
 #: include/export/export_poste_detail_pdf.php:230
 #: include/export/export_poste_detail_pdf.php:133
 #: include/export/export_poste_detail_pdf.php:241
-#: include/export/export_poste_detail_pdf.php:133
-#: include/export/export_poste_detail_pdf.php:241
+#: include/export/export_poste_detail_pdf.php:134
+#: include/export/export_poste_detail_pdf.php:242
+#: include/export/export_poste_detail_pdf.php:134
+#: include/export/export_poste_detail_pdf.php:242
 msgid " D "
 msgstr ""
 
 #: include/export/export_poste_detail_pdf.php:168
 #: include/export/export_poste_detail_pdf.php:179
-#: include/export/export_poste_detail_pdf.php:179
+#: include/export/export_poste_detail_pdf.php:180
+#: include/export/export_poste_detail_pdf.php:180
 msgid "C"
 msgstr ""
 
@@ -22123,6 +23394,8 @@ msgstr ""
 #: include/class/anc_grandlivre.class.php:167
 #: include/class/anc_grandlivre.class.php:168
 #: include/class/anc_grandlivre.class.php:180
+#: include/class/anc_grandlivre.class.php:181
+#: include/class/anc_grandlivre.class.php:181
 msgid ""
 "Les extensions CONVERT_GIF_PDF et PDFTK pour convertir en pdf ne sont pas "
 "installées "
@@ -22130,8 +23403,8 @@ msgstr ""
 
 #: include/dossier.inc.php:342 include/ajax/ajax_admin.php:213
 #: include/dossier.inc.php:347 include/ajax/ajax_admin.php:234
-#: include/ajax/ajax_admin.php:238 include/ajax/ajax_admin.php:238
-#: include/dossier.inc.php:347
+#: include/ajax/ajax_admin.php:238 include/dossier.inc.php:350
+#: include/ajax/ajax_admin.php:238 include/dossier.inc.php:350
 msgid "Max. email / jour (-1 = illimité)"
 msgstr ""
 
@@ -22246,6 +23519,7 @@ msgstr ""
 #: include/lib/class_sendmail.php:98 include/lib/sendmail.class.php:98
 #: include/lib/sendmail.class.php:102 include/lib/sendmail_core.class.php:105
 #: include/lib/sendmail_core.class.php:106
+#: include/lib/sendmail_core.class.php:106
 #, php-format
 msgid "%s est vide"
 msgstr ""
@@ -22354,6 +23628,7 @@ msgstr ""
 #: include/ext/import_account/include/impacc_export.class.php:104
 #: include/class/acc_ledger.class.php:2938
 #: include/class/acc_ledger.class.php:2962
+#: include/class/acc_ledger.class.php:2962
 msgid "Journal invalide"
 msgstr ""
 
@@ -22385,6 +23660,8 @@ msgstr ""
 #: include/ext/import_account/include/impacc_tva.class.php:64
 #: include/ext/import_account/include/impacc_tva.class.php:76
 #: include/template/ledger_detail_bottom.php:354
+#: include/template/ledger_detail_bottom.php:371
+#: include/template/ledger_detail_bottom.php:371
 msgid "Duplicate"
 msgstr ""
 
@@ -22433,6 +23710,7 @@ msgstr ""
 #: include/balance.inc.php:458 include/export/export_balance_pdf.php:334
 #: include/export/export_balance_pdf.php:329
 #: include/export/export_balance_pdf.php:330
+#: include/export/export_balance_pdf.php:331
 #: include/export/export_balance_pdf.php:331 include/balance.inc.php:458
 msgid "Résumé Exercice précédent"
 msgstr ""
@@ -22442,6 +23720,7 @@ msgstr ""
 #: include/balance.inc.php:465 include/export/export_balance_pdf.php:341
 #: include/export/export_balance_pdf.php:336
 #: include/export/export_balance_pdf.php:337
+#: include/export/export_balance_pdf.php:338
 #: include/export/export_balance_pdf.php:338 include/balance.inc.php:465
 msgid "Résumé Exercice courant"
 msgstr ""
@@ -22454,7 +23733,7 @@ msgstr ""
 
 #: include/compta_ach.inc.php:184 include/compta_ach.inc.php:186
 #: include/compta_ach.inc.php:191 include/compta_ach.inc.php:189
-#: include/compta_ach.inc.php:188
+#: include/compta_ach.inc.php:188 include/compta_ach.inc.php:188
 #, php-format
 msgid "Extourné au %s"
 msgstr ""
@@ -22465,7 +23744,7 @@ msgstr ""
 
 #: include/lib/ac_common.php:567 include/lib/ac_common.php:568
 #: include/lib/ac_common.php:570 include/lib/ac_common.php:586
-#: include/lib/ac_common.php:596
+#: include/lib/ac_common.php:596 include/lib/ac_common.php:596
 msgid "paramètre invalide"
 msgstr ""
 
@@ -22480,6 +23759,7 @@ msgstr ""
 #: include/lib/manage_table_sql.class.php:1022
 #: include/lib/manage_table_sql.class.php:1066
 #: include/lib/manage_table_sql.class.php:1122
+#: include/lib/manage_table_sql.class.php:1122
 msgid "OK"
 msgstr ""
 
@@ -22490,6 +23770,7 @@ msgstr ""
 #: include/lib/manage_table_sql.class.php:1025
 #: include/lib/manage_table_sql.class.php:1069
 #: include/lib/manage_table_sql.class.php:1125
+#: include/lib/manage_table_sql.class.php:1125
 msgid "Cancel"
 msgstr ""
 
@@ -22544,6 +23825,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2835
 #: include/class/acc_ledger.class.php:2874
 #: include/class/acc_ledger.class.php:2898
+#: include/class/acc_ledger.class.php:2898
 msgid "Opération identique"
 msgstr ""
 
@@ -22571,6 +23853,8 @@ msgstr ""
 #: include/class/class_pdf_operation.php:422
 #: include/class/pdf_operation.class.php:421
 #: include/class/pdf_operation.class.php:422
+#: include/template/follow_up_detail_display.php:45
+#: include/template/action_document_type_mtable_input.php:73
 #: include/class/pdf_operation.class.php:421
 #: include/class/pdf_operation.class.php:422
 #: include/template/follow_up_detail_display.php:45
@@ -22709,6 +23993,7 @@ msgid "Vous devez choisir au moins une ligne"
 msgstr ""
 
 #: include/compta_fin_rec.inc.php:339 include/compta_fin_rec.inc.php:380
+#: include/compta_fin_rec.inc.php:380
 msgid "Pièce justificative"
 msgstr ""
 
@@ -22734,16 +24019,19 @@ msgstr ""
 
 #: include/database.item.php:7 include/database.item.php:136
 #: include/database.item.php:134 include/database.item.php:135
+#: include/database.item.php:135
 msgid "Exporte la pièce"
 msgstr ""
 
 #: include/database.item.php:8 include/database.item.php:137
 #: include/database.item.php:135 include/database.item.php:136
+#: include/database.item.php:136
 msgid "Export le document"
 msgstr ""
 
 #: include/database.item.php:9 include/database.item.php:138
 #: include/database.item.php:136 include/database.item.php:137
+#: include/database.item.php:137
 msgid "Exporte le modèle de document"
 msgstr ""
 
@@ -22803,7 +24091,7 @@ msgid "Ecriture d'ouverture %d"
 msgstr ""
 
 #: include/operation_ods_new.inc.php:43 include/operation_ods_new.inc.php:44
-#: include/operation_ods_new.inc.php:45
+#: include/operation_ods_new.inc.php:45 include/operation_ods_new.inc.php:45
 msgid ""
 "Vous ne pouvez pas écrire dans ce journal, contactez votre administrateur"
 msgstr ""
@@ -22813,15 +24101,18 @@ msgid "Type d'utilisateur"
 msgstr ""
 
 #: include/param_sec.inc.php:85 include/param_sec.inc.php:86
+#: include/param_sec.inc.php:86
 msgid "prénom"
 msgstr ""
 
 #: include/param_sec.inc.php:86 include/param_sec.inc.php:87
+#: include/param_sec.inc.php:87
 msgid "profil"
 msgstr ""
 
 #: include/param_sec.inc.php:135 include/param_sec.inc.php:141
 #: include/category_followup.inc.php:50 include/param_sec.inc.php:146
+#: include/category_followup.inc.php:50 include/param_sec.inc.php:146
 msgid "retour"
 msgstr ""
 
@@ -22843,6 +24134,7 @@ msgstr ""
 
 #: include/template/form_ledger_detail.php:15
 #: include/template/form_ledger_detail.php:18
+#: include/template/form_ledger_detail.php:18
 msgid "Modèle opération"
 msgstr ""
 
@@ -22868,18 +24160,20 @@ msgstr ""
 #: include/template/ledger_detail_bottom.php:217
 #: include/template/ledger_detail_bottom.php:214
 #: include/template/ledger_detail_bottom.php:232
+#: include/template/ledger_detail_bottom.php:233
+#: include/template/ledger_detail_bottom.php:233
 msgid "delta"
 msgstr ""
 
 #: include/template/param_jrn.php:194 include/template/param_jrn.php:201
 #: include/template/param_jrn.php:203 include/template/param_jrn.php:248
-#: include/template/param_jrn.php:249
+#: include/template/param_jrn.php:249 include/template/param_jrn.php:249
 msgid "Clients (D)"
 msgstr ""
 
 #: include/template/param_jrn.php:197 include/template/param_jrn.php:204
 #: include/template/param_jrn.php:206 include/template/param_jrn.php:251
-#: include/template/param_jrn.php:252
+#: include/template/param_jrn.php:252 include/template/param_jrn.php:252
 msgid "Services, fournitures ou biens  vendus (C)"
 msgstr ""
 
@@ -22889,11 +24183,13 @@ msgstr ""
 
 #: include/lib/http_input.class.php:78 include/lib/http_input.class.php:85
 #: include/lib/http_input.class.php:87 include/lib/http_input.class.php:125
+#: include/lib/http_input.class.php:125
 msgid "Unknown type"
 msgstr ""
 
 #: include/lib/icard.class.php:222 include/lib/icard.class.php:223
 #: include/lib/icard.class.php:224 include/lib/icard.class.php:225
+#: include/lib/icard.class.php:225
 msgid "Le nom d une icard doit être donne"
 msgstr ""
 
@@ -22902,12 +24198,12 @@ msgid "Faites un choix"
 msgstr ""
 
 #: include/lib/inplace_edit.class.php:79 include/lib/inplace_edit.class.php:78
-#: include/lib/inplace_edit.class.php:81
+#: include/lib/inplace_edit.class.php:81 include/lib/inplace_edit.class.php:81
 msgid "ok"
 msgstr ""
 
 #: include/lib/inplace_edit.class.php:80 include/lib/inplace_edit.class.php:79
-#: include/lib/inplace_edit.class.php:82
+#: include/lib/inplace_edit.class.php:82 include/lib/inplace_edit.class.php:82
 msgid "cancel"
 msgstr ""
 
@@ -22918,29 +24214,34 @@ msgid "Invalide value"
 msgstr ""
 
 #: include/lib/message_javascript.php:72 include/lib/message_javascript.php:74
-#: include/lib/message_javascript.php:74
+#: include/lib/message_javascript.php:75 include/lib/message_javascript.php:75
 msgid "Mettez le pourcentage <br> à zéro pour effacer la ligne"
 msgstr ""
 
 #: include/ajax/ajax_anc_plan.php:56 include/class/anc_plan.class.php:126
 #: include/ajax/ajax_anc_plan.php:59 include/ajax/ajax_anc_plan.php:60
-#: include/class/anc_plan.class.php:127 include/ajax/ajax_anc_plan.php:60
+#: include/class/anc_plan.class.php:127 include/class/anc_plan.class.php:127
+#: include/ajax/ajax_anc_plan.php:60
 msgid "Aucune description"
 msgstr ""
 
 #: include/ajax/ajax_card.php:356 include/ajax/ajax_card.php:359
 #: include/ajax/ajax_card.php:360 include/ajax/ajax_card.php:393
+#: include/ajax/ajax_card.php:393
 msgid "Erreur sauvegarde"
 msgstr ""
 
 #: include/ajax/ajax_search_filter.php:73
 #: include/class/action_document_type_mtable.class.php:106
-#: include/ajax/ajax_search_filter.php:73
+#: include/ajax/ajax_search_filter.php:81
+#: include/class/action_document_type_mtable.class.php:106
+#: include/ajax/ajax_search_filter.php:81
 msgid "Nom ne peut être vide"
 msgstr ""
 
 #: include/ajax/ajax_search_filter.php:151
-#: include/ajax/ajax_search_filter.php:151
+#: include/ajax/ajax_search_filter.php:160
+#: include/ajax/ajax_search_filter.php:160
 msgid "Remise à zéro"
 msgstr ""
 
@@ -22981,24 +24282,28 @@ msgstr ""
 
 #: include/export/export_gl_pdf.php:88
 #: include/export/export_poste_detail_pdf.php:100
-#: include/export/export_poste_detail_pdf.php:100
+#: include/export/export_poste_detail_pdf.php:101
+#: include/export/export_poste_detail_pdf.php:101
 #: include/export/export_gl_pdf.php:88
 msgid "Let"
 msgstr ""
 
 #: include/export/export_poste_detail_pdf.php:60
-#: include/export/export_poste_detail_pdf.php:60
+#: include/export/export_poste_detail_pdf.php:61
+#: include/export/export_poste_detail_pdf.php:61
 #, php-format
 msgid "  Période : %s %s"
 msgstr ""
 
 #: include/export/export_poste_detail_pdf.php:64
-#: include/export/export_poste_detail_pdf.php:64
+#: include/export/export_poste_detail_pdf.php:65
+#: include/export/export_poste_detail_pdf.php:65
 msgid "Détail poste comptable"
 msgstr ""
 
 #: include/export/export_poste_detail_pdf.php:106
-#: include/export/export_poste_detail_pdf.php:106
+#: include/export/export_poste_detail_pdf.php:107
+#: include/export/export_poste_detail_pdf.php:107
 msgid "Prog"
 msgstr ""
 
@@ -23024,6 +24329,7 @@ msgstr ""
 
 #: include/export/export_security_pdf.php:104
 #: include/class/card_attribut_mtable.class.php:155
+#: include/class/card_attribut_mtable.class.php:155
 #: include/export/export_security_pdf.php:104
 msgid "Bloqué"
 msgstr ""
@@ -23094,6 +24400,7 @@ msgstr ""
 #: include/class/acc_account_ledger.class.php:392
 #: include/class/acc_account_ledger.class.php:393
 #: include/class/acc_account_ledger.class.php:385
+#: include/class/acc_account_ledger.class.php:385
 msgid "n° de pièce"
 msgstr ""
 
@@ -23103,6 +24410,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:803
 #: include/class/acc_ledger.class.php:819
 #: include/class/acc_ledger.class.php:807
+#: include/class/acc_ledger.class.php:807
 msgid "Modèle d'opération"
 msgstr ""
 
@@ -23112,6 +24420,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:986
 #: include/class/acc_ledger.class.php:1002
 #: include/class/acc_ledger.class.php:994
+#: include/class/acc_ledger.class.php:994
 #, php-format
 msgid "Réconciliation/rapprochements : %s"
 msgstr ""
@@ -23124,6 +24433,8 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:246
 #: include/class/acc_ledger_search.class.php:248
 #: include/class/acc_ledger_search.class.php:262
+#: include/class/acc_ledger_search.class.php:264
+#: include/class/acc_ledger_search.class.php:264
 msgid "Nom du filtre"
 msgstr ""
 
@@ -23132,6 +24443,8 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:1078
 #: include/class/acc_ledger_search.class.php:1091
 #: include/class/acc_ledger_search.class.php:1180
+#: include/class/acc_ledger_search.class.php:1203
+#: include/class/acc_ledger_search.class.php:1203
 msgid "Inverser sel"
 msgstr ""
 
@@ -23140,6 +24453,8 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:1080
 #: include/class/acc_ledger_search.class.php:1093
 #: include/class/acc_ledger_search.class.php:1182
+#: include/class/acc_ledger_search.class.php:1205
+#: include/class/acc_ledger_search.class.php:1205
 msgid "Effacer sel"
 msgstr ""
 
@@ -23148,6 +24463,8 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:1088
 #: include/class/acc_ledger_search.class.php:1101
 #: include/class/acc_ledger_search.class.php:1190
+#: include/class/acc_ledger_search.class.php:1213
+#: include/class/acc_ledger_search.class.php:1213
 msgid "Op.Diverses"
 msgstr ""
 
@@ -23223,6 +24540,7 @@ msgstr ""
 #: include/class/acc_plan_mtable.class.php:139
 #: include/class/acc_plan_mtable.class.php:163
 #: include/class/acc_plan_mtable.class.php:167
+#: include/class/acc_plan_mtable.class.php:167
 msgid "Poste comptable est unique"
 msgstr ""
 
@@ -23230,6 +24548,7 @@ msgstr ""
 #: include/class/acc_plan_mtable.class.php:142
 #: include/class/acc_plan_mtable.class.php:166
 #: include/class/acc_plan_mtable.class.php:170
+#: include/class/acc_plan_mtable.class.php:170
 msgid "Poste comptable ne peut être vide"
 msgstr ""
 
@@ -23248,8 +24567,11 @@ msgstr ""
 #: include/class/fiche.class.php:850 include/class/fiche.class.php:997
 #: include/class/fiche.class.php:1037 include/class/fiche.class.php:846
 #: include/class/fiche.class.php:876 include/class/fiche.class.php:877
-#: include/class/fiche.class.php:1023 include/class/fiche.class.php:1024
-#: include/class/fiche.class.php:1064
+#: include/class/fiche.class.php:1024 include/class/fiche.class.php:1064
+#: include/class/acc_plan_mtable.class.php:174
+#: include/class/fiche.class.php:846 include/class/fiche.class.php:876
+#: include/class/fiche.class.php:877 include/class/fiche.class.php:1023
+#: include/class/fiche.class.php:1024 include/class/fiche.class.php:1064
 #: include/class/acc_plan_mtable.class.php:174
 msgid "Poste comptable trop long"
 msgstr ""
@@ -23258,6 +24580,7 @@ msgstr ""
 #: include/class/acc_plan_mtable.class.php:149
 #: include/class/acc_plan_mtable.class.php:173
 #: include/class/acc_plan_mtable.class.php:177
+#: include/class/acc_plan_mtable.class.php:177
 msgid "Poste comptable dépendant ne peut pas être vide"
 msgstr ""
 
@@ -23265,6 +24588,7 @@ msgstr ""
 #: include/class/acc_plan_mtable.class.php:157
 #: include/class/acc_plan_mtable.class.php:181
 #: include/class/acc_plan_mtable.class.php:185
+#: include/class/acc_plan_mtable.class.php:185
 msgid "Compte parent n'existe pas"
 msgstr ""
 
@@ -23301,35 +24625,38 @@ msgid "Num Pièce"
 msgstr ""
 
 #: include/class/anc_table.class.php:233 include/fiche.inc.php:285
-#: include/class/anc_table.class.php:233
+#: include/fiche.inc.php:285 include/class/anc_table.class.php:233
 msgid "Export en CSV"
 msgstr ""
 
 #: include/class/fiche.class.php:838 include/class/fiche.class.php:840
 #: include/class/fiche.class.php:843 include/class/fiche.class.php:844
-#: include/class/fiche.class.php:871
+#: include/class/fiche.class.php:871 include/class/fiche.class.php:871
 msgid "Désolé, il y a trop de virgule dans le poste comptable "
 msgstr ""
 
 #: include/class/fiche.class.php:1047 include/class/fiche.class.php:1049
 #: include/class/fiche.class.php:1063 include/class/fiche.class.php:1064
-#: include/class/fiche.class.php:1091
+#: include/class/fiche.class.php:1091 include/class/fiche.class.php:1091
 msgid "opération annulée"
 msgstr ""
 
 #: include/class/pre_operation.class.php:285
 #: include/class/pre_operation.class.php:286
 #: include/class/pre_operation.class.php:343
+#: include/class/pre_operation.class.php:343
 msgid "Vous n'avez encore sauvé aucun modèle"
 msgstr ""
 
 #: html/ajax_misc.php:288 html/ajax_misc.php:290 html/ajax_misc.php:296
-#: html/ajax_misc.php:298 html/ajax_misc.php:313
+#: html/ajax_misc.php:298 html/ajax_misc.php:313 html/ajax_misc.php:321
+#: html/ajax_misc.php:321
 msgid "Invalide type"
 msgstr ""
 
 #: html/ajax_misc.php:452 html/ajax_misc.php:454 html/ajax_misc.php:460
 #: html/ajax_misc.php:462 html/ajax_misc.php:466 html/ajax_misc.php:431
+#: html/ajax_misc.php:439 html/ajax_misc.php:439
 msgid "Choisissez la TVA"
 msgstr ""
 
@@ -23337,13 +24664,15 @@ msgstr ""
 msgid "cliquez ici pour mettre à jour "
 msgstr ""
 
-#: html/install.php:142 html/install.php:155
+#: html/install.php:142 html/install.php:155 html/install.php:159
+#: html/install.php:159
 msgid ""
 "Indiquez ici le répertoire où les documents temporaires peuvent être sauvés "
 "exemple c:/temp, /tmp"
 msgstr ""
 
 #: html/install.php:370 html/install.php:373 html/install.php:422
+#: html/install.php:428 html/install.php:428
 msgid "open_basedir empêche certaines fonctions de Noalyss,mettez-le à vide "
 msgstr ""
 
@@ -23357,19 +24686,20 @@ msgid ""
 msgstr ""
 
 #: html/install.php:629 html/install.php:636 html/install.php:639
-#: html/install.php:692
+#: html/install.php:692 html/install.php:698 html/install.php:698
 #, php-format
 msgid "VOUS DEVEZ EFFACER CE FICHIER %s"
 msgstr ""
 
 #: html/install.php:632 html/install.php:592 html/install.php:639
 #: html/install.php:595 html/install.php:642 html/install.php:645
-#: html/install.php:695
+#: html/install.php:695 html/install.php:651 html/install.php:701
+#: html/install.php:651 html/install.php:701
 msgid "Tout est installé"
 msgstr ""
 
 #: html/install.php:636 html/install.php:643 html/install.php:646
-#: html/install.php:699
+#: html/install.php:699 html/install.php:705 html/install.php:705
 msgid "Essai effacement install.php et se connecter à NOALYSS"
 msgstr ""
 
@@ -23410,13 +24740,14 @@ msgstr ""
 
 #: include/compta_ach.inc.php:109 include/compta_ven.inc.php:116
 #: include/operation_ods_confirm.inc.php:67 include/compta_ven.inc.php:114
-#: include/compta_ach.inc.php:107 include/compta_ven.inc.php:114
-#: include/compta_ach.inc.php:106 include/operation_ods_confirm.inc.php:67
+#: include/compta_ach.inc.php:107 include/compta_ach.inc.php:106
+#: include/compta_ven.inc.php:114 include/compta_ach.inc.php:106
+#: include/operation_ods_confirm.inc.php:67
 msgid "Message extourne"
 msgstr ""
 
 #: include/database.item.php:89 include/database.item.php:87
-#: include/database.item.php:88
+#: include/database.item.php:88 include/database.item.php:88
 msgid ""
 "Chargement de modèles de documents qui seront générés par NOALYSS, les "
 "formats utilisables sont libreoffice, html, text et rtf"
@@ -23456,50 +24787,63 @@ msgstr ""
 #: include/operation_ods_confirm.inc.php:54
 #: include/template/ledger_detail_bottom.php:155
 #: include/template/ledger_detail_bottom.php:160
+#: include/template/ledger_detail_bottom.php:161
+#: include/template/ledger_detail_bottom.php:161
 #: include/operation_ods_confirm.inc.php:54
 msgid "Type opération"
 msgstr ""
 
 #: include/param_sec.inc.php:87 include/param_sec.inc.php:88
+#: include/param_sec.inc.php:88
 msgid "Séc. Journaux actif"
 msgstr ""
 
 #: include/param_sec.inc.php:88 include/param_sec.inc.php:89
+#: include/param_sec.inc.php:89
 msgid "Séc. Action actif"
 msgstr ""
 
 #: include/param_sec.inc.php:231 include/param_sec.inc.php:234
+#: include/param_sec.inc.php:234
 msgid "Sécurité sur les journaux"
 msgstr ""
 
 #: include/param_sec.inc.php:237 include/param_sec.inc.php:302
 #: include/param_sec.inc.php:240 include/param_sec.inc.php:313
+#: include/param_sec.inc.php:240 include/param_sec.inc.php:313
 msgid "Les administrateurs NOALYSS ont toujours accès à tout"
 msgstr ""
 
 #: include/param_sec.inc.php:298 include/param_sec.inc.php:309
+#: include/param_sec.inc.php:309
 msgid "Sécurité sur les actions"
 msgstr ""
 
 #: include/periode.inc.php:88 include/periode.inc.php:86
+#: include/periode.inc.php:86
 msgid "Montrer l'exercice"
 msgstr ""
 
 #: include/periode.inc.php:94 include/periode.inc.php:95
+#: include/periode.inc.php:95
 msgid "Fermer les périodes sélectionnées"
 msgstr ""
 
 #: include/periode.inc.php:102 include/periode.inc.php:103
+#: include/periode.inc.php:103
 msgid "Ajout exercice"
 msgstr ""
 
 #: include/periode.inc.php:113 include/class/periode.class.php:687
 #: include/class/periode.class.php:689 include/class/periode.class.php:691
 #: include/class/periode.class.php:692 include/periode.inc.php:114
+#: include/class/periode.class.php:693 include/class/periode.class.php:693
+#: include/periode.inc.php:114
 msgid "Ajout période"
 msgstr ""
 
 #: include/periode.inc.php:126 include/periode.inc.php:127
+#: include/periode.inc.php:127
 msgid "Pour ajouter, effacer ou modifier une période, il faut choisir global"
 msgstr ""
 
@@ -23528,7 +24872,8 @@ msgstr ""
 msgid "Met à jour toutes les dossiers et modèles"
 msgstr ""
 
-#: include/upgrade.inc.php:34 include/upgrade.inc.php:34
+#: include/upgrade.inc.php:34 include/template/template_config_form.php:32
+#: include/template/template_config_form.php:32 include/upgrade.inc.php:34
 msgid "Application"
 msgstr ""
 
@@ -23556,28 +24901,28 @@ msgid "Les extensions doivent être activées dans le dossier après installatio
 msgstr ""
 
 #: include/upgrade-plugin.php:53 include/upgrade-plugin.php:65
-#: include/upgrade-plugin.php:68
+#: include/upgrade-plugin.php:68 include/upgrade-plugin.php:68
 msgid "Auteur"
 msgstr ""
 
 #: include/upgrade-plugin.php:91 include/upgrade-plugin.php:103
-#: include/upgrade-plugin.php:106
+#: include/upgrade-plugin.php:106 include/upgrade-plugin.php:106
 msgid "MultiModule"
 msgstr ""
 
 #: include/upgrade-plugin.php:98 include/upgrade-plugin.php:110
-#: include/upgrade-plugin.php:113
+#: include/upgrade-plugin.php:113 include/upgrade-plugin.php:113
 #, php-format
 msgid "Nouvelle version disponible %s , votre version %s"
 msgstr ""
 
 #: include/upgrade-plugin.php:105 include/upgrade-plugin.php:117
-#: include/upgrade-plugin.php:120
+#: include/upgrade-plugin.php:120 include/upgrade-plugin.php:120
 msgid "Dernière version installée"
 msgstr ""
 
 #: include/upgrade-plugin.php:112 include/upgrade-plugin.php:124
-#: include/upgrade-plugin.php:127
+#: include/upgrade-plugin.php:127 include/upgrade-plugin.php:127
 msgid "Non installée"
 msgstr ""
 
@@ -23608,6 +24953,7 @@ msgstr ""
 
 #: include/template/param_jrn.php:125 include/template/param_jrn.php:127
 #: include/template/param_jrn.php:171 include/template/param_jrn.php:172
+#: include/template/param_jrn.php:172
 msgid "Journal actif"
 msgstr ""
 
@@ -23653,17 +24999,20 @@ msgid "Réservé un jour pour les opérations de fermeture "
 msgstr ""
 
 #: include/template/periode_add_exercice.php:82
-#: include/template/periode_add_exercice.php:82
+#: include/template/periode_add_exercice.php:91
+#: include/template/periode_add_exercice.php:91
 msgid "Exercice invalide"
 msgstr ""
 
 #: include/template/periode_add_exercice.php:87
-#: include/template/periode_add_exercice.php:87
+#: include/template/periode_add_exercice.php:96
+#: include/template/periode_add_exercice.php:96
 msgid "Nombre de mois invalide"
 msgstr ""
 
 #: include/template/periode_add_exercice.php:99
-#: include/template/periode_add_exercice.php:99
+#: include/template/periode_add_exercice.php:108
+#: include/template/periode_add_exercice.php:108
 msgid "Nombre de mois possible entre 1 et 60"
 msgstr ""
 
@@ -23677,11 +25026,13 @@ msgstr ""
 
 #: include/template/tag_search_select.php:13
 #: include/template/tag_search_select.php:16
+#: include/template/tag_search_select.php:16
 msgid "Uniquement actif"
 msgstr ""
 
 #: include/template/tag_search_select.php:45
 #: include/template/tag_search_select.php:48
+#: include/template/tag_search_select.php:48
 msgid "non actif"
 msgstr ""
 
@@ -23743,6 +25094,7 @@ msgstr ""
 
 #: include/lib/ac_common.php:811 include/lib/ac_common.php:813
 #: include/lib/ac_common.php:829 include/lib/ac_common.php:839
+#: include/lib/ac_common.php:839
 msgid "Format Invalide"
 msgstr ""
 
@@ -23755,7 +25107,7 @@ msgid "Cliquez pour éditer"
 msgstr ""
 
 #: include/lib/message_javascript.php:74 include/lib/message_javascript.php:76
-#: include/lib/message_javascript.php:76
+#: include/lib/message_javascript.php:77 include/lib/message_javascript.php:77
 msgid "Autoliquidation : Utilisé en même temps au crédit et au débit"
 msgstr ""
 
@@ -23774,7 +25126,7 @@ msgid "Encodage invalide"
 msgstr ""
 
 #: include/lib/user_menu.php:121 include/lib/user_menu.php:78
-#: include/lib/user_menu.php:77
+#: include/lib/user_menu.php:77 include/lib/user_menu.php:77
 msgid "Installation Mise à jour du système et des bases de données"
 msgstr ""
 
@@ -23794,7 +25146,8 @@ msgid "Modèle installé "
 msgstr ""
 
 #: include/ajax/ajax_card.php:619 include/ajax/ajax_card.php:642
-#: include/ajax/ajax_card.php:756
+#: include/ajax/ajax_card.php:756 include/ajax/ajax_card.php:755
+#: include/ajax/ajax_card.php:755
 msgid "Fiche non effacée"
 msgstr ""
 
@@ -23803,6 +25156,7 @@ msgid "Erreur exercice invalide"
 msgstr ""
 
 #: include/ajax/ajax_periode.php:291 include/ajax/ajax_periode.php:261
+#: include/ajax/ajax_periode.php:261
 msgid "Invalid command"
 msgstr ""
 
@@ -23863,11 +25217,13 @@ msgstr ""
 
 #: include/ajax/ajax_template_cat_category.php:92
 #: include/ajax/ajax_template_cat_category.php:91
+#: include/ajax/ajax_template_cat_category.php:91
 msgid "Attribut déjà utilisé"
 msgstr ""
 
 #: include/ajax/ajax_template_cat_category.php:95
 #: include/ajax/ajax_template_cat_category.php:94
+#: include/ajax/ajax_template_cat_category.php:94
 msgid "Attribut obligatoire"
 msgstr ""
 
@@ -23903,6 +25259,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2283
 #: include/class/acc_ledger.class.php:2299
 #: include/class/acc_ledger.class.php:2318
+#: include/class/acc_ledger.class.php:2318
 msgid "Activé"
 msgstr ""
 
@@ -23911,6 +25268,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2284
 #: include/class/acc_ledger.class.php:2300
 #: include/class/acc_ledger.class.php:2319
+#: include/class/acc_ledger.class.php:2319
 msgid "Désactivé"
 msgstr ""
 
@@ -23919,6 +25277,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2880
 #: include/class/acc_ledger.class.php:2919
 #: include/class/acc_ledger.class.php:2943
+#: include/class/acc_ledger.class.php:2943
 msgid "Journal incorrect"
 msgstr ""
 
@@ -23926,6 +25285,7 @@ msgstr ""
 #: include/class/acc_ledger_history.class.php:47
 #: include/class/acc_ledger_history.class.php:48
 #: include/class/acc_ledger_history.class.php:59
+#: include/class/acc_ledger_history.class.php:59
 msgid "pa_ledger doit être un tableau"
 msgstr ""
 
@@ -23937,6 +25297,8 @@ msgstr ""
 #: include/class/acc_ledger_history.class.php:123
 #: include/class/acc_ledger_history.class.php:138
 #: include/class/acc_ledger_history.class.php:151
+#: include/class/acc_ledger_history.class.php:138
+#: include/class/acc_ledger_history.class.php:151
 msgid "invalid parameter"
 msgstr ""
 
@@ -23944,6 +25306,7 @@ msgstr ""
 #: include/class/acc_ledger_history_generic.class.php:668
 #: include/class/acc_ledger_history_generic.class.php:671
 #: include/class/acc_ledger_history_generic.class.php:672
+#: include/class/acc_ledger_history_generic.class.php:672
 msgid "solde débiteur:"
 msgstr ""
 
@@ -23951,6 +25314,7 @@ msgstr ""
 #: include/class/acc_ledger_history_generic.class.php:669
 #: include/class/acc_ledger_history_generic.class.php:672
 #: include/class/acc_ledger_history_generic.class.php:673
+#: include/class/acc_ledger_history_generic.class.php:673
 msgid "solde créditeur:"
 msgstr ""
 
@@ -23958,6 +25322,7 @@ msgstr ""
 #: include/class/acc_ledger_history_generic.class.php:685
 #: include/class/acc_ledger_history_generic.class.php:688
 #: include/class/acc_ledger_history_generic.class.php:689
+#: include/class/acc_ledger_history_generic.class.php:689
 msgid "Total opération"
 msgstr ""
 
@@ -23969,6 +25334,8 @@ msgstr ""
 #: include/class/acc_ledger_history_purchase.class.php:276
 #: include/class/acc_ledger_history_sale.class.php:272
 #: include/class/acc_ledger_history_purchase.class.php:287
+#: include/class/acc_ledger_history_sale.class.php:272
+#: include/class/acc_ledger_history_purchase.class.php:287
 msgid "TVAC/TTC"
 msgstr ""
 
@@ -23976,6 +25343,7 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:225
 #: include/class/acc_ledger_purchase.class.php:269
 #: include/class/acc_ledger_purchase.class.php:271
+#: include/class/acc_ledger_purchase.class.php:271
 #: include/class/acc_ledger_sold.class.php:225
 msgid "Date de paiement invalide"
 msgstr ""
@@ -23984,6 +25352,7 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:232
 #: include/class/acc_ledger_purchase.class.php:275
 #: include/class/acc_ledger_purchase.class.php:277
+#: include/class/acc_ledger_purchase.class.php:277
 #: include/class/acc_ledger_sold.class.php:232
 msgid "Date échéance invalide"
 msgstr ""
@@ -24062,57 +25431,68 @@ msgstr ""
 
 #: include/class/periode.class.php:421 include/class/periode.class.php:423
 #: include/class/periode.class.php:425 include/class/periode.class.php:426
+#: include/class/periode.class.php:426
 msgid "Exercice n'est pas un nombre"
 msgstr ""
 
 #: include/class/periode.class.php:424 include/class/periode.class.php:426
 #: include/class/periode.class.php:428 include/class/periode.class.php:429
+#: include/class/periode.class.php:429
 #, php-format
 msgid "Exercice doit être entre %s et %s "
 msgstr ""
 
 #: include/class/periode.class.php:427 include/class/periode.class.php:429
 #: include/class/periode.class.php:431 include/class/periode.class.php:432
+#: include/class/periode.class.php:432
 msgid "Année n'est pas un nombre"
 msgstr ""
 
 #: include/class/periode.class.php:430 include/class/periode.class.php:432
 #: include/class/periode.class.php:434 include/class/periode.class.php:435
+#: include/class/periode.class.php:435
 #, php-format
 msgid "Année doit être entre %s et %s "
 msgstr ""
 
 #: include/class/periode.class.php:434 include/class/periode.class.php:436
 #: include/class/periode.class.php:438 include/class/periode.class.php:439
+#: include/class/periode.class.php:439
 msgid "Nombre de mois n'est pas un nombre"
 msgstr ""
 
 #: include/class/periode.class.php:436 include/class/periode.class.php:438
 #: include/class/periode.class.php:440 include/class/periode.class.php:441
+#: include/class/periode.class.php:441
 msgid "Nombre de mois doit être compris entre 1 & 60 "
 msgstr ""
 
 #: include/class/periode.class.php:438 include/class/periode.class.php:440
 #: include/class/periode.class.php:442 include/class/periode.class.php:444
 #: include/class/periode.class.php:443 include/class/periode.class.php:445
+#: include/class/periode.class.php:443 include/class/periode.class.php:445
 msgid "Mois de début n'existe pas "
 msgstr ""
 
 #: include/class/periode.class.php:520 include/class/periode.class.php:522
 #: include/class/periode.class.php:524 include/class/periode.class.php:525
+#: include/class/periode.class.php:525
 msgid "nb opérations"
 msgstr ""
 
 #: include/class/periode.class.php:521 include/class/periode.class.php:523
 #: include/class/periode.class.php:525 include/class/periode.class.php:526
+#: include/class/periode.class.php:526
 msgid "Status"
 msgstr ""
 
 #: include/class/periode.class.php:585
 #: include/class/periode_ledger_table.class.php:142
 #: include/class/periode.class.php:587 include/class/periode.class.php:589
-#: include/class/periode.class.php:590
-#: include/class/periode_ledger_table.class.php:142
+#: include/class/periode.class.php:590 include/class/periode.class.php:591
+#: include/class/periode_ledger_table.class.php:143
+#: include/class/periode.class.php:591
+#: include/class/periode_ledger_table.class.php:143
 msgid "Fermée"
 msgstr ""
 
@@ -24120,83 +25500,101 @@ msgstr ""
 #: include/class/periode_ledger_table.class.php:142
 #: include/class/periode_ledger_table.class.php:144
 #: include/class/periode.class.php:587 include/class/periode.class.php:589
-#: include/class/periode.class.php:590
-#: include/class/periode_ledger_table.class.php:142
-#: include/class/periode_ledger_table.class.php:144
+#: include/class/periode.class.php:590 include/class/periode.class.php:591
+#: include/class/periode_ledger_table.class.php:143
+#: include/class/periode_ledger_table.class.php:145
+#: include/class/periode.class.php:591
+#: include/class/periode_ledger_table.class.php:143
+#: include/class/periode_ledger_table.class.php:145
 msgid "Ouvert"
 msgstr ""
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
 #: include/class/periode.class.php:651 include/class/periode.class.php:652
+#: include/class/periode.class.php:653 include/class/periode.class.php:653
 msgid "Janvier"
 msgstr ""
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
 #: include/class/periode.class.php:651 include/class/periode.class.php:652
+#: include/class/periode.class.php:653 include/class/periode.class.php:653
 msgid "Février"
 msgstr ""
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
 #: include/class/periode.class.php:651 include/class/periode.class.php:652
+#: include/class/periode.class.php:653 include/class/periode.class.php:653
 msgid "Mars"
 msgstr ""
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
 #: include/class/periode.class.php:651 include/class/periode.class.php:652
+#: include/class/periode.class.php:653 include/class/periode.class.php:653
 msgid "Avril"
 msgstr ""
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
 #: include/class/periode.class.php:652 include/class/periode.class.php:653
+#: include/class/periode.class.php:654 include/class/periode.class.php:654
 msgid "Mai"
 msgstr ""
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
 #: include/class/periode.class.php:652 include/class/periode.class.php:653
+#: include/class/periode.class.php:654 include/class/periode.class.php:654
 msgid "Juin"
 msgstr ""
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
 #: include/class/periode.class.php:652 include/class/periode.class.php:653
+#: include/class/periode.class.php:654 include/class/periode.class.php:654
 msgid "Juillet"
 msgstr ""
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
 #: include/class/periode.class.php:652 include/class/periode.class.php:653
+#: include/class/periode.class.php:654 include/class/periode.class.php:654
 msgid "Août"
 msgstr ""
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
 #: include/class/periode.class.php:652 include/class/periode.class.php:653
+#: include/class/periode.class.php:654 include/class/periode.class.php:654
 msgid "Septembre"
 msgstr ""
 
 #: include/class/periode.class.php:649 include/class/periode.class.php:651
 #: include/class/periode.class.php:653 include/class/periode.class.php:654
+#: include/class/periode.class.php:655 include/class/periode.class.php:655
 msgid "Octobre"
 msgstr ""
 
 #: include/class/periode.class.php:649 include/class/periode.class.php:651
 #: include/class/periode.class.php:653 include/class/periode.class.php:654
+#: include/class/periode.class.php:655 include/class/periode.class.php:655
 msgid "Novembre"
 msgstr ""
 
 #: include/class/periode.class.php:649 include/class/periode.class.php:651
 #: include/class/periode.class.php:653 include/class/periode.class.php:654
+#: include/class/periode.class.php:655 include/class/periode.class.php:655
 msgid "Décembre"
 msgstr ""
 
 #: include/class/periode.class.php:673 include/class/periode.class.php:675
 #: include/class/periode.class.php:677 include/class/periode.class.php:678
+#: include/class/periode.class.php:679 include/class/periode.class.php:679
 msgid "Effacement impossible"
 msgstr ""
 
 #: include/class/periode.class.php:688 include/class/periode.class.php:690
 #: include/class/periode.class.php:692 include/class/periode.class.php:693
+#: include/class/periode.class.php:694 include/class/periode.class.php:694
 msgid "On ne peut ajouter une période que sur un exercice qui existe déjà"
 msgstr ""
 
 #: include/class/tag.class.php:60 include/class/tag.class.php:65
+#: include/class/tag.class.php:65
 msgid "Ajout d'un dossier (ou tag)"
 msgstr ""
 
@@ -24237,6 +25635,7 @@ msgstr ""
 
 #: include/class/template_card_category.class.php:158
 #: include/class/template_card_category.class.php:157
+#: include/class/template_card_category.class.php:157
 msgid "Attribut à ajouter"
 msgstr ""
 
@@ -24264,16 +25663,20 @@ msgstr ""
 #: include/class/tva_rate_mtable.class.php:209
 #: include/class/tva_rate_mtable.class.php:224
 #: include/class/tva_rate_mtable.class.php:226
+#: include/class/tva_rate_mtable.class.php:224
+#: include/class/tva_rate_mtable.class.php:226
 msgid "Les 2 postes comptables ne peuvent être nuls"
 msgstr ""
 
 #: include/class/tva_rate_mtable.class.php:215
 #: include/class/tva_rate_mtable.class.php:232
+#: include/class/tva_rate_mtable.class.php:232
 msgid "Taux de TVA invalide"
 msgstr ""
 
 #: include/class/tva_rate_mtable.class.php:223
 #: include/class/tva_rate_mtable.class.php:240
+#: include/class/tva_rate_mtable.class.php:240
 msgid "Ce nom est déjà utilisé"
 msgstr ""
 
@@ -24281,21 +25684,26 @@ msgstr ""
 #: include/class/tva_rate_mtable.class.php:243
 #: include/class/tva_rate_mtable.class.php:250
 #: include/class/tva_rate_mtable.class.php:260
+#: include/class/tva_rate_mtable.class.php:250
+#: include/class/tva_rate_mtable.class.php:260
 msgid "Poste comptable inexistant"
 msgstr ""
 
 #: include/class/tva_rate_mtable.class.php:250
 #: include/class/tva_rate_mtable.class.php:267
+#: include/class/tva_rate_mtable.class.php:267
 msgid "Choix incorrect"
 msgstr ""
 
 #: include/class/tva_rate_mtable.class.php:267
 #: include/class/tva_rate_mtable.class.php:284
+#: include/class/tva_rate_mtable.class.php:284
 msgid "Effacement interdit : TVA utilisée"
 msgstr ""
 
 #: include/class/tva_rate_mtable.class.php:273
 #: include/class/tva_rate_mtable.class.php:290
+#: include/class/tva_rate_mtable.class.php:290
 msgid ""
 "Vous ne pouvez pas effacer tous les taux. Si votre société n'utilise pas la "
 "TVA, changer dans le menu société"
@@ -24306,25 +25714,32 @@ msgstr ""
 #: include/lib/input_switch.class.php:56
 #: include/class/acc_ledger.class.php:2399 include/class/user.class.php:1402
 #: include/class/user.class.php:1431 include/lib/input_switch.class.php:57
+#: include/lib/input_checkbox.class.php:65 include/class/user.class.php:1426
+#: include/class/user.class.php:1455 include/class/acc_ledger.class.php:2399
+#: include/class/user.class.php:1426 include/class/user.class.php:1455
+#: include/lib/input_switch.class.php:57
 #: include/lib/input_checkbox.class.php:65
 msgid "Valeur invalide"
 msgstr ""
 
 #: html/install.php:384 html/install.php:387 html/install.php:436
+#: html/install.php:442 html/install.php:442
 msgid "Module php-pgsql n'est pas installé"
 msgstr ""
 
 #: html/install.php:586 html/install.php:589 html/install.php:639
+#: html/install.php:645 html/install.php:645
 msgid ""
 "Puis refaites la procédure d'installation pour mettre la base de données à "
 "jour"
 msgstr ""
 
-#: include/template/tag_detail.php:27 include/template/tag_detail.php:27
+#: include/template/tag_detail.php:27
 msgid "Etiquette(tag) actif"
 msgstr ""
 
-#: include/template/tag_detail.php:33 include/template/tag_detail.php:33
+#: include/template/tag_detail.php:33 include/template/tag_detail.php:56
+#: include/template/tag_detail.php:56
 msgid "Cochez pour cette case pour effacer cette étiquette (tag)"
 msgstr ""
 
@@ -24385,6 +25800,7 @@ msgstr ""
 
 #: include/template/param_jrn.php:61 include/template/param_jrn.php:68
 #: include/template/param_jrn.php:74 include/template/param_jrn.php:75
+#: include/template/param_jrn.php:75
 msgid ""
 "Obligatoire pour les journaux FIN : donner ici la fiche du compte en banque "
 "utilisée"
@@ -24392,6 +25808,7 @@ msgstr ""
 
 #: include/template/param_jrn.php:68 include/template/param_jrn.php:75
 #: include/template/param_jrn.php:119 include/template/param_jrn.php:120
+#: include/template/param_jrn.php:120
 msgid "Minimum de lignes à afficher"
 msgstr ""
 
@@ -24408,6 +25825,7 @@ msgid "delete_param : echec"
 msgstr ""
 
 #: include/lib/html_tab.class.php:99 include/lib/html_tab.class.php:119
+#: include/lib/html_tab.class.php:119
 msgid "Mode invalide"
 msgstr ""
 
@@ -24501,18 +25919,20 @@ msgid "Du %s au %s"
 msgstr ""
 
 #: include/operation_ods_new.inc.php:94 include/operation_ods_new.inc.php:95
+#: include/operation_ods_new.inc.php:95
 #, php-format
 msgid "Opération rapprochée : %s"
 msgstr ""
 
 #: include/fiche.inc.php:592 include/fiche.inc.php:601
-#: include/fiche.inc.php:614
+#: include/fiche.inc.php:614 include/fiche.inc.php:614
 msgid "solde crediteur"
 msgstr ""
 
 #: include/class/acc_ledger.class.php:1079
 #: include/class/acc_ledger.class.php:1095
 #: include/class/acc_ledger.class.php:1091
+#: include/class/acc_ledger.class.php:1091
 #, php-format
 msgid ""
 "Vous utilisez le mode strict la dernière operation est la date du %s\n"
@@ -24522,6 +25942,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1124
 #: include/class/acc_ledger.class.php:1140
 #: include/class/acc_ledger.class.php:1136
+#: include/class/acc_ledger.class.php:1136
 #, php-format
 msgid "Le poste %s n'est pas dans ce journal"
 msgstr ""
@@ -24529,6 +25950,7 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1136
 #: include/class/acc_ledger.class.php:1152
 #: include/class/acc_ledger.class.php:1148
+#: include/class/acc_ledger.class.php:1148
 #, php-format
 msgid " Le poste %s appartient à  fiche(s) dont : %s"
 msgstr ""
@@ -24536,11 +25958,13 @@ msgstr ""
 #: include/class/acc_ledger.class.php:1150
 #: include/class/acc_ledger.class.php:1166
 #: include/class/acc_ledger.class.php:1162
+#: include/class/acc_ledger.class.php:1162
 #, php-format
 msgid "Utilisation directe interdite du poste comptable %s"
 msgstr ""
 
 #: include/class/document.class.php:1293 include/class/document.class.php:1576
+#: include/class/document.class.php:1576
 #, php-format
 msgid "chaine à remplacer [%s] contient un caractère interdit"
 msgstr ""
@@ -24577,14 +26001,17 @@ msgstr ""
 
 #: include/class/acc_plan_mtable.class.php:196
 #: include/class/acc_plan_mtable.class.php:213
+#: include/class/acc_plan_mtable.class.php:213
 msgid "Toutes les fiches"
 msgstr ""
 
-#: include/class/anc_print.class.php:163 include/class/anc_print.class.php:163
+#: include/class/anc_print.class.php:163 include/class/anc_print.class.php:164
+#: include/class/anc_print.class.php:164
 msgid "Plan Analytique "
 msgstr ""
 
 #: include/lib/ac_common.php:1129 include/lib/ac_common.php:1139
+#: include/lib/ac_common.php:1139
 msgid "Fichier non trouvé"
 msgstr ""
 
@@ -24605,97 +26032,99 @@ msgid "Poste Analytique"
 msgstr ""
 
 #: include/lib/message_javascript.php:77 include/lib/message_javascript.php:79
-#: include/lib/message_javascript.php:79
+#: include/lib/message_javascript.php:80 include/lib/message_javascript.php:80
 msgid "Un instant svp"
 msgstr ""
 
 #: include/lib/message_javascript.php:79 include/lib/message_javascript.php:81
-#: include/lib/message_javascript.php:81
+#: include/lib/message_javascript.php:82 include/lib/message_javascript.php:82
 msgid "Echec "
 msgstr ""
 
 #: include/lib/message_javascript.php:80 include/lib/message_javascript.php:82
-#: include/lib/message_javascript.php:82
+#: include/lib/message_javascript.php:83 include/lib/message_javascript.php:83
 msgid "Echec donnée manquante ou incorrecte"
 msgstr ""
 
 #: include/lib/message_javascript.php:81 include/lib/message_javascript.php:83
-#: include/lib/message_javascript.php:83
+#: include/lib/message_javascript.php:84 include/lib/message_javascript.php:84
 msgid "Vous confirmez effacement ?"
 msgstr ""
 
 #: include/lib/message_javascript.php:82 include/lib/message_javascript.php:84
-#: include/lib/message_javascript.php:84
+#: include/lib/message_javascript.php:85 include/lib/message_javascript.php:85
 msgid "Vous confirmez mise à jour ?"
 msgstr ""
 
 #: include/lib/message_javascript.php:83 include/lib/message_javascript.php:85
-#: include/lib/message_javascript.php:85
+#: include/lib/message_javascript.php:86 include/lib/message_javascript.php:86
 msgid "Si vous changez de page vous perdez les reconciliations, continuez ?"
 msgstr ""
 
 #: include/lib/message_javascript.php:84 include/lib/message_javascript.php:86
-#: include/lib/message_javascript.php:86
+#: include/lib/message_javascript.php:87 include/lib/message_javascript.php:87
 msgid "Echec réponse"
 msgstr ""
 
 #: include/lib/message_javascript.php:85 include/lib/message_javascript.php:87
-#: include/lib/message_javascript.php:87
+#: include/lib/message_javascript.php:88 include/lib/message_javascript.php:88
 msgid "Désolé, les montants pour la comptabilité analytique sont incorrects"
 msgstr ""
 
 #: include/lib/message_javascript.php:86 include/lib/message_javascript.php:88
-#: include/lib/message_javascript.php:88
+#: include/lib/message_javascript.php:89 include/lib/message_javascript.php:89
 msgid "Maximum 15 lignes"
 msgstr ""
 
 #: include/lib/message_javascript.php:87 include/lib/message_javascript.php:89
-#: include/lib/message_javascript.php:89
+#: include/lib/message_javascript.php:90 include/lib/message_javascript.php:90
 msgid "Maximum"
 msgstr ""
 
 #: include/lib/message_javascript.php:88 include/lib/message_javascript.php:90
-#: include/lib/message_javascript.php:90
+#: include/lib/message_javascript.php:91 include/lib/message_javascript.php:91
 msgid "calculé"
 msgstr ""
 
 #: include/lib/message_javascript.php:89 include/lib/message_javascript.php:91
-#: include/lib/message_javascript.php:91
+#: include/lib/message_javascript.php:92 include/lib/message_javascript.php:92
 msgid "Balance incorrecte D/C"
 msgstr ""
 
 #: include/lib/message_javascript.php:91 include/lib/message_javascript.php:93
-#: include/lib/message_javascript.php:93
+#: include/lib/message_javascript.php:94 include/lib/message_javascript.php:94
 msgid "Donnée manquante ou déjà supprimée"
 msgstr ""
 
 #: include/lib/message_javascript.php:92 include/lib/message_javascript.php:94
-#: include/lib/message_javascript.php:94
+#: include/lib/message_javascript.php:95 include/lib/message_javascript.php:95
 msgid "Désolé, événement en cours de création à sauver"
 msgstr ""
 
 #: include/lib/message_javascript.php:93 include/lib/message_javascript.php:95
-#: include/lib/message_javascript.php:95
+#: include/lib/message_javascript.php:96 include/lib/message_javascript.php:96
 msgid "Cacher"
 msgstr ""
 
 #: include/lib/message_javascript.php:95 include/lib/message_javascript.php:97
-#: include/lib/message_javascript.php:97
+#: include/lib/message_javascript.php:98 include/lib/message_javascript.php:98
 msgid "Traitement en cours"
 msgstr ""
 
 #: include/lib/message_javascript.php:96 include/lib/message_javascript.php:98
-#: include/lib/message_javascript.php:98
+#: include/lib/message_javascript.php:99 include/lib/message_javascript.php:99
 msgid "Un instant"
 msgstr ""
 
 #: include/lib/message_javascript.php:98 include/lib/message_javascript.php:100
-#: include/lib/message_javascript.php:100
+#: include/lib/message_javascript.php:101
+#: include/lib/message_javascript.php:101
 msgid "Taper une formule (ex 20*5.1) puis enter"
 msgstr ""
 
 #: include/lib/message_javascript.php:99 include/lib/message_javascript.php:101
-#: include/lib/message_javascript.php:101
+#: include/lib/message_javascript.php:102
+#: include/lib/message_javascript.php:102
 msgid ""
 "Calculatrice simplifiée: écrivez simplement les opérations que vous voulez "
 "puis la touche retour. exemple : 1+2+3*(1/5)"
@@ -24703,6 +26132,7 @@ msgstr ""
 
 #: include/class/pre_operation.class.php:149
 #: include/class/pre_operation.class.php:550
+#: include/class/pre_operation.class.php:550
 #, php-format
 msgid "Echec PreOperatoin chargement %s"
 msgstr ""
@@ -24719,7 +26149,7 @@ msgstr ""
 msgid "Balance simple poste %s %s date %s %s"
 msgstr ""
 
-#: include/lib/message_javascript.php:65 include/lib/message_javascript.php:65
+#: include/lib/message_javascript.php:65
 msgid ""
 "<h3>        Remarque  : choix possibles    </h3>    <ul>        <li> Détail "
 "opérations ne donne pas le même résultat si on regarde tous les journaux ou "
@@ -24732,7 +26162,8 @@ msgid ""
 msgstr ""
 
 #: include/lib/message_javascript.php:103
-#: include/lib/message_javascript.php:103
+#: include/lib/message_javascript.php:104
+#: include/lib/message_javascript.php:104
 msgid "Votre demande est en cours de traitement"
 msgstr ""
 
@@ -24776,16 +26207,19 @@ msgstr ""
 
 #: include/lib/database_core.class.php:464
 #: include/lib/database_core.class.php:467
+#: include/lib/database_core.class.php:467
 msgid "Database:get_row retourne trop de lignes"
 msgstr ""
 
 #: include/class/payment_method_mtable.class.php:39
 #: include/class/payment_method_mtable.class.php:40
+#: include/class/payment_method_mtable.class.php:40
 msgid "Enregistrement dans"
 msgstr ""
 
 #: include/class/payment_method_mtable.class.php:42
 #: include/class/payment_method_mtable.class.php:43
+#: include/class/payment_method_mtable.class.php:43
 msgid "Utilisation dans"
 msgstr ""
 
@@ -24793,6 +26227,8 @@ msgstr ""
 #: include/class/payment_method_mtable.class.php:92
 #: include/class/payment_method_mtable.class.php:69
 #: include/class/payment_method_mtable.class.php:93
+#: include/class/payment_method_mtable.class.php:69
+#: include/class/payment_method_mtable.class.php:93
 msgid "Un libellé est obligatoire"
 msgstr ""
 
@@ -24800,21 +26236,26 @@ msgstr ""
 #: include/class/payment_method_mtable.class.php:87
 #: include/class/payment_method_mtable.class.php:78
 #: include/class/payment_method_mtable.class.php:88
+#: include/class/payment_method_mtable.class.php:78
+#: include/class/payment_method_mtable.class.php:88
 msgid "Choisissez un journal"
 msgstr ""
 
 #: include/class/payment_method_mtable.class.php:98
 #: include/class/payment_method_mtable.class.php:102
+#: include/class/payment_method_mtable.class.php:102
 msgid "Fiche inexistante"
 msgstr ""
 
 #: include/class/payment_method_mtable.class.php:115
 #: include/class/payment_method_mtable.class.php:120
+#: include/class/payment_method_mtable.class.php:120
 msgid "Choisissez un type de fiche"
 msgstr ""
 
 #: include/class/payment_method_mtable.class.php:140
 #: include/class/payment_method_mtable.class.php:145
+#: include/class/payment_method_mtable.class.php:145
 #, php-format
 msgid "Erreur key %s value %s"
 msgstr ""
@@ -24826,12 +26267,14 @@ msgid ""
 msgstr ""
 
 #: include/lib/message_javascript.php:105
-#: include/lib/message_javascript.php:105
+#: include/lib/message_javascript.php:106
+#: include/lib/message_javascript.php:106
 msgid "Pour les journaux FIN, ce sera la fiche du journal"
 msgstr ""
 
 #: include/lib/manage_table_sql.class.php:965
 #: include/lib/manage_table_sql.class.php:1020
+#: include/lib/manage_table_sql.class.php:1020
 msgid "non implémenté"
 msgstr ""
 
@@ -24841,11 +26284,13 @@ msgid "Lien"
 msgstr ""
 
 #: include/impress_jrn.inc.php:156 include/impress_jrn.inc.php:170
+#: include/impress_jrn.inc.php:170
 msgid "Style d'impression"
 msgstr ""
 
 #: include/class/print_ledger_simple.class.php:113
 #: include/class/print_ledger_simple.class.php:110
+#: include/class/print_ledger_simple.class.php:110
 msgid "Priv/DNA"
 msgstr ""
 
@@ -24855,16 +26300,21 @@ msgstr ""
 #: include/class/acc_ledger_history_sale.class.php:275
 #: include/class/acc_ledger_history_purchase.class.php:291
 #: include/export/export_ledger_csv.php:147
+#: include/class/acc_ledger_history_sale.class.php:275
+#: include/class/acc_ledger_history_purchase.class.php:291
+#: include/export/export_ledger_csv.php:147
 msgid "Montant paiement"
 msgstr ""
 
 #: include/export/export_ledger_csv.php:143
 #: include/export/export_ledger_csv.php:148
+#: include/export/export_ledger_csv.php:148
 msgid "Methode paiement"
 msgstr ""
 
 #: include/export/export_ledger_csv.php:144
 #: include/export/export_ledger_csv.php:150
+#: include/export/export_ledger_csv.php:150
 msgid "Opération paiement"
 msgstr ""
 
@@ -24878,6 +26328,7 @@ msgstr ""
 #: include/class/acc_ledger_history_purchase.class.php:278
 #: include/class/acc_ledger_history_sale.class.php:264
 #: include/class/acc_ledger_history_purchase.class.php:290
+#: include/class/acc_ledger_history_purchase.class.php:290
 msgid "Méthode paiement"
 msgstr ""
 
@@ -24885,21 +26336,26 @@ msgstr ""
 #: include/class/acc_ledger_history_sale.class.php:266
 #: include/class/acc_ledger_history_sale.class.php:276
 #: include/class/acc_ledger_history_purchase.class.php:292
+#: include/class/acc_ledger_history_sale.class.php:276
+#: include/class/acc_ledger_history_purchase.class.php:292
 msgid "n° opération"
 msgstr ""
 
 #: include/lib/message_javascript.php:104
-#: include/lib/message_javascript.php:104
+#: include/lib/message_javascript.php:105
+#: include/lib/message_javascript.php:105
 msgid ""
 "Limite le type de fiche si vous choisissez la fiche à la saisie, uniquement "
 "avec journaux OD"
 msgstr ""
 
 #: include/template/param_jrn.php:93 include/template/param_jrn.php:94
+#: include/template/param_jrn.php:94
 msgid "Uniquement note de débit ou crédit"
 msgstr ""
 
 #: include/template/param_jrn.php:106 include/template/param_jrn.php:107
+#: include/template/param_jrn.php:107
 msgid "Avertissement montant positif"
 msgstr ""
 
@@ -24915,6 +26371,10 @@ msgstr ""
 #: include/export/export_printtva_pdf.php:216
 #: include/export/export_printtva_csv.php:54
 #: include/export/export_printtva_csv.php:73
+#: include/export/export_printtva_pdf.php:59
+#: include/export/export_printtva_pdf.php:216
+#: include/export/export_printtva_csv.php:54
+#: include/export/export_printtva_csv.php:73
 #: include/template/tax_summary_display.php:62
 #: include/template/tax_summary_display.php:122
 #: include/template/tax_summary_display.php:210
@@ -24934,6 +26394,10 @@ msgstr ""
 #: include/export/export_printtva_pdf.php:217
 #: include/export/export_printtva_csv.php:56
 #: include/export/export_printtva_csv.php:76
+#: include/export/export_printtva_pdf.php:60
+#: include/export/export_printtva_pdf.php:217
+#: include/export/export_printtva_csv.php:56
+#: include/export/export_printtva_csv.php:76
 #: include/template/tax_summary_display.php:64
 #: include/template/tax_summary_display.php:128
 #: include/template/tax_summary_display.php:213
@@ -24952,6 +26416,8 @@ msgstr ""
 #: include/export/export_printtva_pdf.php:212
 #: include/export/export_printtva_pdf.php:216
 #: include/export/export_printtva_csv.php:74
+#: include/export/export_printtva_pdf.php:216
+#: include/export/export_printtva_csv.php:74
 #: include/template/tax_summary_display.php:211
 #: include/template/tax_summary_display.php:297
 msgid "Privée"
@@ -24961,6 +26427,7 @@ msgstr ""
 #: include/template/tax_summary_display.php:306
 #: include/export/export_printtva_pdf.php:213
 #: include/export/export_printtva_pdf.php:217
+#: include/export/export_printtva_pdf.php:217
 #: include/template/tax_summary_display.php:214
 #: include/template/tax_summary_display.php:306
 msgid "Montant Non Déd"
@@ -24971,6 +26438,7 @@ msgstr ""
 #: include/export/export_printtva_csv.php:66
 #: include/export/export_printtva_pdf.php:213
 #: include/export/export_printtva_csv.php:78
+#: include/export/export_printtva_csv.php:78
 #: include/template/tax_summary_display.php:215
 #: include/template/tax_summary_display.php:309
 msgid "TVA Non Déd"
@@ -24981,6 +26449,7 @@ msgstr ""
 #: include/export/export_printtva_csv.php:67
 #: include/export/export_printtva_pdf.php:213
 #: include/export/export_printtva_csv.php:79
+#: include/export/export_printtva_csv.php:79
 #: include/template/tax_summary_display.php:216
 #: include/template/tax_summary_display.php:312
 msgid "TVA Non Déd & récup"
@@ -24992,60 +26461,73 @@ msgid "Résumé tous les journaux d'achat"
 msgstr ""
 
 #: include/compta_ven.inc.php:80 include/compta_ach.inc.php:72
-#: include/compta_ven.inc.php:80 include/compta_ach.inc.php:71
+#: include/compta_ach.inc.php:71 include/compta_ven.inc.php:80
+#: include/compta_ach.inc.php:71
 msgid "Vous devez encore confirmer"
 msgstr ""
 
 #: include/tax_summary.inc.php:39 include/tax_summary.inc.php:48
+#: include/tax_summary.inc.php:48
 #, php-format
 msgid "Période du %s au %s"
 msgstr ""
 
 #: include/export/export_printtva_pdf.php:49 include/database.item.php:141
 #: include/export/export_printtva_pdf.php:51 include/database.item.php:140
+#: include/export/export_printtva_pdf.php:51 include/database.item.php:140
 msgid "Résumé TVA"
 msgstr ""
 
 #: include/export/export_printtva_pdf.php:160
 #: include/export/export_printtva_pdf.php:164
+#: include/export/export_printtva_pdf.php:164
 msgid "Résumé TVA vente"
 msgstr ""
 
 #: include/export/export_printtva_pdf.php:301
 #: include/export/export_printtva_pdf.php:315
+#: include/export/export_printtva_pdf.php:315
 msgid "Résumé TVA Achat"
 msgstr ""
 
 #: include/database.item.php:139 include/database.item.php:138
+#: include/database.item.php:138
 msgid "Devises"
 msgstr ""
 
 #: include/database.item.php:139 include/database.item.php:138
+#: include/database.item.php:138
 msgid "Configuration des devises"
 msgstr ""
 
 #: include/database.item.php:139 include/database.item.php:138
+#: include/database.item.php:138
 msgid "Permet de configurer les devises"
 msgstr ""
 
 #: include/database.item.php:140 include/database.item.php:139
+#: include/database.item.php:139
 msgid "Export ANC"
 msgstr ""
 
 #: include/database.item.php:141 include/database.item.php:140
+#: include/database.item.php:140
 msgid "totaux  par TVA et par journal"
 msgstr ""
 
 #: include/database.item.php:141 include/database.item.php:140
+#: include/database.item.php:140
 msgid "Calcul des totaux  par TVA et par journal"
 msgstr ""
 
 #: include/database.item.php:142 include/database.item.php:143
-#: include/database.item.php:141 include/database.item.php:142
+#: include/database.item.php:141 include/database.item.php:141
+#: include/database.item.php:142
 msgid "Export Résumé TVA"
 msgstr ""
 
 #: include/database.item.php:236 include/database.item.php:220
+#: include/database.item.php:220
 msgid "Note de crédit"
 msgstr ""
 
@@ -25061,12 +26543,15 @@ msgstr ""
 
 #: include/class/acc_ledger.class.php:2362
 #: include/class/acc_ledger.class.php:2393
+#: include/class/acc_ledger.class.php:2393
 msgid "Avertissement ne peut être vide"
 msgstr ""
 
 #: include/class/acc_ledger.class.php:2555
 #: include/class/acc_ledger.class.php:2430
 #: include/class/acc_ledger.class.php:2585 include/database.item.php:233
+#: include/class/acc_ledger.class.php:2430
+#: include/class/acc_ledger.class.php:2585 include/database.item.php:233
 msgid "Attention, ce journal doit utiliser des montants négatifs"
 msgstr ""
 
@@ -25074,6 +26559,8 @@ msgstr ""
 #: include/class/tax_summary.class.php:93
 #: include/class/tax_summary.class.php:91
 #: include/class/tax_summary.class.php:111
+#: include/class/tax_summary.class.php:91
+#: include/class/tax_summary.class.php:111
 msgid "Format date invalide"
 msgstr ""
 
@@ -25083,31 +26570,45 @@ msgid "Aucune Donnée"
 msgstr ""
 
 #: include/lib/message_javascript.php:106
-#: include/lib/message_javascript.php:106
+#: include/lib/message_javascript.php:107
+#: include/lib/message_javascript.php:107
 msgid ""
 "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"
 msgstr ""
 
+#: scenario/select_dialog.test.php:32
+#: include/template/followup-show-action-add.php:30
 #: scenario/select_dialog.test.php:32
 #: include/template/followup-show-action-add.php:30
 msgid "Ajout action"
 msgstr ""
 
+#: unit-test/include/class/print_ledger_misc.classTest.php:73
 #: unit-test/include/class/print_ledger_misc.classTest.php:73
 msgid "Journal Opérations diverses "
 msgstr ""
 
+#: unit-test/include/class/print_ledger_misc.classTest.php:84
 #: unit-test/include/class/print_ledger_misc.classTest.php:84
 msgid "Journal Opérations diverses"
 msgstr ""
 
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:78
+#: unit-test/include/class/print_ledger_simple.classTest.php:82
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:82
 #: unit-test/include/class/print_ledger_detail_item.classTest.php:78
 #: unit-test/include/class/print_ledger_simple.classTest.php:82
 #: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:82
 msgid "Journal Achat Payé"
 msgstr ""
 
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:92
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:141
+#: unit-test/include/class/print_ledger_simple.classTest.php:96
+#: unit-test/include/class/print_ledger_simple.classTest.php:145
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:95
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:141
 #: unit-test/include/class/print_ledger_detail_item.classTest.php:92
 #: unit-test/include/class/print_ledger_detail_item.classTest.php:141
 #: unit-test/include/class/print_ledger_simple.classTest.php:96
@@ -25117,59 +26618,69 @@ msgstr ""
 msgid "Journal Non Payé"
 msgstr ""
 
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:107
+#: unit-test/include/class/print_ledger_simple.classTest.php:111
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:109
 #: unit-test/include/class/print_ledger_detail_item.classTest.php:107
 #: unit-test/include/class/print_ledger_simple.classTest.php:111
 #: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:109
 msgid "Journal Achat tous"
 msgstr ""
 
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:127
+#: unit-test/include/class/print_ledger_simple.classTest.php:131
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:128
 #: unit-test/include/class/print_ledger_detail_item.classTest.php:127
 #: unit-test/include/class/print_ledger_simple.classTest.php:131
 #: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:128
 msgid "Journal Vente Payé"
 msgstr ""
 
+#: unit-test/include/class/print_ledger_detail_item.classTest.php:156
+#: unit-test/include/class/print_ledger_simple.classTest.php:160
+#: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:155
 #: unit-test/include/class/print_ledger_detail_item.classTest.php:156
 #: unit-test/include/class/print_ledger_simple.classTest.php:160
 #: unit-test/include/class/print_ledger_simple_without_vat.classTest.php:155
 msgid "Journal Vente tous"
 msgstr ""
 
+#: unit-test/include/class/tax_summary.Test.php:110
 #: unit-test/include/class/tax_summary.Test.php:110
 msgid "unknow jrn_type"
 msgstr ""
 
-#: html/install.php:164
+#: html/install.php:164 html/install.php:168 html/install.php:168
 msgid ""
 "Mot de passe administrateur, il peut être changé ensuite dans les préférences"
 msgstr ""
 
-#: html/install.php:165
+#: html/install.php:165 html/install.php:169 html/install.php:169
 msgid "login administrateur"
 msgstr ""
 
-#: html/install.php:226
+#: html/install.php:226 html/install.php:230 html/install.php:230
 msgid "Le mot de passe du super admin et le login ne peuvent être vides"
 msgstr ""
 
-#: html/install.php:243
+#: html/install.php:243 html/install.php:247 html/install.php:247
 msgid ""
 "Le mot de passe du super admin et le superadmin ne peut pas contenir des "
 "guillemets ou espaces, ni @mobile"
 msgstr ""
 
-#: html/install.php:260
+#: html/install.php:260 html/install.php:265 html/install.php:265
 msgid ""
 "Voici l'utilisateur et mot de passe de l'utilisateur administrateur de "
 "Noalyss ,  il a tous les droits et a accès à tout. Connectez-vous avec ses "
 "identifiants et changer le mot de passe dans préférence (en haut à droit)"
 msgstr ""
 
-#: html/install.php:356
+#: html/install.php:356 html/install.php:362 html/install.php:362
 msgid "Version PHP trop basse , minimum 7.0.33"
 msgstr ""
 
-#: html/install.php:462
+#: html/install.php:462 html/install.php:468 html/install.php:468
 msgid ""
 " Vous devez absolument utiliser au minimum une version 9.5 de PostGresql, si "
 "votre distribution n'en\n"
@@ -25178,26 +26689,27 @@ msgid ""
 "vos bases de données"
 msgstr ""
 
-#: html/user_login.php:132
+#: html/user_login.php:132 html/user_login.php:132
 msgid ""
 "Si la redirection ne fonctionne pas, vous devez changer la valeur de "
 "NOALYSS_URL "
 msgstr ""
 
-#: include/fiche.inc.php:272
+#: include/fiche.inc.php:272 include/fiche.inc.php:272
 msgid "Export en PDF"
 msgstr ""
 
+#: include/anc_pa.inc.php:174 include/anc_pa.inc.php:194
 #: include/anc_pa.inc.php:174 include/anc_pa.inc.php:194
 msgid "Ajout d'un plan analytique"
 msgstr ""
 
-#: include/balance_card.inc.php:61
+#: include/balance_card.inc.php:61 include/balance_card.inc.php:61
 #, php-format
 msgid "Autre exercice %s"
 msgstr ""
 
-#: include/impress_bilan.inc.php:75
+#: include/impress_bilan.inc.php:75 include/impress_bilan.inc.php:75
 msgid ""
 "Attention : si le bilan n'est pas équilibré.<br> Vérifiez <ul>\n"
 "           <li>L'affectation du résultat est fait</li>\n"
@@ -25209,104 +26721,144 @@ msgid ""
 "           Utilisez la balance des comptes pour vérifier."
 msgstr ""
 
-#: include/class/document.class.php:1229
+#: include/class/document.class.php:1229 include/class/document.class.php:1229
 #, php-format
 msgid "le %s , %s écrit %s"
 msgstr ""
 
 #: include/class/document.class.php:1413 include/class/follow_up.class.php:270
+#: include/class/follow_up.class.php:272 include/class/follow_up.class.php:761
+#: include/class/document.class.php:1413 include/class/follow_up.class.php:272
+#: include/class/follow_up.class.php:761
 msgid "Normale"
 msgstr ""
 
+#: include/class/acc_ledger_history_sale.class.php:274
+#: include/class/acc_ledger_history_purchase.class.php:289
 #: include/class/acc_ledger_history_sale.class.php:274
 #: include/class/acc_ledger_history_purchase.class.php:289
 msgid "Code paiement"
 msgstr ""
 
-#: include/class/follow_up.class.php:620
+#: include/class/follow_up.class.php:620 include/class/follow_up.class.php:632
+#: include/class/follow_up.class.php:632
 msgid "Date Doc."
 msgstr ""
 
-#: include/class/follow_up.class.php:622
+#: include/class/follow_up.class.php:622 include/class/follow_up.class.php:635
+#: include/class/follow_up.class.php:635
 msgid "Date Limite"
 msgstr ""
 
-#: include/class/follow_up.class.php:624
+#: include/class/follow_up.class.php:624 include/class/follow_up.class.php:637
+#: include/class/follow_up.class.php:637
 msgid "Réf."
 msgstr ""
 
-#: include/class/follow_up.class.php:626
+#: include/class/follow_up.class.php:626 include/class/follow_up.class.php:643
+#: include/class/follow_up.class.php:643
 msgid "Dest/Exp"
 msgstr ""
 
 #: include/class/follow_up.class.php:1128
+#: include/class/follow_up.class.php:1160
+#: include/class/follow_up.class.php:1160
 msgid "Tous les actions ouvertes"
 msgstr ""
 
 #: include/class/follow_up.class.php:1535
+#: include/class/follow_up.class.php:1567
+#: include/class/tag_operation.class.php:69
+#: include/class/follow_up.class.php:1567
+#: include/class/tag_operation.class.php:69
 msgid "Ajout étiquette"
 msgstr ""
 
+#: include/class/tax_summary.class.php:137
+#: include/class/tax_summary.class.php:154
 #: include/class/tax_summary.class.php:137
 #: include/class/tax_summary.class.php:154
 msgid "Données manquantes"
 msgstr ""
 
+#: include/class/tax_summary.class.php:232
+#: include/class/tax_summary.class.php:306
 #: include/class/tax_summary.class.php:232
 #: include/class/tax_summary.class.php:306
 msgid "Exig TVA invalide"
 msgstr ""
 
+#: include/class/anc_operation.class.php:658
 #: include/class/anc_operation.class.php:658
 msgid "Efface détail"
 msgstr ""
 
+#: include/class/tva_rate_mtable.class.php:60
 #: include/class/tva_rate_mtable.class.php:60
 msgid "Exigible achat"
 msgstr ""
 
+#: include/class/tva_rate_mtable.class.php:67
 #: include/class/tva_rate_mtable.class.php:67
 msgid "Exigible vente"
 msgstr ""
 
+#: include/class/anc_account_table.class.php:120
 #: include/class/anc_account_table.class.php:120
 msgid "Effacement impossible : le poste est utilisé dans une période fermée"
 msgstr ""
 
+#: include/class/pre_operation.class.php:69
 #: include/class/pre_operation.class.php:69
 msgid "Nom du modèle "
 msgstr ""
 
 #: include/class/acc_ledger_search.class.php:212
+#: include/class/acc_ledger_search.class.php:214
+#: include/class/acc_ledger_search.class.php:214
 msgid "Toutes"
 msgstr ""
 
 #: include/class/acc_ledger_search.class.php:213
+#: include/class/acc_ledger_search.class.php:215
+#: include/class/acc_ledger_search.class.php:215
 msgid "Non payées"
 msgstr ""
 
 #: include/class/acc_ledger_search.class.php:214
+#: include/class/acc_ledger_search.class.php:216
+#: include/class/acc_ledger_search.class.php:216
 msgid "Payées"
 msgstr ""
 
 #: include/class/acc_ledger_search.class.php:603
+#: include/class/acc_ledger_search.class.php:626
+#: include/class/acc_ledger_search.class.php:626
 msgid "ALS01 Etat inconnu"
 msgstr ""
 
+#: include/class/acc_operation.class.php:747
 #: include/class/acc_operation.class.php:747
 msgid "Menu invalide"
 msgstr ""
 
+#: include/class/acc_operation.class.php:769
+#: include/class/acc_operation.class.php:779
 #: include/class/acc_operation.class.php:769
 #: include/class/acc_operation.class.php:779
 #, php-format
 msgid "Voulez-vous aller à %s pour dupliquer cette opération ?"
 msgstr ""
 
+#: include/class/acc_operation.class.php:798
 #: include/class/acc_operation.class.php:798
 msgid "Dupliquer"
 msgstr ""
 
+#: include/class/acc_ledger_history.class.php:337
+#: include/class/acc_ledger_purchase.class.php:1845
+#: include/class/acc_ledger_sold.class.php:1368
+#: include/class/print_ledger.class.php:331
 #: include/class/acc_ledger_history.class.php:337
 #: include/class/acc_ledger_purchase.class.php:1845
 #: include/class/acc_ledger_sold.class.php:1368
@@ -25314,154 +26866,191 @@ msgstr ""
 msgid "Filtre invalide"
 msgstr ""
 
+#: include/class/acc_ledger_history.class.php:361
+#: include/class/pdf.class.php:151 include/class/print_ledger.class.php:103
 #: include/class/acc_ledger_history.class.php:361
 #: include/class/pdf.class.php:151 include/class/print_ledger.class.php:103
 msgid "Filter invalide "
 msgstr ""
 
+#: include/class/acc_ledger.class.php:1063
 #: include/class/acc_ledger.class.php:1063
 msgid "Période inexistante"
 msgstr ""
 
-#: include/class/fiche.class.php:1181
+#: include/class/fiche.class.php:1181 include/class/fiche.class.php:1181
 msgid "Fiche n'existe pas"
 msgstr ""
 
+#: include/class/card_attribut_mtable.class.php:42
 #: include/class/card_attribut_mtable.class.php:42
 msgid "Option sup."
 msgstr ""
 
+#: include/class/card_attribut_mtable.class.php:43
 #: include/class/card_attribut_mtable.class.php:43
 msgid "Recherche suivi"
 msgstr ""
 
+#: include/class/card_attribut_mtable.class.php:57
+#: include/class/contact_option_ref_mtable.class.php:46
 #: include/class/card_attribut_mtable.class.php:57
 #: include/class/contact_option_ref_mtable.class.php:46
 msgid "Coche"
 msgstr ""
 
+#: include/class/card_attribut_mtable.class.php:176
 #: include/class/card_attribut_mtable.class.php:176
 msgid "Description ne peut pas être vide"
 msgstr ""
 
+#: include/class/card_attribut_mtable.class.php:196
 #: include/class/card_attribut_mtable.class.php:196
 msgid "Effacement bloqué : attribut utilisé"
 msgstr ""
 
+#: include/class/card_multiple.class.php:128
 #: include/class/card_multiple.class.php:128
 msgid "CMCDO01Security"
 msgstr ""
 
+#: include/class/action_document_type_mtable.class.php:49
 #: include/class/action_document_type_mtable.class.php:49
 msgid "Préfixe document"
 msgstr ""
 
+#: include/class/action_document_type_mtable.class.php:111
 #: include/class/action_document_type_mtable.class.php:111
 msgid "Préfixe ne peut être vide"
 msgstr ""
 
+#: include/class/action_document_type_mtable.class.php:118
 #: include/class/action_document_type_mtable.class.php:118
 msgid "Doublon, ce nom existe déjà "
 msgstr ""
 
+#: include/class/action_document_type_mtable.class.php:125
 #: include/class/action_document_type_mtable.class.php:125
 msgid "Doublon, ce préfixe existe déjà "
 msgstr ""
 
+#: include/class/contact_option_ref_mtable.class.php:39
+#: include/class/follow_up_other_concerned.class.php:166
+#: include/class/follow_up_other_concerned.class.php:166
 #: include/class/contact_option_ref_mtable.class.php:39
 msgid "Options"
 msgstr ""
 
-#: include/class/user.class.php:764
+#: include/class/user.class.php:764 include/class/user.class.php:764
 msgid "Access invalid"
 msgstr ""
 
+#: include/class/noalyss_parameter_folder.class.php:70
 #: include/class/noalyss_parameter_folder.class.php:70
 #, php-format
 msgid "Valeur invalide %s"
 msgstr ""
 
+#: include/class/noalyss_parameter_folder.class.php:73
 #: include/class/noalyss_parameter_folder.class.php:73
 #, php-format
 msgid "Erreur Filtre analytique %s"
 msgstr ""
 
+#: include/class/profile_menu.class.php:247
 #: include/class/profile_menu.class.php:247
 msgid "Ecriture et suppression"
 msgstr ""
 
+#: include/class/html_input_noalyss.class.php:46
 #: include/class/html_input_noalyss.class.php:46
 msgid "LAD46 Erreur type"
 msgstr ""
 
+#: include/class/html_input_noalyss.class.php:56
 #: include/class/html_input_noalyss.class.php:56
 msgid "ligne à ajouter"
 msgstr ""
 
+#: include/class/document_state_mtable.php:47
 #: include/class/document_state_mtable.php:47
 msgid "Ferme"
 msgstr ""
 
 #: include/class/document_state_mtable.php:48
+#: include/class/document_state_mtable.php:48 include/database.item.php:125
 msgid "Aucune"
 msgstr ""
 
+#: include/class/acc_balance.class.php:279
 #: include/class/acc_balance.class.php:279
 #, php-format
 msgid "Totaux %s %s"
 msgstr ""
 
+#: include/class/acc_plan_mtable.class.php:197
 #: include/class/acc_plan_mtable.class.php:197
 msgid "Poste utilisé"
 msgstr ""
 
-#: include/lettering.account.inc.php:139
+#: include/lettering.account.inc.php:139 include/lettering.account.inc.php:139
 msgid "Un instant..."
 msgstr ""
 
+#: include/ajax/ajax_anc_key_clean.php:65
 #: include/ajax/ajax_anc_key_clean.php:65
 msgid "Interdit"
 msgstr ""
 
-#: include/ajax/ajax_card.php:430
+#: include/ajax/ajax_card.php:430 include/ajax/ajax_card.php:430
 msgid "fiches inactives"
 msgstr ""
 
-#: include/ajax/ajax_ledger.php:589
+#: include/ajax/ajax_ledger.php:589 include/ajax/ajax_ledger.php:590
+#: include/ajax/ajax_ledger.php:590
 msgid "Dupliquer une opération"
 msgstr ""
 
+#: include/ajax/ajax_display_card_option.php:42
+#: include/template/action_document_type_mtable_input.php:125
 #: include/ajax/ajax_display_card_option.php:42
 #: include/template/action_document_type_mtable_input.php:125
 msgid "Options contact"
 msgstr ""
 
+#: include/ajax/ajax_add_concerned_card.php:71
 #: include/ajax/ajax_add_concerned_card.php:71
 msgid "limité aux champs "
 msgstr ""
 
+#: include/ajax/ajax_add_concerned_card.php:88
 #: include/ajax/ajax_add_concerned_card.php:88
 msgid "Fiches inactives"
 msgstr ""
 
-#: include/preod.inc.php:50
+#: include/preod.inc.php:50 include/preod.inc.php:50
 msgid "Filter par journal"
 msgstr ""
 
+#: include/export/export_printtva_pdf.php:217
 #: include/export/export_printtva_pdf.php:217
 msgid "TVA ND récup"
 msgstr ""
 
+#: include/export/export_balance_csv.php:85
 #: include/export/export_balance_csv.php:85
 #, php-format
 msgid "balance du %s au %s"
 msgstr ""
 
+#: include/export/export_balance_pdf.php:179
 #: include/export/export_balance_pdf.php:179
 #, php-format
 msgid "Totaux %s "
 msgstr ""
 
+#: include/export/export_balance_pdf.php:186
+#: include/export/export_balance_pdf.php:192
 #: include/export/export_balance_pdf.php:186
 #: include/export/export_balance_pdf.php:192
 #, php-format
@@ -25469,13 +27058,18 @@ msgid "niveau %s"
 msgstr ""
 
 #: include/template/template_config_form.php:65
+#: include/template/template_config_form.php:46
+#: include/template/template_config_form.php:46
 msgid "Mot de passe administrateur de noalyss"
 msgstr ""
 
 #: include/template/template_config_form.php:91
+#: include/template/template_config_form.php:84
+#: include/template/template_config_form.php:84
 msgid "Aide"
 msgstr ""
 
+#: include/template/follow_up_detail_display.php:194
 #: include/template/follow_up_detail_display.php:194
 msgid "Recalculer"
 msgstr ""
@@ -25484,166 +27078,271 @@ msgstr ""
 msgid "Contacts multiples"
 msgstr ""
 
+#: include/template/action_document_type_mtable_input.php:94
 #: include/template/action_document_type_mtable_input.php:94
 msgid "Création de facture"
 msgstr ""
 
+#: include/template/action_document_type_mtable_input.php:105
 #: include/template/action_document_type_mtable_input.php:105
 msgid "Description modifiable"
 msgstr ""
 
+#: include/template/action_document_type_mtable_input.php:115
 #: include/template/action_document_type_mtable_input.php:115
 msgid "Unique"
 msgstr ""
 
+#: include/template/action_document_type_mtable_input.php:116
 #: include/template/action_document_type_mtable_input.php:116
 msgid "Multiples"
 msgstr ""
 
+#: include/template/ledger_detail_bottom.php:16
 #: include/template/ledger_detail_bottom.php:16
 msgid "Autre action"
 msgstr ""
 
 #: include/template/ledger_detail_bottom.php:337
+#: include/template/ledger_detail_bottom.php:354
+#: include/template/ledger_detail_bottom.php:354
 msgid "Vérification CA"
 msgstr ""
 
+#: include/template/tag_search_select.php:12
 #: include/template/tag_search_select.php:12
 msgid "Etiquettes"
 msgstr ""
 
-#: include/template/letter_all.php:53
+#: include/template/letter_all.php:53 include/template/letter_all.php:53
 msgid "aucun lettrage"
 msgstr ""
 
-#: include/template/letter_all.php:126
+#: include/template/letter_all.php:126 include/template/letter_all.php:126
 #, php-format
 msgid "Solde débiteur : %s"
 msgstr ""
 
-#: include/template/letter_all.php:128
+#: include/template/letter_all.php:128 include/template/letter_all.php:128
 #, php-format
 msgid "Solde créditeur : %s"
 msgstr ""
 
+#: include/template/pre_operation_display.php:32
 #: include/template/pre_operation_display.php:32
 msgid "Nom du modèle"
 msgstr ""
 
+#: include/template/followup-show-action-add.php:34
 #: include/template/followup-show-action-add.php:34
 msgid "Choississez une action"
 msgstr ""
 
+#: include/template/fiche_def_input.php:26
 #: include/template/fiche_def_input.php:26
 msgid "Modèles de catégorie"
 msgstr ""
 
+#: include/template/card_multiple_result.php:10
 #: include/template/card_multiple_result.php:10
 msgid "recherche rapide"
 msgstr ""
 
+#: include/template/card_multiple_result.php:14
 #: include/template/card_multiple_result.php:14
 #, php-format
 msgid "Nombre de fiches trouvées %d montrées %d"
 msgstr ""
 
 #: include/template/action_search.php:146
+#: include/template/action_search.php:148
+#: include/template/action_search.php:148
 msgid "Option étiquettes"
 msgstr ""
 
-#: include/template/action_search.php:149
+#: include/template/action_search.php:149 include/template/ledger_search.php:97
+#: include/template/action_search.php:151 include/template/ledger_search.php:97
+#: include/template/action_search.php:151
 msgid "Toutes les étiquettes"
 msgstr ""
 
-#: include/template/action_search.php:150
+#: include/template/action_search.php:150 include/template/ledger_search.php:98
+#: include/template/action_search.php:152 include/template/ledger_search.php:98
+#: include/template/action_search.php:152
 msgid "Au moins une étiquette"
 msgstr ""
 
-#: include/impress_jrn.inc.php:157
+#: include/impress_jrn.inc.php:157 include/impress_jrn.inc.php:157
 msgid "Uniquement payées"
 msgstr ""
 
-#: include/impress_jrn.inc.php:158
+#: include/impress_jrn.inc.php:158 include/impress_jrn.inc.php:158
 msgid "Uniquement non payées"
 msgstr ""
 
-#: include/impress_jrn.inc.php:162
+#: include/impress_jrn.inc.php:162 include/impress_jrn.inc.php:162
 msgid "Uniquement pour journaux vente et achat"
 msgstr ""
 
-#: include/tax_summary.inc.php:46
+#: include/tax_summary.inc.php:46 include/tax_summary.inc.php:46
 #, php-format
 msgid "Calcul d'après la date"
 msgstr ""
 
+#: include/lib/manage_table_sql.class.php:1107
 #: include/lib/manage_table_sql.class.php:1107
 msgid "Donnée"
 msgstr ""
 
-#: include/lib/iconcerned.class.php:99
+#: include/lib/iconcerned.class.php:99 include/lib/iconcerned.class.php:99
 msgid "setSingleOperation failed"
 msgstr ""
 
+#: include/lib/output_html_tab.class.php:71
 #: include/lib/output_html_tab.class.php:71
 msgid "OUTPUTHTML070 Mode invalide"
 msgstr ""
 
-#: include/lib/message_javascript.php:77
+#: include/lib/message_javascript.php:77 include/lib/message_javascript.php:78
+#: include/lib/message_javascript.php:78
 msgid "Ne donnez pas ce poste comptable si ce code n'est pas utilisé à l'achat"
 msgstr ""
 
-#: include/lib/message_javascript.php:78
+#: include/lib/message_javascript.php:78 include/lib/message_javascript.php:79
+#: include/lib/message_javascript.php:79
 msgid ""
 "Ne donnez pas ce poste comptable si ce code n'est pas utilisé  à la vente"
 msgstr ""
 
 #: include/lib/message_javascript.php:107
+#: include/lib/message_javascript.php:108
+#: include/lib/message_javascript.php:108
 msgid "TVA due ou récupérable quand l'opération est payée ou exécutée"
 msgstr ""
 
 #: include/lib/message_javascript.php:108
+#: include/lib/message_javascript.php:109
+#: include/lib/message_javascript.php:109
 msgid "Journaux Achat ou vente en mode simple, TVA ou détaillé"
 msgstr ""
 
 #: include/lib/message_javascript.php:109
+#: include/lib/message_javascript.php:110
+#: include/lib/message_javascript.php:110
 msgid "Il est conseillé d'avoir un quickcode de moins de 9 car."
 msgstr ""
 
 #: include/lib/message_javascript.php:110
+#: include/lib/message_javascript.php:111
+#: include/lib/message_javascript.php:111
 msgid "Permet de chercher dans le suivi pour les contacts multiques"
 msgstr ""
 
+#: include/lib/select_dialog.class.php:48
 #: include/lib/select_dialog.class.php:48
 msgid "Sélection"
 msgstr ""
 
-#: include/param_sec.inc.php:120
+#: include/param_sec.inc.php:120 include/param_sec.inc.php:120
 msgid "Erreur sécurité"
 msgstr ""
 
-#: include/param_sec.inc.php:253
+#: include/param_sec.inc.php:253 include/param_sec.inc.php:253
 msgid ""
 "La sécurité sur les journaux, permet de limiter l'accès de l'utilisateur aux "
 "journaux, si cette  sécurité n'est pas activée , l'utilisateur a accès à "
 "tous les journaux en lecture et écriture"
 msgstr ""
 
-#: include/param_sec.inc.php:327
+#: include/param_sec.inc.php:327 include/param_sec.inc.php:327
 msgid ""
 "La sécurité sur les actions permet de limiter ce que l'utilisateur peut "
 "faire, si  elle n'est pas active l'utilisateur a donc accès à toutes ces "
 "actions"
 msgstr ""
 
-#: include/company.inc.php:120
+#: include/company.inc.php:120 include/company.inc.php:120
 msgid "Uniquement des chiffres séparés par des virgules"
 msgstr ""
 
-#: include/company.inc.php:146
+#: include/company.inc.php:146 include/company.inc.php:146
 msgid ""
 "Opération analytique uniquement pour les postes comptables commençant par"
 msgstr ""
 
-#: include/cfgtags.inc.php:83
+#: include/cfgtags.inc.php:83 include/cfgtags.inc.php:83
 msgid "Groupe étiquettes"
 msgstr ""
+
+#: include/user_detail.inc.php:94 include/user_detail.inc.php:94
+msgid "Code invalide, effacement refusé"
+msgstr ""
+
+#: include/user_detail.inc.php:113 include/user_detail.inc.php:113
+#, php-format
+msgid "Utilisateur %s %s est effacé"
+msgstr ""
+
+#: include/user_detail.inc.php:211 include/user_detail.inc.php:211
+msgid "Pour effacer , confirmez en retapant le code"
+msgstr ""
+
+#: include/ajax/ajax_admin.php:264 include/ajax/ajax_admin.php:264
+msgid "Tapez le code de confirmation"
+msgstr ""
+
+#: include/ajax/ajax_action_concerned_list.php:39
+#: include/ajax/ajax_action_concerned_list.php:39
+msgid "Liste Autres Fiches"
+msgstr ""
+
+#: include/export/export_fiche_detail_pdf.php:112
+#: include/export/export_fiche_detail_pdf.php:216
+#: include/export/export_fiche_detail_pdf.php:112
+#: include/export/export_fiche_detail_pdf.php:216
+msgid "créditeur"
+msgstr ""
+
+#: include/export/export_fiche_detail_pdf.php:117
+#: include/export/export_fiche_detail_pdf.php:221
+#: include/export/export_fiche_detail_pdf.php:117
+#: include/export/export_fiche_detail_pdf.php:221
+msgid "débiteur"
+msgstr ""
+
+#: include/template/template_config_form.php:56
+#: include/template/template_config_form.php:56
+msgid "Serveur"
+msgstr ""
+
+#: include/template/template_config_form.php:91
+#: include/template/template_config_form.php:91
+msgid "Postgresql"
+msgstr ""
+
+#: include/template/action_document_type_mtable_input.php:86
+#: include/template/action_document_type_mtable_input.php:86
+msgid "Autres fiches"
+msgstr ""
+
+#: include/template/tag_detail.php:29 include/template/tag_detail.php:29
+msgid "Couleur"
+msgstr ""
+
+#: include/template/tag_detail.php:38 include/template/tag_detail.php:38
+msgid "Exemple"
+msgstr ""
+
+#: include/template/tag_detail.php:50 include/template/tag_detail.php:50
+msgid "Etiquette actif"
+msgstr ""
+
+#: include/dossier.inc.php:386 include/dossier.inc.php:386
+msgid "Désolé, le code est invalide"
+msgstr ""
+
+#: include/lib/message_javascript.php:67 include/lib/message_javascript.php:67
+msgid ""
+"le type vaut : ME pour Menu, PR pour les impressions,PL pour les plugins,SP "
+"pour des valeurs spéciales"
+msgstr ""
diff --git a/html/lang/nl_NL/LC_MESSAGES/messages.po b/html/lang/nl_NL/LC_MESSAGES/messages.po
index 8133067d9..bc5b849b5 100644
--- a/html/lang/nl_NL/LC_MESSAGES/messages.po
+++ b/html/lang/nl_NL/LC_MESSAGES/messages.po
@@ -4,12 +4,11 @@
 #
 # dany <dany@alchimerys.be>, 2014.
 # Dany De Bontridder <danydb@noalyss.eu>, 2015, 2018, 2019.
-#: include/database.item.php:125
 msgid ""
 msgstr ""
 "Project-Id-Version: NOALYSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-04 17:42+0100\n"
+"POT-Creation-Date: 2020-11-13 08:52+0100\n"
 "PO-Revision-Date: 2019-07-31 13:23+0100\n"
 "Last-Translator: dany <danydb@noalyss.eu>\n"
 "Language-Team: English <kde-i18n-doc@kde.org>\n"
@@ -30,6 +29,7 @@ msgid "  Periode : "
 msgstr "Periode"
 
 #: include/export/export_poste_detail_pdf.php:60
+#: include/export/export_poste_detail_pdf.php:61
 #, php-format
 msgid "  Période : %s %s"
 msgstr "Periode %s %s"
@@ -82,12 +82,13 @@ msgstr ""
 #: include/ajax/ajax_card.php:456 include/ajax/ajax_card.php:457
 #: include/ajax/ajax_card.php:490 include/ajax/ajax_card.php:494
 #: include/ajax/ajax_card.php:495 include/ajax/ajax_card.php:571
+#: include/ajax/ajax_card.php:570
 msgid " Banque"
 msgstr "Bank"
 
 #: include/dossier.inc.php:111 include/dossier.inc.php:132
 #: include/dossier.inc.php:143 include/dossier.inc.php:146
-#: include/dossier.inc.php:151
+#: include/dossier.inc.php:151 include/dossier.inc.php:153
 msgid " Base de donnée "
 msgstr "Database"
 
@@ -96,6 +97,7 @@ msgstr "Database"
 #: include/template/ledger_detail_bottom.php:143
 #: include/template/ledger_detail_bottom.php:148
 #: include/template/ledger_detail_bottom.php:153
+#: include/template/ledger_detail_bottom.php:154
 msgid " Bon de commande"
 msgstr "Bestelbon"
 
@@ -103,6 +105,8 @@ msgstr "Bestelbon"
 #: include/export/export_poste_detail_pdf.php:225
 #: include/export/export_poste_detail_pdf.php:128
 #: include/export/export_poste_detail_pdf.php:236
+#: include/export/export_poste_detail_pdf.php:129
+#: include/export/export_poste_detail_pdf.php:237
 msgid " C "
 msgstr "C"
 
@@ -136,13 +140,15 @@ msgstr "BTW Code"
 #: include/export/export_poste_detail_pdf.php:230
 #: include/export/export_poste_detail_pdf.php:133
 #: include/export/export_poste_detail_pdf.php:241
+#: include/export/export_poste_detail_pdf.php:134
+#: include/export/export_poste_detail_pdf.php:242
 msgid " D "
 msgstr "D"
 
 #: include/ajax_mod_periode.php:55 include/ajax/ajax_mod_periode.php:55
 #: include/ajax/ajax_periode.php:171 include/class/periode.class.php:702
 #: include/class/periode.class.php:704 include/class/periode.class.php:706
-#: include/class/periode.class.php:707
+#: include/class/periode.class.php:707 include/class/periode.class.php:708
 msgid " Début période : "
 msgstr "Begin"
 
@@ -154,6 +160,7 @@ msgstr ""
 #: include/ajax/ajax_card.php:460 include/ajax/ajax_card.php:461
 #: include/ajax/ajax_card.php:494 include/ajax/ajax_card.php:498
 #: include/ajax/ajax_card.php:499 include/ajax/ajax_card.php:575
+#: include/ajax/ajax_card.php:574
 msgid " Employé ou administrateur"
 msgstr "Manager of bediende"
 
@@ -168,14 +175,14 @@ msgstr "Fout in de formula"
 #: include/ajax_mod_periode.php:57 include/ajax/ajax_mod_periode.php:57
 #: include/ajax/ajax_periode.php:173 include/class/periode.class.php:704
 #: include/class/periode.class.php:706 include/class/periode.class.php:708
-#: include/class/periode.class.php:709
+#: include/class/periode.class.php:709 include/class/periode.class.php:710
 msgid " Exercice : "
 msgstr "Jaar"
 
 #: include/ajax_mod_periode.php:56 include/ajax/ajax_mod_periode.php:56
 #: include/ajax/ajax_periode.php:172 include/class/periode.class.php:703
 #: include/class/periode.class.php:705 include/class/periode.class.php:707
-#: include/class/periode.class.php:708
+#: include/class/periode.class.php:708 include/class/periode.class.php:709
 msgid " Fin période : "
 msgstr "End "
 
@@ -302,7 +309,7 @@ msgid ""
 "vos bases de données"
 msgstr ""
 
-#: html/install.php:462
+#: html/install.php:462 html/install.php:468
 msgid ""
 " Vous devez absolument utiliser au minimum une version 9.5 de PostGresql, si "
 "votre distribution n'en\n"
@@ -322,7 +329,7 @@ msgstr "tot"
 #: include/ajax/ajax_card.php:447 include/ajax/ajax_card.php:448
 #: include/ajax/ajax_card.php:449 include/ajax/ajax_card.php:482
 #: include/ajax/ajax_card.php:486 include/ajax/ajax_card.php:487
-#: include/ajax/ajax_card.php:563
+#: include/ajax/ajax_card.php:563 include/ajax/ajax_card.php:562
 msgid " d'administration"
 msgstr "van de administratie"
 
@@ -331,7 +338,7 @@ msgstr "van de administratie"
 #: include/ajax/ajax_card.php:439 include/ajax/ajax_card.php:440
 #: include/ajax/ajax_card.php:441 include/ajax/ajax_card.php:474
 #: include/ajax/ajax_card.php:478 include/ajax/ajax_card.php:479
-#: include/ajax/ajax_card.php:555
+#: include/ajax/ajax_card.php:555 include/ajax/ajax_card.php:554
 msgid " de clients"
 msgstr "van klanten"
 
@@ -340,6 +347,7 @@ msgstr "van klanten"
 #: include/ajax/ajax_card.php:452 include/ajax/ajax_card.php:453
 #: include/ajax/ajax_card.php:486 include/ajax/ajax_card.php:490
 #: include/ajax/ajax_card.php:491 include/ajax/ajax_card.php:567
+#: include/ajax/ajax_card.php:566
 msgid " de contacts"
 msgstr "van contacten"
 
@@ -348,7 +356,7 @@ msgstr "van contacten"
 #: include/ajax/ajax_card.php:443 include/ajax/ajax_card.php:444
 #: include/ajax/ajax_card.php:445 include/ajax/ajax_card.php:478
 #: include/ajax/ajax_card.php:482 include/ajax/ajax_card.php:483
-#: include/ajax/ajax_card.php:559
+#: include/ajax/ajax_card.php:559 include/ajax/ajax_card.php:558
 msgid " de fournisseurs"
 msgstr "van leveranciers"
 
@@ -386,7 +394,7 @@ msgstr ""
 
 #: include/dossier.inc.php:94 include/dossier.inc.php:115
 #: include/dossier.inc.php:126 include/dossier.inc.php:129
-#: include/dossier.inc.php:134
+#: include/dossier.inc.php:134 include/dossier.inc.php:136
 msgid " est une année invalide"
 msgstr "is een ongeldig jaar"
 
@@ -401,7 +409,7 @@ msgstr ""
 #: include/class_anc_print.php:137 include/class_anc_print.php:179
 #: include/class_anc_print.php:181 include/class/class_anc_print.php:181
 #: include/class/class_anc_print.php:183 include/class/anc_print.class.php:177
-#: include/class/anc_print.class.php:183
+#: include/class/anc_print.class.php:183 include/class/anc_print.class.php:184
 msgid " et l'activité "
 msgstr "en de activiteit"
 
@@ -561,29 +569,29 @@ msgstr "Inkoopdagboeken"
 msgid "(beta) Encodage de fiche pour service après-vente"
 msgstr ""
 
-#: include/lib/message_javascript.php:39
+#: include/lib/message_javascript.php:39 include/lib/message_javascript.php:40
 msgid ""
 "(optionnel) Ce montant correspond au total tva, si vous le laissez à vide, "
 "il sera calculé automatiquement en fonction du taux"
 msgstr ""
 
-#: include/lib/message_javascript.php:38
+#: include/lib/message_javascript.php:38 include/lib/message_javascript.php:39
 msgid ""
 "(optionnel) Ces champs servent à contrôler que les montants correspondent à "
 "l'extrait"
 msgstr ""
 
-#: include/lib/message_javascript.php:35
+#: include/lib/message_javascript.php:35 include/lib/message_javascript.php:36
 msgid "(optionnel) L'échéance est la date limite de paiement"
 msgstr ""
 
-#: include/lib/message_javascript.php:32
+#: include/lib/message_javascript.php:32 include/lib/message_javascript.php:33
 msgid ""
 "(optionnel) La description est un commentaire libre qui sert à identifier "
 "cette opération"
 msgstr ""
 
-#: include/lib/message_javascript.php:36
+#: include/lib/message_javascript.php:36 include/lib/message_javascript.php:37
 msgid ""
 "(optionnel)Le numéro d'extrait permet de retrouver plus facilement l'extrait "
 "de banque"
@@ -750,17 +758,18 @@ msgid "A partir du mois de"
 msgstr "Vanaf"
 
 #: include/class/acc_ledger_search.class.php:603
+#: include/class/acc_ledger_search.class.php:626
 #, fuzzy
 msgid "ALS01 Etat inconnu"
 msgstr "onbekend btw"
 
-#: include/lib/message_javascript.php:41
+#: include/lib/message_javascript.php:41 include/lib/message_javascript.php:42
 msgid ""
 "ATTENTION changer le poste comptable d'une fiche <b>ne modifiera pas toutes "
 "les opérations</b> où cette fiche est utilisée"
 msgstr ""
 
-#: include/lib/message_javascript.php:42
+#: include/lib/message_javascript.php:42 include/lib/message_javascript.php:43
 msgid "ATTENTION si le poste comptable est  vide, il sera créé automatiquement"
 msgstr ""
 
@@ -908,6 +917,7 @@ msgstr "Verboden toegang"
 #: include/class/operation_predef_mtable.class.php:172
 #: include/database.item.php:3 include/database.item.php:67
 #: include/database.item.php:219 include/database.item.php:231
+#: include/class/acc_ledger_search.class.php:1211
 msgid "Achat"
 msgstr "Aankoop"
 
@@ -922,6 +932,7 @@ msgstr "Verwerving over heel het jaar"
 #: include/class/acc_plan_mtable.class.php:49
 #: include/template/tag_detail.php:15
 #: include/class/acc_plan_mtable.class.php:55 include/template/tag_list.php:20
+#: include/user_detail.inc.php:163 include/user.inc.php:131
 #, fuzzy
 msgid "Actif"
 msgstr "Actie"
@@ -1006,7 +1017,9 @@ msgstr "Achterstallige actie"
 #: include/ajax/ajax_card.php:220 include/ajax/ajax_card.php:402
 #: include/ajax/ajax_card.php:603 include/ajax/ajax_card.php:658
 #: include/ajax/ajax_card.php:673 include/ajax/ajax_card.php:702
-#: include/ajax/ajax_card.php:738
+#: include/ajax/ajax_card.php:738 include/ajax/ajax_card.php:602
+#: include/ajax/ajax_card.php:657 include/ajax/ajax_card.php:672
+#: include/ajax/ajax_card.php:701 include/ajax/ajax_card.php:737
 msgid "Action interdite"
 msgstr "Verboden handeling"
 
@@ -1033,7 +1046,7 @@ msgstr "Actie is ontoegankelijk"
 #: html/ajax_misc.php:290 html/ajax_misc.php:382 html/ajax_misc.php:384
 #: html/ajax_misc.php:390 include/lib/message_javascript.php:90
 #: include/lib/message_javascript.php:92 html/ajax_misc.php:392
-#: html/ajax_misc.php:396
+#: html/ajax_misc.php:396 include/lib/message_javascript.php:93
 #, fuzzy
 msgid "Action non autorisée"
 msgstr "Bewerking Opgeslagen"
@@ -1064,6 +1077,7 @@ msgstr "Actie management"
 #: include/template/detail-action.php:191
 #: include/template/detail-action.php:166
 #: include/template/detail-action.php:173
+#: include/template/detail-action.php:175
 msgid "Actions concernées"
 msgstr "Betreffende acties"
 
@@ -1133,11 +1147,13 @@ msgstr "Updaten"
 #: include/param_sec.inc.php:99 include/param_sec.inc.php:158
 #: html/user_login.php:115 include/database.item.php:126
 #: include/param_sec.inc.php:100 include/param_sec.inc.php:163
+#: include/user_detail.inc.php:186 include/user.inc.php:175
 msgid "Administrateur"
 msgstr "Beheerder"
 
 #: include/template/template_config_form.php:56
 #: include/template/template_config_form.php:57
+#: include/template/template_config_form.php:38
 #, fuzzy
 msgid "Administrateur de noalyss"
 msgstr "Beheerder"
@@ -1185,6 +1201,7 @@ msgstr "Adres"
 #: include/template/template_config_form.php:55
 #: include/template/template_config_form.php:63
 #: include/template/template_config_form.php:73
+#: include/template/template_config_form.php:104
 #, fuzzy
 msgid "Adresse Serveur Postgresql"
 msgstr "Gebruiker toevoegen"
@@ -1223,6 +1240,7 @@ msgstr "Toon ook de gesloten acties"
 #: include/ext/tva/ext_tvagen.class.php:114
 #: include/lib/message_javascript.php:94 include/lib/message_javascript.php:96
 #: include/tax_summary.inc.php:43 include/tax_summary.inc.php:52
+#: include/lib/message_javascript.php:97
 msgid "Afficher"
 msgstr "Weergeven"
 
@@ -1252,6 +1270,7 @@ msgid "Agenda, présentation du suivi sous forme d'agenda "
 msgstr ""
 
 #: include/template/template_config_form.php:91
+#: include/template/template_config_form.php:84
 msgid "Aide"
 msgstr ""
 
@@ -1297,7 +1316,8 @@ msgstr "Hulp voor de wiki"
 #: include/class/operation_predef_mtable.class.php:170
 #: include/template/followup-show-action-add.php:61
 #: include/lib/manage_table_sql.class.php:663
-#: include/lib/manage_table_sql.class.php:704
+#: include/lib/manage_table_sql.class.php:704 include/user_detail.inc.php:283
+#: include/class/acc_ledger_search.class.php:266
 msgid "Ajout"
 msgstr "Toevoeging"
 
@@ -1317,6 +1337,7 @@ msgid "Ajout Menu"
 msgstr "Lijn toevoegen"
 
 #: include/user.inc.php:73 include/user.inc.php:74 include/user.inc.php:76
+#: include/user.inc.php:78
 #, fuzzy
 msgid "Ajout Utilisateur"
 msgstr "Gebruiker toevoegen"
@@ -1378,6 +1399,7 @@ msgstr "Artikel toevoegen"
 #: include/lib/html_input.class.php:1037 include/lib/html_input.class.php:1095
 #: include/lib/html_input.class.php:1096 include/lib/html_input.class.php:1111
 #: include/lib/html_input.class.php:1112 include/lib/html_input.class.php:1145
+#: include/class/follow_up_other_concerned.class.php:135
 #, fuzzy
 msgid "Ajout autres"
 msgstr "Factuur toevoegen"
@@ -1397,6 +1419,7 @@ msgstr "Toevoeging van een af te betalen goed "
 #: include/dossier.inc.php:242 include/dossier.inc.php:264
 #: include/dossier.inc.php:298 include/dossier.inc.php:299
 #: include/dossier.inc.php:302 include/dossier.inc.php:307
+#: include/dossier.inc.php:310
 #, fuzzy
 msgid "Ajout d'un dossier"
 msgstr "Naam van de map"
@@ -1419,6 +1442,7 @@ msgstr "Toevoeging van een boekhoudkundige oefening"
 #: include/template/periode_add_exercice.php:21
 #: include/template/periode_add_exercice.php:22
 #: include/template/periode_add_exercice.php:74
+#: include/template/periode_add_exercice.php:76
 msgid "Ajout d'un exercice comptable"
 msgstr "Toevoeging van een boekhoudkundige oefening"
 
@@ -1467,7 +1491,7 @@ msgid "Ajout d'un poste analytique"
 msgstr "Analytische groep"
 
 #: include/ajax_tag_list.php:30 include/ajax/ajax_tag_list.php:30
-#: include/ajax/ajax_tag_list.php:34
+#: include/ajax/ajax_tag_list.php:34 include/ajax/ajax_operation_tag.php:65
 msgid "Ajout d'un tag"
 msgstr "Toevoeging van een tag"
 
@@ -1614,16 +1638,20 @@ msgstr "Raming toevoegen"
 #: include/periode.inc.php:113 include/class/periode.class.php:687
 #: include/class/periode.class.php:689 include/class/periode.class.php:691
 #: include/class/periode.class.php:692 include/periode.inc.php:114
+#: include/class/periode.class.php:693
 #, fuzzy
 msgid "Ajout période"
 msgstr "Artikel toevoegen"
 
 #: include/user.inc.php:109 include/user.inc.php:110 include/user.inc.php:112
+#: include/user.inc.php:114
 #, fuzzy
 msgid "Ajout utilisateur"
 msgstr "Gebruiker toevoegen"
 
 #: include/class/follow_up.class.php:1535
+#: include/class/follow_up.class.php:1567
+#: include/class/tag_operation.class.php:69
 #, fuzzy
 msgid "Ajout étiquette"
 msgstr "Toevoeging van een label"
@@ -1646,7 +1674,7 @@ msgstr "Hierbij een actie toevoegen"
 #: include/dossier.inc.php:214 include/modele.inc.php:261
 #: include/dossier.inc.php:217 include/dossier.inc.php:222
 #: include/modele.inc.php:262 include/modele.inc.php:263
-#: include/ajax/ajax_add_concerned_card.php:138
+#: include/ajax/ajax_add_concerned_card.php:138 include/dossier.inc.php:225
 msgid "Ajouter"
 msgstr "Toevoegen"
 
@@ -1662,6 +1690,7 @@ msgstr "Boekjaren toevoegen"
 #: include/dossier.inc.php:159 include/dossier.inc.php:179
 #: include/dossier.inc.php:213 include/dossier.inc.php:214
 #: include/dossier.inc.php:217 include/dossier.inc.php:222
+#: include/dossier.inc.php:225
 #, fuzzy
 msgid "Ajouter un dossier"
 msgstr "Een bestand toevoegen"
@@ -1682,6 +1711,7 @@ msgstr "Geen enkel model"
 #: include/template/detail-action.php:480
 #: include/template/detail-action.php:478
 #: include/template/detail-action.php:491
+#: include/template/detail-action.php:504
 msgid "Ajouter un fichier"
 msgstr "Een bestand toevoegen"
 
@@ -1878,6 +1908,7 @@ msgstr "Annuleren"
 #: include/dossier.inc.php:303 include/dossier.inc.php:339
 #: include/dossier.inc.php:340 include/dossier.inc.php:356
 #: include/dossier.inc.php:361 include/template/periode_add_exercice.php:41
+#: include/dossier.inc.php:364
 msgid "Année"
 msgstr "Jaar"
 
@@ -1919,6 +1950,7 @@ msgstr "Tussen de  data %s en %s"
 #: include/ext/amortis/include/am_card.class.php:235
 #: include/template/periode_add_exercice.php:92
 #: include/ext/amortis/include/am_card.class.php:267
+#: include/template/periode_add_exercice.php:101
 msgid "Année invalide"
 msgstr "Ongeldig jaar"
 
@@ -1941,6 +1973,7 @@ msgstr "Belettering voor de boekhoudkundige positie"
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
 #: include/class/periode.class.php:652 include/class/periode.class.php:653
+#: include/class/periode.class.php:654
 msgid "Août"
 msgstr ""
 
@@ -1961,7 +1994,7 @@ msgstr "Ongeldig verzoek"
 msgid "Appel invalide Service_After_Sale "
 msgstr "Invalid call Service_After°Sake"
 
-#: include/upgrade.inc.php:34
+#: include/upgrade.inc.php:34 include/template/template_config_form.php:32
 #, fuzzy
 msgid "Application"
 msgstr "Uitleg"
@@ -2130,6 +2163,7 @@ msgstr ""
 #: include/template/template_config_form.php:80
 #: include/template/template_config_form.php:88
 #: include/template/template_config_form.php:100
+#: include/template/template_config_form.php:118
 msgid ""
 "Attention : si vous installez sous windows n'utilisez pas le \\ mais plutôt "
 "le / dans les nom de répertoire (càd les chemins ou path)"
@@ -2169,6 +2203,7 @@ msgstr ""
 #: include/class/acc_ledger_purchase.class.php:1549
 #: include/class/acc_ledger_purchase.class.php:1560
 #: include/class/acc_ledger_sold.class.php:807
+#: include/lib/message_javascript.php:60
 msgid "Attention Différence entre TVA calculée et donnée"
 msgstr "Let op: Verschil tussen BTW en berekende gegevens"
 
@@ -2192,6 +2227,7 @@ msgstr ""
 #: html/install.php:503 html/install.php:509 html/install.php:501
 #: html/install.php:507 html/install.php:469 html/install.php:444
 #: html/install.php:450 html/install.php:453 html/install.php:502
+#: html/install.php:508
 #, php-format
 msgid "Attention le paramètre effective_cache_size est de %s au lieu de 1000"
 msgstr ""
@@ -2246,7 +2282,7 @@ msgstr ""
 "Opgelet periode\n"
 "\t\t         periode niet gevonden p_from=%s p_to_periode = %s"
 
-#: include/lib/message_javascript.php:58
+#: include/lib/message_javascript.php:58 include/lib/message_javascript.php:59
 msgid ""
 "Attention, <b>SI</b> la fiche a changé de poste comptable, c'est seulement "
 "le dernier qui est affiché"
@@ -2267,7 +2303,7 @@ msgid ""
 "confirmer"
 msgstr ""
 
-#: include/lib/message_javascript.php:45
+#: include/lib/message_javascript.php:45 include/lib/message_javascript.php:46
 msgid "Attention, le poste comptable doit exister, il ne sera pas vérifié"
 msgstr ""
 
@@ -2324,7 +2360,8 @@ msgstr "Verplicht"
 msgid "Attribut à ajouter"
 msgstr "Attribuut van het bestand"
 
-#: include/template/action_search.php:150
+#: include/template/action_search.php:150 include/template/ledger_search.php:98
+#: include/template/action_search.php:152
 #, fuzzy
 msgid "Au moins une étiquette"
 msgstr "Toevoeging van een label"
@@ -2341,6 +2378,7 @@ msgstr "Toevoeging van een label"
 #: include/class/follow_up.class.php:1219
 #: include/class/follow_up.class.php:1220
 #: include/class/follow_up.class.php:1137
+#: include/class/follow_up.class.php:1169
 msgid "Aucun"
 msgstr "Geen"
 
@@ -2488,6 +2526,9 @@ msgstr "Geen enkele record gevonden"
 #: include/class/follow_up.class.php:775 include/class/follow_up.class.php:688
 #: include/class/acc_ledger_search.class.php:763
 #: include/class/acc_ledger_search.class.php:1032
+#: include/class/follow_up.class.php:711
+#: include/class/acc_ledger_search.class.php:786
+#: include/class/acc_ledger_search.class.php:1055
 msgid "Aucun enregistrement trouvé"
 msgstr "Geen enkele record gevonden"
 
@@ -2495,7 +2536,7 @@ msgstr "Geen enkele record gevonden"
 #: html/ajax_ledger.php:277 html/ajax_ledger.php:279
 #: include/ajax/ajax_ledger.php:256 include/ajax/ajax_ledger.php:259
 #: include/ajax/ajax_ledger.php:261 include/ajax/ajax_ledger.php:265
-#: include/ajax/ajax_ledger.php:266
+#: include/ajax/ajax_ledger.php:266 include/ajax/ajax_ledger.php:267
 msgid "Aucun fichier"
 msgstr "Geen bestand"
 
@@ -2535,6 +2576,7 @@ msgstr "Geen enkel model"
 
 #: include/dossier.inc.php:318 include/dossier.inc.php:319
 #: include/dossier.inc.php:322 include/dossier.inc.php:327
+#: include/dossier.inc.php:330
 msgid "Aucun modèle (dossier vide, devant être restauré manuellement)"
 msgstr ""
 
@@ -2559,7 +2601,7 @@ msgstr "Geen enkel analystisch plan is bepaald"
 
 #: include/class_anc_print.php:93 include/class_anc_print.php:94
 #: include/class/class_anc_print.php:94 include/class/class_anc_print.php:96
-#: include/class/anc_print.class.php:96
+#: include/class/anc_print.class.php:96 include/class/anc_print.class.php:97
 msgid "Aucun plan défini"
 msgstr "Geen bepaald plan"
 
@@ -2597,7 +2639,7 @@ msgstr "Geen resultaten"
 msgid "Aucun titre"
 msgstr "Geen enkele klant"
 
-#: include/class/document_state_mtable.php:48
+#: include/class/document_state_mtable.php:48 include/database.item.php:125
 #, fuzzy
 msgid "Aucune"
 msgstr "Geen"
@@ -2650,7 +2692,7 @@ msgstr "Geen enkel bestandscategorie voldoet aan uw vraag"
 #: include/ajax/ajax_card.php:410 include/ajax/ajax_card.php:264
 #: include/ajax/ajax_card.php:413 include/ajax/ajax_card.php:265
 #: include/ajax/ajax_card.php:414 include/ajax/ajax_card.php:271
-#: include/ajax/ajax_card.php:468
+#: include/ajax/ajax_card.php:468 include/ajax/ajax_card.php:467
 msgid ""
 "Aucune catégorie de fiche ne correspond à votre demande, le journal pourrait "
 "n'avoir accès à aucune fiche"
@@ -2704,6 +2746,8 @@ msgstr "Beschrijving"
 #: include/template/tax_summary_display.php:105
 #: include/template/tax_summary_display.php:277
 #: include/template/ledger_detail_bottom.php:302 include/lib/ac_common.php:1257
+#: include/template/ledger_detail_bottom.php:303
+#: include/lib/message_javascript.php:103
 msgid "Aucune donnée"
 msgstr "Geen enkel gegeven"
 
@@ -2734,7 +2778,7 @@ msgstr "Geen bestand gevraag"
 #: include/fiche.inc.php:133 include/fiche.inc.php:387
 #: include/fiche.inc.php:134 include/fiche.inc.php:388
 #: include/fiche.inc.php:395 include/fiche.inc.php:135
-#: include/fiche.inc.php:405
+#: include/fiche.inc.php:405 include/export/export_fiche_pdf.php:73
 msgid "Aucune fiche trouvée"
 msgstr "Geen bestand gevonden"
 
@@ -2872,6 +2916,7 @@ msgid "Autoliquidation"
 msgstr ""
 
 #: include/lib/message_javascript.php:74 include/lib/message_javascript.php:76
+#: include/lib/message_javascript.php:77
 msgid "Autoliquidation : Utilisé en même temps au crédit et au débit"
 msgstr ""
 
@@ -2917,6 +2962,7 @@ msgstr "Een andere oefening"
 #: include/template/ledger_detail_bottom.php:146
 #: include/template/ledger_detail_bottom.php:151
 #: include/template/ledger_detail_bottom.php:156
+#: include/template/ledger_detail_bottom.php:157
 msgid "Autre information"
 msgstr "Andere informatie"
 
@@ -2955,10 +3001,16 @@ msgstr "Andere acties"
 
 #: include/template/detail-action.php:64 include/template/detail-action.php:67
 #: include/template/detail-action.php:72 include/template/detail-action.php:71
+#: include/template/detail-action.php:73
 #, fuzzy
 msgid "Autres concernés"
 msgstr "Betreffende acties"
 
+#: include/template/action_document_type_mtable_input.php:86
+#, fuzzy
+msgid "Autres fiches"
+msgstr "Een dossier toevoegen"
+
 #: include/database.item.php:117 include/balance.inc.php:86
 #: include/database.item.php:120 include/database.item.php:126
 #: include/database.item.php:123 include/database.item.php:122
@@ -3027,6 +3079,7 @@ msgstr "Met het bestand"
 #: html/install.php:351 html/install.php:360 html/install.php:369
 #: html/install.php:354 html/install.php:363 html/install.php:372
 #: html/install.php:403 html/install.php:412 html/install.php:421
+#: html/install.php:409 html/install.php:418
 #, fuzzy
 msgid "Avertissement"
 msgstr "Aflossing"
@@ -3044,6 +3097,7 @@ msgstr "De naam mag niet leeg zijn"
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
 #: include/class/periode.class.php:651 include/class/periode.class.php:652
+#: include/class/periode.class.php:653
 msgid "Avril"
 msgstr ""
 
@@ -3061,6 +3115,7 @@ msgstr "Analytisch"
 #: include/modele.inc.php:314 include/dossier.inc.php:281
 #: include/dossier.inc.php:286 include/modele.inc.php:315
 #: include/modele.inc.php:320 include/modele.inc.php:321
+#: include/dossier.inc.php:289
 msgid "Backup"
 msgstr "Back-up"
 
@@ -3180,6 +3235,7 @@ msgid "Balance incorrecte "
 msgstr "Foute balans"
 
 #: include/lib/message_javascript.php:89 include/lib/message_javascript.php:91
+#: include/lib/message_javascript.php:92
 #, fuzzy
 msgid "Balance incorrecte D/C"
 msgstr "Foute balans"
@@ -3274,7 +3330,7 @@ msgstr ""
 #: include/dossier.inc.php:365 include/dossier.inc.php:321
 #: include/dossier.inc.php:354 include/dossier.inc.php:390
 #: include/dossier.inc.php:391 include/dossier.inc.php:407
-#: include/dossier.inc.php:412
+#: include/dossier.inc.php:412 include/dossier.inc.php:416
 msgid "Base de donnée "
 msgstr "Database"
 
@@ -3318,6 +3374,7 @@ msgstr "Ongeldige database"
 #: include/class/dossier.class.php:395 html/install.php:398
 #: html/install.php:401 html/install.php:450
 #: include/class/dossier.class.php:373 include/class/dossier.class.php:401
+#: html/install.php:456
 #, fuzzy
 msgid "Base de données"
 msgstr "Database"
@@ -3328,7 +3385,8 @@ msgstr "Database"
 #: include/class/class_follow_up.php:263 include/class/follow_up.class.php:263
 #: include/template/action_display_short.php:60
 #: include/class/follow_up.class.php:264 include/class/document.class.php:1413
-#: include/class/follow_up.class.php:271
+#: include/class/follow_up.class.php:271 include/class/follow_up.class.php:273
+#: include/class/follow_up.class.php:764
 msgid "Basse"
 msgstr ""
 
@@ -3418,6 +3476,7 @@ msgstr "Budget"
 # DC =?
 #: include/export/export_poste_detail_pdf.php:168
 #: include/export/export_poste_detail_pdf.php:179
+#: include/export/export_poste_detail_pdf.php:180
 #, fuzzy
 msgid "C"
 msgstr "D / C"
@@ -3440,6 +3499,7 @@ msgid "CONVERT_GIF_PDF n'est pas installé"
 msgstr "CONVERT_GIF_PDF is niet geïnstalleerd"
 
 #: include/lib/message_javascript.php:93 include/lib/message_javascript.php:95
+#: include/lib/message_javascript.php:96
 #, fuzzy
 msgid "Cacher"
 msgstr "Vinden"
@@ -3486,10 +3546,12 @@ msgstr ""
 #: include/class_ibutton.php:82 include/class_ibutton.php:84
 #: include/lib/class_ibutton.php:84 include/lib/ibutton.class.php:84
 #: include/lib/message_javascript.php:97 include/lib/message_javascript.php:99
+#: include/lib/message_javascript.php:100
 msgid "Calculatrice"
 msgstr "Rekenmachine"
 
 #: include/lib/message_javascript.php:99 include/lib/message_javascript.php:101
+#: include/lib/message_javascript.php:102
 msgid ""
 "Calculatrice simplifiée: écrivez simplement les opérations que vous voulez "
 "puis la touche retour. exemple : 1+2+3*(1/5)"
@@ -3514,7 +3576,7 @@ msgstr "Rekenmachine"
 #: include/ajax/ajax_calendar_zoom.php:26 include/lib/html_input.class.php:991
 #: include/ajax/ajax_calendar_zoom.php:32 include/lib/html_input.class.php:992
 #: include/lib/html_input.class.php:1007 include/lib/html_input.class.php:1008
-#: include/lib/html_input.class.php:1041
+#: include/lib/html_input.class.php:1041 include/lib/html_input.class.php:1042
 msgid "Calendrier"
 msgstr "Kalender"
 
@@ -3631,6 +3693,7 @@ msgstr "Bestaande categorie"
 #: include/ajax/ajax_card.php:510 include/ajax/ajax_card.php:511
 #: include/ajax/ajax_card.php:544 include/ajax/ajax_card.php:548
 #: include/ajax/ajax_card.php:563 include/ajax/ajax_card.php:639
+#: include/ajax/ajax_card.php:638
 msgid "Catégorie existe déjà"
 msgstr "De categorie bestaat al."
 
@@ -3646,6 +3709,7 @@ msgstr "Ongeldige code"
 #: include/ajax/ajax_card.php:512 include/ajax/ajax_card.php:513
 #: include/ajax/ajax_card.php:546 include/ajax/ajax_card.php:550
 #: include/ajax/ajax_card.php:567 include/ajax/ajax_card.php:643
+#: include/ajax/ajax_card.php:642
 msgid "Catégorie sauvée"
 msgstr "Opgeslagen categorie"
 
@@ -3729,7 +3793,7 @@ msgstr "Dit plan bestaat niet"
 #: html/ajax_misc.php:571 html/ajax_misc.php:613 html/ajax_misc.php:408
 #: html/ajax_misc.php:434 html/ajax_misc.php:546 html/ajax_misc.php:548
 #: html/ajax_misc.php:554 html/ajax_misc.php:556 html/ajax_misc.php:560
-#: html/ajax_misc.php:525
+#: html/ajax_misc.php:525 html/ajax_misc.php:533
 #, fuzzy
 msgid "Ce plugin n'existe pas "
 msgstr "Dit plan bestaat niet"
@@ -3806,7 +3870,7 @@ msgstr "Deze categorie heeft geen toegewezen e-mail"
 #: include/fiche.inc.php:290 include/fiche.inc.php:363
 #: include/fiche.inc.php:366 include/fiche.inc.php:367
 #: include/fiche.inc.php:368 include/fiche.inc.php:375
-#: include/fiche.inc.php:385
+#: include/fiche.inc.php:385 include/export/export_fiche_pdf.php:63
 #, fuzzy
 msgid "Cette catégorie n'ayant pas de poste comptable n'a pas de balance"
 msgstr "Dit bestand heeft geen geldige boekhoudkundige post"
@@ -3894,6 +3958,7 @@ msgstr "Handmatige wijziging"
 #: html/admin/template_config_form.php:39
 #: include/template/template_config_form.php:39
 #: include/template/template_config_form.php:40
+#: include/template/template_config_form.php:66
 #, fuzzy
 msgid "Changement de langue"
 msgstr "Handmatige wijziging"
@@ -3906,7 +3971,7 @@ msgstr "Veranderingen van de toestanden"
 #: html/ajax_ledger.php:522 html/ajax_ledger.php:529 html/ajax_ledger.php:531
 #: include/ajax/ajax_ledger.php:508 include/ajax/ajax_ledger.php:511
 #: include/ajax/ajax_ledger.php:515 include/ajax/ajax_ledger.php:516
-#: include/ajax/ajax_ledger.php:517
+#: include/ajax/ajax_ledger.php:517 include/ajax/ajax_ledger.php:518
 msgid ""
 "Changement impossible: on ne peut pas changer la date dans une période fermée"
 msgstr ""
@@ -3958,6 +4023,7 @@ msgstr "Kosten"
 #: include/ajax/ajax_ledger.php:239 include/ajax/ajax_ledger.php:352
 #: include/ajax/ajax_ledger.php:243 include/ajax/ajax_ledger.php:356
 #: include/ajax/ajax_ledger.php:244 include/ajax/ajax_ledger.php:357
+#: include/ajax/ajax_ledger.php:245 include/ajax/ajax_ledger.php:358
 msgid "Chargement"
 msgstr "Laden"
 
@@ -3990,6 +4056,7 @@ msgstr "Pad"
 #: html/admin/template_config_form.php:43
 #: include/template/template_config_form.php:43
 #: include/template/template_config_form.php:44
+#: include/template/template_config_form.php:70
 msgid "Chemin complet vers les executable de Postgresql"
 msgstr ""
 
@@ -4047,7 +4114,8 @@ msgstr ""
 #: include/class/acc_ledger.class.php:2220 include/class/fiche.class.php:2274
 #: include/ajax/ajax_card.php:298 include/compta_fin_rec.inc.php:263
 #: include/template/tag_select.php:18 include/template/tag_search_select.php:15
-#: include/lib/manage_table_sql.class.php:681
+#: include/lib/manage_table_sql.class.php:681 html/ajax_misc.php:441
+#: include/user.inc.php:140 include/dossier.inc.php:242
 #, fuzzy, php-format
 msgid "Cherche"
 msgstr "Vinden"
@@ -4071,11 +4139,12 @@ msgstr "Vinden"
 #: include/class/acc_ledger_search.class.php:588
 #: include/class/anc_operation.class.php:295
 #: include/class/acc_ledger_search.class.php:674
+#: include/class/acc_ledger_search.class.php:697
 #, fuzzy
 msgid "Chercher"
 msgstr "Vinden"
 
-#: include/lib/message_javascript.php:31
+#: include/lib/message_javascript.php:31 include/lib/message_javascript.php:32
 msgid ""
 "Cherchez en saisissant le quickcode, le poste comptable ou une partie du nom "
 "de la fiche ou de l'adresse"
@@ -4098,6 +4167,7 @@ msgstr ""
 
 #: html/ajax_misc.php:452 html/ajax_misc.php:454 html/ajax_misc.php:460
 #: html/ajax_misc.php:462 html/ajax_misc.php:466 html/ajax_misc.php:431
+#: html/ajax_misc.php:439
 #, fuzzy
 msgid "Choisissez la TVA"
 msgstr "Kies de BTW"
@@ -4538,14 +4608,16 @@ msgid "Cliquez pour éditer"
 msgstr "Creditsaldo"
 
 #: include/lib/message_javascript.php:66 include/lib/message_javascript.php:68
+#: include/lib/message_javascript.php:69
 msgid "Cliquez sur le chemin pour ouvrir le menu"
 msgstr ""
 
 #: include/lib/message_javascript.php:65 include/lib/message_javascript.php:67
+#: include/lib/message_javascript.php:68
 msgid "Cliquez sur le code AD pour ouvrir le menu dans un nouvel onglet"
 msgstr ""
 
-#: include/lib/message_javascript.php:48
+#: include/lib/message_javascript.php:48 include/lib/message_javascript.php:49
 msgid "Cliquez sur le titre d'une colonne pour trier"
 msgstr ""
 
@@ -4614,7 +4686,7 @@ msgstr "Vink dit vakje aan als u zeker bent dat u dit dossier wil verwijderen "
 msgid "Cochez pour cette case pour effacer ce tag"
 msgstr "Vink dit vakje aan als u de tag wil verwijderen"
 
-#: include/template/tag_detail.php:33
+#: include/template/tag_detail.php:33 include/template/tag_detail.php:56
 #, fuzzy
 msgid "Cochez pour cette case pour effacer cette étiquette (tag)"
 msgstr "Vink dit vakje aan als u de tag wil verwijderen"
@@ -4674,6 +4746,7 @@ msgstr "Vink aan om deze fiche te verwijderen "
 #: include/class/acc_ledger_sold.class.php:721
 #: include/class/print_ledger_detail_item.class.php:58
 #: include/upgrade-plugin.php:71
+#: include/template/follow_up_other_concerned_display_table.php:42
 msgid "Code"
 msgstr "Code"
 
@@ -4875,6 +4948,11 @@ msgstr "Interne code van de operatie veranderen"
 msgid "Code invalide"
 msgstr "Ongeldige code"
 
+#: include/user_detail.inc.php:94
+#, fuzzy
+msgid "Code invalide, effacement refusé"
+msgstr "Erasure"
+
 #: include/class_acc_ledger_purchase.php:1735
 #: include/class_acc_ledger_sold.php:1319
 #: include/class_acc_ledger_sold.php:1317
@@ -4965,7 +5043,7 @@ msgstr "Onbekende post"
 #: html/install.php:533 html/install.php:532 html/install.php:530
 #: html/install.php:536 html/install.php:528 html/install.php:534
 #: html/install.php:496 html/install.php:471 html/install.php:477
-#: html/install.php:480 html/install.php:529
+#: html/install.php:480 html/install.php:529 html/install.php:535
 msgid "Commencer la mise à jour ou l'installation"
 msgstr ""
 
@@ -5027,6 +5105,9 @@ msgstr ""
 #: include/template/detail-action.php:297
 #: include/template/detail-action.php:327
 #: include/template/detail-action.php:332
+#: include/template/detail-action.php:301
+#: include/template/detail-action.php:339
+#: include/template/detail-action.php:342
 msgid "Commentaire"
 msgstr "Commentaar"
 
@@ -5260,6 +5341,8 @@ msgstr "Gewone rekeningen"
 #: include/class/acc_ledger_search.class.php:963
 #: include/class/acc_ledger_search.class.php:794
 #: include/class/acc_ledger_search.class.php:1052
+#: include/class/acc_ledger_search.class.php:817
+#: include/class/acc_ledger_search.class.php:1075
 msgid "Concerne"
 msgstr "Wat betreft"
 
@@ -5357,6 +5440,7 @@ msgstr "Config. van de basis van de boekhoudkundige post"
 #: html/install.php:320 html/install.php:319 html/install.php:317
 #: html/install.php:323 html/install.php:329 html/install.php:280
 #: html/install.php:287 html/install.php:290 html/install.php:339
+#: html/install.php:345
 #, fuzzy
 msgid "Configuration"
 msgstr "Informatie"
@@ -5509,7 +5593,8 @@ msgstr "Informatie"
 #: include/compta_fin.inc.php:83 include/compta_fin.inc.php:84
 #: include/operation_ods_confirm.inc.php:78 include/ext/importbank/ajax.php:232
 #: include/ext/importbank/ajax.php:237 include/ext/importbank/ajax.php:238
-#: include/operation_ods_confirm.inc.php:89
+#: include/operation_ods_confirm.inc.php:89 include/user_detail.inc.php:197
+#: include/user_detail.inc.php:218
 msgid "Confirmer"
 msgstr "Bevestigen"
 
@@ -5560,6 +5645,7 @@ msgstr "U bent geen beheerder"
 #: html/install.php:683 html/install.php:676 html/install.php:655
 #: html/install.php:682 html/install.php:617 html/install.php:644
 #: html/install.php:607 html/install.php:614 html/install.php:667
+#: html/install.php:673
 msgid "Connectez-vous à NOALYSS"
 msgstr ""
 
@@ -5571,6 +5657,7 @@ msgstr ""
 #: include/database.item.php:57 include/category_card.inc.php:75
 #: include/database.item.php:60 include/database.item.php:52
 #: include/category_card.inc.php:77 include/database.item.php:53
+#: include/template/detail-action.php:50
 msgid "Contact"
 msgstr "Contact"
 
@@ -5592,6 +5679,7 @@ msgstr "Text"
 #: html/install.php:215 html/install.php:257 include/opening.inc.php:140
 #: include/opening.inc.php:174 html/install.php:222 html/install.php:225
 #: html/install.php:267 html/install.php:272 html/install.php:315
+#: html/install.php:278 html/install.php:321
 #, fuzzy
 msgid "Continuer"
 msgstr "Contact"
@@ -5690,6 +5778,10 @@ msgstr "Boekhoudkundig schrijven aanmaken"
 msgid "Corriger"
 msgstr "Verbeteren"
 
+#: include/template/tag_detail.php:29
+msgid "Couleur"
+msgstr ""
+
 #: include/database.item.php:172 include/database.item.php:175
 #: include/database.item.php:207 include/database.item.php:204
 #: include/database.item.php:177 include/database.item.php:178
@@ -5701,14 +5793,14 @@ msgstr "Post"
 #: include/dossier.inc.php:286 include/dossier.inc.php:283
 #: include/dossier.inc.php:305 include/dossier.inc.php:341
 #: include/dossier.inc.php:342 include/dossier.inc.php:358
-#: include/dossier.inc.php:363
+#: include/dossier.inc.php:363 include/dossier.inc.php:366
 msgid "Creation Dossier"
 msgstr "Dossier maken"
 
 #: html/admin/setup.php:497 html/install.php:561 html/install.php:560
 #: html/install.php:558 html/install.php:569 html/install.php:567
 #: html/install.php:529 html/install.php:513 html/install.php:519
-#: html/install.php:522 html/install.php:572
+#: html/install.php:522 html/install.php:572 html/install.php:578
 #, fuzzy
 msgid "Creation of Modele 1"
 msgstr "Dossier maken"
@@ -5716,7 +5808,7 @@ msgstr "Dossier maken"
 #: html/admin/setup.php:510 html/install.php:574 html/install.php:573
 #: html/install.php:571 html/install.php:582 html/install.php:580
 #: html/install.php:542 html/install.php:532 html/install.php:538
-#: html/install.php:541 html/install.php:591
+#: html/install.php:541 html/install.php:591 html/install.php:597
 #, fuzzy
 msgid "Creation of Modele 2"
 msgstr "Dossier maken"
@@ -5733,6 +5825,7 @@ msgstr "Dossier maken"
 #: include/ajax/ajax_display_letter.php:123 include/fiche.inc.php:580
 #: include/fiche.inc.php:589 include/fiche.inc.php:602
 #: include/ajax/ajax_display_letter.php:141
+#: include/export/export_poste_detail_pdf.php:105
 msgid "Credit"
 msgstr "Credit"
 
@@ -5926,6 +6019,9 @@ msgstr "Crébit"
 #: include/export/export_balance_csv.php:79
 #: include/template/ledger_detail_bottom.php:97
 #: include/operation_ods_new.inc.php:86
+#: include/class/anc_grandlivre.class.php:235
+#: include/export/export_poste_detail_pdf.php:251
+#: include/template/ledger_detail_bottom.php:98
 msgid "Crédit"
 msgstr "Creditzijde"
 
@@ -5940,6 +6036,7 @@ msgid "Créditeur"
 msgstr "Schuldeiser"
 
 #: include/user.inc.php:84 include/user.inc.php:85 include/user.inc.php:87
+#: include/user.inc.php:89
 #, fuzzy
 msgid "Créer Utilisateur"
 msgstr "Gebruiker"
@@ -6047,13 +6144,14 @@ msgstr "Een nieuwe fiche aanmaken"
 #: include/class/acc_ledger.class.php:2505
 #: include/class/pre_op_advanced.class.php:177 include/bank.inc.php:125
 #: include/supplier.inc.php:130 include/contact.inc.php:131
-#: include/customer.inc.php:128
+#: include/customer.inc.php:128 include/class/follow_up.class.php:306
 msgid "Créer une nouvelle fiche"
 msgstr "Een nieuwe fiche aanmaken"
 
 #: html/install.php:264 html/install.php:263 html/install.php:261
 #: html/install.php:266 html/install.php:272 html/install.php:223
 #: html/install.php:230 html/install.php:233 html/install.php:280
+#: html/install.php:286
 #, php-format
 msgid "Créez ce fichier %s avec les informations suivantes "
 msgstr ""
@@ -6064,6 +6162,7 @@ msgstr ""
 #: include/ext/invoicing/include/acc_ledger_sold_generate.class.php:118
 #: include/export/export_poste_detail_pdf.php:182
 #: include/ext/invoicing/include/acc_ledger_sold_generate.class.php:119
+#: include/export/export_poste_detail_pdf.php:183
 #, fuzzy
 msgid "D"
 msgstr "D / C"
@@ -6384,6 +6483,12 @@ msgstr ""
 #: include/export/export_histo_csv.php:41
 #: include/template/form_ledger_detail.php:25
 #: include/template/detail-action.php:102 include/lib/ac_common.php:1220
+#: include/class/acc_ledger_search.class.php:747
+#: include/class/acc_ledger_search.class.php:1069
+#: include/class/anc_grandlivre.class.php:226
+#: include/export/export_poste_detail_pdf.php:93
+#: include/template/detail-action.php:104
+#: include/template/action_search_result.php:45
 #, php-format
 msgid "Date"
 msgstr "Datum"
@@ -6412,7 +6517,7 @@ msgstr "Aankoopdatum"
 msgid "Date DMY"
 msgstr "Datum DMY"
 
-#: include/class/follow_up.class.php:620
+#: include/class/follow_up.class.php:620 include/class/follow_up.class.php:632
 #, fuzzy
 msgid "Date Doc."
 msgstr "Datum"
@@ -6442,7 +6547,7 @@ msgstr "Begindatum"
 msgid "Date Fin"
 msgstr "Einddatum"
 
-#: include/class/follow_up.class.php:622
+#: include/class/follow_up.class.php:622 include/class/follow_up.class.php:635
 #, fuzzy
 msgid "Date Limite"
 msgstr "Uiterste datum"
@@ -6623,6 +6728,8 @@ msgstr "Uiterste datum"
 #: include/class/acc_ledger.class.php:224
 #: include/class/acc_ledger.class.php:1052
 #: include/class/acc_ledger_purchase.class.php:91
+#: include/class/follow_up.class.php:1678
+#: include/class/follow_up.class.php:1680
 msgid "Date invalide"
 msgstr "Ongeldig datum"
 
@@ -6652,6 +6759,7 @@ msgstr "Handeling is niet gevonden"
 #: include/template/detail-action.php:115
 #: include/template/detail-action.php:114
 #: include/template/detail-action.php:121
+#: include/template/detail-action.php:123
 msgid "Date limite"
 msgstr "Uiterste datum"
 
@@ -6794,6 +6902,7 @@ msgstr "Vervaldatum"
 #: include/ajax/ajax_display_letter.php:122 include/fiche.inc.php:576
 #: include/fiche.inc.php:585 include/fiche.inc.php:598
 #: include/ajax/ajax_display_letter.php:140
+#: include/export/export_poste_detail_pdf.php:103
 msgid "Debit"
 msgstr "Debet"
 
@@ -6845,6 +6954,7 @@ msgstr ""
 #: include/ext/bilan_interne/acc_bilaninterne.class.php:274
 #: include/class/acc_bilan.class.php:70 include/class/anc_print.class.php:142
 #: include/balance.inc.php:77 include/impress_jrn.inc.php:132
+#: include/class/anc_print.class.php:143
 msgid "Depuis"
 msgstr "Vanaf"
 
@@ -7080,7 +7190,13 @@ msgstr "Kan dit bestand op te slaan"
 #: include/template/param_jrn.php:130
 #: include/template/newEmptyPHP_NOALYSS.php:36
 #: include/template/card_multiple_result.php:20 include/lib/ac_common.php:1223
-#: include/upgrade-plugin.php:65
+#: include/upgrade-plugin.php:65 include/class/acc_ledger_search.class.php:763
+#: include/class/acc_ledger_search.class.php:1072
+#: include/class/acc_ledger_search.class.php:1217
+#: include/template/detail-action.php:284
+#: include/template/detail-action.php:291
+#: include/template/detail-action.php:499 include/template/tag_detail.php:26
+#: include/dossier.inc.php:231 include/dossier.inc.php:345
 msgid "Description"
 msgstr "Beschrijving"
 
@@ -7126,7 +7242,7 @@ msgstr "Beschrijving"
 
 #: include/dossier.inc.php:76 include/dossier.inc.php:97
 #: include/dossier.inc.php:103 include/dossier.inc.php:106
-#: include/dossier.inc.php:111
+#: include/dossier.inc.php:111 include/dossier.inc.php:113
 msgid ""
 "Desole la creation de ce dossier a echoue,\n"
 " la cause la plus probable est deux fois le même nom de dossier"
@@ -7134,7 +7250,7 @@ msgstr ""
 "Sorry het maken van dit dossier is mislukt, waarschijnlijk komt de naam van "
 "het dossier tweemaal voor"
 
-#: include/class/follow_up.class.php:626
+#: include/class/follow_up.class.php:626 include/class/follow_up.class.php:643
 msgid "Dest/Exp"
 msgstr ""
 
@@ -7148,6 +7264,8 @@ msgstr ""
 #: include/template/action_search.php:51
 #: include/template/action_display_short.php:97
 #: include/template/action_search.php:47 include/template/action_show.php:39
+#: include/template/detail-action.php:41
+#: include/template/action_search_result.php:54
 msgid "Destinataire"
 msgstr "Ontvanger"
 
@@ -7316,6 +7434,8 @@ msgstr "Divers"
 #: include/compta_ach.inc.php:174 include/class/document.class.php:177
 #: include/class/acc_ledger_search.class.php:795 include/compta_ach.inc.php:173
 #: include/template/ledger_detail_bottom.php:44 include/database.item.php:88
+#: include/class/acc_ledger_search.class.php:818
+#: include/ajax/ajax_ledger.php:324 include/ajax/ajax_ledger.php:353
 msgid "Document"
 msgstr "Document"
 
@@ -7347,7 +7467,7 @@ msgstr "Document in PDF"
 msgid "Document généré"
 msgstr "Gegenereerd papier"
 
-#: include/lib/message_javascript.php:43
+#: include/lib/message_javascript.php:43 include/lib/message_javascript.php:44
 msgid "Document généré uniquement si le mode de paiement est utilisé"
 msgstr ""
 
@@ -7411,44 +7531,44 @@ msgstr ""
 msgid "Donnez un nom pour sauver cette opération comme modèle"
 msgstr ""
 
-#: include/lib/message_javascript.php:52
+#: include/lib/message_javascript.php:52 include/lib/message_javascript.php:53
 msgid "Donnez un nombre entre 0 & 100"
 msgstr ""
 
-#: include/lib/message_javascript.php:56
+#: include/lib/message_javascript.php:56 include/lib/message_javascript.php:57
 msgid ""
 "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é"
 msgstr ""
 
-#: include/lib/message_javascript.php:54
+#: include/lib/message_javascript.php:54 include/lib/message_javascript.php:55
 msgid "Donnez une partie du nom du dossier ou de la description pour filtrer"
 msgstr ""
 
-#: include/lib/message_javascript.php:53
+#: include/lib/message_javascript.php:53 include/lib/message_javascript.php:54
 msgid ""
 "Donnez une partie du nom du dossier,du nom, du prénom ou du login pour "
 "filtrer"
 msgstr ""
 
-#: include/lib/message_javascript.php:50
+#: include/lib/message_javascript.php:50 include/lib/message_javascript.php:51
 msgid ""
 "Donnez une partie du nom, de la description,  du n° de TVA du poste "
 "comptable ou du quick code"
 msgstr ""
 
-#: include/lib/message_javascript.php:49
+#: include/lib/message_javascript.php:49 include/lib/message_javascript.php:50
 msgid ""
 "Donnez une partie du nom, prénom, de la description, du poste comptable, du n"
 "° de TVA,quick code ... "
 msgstr ""
 
-#: include/lib/message_javascript.php:55
+#: include/lib/message_javascript.php:55 include/lib/message_javascript.php:56
 #, fuzzy
 msgid "Donnez une partie du poste comptable ou du libellé pour filtrer"
 msgstr "Een deel van de financieel administratieve post of etiket"
 
-#: include/lib/message_javascript.php:57
+#: include/lib/message_javascript.php:57 include/lib/message_javascript.php:58
 msgid "Donnez une partie du quickcode, nom, description... pour filtrer"
 msgstr ""
 
@@ -7479,6 +7599,7 @@ msgid "Donnée invalide"
 msgstr "Ongeldig jaar"
 
 #: include/lib/message_javascript.php:91 include/lib/message_javascript.php:93
+#: include/lib/message_javascript.php:94
 msgid "Donnée manquante ou déjà supprimée"
 msgstr ""
 
@@ -7517,7 +7638,7 @@ msgstr "Gegevens zijn niet beschikbaar"
 #: include/user.inc.php:124 include/restore.inc.php:219
 #: include/user.inc.php:125 include/restore.inc.php:220
 #: include/restore.inc.php:221 include/restore.inc.php:222
-#: include/user.inc.php:127
+#: include/user.inc.php:127 include/user.inc.php:129
 #, fuzzy
 msgid "Dossier"
 msgstr "Archief"
@@ -7525,6 +7646,7 @@ msgstr "Archief"
 #: include/dossier.inc.php:150 include/dossier.inc.php:170
 #: include/dossier.inc.php:204 include/dossier.inc.php:205
 #: include/dossier.inc.php:208 include/dossier.inc.php:213
+#: include/dossier.inc.php:216
 #, fuzzy
 msgid "Dossier Management"
 msgstr "Map niet bestaat"
@@ -7537,6 +7659,7 @@ msgstr "Map niet bestaat"
 #: include/upgrade.inc.php:79 include/dossier.inc.php:271
 #: include/dossier.inc.php:276 include/upgrade.inc.php:80
 #: include/class/dossier.class.php:379 include/class/dossier.class.php:385
+#: include/dossier.inc.php:279
 msgid "Dossier inexistant"
 msgstr "Map niet bestaat"
 
@@ -7634,6 +7757,7 @@ msgstr "tot"
 #: include/ext/import_account/include/impacc_tva.class.php:64
 #: include/ext/import_account/include/impacc_tva.class.php:76
 #: include/template/ledger_detail_bottom.php:354
+#: include/template/ledger_detail_bottom.php:371
 #, fuzzy
 msgid "Duplicate"
 msgstr "Uitleg"
@@ -7643,7 +7767,7 @@ msgstr "Uitleg"
 msgid "Dupliquer"
 msgstr "Analytisch"
 
-#: include/ajax/ajax_ledger.php:589
+#: include/ajax/ajax_ledger.php:589 include/ajax/ajax_ledger.php:590
 #, fuzzy
 msgid "Dupliquer une opération"
 msgstr "Alle activiteiten"
@@ -7756,6 +7880,9 @@ msgstr "Afschrijvingstermijn"
 #: include/export/export_balance_csv.php:79
 #: include/template/ledger_detail_bottom.php:96
 #: include/operation_ods_new.inc.php:85
+#: include/class/anc_grandlivre.class.php:234
+#: include/export/export_poste_detail_pdf.php:248
+#: include/template/ledger_detail_bottom.php:97
 msgid "Débit"
 msgstr "debiet"
 
@@ -7784,6 +7911,7 @@ msgstr "schuldenaar"
 
 #: include/class/periode.class.php:649 include/class/periode.class.php:651
 #: include/class/periode.class.php:653 include/class/periode.class.php:654
+#: include/class/periode.class.php:655
 msgid "Décembre"
 msgstr ""
 
@@ -7913,6 +8041,7 @@ msgstr "Afhankelijk van"
 
 #: include/template/detail-action.php:168
 #: include/template/detail-action.php:175
+#: include/template/detail-action.php:177
 #, fuzzy
 msgid "Dépendant"
 msgstr "Afhankelijk van"
@@ -7988,7 +8117,7 @@ msgstr "Deposito"
 
 #: html/admin/setup.php:75 html/admin/setup.php:78 html/admin/setup.php:129
 #: html/install.php:131 html/install.php:130 html/install.php:136
-#: html/install.php:143 html/install.php:156
+#: html/install.php:143 html/install.php:156 html/install.php:160
 msgid "Désactiver le changement de langue (requis pour MacOSX)"
 msgstr ""
 
@@ -8018,7 +8147,7 @@ msgstr "Sorry Geen Result van stuurprogramma"
 #: html/ajax_ledger.php:223 html/ajax_ledger.php:225
 #: include/ajax/ajax_ledger.php:202 include/ajax/ajax_ledger.php:205
 #: include/ajax/ajax_ledger.php:207 include/ajax/ajax_ledger.php:211
-#: include/ajax/ajax_ledger.php:212
+#: include/ajax/ajax_ledger.php:212 include/ajax/ajax_ledger.php:213
 msgid "Désolé il y a une erreur"
 msgstr "Sorry er is een fout opgetreden"
 
@@ -8050,7 +8179,13 @@ msgstr ""
 msgid "Désolé, il y a trop de virgule dans le poste comptable "
 msgstr ""
 
+#: include/dossier.inc.php:386
+#, fuzzy
+msgid "Désolé, le code est invalide"
+msgstr "een vat code ongeldig"
+
 #: include/lib/message_javascript.php:85 include/lib/message_javascript.php:87
+#: include/lib/message_javascript.php:88
 #, fuzzy
 msgid "Désolé, les montants pour la comptabilité analytique sont incorrects"
 msgstr "Cost Accounting Module"
@@ -8066,6 +8201,7 @@ msgid "Désolé, vous n'avez pas coché la case"
 msgstr "Sorry hebt u Het niet VAK aangekruisd"
 
 #: include/lib/message_javascript.php:92 include/lib/message_javascript.php:94
+#: include/lib/message_javascript.php:95
 msgid "Désolé, événement en cours de création à sauver"
 msgstr ""
 
@@ -8238,6 +8374,7 @@ msgstr "Detail van de fiche"
 #: include/ajax/ajax_card.php:544 include/ajax/ajax_card.php:545
 #: include/ajax/ajax_card.php:578 include/ajax/ajax_card.php:582
 #: include/ajax/ajax_card.php:605 include/ajax/ajax_card.php:684
+#: include/ajax/ajax_card.php:683
 msgid "Détail fiche (sauvée)"
 msgstr "Detail van de fiche (opgeslagen)"
 
@@ -8274,6 +8411,7 @@ msgid "Détail opération "
 msgstr "Retail operatie"
 
 #: include/export/export_poste_detail_pdf.php:64
+#: include/export/export_poste_detail_pdf.php:65
 #, fuzzy
 msgid "Détail poste comptable"
 msgstr "de begrotingspost"
@@ -8333,6 +8471,7 @@ msgstr ""
 #: include/class/acc_ledger_sold.class.php:693
 #: include/export/export_histo_csv.php:42
 #: include/template/form_ledger_detail.php:33
+#: include/class/acc_ledger_search.class.php:751
 msgid "Echeance"
 msgstr "Termijn"
 
@@ -8371,6 +8510,7 @@ msgid "Echec"
 msgstr "Termijn"
 
 #: include/lib/message_javascript.php:79 include/lib/message_javascript.php:81
+#: include/lib/message_javascript.php:82
 #, fuzzy
 msgid "Echec "
 msgstr "Termijn"
@@ -8390,6 +8530,7 @@ msgstr ""
 
 #: include/dossier.inc.php:195 include/dossier.inc.php:196
 #: include/dossier.inc.php:199 include/dossier.inc.php:204
+#: include/dossier.inc.php:206
 #, fuzzy
 msgid "Echec création "
 msgstr "Aanmaken"
@@ -8416,6 +8557,7 @@ msgid "Echec de la restauration "
 msgstr ""
 
 #: include/lib/message_javascript.php:80 include/lib/message_javascript.php:82
+#: include/lib/message_javascript.php:83
 msgid "Echec donnée manquante ou incorrecte"
 msgstr ""
 
@@ -8455,6 +8597,7 @@ msgid "Echec ouverture fichier "
 msgstr "fout bij het openen van het bestand"
 
 #: include/lib/message_javascript.php:84 include/lib/message_javascript.php:86
+#: include/lib/message_javascript.php:87
 #, fuzzy
 msgid "Echec réponse"
 msgstr "Aanmaken"
@@ -8546,6 +8689,7 @@ msgstr "Opening Schrift"
 #: html/admin/setup.php:199 html/admin/setup.php:217 html/admin/setup.php:219
 #: html/install.php:225 html/install.php:223 html/install.php:231
 #: html/install.php:182 html/install.php:189 html/install.php:205
+#: html/install.php:209
 #, fuzzy
 msgid "Ecriture non possible"
 msgstr "Boekhoudend schrijven"
@@ -8626,6 +8770,7 @@ msgstr "Deze verklaring verwijderen"
 
 #: include/class/periode.class.php:673 include/class/periode.class.php:675
 #: include/class/periode.class.php:677 include/class/periode.class.php:678
+#: include/class/periode.class.php:679
 #, fuzzy
 msgid "Effacement impossible"
 msgstr "Export is onmogelijk"
@@ -8650,7 +8795,7 @@ msgstr "Erasure"
 #: html/ajax_ledger.php:186 html/ajax_ledger.php:187
 #: include/ajax/ajax_ledger.php:164 include/ajax/ajax_ledger.php:167
 #: include/ajax/ajax_ledger.php:168 include/ajax/ajax_ledger.php:172
-#: include/ajax/ajax_ledger.php:173
+#: include/ajax/ajax_ledger.php:173 include/ajax/ajax_ledger.php:174
 #, fuzzy
 msgid "Effacement refusé"
 msgstr "Erasure"
@@ -8735,7 +8880,10 @@ msgstr "Erasure"
 #: include/class/periode.class.php:598 include/class/periode.class.php:603
 #: include/class/document_type.class.php:84 include/class/periode.class.php:604
 #: include/template/ledger_detail_bottom.php:344
-#: include/lib/manage_table_sql.class.php:820
+#: include/lib/manage_table_sql.class.php:820 include/user_detail.inc.php:203
+#: include/class/periode.class.php:600 include/class/periode.class.php:605
+#: include/template/ledger_detail_bottom.php:361 include/dossier.inc.php:284
+#: include/dossier.inc.php:293
 msgid "Effacer"
 msgstr "Wissen"
 
@@ -8801,6 +8949,7 @@ msgstr "Duidelijke documentatie van de monitoring"
 #: include/class/acc_ledger_search.class.php:1080
 #: include/class/acc_ledger_search.class.php:1093
 #: include/class/acc_ledger_search.class.php:1182
+#: include/class/acc_ledger_search.class.php:1205
 #, fuzzy
 msgid "Effacer sel"
 msgstr "Wissen"
@@ -8849,6 +8998,7 @@ msgstr "Elementen"
 #: include/user.inc.php:84 include/database.item.php:191
 #: include/ajax/ajax_preference.php:74 include/ajax/ajax_preference.php:85
 #: include/database.item.php:196 include/database.item.php:189
+#: include/user.inc.php:86
 msgid "Email"
 msgstr "E-mail"
 
@@ -8903,6 +9053,7 @@ msgid "En une opération"
 msgstr "Alle activiteiten"
 
 #: include/lib/message_javascript.php:67 include/lib/message_javascript.php:69
+#: include/lib/message_javascript.php:70
 msgid ""
 "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"
@@ -8916,7 +9067,7 @@ msgstr ""
 
 #: html/admin/setup.php:80 html/admin/setup.php:83 html/admin/setup.php:134
 #: html/install.php:136 html/install.php:135 html/install.php:141
-#: html/install.php:148 html/install.php:161
+#: html/install.php:148 html/install.php:161 html/install.php:165
 msgid ""
 "En version mono dossier, le nom de la base de données doit être mentionné"
 msgstr ""
@@ -8993,6 +9144,7 @@ msgstr "Factuur versturen"
 #: include/ajax_admin.php:57 include/user_detail.inc.php:226
 #: include/ajax/ajax_admin.php:57 include/user_detail.inc.php:235
 #: include/ajax/ajax_admin.php:54 include/ajax/ajax_admin.php:62
+#: include/user_detail.inc.php:273
 #, fuzzy
 msgid "Enleve"
 msgstr "verwijderen"
@@ -9090,7 +9242,7 @@ msgstr "wordt niet in this journaal"
 #: include/class_anc_print.php:130 include/class_anc_print.php:177
 #: include/class_anc_print.php:179 include/class/class_anc_print.php:179
 #: include/class/class_anc_print.php:181 include/class/anc_print.class.php:175
-#: include/class/anc_print.class.php:181
+#: include/class/anc_print.class.php:181 include/class/anc_print.class.php:182
 msgid "Entre l'activité "
 msgstr "Tussen de activiteit"
 
@@ -9114,6 +9266,7 @@ msgstr "Voer de datum van de verklaring"
 #: html/install.php:290 html/install.php:289 html/install.php:287
 #: html/install.php:293 html/install.php:299 html/install.php:250
 #: html/install.php:257 html/install.php:260 html/install.php:308
+#: html/install.php:314
 msgid "Entrez les informations nécessaires à noalyss"
 msgstr ""
 
@@ -9344,7 +9497,7 @@ msgid "Erreur sécurité"
 msgstr "Veiligheid"
 
 #: html/install.php:636 html/install.php:643 html/install.php:646
-#: html/install.php:699
+#: html/install.php:699 html/install.php:705
 msgid "Essai effacement install.php et se connecter à NOALYSS"
 msgstr ""
 
@@ -9453,6 +9606,7 @@ msgstr ""
 #: include/template/detail-action.php:123 include/template/action_search.php:60
 #: include/template/action_search.php:56 include/class/follow_up.class.php:628
 #: include/template/detail-action.php:130 include/template/ledger_search.php:83
+#: include/class/follow_up.class.php:647 include/template/detail-action.php:132
 msgid "Etat"
 msgstr "Toestand"
 
@@ -9496,13 +9650,23 @@ msgstr "Bent u DAT u verwelkingsziekte Zeker Wissen"
 #: include/template/action_search.php:129 include/class/tag.class.php:85
 #: include/class/follow_up.class.php:623 include/class/tag.class.php:90
 #: include/template/action_search.php:130 include/cfgtags.inc.php:38
+#: include/class/follow_up.class.php:639 include/class/tag_action.class.php:54
+#: include/class/tag_operation.class.php:192
+#: include/ajax/ajax_tag_detail.php:19
+#: include/template/ledger_detail_bottom.php:47
 msgid "Etiquette"
 msgstr "Etiquette"
 
 #: include/template/tag_detail.php:15 include/template/tag_detail.php:21
+#: include/template/tag_detail.php:23
 msgid "Etiquette (tag)"
 msgstr "Label (tag)"
 
+#: include/template/tag_detail.php:50
+#, fuzzy
+msgid "Etiquette actif"
+msgstr "Label (tag)"
+
 #: include/template/tag_detail.php:27
 #, fuzzy
 msgid "Etiquette(tag) actif"
@@ -9527,6 +9691,10 @@ msgstr ""
 msgid "Exclure Etat"
 msgstr "Uitsluiten State"
 
+#: include/template/tag_detail.php:38
+msgid "Exemple"
+msgstr ""
+
 #: include/ext/tools/index.php:43 include/bank.inc.php:73
 #: include/template/stock_state_search.php:35 include/impress_bilan.inc.php:49
 #: include/impress_jrn.inc.php:84 include/impress_rapport.inc.php:182
@@ -9555,6 +9723,7 @@ msgid "Exercice doit être entre %s et %s "
 msgstr ""
 
 #: include/template/periode_add_exercice.php:82
+#: include/template/periode_add_exercice.php:91
 #, fuzzy
 msgid "Exercice invalide"
 msgstr "Ongeldig datum"
@@ -9585,7 +9754,7 @@ msgstr "Historische omzet"
 #: html/ajax_misc.php:236 html/ajax_misc.php:314 html/ajax_misc.php:319
 #: html/ajax_misc.php:347 html/ajax_misc.php:459 html/ajax_misc.php:461
 #: html/ajax_misc.php:467 html/ajax_misc.php:469 html/ajax_misc.php:473
-#: html/ajax_misc.php:438
+#: html/ajax_misc.php:438 html/ajax_misc.php:446
 msgid "Explication"
 msgstr "Uitleg"
 
@@ -9666,6 +9835,8 @@ msgstr "Balans export"
 #: include/class/fiche.class.php:1646 include/class/fiche.class.php:2242
 #: include/class/acc_account_ledger.class.php:727
 #: include/template/detail-action.php:88
+#: include/ajax/ajax_action_concerned_list.php:49
+#: include/template/detail-action.php:90
 msgid "Export CSV"
 msgstr "Export CSV"
 
@@ -9775,6 +9946,7 @@ msgstr "Export Kranten"
 #: include/class/fiche.class.php:2264
 #: include/class/acc_account_ledger.class.php:749
 #: include/template/ledger_detail_bottom.php:359
+#: include/template/ledger_detail_bottom.php:376
 msgid "Export PDF"
 msgstr "PDF exporteren"
 
@@ -9826,6 +9998,8 @@ msgstr "Exporteer tabel Analytische"
 #: include/class/anc_grandlivre.class.php:170
 #: include/class/anc_grandlivre.class.php:174
 #: include/class/anc_grandlivre.class.php:182
+#: include/class/anc_grandlivre.class.php:175
+#: include/class/anc_grandlivre.class.php:183
 msgid "Export des pièces en PDF"
 msgstr "De documenten in PDF exporteren"
 
@@ -9891,6 +10065,7 @@ msgstr "Export rapport"
 #: html/recherche.php:126 html/recherche.php:129
 #: include/history_operation.inc.php:167 include/history_operation.inc.php:178
 #: html/recherche.php:141 include/history_operation.inc.php:192
+#: html/recherche.php:151 include/history_operation.inc.php:203
 #, fuzzy
 msgid "Export vers CSV"
 msgstr "Export CSV"
@@ -9967,6 +10142,8 @@ msgstr "Uitbreidingen (plugins)"
 #: include/ajax/ajax_ledger.php:564 include/class/acc_operation.class.php:729
 #: include/ajax/ajax_ledger.php:565 include/compta_ach.inc.php:89
 #: include/template/ledger_detail_bottom.php:349
+#: include/ajax/ajax_ledger.php:566
+#: include/template/ledger_detail_bottom.php:366
 #, fuzzy
 msgid "Extourne"
 msgstr "Extourner"
@@ -10000,6 +10177,7 @@ msgstr "Alle activiteiten"
 #: include/template/ledger_detail_bottom.php:333
 #: include/template/ledger_detail_bottom.php:346
 #: include/template/ledger_detail_bottom.php:374
+#: include/template/ledger_detail_bottom.php:391
 msgid "Extourner"
 msgstr "Extourner"
 
@@ -10011,6 +10189,7 @@ msgstr "Extourner"
 #: include/template/ledger_detail_bottom.php:351
 #: include/template/ledger_detail_bottom.php:348
 #: include/template/ledger_detail_bottom.php:376
+#: include/template/ledger_detail_bottom.php:393
 msgid ""
 "Extourner une opération vous permet de l'annuler par son écriture inverse"
 msgstr ""
@@ -10198,7 +10377,10 @@ msgstr "Krachtdadig optreden"
 #: include/class/extension.class.php:276 include/ajax/ajax_card.php:319
 #: include/template/ledger_detail_bottom.php:317
 #: include/template/ledger_detail_bottom.php:318
-#: include/template/action_search.php:169
+#: include/template/action_search.php:169 html/recherche.php:154
+#: include/template/ledger_detail_bottom.php:334
+#: include/template/ledger_detail_bottom.php:335
+#: include/template/action_search.php:171 include/user.inc.php:90
 #, php-format
 msgid "Fermer"
 msgstr "Dicht"
@@ -10218,6 +10400,7 @@ msgstr "Dicht"
 #: include/ext/sav/include/sav_repair_card_sql.class.php:67
 #: include/ext/sav/include/sav_repair_card_sql.class.php:72
 #: include/class/periode_ledger_table.class.php:145
+#: include/class/periode_ledger_table.class.php:146
 #, fuzzy
 msgid "Fermé"
 msgstr "Dicht"
@@ -10225,7 +10408,8 @@ msgstr "Dicht"
 #: include/class/periode.class.php:585
 #: include/class/periode_ledger_table.class.php:142
 #: include/class/periode.class.php:587 include/class/periode.class.php:589
-#: include/class/periode.class.php:590
+#: include/class/periode.class.php:590 include/class/periode.class.php:591
+#: include/class/periode_ledger_table.class.php:143
 #, fuzzy
 msgid "Fermée"
 msgstr "Dicht"
@@ -10335,7 +10519,7 @@ msgid "Fiche non disponible pour journal"
 msgstr "Geen enkele printer is beschikbaar om toegevoegd te worden"
 
 #: include/ajax/ajax_card.php:619 include/ajax/ajax_card.php:642
-#: include/ajax/ajax_card.php:756
+#: include/ajax/ajax_card.php:756 include/ajax/ajax_card.php:755
 #, fuzzy
 msgid "Fiche non effacée"
 msgstr "Undeleted opnemen"
@@ -10369,6 +10553,8 @@ msgstr "Record niet gevonden"
 #: include/ajax/ajax_card.php:607 include/ajax/ajax_card.php:600
 #: include/ajax/ajax_card.php:630 include/ajax/ajax_card.php:679
 #: include/ajax/ajax_card.php:708 include/ajax/ajax_card.php:744
+#: include/ajax/ajax_card.php:678 include/ajax/ajax_card.php:707
+#: include/ajax/ajax_card.php:743
 msgid "Fiche non valide"
 msgstr "Ongeldige opnemen"
 
@@ -10449,6 +10635,7 @@ msgstr "Verwijderde bestand"
 #: html/install.php:269 html/install.php:220
 #: include/ext/import_account/include/impacc_file.class.php:69
 #: html/install.php:227 html/install.php:230 html/install.php:277
+#: html/install.php:283
 #, fuzzy
 msgid "Fichier non sauvé"
 msgstr "Record niet gevonden"
@@ -10539,6 +10726,8 @@ msgstr "Gefilterd per categorie"
 #: include/class/acc_ledger_search.class.php:562 include/modele.inc.php:279
 #: html/recherche.php:88 include/class/acc_ledger_search.class.php:648
 #: include/lettering.card.inc.php:98
+#: include/class/acc_ledger_search.class.php:671
+#: include/ajax/ajax_search_filter.php:137
 msgid "Filtre"
 msgstr "Filter"
 
@@ -10549,6 +10738,7 @@ msgstr "Filter"
 #: include/class/acc_ledger_search.class.php:1077
 #: include/class/acc_ledger_search.class.php:1090
 #: include/class/acc_ledger_search.class.php:1179
+#: include/class/acc_ledger_search.class.php:1202
 msgid "Filtre "
 msgstr "Filter"
 
@@ -10662,6 +10852,7 @@ msgstr ""
 #: include/database.item.php:233 include/database.item.php:252
 #: include/class/acc_ledger_search.class.php:1184 include/database.item.php:217
 #: include/database.item.php:229 include/lib/user_menu.php:135
+#: include/class/acc_ledger_search.class.php:1207
 msgid "Financier"
 msgstr "Financieel"
 
@@ -10826,6 +11017,7 @@ msgstr "Frans"
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
 #: include/class/periode.class.php:651 include/class/periode.class.php:652
+#: include/class/periode.class.php:653
 msgid "Février"
 msgstr ""
 
@@ -11102,6 +11294,7 @@ msgstr "Grid 86: overnames in België en intra ABC sales"
 #: include/database.item.php:52 include/class/follow_up.class.php:625
 #: include/template/tag_search_select.php:64
 #: include/template/tag_search_select.php:70 include/database.item.php:8
+#: include/class/follow_up.class.php:641
 msgid "Groupe"
 msgstr "Groep"
 
@@ -11109,6 +11302,7 @@ msgstr "Groep"
 #: include/template/detail-action.php:144
 #: include/template/detail-action.php:143 include/ajax/ajax_get_profile.php:58
 #: include/template/detail-action.php:150
+#: include/template/detail-action.php:152
 #, fuzzy
 msgid "Groupe Gestion"
 msgstr "Management Module"
@@ -11170,6 +11364,7 @@ msgstr "Vorming van het boekhoudkundig schrijven"
 #: include/class_follow_up.php:421 include/class/class_follow_up.php:421
 #: include/class/class_follow_up.php:411 include/class/follow_up.class.php:411
 #: include/class/follow_up.class.php:412 include/class/follow_up.class.php:419
+#: include/class/follow_up.class.php:421
 msgid "Génére le document"
 msgstr "Document Maken"
 
@@ -11278,6 +11473,7 @@ msgstr "Operatie exclusief BTW"
 #: include/template/action_display_short.php:58
 #: include/class/follow_up.class.php:262 include/class/document.class.php:1413
 #: include/class/follow_up.class.php:269 include/class/follow_up.class.php:725
+#: include/class/follow_up.class.php:271 include/class/follow_up.class.php:758
 msgid "Haute"
 msgstr ""
 
@@ -11288,6 +11484,7 @@ msgstr ""
 #: include/template/action_display_short.php:88
 #: include/template/action_display_short.php:89
 #: include/template/detail-action.php:111
+#: include/template/detail-action.php:113
 msgid "Heure"
 msgstr "Tijd"
 
@@ -11528,6 +11725,7 @@ msgid "Id"
 msgstr ""
 
 #: include/lib/message_javascript.php:109
+#: include/lib/message_javascript.php:110
 msgid "Il est conseillé d'avoir un quickcode de moins de 9 car."
 msgstr ""
 
@@ -11563,6 +11761,7 @@ msgstr "Er are Geen goederen"
 #: html/install.php:523 html/install.php:529 html/install.php:521
 #: html/install.php:527 html/install.php:489 html/install.php:464
 #: html/install.php:470 html/install.php:473 html/install.php:522
+#: html/install.php:528
 #, php-format
 msgid "Il y a %s param&egrave;tre qui sont trop bas"
 msgstr ""
@@ -11570,7 +11769,7 @@ msgstr ""
 #: html/ajax_misc.php:572 html/ajax_misc.php:614 html/ajax_misc.php:409
 #: html/ajax_misc.php:435 html/ajax_misc.php:547 html/ajax_misc.php:549
 #: html/ajax_misc.php:555 html/ajax_misc.php:557 html/ajax_misc.php:561
-#: html/ajax_misc.php:526
+#: html/ajax_misc.php:526 html/ajax_misc.php:534
 msgid "Il y a une erreur, ce plugin n'existe pas"
 msgstr ""
 
@@ -11638,6 +11837,7 @@ msgstr "Balans export"
 #: html/install.php:632 html/install.php:552 html/install.php:635
 #: html/install.php:259 html/install.php:602 html/install.php:659
 #: html/install.php:688 include/class/follow_up.class.php:731
+#: html/install.php:264 html/install.php:608 html/install.php:694
 #, fuzzy
 msgid "Important"
 msgstr "Invoegen"
@@ -11814,6 +12014,7 @@ msgstr "Kan dit bestand op te slaan"
 #: html/install.php:278 html/install.php:277 html/install.php:275
 #: html/install.php:281 html/install.php:287 html/install.php:238
 #: html/install.php:245 html/install.php:248 html/install.php:295
+#: html/install.php:301
 msgid ""
 "Impossible de se connecter à Postgresql, vérifiez les informations de "
 "connection"
@@ -11978,7 +12179,7 @@ msgstr "Behoren medewerkers zonder operatie:"
 msgid "Inclure les fournisseurs sans opération :"
 msgstr "Onder andere leveranciers zonder operatie:"
 
-#: include/lib/message_javascript.php:37
+#: include/lib/message_javascript.php:37 include/lib/message_javascript.php:38
 msgid ""
 "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 "
@@ -11992,7 +12193,7 @@ msgid ""
 "sauvés exemple c:/temp, /tmp"
 msgstr ""
 
-#: html/install.php:142 html/install.php:155
+#: html/install.php:142 html/install.php:155 html/install.php:159
 msgid ""
 "Indiquez ici le répertoire où les documents temporaires peuvent être sauvés "
 "exemple c:/temp, /tmp"
@@ -12026,6 +12227,7 @@ msgstr ""
 #: include/ext/tva/ajax.php:200 include/ajax/ajax_ledger.php:104
 #: include/ajax/ajax_ledger.php:126
 #: include/template/ledger_detail_bottom.php:42
+#: include/ajax/ajax_ledger.php:105 include/ajax/ajax_ledger.php:127
 msgid "Information"
 msgstr "Informatie"
 
@@ -12072,7 +12274,7 @@ msgstr "Algemene informatie"
 #: include/lib/user_menu.php:121 html/install.php:238
 #: include/upgrade-plugin.php:125 include/lib/user_menu.php:78
 #: html/install.php:285 include/lib/user_menu.php:77
-#: include/upgrade-plugin.php:128
+#: include/upgrade-plugin.php:128 html/install.php:291
 #, fuzzy
 msgid "Installation"
 msgstr "Herstelt"
@@ -12127,6 +12329,7 @@ msgstr "Intern"
 #: include/class/acc_ledger_search.class.php:950
 #: include/class/acc_ledger_search.class.php:1039
 #: include/export/export_histo_csv.php:39
+#: include/class/acc_ledger_search.class.php:1062
 msgid "Internal"
 msgstr "Intern"
 
@@ -12194,6 +12397,7 @@ msgstr "Intern"
 #: include/class/acc_ledger_sold.class.php:1397
 #: include/class/acc_ledger_history_generic.class.php:770
 #: include/class/anc_grandlivre.class.php:232
+#: include/class/anc_grandlivre.class.php:233
 msgid "Interne"
 msgstr "Intern"
 
@@ -12210,7 +12414,7 @@ msgid "Invalide"
 msgstr "Bevestigen"
 
 #: html/ajax_misc.php:288 html/ajax_misc.php:290 html/ajax_misc.php:296
-#: html/ajax_misc.php:298 html/ajax_misc.php:313
+#: html/ajax_misc.php:298 html/ajax_misc.php:313 html/ajax_misc.php:321
 #, fuzzy
 msgid "Invalide type"
 msgstr "Bevestigen"
@@ -12246,6 +12450,7 @@ msgstr "Omgekeerde selectie"
 #: include/class/acc_ledger_search.class.php:1078
 #: include/class/acc_ledger_search.class.php:1091
 #: include/class/acc_ledger_search.class.php:1180
+#: include/class/acc_ledger_search.class.php:1203
 #, fuzzy
 msgid "Inverser sel"
 msgstr "Omgekeerde selectie"
@@ -12260,6 +12465,7 @@ msgstr "Item code"
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
 #: include/class/periode.class.php:651 include/class/periode.class.php:652
+#: include/class/periode.class.php:653
 msgid "Janvier"
 msgstr ""
 
@@ -12278,6 +12484,7 @@ msgstr "Javascript"
 #: include/template/detail-action.php:465
 #: include/template/detail-action.php:463
 #: include/template/detail-action.php:476
+#: include/template/detail-action.php:489
 msgid "Je ne peux pas ajouter de fichier"
 msgstr "EEN blad Toevoegen is niet mogelijk"
 
@@ -12343,6 +12550,8 @@ msgstr "Donderdag"
 #: include/export/export_ledger_pdf.php:84
 #: include/export/export_histo_csv.php:40
 #: include/template/pre_operation_display.php:38
+#: include/class/acc_ledger_search.class.php:1066
+#: include/export/export_poste_detail_pdf.php:97
 msgid "Journal"
 msgstr "Journaal"
 
@@ -12478,10 +12687,12 @@ msgstr "Handeling is niet gevonden"
 #: include/class/acc_ledger_search.class.php:1073
 #: include/class/acc_ledger_search.class.php:1086
 #: include/class/acc_ledger_search.class.php:1175 include/param_sec.inc.php:228
+#: include/class/acc_ledger_search.class.php:1198
 msgid "Journaux"
 msgstr "Dagboeken"
 
 #: include/lib/message_javascript.php:108
+#: include/lib/message_javascript.php:109
 msgid "Journaux Achat ou vente en mode simple, TVA ou détaillé"
 msgstr ""
 
@@ -12543,12 +12754,14 @@ msgstr "Geschiedenis verkopen "
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
 #: include/class/periode.class.php:652 include/class/periode.class.php:653
+#: include/class/periode.class.php:654
 #, fuzzy
 msgid "Juillet"
 msgstr "City"
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
 #: include/class/periode.class.php:652 include/class/periode.class.php:653
+#: include/class/periode.class.php:654
 msgid "Juin"
 msgstr ""
 
@@ -12560,7 +12773,7 @@ msgstr "Om de positie"
 #: include/template/stock_histo_search.php:47 include/class_anc_print.php:159
 #: include/class/class_anc_print.php:159 include/class/class_anc_print.php:161
 #: include/class/anc_print.class.php:155 include/class/anc_print.class.php:153
-#: include/impress_jrn.inc.php:143
+#: include/impress_jrn.inc.php:143 include/class/anc_print.class.php:154
 msgid "Jusque"
 msgstr "Peuter"
 
@@ -12606,6 +12819,7 @@ msgstr ""
 #: html/install.php:605 html/install.php:621 html/install.php:613
 #: html/install.php:619 html/install.php:581 html/install.php:571
 #: html/install.php:577 html/install.php:580 html/install.php:630
+#: html/install.php:636
 #, php-format
 msgid ""
 "La base de donnée %s est vide, \n"
@@ -12636,6 +12850,7 @@ msgstr ""
 #: html/install.php:520 html/install.php:526 html/install.php:518
 #: html/install.php:524 html/install.php:486 html/install.php:461
 #: html/install.php:467 html/install.php:470 html/install.php:519
+#: html/install.php:525
 #, fuzzy
 msgid "La base de données est bien configurée "
 msgstr "UW datagegevens is niet van de laatste versie"
@@ -12755,6 +12970,7 @@ msgid "La numérotation est propre à chaque journal"
 msgstr "Dagboek van nummering hängt"
 
 #: include/lib/message_javascript.php:69 include/lib/message_javascript.php:71
+#: include/lib/message_javascript.php:72
 #, fuzzy
 msgid ""
 "La numérotation est propre à chaque journal. Laissez à 0 pour ne pas changer "
@@ -12786,11 +13002,11 @@ msgid "Label"
 msgstr "Etiket"
 
 #: include/template/param_jrn.php:118 include/lib/message_javascript.php:71
-#: include/lib/message_javascript.php:73
+#: include/lib/message_javascript.php:73 include/lib/message_javascript.php:74
 msgid "Laissez à 0 pour ne pas changer le numéro"
 msgstr "Laat 0 het nummer niet wijzigen"
 
-#: include/lib/message_javascript.php:46
+#: include/lib/message_javascript.php:46 include/lib/message_javascript.php:47
 #, fuzzy
 msgid "Laissez à 0 pour ne rien changer"
 msgstr "Laat 0 het nummer niet wijzigen"
@@ -12808,13 +13024,14 @@ msgstr ""
 
 #: html/admin/setup.php:76 html/admin/setup.php:79 html/admin/setup.php:130
 #: html/install.php:132 html/install.php:131 html/install.php:137
-#: html/install.php:144 html/install.php:157
+#: html/install.php:144 html/install.php:157 html/install.php:161
 msgid "Le chemin vers le repertoire contenant psql, pg_dump..."
 msgstr ""
 
 #: include/dossier.inc.php:331 include/dossier.inc.php:367
 #: include/dossier.inc.php:403 include/dossier.inc.php:404
 #: include/dossier.inc.php:420 include/dossier.inc.php:425
+#: include/dossier.inc.php:429
 #, fuzzy, php-format
 msgid "Le dossier %s est effacé"
 msgstr "De Naam van de map is leeg"
@@ -12837,6 +13054,7 @@ msgid "Le login ne peut pas être vide"
 msgstr "De naam mag niet leeg zijn"
 
 #: include/user.inc.php:93 include/user.inc.php:94 include/user.inc.php:96
+#: include/user.inc.php:98
 #, fuzzy
 msgid "Le login ne peut être vide"
 msgstr "De naam mag niet leeg zijn"
@@ -12855,18 +13073,19 @@ msgstr "De quick ratio is een verhouding die op uw homepage verschijnt"
 msgid "Le modèle %s est effacé"
 msgstr "Lege regels worden gewist"
 
-#: html/install.php:226
+#: html/install.php:226 html/install.php:230
 #, fuzzy
 msgid "Le mot de passe du super admin et le login ne peuvent être vides"
 msgstr "De naam mag niet leeg zijn"
 
-#: html/install.php:243
+#: html/install.php:243 html/install.php:247
 msgid ""
 "Le mot de passe du super admin et le superadmin ne peut pas contenir des "
 "guillemets ou espaces, ni @mobile"
 msgstr ""
 
 #: include/user.inc.php:98 include/user.inc.php:99 include/user.inc.php:101
+#: include/user.inc.php:103
 #, fuzzy
 msgid "Le mot de passe ne peut être vide"
 msgstr "De naam mag niet leeg zijn"
@@ -12926,6 +13145,7 @@ msgstr "EEN Naam bij post are Moeder Verplicht"
 #: include/ajax/ajax_card.php:555
 #: include/class/template_card_category.class.php:73
 #: include/ajax/ajax_card.php:574 include/ajax/ajax_card.php:650
+#: include/ajax/ajax_card.php:649
 msgid "Le nom ne peut pas être vide"
 msgstr "De Naam mag are niet leeg"
 
@@ -12967,7 +13187,7 @@ msgid "Le poste %s n'est pas dans ce journal"
 msgstr "wordt niet in this journaal"
 
 #: include/template/param_jrn.php:94 include/lib/message_javascript.php:70
-#: include/lib/message_javascript.php:72
+#: include/lib/message_javascript.php:72 include/lib/message_javascript.php:73
 msgid ""
 "Le préfixe des pièces doit être différent pour chaque journal, on peut aussi "
 "utiliser l'année"
@@ -13056,7 +13276,7 @@ msgid "Les clauses FROM sont ignorés avec les dates calendriers"
 msgstr ""
 
 #: include/class_anc_print.php:120 include/lib/message_javascript.php:68
-#: include/lib/message_javascript.php:70
+#: include/lib/message_javascript.php:70 include/lib/message_javascript.php:71
 msgid "Les dates sont en format DD.MM.YYYY"
 msgstr "referentiepunt in formaat TT.MM.JJJJ"
 
@@ -13064,6 +13284,7 @@ msgstr "referentiepunt in formaat TT.MM.JJJJ"
 #: include/class/anc_grandlivre.class.php:167
 #: include/class/anc_grandlivre.class.php:168
 #: include/class/anc_grandlivre.class.php:180
+#: include/class/anc_grandlivre.class.php:181
 #, fuzzy
 msgid ""
 "Les extensions CONVERT_GIF_PDF et PDFTK pour convertir en pdf ne sont pas "
@@ -13092,6 +13313,7 @@ msgstr "De stekkers moet ten minste een naam hebben"
 #: html/install.php:255 html/install.php:254 html/install.php:252
 #: html/install.php:257 html/install.php:263 html/install.php:214
 #: html/install.php:221 html/install.php:224 html/install.php:271
+#: html/install.php:277
 msgid "Les informations sont sauv&eacute;es vous pouvez continuer"
 msgstr ""
 
@@ -13114,7 +13336,7 @@ msgstr ""
 msgid "Les lignes vides seront effacées"
 msgstr "Lege regels worden gewist"
 
-#: include/lib/message_javascript.php:51
+#: include/lib/message_javascript.php:51 include/lib/message_javascript.php:52
 msgid ""
 "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 "
@@ -13126,7 +13348,7 @@ msgstr ""
 #: include/class/class_user.php:1212 include/class/class_user.php:1200
 #: include/class/class_user.php:1238 include/class/class_user.php:1236
 #: include/class/user.class.php:1236 include/class/user.class.php:1261
-#: include/class/user.class.php:1284
+#: include/class/user.class.php:1284 include/class/user.class.php:1299
 msgid "Les mots de passe ne correspondent pas. Mot de passe inchangé"
 msgstr "Wachtwoorden komen niet overeen. Wachtwoord ongewijzigd"
 
@@ -13153,7 +13375,7 @@ msgid ""
 "mettez \"Afficher la période comptable\" à non"
 msgstr ""
 
-#: include/lib/message_javascript.php:34
+#: include/lib/message_javascript.php:34 include/lib/message_javascript.php:35
 msgid ""
 "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 "
@@ -13170,6 +13392,7 @@ msgstr ""
 
 #: include/export/export_gl_pdf.php:88
 #: include/export/export_poste_detail_pdf.php:100
+#: include/export/export_poste_detail_pdf.php:101
 #, fuzzy
 msgid "Let"
 msgstr "Laten."
@@ -13444,6 +13667,10 @@ msgstr "smaad"
 #: include/template/form_ledger_detail.php:59
 #: include/template/ledger_detail_bottom.php:95
 #: include/template/ledger_detail_bottom.php:384
+#: include/class/anc_grandlivre.class.php:229
+#: include/export/export_poste_detail_pdf.php:99
+#: include/template/ledger_detail_bottom.php:96
+#: include/template/ledger_detail_bottom.php:401
 #, php-format
 msgid "Libellé"
 msgstr "Opstellen"
@@ -13530,6 +13757,7 @@ msgid "Limite dossiers"
 msgstr "Records Management"
 
 #: include/lib/message_javascript.php:104
+#: include/lib/message_javascript.php:105
 msgid ""
 "Limite le type de fiche si vous choisissez la fiche à la saisie, uniquement "
 "avec journaux OD"
@@ -13548,6 +13776,11 @@ msgstr ""
 msgid "Liste"
 msgstr "Fractie Lijst"
 
+#: include/ajax/ajax_action_concerned_list.php:39
+#, fuzzy
+msgid "Liste Autres Fiches"
+msgstr "Alle bladen in PDF"
+
 #: include/ext/importbank/index.php:57 include/ext/importbank/index.php:59
 msgid "Liste Import "
 msgstr "Importlijst"
@@ -13696,7 +13929,7 @@ msgstr ""
 
 #: include/template/todo_list_list_user.php:37 include/user.inc.php:122
 #: include/user.inc.php:123 include/param_sec.inc.php:57
-#: include/user.inc.php:125
+#: include/user.inc.php:125 include/user.inc.php:127
 msgid "Login"
 msgstr ""
 
@@ -13710,6 +13943,7 @@ msgstr "Maandag"
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
 #: include/class/periode.class.php:652 include/class/periode.class.php:653
+#: include/class/periode.class.php:654
 #, fuzzy
 msgid "Mai"
 msgstr "Dinsdag"
@@ -13797,6 +14031,7 @@ msgstr "Print menu"
 
 #: include/class/periode.class.php:647 include/class/periode.class.php:649
 #: include/class/periode.class.php:651 include/class/periode.class.php:652
+#: include/class/periode.class.php:653
 msgid "Mars"
 msgstr ""
 
@@ -13831,15 +14066,17 @@ msgstr "Verkeerd type object"
 
 #: include/dossier.inc.php:342 include/ajax/ajax_admin.php:213
 #: include/dossier.inc.php:347 include/ajax/ajax_admin.php:234
-#: include/ajax/ajax_admin.php:238
+#: include/ajax/ajax_admin.php:238 include/dossier.inc.php:350
 msgid "Max. email / jour (-1 = illimité)"
 msgstr ""
 
 #: include/lib/message_javascript.php:87 include/lib/message_javascript.php:89
+#: include/lib/message_javascript.php:90
 msgid "Maximum"
 msgstr ""
 
 #: include/lib/message_javascript.php:86 include/lib/message_javascript.php:88
+#: include/lib/message_javascript.php:89
 #, fuzzy
 msgid "Maximum 15 lignes"
 msgstr "Nieuwe lijn"
@@ -14018,6 +14255,7 @@ msgid "Methode paiement"
 msgstr "Betaling"
 
 #: include/lib/message_javascript.php:72 include/lib/message_javascript.php:74
+#: include/lib/message_javascript.php:75
 msgid "Mettez le pourcentage <br> à zéro pour effacer la ligne"
 msgstr ""
 
@@ -14041,10 +14279,13 @@ msgstr ""
 #: include/ajax/ajax_search_operation.php:134
 #: include/ajax/ajax_search_operation.php:135
 #: include/ajax/ajax_search_operation.php:140
+#: include/template/action_search_result.php:33
+#: include/template/action_search_result.php:90
 msgid "Mettre à jour"
 msgstr "Up-to-date brengen"
 
 #: include/lib/message_javascript.php:106
+#: include/lib/message_javascript.php:107
 msgid ""
 "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"
@@ -14071,6 +14312,7 @@ msgstr "Bijwerken"
 #: html/install.php:589 html/install.php:602 html/install.php:594
 #: html/install.php:600 html/install.php:562 html/install.php:552
 #: html/install.php:558 html/install.php:561 html/install.php:611
+#: html/install.php:617
 #, fuzzy
 msgid "Mise  à jour dossier"
 msgstr "Bijwerken"
@@ -14117,7 +14359,7 @@ msgstr "Bijwerken"
 #: html/admin/setup.php:549 html/install.php:613 html/install.php:614
 #: html/install.php:621 html/install.php:637 html/install.php:629
 #: html/install.php:635 html/install.php:597 html/install.php:587
-#: html/install.php:594 html/install.php:647
+#: html/install.php:594 html/install.php:647 html/install.php:653
 #, fuzzy
 msgid "Mise à jour Repository"
 msgstr "OPSLAAN"
@@ -14150,6 +14392,7 @@ msgstr "Werk plugin, kunt u de parameter instelling te controleren?"
 #: html/install.php:588 html/install.php:601 html/install.php:593
 #: html/install.php:599 html/install.php:561 html/install.php:551
 #: html/install.php:557 html/install.php:560 html/install.php:610
+#: html/install.php:616
 #, fuzzy
 msgid "Mise à jour du systeme"
 msgstr "Update"
@@ -14213,6 +14456,7 @@ msgstr ""
 #: include/template/template_config_form.php:63
 #: include/template/template_config_form.php:71
 #: include/template/template_config_form.php:81
+#: include/template/template_config_form.php:74
 msgid "Mode Serveur mutualisé"
 msgstr ""
 
@@ -14341,7 +14585,7 @@ msgstr "Verandering"
 #: include/class/anc_operation.class.php:319
 #: include/lib/manage_table_sql.class.php:755
 #: include/class/document_type.class.php:77
-#: include/lib/manage_table_sql.class.php:807
+#: include/lib/manage_table_sql.class.php:807 include/dossier.inc.php:286
 msgid "Modifier"
 msgstr "Veranderen"
 
@@ -14437,6 +14681,7 @@ msgstr "Module instellen"
 
 # Je suppose que TKPDF est comme PDF?
 #: html/install.php:384 html/install.php:387 html/install.php:436
+#: html/install.php:442
 #, fuzzy
 msgid "Module php-pgsql n'est pas installé"
 msgstr "TKPDF is niet geïnstalleerd"
@@ -14449,7 +14694,7 @@ msgstr "TKPDF is niet geïnstalleerd"
 #: include/dossier.inc.php:353 include/compta_ach.inc.php:89
 #: include/compta_ach.inc.php:91 include/compta_ven.inc.php:98
 #: include/dossier.inc.php:358 include/upgrade.inc.php:36
-#: include/compta_ach.inc.php:88
+#: include/compta_ach.inc.php:88 include/dossier.inc.php:361
 msgid "Modèle"
 msgstr "Model"
 
@@ -14673,6 +14918,8 @@ msgstr "Dit plan bestaat niet"
 #: include/class/acc_ledger_purchase.class.php:1463
 #: include/class/acc_ledger_sold.class.php:733
 #: include/class/pre_op_advanced.class.php:201 include/lib/ac_common.php:1225
+#: include/class/acc_ledger_search.class.php:761
+#: include/class/acc_ledger_search.class.php:1074
 msgid "Montant"
 msgstr "Bedrag"
 
@@ -15076,17 +15323,19 @@ msgstr "Details Tonen"
 #: html/install.php:593 html/install.php:208 html/install.php:555
 #: include/user.inc.php:83 html/install.php:215 html/install.php:545
 #: html/install.php:551 html/install.php:218 html/install.php:554
-#: html/install.php:265 html/install.php:604
+#: html/install.php:265 html/install.php:604 html/install.php:270
+#: html/install.php:610 include/user.inc.php:85
 #, fuzzy
 msgid "Mot de passe"
 msgstr "Onkostennota"
 
 #: include/template/template_config_form.php:65
+#: include/template/template_config_form.php:46
 #, fuzzy
 msgid "Mot de passe administrateur de noalyss"
 msgstr "Beheerder"
 
-#: html/install.php:164
+#: html/install.php:164 html/install.php:168
 msgid ""
 "Mot de passe administrateur, il peut être changé ensuite dans les préférences"
 msgstr ""
@@ -15104,12 +15353,14 @@ msgstr "Gebruiker toevoegen"
 #: html/admin/template_config_form.php:51
 #: include/template/template_config_form.php:51
 #: include/template/template_config_form.php:52
+#: include/template/template_config_form.php:100
 #, fuzzy
 msgid "Mot de passe de l'utilisateur Postgresql"
 msgstr "Gebruiker toevoegen"
 
 #: html/admin/setup.php:132 html/install.php:134 html/install.php:133
 #: html/install.php:139 html/install.php:146 html/install.php:159
+#: html/install.php:163
 #, fuzzy
 msgid "Mot de passe de l'utilisateur de Postgresql"
 msgstr "Gebruiker toevoegen"
@@ -15229,12 +15480,12 @@ msgstr ""
 msgid "Ne donner pas ce poste comptable si ce code n'est pas utilisé à l'achat"
 msgstr ""
 
-#: include/lib/message_javascript.php:78
+#: include/lib/message_javascript.php:78 include/lib/message_javascript.php:79
 msgid ""
 "Ne donnez pas ce poste comptable si ce code n'est pas utilisé  à la vente"
 msgstr ""
 
-#: include/lib/message_javascript.php:77
+#: include/lib/message_javascript.php:77 include/lib/message_javascript.php:78
 msgid "Ne donnez pas ce poste comptable si ce code n'est pas utilisé à l'achat"
 msgstr ""
 
@@ -15470,6 +15721,9 @@ msgstr "Geen handeling"
 #: include/class/contact_option_ref_mtable.class.php:36
 #: include/class/user.class.php:991
 #: include/template/card_multiple_result.php:19 include/upgrade-plugin.php:62
+#: include/class/acc_ledger_search.class.php:1216
+#: include/template/follow_up_other_concerned_display_table.php:45
+#: include/user.inc.php:84 include/user.inc.php:128 include/dossier.inc.php:230
 msgid "Nom"
 msgstr "Naam"
 
@@ -15513,6 +15767,7 @@ msgstr "Naam TVA"
 #: include/template/template_config_form.php:68
 #: include/template/template_config_form.php:76
 #: include/template/template_config_form.php:86
+#: include/template/template_config_form.php:79
 #, fuzzy
 msgid "Nom base de donnée"
 msgstr "Database"
@@ -15523,7 +15778,7 @@ msgstr "Database"
 #: include/dossier.inc.php:239 include/modele.inc.php:280
 #: include/dossier.inc.php:242 include/dossier.inc.php:247
 #: include/modele.inc.php:281 include/modele.inc.php:286
-#: include/modele.inc.php:287
+#: include/modele.inc.php:287 include/dossier.inc.php:250
 #, fuzzy
 msgid "Nom base de données"
 msgstr "Database"
@@ -15565,7 +15820,7 @@ msgstr "Documentnaam"
 #: include/dossier.inc.php:275 include/dossier.inc.php:272
 #: include/dossier.inc.php:294 include/dossier.inc.php:330
 #: include/dossier.inc.php:331 include/dossier.inc.php:334
-#: include/dossier.inc.php:339
+#: include/dossier.inc.php:339 include/dossier.inc.php:342
 msgid "Nom du dossier"
 msgstr "Naam van de map"
 
@@ -15573,6 +15828,7 @@ msgstr "Naam van de map"
 #: include/class/acc_ledger_search.class.php:246
 #: include/class/acc_ledger_search.class.php:248
 #: include/class/acc_ledger_search.class.php:262
+#: include/class/acc_ledger_search.class.php:264
 #, fuzzy
 msgid "Nom du filtre"
 msgstr "Naam fiche"
@@ -15682,6 +15938,7 @@ msgstr "Parameter"
 
 #: include/ajax/ajax_search_filter.php:73
 #: include/class/action_document_type_mtable.class.php:106
+#: include/ajax/ajax_search_filter.php:81
 #, fuzzy
 msgid "Nom ne peut être vide"
 msgstr "De naam mag niet leeg zijn"
@@ -15786,6 +16043,7 @@ msgid "Nombre de mois doit être compris entre 1 & 60 "
 msgstr ""
 
 #: include/template/periode_add_exercice.php:87
+#: include/template/periode_add_exercice.php:96
 #, fuzzy
 msgid "Nombre de mois invalide"
 msgstr "Aantal ongeldige annuïteiten"
@@ -15797,6 +16055,7 @@ msgid "Nombre de mois n'est pas un nombre"
 msgstr "tarief is geen getal"
 
 #: include/template/periode_add_exercice.php:99
+#: include/template/periode_add_exercice.php:108
 msgid "Nombre de mois possible entre 1 et 60"
 msgstr ""
 
@@ -15834,6 +16093,7 @@ msgstr "Aantal operaties %d"
 #: include/template/profile_menu_display_module.php:81
 #: include/class/tva_rate_mtable.class.php:56 include/company.inc.php:71
 #: include/company.inc.php:74 include/company.inc.php:112
+#: include/user_detail.inc.php:169
 msgid "Non"
 msgstr "Geboren"
 
@@ -15926,10 +16186,12 @@ msgstr "TKPDF is niet geïnstalleerd"
 #: include/class/acc_ledger_search.class.php:868
 #: include/class/acc_ledger_search.class.php:881
 #: include/class/acc_ledger_search.class.php:970
+#: include/class/acc_ledger_search.class.php:993
 msgid "Non payé"
 msgstr "Niet betaald"
 
 #: include/class/acc_ledger_search.class.php:213
+#: include/class/acc_ledger_search.class.php:215
 #, fuzzy
 msgid "Non payées"
 msgstr "Niet betaald"
@@ -15957,6 +16219,7 @@ msgstr "Niet gevonden"
 #: include/template/ledger_detail_bottom.php:292
 #: include/template/ledger_detail_bottom.php:289
 #: include/template/ledger_detail_bottom.php:307
+#: include/template/ledger_detail_bottom.php:308
 #, fuzzy
 msgid "Non utilisée"
 msgstr "niet use of"
@@ -15967,6 +16230,7 @@ msgid "Normal"
 msgstr ""
 
 #: include/class/document.class.php:1413 include/class/follow_up.class.php:270
+#: include/class/follow_up.class.php:272 include/class/follow_up.class.php:761
 msgid "Normale"
 msgstr ""
 
@@ -16017,6 +16281,7 @@ msgstr "Onkostennota"
 #: include/class/acc_ledger_search.class.php:948
 #: include/class/acc_ledger_search.class.php:961
 #: include/class/acc_ledger_search.class.php:1050
+#: include/class/acc_ledger_search.class.php:1073
 msgid "Notes"
 msgstr "Notes"
 
@@ -16094,7 +16359,7 @@ msgstr "Nieuwe bankafschrift"
 #: include/template/action_display_short.php:81
 #: include/lib/html_input.class.php:1103 include/lib/html_input.class.php:1104
 #: include/lib/html_input.class.php:1119 include/lib/html_input.class.php:1120
-#: include/lib/html_input.class.php:1153
+#: include/lib/html_input.class.php:1153 include/lib/html_input.class.php:1145
 #, fuzzy
 msgid "Nouvel événement"
 msgstr "Voeg dit element toe"
@@ -16173,6 +16438,7 @@ msgstr ""
 
 #: include/class/periode.class.php:649 include/class/periode.class.php:651
 #: include/class/periode.class.php:653 include/class/periode.class.php:654
+#: include/class/periode.class.php:655
 #, fuzzy
 msgid "Novembre"
 msgstr "Aantal"
@@ -16428,6 +16694,7 @@ msgid "N° TVA"
 msgstr "Geen BTW"
 
 #: include/template/detail-action.php:19 include/template/detail-action.php:12
+#: include/template/detail-action.php:13
 msgid "N° document"
 msgstr "Document nr."
 
@@ -16608,11 +16875,13 @@ msgstr "Verplicht voor FIN kranten geven hier de Data Bank gebruikt"
 
 #: include/class/periode.class.php:649 include/class/periode.class.php:651
 #: include/class/periode.class.php:653 include/class/periode.class.php:654
+#: include/class/periode.class.php:655
 msgid "Octobre"
 msgstr ""
 
 #: include/class/periode.class.php:688 include/class/periode.class.php:690
 #: include/class/periode.class.php:692 include/class/periode.class.php:693
+#: include/class/periode.class.php:694
 msgid "On ne peut ajouter une période que sur un exercice qui existe déjà"
 msgstr ""
 
@@ -16627,6 +16896,7 @@ msgstr ""
 #: html/admin/setup.php:201 html/admin/setup.php:219 html/admin/setup.php:221
 #: html/install.php:227 html/install.php:225 html/install.php:233
 #: html/install.php:184 html/install.php:191 html/install.php:207
+#: html/install.php:211
 msgid ""
 "On ne peut pas écrire dans le répertoire de NOALYSS, changez-en les droits "
 msgstr ""
@@ -16664,6 +16934,7 @@ msgstr "Betrokken Op"
 #: include/class/acc_ledger_search.class.php:1088
 #: include/class/acc_ledger_search.class.php:1101
 #: include/class/acc_ledger_search.class.php:1190
+#: include/class/acc_ledger_search.class.php:1213
 #, fuzzy
 msgid "Op.Diverses"
 msgstr "Divers"
@@ -16680,11 +16951,13 @@ msgid "Option sup."
 msgstr "Operatie"
 
 #: include/template/action_search.php:146
+#: include/template/action_search.php:148
 #, fuzzy
 msgid "Option étiquettes"
 msgstr "Configuratie van de label"
 
 #: include/class/contact_option_ref_mtable.class.php:39
+#: include/class/follow_up_other_concerned.class.php:166
 #, fuzzy
 msgid "Options"
 msgstr "Operatie"
@@ -16728,6 +17001,7 @@ msgstr "Diverse operatie"
 #: html/ajax_ledger.php:156 html/ajax_ledger.php:174 html/ajax_ledger.php:175
 #: include/ajax/ajax_ledger.php:152 include/ajax/ajax_ledger.php:155
 #: include/ajax/ajax_ledger.php:159 include/ajax/ajax_ledger.php:160
+#: include/ajax/ajax_ledger.php:161
 msgid "Opération Effacée"
 msgstr "Operatie Ontruimde"
 
@@ -16769,6 +17043,8 @@ msgstr ""
 #: include/class/acc_ledger_search.class.php:1058
 #: include/class/acc_ledger_search.class.php:939
 #: include/class/acc_ledger_search.class.php:1147
+#: include/class/acc_ledger_search.class.php:962
+#: include/class/acc_ledger_search.class.php:1170
 msgid "Opération annulée"
 msgstr "Operatie ongedaan gemaakt"
 
@@ -16803,7 +17079,7 @@ msgstr "Operatie bij het begin"
 #: html/ajax_ledger.php:564 html/ajax_ledger.php:576 html/ajax_ledger.php:578
 #: include/ajax/ajax_ledger.php:555 include/ajax/ajax_ledger.php:558
 #: include/ajax/ajax_ledger.php:563 include/ajax/ajax_ledger.php:568
-#: include/ajax/ajax_ledger.php:569
+#: include/ajax/ajax_ledger.php:569 include/ajax/ajax_ledger.php:570
 msgid "Opération extournée"
 msgstr "Werking omgekeerd"
 
@@ -16869,6 +17145,7 @@ msgstr "Opgeslagen Operatie"
 #: include/ajax/ajax_ledger.php:504 include/ajax/ajax_ledger.php:508
 #: include/anc_od.inc.php:121 include/ajax/ajax_ledger.php:509
 #: include/ext/modop/modop_save.php:165 include/ajax/ajax_ledger.php:510
+#: include/ajax/ajax_ledger.php:511
 msgid "Opération sauvée"
 msgstr "Opgeslagen Operatie"
 
@@ -16921,6 +17198,7 @@ msgstr "Operatie Verkopen/Aankopen"
 
 #: include/template/detail-action.php:167
 #: include/template/detail-action.php:174
+#: include/template/detail-action.php:176
 #, fuzzy
 msgid "Opérations concernées"
 msgstr "Geletterde operaties"
@@ -17041,6 +17319,7 @@ msgstr "Kies de BTW"
 #: include/class/tva_rate_mtable.class.php:57
 #: include/class/acc_plan_mtable.class.php:66 include/company.inc.php:72
 #: include/company.inc.php:75 include/company.inc.php:113
+#: include/user_detail.inc.php:170
 msgid "Oui"
 msgstr "Ja"
 
@@ -17063,7 +17342,9 @@ msgstr "de begrotingspost"
 #: include/class/periode_ledger_table.class.php:142
 #: include/class/periode_ledger_table.class.php:144
 #: include/class/periode.class.php:587 include/class/periode.class.php:589
-#: include/class/periode.class.php:590
+#: include/class/periode.class.php:590 include/class/periode.class.php:591
+#: include/class/periode_ledger_table.class.php:143
+#: include/class/periode_ledger_table.class.php:145
 #, fuzzy
 msgid "Ouvert"
 msgstr "OPSLAAN"
@@ -17206,6 +17487,7 @@ msgstr "Eenheidsprijs"
 #: include/class/acc_ledger_history_purchase.class.php:265
 #: include/class/acc_ledger.class.php:2480
 #: include/export/export_histo_csv.php:43 include/tax_summary.inc.php:42
+#: include/class/acc_ledger_search.class.php:753
 msgid "Paiement"
 msgstr "Betaling"
 
@@ -17372,7 +17654,7 @@ msgstr "Parameter"
 #: html/install.php:471 include/admin_repo.inc.php:125 html/install.php:477
 #: html/install.php:439 include/admin_repo.inc.php:127 html/install.php:414
 #: include/admin_repo.inc.php:129 html/install.php:420 html/install.php:423
-#: html/install.php:472
+#: html/install.php:472 html/install.php:478
 #, fuzzy
 msgid "Paramètre base de données"
 msgstr "Database"
@@ -17501,7 +17783,7 @@ msgstr "Geen enkele record gevonden"
 msgid "Pas d'étape"
 msgstr ""
 
-#: include/template/detail-action.php:57
+#: include/template/detail-action.php:57 include/template/detail-action.php:58
 #, fuzzy
 msgid "Pas de catégorie de contact"
 msgstr "Categorie naam van het record"
@@ -17634,6 +17916,8 @@ msgstr "Land"
 #: include/class/acc_ledger_search.class.php:877
 #: include/class/acc_ledger_search.class.php:792
 #: include/class/acc_ledger_search.class.php:966
+#: include/class/acc_ledger_search.class.php:815
+#: include/class/acc_ledger_search.class.php:989
 msgid "Payé"
 msgstr "Betaald"
 
@@ -17662,6 +17946,7 @@ msgid "Payé par"
 msgstr "Betaald deur"
 
 #: include/class/acc_ledger_search.class.php:214
+#: include/class/acc_ledger_search.class.php:216
 #, fuzzy
 msgid "Payées"
 msgstr "Betaald"
@@ -17747,6 +18032,7 @@ msgid "Permet de changer le poste comptable de base des catégories de fiches"
 msgstr ""
 
 #: include/lib/message_javascript.php:110
+#: include/lib/message_javascript.php:111
 msgid "Permet de chercher dans le suivi pour les contacts multiques"
 msgstr ""
 
@@ -17779,12 +18065,12 @@ msgstr "Contactpersoon"
 msgid "Personnel"
 msgstr "Personeel"
 
-#: include/lib/message_javascript.php:62
+#: include/lib/message_javascript.php:62 include/lib/message_javascript.php:63
 #, fuzzy
 msgid "Peut contenir un numéro de bon de commande"
 msgstr "Nummer van bestelbon"
 
-#: include/lib/message_javascript.php:61
+#: include/lib/message_javascript.php:61 include/lib/message_javascript.php:62
 msgid ""
 "Peut contenir une information telle que le message structuré sur le virement"
 msgstr ""
@@ -17910,6 +18196,9 @@ msgstr "stuk"
 #: include/class/acc_ledger_sold.class.php:1396
 #: include/class/print_ledger_simple.class.php:96
 #: include/class/anc_grandlivre.class.php:231 include/lib/ac_common.php:1222
+#: include/class/acc_ledger_search.class.php:755
+#: include/class/acc_ledger_search.class.php:1070
+#: include/class/anc_grandlivre.class.php:232
 msgid "Pièce"
 msgstr "Bewijs"
 
@@ -17937,6 +18226,7 @@ msgstr "Nummer"
 #: include/template/detail-action.php:407
 #: include/template/detail-action.php:405
 #: include/template/detail-action.php:401
+#: include/template/detail-action.php:414
 msgid "Pièces attachées"
 msgstr "Documenten"
 
@@ -17967,7 +18257,7 @@ msgstr "Kaart"
 msgid "Plan Analytique"
 msgstr "Analytic Plan"
 
-#: include/class/anc_print.class.php:163
+#: include/class/anc_print.class.php:163 include/class/anc_print.class.php:164
 #, fuzzy
 msgid "Plan Analytique "
 msgstr "Analytic Plan"
@@ -18022,6 +18312,7 @@ msgstr ""
 #: include/template/template_config_form.php:59
 #: include/template/template_config_form.php:67
 #: include/template/template_config_form.php:77
+#: include/template/template_config_form.php:108
 #, fuzzy
 msgid "Port de Postgresql"
 msgstr "Basisklasse"
@@ -18035,7 +18326,7 @@ msgstr "Basisklasse"
 
 # Plage heeft verschillende vertalingen: periode, marge/verschil, programmablok
 #: html/install.php:135 html/install.php:134 html/install.php:140
-#: html/install.php:147 html/install.php:160
+#: html/install.php:147 html/install.php:160 html/install.php:164
 #, fuzzy
 msgid "Port pour postgresql"
 msgstr "Basisklasse"
@@ -18141,6 +18432,7 @@ msgstr "Archief"
 #: include/class/acc_ledger_history_generic.class.php:772
 #: include/class/anc_grandlivre.class.php:226
 #: include/ajax/ajax_display_letter.php:64 include/database.item.php:63
+#: include/class/anc_grandlivre.class.php:227
 msgid "Poste"
 msgstr "Rekening"
 
@@ -18181,6 +18473,7 @@ msgstr "Kostenpost "
 #: include/class/fiche.class.php:469
 #: include/class/pdfbalance_simple.class.php:55
 #: include/template/ledger_detail_bottom.php:93
+#: include/template/ledger_detail_bottom.php:94
 msgid "Poste Comptable"
 msgstr "rekening"
 
@@ -18467,6 +18760,12 @@ msgstr "De te crediteren post in fout"
 msgid "Postes utilisables journal (débit/crédit) "
 msgstr "Bericht bruikbare krant (debet / credit)"
 
+# Plage heeft verschillende vertalingen: periode, marge/verschil, programmablok
+#: include/template/template_config_form.php:91
+#, fuzzy
+msgid "Postgresql"
+msgstr "Basisklasse"
+
 #: include/periode.inc.php:144
 msgid ""
 "Pour ajouter, effacer ou modifier une p&eacute;riode, il faut choisir global"
@@ -18484,11 +18783,16 @@ msgstr "Voor vandaag"
 #: html/install.php:481 html/install.php:487 html/install.php:479
 #: html/install.php:485 html/install.php:447 html/install.php:422
 #: html/install.php:428 html/install.php:431 html/install.php:480
+#: html/install.php:486
 msgid ""
 "Pour cela, sur la ligne de commande en tant qu\\'utilisateur postgres, "
 "faites createlang plpgsql template1"
 msgstr ""
 
+#: include/user_detail.inc.php:211
+msgid "Pour effacer , confirmez en retapant le code"
+msgstr ""
+
 #: include/ext/import_account/include/template/test_operation.php:9
 msgid ""
 "Pour importer des données, c'est-à-dire transformer des fichiers CSV (Valeur "
@@ -18598,6 +18902,7 @@ msgstr ""
 "ontvangen bestand herstellen"
 
 #: include/lib/message_javascript.php:105
+#: include/lib/message_javascript.php:106
 #, fuzzy
 msgid "Pour les journaux FIN, ce sera la fiche du journal"
 msgstr "Verplicht voor FIN kranten geven hier de Data Bank gebruikt"
@@ -18640,6 +18945,7 @@ msgstr ""
 #: include/class/follow_up.class.php:1921
 #: include/class/follow_up.class.php:1922
 #: include/class/follow_up.class.php:1871
+#: include/class/follow_up.class.php:1845
 msgid "Principal"
 msgstr ""
 
@@ -18651,6 +18957,7 @@ msgstr ""
 #: include/template/action_display_short.php:99
 #: include/template/action_display_short.php:100
 #: include/template/detail-action.php:140
+#: include/template/detail-action.php:142
 msgid "Priorité"
 msgstr "Prioriteit"
 
@@ -18785,6 +19092,7 @@ msgid "Profil inexistant"
 msgstr "Module bestaat niet"
 
 #: include/export/export_poste_detail_pdf.php:106
+#: include/export/export_poste_detail_pdf.php:107
 #, fuzzy
 msgid "Prog"
 msgstr "Prog."
@@ -18805,6 +19113,7 @@ msgstr "Prog."
 #: include/class/anc_grandlivre.class.php:222 include/fiche.inc.php:523
 #: include/fiche.inc.php:532 include/fiche.inc.php:545
 #: include/class/anc_grandlivre.class.php:235
+#: include/class/anc_grandlivre.class.php:236
 msgid "Prog."
 msgstr "Prog."
 
@@ -18885,6 +19194,8 @@ msgstr ""
 #: include/user.inc.php:145 include/class/balance_age.class.php:146
 #: include/database.item.php:170 include/database.item.php:173
 #: include/database.item.php:169
+#: include/template/follow_up_other_concerned_display_table.php:48
+#: include/user.inc.php:83 include/user.inc.php:147
 msgid "Prénom"
 msgstr "Voornaam"
 
@@ -18925,10 +19236,12 @@ msgstr ""
 #: html/install.php:268 html/install.php:267 html/install.php:265
 #: html/install.php:270 html/install.php:276 html/install.php:227
 #: html/install.php:234 html/install.php:237 html/install.php:284
+#: html/install.php:290
 msgid "Puis cliquez sur ce lien"
 msgstr ""
 
 #: html/install.php:586 html/install.php:589 html/install.php:639
+#: html/install.php:645
 msgid ""
 "Puis refaites la procédure d'installation pour mettre la base de données à "
 "jour"
@@ -19177,6 +19490,7 @@ msgstr "Hoeveelheid"
 #: include/database.item.php:167 include/fiche.inc.php:415
 #: include/class/fiche.class.php:1805
 #: include/template/ledger_detail_bottom.php:94
+#: include/template/ledger_detail_bottom.php:95
 msgid "Quick Code"
 msgstr "Quick Code"
 
@@ -19233,6 +19547,7 @@ msgstr "QuickCode"
 #: include/class/anc_grandlivre.class.php:215
 #: include/class/anc_listing.class.php:81
 #: include/class/anc_grandlivre.class.php:227
+#: include/class/anc_grandlivre.class.php:228
 msgid "Quick_code"
 msgstr "Quick_code"
 
@@ -19384,7 +19699,9 @@ msgstr "Door berekening"
 #: include/template/action_button.php:35 include/database.item.php:96
 #: include/lettering.card.inc.php:104 include/lib/html_input.class.php:984
 #: include/lib/html_input.class.php:1004 include/lib/html_input.class.php:1021
-#: include/upgrade-plugin.php:55
+#: include/upgrade-plugin.php:55 include/class/acc_ledger_search.class.php:665
+#: include/lib/html_input.class.php:985 include/lib/html_input.class.php:1005
+#: include/lib/html_input.class.php:1022
 #, php-format
 msgid "Recherche"
 msgstr "Vinden"
@@ -19411,6 +19728,7 @@ msgstr "Gedetailleerder Zoeken"
 #: include/ajax/ajax_card.php:375 include/ajax/ajax_card.php:408
 #: include/ajax/ajax_card.php:411 include/fiche.inc.php:93
 #: include/ajax/ajax_card.php:412 include/ajax/ajax_card.php:466
+#: include/ajax/ajax_card.php:465
 msgid "Recherche de fiche"
 msgstr "VIND EEN blad"
 
@@ -19452,7 +19770,7 @@ msgstr "VIND EEN blad"
 #: include/ext/rapport_avance/include/formulaire_param_detail.class.php:368
 #: include/ajax/ajax_card.php:506 include/class/acc_report.class.php:151
 #: include/ajax/ajax_card.php:510 include/ajax/ajax_card.php:511
-#: include/ajax/ajax_card.php:587
+#: include/ajax/ajax_card.php:587 include/ajax/ajax_card.php:586
 msgid "Recherche poste"
 msgstr "Bericht Vinden"
 
@@ -19494,6 +19812,7 @@ msgstr "Activiteit zoeken"
 #: include/class/acc_ledger_fin.class.php:1087
 #: include/class/anc_balance_double.class.php:370
 #: include/class/acc_ledger_search.class.php:646
+#: include/class/acc_ledger_search.class.php:669
 msgid "Rechercher"
 msgstr "Vinden"
 
@@ -19516,10 +19835,13 @@ msgstr "De reeks herbeginnen (op 0 laten om niet te veranderen)"
 #: include/export/export_poste_detail_pdf.php:94
 #: include/template/acc_ledger_history_purchase_detail.php:35
 #: include/template/acc_ledger_history_sale_detail.php:36
+#: include/export/export_poste_detail_pdf.php:95
+#: include/template/action_search_result.php:48
 msgid "Ref"
 msgstr "Ref"
 
 #: include/template/detail-action.php:27 include/template/detail-action.php:20
+#: include/template/detail-action.php:21
 msgid "Reference"
 msgstr "Verwijzing"
 
@@ -19575,6 +19897,7 @@ msgid "Rejeté"
 msgstr "Verworpen"
 
 #: include/ajax/ajax_search_filter.php:151
+#: include/ajax/ajax_search_filter.php:160
 msgid "Remise à zéro"
 msgstr ""
 
@@ -19683,7 +20006,8 @@ msgstr "Is te laat"
 #: include/ajax/ajax_display_letter.php:39 include/cfgledger.inc.php:141
 #: include/ext/tva/ajax.php:35 html/do.php:312 html/do.php:281
 #: include/modele.inc.php:404 include/modele.inc.php:444 html/do.php:283
-#: include/ajax/ajax_display_letter.php:53
+#: include/ajax/ajax_display_letter.php:53 include/dossier.inc.php:387
+#: include/dossier.inc.php:431
 msgid "Retour"
 msgstr "Terug"
 
@@ -19796,7 +20120,7 @@ msgstr "Beschrijving"
 msgid "Réel"
 msgstr "Echt"
 
-#: include/class/follow_up.class.php:624
+#: include/class/follow_up.class.php:624 include/class/follow_up.class.php:637
 msgid "Réf."
 msgstr ""
 
@@ -19819,6 +20143,7 @@ msgstr "Omslag"
 #: html/admin/template_config_form.php:33
 #: include/template/template_config_form.php:33
 #: include/template/template_config_form.php:34
+#: include/template/template_config_form.php:60
 msgid "Répertoire temporaire"
 msgstr ""
 
@@ -19952,6 +20277,7 @@ msgstr ""
 #: include/class/follow_up.class.php:1780
 #: include/class/follow_up.class.php:1781
 #: include/class/follow_up.class.php:1731
+#: include/class/follow_up.class.php:1705
 #, fuzzy
 msgid "SECURITE : Ajout impossible"
 msgstr "Export is onmogelijk"
@@ -20015,7 +20341,7 @@ msgstr "Nieuwe lijn"
 #: include/cfgledger.inc.php:137 include/ajax/ajax_card.php:204
 #: include/ajax/ajax_card.php:518 include/ajax/ajax_mod_predf_op.php:67
 #: include/ajax/ajax_card.php:207 include/ajax/ajax_card.php:594
-#: include/company.inc.php:163
+#: include/company.inc.php:163 include/ajax/ajax_card.php:593
 msgid "Sauve"
 msgstr "OPSLAAN"
 
@@ -20117,6 +20443,7 @@ msgstr "Geen enkel model"
 #: include/ajax/ajax_display_letter.php:226 include/ajax/ajax_card.php:168
 #: include/template/ledger_detail_bottom.php:333
 #: include/template/card_multiple_display_option.php:114
+#: include/template/ledger_detail_bottom.php:350
 msgid "Sauver"
 msgstr "OPSLAAN"
 
@@ -20196,6 +20523,7 @@ msgstr "Schatkist"
 #: include/class/class_follow_up.php:129 include/class/follow_up.class.php:128
 #: include/class/follow_up.class.php:129 include/class/follow_up.class.php:130
 #: include/class/follow_up.class.php:135 include/class/follow_up.class.php:136
+#: include/class/follow_up.class.php:137 include/class/follow_up.class.php:138
 #, fuzzy
 msgid "Securité"
 msgstr "Veiligheid"
@@ -20212,10 +20540,11 @@ msgstr "Veiligheid"
 #: include/class/acc_ledger_search.class.php:936
 #: include/class/acc_ledger_search.class.php:949
 #: include/class/acc_ledger_search.class.php:1038
+#: include/class/acc_ledger_search.class.php:1061
 msgid "Selection"
 msgstr "Selectie"
 
-#: include/lib/message_javascript.php:33
+#: include/lib/message_javascript.php:33 include/lib/message_javascript.php:34
 msgid "Selectionnez le journal où l'opération doit être sauvée"
 msgstr ""
 
@@ -20231,6 +20560,7 @@ msgstr "Selectionneer plannen DAT u interesseert je op VOOR Zoeken Klikken"
 
 #: include/class_anc_print.php:140 include/class_anc_print.php:181
 #: include/lib/message_javascript.php:73 include/lib/message_javascript.php:75
+#: include/lib/message_javascript.php:76
 msgid "Selectionnez le plan qui vous intéresse avant de cliquer sur Recherche"
 msgstr "Selectionneer plannen DAT u interesseert je op VOOR Zoeken Klikken"
 
@@ -20242,12 +20572,17 @@ msgstr "Selecteer uw taal"
 
 #: include/class/periode.class.php:648 include/class/periode.class.php:650
 #: include/class/periode.class.php:652 include/class/periode.class.php:653
+#: include/class/periode.class.php:654
 msgid "Septembre"
 msgstr ""
 
+#: include/template/template_config_form.php:56
+msgid "Serveur"
+msgstr ""
+
 # Plage heeft verschillende vertalingen: periode, marge/verschil, programmablok
 #: html/install.php:138 html/install.php:137 html/install.php:143
-#: html/install.php:150 html/install.php:163
+#: html/install.php:150 html/install.php:163 html/install.php:167
 #, fuzzy
 msgid "Serveur postgresql"
 msgstr "Basisklasse"
@@ -20294,6 +20629,7 @@ msgid ""
 msgstr ""
 
 #: include/lib/message_javascript.php:83 include/lib/message_javascript.php:85
+#: include/lib/message_javascript.php:86
 msgid "Si vous changez de page vous perdez les reconciliations, continuez ?"
 msgstr ""
 
@@ -20308,7 +20644,7 @@ msgstr ""
 "dezelfde administratieve post standaard. Dit item accounting standaard "
 "basisklasse."
 
-#: include/lib/message_javascript.php:60
+#: include/lib/message_javascript.php:60 include/lib/message_javascript.php:61
 msgid ""
 "Si vous ne donnez pas de nom, ce sera le nom du fichier qui sera utilisé"
 msgstr ""
@@ -20678,7 +21014,7 @@ msgstr ""
 #: html/ajax_misc.php:235 html/ajax_misc.php:313 html/ajax_misc.php:318
 #: html/ajax_misc.php:346 html/ajax_misc.php:458 html/ajax_misc.php:460
 #: html/ajax_misc.php:466 html/ajax_misc.php:468 html/ajax_misc.php:472
-#: html/ajax_misc.php:437
+#: html/ajax_misc.php:437 html/ajax_misc.php:445
 msgid "Symbole"
 msgstr "Symbool"
 
@@ -20993,6 +21329,7 @@ msgid "TVA annulée"
 msgstr "Geannuleerd BTW"
 
 #: include/lib/message_javascript.php:107
+#: include/lib/message_javascript.php:108
 msgid "TVA due ou récupérable quand l'opération est payée ou exécutée"
 msgstr ""
 
@@ -21127,7 +21464,7 @@ msgstr "Totale activa"
 #: include/card_attr.inc.php:96 include/dossier.inc.php:204
 #: include/dossier.inc.php:238 include/dossier.inc.php:239
 #: include/dossier.inc.php:242 include/dossier.inc.php:247
-#: include/class/card_attribut_mtable.class.php:41
+#: include/class/card_attribut_mtable.class.php:41 include/dossier.inc.php:250
 msgid "Taille"
 msgstr "Aantal"
 
@@ -21147,10 +21484,16 @@ msgid "Tant que ce n'est pas vous fait vous ne pouvez pas utiliser NOALYSS"
 msgstr ""
 
 #: include/lib/message_javascript.php:98 include/lib/message_javascript.php:100
+#: include/lib/message_javascript.php:101
 msgid "Taper une formule (ex 20*5.1) puis enter"
 msgstr ""
 
-#: include/lib/message_javascript.php:40
+#: include/ajax/ajax_admin.php:264
+#, fuzzy
+msgid "Tapez le code de confirmation"
+msgstr "Veranderingen OPSLAAN"
+
+#: include/lib/message_javascript.php:40 include/lib/message_javascript.php:41
 msgid ""
 "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 "
@@ -21172,7 +21515,7 @@ msgstr ""
 #: include/export/export_printtva_pdf.php:59
 #: include/export/export_printtva_pdf.php:216
 #: include/export/export_printtva_csv.php:53
-#: include/export/export_printtva_csv.php:72
+#: include/export/export_printtva_csv.php:72 html/ajax_misc.php:444
 msgid "Taux"
 msgstr "Tarief"
 
@@ -21276,6 +21619,8 @@ msgstr "Thema"
 #: include/class/anc_grandlivre.class.php:229
 #: include/export/export_ledger_csv.php:230
 #: include/export/export_histo_csv.php:46
+#: include/class/acc_ledger_search.class.php:759
+#: include/class/anc_grandlivre.class.php:230
 msgid "Tiers"
 msgstr "Derde"
 
@@ -21293,7 +21638,8 @@ msgstr "Derde"
 #: include/template/detail-action.php:258 include/template/dashboard.php:348
 #: include/ext/invoicing/include/invoice_send_mail_input.inc.php:139
 #: include/template/action_show.php:40 include/template/dashboard.php:346
-#: include/class/follow_up.class.php:627
+#: include/class/follow_up.class.php:627 include/class/follow_up.class.php:645
+#: include/template/action_search_result.php:51
 msgid "Titre"
 msgstr "Titel"
 
@@ -21724,7 +22070,7 @@ msgstr "Het totaal per subniveau"
 #: include/user.inc.php:176 include/user.inc.php:178
 #: include/ext/importbank/include/import_bank.class.php:136
 #: include/template/tag_search_select.php:14
-#: include/template/tag_search_select.php:17
+#: include/template/tag_search_select.php:17 include/user.inc.php:180
 msgid "Tous"
 msgstr ""
 
@@ -21743,6 +22089,7 @@ msgid "Tous les Etats"
 msgstr "Alle staten"
 
 #: include/class/follow_up.class.php:1128
+#: include/class/follow_up.class.php:1160
 #, fuzzy
 msgid "Tous les actions ouvertes"
 msgstr "Alle Operaties"
@@ -21783,6 +22130,7 @@ msgstr ""
 #: include/class/follow_up.class.php:1243
 #: include/class/follow_up.class.php:1244
 #: include/class/follow_up.class.php:1161
+#: include/class/follow_up.class.php:1193
 msgid "Tous les profiles"
 msgstr "Alle profielen"
 
@@ -21798,6 +22146,7 @@ msgstr "Alle profielen"
 #: include/class/follow_up.class.php:1203
 #: include/class/follow_up.class.php:1204
 #: include/class/follow_up.class.php:1121
+#: include/class/follow_up.class.php:1153
 msgid "Tous les types"
 msgstr "Alle soorten"
 
@@ -21824,7 +22173,7 @@ msgstr ""
 # Je suppose que TKPDF est comme PDF?
 #: html/install.php:632 html/install.php:592 html/install.php:639
 #: html/install.php:595 html/install.php:642 html/install.php:645
-#: html/install.php:695
+#: html/install.php:695 html/install.php:651 html/install.php:701
 #, fuzzy
 msgid "Tout est installé"
 msgstr "TKPDF is niet geïnstalleerd"
@@ -21843,6 +22192,7 @@ msgid "Tout sélectionner"
 msgstr "Alles selecteren"
 
 #: include/class/acc_ledger_search.class.php:212
+#: include/class/acc_ledger_search.class.php:214
 #, fuzzy
 msgid "Toutes"
 msgstr "Alles"
@@ -21870,7 +22220,8 @@ msgstr "Alle bladen in PDF"
 msgid "Toutes les opérations"
 msgstr "Alle Operaties"
 
-#: include/template/action_search.php:149
+#: include/template/action_search.php:149 include/template/ledger_search.php:97
+#: include/template/action_search.php:151
 #, fuzzy
 msgid "Toutes les étiquettes"
 msgstr "Toevoeging van een label"
@@ -21883,6 +22234,7 @@ msgid "Toutes opérations"
 msgstr "Alle activiteiten"
 
 #: include/lib/message_javascript.php:95 include/lib/message_javascript.php:97
+#: include/lib/message_javascript.php:98
 #, fuzzy
 msgid "Traitement en cours"
 msgstr "Later in te brengen"
@@ -21989,6 +22341,10 @@ msgstr "BTW NTV"
 #: include/class/fiche.class.php:1505
 #: include/class/card_attribut_mtable.class.php:40
 #: include/class/acc_account_ledger.class.php:390
+#: include/user_detail.inc.php:179
+#: include/class/acc_ledger_search.class.php:1218
+#: include/template/detail-action.php:30
+#: include/template/action_search_result.php:57 include/user.inc.php:149
 msgid "Type"
 msgstr "Type"
 
@@ -22008,6 +22364,7 @@ msgstr "Type"
 #: include/class/follow_up.class.php:1694
 #: include/class/follow_up.class.php:1695
 #: include/class/follow_up.class.php:1643
+#: include/class/follow_up.class.php:1675
 #, fuzzy
 msgid "Type action invalide"
 msgstr "Ongeldige opties"
@@ -22074,6 +22431,7 @@ msgstr "Ongeldig verzoek"
 #: include/operation_ods_confirm.inc.php:54
 #: include/template/ledger_detail_bottom.php:155
 #: include/template/ledger_detail_bottom.php:160
+#: include/template/ledger_detail_bottom.php:161
 #, fuzzy
 msgid "Type opération"
 msgstr "Datum van de verrichting"
@@ -22119,11 +22477,13 @@ msgid "URL"
 msgstr "URL"
 
 #: include/lib/message_javascript.php:96 include/lib/message_javascript.php:98
+#: include/lib/message_javascript.php:99
 #, fuzzy
 msgid "Un instant"
 msgstr "onbestaand"
 
 #: include/lib/message_javascript.php:77 include/lib/message_javascript.php:79
+#: include/lib/message_javascript.php:80
 msgid "Un instant svp"
 msgstr ""
 
@@ -22305,16 +22665,22 @@ msgstr "Ongeldige waarden"
 #: include/admin_repo.inc.php:146 include/stock_inv_histo.inc.php:84
 #: include/user.inc.php:173 html/user_login.php:109
 #: include/admin_repo.inc.php:148 html/user_login.php:115
+#: include/user.inc.php:175
 msgid "Utilisateur"
 msgstr "Gebruiker"
 
 #: html/install.php:594 html/install.php:586 html/install.php:592
 #: html/install.php:554 html/install.php:544 html/install.php:550
-#: html/install.php:553 html/install.php:603
+#: html/install.php:553 html/install.php:603 html/install.php:609
 #, fuzzy
 msgid "Utilisateur  administrateur"
 msgstr "Gebruiker"
 
+#: include/user_detail.inc.php:113
+#, fuzzy, php-format
+msgid "Utilisateur %s %s est effacé"
+msgstr "Gebruikers die zijn aangesloten"
+
 #: include/lib/database_core.class.php:66
 #, fuzzy, php-format
 msgid "Utilisateur : %s"
@@ -22329,6 +22695,7 @@ msgstr "Gebruiker"
 #: html/admin/template_config_form.php:47
 #: include/template/template_config_form.php:47
 #: include/template/template_config_form.php:48
+#: include/template/template_config_form.php:96
 #, fuzzy
 msgid "Utilisateur Postgresql"
 msgstr "Gebruiker"
@@ -22340,6 +22707,7 @@ msgstr "Gebruiker"
 #: html/install.php:600 html/install.php:626 html/install.php:607
 #: html/install.php:633 html/install.php:217 html/install.php:636
 #: html/install.php:264 html/install.php:660 html/install.php:689
+#: html/install.php:269 html/install.php:695
 #, fuzzy
 msgid "Utilisateur administrateur"
 msgstr "Gebruiker"
@@ -22351,7 +22719,7 @@ msgstr "Database"
 
 #: html/admin/setup.php:77 html/admin/setup.php:80 html/admin/setup.php:131
 #: html/install.php:133 html/install.php:132 html/install.php:138
-#: html/install.php:145 html/install.php:158
+#: html/install.php:145 html/install.php:158 html/install.php:162
 #, fuzzy
 msgid "Utilisateur de la base de donnée postgresql"
 msgstr "Database"
@@ -22386,7 +22754,7 @@ msgstr ""
 #: include/user_detail.inc.php:169 include/user_detail.inc.php:165
 #: include/user_detail.inc.php:174 include/param_sec.inc.php:147
 #: include/export/export_security_pdf.php:66 include/param_sec.inc.php:153
-#: include/param_sec.inc.php:158
+#: include/param_sec.inc.php:158 include/user_detail.inc.php:185
 #, fuzzy
 msgid "Utilisateur normal"
 msgstr "Gebruiker"
@@ -22466,7 +22834,7 @@ msgid "Utilitaire"
 msgstr "Besturingssoftware"
 
 #: html/install.php:629 html/install.php:636 html/install.php:639
-#: html/install.php:692
+#: html/install.php:692 html/install.php:698
 #, php-format
 msgid "VOUS DEVEZ EFFACER CE FICHIER %s"
 msgstr ""
@@ -22482,7 +22850,8 @@ msgstr "Accounting Plan"
 #: include/lib/input_switch.class.php:56
 #: include/class/acc_ledger.class.php:2399 include/class/user.class.php:1402
 #: include/class/user.class.php:1431 include/lib/input_switch.class.php:57
-#: include/lib/input_checkbox.class.php:65
+#: include/lib/input_checkbox.class.php:65 include/class/user.class.php:1426
+#: include/class/user.class.php:1455
 #, fuzzy
 msgid "Valeur invalide"
 msgstr "Ongeldige waarden"
@@ -22574,6 +22943,7 @@ msgstr "Bevestigen"
 #: include/ajax/ajax_preference.php:280
 #: include/class/acc_ledger_search.class.php:1223
 #: include/ajax/ajax_preference.php:283
+#: include/class/acc_ledger_search.class.php:1246
 msgid "Valider"
 msgstr "Bevestigen"
 
@@ -22625,6 +22995,7 @@ msgstr "Vrijdag"
 #: include/database.item.php:253 include/class/acc_ledger_search.class.php:1186
 #: include/class/operation_predef_mtable.class.php:176
 #: include/database.item.php:10 include/database.item.php:218
+#: include/class/acc_ledger_search.class.php:1209
 msgid "Vente"
 msgstr "Verkoop"
 
@@ -22660,7 +23031,7 @@ msgstr ""
 msgid "Version PHP trop basse , minimum 5.4"
 msgstr ""
 
-#: html/install.php:356
+#: html/install.php:356 html/install.php:362
 msgid "Version PHP trop basse , minimum 7.0.33"
 msgstr ""
 
@@ -22668,7 +23039,7 @@ msgstr ""
 #: html/install.php:456 html/install.php:462 html/install.php:454
 #: html/install.php:460 html/install.php:424 html/install.php:399
 #: html/install.php:405 html/install.php:408 scenario/180209.php:18
-#: html/install.php:457
+#: html/install.php:457 html/install.php:463
 #, fuzzy
 msgid "Version base de données :"
 msgstr "Database"
@@ -22738,7 +23109,7 @@ msgstr "Zichtbare Y of N"
 msgid "Visualisation"
 msgstr "Visualisatie"
 
-#: html/install.php:260
+#: html/install.php:260 html/install.php:265
 msgid ""
 "Voici l'utilisateur et mot de passe de l'utilisateur administrateur de "
 "Noalyss ,  il a tous les droits et a accès à tout. Connectez-vous avec ses "
@@ -22774,6 +23145,7 @@ msgid "Votre base de données n'est pas à jour"
 msgstr "UW datagegevens is niet van de laatste versie"
 
 #: include/lib/message_javascript.php:103
+#: include/lib/message_javascript.php:104
 msgid "Votre demande est en cours de traitement"
 msgstr ""
 
@@ -22802,6 +23174,7 @@ msgstr "Heeft u een kopie van deze kwestie"
 #: include/template/detail-action.php:247
 #: include/template/detail-action.php:249
 #: include/template/detail-action.php:336
+#: include/template/detail-action.php:346
 #, php-format
 msgid "Voulez-vous effacer ce commentaire"
 msgstr "Wilt u deze opmerking verwijderen?"
@@ -22833,6 +23206,8 @@ msgstr "Wilt u deze plug-in wissen?"
 #: include/class/follow_up.class.php:2018
 #: include/class/follow_up.class.php:1906
 #: include/class/follow_up.class.php:1971
+#: include/class/follow_up.class.php:1880
+#: include/class/follow_up.class.php:1945
 #, php-format
 msgid "Voulez-vous effacer cette action "
 msgstr "Wilt u deze actie wilt verwijderen"
@@ -22850,6 +23225,7 @@ msgstr "Wilt u deze transactie verwijderen"
 #: include/lib/html_input.class.php:1025 include/lib/html_input.class.php:1083
 #: include/lib/html_input.class.php:1084 include/lib/html_input.class.php:1099
 #: include/lib/html_input.class.php:1100 include/lib/html_input.class.php:1133
+#: include/lib/html_input.class.php:1134
 #, fuzzy, php-format
 msgid "Voulez-vous effacer cette relation "
 msgstr "Wilt u deze actie wilt verwijderen"
@@ -22865,6 +23241,7 @@ msgstr "Wilt u deze actie wilt verwijderen"
 #: include/template/detail-action.php:442
 #: include/template/detail-action.php:440
 #: include/template/detail-action.php:453
+#: include/template/detail-action.php:466
 #, php-format
 msgid "Voulez-vous effacer le document"
 msgstr "Wilt u sterven afvegen papier?"
@@ -22926,10 +23303,12 @@ msgstr "U bevestigt"
 #: include/class/fiche_def.class.php:791 include/class/fiche_def.class.php:796
 #: include/ajax/ajax_create_menu.php:13 include/template/stock_inv.php:33
 #: include/lib/message_javascript.php:78 include/lib/message_javascript.php:80
+#: include/lib/message_javascript.php:81
 msgid "Vous confirmez ?"
 msgstr "U bevestigt"
 
 #: include/lib/message_javascript.php:81 include/lib/message_javascript.php:83
+#: include/lib/message_javascript.php:84
 #, fuzzy
 msgid "Vous confirmez effacement ?"
 msgstr "U bevestigt het wissen"
@@ -22954,6 +23333,7 @@ msgid "Vous confirmez le clonage "
 msgstr "U bevestigt het klonen"
 
 #: include/lib/message_javascript.php:82 include/lib/message_javascript.php:84
+#: include/lib/message_javascript.php:85
 #, fuzzy
 msgid "Vous confirmez mise à jour ?"
 msgstr "U bevestigt"
@@ -22986,7 +23366,7 @@ msgstr "U moet een bestand of berekening kiezen"
 
 #: html/admin/setup.php:81 html/admin/setup.php:84 html/admin/setup.php:135
 #: html/install.php:137 html/install.php:136 html/install.php:142
-#: html/install.php:149 html/install.php:162
+#: html/install.php:149 html/install.php:162 html/install.php:166
 msgid ""
 "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"
@@ -23009,7 +23389,7 @@ msgstr "U moet corrigeren"
 msgid "Vous devez donner la colonne quick_code"
 msgstr "U moet de kolom quick_code geven"
 
-#: include/lib/message_javascript.php:47
+#: include/lib/message_javascript.php:47 include/lib/message_javascript.php:48
 #, fuzzy
 msgid "Vous devez donner la date par opération"
 msgstr "U moet de periode geven"
@@ -23033,6 +23413,7 @@ msgstr "U moet corrigeren"
 #: html/install.php:480 html/install.php:486 html/install.php:478
 #: html/install.php:484 html/install.php:446 html/install.php:421
 #: html/install.php:427 html/install.php:430 html/install.php:479
+#: html/install.php:485
 msgid ""
 "Vous devez installer le langage plpgsql pour permettre aux fonctions SQL de "
 "fonctionner."
@@ -23042,6 +23423,7 @@ msgstr ""
 #: html/install.php:345 html/install.php:344 html/install.php:342
 #: html/install.php:348 html/install.php:354 html/install.php:318
 #: html/install.php:327 html/install.php:330 html/install.php:379
+#: html/install.php:385
 msgid "Vous devez installer ou activer l'extension"
 msgstr ""
 
@@ -23169,14 +23551,14 @@ msgstr ""
 "uitmaken van \n"
 "          meerdere dossiers of meerdere labels hebben."
 
-#: include/lib/message_javascript.php:44
+#: include/lib/message_javascript.php:44 include/lib/message_javascript.php:45
 msgid "Vous pouvez utiliser le % pour indiquer le poste parent"
 msgstr ""
 
 #: html/admin/setup.php:259 html/install.php:323 html/install.php:322
 #: html/install.php:320 html/install.php:326 html/install.php:332
 #: html/install.php:283 html/install.php:290 html/install.php:293
-#: html/install.php:342
+#: html/install.php:342 html/install.php:348
 #, fuzzy
 msgid "Vous utilisez le domaine"
 msgstr "U niet gebruikt voorraadbeheer"
@@ -23239,6 +23621,7 @@ msgid "Vérification "
 msgstr "Verificatie"
 
 #: include/template/ledger_detail_bottom.php:337
+#: include/template/ledger_detail_bottom.php:354
 #, fuzzy
 msgid "Vérification CA"
 msgstr "Verificatie"
@@ -23359,7 +23742,7 @@ msgstr "Heet EEN ongeldig Bedrag"
 #: html/admin/setup.php:272 html/install.php:336 html/install.php:335
 #: html/install.php:333 html/install.php:339 html/install.php:345
 #: html/install.php:309 html/install.php:316 html/install.php:319
-#: html/install.php:368
+#: html/install.php:368 html/install.php:374
 #, fuzzy
 msgid "a une mauvaise valeur"
 msgstr "has EEN Verkeerd hoeveelheid"
@@ -23435,6 +23818,7 @@ msgid "budgets"
 msgstr "budgetten"
 
 #: include/lib/message_javascript.php:88 include/lib/message_javascript.php:90
+#: include/lib/message_javascript.php:91
 #, fuzzy
 msgid "calculé"
 msgstr "Door berekening"
@@ -23479,6 +23863,8 @@ msgstr "kiezen"
 #: include/lib/html_input.class.php:1033 include/lib/html_input.class.php:1034
 #: include/class/acc_ledger_search.class.php:114
 #: include/lib/html_input.class.php:1067
+#: include/class/acc_ledger_search.class.php:116
+#: include/lib/html_input.class.php:1068
 msgid "choix des journaux"
 msgstr "keuze van de dagboeken"
 
@@ -23522,7 +23908,7 @@ msgstr "Klik hier om uw voorkeuren bij te werken"
 #: include/class/pdf_operation.class.php:194
 #: include/class/pdf_operation.class.php:247 html/ajax_misc.php:456
 #: html/ajax_misc.php:458 html/ajax_misc.php:464 html/ajax_misc.php:466
-#: html/ajax_misc.php:470 html/ajax_misc.php:435
+#: html/ajax_misc.php:470 html/ajax_misc.php:435 html/ajax_misc.php:443
 msgid "code"
 msgstr "code"
 
@@ -23577,6 +23963,12 @@ msgstr "Credit"
 msgid "création, modification et effacement de catégorie de fiche"
 msgstr "aanmaken, wijzigen en verwijderen van categorie opnemen"
 
+#: include/export/export_fiche_detail_pdf.php:112
+#: include/export/export_fiche_detail_pdf.php:216
+#, fuzzy
+msgid "créditeur"
+msgstr "Schuldeiser"
+
 #: html/user_login.php:155 html/user_login.php:157 html/user_login.php:159
 msgid "dans NOALYSS"
 msgstr "in NOALYSS"
@@ -23618,6 +24010,7 @@ msgstr ""
 #: include/template/ledger_detail_bottom.php:217
 #: include/template/ledger_detail_bottom.php:214
 #: include/template/ledger_detail_bottom.php:232
+#: include/template/ledger_detail_bottom.php:233
 msgid "delta"
 msgstr "delta"
 
@@ -23632,6 +24025,7 @@ msgstr "Verschil"
 #: include/class/follow_up.class.php:1948
 #: include/class/follow_up.class.php:1949
 #: include/class/follow_up.class.php:1901
+#: include/class/follow_up.class.php:1875
 #, fuzzy
 msgid "direct parent "
 msgstr "Filteren op"
@@ -23648,6 +24042,12 @@ msgstr "moet in een unicode worden omgezet"
 msgid "du poste comptable"
 msgstr "de begrotingspost"
 
+#: include/export/export_fiche_detail_pdf.php:117
+#: include/export/export_fiche_detail_pdf.php:221
+#, fuzzy
+msgid "débiteur"
+msgstr "schuldenaar"
+
 #: include/template/dashboard.php:112 include/template/dashboard.php:124
 #: include/template/dashboard.php:140 include/template/dashboard.php:150
 #: include/template/dashboard.php:165 include/template/dashboard.php:175
@@ -23671,7 +24071,7 @@ msgstr "Wissen"
 #: include/ext/transform/include/template/listing_assujetti_declarant.php:54
 #: include/ext/transform/include/template/listing_assujetti_representative.php:54
 #: include/user_detail.inc.php:130 include/user_detail.inc.php:126
-#: include/user_detail.inc.php:135
+#: include/user_detail.inc.php:135 include/user_detail.inc.php:146
 msgid "email"
 msgstr "e-mail"
 
@@ -23728,6 +24128,8 @@ msgstr "Tussen 61 en 90 dagen"
 #: include/template/ledger_detail_bottom.php:352
 #: include/ajax/ajax_ledger.php:545
 #: include/template/ledger_detail_bottom.php:380
+#: include/ajax/ajax_ledger.php:546
+#: include/template/ledger_detail_bottom.php:397
 msgid "entrez une date"
 msgstr "datum invoeren"
 
@@ -23789,6 +24191,7 @@ msgstr "is in use of, logout eerst"
 #: include/dossier.inc.php:391 include/dossier.inc.php:392
 #: include/dossier.inc.php:147 include/dossier.inc.php:408
 #: include/dossier.inc.php:152 include/dossier.inc.php:413
+#: include/dossier.inc.php:154 include/dossier.inc.php:417
 msgid "est accèdée, déconnectez-vous d'abord"
 msgstr "is in use of, logout eerst"
 
@@ -23815,7 +24218,7 @@ msgstr ""
 #: include/ajax/ajax_mod_periode.php:60 include/ajax/ajax_mod_periode.php:78
 #: include/ajax/ajax_periode.php:176 include/class/periode.class.php:707
 #: include/class/periode.class.php:709 include/class/periode.class.php:711
-#: include/class/periode.class.php:712
+#: include/class/periode.class.php:712 include/class/periode.class.php:713
 #, fuzzy
 msgid "fermer"
 msgstr "Dicht"
@@ -23910,7 +24313,7 @@ msgstr "Stock Geschiedenis"
 #: include/dossier.inc.php:218 include/modele.inc.php:245
 #: include/dossier.inc.php:221 include/dossier.inc.php:226
 #: include/modele.inc.php:246 include/class/tva_rate_mtable.class.php:47
-#: include/modele.inc.php:247
+#: include/modele.inc.php:247 include/dossier.inc.php:229
 msgid "id"
 msgstr "id"
 
@@ -23930,7 +24333,7 @@ msgstr ""
 #: include/dossier.inc.php:355 include/dossier.inc.php:311
 #: include/dossier.inc.php:334 include/dossier.inc.php:370
 #: include/dossier.inc.php:371 include/dossier.inc.php:387
-#: include/dossier.inc.php:392
+#: include/dossier.inc.php:392 include/dossier.inc.php:396
 msgid "inexistant"
 msgstr "onbestaand"
 
@@ -24084,6 +24487,12 @@ msgstr "het tarief is ongeldig"
 msgid "le taux n'est pas un nombre"
 msgstr "tarief is geen getal"
 
+#: include/lib/message_javascript.php:67
+msgid ""
+"le type vaut : ME pour Menu, PR pour les impressions,PL pour les plugins,SP "
+"pour des valeurs spéciales"
+msgstr ""
+
 #: include/lib/message_javascript.php:64 include/lib/message_javascript.php:66
 msgid ""
 "le type vaut :<ul>\t<li> ME pour Menu</li>\t<li> PR pour les impressions </"
@@ -24149,10 +24558,11 @@ msgid "listing id"
 msgstr "ID-lijst"
 
 #: include/user.inc.php:77 include/user.inc.php:78 include/user.inc.php:80
+#: include/user.inc.php:82
 msgid "login"
 msgstr "login"
 
-#: html/install.php:165
+#: html/install.php:165 html/install.php:169
 #, fuzzy
 msgid "login administrateur"
 msgstr "Beheerder"
@@ -24161,6 +24571,7 @@ msgstr "Beheerder"
 #: html/install.php:413 html/install.php:412 html/install.php:410
 #: html/install.php:416 html/install.php:422 html/install.php:386
 #: html/install.php:353 html/install.php:356 html/install.php:405
+#: html/install.php:411
 msgid "max_execution_time devrait être de 60 minimum"
 msgstr ""
 
@@ -24189,6 +24600,7 @@ msgstr ""
 #: include/ajax/ajax_display_letter.php:69
 #: include/export/export_ledger_csv.php:233
 #: include/template/ledger_detail_bottom.php:231
+#: include/template/ledger_detail_bottom.php:232
 msgid "montant"
 msgstr "bedrag"
 
@@ -24374,6 +24786,7 @@ msgstr "Interne code"
 #: include/class/acc_ledger_search.class.php:699
 #: include/class/acc_ledger_fin.class.php:753
 #: include/class/acc_ledger_search.class.php:785
+#: include/class/acc_ledger_search.class.php:808
 msgid "n° interne"
 msgstr "Intern nr."
 
@@ -24426,6 +24839,7 @@ msgid "op. concernée"
 msgstr "betreft Operatie"
 
 #: html/install.php:370 html/install.php:373 html/install.php:422
+#: html/install.php:428
 msgid "open_basedir empêche certaines fonctions de Noalyss,mettez-le à vide "
 msgstr ""
 
@@ -24567,7 +24981,7 @@ msgstr "Parameter is ongeldig"
 #: include/dossier.inc.php:254 include/dossier.inc.php:251
 #: include/dossier.inc.php:273 include/dossier.inc.php:307
 #: include/dossier.inc.php:308 include/dossier.inc.php:311
-#: include/dossier.inc.php:316
+#: include/dossier.inc.php:316 include/dossier.inc.php:319
 msgid "pas de modèle disponible"
 msgstr "Beschikbaar Geen model"
 
@@ -24586,7 +25000,7 @@ msgstr ""
 #: html/admin/setup.php:375 html/install.php:439 html/install.php:438
 #: html/install.php:436 html/install.php:442 html/install.php:434
 #: html/install.php:440 html/install.php:404 html/install.php:379
-#: html/install.php:382 html/install.php:431
+#: html/install.php:382 html/install.php:431 html/install.php:437
 msgid "php mal configuré "
 msgstr ""
 
@@ -24597,7 +25011,7 @@ msgstr ""
 #: html/admin/setup.php:373 html/install.php:437 html/install.php:436
 #: html/install.php:434 html/install.php:440 html/install.php:432
 #: html/install.php:438 html/install.php:402 html/install.php:377
-#: html/install.php:380 html/install.php:429
+#: html/install.php:380 html/install.php:429 html/install.php:435
 msgid "php.ini est bien configuré "
 msgstr ""
 
@@ -24817,6 +25231,7 @@ msgstr "Verzoening"
 #: include/template/action_search.php:152 include/customer.inc.php:103
 #: include/template/action_search.php:148 scenario/select-box-test.php:62
 #: include/template/action_search.php:161 include/contact.inc.php:99
+#: include/template/action_search.php:163
 msgid "recherche"
 msgstr "Zoeken"
 
@@ -24840,7 +25255,7 @@ msgstr "ref"
 #: html/admin/setup.php:357 html/install.php:421 html/install.php:420
 #: html/install.php:418 html/install.php:424 html/install.php:430
 #: html/install.php:394 html/install.php:361 html/install.php:364
-#: html/install.php:413
+#: html/install.php:413 html/install.php:419
 msgid "register_globals doit être à off"
 msgstr ""
 
@@ -24871,7 +25286,7 @@ msgstr "nieuwe regel"
 #: include/ajax_mod_periode.php:59 include/ajax/ajax_mod_periode.php:59
 #: include/ajax/ajax_periode.php:175 include/class/periode.class.php:706
 #: include/class/periode.class.php:708 include/class/periode.class.php:710
-#: include/class/periode.class.php:711
+#: include/class/periode.class.php:711 include/class/periode.class.php:712
 #, fuzzy
 msgid "sauver"
 msgstr "OPSLAAN"
@@ -24893,6 +25308,7 @@ msgstr ""
 #: html/install.php:611 html/install.php:627 html/install.php:619
 #: html/install.php:625 html/install.php:587 html/install.php:577
 #: html/install.php:583 html/install.php:586 html/install.php:636
+#: html/install.php:642
 msgid ""
 "soit noalyss/contrib/mono-dossier/mono-belge.sql pour la comptabilité belge"
 msgstr ""
@@ -24901,6 +25317,7 @@ msgstr ""
 #: html/install.php:610 html/install.php:626 html/install.php:618
 #: html/install.php:624 html/install.php:586 html/install.php:576
 #: html/install.php:582 html/install.php:585 html/install.php:635
+#: html/install.php:641
 msgid ""
 "soit noalyss/contrib/mono-dossier/mono-france.sql pour la comptabilité "
 "française"
@@ -24910,6 +25327,7 @@ msgstr ""
 #: html/install.php:612 html/install.php:628 html/install.php:620
 #: html/install.php:626 html/install.php:588 html/install.php:578
 #: html/install.php:584 html/install.php:587 html/install.php:637
+#: html/install.php:643
 msgid "soit y restaurer un backup ou un modèle"
 msgstr ""
 
@@ -25029,6 +25447,7 @@ msgstr "this->jr_id is not set of onbekende handeling"
 #: include/class/acc_ledger_search.class.php:946
 #: include/class/acc_ledger_search.class.php:959
 #: include/class/acc_ledger_search.class.php:1048
+#: include/class/acc_ledger_search.class.php:1071
 msgid "tiers"
 msgstr "derde"
 
@@ -25064,6 +25483,7 @@ msgstr "Totaal"
 #: include/export/export_fiche_detail_csv.php:182
 #: include/export/export_fiche_detail_pdf.php:122
 #: include/export/export_poste_detail_pdf.php:138
+#: include/export/export_poste_detail_pdf.php:139
 #, fuzzy
 msgid "totaux"
 msgstr "Totalen"
@@ -25113,7 +25533,7 @@ msgstr "btw"
 #: html/ajax_misc.php:514 html/ajax_misc.php:519 html/ajax_misc.php:520
 #: html/ajax_misc.php:525 html/ajax_misc.php:522 html/ajax_misc.php:527
 #: html/ajax_misc.php:526 html/ajax_misc.php:531 html/ajax_misc.php:491
-#: html/ajax_misc.php:496
+#: html/ajax_misc.php:496 html/ajax_misc.php:499 html/ajax_misc.php:504
 msgid "tva inconnue"
 msgstr "onbekend btw"
 
@@ -25219,6 +25639,7 @@ msgstr "u bevestigt"
 #: include/template/ledger_detail_bottom.php:195
 #: include/template/ledger_detail_bottom.php:192
 #: include/template/ledger_detail_bottom.php:211
+#: include/template/ledger_detail_bottom.php:212
 #, fuzzy
 msgid "vous confirmez?"
 msgstr "u bevestigt"
diff --git a/include/database.item.php b/include/database.item.php
index 1f57311ef..92593cab2 100644
--- a/include/database.item.php
+++ b/include/database.item.php
@@ -122,7 +122,7 @@ $menu[]=_('Liste Suivi');  $desc[]=_('Document de suivi sous forme de liste');$d
 $menu[]=_('Moyen de paiement');  $desc[]=_('Config. des méthodes de paiement');$desc_long[]=_('Configuration des moyens de paiements que vous voulez utiliser dans les journaux de type VEN ou ACH, les moyens de paiement permettent de générer l\'opération de trésorerie en même temps que l\'achat, la note de frais ou la vente');
 $menu[]=_('Administration');  $desc[]=_('Suivi administration, banque');$desc_long[]=_('Suivi des administrations : courrrier, déclarations.');
 $menu[]=_('Prévision');  $desc[]=_('Prévision');$desc_long[]=_('Prévision de vos achats, revenus, permet de suivre l\'évolution de votre société. Vos prévisions sont des formules sur les postes comptables et vous permettent aussi vos marges brutes.');
-$menu[]=_('Export opérations rapprochées');  $desc[]=_('Export opérations rapprochées en CSV');$desc_long[]=_('');
+$menu[]=_('Export opérations rapprochées');  $desc[]=_('Export opérations rapprochées en CSV');$desc_long[]=_('Aucune');
 $menu[]=_('Administrateur');  $desc[]=_('Suivi des gérants, administrateurs et salariés');$desc_long[]=_('Suivi de vos salariés, managers ainsi que des administrateurs, pour les documents et les opérations comptables');
 $menu[]=_('Menu par défaut');  $desc[]=_('Configuration des menus par défaut');$desc_long[]=_('Configuration des menus par défaut, ces menus sont appelés par des actions dans d\'autres menus');
 $menu[]=_('Agenda');  $desc[]=_('Agenda');$desc_long[]=_('Agenda, présentation du suivi sous forme d\'agenda ');
diff --git a/include/lib/message_javascript.php b/include/lib/message_javascript.php
index 0046a6e3d..44d9e0bd6 100644
--- a/include/lib/message_javascript.php
+++ b/include/lib/message_javascript.php
@@ -24,6 +24,7 @@
  * @brief Contains all the javascript messages, this file must be included before
  * the javascript file. The message cannot contains a double quote even when
  * it is escaped !
+ * Avoid use of HTML Tag
  */
 ?>
 <script>
@@ -60,10 +61,10 @@ content[28]="<?php echo escape_xml(_("Attention Différence entre TVA calculée
 content[29]="<?php echo escape_xml(_("Si vous ne donnez pas de nom, ce sera le nom du fichier qui sera utilisé"))?>";
 content[30]="<?php echo escape_xml(_("Peut contenir une information telle que le message structuré sur le virement"))?>";
 content[31]="<?php echo escape_xml(_("Peut contenir un numéro de bon de commande"))?>";
-// Because we are using HTML tag , we cannot escape and we must be careful with quote and double-quote, the best
-// is to avoid them
+
 content[32]=_('Le résultat peut changer en fonction du type de journal');
-content[33]="<?php echo escape_xml(_("le type vaut :<ul>	<li> ME pour Menu</li>	<li> PR pour les impressions </li>	<li> PL pour les plugins</li>	<li> SP pour des valeurs spéciales</li>	</ul>"))?>";
+	
+content[33]="<?php echo escape_xml(_("le type vaut : ME pour Menu, PR pour les impressions,PL pour les plugins,SP pour des valeurs spéciales"))?>";
 content[34]="<?php echo escape_xml(_("Cliquez sur le code AD pour ouvrir le menu dans un nouvel onglet"))?>";
 content[35]="<?php echo escape_xml(_("Cliquez sur le chemin pour ouvrir le menu"))?>";
 content[36]="<?php echo escape_xml(_("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"))?>";

From ea1f3e03058001b23492341e2340dfb7f026d7de Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 13 Nov 2020 09:37:58 +0100
Subject: [PATCH 193/257] Bug : Follow Up returns to list

---
 include/action.inc.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/action.inc.php b/include/action.inc.php
index e27e5f192..93a3c6bf4 100644
--- a/include/action.inc.php
+++ b/include/action.inc.php
@@ -25,7 +25,11 @@ global $g_user;
 $http=new HttpInput();
 
 $retour=HtmlInput::button_anchor(_('Retour liste'),
-	HtmlInput::request_to_string(array("closed_action","remind_date_end","remind_date","sag_ref","only_internal","state","ac","gDossier","qcode","ag_dest_query","action_query","tdoc","date_start","date_end","hsstate","searchtag")),
+	HtmlInput::request_to_string(array("closed_action","remind_date_end","remind_date","sag_ref","only_internal",
+            "state","ac","gDossier","qcode","ag_dest_query","action_query","tdoc","date_start","date_end","hsstate",
+            "searchtag",
+            "closed_action",
+            "tag_option",)),
         "","","smallbutton");
 //-----------------------------------------------------
 // Follow_Up

From 525d04949bdc7b01765893a8e183f87298c85efe Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 13 Nov 2020 12:06:33 +0100
Subject: [PATCH 194/257] fixup! Translate , make failed chrome because of HTML
 in javascript message

---
 html/js/scripts.js                 | 2 +-
 include/lib/message_javascript.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/js/scripts.js b/html/js/scripts.js
index 12aa9bb84..d068eaf04 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -2664,7 +2664,7 @@ function action_tag_remove(p_dossier, ag_id, t_id)
                     {
                         method: 'get', parameters: queryString,
                         onFailure: ajax_misc_failure,
-                        onSuccess: function (req, j) {
+                        onSuccess: function (req) {
                             var answer = req.responseXML;
                             var html = answer.getElementsByTagName('code');
                             if (html.length === 0)
diff --git a/include/lib/message_javascript.php b/include/lib/message_javascript.php
index 44d9e0bd6..6eea94637 100644
--- a/include/lib/message_javascript.php
+++ b/include/lib/message_javascript.php
@@ -62,7 +62,7 @@ content[29]="<?php echo escape_xml(_("Si vous ne donnez pas de nom, ce sera le n
 content[30]="<?php echo escape_xml(_("Peut contenir une information telle que le message structuré sur le virement"))?>";
 content[31]="<?php echo escape_xml(_("Peut contenir un numéro de bon de commande"))?>";
 
-content[32]=_('Le résultat peut changer en fonction du type de journal');
+content[32]="<?php echo _('Le résultat peut changer en fonction du type de journal');?>";
 	
 content[33]="<?php echo escape_xml(_("le type vaut : ME pour Menu, PR pour les impressions,PL pour les plugins,SP pour des valeurs spéciales"))?>";
 content[34]="<?php echo escape_xml(_("Cliquez sur le code AD pour ouvrir le menu dans un nouvel onglet"))?>";

From 4ff9782a1f0c003d8cbc6461ec8a00bdcbfad1ef Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sat, 14 Nov 2020 19:40:03 +0100
Subject: [PATCH 195/257] IText : protect against Quote and Double Quote

---
 include/lib/itext.class.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/lib/itext.class.php b/include/lib/itext.class.php
index e74c23805..fdbd11422 100644
--- a/include/lib/itext.class.php
+++ b/include/lib/itext.class.php
@@ -48,7 +48,6 @@ class IText extends HtmlInput
 
         $t= 'title="'.$this->title.'" ';
         $autofocus=($this->autofocus)?" autofocus ":"";
-        $this->value=str_replace('"','',$this->value);
         $require=($this->require)?"required":"";
         if ( ! isset ($this->css_size))
         {
@@ -58,7 +57,7 @@ class IText extends HtmlInput
                     ',$this->style,
                     $this->id,
                     $this->name,
-                    htmlentities($this->value, ENT_COMPAT, "UTF-8"),
+                    htmlentities($this->value, ENT_COMPAT|ENT_QUOTES, "UTF-8"),
                     $this->placeholder,
                     $this->title,
                     $this->size,
@@ -73,7 +72,7 @@ class IText extends HtmlInput
                     ',$this->style,
                     $this->id,
                     $this->name,
-                    htmlentities($this->value, ENT_COMPAT, "UTF-8"),
+                     htmlentities($this->value, ENT_COMPAT|ENT_QUOTES, "UTF-8"),
                     $this->placeholder,
                     $this->title,
                     $this->css_size,
@@ -98,7 +97,7 @@ class IText extends HtmlInput
         $extra=(isset($this->extra))?$this->extra:"";
 
         $readonly=" readonly ";
-        $this->value=str_replace('"','',$this->value);
+        htmlentities($this->value, ENT_COMPAT|ENT_QUOTES, "UTF-8"),
 		 $this->style=' class="input_text_ro" ';
          if ( ! isset ($this->css_size))
         {

From 16ad836dcebee53f041d0067ba266e59ca13dede Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sun, 15 Nov 2020 13:11:25 +0100
Subject: [PATCH 196/257] Typo

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

diff --git a/include/user_detail.inc.php b/include/user_detail.inc.php
index b39e988d1..c0c72bdb3 100644
--- a/include/user_detail.inc.php
+++ b/include/user_detail.inc.php
@@ -109,7 +109,7 @@ else if ($sbaction == "delete")
             User::remove_inexistant_user($a_dossier[$i]['dos_id']);
     }
     User::audit_admin(sprintf('DELETE USER %s %s',$uid,$auser['use_login']));
-ZZ    echo "<H2 class=\"info\">";
+    echo "<H2 class=\"info\">";
     printf (_("Utilisateur %s %s est effacé"),$http->post('fname'),$http->post('lname')) ;
     echo " </H2>";
     require_once NOALYSS_INCLUDE.'/lib/iselect.class.php';

From 397f11e04a9081450bf74b96dc831f68e1959cb4 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 17 Nov 2020 12:33:50 +0100
Subject: [PATCH 197/257] Bug Securimage : fix if session is expired then $code
 is undefined

---
 html/securimage/securimage.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html/securimage/securimage.php b/html/securimage/securimage.php
index ebabab0fe..6d2860748 100644
--- a/html/securimage/securimage.php
+++ b/html/securimage/securimage.php
@@ -1142,6 +1142,7 @@ class Securimage {
 	 */
 	function validate()
 	{
+            $code='';
 		// retrieve code from session, if no code exists check sqlite database if supported.
 		
 		if (isset($_SESSION['securimage_code_value']) && trim($_SESSION['securimage_code_value']) != '') {

From b03de37d7837d76bdb622a0f75f689a7914e4dec Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 17 Nov 2020 17:24:18 +0100
Subject: [PATCH 198/257] Fix: template doesn't delete LOB files

---
 html/lang/en_US/LC_MESSAGES/messages.po | 4 ++--
 include/modele.inc.php                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/html/lang/en_US/LC_MESSAGES/messages.po b/html/lang/en_US/LC_MESSAGES/messages.po
index e03896d1a..63332d639 100644
--- a/html/lang/en_US/LC_MESSAGES/messages.po
+++ b/html/lang/en_US/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: NOALYSS 672\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-11-12 22:12+0100\n"
-"PO-Revision-Date: 2020-11-13 08:59+0100\n"
+"PO-Revision-Date: 2020-11-16 11:15+0100\n"
 "Last-Translator: dany <danydb@noalyss.eu>\n"
 "Language-Team: French <kde-i18n-doc@kde.org>\n"
 "Language: en_US\n"
@@ -4907,7 +4907,7 @@ msgstr "Start the uprade or the installation"
 #: include/template/detail-action.php:339
 #: include/template/detail-action.php:342
 msgid "Commentaire"
-msgstr "How"
+msgstr "Comment"
 
 #: include/class_fiche_def_ref.php:98 include/class/class_fiche_def_ref.php:98
 #: include/class/fiche_def_ref.class.php:98
diff --git a/include/modele.inc.php b/include/modele.inc.php
index dab6e08e4..65a6dbe93 100644
--- a/include/modele.inc.php
+++ b/include/modele.inc.php
@@ -111,7 +111,7 @@ if (isset($_POST["FMOD_NAME"]))
 	if (Database::num_row($Res) != 0)
 	{
 		$a_lob = Database::fetch_all($Res);
-                $nb_log=($a_lob == FALSE)?0:count($a_lob);
+                $nb_lob=($a_lob == FALSE)?0:count($a_lob);
 		for ($i = 0; $i < $nb_lob; $i++)
 			$cn_mod->lo_unlink($a_lob[$i]['jr_pj']);
 	}

From c939dab5e561646ba56acb747ded701e13c50533 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 19 Nov 2020 11:01:52 +0100
Subject: [PATCH 199/257] CfgPlugin : improve trace

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

diff --git a/include/cfgplugin.inc.php b/include/cfgplugin.inc.php
index e09e60098..6dcb39734 100644
--- a/include/cfgplugin.inc.php
+++ b/include/cfgplugin.inc.php
@@ -83,7 +83,7 @@ if ( isset ($_POST['save_plugin'])){
                 }
                 catch (Exception $exc)
                 {
-                    record_log($exc->getTraceAsString());
+                    record_log($exc->getMessage()." trace:".$exc->getTraceAsString());
                     $profile_name=$cn->get_value('select profile.p_name from profile where p_id=$1'
                             ,array($profile));
                     echo '<p class="notice">';

From a7236046a0b9da403179da65339fcd22a523ecbe Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sun, 22 Nov 2020 17:09:41 +0100
Subject: [PATCH 200/257] IText , remove double-quote

---
 include/lib/itext.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/lib/itext.class.php b/include/lib/itext.class.php
index 9cbafc917..e66bb9031 100644
--- a/include/lib/itext.class.php
+++ b/include/lib/itext.class.php
@@ -46,6 +46,9 @@ class IText extends HtmlInput
         if ( $this->readOnly==true) return $this->display();
 	$this->id=($this->id=="")?$this->name:$this->id;
 
+	// Double quote makes troubles 
+	$this->value=str_replace('"','',$this->value);
+
         $t= 'title="'.$this->title.'" ';
         $autofocus=($this->autofocus)?" autofocus ":"";
         $require=($this->require)?"required":"";

From f1c2929c2b2dc2230de26bad922fc9ec649d50f1 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 10 Dec 2020 15:17:20 +0100
Subject: [PATCH 201/257] Export GL PDF : no row found for an accounting

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

diff --git a/include/export/export_gl_pdf.php b/include/export/export_gl_pdf.php
index 571c5cf5c..880a1c9b2 100644
--- a/include/export/export_gl_pdf.php
+++ b/include/export/export_gl_pdf.php
@@ -101,7 +101,7 @@ foreach ($a_poste as $poste)
 
   $array1=$Poste->get_row_date($from_periode,$to_periode,$l,$s);
   // don't print empty account
-  if ( count($array1[0]) == 0 )
+  if (empty($array1) || count($array1[0]) == 0 )
     {
         continue;
     }

From df45c20cf88778db1b6bd559160ccd8c7e7788e4 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 11 Dec 2020 15:37:30 +0100
Subject: [PATCH 202/257] SQL : improve vw_fiche_attr with index

---
 sql/upgrade.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index e69de29bb..db56945e7 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -0,0 +1,3 @@
+-- improve vw_fiche_attr
+drop index if exists fiche_detail_attr_ix;
+create index fiche_detail_attr_ix on fiche_detail (ad_id);

From 1f458a4f01ece362ef9a175c78472416b99ae70e Mon Sep 17 00:00:00 2001
From: Dany wm De Bontridder <danydb@noalyss.eu>
Date: Tue, 22 Dec 2020 20:32:34 +0100
Subject: [PATCH 203/257] Task #0001869: Session key : clef de session

---
 html/ajax.php                               |  2 +-
 html/do.php                                 |  4 +-
 html/extension.raw.php                      |  2 +-
 html/fid.php                                |  2 +-
 html/install.php                            |  2 +-
 html/login.php                              |  4 +-
 html/popup.php                              |  4 +-
 html/recherche.php                          |  6 +--
 html/user_login.php                         |  2 +-
 include/admin_repo.inc.php                  |  2 +-
 include/ajax/ajax_history.php               |  2 +-
 include/ajax/ajax_ledger.php                |  8 +--
 include/ajax/ajax_navigator.php             |  2 +-
 include/ajax/ajax_preference.php            | 22 ++++----
 include/ajax/ajax_todo_list.php             |  4 +-
 include/class/acc_ledger.class.php          |  8 +--
 include/class/acc_ledger_purchase.class.php |  2 +-
 include/class/acc_ledger_search.class.php   | 10 ++--
 include/class/acc_operation.class.php       |  6 +--
 include/class/anc_operation.class.php       |  2 +-
 include/class/calendar.class.php            |  4 +-
 include/class/contact.class.php             |  2 +-
 include/class/document.class.php            |  2 +-
 include/class/extension.class.php           |  2 +-
 include/class/fiche.class.php               |  4 +-
 include/class/fiche_def.class.php           |  8 +--
 include/class/follow_up.class.php           | 20 ++++----
 include/class/stock.class.php               |  2 +-
 include/class/stock_goods.class.php         |  4 +-
 include/class/todo_list.class.php           |  8 +--
 include/class/user.class.php                | 56 ++++++++++-----------
 include/config.inc.example                  |  4 +-
 include/constant.php                        |  4 +-
 include/extension_choice.inc.php            |  2 +-
 include/fiche.inc.php                       |  2 +-
 include/history_operation.inc.php           |  2 +-
 include/lib/ac_common.php                   | 20 ++++----
 include/lib/icard.class.php                 |  2 +-
 include/lib/idate.class.php                 | 18 ++++---
 include/lib/noalyss_csv.class.php           |  6 +--
 include/lib/user_common.php                 |  6 +--
 include/template/module.php                 |  4 +-
 include/template/todo_list_display.php      |  2 +-
 unit-test/global.example.php                |  6 +--
 unit-test/global.php                        |  6 +--
 45 files changed, 149 insertions(+), 143 deletions(-)

diff --git a/html/ajax.php b/html/ajax.php
index 5bf62668d..4219a4cda 100644
--- a/html/ajax.php
+++ b/html/ajax.php
@@ -56,7 +56,7 @@ if (isset($_REQUEST['plugin_code']) )
     if ( $ext->search($_REQUEST['plugin_code']) != -1)
     {
         /* security */
-        if ( !isset ($_SESSION['g_user']) || $ext->can_request($_SESSION['g_user']) == 0 )
+        if ( !isset ($_SESSION[SESSION_KEY.'g_user']) || $ext->can_request($_SESSION[SESSION_KEY.'g_user']) == 0 )
         {
             exit();
         }
diff --git a/html/do.php b/html/do.php
index 49a2dccea..9a8641286 100644
--- a/html/do.php
+++ b/html/do.php
@@ -42,7 +42,7 @@ if ( ! isset($_REQUEST['gDossier']))
     redirect('user_login.php');
     exit();
 }
-if ( ! isset ($_SESSION['g_theme']))
+if ( ! isset ($_SESSION[SESSION_KEY.'g_theme']))
   {
     echo "<h2>"._('Vous  êtes déconnecté')."</h2>";
     $backurl=$_SERVER['REQUEST_URI'];
@@ -68,7 +68,7 @@ if ( ! $cn->exist_table('version')) {
     return;
 }
 
-$style_user=$http->post("style_user","string",$_SESSION['g_theme']);
+$style_user=$http->post("style_user","string",$_SESSION[SESSION_KEY.'g_theme']);
 
 html_page_start($style_user);
 if ( DEBUG ) {
diff --git a/html/extension.raw.php b/html/extension.raw.php
index d8f8abb72..99a5729dd 100644
--- a/html/extension.raw.php
+++ b/html/extension.raw.php
@@ -45,7 +45,7 @@ $ext=new Extension($cn);
 if ( $ext->search($http->request("plugin_code")) != -1 )
   {
     /* security */
-    if ( !isset ($_SESSION['g_user']) || $ext->can_request($_SESSION['g_user']) == 0 )
+    if ( !isset ($_SESSION[SESSION_KEY.'g_user']) || $ext->can_request($_SESSION[SESSION_KEY.'g_user']) == 0 )
       {
 		exit();
       }
diff --git a/html/fid.php b/html/fid.php
index 2b6c38964..471a08de9 100644
--- a/html/fid.php
+++ b/html/fid.php
@@ -56,7 +56,7 @@ $fTva_id=$hi->request("t","string","none");
 $fPrice_sale=$hi->request("p","string","none");
 $fPrice_purchase=$hi->request("b","string","none");
 
-if ( isset($_SESSION['isValid']) && $_SESSION['isValid'] == 1)
+if ( isset($_SESSION[SESSION_KEY.'isValid']) && $_SESSION[SESSION_KEY.'isValid'] == 1)
 {
     $jrn=$hi->get('j', "number",'-1');
     $d=$hi->get('d',"string", '');
diff --git a/html/install.php b/html/install.php
index 821df7a8c..7e4ff5d8f 100644
--- a/html/install.php
+++ b/html/install.php
@@ -145,7 +145,7 @@ load_all_script();
 echo '<div id="info_div"></div>';
 if ( $_GET['lang'] == "en_US.utf8" || $_GET['lang']=='fr_FR.utf8')
 {
-    $_SESSION['g_lang']=$_GET['lang'];
+    $_SESSION[SESSION_KEY.'g_lang']=$_GET['lang'];
     set_language();
 }
 ?>
diff --git a/html/login.php b/html/login.php
index 089040878..face7be1a 100644
--- a/html/login.php
+++ b/html/login.php
@@ -39,8 +39,8 @@ if (  isset ($_POST["p_user"] ) )
 {
     $g_user=strtolower(sql_string($_POST["p_user"]));
     $g_pass=$_POST["p_pass"];
-    $_SESSION['g_user']=$g_user;
-    $_SESSION['g_pass']=$g_pass;
+    $_SESSION[SESSION_KEY.'g_user']=$g_user;
+    $_SESSION[SESSION_KEY.'g_pass']=$g_pass;
 
 
 
diff --git a/html/popup.php b/html/popup.php
index b985af528..44bfdf57d 100644
--- a/html/popup.php
+++ b/html/popup.php
@@ -32,7 +32,7 @@ $http=new HttpInput();
 /*
  * Check if the user is still connected
  */
-if (  ! isset ($_SESSION['g_user'] ) )
+if (  ! isset ($_SESSION[SESSION_KEY.'g_user'] ) )
 {
     echo "<h2>"._('Vous  êtes déconnecté')."</h2>";
     $backurl=$_SERVER['REQUEST_URI'];
@@ -42,7 +42,7 @@ if (  ! isset ($_SESSION['g_user'] ) )
 }
 
 
-html_page_start($_SESSION['g_theme']);
+html_page_start($_SESSION[SESSION_KEY.'g_theme']);
 echo '<div style="float:left;">';
 ?>
 <script>
diff --git a/html/recherche.php b/html/recherche.php
index aa655ca6e..939256944 100644
--- a/html/recherche.php
+++ b/html/recherche.php
@@ -28,13 +28,13 @@ require_once NOALYSS_INCLUDE.'/class/acc_ledger.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_ledger_search.class.php';
 require_once NOALYSS_INCLUDE.'/lib/icon_action.class.php';
 require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
-if ( ! isset ($_SESSION['g_theme']))
+if ( ! isset ($_SESSION[SESSION_KEY.'g_theme']))
 {
     echo "<h2>"._('Vous  êtes déconnecté')."</h2>";
     die();
 }
 
-html_page_start($_SESSION['g_theme']);
+html_page_start($_SESSION[SESSION_KEY.'g_theme']);
 
 load_all_script();
 
@@ -101,7 +101,7 @@ if ( isset ($_GET['viewsearch']))
 {
 
     // Navigation bar
-    $step=$_SESSION['g_pagesize'];
+    $step=$_SESSION[SESSION_KEY.'g_pagesize'];
     $page=$http->get("page","number",1);
     $offset=$http->get("offset","number",0);
     
diff --git a/html/user_login.php b/html/user_login.php
index 0780af731..0b46a274d 100644
--- a/html/user_login.php
+++ b/html/user_login.php
@@ -29,7 +29,7 @@ require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
 require_once NOALYSS_INCLUDE.'/lib/function_javascript.php';
 require_once NOALYSS_INCLUDE.'/lib/icon_action.class.php';
 
-@html_page_start($_SESSION['g_theme']);
+@html_page_start($_SESSION[SESSION_KEY.'g_theme']);
 $rep=new Database();
 require_once NOALYSS_INCLUDE.'/class/user.class.php';
 $User=new User($rep);
diff --git a/include/admin_repo.inc.php b/include/admin_repo.inc.php
index a18e4ab0e..c20036014 100644
--- a/include/admin_repo.inc.php
+++ b/include/admin_repo.inc.php
@@ -60,7 +60,7 @@ if ( $action== 'backup') {
         require_once NOALYSS_INCLUDE."/backup.inc.php";
         exit();
 }
-html_page_start($_SESSION['g_theme']);
+html_page_start($_SESSION[SESSION_KEY.'g_theme']);
 load_all_script();
 echo '<H2 class="info"> '._('Administration').'</H2>';
 echo '<div class="topmenu">';
diff --git a/include/ajax/ajax_history.php b/include/ajax/ajax_history.php
index ffdb85ae4..2951e102e 100644
--- a/include/ajax/ajax_history.php
+++ b/include/ajax/ajax_history.php
@@ -36,7 +36,7 @@ $div=$http->request('div');
 mb_internal_encoding("UTF-8");
 $http=new HttpInput();
 /**
- *if $_SESSION['g_user'] is not set : echo a warning
+ *if $_SESSION[SESSION_KEY.'g_user'] is not set : echo a warning
  */
 /* security */
 if ( $g_user->check_dossier(dossier::id(),true) == 'X' ) exit();
diff --git a/include/ajax/ajax_ledger.php b/include/ajax/ajax_ledger.php
index 6eb4bcb09..40cd7c486 100644
--- a/include/ajax/ajax_ledger.php
+++ b/include/ajax/ajax_ledger.php
@@ -66,7 +66,7 @@ catch (Exception $exc)
 }
 
 /**
- *if $_SESSION['g_user'] is not set : echo a warning
+ *if $_SESSION[SESSION_KEY.'g_user'] is not set : echo a warning
  */
 
 $cn=Dossier::connect();
@@ -224,7 +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['g_theme']));
+    $theme = $repo->get_value("select the_filestyle from theme where the_name=$1", array($_SESSION[SESSION_KEY.'g_theme']));
     html_min_page_start($theme);
 
     // if there is a receipt document
@@ -317,7 +317,7 @@ case 'loadfile':
 
         echo "<html><head>";
         $repo=new Database();
-        $theme=$repo->get_value("select the_filestyle from theme where the_name=$1",array($_SESSION['g_theme']));
+        $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>";
 		if ( ! isset($_REQUEST['ajax']) ) echo "<body class=\"op_detail_frame\">"; else echo "<body>";
@@ -347,7 +347,7 @@ case 'rmf':
     {
         echo "<html><head>";
         $repo=new Database();
-        $theme=$repo->get_value("select the_filestyle from theme where the_name=$1",array($_SESSION['g_theme']));
+        $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>";
diff --git a/include/ajax/ajax_navigator.php b/include/ajax/ajax_navigator.php
index 757b37039..867c70885 100644
--- a/include/ajax/ajax_navigator.php
+++ b/include/ajax/ajax_navigator.php
@@ -34,7 +34,7 @@ $sql="
     where user_name=$1
     order by 2 ";
 
-$a_menu=$cn->get_array($sql,array($_SESSION['g_user']));
+$a_menu=$cn->get_array($sql,array($_SESSION[SESSION_KEY.'g_user']));
 
 ?>
 <div class="content">
diff --git a/include/ajax/ajax_preference.php b/include/ajax/ajax_preference.php
index f2eea8340..3f7448b60 100644
--- a/include/ajax/ajax_preference.php
+++ b/include/ajax/ajax_preference.php
@@ -59,7 +59,7 @@ if (isset($_REQUEST['gDossier']) && $http->request("gDossier","number",0) != 0 )
     $style->value = $repo->make_array("select the_name,the_name
 	from theme
 	order by the_name");
-    $style->selected =$_SESSION['g_theme'];
+    $style->selected =$_SESSION[SESSION_KEY.'g_theme'];
     
 //----------------------------------------------------------------------------------------------
 // Display the form    
@@ -164,8 +164,8 @@ if ( $action == 'display_form' )
     			    <option value="200">200
     			    <option value="-1"><?php echo _('Illimité');?>
 				    <?php
-				    $label = ($_SESSION['g_pagesize'] == -1) ? _('Illimité') : $_SESSION['g_pagesize'];
-				    echo '<option value="' . $_SESSION['g_pagesize'] . '" selected>' . $label;
+				    $label = ($_SESSION[SESSION_KEY.'g_pagesize'] == -1) ? _('Illimité') : $_SESSION[SESSION_KEY.'g_pagesize'];
+				    echo '<option value="' . $_SESSION[SESSION_KEY.'g_pagesize'] . '" selected>' . $label;
 				    ?>
     			</SELECT>
 
@@ -180,7 +180,7 @@ if ( $action == 'display_form' )
             <legend><?=_("Format Export CSV")?></legend>
             <p>
                 <?php 
-                if ( $_SESSION['csv_fieldsep']==1 && $_SESSION['csv_decimal']==1)
+                if ( $_SESSION[SESSION_KEY.'csv_fieldsep']==1 && $_SESSION[SESSION_KEY.'csv_decimal']==1)
                 {
                  echo_warning(_("N'utilisez pas le même séparateur pour les champs et les décimales"));
                 }
@@ -198,7 +198,7 @@ if ( $action == 'display_form' )
                                 ["label"=>_("Point-virgule"),"value"=>0],
                                 ["label"=>_("virgule"),"value"=>1]
                             ];
-                            $csv_fieldsep->selected=$_SESSION['csv_fieldsep'];
+                            $csv_fieldsep->selected=$_SESSION[SESSION_KEY.'csv_fieldsep'];
                             echo $csv_fieldsep->input();
                         ?>
                     </td>
@@ -214,7 +214,7 @@ if ( $action == 'display_form' )
                                 ["label"=>_("point"),"value"=>0],
                                 ["label"=>_("virgule"),"value"=>1]
                             ];
-                            $csv_decimal->selected=$_SESSION['csv_decimal'];
+                            $csv_decimal->selected=$_SESSION[SESSION_KEY.'csv_decimal'];
                             echo $csv_decimal->input();
                         ?>
                     </td>
@@ -230,7 +230,7 @@ if ( $action == 'display_form' )
                                 ["label"=>_("utf8"),"value"=>'utf8'],
                                 ["label"=>_("latin1"),"value"=>'latin1']
                             ];
-                            $csv_encoding->selected=$_SESSION['csv_encoding'];
+                            $csv_encoding->selected=$_SESSION[SESSION_KEY.'csv_encoding'];
                             echo $csv_encoding->input();
                         ?>
                     </td>
@@ -268,7 +268,7 @@ if ( $action == 'display_form' )
 	for ($i = 0; $i < count($aLang); $i++)
 	{
 	    $sel = "";
-	    if ($aLang[$i][1] == $_SESSION['g_lang'])
+	    if ($aLang[$i][1] == $_SESSION[SESSION_KEY.'g_lang'])
 		$sel = " selected ";
 	    printf('<option value="%s" %s>%s</option>', $aLang[$i][1], $sel, $aLang[$i][0]);
 	}
@@ -324,9 +324,9 @@ if ($action == 'save')
     $g_user->save_global_preference('csv_encoding', $csv_encoding);
     $g_user->save_email($p_email);
     
-    $_SESSION['g_theme']=$style_user;
-    $_SESSION['g_pagesize']=$p_size;
-    $_SESSION['g_lang']=$lang;
+    $_SESSION[SESSION_KEY.'g_theme']=$style_user;
+    $_SESSION[SESSION_KEY.'g_pagesize']=$p_size;
+    $_SESSION[SESSION_KEY.'g_lang']=$lang;
     
     // find the right CSS theme
     $style= $repo->get_value("select the_filestyle from theme
diff --git a/include/ajax/ajax_todo_list.php b/include/ajax/ajax_todo_list.php
index 3b129bbab..0805569dc 100644
--- a/include/ajax/ajax_todo_list.php
+++ b/include/ajax/ajax_todo_list.php
@@ -102,7 +102,7 @@ if ($ac == 'save')
     if ($id <> 0 ) { $todo->load(); }
     else
     {
-        $todo->set_parameter("owner", $_SESSION['g_user']);
+        $todo->set_parameter("owner", $_SESSION[SESSION_KEY.'g_user']);
     }
     
     $todo->set_parameter("date",$http->post("p_date_todo","string", ""));
@@ -111,7 +111,7 @@ if ($ac == 'save')
     $todo->set_is_public($http->post("p_public", "string","N"));
     
     ob_start();
-    if ( $todo->get_parameter('owner') == $_SESSION['g_user'] ) $todo->save();
+    if ( $todo->get_parameter('owner') == $_SESSION[SESSION_KEY.'g_user'] ) $todo->save();
     ob_end_clean();
     $dom=new DOMDocument('1.0','UTF-8');
     
diff --git a/include/class/acc_ledger.class.php b/include/class/acc_ledger.class.php
index 003513bc2..995423a5f 100644
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@ -2016,8 +2016,8 @@ class Acc_Ledger  extends jrn_def_sql
             echo Acc_Reconciliation::$javascript;
             html_page_start();
             $cn=Dossier::connect();
-            $_SESSION['g_user']=NOALYSS_ADMINISTRATOR;
-            $_SESSION['g_pass']='phpcompta';
+            $_SESSION[SESSION_KEY.'g_user']=NOALYSS_ADMINISTRATOR;
+            $_SESSION[SESSION_KEY.'g_pass']='phpcompta';
 
             $id=(isset($_REQUEST['p_jrn']))?$_REQUEST['p_jrn']:-1;
             $a=new Acc_Ledger($cn, $id);
@@ -2109,8 +2109,8 @@ class Acc_Ledger  extends jrn_def_sql
             html_page_start();
             $cn=Dossier::connect();
             $ledger=new Acc_Ledger($cn, 0);
-            $_SESSION['g_user']=NOALYSS_ADMINISTRATOR;
-            $_SESSION['g_pass']='phpcompta';
+            $_SESSION[SESSION_KEY.'g_user']=NOALYSS_ADMINISTRATOR;
+            $_SESSION[SESSION_KEY.'g_pass']='phpcompta';
             echo $ledger->search_form('ALL');
         }
         ///////////////////////////////////////////////////////////////////////////
diff --git a/include/class/acc_ledger_purchase.class.php b/include/class/acc_ledger_purchase.class.php
index 241744697..39f3c5549 100644
--- a/include/class/acc_ledger_purchase.class.php
+++ b/include/class/acc_ledger_purchase.class.php
@@ -1788,7 +1788,7 @@ EOF;
         // Show list of unpaid sell
         // Date - date of payment - Customer - amount
         // Nav. bar
-        $step=$_SESSION['g_pagesize'];
+        $step=$_SESSION[SESSION_KEY.'g_pagesize'];
         $page=(isset($_GET['offset']))?$_GET['page']:1;
         $offset=(isset($_GET['offset']))?$_GET['offset']:0;
 
diff --git a/include/class/acc_ledger_search.class.php b/include/class/acc_ledger_search.class.php
index 4989f61e6..b435c8dc3 100644
--- a/include/class/acc_ledger_search.class.php
+++ b/include/class/acc_ledger_search.class.php
@@ -639,7 +639,7 @@ class Acc_Ledger_Search
             
             $fil_sec=$and." jr_def_id in ( select uj_jrn_id ".
                     " from user_sec_jrn where ".
-                    " uj_login='".sql_string($_SESSION['g_user'])."'".
+                    " uj_login='".sql_string($_SESSION[SESSION_KEY.'g_user'])."'".
                     " and uj_priv in ('R','W'))";
         }
         $where=$fil_ledger.$fil_amount.$fil_date.$fil_desc.$fil_sec.$fil_amount.
@@ -712,7 +712,7 @@ class Acc_Ledger_Search
       // Count nb of line
       $max_line=$cn->count_sql($sql);
 
-      $step=$_SESSION['g_pagesize'];
+      $step=$_SESSION[SESSION_KEY.'g_pagesize'];
       $page=(isset($_GET['offset']))?$_GET['page']:1;
       $offset=(isset($_GET['offset']))?$_GET['offset']:0;
       // create the nav. bar
@@ -738,8 +738,8 @@ class Acc_Ledger_Search
         $gDossier=dossier::id();
         $amount_paid=0.0;
         $amount_unpaid=0.0;
-        $limit=($_SESSION['g_pagesize']!=-1)?" LIMIT ".$_SESSION['g_pagesize']:"";
-        $offset=($_SESSION['g_pagesize']!=-1)?" OFFSET ".Database::escape_string($offset):"";
+        $limit=($_SESSION[SESSION_KEY.'g_pagesize']!=-1)?" LIMIT ".$_SESSION[SESSION_KEY.'g_pagesize']:"";
+        $offset=($_SESSION[SESSION_KEY.'g_pagesize']!=-1)?" OFFSET ".Database::escape_string($offset):"";
         $order="  order by jr_date_order asc,jr_internal asc";
         // Sort
         $url="?".CleanUrl();
@@ -1011,7 +1011,7 @@ class Acc_Ledger_Search
       // Count nb of line
       $max_line=$this->cn->count_sql($sql);
 
-      $step=$_SESSION['g_pagesize'];
+      $step=$_SESSION[SESSION_KEY.'g_pagesize'];
       $page=(isset($_GET['offset']))?$_GET['page']:1;
       $offset=(isset($_GET['offset']))?$_GET['offset']:0;
       // create the nav. bar
diff --git a/include/class/acc_operation.class.php b/include/class/acc_operation.class.php
index 06946c760..fd30cf612 100644
--- a/include/class/acc_operation.class.php
+++ b/include/class/acc_operation.class.php
@@ -56,7 +56,7 @@ class Acc_Operation
         global $g_user;
         $this->db=$p_cn;
         $this->qcode="";
-        $this->user=$_SESSION['g_user'];
+        $this->user=$_SESSION[SESSION_KEY.'g_user'];
         $this->periode=$g_user->get_periode();
         $this->jr_id=0;
         $this->jr_optype="NOR";
@@ -700,8 +700,8 @@ class Acc_Operation
     }
     static function test_me()
     {
-        $_SESSION['g_user']=NOALYSS_ADMINISTRATOR;
-        $_SESSION['g_pass']='dany';
+        $_SESSION[SESSION_KEY.'g_user']=NOALYSS_ADMINISTRATOR;
+        $_SESSION[SESSION_KEY.'g_pass']='dany';
         global $g_user;
         $cn=Dossier::connect();
         $g_user=new User($cn);
diff --git a/include/class/anc_operation.class.php b/include/class/anc_operation.class.php
index f8c2ea835..35b8f4e78 100644
--- a/include/class/anc_operation.class.php
+++ b/include/class/anc_operation.class.php
@@ -274,7 +274,7 @@ class Anc_Operation
             return _("Pas d'enregistrement trouvé");
 
         // navigation_bar
-        $step=$_SESSION['g_pagesize'];
+        $step=$_SESSION[SESSION_KEY.'g_pagesize'];
         $page=(isset($_GET['offset']))?$_GET['page']:1;
         $offset=(isset($_GET['offset']))?$_GET['offset']:0;
         $bar=navigation_bar($offset+1,count($array),$step,$page);
diff --git a/include/class/calendar.class.php b/include/class/calendar.class.php
index 643e5e2ea..58aa9e149 100644
--- a/include/class/calendar.class.php
+++ b/include/class/calendar.class.php
@@ -129,7 +129,7 @@ class Calendar
                  " to_char(tl_date,'MM')::integer=$1 ".
                  " and to_char(tl_date,'YYYY')::integer=$2 ".
                  " and use_login=$3 group by to_char(tl_date,'DD')::integer ";
-            $array=$cn->get_array($sql,array($this->month,$this->year,$_SESSION['g_user']));
+            $array=$cn->get_array($sql,array($this->month,$this->year,$_SESSION[SESSION_KEY.'g_user']));
             for ($i=0;$i<count($array);$i++)
             {
                 $ind=$array[$i]['tl_date_day'];
@@ -143,7 +143,7 @@ class Calendar
                  " to_char(tl_date,'MM')::integer=$1 ".
                  " and to_char(tl_date,'YYYY')::integer=$2 ".
                  " and use_login=$3  ";
-            $array=$cn->get_array($sql,array($this->month,$this->year,$_SESSION['g_user']));
+            $array=$cn->get_array($sql,array($this->month,$this->year,$_SESSION[SESSION_KEY.'g_user']));
             for ($i=0;$i<count($array);$i++)
             {
                 $ind=$array[$i]['tl_date_day'];
diff --git a/include/class/contact.class.php b/include/class/contact.class.php
index 39bf44953..9efb99340 100644
--- a/include/class/contact.class.php
+++ b/include/class/contact.class.php
@@ -63,7 +63,7 @@ class contact extends Fiche
         // Get offset and page variable
         $offset=( isset ($_REQUEST['offset'] )) ?$_REQUEST['offset']:0;
         $page=(isset($_REQUEST['page']))?$_REQUEST['page']:1;
-        $bar=navigation_bar($offset,$all_contact,$_SESSION['g_pagesize'],$page);
+        $bar=navigation_bar($offset,$all_contact,$_SESSION[SESSION_KEY.'g_pagesize'],$page);
         // set a filter ?
         $search="";
         if ( trim($p_search) != "" )
diff --git a/include/class/document.class.php b/include/class/document.class.php
index d7b7f8789..e75d09051 100644
--- a/include/class/document.class.php
+++ b/include/class/document.class.php
@@ -822,7 +822,7 @@ class Document
             break;
 
         case 'USER' :
-            return $_SESSION['use_name'].', '.$_SESSION['use_first_name'];
+            return $_SESSION[SESSION_KEY.'use_name'].', '.$_SESSION[SESSION_KEY.'use_first_name'];
 
             break;
         case 'REFERENCE':
diff --git a/include/class/extension.class.php b/include/class/extension.class.php
index 1b321fe60..31961e436 100644
--- a/include/class/extension.class.php
+++ b/include/class/extension.class.php
@@ -97,7 +97,7 @@ class Extension extends Menu_Ref_sql
                 " menu_ref join profile_menu using (me_code)
 				 join profile_user using (p_id) where ".
                 " user_name=$1 and me_type='PL' ORDER BY ME_MENU";
-        $a=$cn->get_array($sql, array($_SESSION['g_user']));
+        $a=$cn->get_array($sql, array($_SESSION[SESSION_KEY.'g_user']));
         return $a;
     }
 
diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index 5bbd6fe9f..631e24c51 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -303,7 +303,7 @@ class Fiche
         }
         else
         {
-            $limit=($_SESSION['g_pagesize']!=-1)?"limit ".$_SESSION['g_pagesize']:"";
+            $limit=($_SESSION[SESSION_KEY.'g_pagesize']!=-1)?"limit ".$_SESSION[SESSION_KEY.'g_pagesize']:"";
             $sql="select *
                  from
                  fiche join fiche_Def using (fd_id) join vw_fiche_name using(f_id)
@@ -1776,7 +1776,7 @@ class Fiche
         // Get offset and page variable
         $offset=( isset ($_REQUEST['offset'] )) ?$_REQUEST['offset']:0;
         $page=(isset($_REQUEST['page']))?$_REQUEST['page']:1;
-        $bar=navigation_bar($offset,$all_tiers,$_SESSION['g_pagesize'],$page);
+        $bar=navigation_bar($offset,$all_tiers,$_SESSION[SESSION_KEY.'g_pagesize'],$page);
 
         // set a filter ?
         $search=$p_sql;
diff --git a/include/class/fiche_def.class.php b/include/class/fiche_def.class.php
index a06ee60f6..ddae639a1 100644
--- a/include/class/fiche_def.class.php
+++ b/include/class/fiche_def.class.php
@@ -324,10 +324,10 @@ $order
              where ad_id=1 and fd_id=$1 order by 2";
 
         // we use navigation_bar
-        if ($step == 1  && $_SESSION['g_pagesize'] != -1   )
+        if ($step == 1  && $_SESSION[SESSION_KEY.'g_pagesize'] != -1   )
         {
             $offset=(isset($_GET['offset']))?$_GET['offset']:0;
-            $step=$_SESSION['g_pagesize'];
+            $step=$_SESSION[SESSION_KEY.'g_pagesize'];
             $sql.=" offset $offset limit $step";
         }
 
@@ -370,7 +370,7 @@ $order
         $this->get();
         echo '<H2 class="info">'.$this->id." ".$this->label.'</H2>';
 
-        $step=$_SESSION['g_pagesize'];
+        $step=$_SESSION[SESSION_KEY.'g_pagesize'];
         $sql_limit="";
         $sql_offset="";
         $bar="";
@@ -398,7 +398,7 @@ $order
         $str="";
         // save the url
         // with offet &offset=15&step=15&page=2&size=15
-        if ( $_SESSION['g_pagesize'] != -1)
+        if ( $_SESSION[SESSION_KEY.'g_pagesize'] != -1)
         {
             $str=sprintf("&offset=%s&step=%s&page=%s&size=%s",
                          $offset,
diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 9c78f7115..7a57316ee 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -577,7 +577,7 @@ class Follow_Up
             $this->ag_dest, /* 7 */
             $this->ag_hour, /* 8 */
             $this->ag_priority, /* 9 */
-            $_SESSION['g_user'], /* 10 */
+            $_SESSION[SESSION_KEY.'g_user'], /* 10 */
             $contact->id, /* 11 */
             $this->ag_state, /* 12 */
             $this->ag_remind_date /* 13 */
@@ -602,12 +602,12 @@ class Follow_Up
         if (trim($this->ag_comment)!='' && Document_Option::can_add_comment($this->ag_id))
         {
             $this->db->exec_sql("insert into action_gestion_comment (ag_id,tech_user,agc_comment) values ($1,$2,$3)"
-                , array($this->ag_id, $_SESSION['g_user'], $this->ag_comment));
+                , array($this->ag_id, $_SESSION[SESSION_KEY.'g_user'], $this->ag_comment));
         }
         if (trim($this->ag_description)!='' && Document_Option::can_add_comment($this->ag_id))
         {
             $this->db->exec_sql("insert into action_gestion_comment (ag_id,tech_user,agc_comment) values ($1,$2,$3)"
-                , array($this->ag_id, $_SESSION['g_user'], $this->ag_description));
+                , array($this->ag_id, $_SESSION[SESSION_KEY.'g_user'], $this->ag_description));
         }
         $this->insert_operation();
         $this->insert_action();
@@ -672,7 +672,7 @@ class Follow_Up
                 join document_state on (ag_state=s_id)
              where $p_filter_doc $p_search $sort";
         $max_line=$this->db->count_sql($sql);
-        $step=$_SESSION['g_pagesize'];
+        $step=$_SESSION[SESSION_KEY.'g_pagesize'];
         $page=(isset($_GET['offset']))?$_GET['page']:1;
         $offset=(isset($_GET['offset']))?Database::escape_string($_GET['offset']):0;
         if ($step!=-1)
@@ -925,12 +925,12 @@ class Follow_Up
         if (trim($this->ag_comment)!='')
         {
             $this->db->exec_sql("insert into action_gestion_comment (ag_id,tech_user,agc_comment) values ($1,$2,$3)"
-                    , array($this->ag_id, $_SESSION['g_user'], $this->ag_comment));
+                    , array($this->ag_id, $_SESSION[SESSION_KEY.'g_user'], $this->ag_comment));
         }
         if (trim($this->ag_description)!='')
         {
             $this->db->exec_sql("insert into action_gestion_comment (ag_id,tech_user,agc_comment) values ($1,$2,$3)"
-                    , array($this->ag_id, $_SESSION['g_user'], $this->ag_description));
+                    , array($this->ag_id, $_SESSION[SESSION_KEY.'g_user'], $this->ag_description));
         }
         $this->insert_operation();
         $this->insert_action();
@@ -1355,11 +1355,11 @@ class Follow_Up
         {
             $action_query.= " and ((ag_dest = ".sql_string($p_array['ag_dest_query'])." and ".self::sql_security_filter($cn, "R").") or ".
                     "(ag_dest = ".sql_string($p_array['ag_dest_query'])." and ".self::sql_security_filter($cn, "R")." and ".
-                    " ag_owner='".$_SESSION['g_user']."'))";
+                    " ag_owner='".$_SESSION[SESSION_KEY.'g_user']."'))";
         }
         else
         {
-            $action_query .=" and (ag_owner='".$_SESSION['g_user']."' or ".self::sql_security_filter($cn, "R")." or ag_dest=-1 )";
+            $action_query .=" and (ag_owner='".$_SESSION[SESSION_KEY.'g_user']."' or ".self::sql_security_filter($cn, "R")." or ag_dest=-1 )";
         }
 
 
@@ -1744,7 +1744,7 @@ class Follow_Up
             $ag_ref, /* 6 */
             $this->ag_dest, /* 7 */
             $this->ag_priority, /* 8 */
-            $_SESSION['g_user'], /* 9 */
+            $_SESSION[SESSION_KEY.'g_user'], /* 9 */
             $this->ag_state, /* 10 */
             $this->ag_remind_date, /* 11 */
             $this->ag_hour /* 12 */
@@ -1754,7 +1754,7 @@ class Follow_Up
         if (trim($this->ag_comment)!='')
         {
             $this->db->exec_sql("insert into action_gestion_comment (ag_id,tech_user,agc_comment) values ($1,$2,$3)"
-                    , array($this->ag_id, $_SESSION['g_user'], $this->ag_comment));
+                    , array($this->ag_id, $_SESSION[SESSION_KEY.'g_user'], $this->ag_comment));
         }
     }
     /**
diff --git a/include/class/stock.class.php b/include/class/stock.class.php
index dcd58ad16..e4ceb8df6 100644
--- a/include/class/stock.class.php
+++ b/include/class/stock.class.php
@@ -55,7 +55,7 @@ class Stock extends Stock_Sql
 		$order = (isset($p_array['ord'])) ? $p_array['ord'] : 'da';
 
 		$sql.=$tb->get_sql_order($order);
-		$step = $_SESSION['g_pagesize'];
+		$step = $_SESSION[SESSION_KEY.'g_pagesize'];
 		$page = (isset($_GET['offset'])) ? $_GET['page'] : 1;
 		$offset = (isset($_GET['offset'])) ? $_GET['offset'] : 0;
 
diff --git a/include/class/stock_goods.class.php b/include/class/stock_goods.class.php
index 8ffd0b453..899eecf79 100644
--- a/include/class/stock_goods.class.php
+++ b/include/class/stock_goods.class.php
@@ -126,7 +126,7 @@ class Stock_Goods extends Stock_Goods_Sql
 			$ch->setp("c_comment", $p_array['p_motif']);
 			$ch->setp("r_id", $p_array['p_depot']);
 			$ch->setp("c_date", $p_array['p_date']);
-			$ch->setp('tech_user', $_SESSION['g_user']);
+			$ch->setp('tech_user', $_SESSION[SESSION_KEY.'g_user']);
 			$ch->insert();
 			$per = new Periode($cn);
 			$periode = $per->find_periode($p_array['p_date']);
@@ -154,7 +154,7 @@ class Stock_Goods extends Stock_Goods_Sql
 					$a->sg_quantity = abs($p_array['sg_quantity' . $i]);
 					$a->sg_type = ($p_array['sg_quantity' . $i] > 0) ? 'd' : 'c';
 					$a->sg_comment = $p_array['p_motif'];
-					$a->tech_user = $_SESSION['g_user'];
+					$a->tech_user = $_SESSION[SESSION_KEY.'g_user'];
 					$a->r_id = $p_array['p_depot'];
 					$a->sg_exercice = $exercice;
 					$a->c_id = $ch->c_id;
diff --git a/include/class/todo_list.class.php b/include/class/todo_list.class.php
index e759a3adb..d42747ea7 100644
--- a/include/class/todo_list.class.php
+++ b/include/class/todo_list.class.php
@@ -57,7 +57,7 @@ class Todo_List
         $this->cn=$p_init;
         $this->tl_id=0;
         $this->tl_desc="";
-        $this->use_login=$_SESSION['g_user'];
+        $this->use_login=$_SESSION[SESSION_KEY.'g_user'];
         $this->is_public="N";
 
     }
@@ -228,7 +228,7 @@ class Todo_List
     public function delete()
     {
         global $g_user;
-        if ( $this->use_login != $_SESSION['g_user'] && $g_user->check_action(SHARENOTEREMOVE)==0) return;
+        if ( $this->use_login != $_SESSION[SESSION_KEY.'g_user'] && $g_user->check_action(SHARENOTEREMOVE)==0) return;
         
         $sql="delete from todo_list_shared where todo_list_id=$1 ";
         $res=$this->cn->exec_sql($sql,array($this->tl_id));
@@ -329,11 +329,11 @@ class Todo_List
       htmlspecialchars($this->tl_title).
       '</a>'.
        '</td>';
-        if ( $this->is_public == 'Y' && $this->use_login != $_SESSION['g_user'] )
+        if ( $this->is_public == 'Y' && $this->use_login != $_SESSION[SESSION_KEY.'g_user'] )
         { // This is a public note, cannot be removed
             $r.= '<td></td>';
         }
-        elseif ($this->use_login == $_SESSION['g_user'] )
+        elseif ($this->use_login == $_SESSION[SESSION_KEY.'g_user'] )
         {
             // This a note the user owns
             $r.=  '<td>'.
diff --git a/include/class/user.class.php b/include/class/user.class.php
index 7ea928d27..2190bb048 100644
--- a/include/class/user.class.php
+++ b/include/class/user.class.php
@@ -53,28 +53,28 @@ class User
 		// if p_id is not set then check the connected user
 		if ($p_id == -1)
 		{
-			if (!isset($_SESSION['g_user']))
+			if (!isset($_SESSION[SESSION_KEY.'g_user']))
 			{
 				echo '<h2 class="error">' . _('Session expirée<br>Utilisateur déconnecté') . '</h2>';
 				redirect('index.php', 1);
 				exit();
 			}
 
-			$this->login =strtolower($_SESSION['g_user']);
-			$this->pass = $_SESSION['g_pass'];
-			$this->lang = (isset($_SESSION['g_lang'])) ? $_SESSION['g_lang'] : 'fr_FR.utf8';
-			$this->valid = (isset($_SESSION['isValid'])) ? 1 : 0;
+			$this->login =strtolower($_SESSION[SESSION_KEY.'g_user']);
+			$this->pass = $_SESSION[SESSION_KEY.'g_pass'];
+			$this->lang = (isset($_SESSION[SESSION_KEY.'g_lang'])) ? $_SESSION[SESSION_KEY.'g_lang'] : 'fr_FR.utf8';
+			$this->valid = (isset($_SESSION[SESSION_KEY.'isValid'])) ? 1 : 0;
 			$this->db = $p_cn;
 			$this->id = -1;
-			if (isset($_SESSION['g_theme']))
-				$this->theme = $_SESSION['g_theme'];
+			if (isset($_SESSION[SESSION_KEY.'g_theme']))
+				$this->theme = $_SESSION[SESSION_KEY.'g_theme'];
 
-			$this->admin = ( isset($_SESSION['use_admin']) ) ? $_SESSION['use_admin'] : 0;
+			$this->admin = ( isset($_SESSION[SESSION_KEY.'use_admin']) ) ? $_SESSION[SESSION_KEY.'use_admin'] : 0;
 
-			if (isset($_SESSION['use_name']))
-				$this->name = $_SESSION['use_name'];
-			if (isset($_SESSION['use_first_name']))
-				$this->first_name = $_SESSION['use_first_name'];
+			if (isset($_SESSION[SESSION_KEY.'use_name']))
+				$this->name = $_SESSION[SESSION_KEY.'use_name'];
+			if (isset($_SESSION[SESSION_KEY.'use_first_name']))
+				$this->first_name = $_SESSION[SESSION_KEY.'use_first_name'];
 			$this->load();
 		}
 		else // if p_id is set get data of another user
@@ -176,21 +176,21 @@ class User
 		if ($res > 0)
 		{
 			$r = Database::fetch_array($ret, 0);
-			$_SESSION['use_admin'] = $r['use_admin'];
-			$_SESSION['use_name'] = $r['use_name'];
-			$_SESSION['use_first_name'] = $r['use_first_name'];
-			$_SESSION['isValid'] = 1;
+			$_SESSION[SESSION_KEY.'use_admin'] = $r['use_admin'];
+			$_SESSION[SESSION_KEY.'use_name'] = $r['use_name'];
+			$_SESSION[SESSION_KEY.'use_first_name'] = $r['use_first_name'];
+			$_SESSION[SESSION_KEY.'isValid'] = 1;
 
-			$this->admin = $_SESSION['use_admin'];
-			$this->name = $_SESSION['use_name'];
-			$this->first_name = $_SESSION['use_first_name'];
+			$this->admin = $_SESSION[SESSION_KEY.'use_admin'];
+			$this->name = $_SESSION[SESSION_KEY.'use_name'];
+			$this->first_name = $_SESSION[SESSION_KEY.'use_first_name'];
 			$this->load_global_pref();
 		}
 		$sql = "insert into audit_connect (ac_user,ac_ip,ac_module,ac_url,ac_state) values ($1,$2,$3,$4,$5)";
 
 		if ($res == 0)
 		{
-			$cn->exec_sql($sql, array($_SESSION['g_user'], $_SERVER["REMOTE_ADDR"], $from, $_SERVER['REQUEST_URI'], 'FAIL'));
+			$cn->exec_sql($sql, array($_SESSION[SESSION_KEY.'g_user'], $_SERVER["REMOTE_ADDR"], $from, $_SERVER['REQUEST_URI'], 'FAIL'));
 			if (!$silent)
 			{
 				echo '<script> alert(\''._('Utilisateur ou mot de passe incorrect').'\')</script>';
@@ -203,7 +203,7 @@ class User
 		else
 		{
 			if ($from == 'LOGIN')
-				$cn->exec_sql($sql, array($_SESSION['g_user'], $_SERVER["REMOTE_ADDR"], $from, $_SERVER['REQUEST_URI'], 'SUCCESS'));
+				$cn->exec_sql($sql, array($_SESSION[SESSION_KEY.'g_user'], $_SERVER["REMOTE_ADDR"], $from, $_SERVER['REQUEST_URI'], 'SUCCESS'));
 			$this->valid = 1;
 		}
 
@@ -597,7 +597,7 @@ class User
 			{
 				$cn = new Database();
 				$sql = "insert into audit_connect (ac_user,ac_ip,ac_module,ac_url,ac_state) values ($1,$2,$3,$4,$5)";
-				$cn->exec_sql($sql, array($_SESSION['g_user'], $_SERVER["REMOTE_ADDR"], $p_action_id, $_SERVER['REQUEST_URI'], 'FAIL'));
+				$cn->exec_sql($sql, array($_SESSION[SESSION_KEY.'g_user'], $_SERVER["REMOTE_ADDR"], $p_action_id, $_SERVER['REQUEST_URI'], 'FAIL'));
 			}
 			return 0;
 		}
@@ -654,7 +654,7 @@ class User
 				$this->load_global_pref();
 				return;
 			}
-			$_SESSION[$name] = $line[$parameter];
+			$_SESSION[SESSION_KEY.$name] = $line[$parameter];
 		}
 	}
 
@@ -1094,7 +1094,7 @@ class User
 		$sql = "insert into audit_connect (ac_user,ac_ip,ac_module,ac_url,ac_state) values ($1,$2,$3,$4,$5)";
 
 		$cn->exec_sql($sql, array(
-			$_SESSION['g_user'],
+			$_SESSION[SESSION_KEY.'g_user'],
 			$_SERVER["REMOTE_ADDR"],
 			$p_module,
 			$_SERVER['REQUEST_URI'],
@@ -1115,7 +1115,7 @@ class User
 			$sql = "insert into audit_connect (ac_user,ac_ip,ac_module,ac_url,ac_state) values ($1,$2,$3,$4,$5)";
 
 			$cn->exec_sql($sql, array(
-				$_SESSION['g_user'],
+				$_SESSION[SESSION_KEY.'g_user'],
 				$_SERVER["REMOTE_ADDR"],
 				$p_module,
 				$_SERVER['REQUEST_URI'],
@@ -1293,8 +1293,8 @@ class User
         if ($p_pass1 == $p_pass2) {
             $repo = new Database();
             $l_pass = md5($_POST['pass_1']);
-            $repo->exec_sql("update ac_users set use_pass=$1 where use_login=$2", array($l_pass, $_SESSION['g_user']));
-            $_SESSION['g_pass'] = $_POST['pass_1'];
+            $repo->exec_sql("update ac_users set use_pass=$1 where use_login=$2", array($l_pass, $_SESSION[SESSION_KEY.'g_user']));
+            $_SESSION[SESSION_KEY.'g_pass'] = $_POST['pass_1'];
         } else {
             alert(_("Les mots de passe ne correspondent pas. Mot de passe inchangé"));
         }
@@ -1306,7 +1306,7 @@ class User
     function save_email($p_email)
     {
         $repo=new Database();
-        $repo->exec_sql("update ac_users set use_email=$1 where use_login=$2", array($p_email, $_SESSION['g_user']));
+        $repo->exec_sql("update ac_users set use_email=$1 where use_login=$2", array($p_email, $_SESSION[SESSION_KEY.'g_user']));
     }
     /**
      * Remove a user and all his privileges
diff --git a/include/config.inc.example b/include/config.inc.example
index 65650be22..e1be7d1be 100644
--- a/include/config.inc.example
+++ b/include/config.inc.example
@@ -69,4 +69,6 @@ define ("dbname","");
 // In recent distribution linux, pdftk is a snap, you should set the path
 // for exporting document in PDF
 // $pdftk = /usr/bin/pdftk 
-// $pdftk = /snap/bin/pdftk 
+// $pdftk = /snap/bin/pdftk
+// Define a random session key if you work with different version of NOALYSS
+// define ('SESSION_KEY','abcde');
diff --git a/include/constant.php b/include/constant.php
index 5aa3a4da6..feaf0812c 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -51,7 +51,9 @@ if ( !defined("FIX_BROKEN_PDF")) define ("FIX_BROKEN_PDF",'NO');
 if ( !defined('NOALYSS_ADMINISTRATOR')) {
     define ('NOALYSS_ADMINISTRATOR','phpcompta');
 }
-
+if (!defined ("SESSION_KEY")) {
+    define ("SESSION_KEY","RtYu0uu");
+}
 require_once NOALYSS_INCLUDE.'/constant.security.php';
 
 if ( strpos($inc_path,";") != 0 ) {
diff --git a/include/extension_choice.inc.php b/include/extension_choice.inc.php
index afca41139..ba5a2484e 100644
--- a/include/extension_choice.inc.php
+++ b/include/extension_choice.inc.php
@@ -14,7 +14,7 @@ require_once NOALYSS_INCLUDE.'/lib/iselect.class.php';
 require_once  NOALYSS_INCLUDE.'/constant.security.php';
 require_once  NOALYSS_INCLUDE.'/class/user.class.php';
 echo '<div class="topmenu">';
-@html_page_start($_SESSION['g_theme']);
+@html_page_start($_SESSION[SESSION_KEY.'g_theme']);
 
 $cn=Dossier::connect();
 global $g_user;
diff --git a/include/fiche.inc.php b/include/fiche.inc.php
index 91fa20bdb..39f118988 100644
--- a/include/fiche.inc.php
+++ b/include/fiche.inc.php
@@ -206,7 +206,7 @@ if ($histo->selected   == -1)
 	// Create nav bar
 	$max = $cn->get_value("select count(*) from fiche as f " . $cond);
 
-	$step = $_SESSION['g_pagesize'];
+	$step = $_SESSION[SESSION_KEY.'g_pagesize'];
 	$page = (isset($_GET['offset'])) ? $_GET['page'] : 1;
 	$offset = (isset($_GET['offset'])) ? $_GET['offset'] : 0;
 	$bar = navigation_bar($offset, $max, $step, $page);
diff --git a/include/history_operation.inc.php b/include/history_operation.inc.php
index d61658e67..ed6f5168b 100644
--- a/include/history_operation.inc.php
+++ b/include/history_operation.inc.php
@@ -107,7 +107,7 @@ else
 list($sql, $where) = $Ledger->build_search_sql($p_array);
 $max_line = $cn->count_sql($sql);
 
-$step = $_SESSION['g_pagesize'];
+$step = $_SESSION[SESSION_KEY.'g_pagesize'];
 $page = (isset($_GET['offset'])) ? $http->get('page') : 1;
 $offset = (isset($_GET['offset'])) ? $http->get('offset') : 0;
 
diff --git a/include/lib/ac_common.php b/include/lib/ac_common.php
index c6c30e7d1..71e85fba2 100644
--- a/include/lib/ac_common.php
+++ b/include/lib/ac_common.php
@@ -344,11 +344,11 @@ function html_page_start($p_theme="", $p_script="", $p_script2="")
     echo '<script language="javascript" src="js/calendar.js"></script>
     <script type="text/javascript" src="js/lang/calendar-en.js"></script>';
 
-    if (isset($_SESSION['g_lang']) && $_SESSION['g_lang']=='fr_FR.utf8' )
+    if (isset($_SESSION[SESSION_KEY.'g_lang']) && $_SESSION[SESSION_KEY.'g_lang']=='fr_FR.utf8' )
     {
 	echo '<script type="text/javascript" src="js/lang/calendar-fr.js"></script>';
     }
-    if (isset($_SESSION['g_lang']) && $_SESSION['g_lang']=='nl_NL.utf8' )
+    if (isset($_SESSION[SESSION_KEY.'g_lang']) && $_SESSION[SESSION_KEY.'g_lang']=='nl_NL.utf8' )
     {
 	echo '<script type="text/javascript" src="js/lang/calendar-nl.js"></script>';
     }
@@ -357,7 +357,7 @@ function html_page_start($p_theme="", $p_script="", $p_script2="")
     <LINK REL="stylesheet" type="text/css" href="calendar-blue.css" media="screen">
     ';
     // language
-    if (isset($_SESSION['g_lang']))
+    if (isset($_SESSION[SESSION_KEY.'g_lang']))
     {
 		set_language();
     }
@@ -710,7 +710,7 @@ function set_language()
 {
     // desactivate local check
     if ( defined("LOCALE") && LOCALE==0 ) return;
-    if ( ! isset ($_SESSION['g_lang'])) return;
+    if ( ! isset ($_SESSION[SESSION_KEY.'g_lang'])) return;
     
     /*
      * If translation is not supported by current
@@ -721,12 +721,12 @@ function set_language()
     // set differently the language depending of the operating system
     if (what_os() == 1)
     {
-	$dir = setlocale(LC_MESSAGES, $_SESSION['g_lang']);
+	$dir = setlocale(LC_MESSAGES, $_SESSION[SESSION_KEY.'g_lang']);
 	if ($dir == "")
 	{
 	    $g_lang = 'fr_FR.utf8';
 	    $dir = setlocale(LC_MESSAGES, $g_lang);
-	   // echo '<span class="notice">' . $_SESSION['g_lang'] . ' domaine non supporté</h2>';
+	   // echo '<span class="notice">' . $_SESSION[SESSION_KEY.'g_lang'] . ' domaine non supporté</h2>';
 	}
 	bindtextdomain('messages', NOALYSS_HOME.'/lang');
 	textdomain('messages');
@@ -735,8 +735,8 @@ function set_language()
 	return;
     }
     // for windows
-    putenv('LANG=' . $_SESSION['g_lang']);
-    $dir = setlocale(LC_ALL, $_SESSION['g_lang']);
+    putenv('LANG=' . $_SESSION[SESSION_KEY.'g_lang']);
+    $dir = setlocale(LC_ALL, $_SESSION[SESSION_KEY.'g_lang']);
     bindtextdomain('messages', '.\\lang');
     textdomain('messages');
     bind_textdomain_codeset('messages', 'UTF8');
@@ -851,9 +851,9 @@ function format_date($p_date, $p_from_format = 'YYYY-MM-DD',$p_to_format='DD.MM.
 function ajax_disconnected($div)
 {
     /**
-     * if $_SESSION['g_user'] is not set : echo a warning
+     * if $_SESSION[SESSION_KEY.'g_user'] is not set : echo a warning
      */
-    if (!isset($_SESSION['g_user']))
+    if (!isset($_SESSION[SESSION_KEY.'g_user']))
     {
 	$script = 'var a=$("' . $div . '");a.style.height="70%";a.style.width="60%";';
 	$script.='a.style.top=posY-20+offsetY;a.style.left=posX+offsetX;';
diff --git a/include/lib/icard.class.php b/include/lib/icard.class.php
index 9fbb74153..f1dc2367f 100644
--- a/include/lib/icard.class.php
+++ b/include/lib/icard.class.php
@@ -344,7 +344,7 @@ class ICard extends HtmlInput
     static public function test_me()
     {
         require_once NOALYSS_INCLUDE.'/lib/itext.class.php';
-        $_SESSION['isValid']=1;
+        $_SESSION[SESSION_KEY.'isValid']=1;
         $a=new ICard('testme');
         $a->extra="all";
         $a->set_attribute('label', 'ctl_label');
diff --git a/include/lib/idate.class.php b/include/lib/idate.class.php
index ea1a105d6..3deb069a9 100644
--- a/include/lib/idate.class.php
+++ b/include/lib/idate.class.php
@@ -18,16 +18,17 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-// Copyright Author Dany De Bontridder danydb@aevalys.eu
+// Copyright Author Dany De Bontridder danydb@noalyss.eu
 
   /**
    *\file
-   \brief Html Input
+   \brief Html Input Date type
   */
 
 
 /// Html Input : Input a date format dd.mm.yyyy
 /// The property title should be set to indicate what it is expected
+/// @see calendar-setup.js
 require_once NOALYSS_INCLUDE.'/lib/html_input.class.php';
 
 class IDate extends HtmlInput
@@ -74,14 +75,15 @@ class IDate extends HtmlInput
                 </span>
                 ',$this->name,$this->id,$this->value,$this->placeholder,$this->title,$this->id
                 );
-        
+        // @see calendar-setup.js
         $r.=sprintf('<script type="text/javascript">
                 Calendar.setup({'.
-                'inputField     :    "%s",     // id of the input field
-            ifFormat       :    "%%d.%%m.%%Y",      // format of the input field
-            button         :    "%s_trigger",  // trigger for the calendar (button ID)
-            align          :    "Bl",           // alignment (defaults to "Bl")
-            singleClick    :    true
+                'inputField     :    "%s",    
+            ifFormat       :    "%%d.%%m.%%Y",     
+            button         :    "%s_trigger",  
+            align          :    "Bl",         
+            singleClick    :    true,
+            firstDay:0 
         });
             </script>'
                 ,$this->id,$this->id);
diff --git a/include/lib/noalyss_csv.class.php b/include/lib/noalyss_csv.class.php
index 669403431..7e5675782 100644
--- a/include/lib/noalyss_csv.class.php
+++ b/include/lib/noalyss_csv.class.php
@@ -46,10 +46,10 @@ class Noalyss_Csv
         $this->size=0;
      
         $a_field=[';',','];
-        $this->sep_field=$a_field[$_SESSION['csv_fieldsep']];
+        $this->sep_field=$a_field[$_SESSION[SESSION_KEY.'csv_fieldsep']];
         $a_field=['.',','];
-        $this->sep_dec=$a_field[$_SESSION['csv_decimal']];
-        $this->encoding=$_SESSION['csv_encoding'];
+        $this->sep_dec=$a_field[$_SESSION[SESSION_KEY.'csv_decimal']];
+        $this->encoding=$_SESSION[SESSION_KEY.'csv_encoding'];
     
     }
 
diff --git a/include/lib/user_common.php b/include/lib/user_common.php
index 5c77c616c..5a2be362a 100644
--- a/include/lib/user_common.php
+++ b/include/lib/user_common.php
@@ -69,7 +69,7 @@ function isValid_deprecrated ($p_cn,$p_grpt_id)
  * \param $p_javascript javascript code to add
  * \note example :
 \verbatim
-   $step=$_SESSION['g_pagesize'];
+   $step=$_SESSION[SESSION_KEY.'g_pagesize'];
    $page=(isset($_GET['offset']))?$_GET['page']:1;
    $offset=(isset($_GET['offset']))?$_GET['offset']:0;
 
@@ -82,10 +82,10 @@ function navigation_bar($p_offset,$p_line,$p_size=0,$p_page=1,$p_javascript="")
 {
     // if the pagesize is unlimited return ""
     // in that case there is no nav. bar
-    if ( $_SESSION['g_pagesize'] == -1  ) return "";
+    if ( $_SESSION[SESSION_KEY.'g_pagesize'] == -1  ) return "";
     if ( $p_size==0)
     {
-        $p_size= $_SESSION['g_pagesize'];
+        $p_size= $_SESSION[SESSION_KEY.'g_pagesize'];
     }
     // if there is no row return an empty string
     if ( $p_line == 0 ) return "";
diff --git a/include/template/module.php b/include/template/module.php
index 2f792438b..09e635b23 100644
--- a/include/template/module.php
+++ b/include/template/module.php
@@ -11,14 +11,14 @@
 <?php
 $http=new HttpInput();
 if ( $cn->get_value("select count(*) from profile join profile_user using (p_id)
-		where user_name=$1 and with_calc=true",array($_SESSION['g_user'])) ==1):
+		where user_name=$1 and with_calc=true",array($_SESSION[SESSION_KEY.'g_user'])) ==1):
   echo '<div id="calc">';
 	echo IButton::show_calc();
 echo '</div>';
 endif;
 
 if ( $cn->get_value("select count(*) from profile join profile_user using (p_id)
-		where user_name=$1 and with_direct_form=true",array($_SESSION['g_user'])) ==1):
+		where user_name=$1 and with_direct_form=true",array($_SESSION[SESSION_KEY.'g_user'])) ==1):
 ?>
 	<div id="direct">
 	<form method="get">
diff --git a/include/template/todo_list_display.php b/include/template/todo_list_display.php
index ea4844ef9..3171c183b 100644
--- a/include/template/todo_list_display.php
+++ b/include/template/todo_list_display.php
@@ -100,7 +100,7 @@ echo HtmlInput::title_box("Note","todo_list_div".$this->tl_id,'close',$close_sha
     <?php echo HtmlInput::hidden('id',$this->tl_id) ?>
     <p style='text-align: center'>
         <ol style="list-style: none;">
-    <?php if ($this->use_login == $_SESSION['g_user']) : ?>
+    <?php if ($this->use_login == $_SESSION[SESSION_KEY.'g_user']) : ?>
             <li style="display:inline">
                 <input type="submit" class="smallbutton" value="<?php echo _('Sauve');?>" onclick="todo_list_save(<?php echo $this->tl_id?>);return false">
              </li>
diff --git a/unit-test/global.example.php b/unit-test/global.example.php
index 70f4ab106..69e2a515b 100644
--- a/unit-test/global.example.php
+++ b/unit-test/global.example.php
@@ -28,7 +28,7 @@ define ("DOSSIER",48);
 $_REQUEST['gDossier'] = DOSSIER;
 $g_connection=new Database(DOSSIER);
 $g_parameter = new Noalyss_Parameter_Folder($g_connection);
-$_SESSION['g_user']='phpcompta';
-$_SESSION['g_pass']='dany';
-$_SESSION['g_pagesize']='50';
+$_SESSION[SESSION_KEY.'g_user']='phpcompta';
+$_SESSION[SESSION_KEY.'g_pass']='dany';
+$_SESSION[SESSION_KEY.'g_pagesize']='50';
 $g_user=new User($g_connection);
diff --git a/unit-test/global.php b/unit-test/global.php
index e2271a2da..0d4a00530 100644
--- a/unit-test/global.php
+++ b/unit-test/global.php
@@ -29,9 +29,9 @@ if (!defined("DOSSIER"))define ("DOSSIER",25);
 $_REQUEST['gDossier'] = DOSSIER;
 $g_connection=new Database(DOSSIER);
 $g_parameter = new Noalyss_Parameter_Folder($g_connection);
-$_SESSION['g_user']='admin';
-$_SESSION['g_pass']='phpcompta';
-$_SESSION['g_pagesize']='50';
+$_SESSION[SESSION_KEY.'g_user']='admin';
+$_SESSION[SESSION_KEY.'g_pass']='phpcompta';
+$_SESSION[SESSION_KEY.'g_pagesize']='50';
 $g_user=new User($g_connection);
 
 require_once __DIR__.'/facility.class.php';
\ No newline at end of file

From 60b15becfdf0f51bc1c41d35d86588aa7342defd Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Mon, 4 Jan 2021 13:04:47 +0100
Subject: [PATCH 204/257] Bug : if all the quantity are NULL, then we have only
 one row in jrn

---
 include/class/acc_ledger_purchase.class.php | 2 +-
 include/class/acc_ledger_sold.class.php     | 4 +++-
 include/class/acc_operation.class.php       | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/include/class/acc_ledger_purchase.class.php b/include/class/acc_ledger_purchase.class.php
index 39f3c5549..d624af02c 100644
--- a/include/class/acc_ledger_purchase.class.php
+++ b/include/class/acc_ledger_purchase.class.php
@@ -260,7 +260,7 @@ class  Acc_Ledger_Purchase extends Acc_Ledger
 		      }
 		  }
 	      }
-	    $nb++;
+            if ( ${"e_quant".$i} != 0 && trim(${"e_quant".$i}) !="" ) {$nb++;}
         }
 
         if ( $nb == 0 )
diff --git a/include/class/acc_ledger_sold.class.php b/include/class/acc_ledger_sold.class.php
index 9cb0668cc..27ec56adf 100644
--- a/include/class/acc_ledger_sold.class.php
+++ b/include/class/acc_ledger_sold.class.php
@@ -208,7 +208,9 @@ class Acc_Ledger_Sold extends Acc_Ledger {
             $fiche->get_by_qcode(${'e_march' . $i});
             if ($fiche->belong_ledger($p_jrn, 'cred') != 1)
                 throw new Exception(_('La fiche ') . ${'e_march' . $i} . _('n\'est pas accessible à ce journal'), 10);
-            $nb++;
+           
+            if ( ${"e_quant".$i} != 0 && trim(${"e_quant".$i}) !="" ) {$nb++;}
+
         }
         if ($nb == 0)
             throw new Exception(_('Il n\'y a aucune marchandise'), 12);
diff --git a/include/class/acc_operation.class.php b/include/class/acc_operation.class.php
index fd30cf612..e2bdaf8e1 100644
--- a/include/class/acc_operation.class.php
+++ b/include/class/acc_operation.class.php
@@ -60,6 +60,7 @@ class Acc_Operation
         $this->periode=$g_user->get_periode();
         $this->jr_id=0;
         $this->jr_optype="NOR";
+        $this->amount=0;
     }
     /**
      *@brief retrieve the grpt_id from jrn for a jr_id
@@ -183,6 +184,7 @@ class Acc_Operation
         $this->amount=abs($this->amount);
         $debit=($this->type=='c')?'false':'true';
         $this->desc=(isset($this->desc))?$this->desc:'';
+        $this->amount=(trim($this->amount)==''||$this->amount==NULL)?0:$this->amount;
         $Res=$this->db->exec_sql("select insert_jrnx
                                  ($1::text,abs($2)::numeric,$3::account_type,$4::integer,$5::integer,$6::bool,$7::text,$8::integer,upper($9),$10::text)",
                                  array(
@@ -287,8 +289,10 @@ class Acc_Operation
         {
             $this->mt=microtime(true);
         }
+        
         // if amount == -1then the triggers will throw an error
         //
+        $this->amount=(trim($this->amount)==''||$this->amount==NULL)?0:$this->amount;
         $Res=$this->db->exec_sql("insert into jrn (jr_def_id,jr_montant,jr_comment,".
                                  "jr_date,jr_ech,jr_grpt_id,jr_tech_per,jr_mt,jr_optype)   values (".
                                  "$1,$2,$3,".

From 754735430167a91dc05433e6456ba8e0ae83dd1c Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Mon, 4 Jan 2021 17:41:34 +0100
Subject: [PATCH 205/257] Generate document : DESCRIPTION for invoice (e_comm)

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

diff --git a/include/class/document.class.php b/include/class/document.class.php
index d7b7f8789..c74a0b60b 100644
--- a/include/class/document.class.php
+++ b/include/class/document.class.php
@@ -1206,6 +1206,8 @@ class Document
                         ,[$p_array['ag_id']]);
                 return $description;
             }
+            if ( isset($p_array['e_comm'])) {return $p_array['e_comm'] ; }
+            
             return "";
             break;
       

From 986e1a10b91b41e9c6ebe4960ecb03b9da2ec157 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 12 Jan 2021 11:08:51 +0100
Subject: [PATCH 206/257] Card : attribute 54 is now a column for each card

---
 html/fid_card.php |   2 +-
 sql/upgrade.sql   | 203 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 204 insertions(+), 1 deletion(-)

diff --git a/html/fid_card.php b/html/fid_card.php
index d01a89b86..23080cc93 100644
--- a/html/fid_card.php
+++ b/html/fid_card.php
@@ -119,7 +119,7 @@ else
     }
 }
 // filter only enable card
-$filter_enable_card=" and f_id in (select f_id from fiche_detail where ad_value = '1' and ad_id=54) ";
+$filter_enable_card=" and f_enable='1' ";
 
 $sql_str="select distinct f_id 
          from fiche 
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index db56945e7..08d570817 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -1,3 +1,206 @@
 -- 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;

From c7c518a19dee881f71307de837a1dec28b4c0146 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 12 Jan 2021 11:11:11 +0100
Subject: [PATCH 207/257] code cleaning and replace $_SERVER['SCRIPT_FILENAME']
 by $_SERVER['PHP_SELF'] SCRIPT_FILENAME in a FPM environment is the CGI
 script

---
 include/action.common.inc.php          |    8 +-
 include/ajax/ajax_search_operation.php |    2 +-
 include/class/acc_ledger.class.php     |    3 +-
 include/class/document.class.php       | 2033 +++++++++++++-----------
 include/class/fiche.class.php          |   61 +-
 include/class/follow_up.class.php      |    8 +-
 include/class/user.class.php           |   71 +-
 include/company.inc.php                |    2 +-
 include/export/export_document.php     |    2 +-
 include/lib/sort_table.class.php       |    2 +-
 include/lib/user_common.php            |   34 +-
 include/template/menu.php              |  108 +-
 12 files changed, 1242 insertions(+), 1092 deletions(-)

diff --git a/include/action.common.inc.php b/include/action.common.inc.php
index ce874a8be..4e568e55d 100644
--- a/include/action.common.inc.php
+++ b/include/action.common.inc.php
@@ -96,7 +96,7 @@ if (isset($_POST['generate']))
 	}
 	else
 	{
-		$act->Update();
+		$act->update();
 	}
         $doc_mod=$http->post('doc_mod',"number");
 	$act->generate_document($doc_mod, $_POST);
@@ -117,12 +117,12 @@ if (isset($_POST['corr']))
 // if this page is called from another menu (customer, supplier,...)
 // a button back is added
 //----------------------------------------------------------------------
-// Update the detail
+// update the detail
 // Add a new action related to this one or update
 //----------------------------------------------------------------------
 if ($sub_action == "update")
 {
-	// Update the modification
+	// update the modification
 	if (isset($_POST['save']))
 	{
 		$act2 = new Follow_Up($cn);
@@ -138,7 +138,7 @@ if ($sub_action == "update")
 		put_global(array(array('key' => "sa", "value" => "detail")));
                 try {
                     $act2->verify() ;
-                    $act2->Update() ;
+                    $act2->update() ;
                 }
                 catch (Exception $e)
                 {
diff --git a/include/ajax/ajax_search_operation.php b/include/ajax/ajax_search_operation.php
index f5a541ac4..4ab531258 100644
--- a/include/ajax/ajax_search_operation.php
+++ b/include/ajax/ajax_search_operation.php
@@ -38,7 +38,7 @@ require_once NOALYSS_INCLUDE.'/class/user.class.php';
 // display a search box
 
 
-$base=basename($_SERVER['SCRIPT_NAME']);
+$base=basename($_SERVER['PHP_SELF']);
 $inside=false;
 $tiers=$http->get("tiers", "string", "");
 // With the amount id, we find the amount in a html elt
diff --git a/include/class/acc_ledger.class.php b/include/class/acc_ledger.class.php
index 995423a5f..d7efb992f 100644
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@ -791,7 +791,6 @@ class Acc_Ledger  extends jrn_def_sql
         $op=new Pre_operation( $this->db);
         $op->set_p_jrn($this->id);
         $op->set_jrn_type("ODS");
-        $op->set_od_direct('t');
 
         $url=http_build_query(
                 array('action'=>'use_opd', 
@@ -1652,7 +1651,7 @@ class Acc_Ledger  extends jrn_def_sql
         $filename="";
         $doc->Generate($p_array, $p_array['e_pj']);
         // Move the document to the jrn
-        $doc->MoveDocumentPj($internal);
+        $doc->moveDocumentPj($internal);
         // Update the comment with invoice number, if the comment is empty
         if (!isset($e_comm)||strlen(trim($e_comm))==0)
         {
diff --git a/include/class/document.class.php b/include/class/document.class.php
index 7f4f1f8ed..9da8e4811 100644
--- a/include/class/document.class.php
+++ b/include/class/document.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  *   This file is part of NOALYSS.
  *
@@ -15,7 +16,7 @@
  *   You should have received a copy of the GNU General Public License
  *   along with NOALYSS; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+ */
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
 require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
 require_once NOALYSS_INCLUDE.'/class/acc_account_ledger.class.php';
@@ -24,50 +25,56 @@ require_once NOALYSS_INCLUDE.'/class/acc_tva.class.php';
 require_once NOALYSS_INCLUDE.'/class/user.class.php';
 require_once NOALYSS_INCLUDE.'/lib/zip_extended.class.php';
 
-/*! \file
+/* ! \file
  * \brief Class Document corresponds to the table document
  */
-/*! \brief Class Document corresponds to the table document
+/* ! \brief Class Document corresponds to the table document
  */
+
 class Document
 {
-    var $db;          /*!< $db Database connexion*/
-    var $d_id;        /*!< $d_id Document id */
-    var $ag_id;       /*!< $ag_id action_gestion.ag_id (pk) */
-    var $d_mimetype;  /*!< $d_mimetype  */
-    var $d_filename;  /*!< $d_filename */
-    var $d_lob;       /*!< $d_lob the oid of the lob */
-    var $d_description;       /*!< Description of the file*/
-    var $d_number;    /*!< $d_number number of the document */
-    var $md_id;       /*!< $md_id document's template */
-    private $counter; /*!< counter for the items ( goods ) */
-   
+
+    var $db;          /* !< $db Database connexion */
+    var $d_id;        /* !< $d_id Document id */
+    var $ag_id;       /* !< $ag_id action_gestion.ag_id (pk) */
+    var $d_mimetype;  /* !< $d_mimetype  */
+    var $d_filename;  /* !< $d_filename */
+    var $d_lob;       /* !< $d_lob the oid of the lob */
+    var $d_description;       /* !< Description of the file */
+    var $d_number;    /* !< $d_number number of the document */
+    var $md_id;       /* !< $md_id document's template */
+    private $counter; /* !< counter for the items ( goods ) */
+
     /* Constructor
      * \param $p_cn Database connection
      */
-    function __construct($p_cn,$p_d_id=0)
+
+    function __construct($p_cn, $p_d_id=0)
     {
         $this->db=$p_cn;
         $this->d_id=$p_d_id;
-        
+
         // counter for MARCH_NEXT
         $this->counter=0;
     }
-    
-    /*!\brief insert a minimal document and set the d_id
+
+    /* !\brief insert a minimal document and set the d_id
      */
+
     function blank()
     {
         $this->d_id=$this->db->get_next_seq("document_d_id_seq");
         // affect a number
         $this->d_number=$this->db->get_next_seq("seq_doc_type_".$this->md_type);
-        $sql=sprintf('insert into document(d_id,ag_id,d_number) values(%d,%d,%d)',
-                     $this->d_id,
-                     $this->ag_id,
-                     $this->d_number);
-        $this->db->exec_sql($sql);
+        $sql='insert into document(d_id,ag_id,d_number) values($1,$2,$3)';
 
+        $this->db->exec_sql($sql,
+                array
+            ($this->d_id,
+            $this->ag_id,
+            $this->d_number));
     }
+
     /**
      * Insert the receipt number into the filename , each generated file
      * will have the name of the template (model) + receipt number)
@@ -75,42 +82,46 @@ class Document
      * @param type $filename the name of the file
      * @return string
      */
-    function compute_filename($pj,$filename)
+    function compute_filename($pj, $filename)
     {
-            foreach (array('/','*','<','>',';',',','\\','.',':','(',')',' ','[',']') as $i) {
-                    $pj= str_replace($i, "-",$pj);
-            }
-            // save the suffix
-            $pos_prefix=strrpos($filename,".");
-            if ($pos_prefix == 0) $pos_prefix=strlen($filename);
-            $filename_no=substr($filename,0,$pos_prefix);
-            $filename_suff=substr($filename,$pos_prefix,strlen($filename));
-            $new_filename=  strtolower($filename_no."-".$pj.$filename_suff);
-            return $new_filename;
+        foreach (array('/', '*', '<', '>', ';', ',', '\\', '.', ':', '(', ')', ' ', '[', ']') as $i)
+        {
+            $pj=str_replace($i, "-", $pj);
+        }
+        // save the suffix
+        $pos_prefix=strrpos($filename, ".");
+        if ($pos_prefix==0)
+            $pos_prefix=strlen($filename);
+        $filename_no=substr($filename, 0, $pos_prefix);
+        $filename_suff=substr($filename, $pos_prefix, strlen($filename));
+        $new_filename=strtolower($filename_no."-".$pj.$filename_suff);
+        return $new_filename;
     }
-    /*!
-     * \brief Generate the document, Call $this-\>Replace to replace
+
+    /* !
+     * \brief Generate the document, Call $this-\>replace to replace
      *        tag by value
-     *@param p_array contains the data normally it is the $_POST
-     *@param $p_filename contains the new filename
+     * @param p_array contains the data normally it is the $_POST
+     * @param $p_filename contains the new filename
      * \return an string : the url where the generated doc can be found, the name
      * of the file and his mimetype
      */
-    function Generate($p_array,$p_filename="")
+
+    function generate($p_array, $p_filename="")
     {
         // create a temp directory in /tmp to unpack file and to parse it
-        $dirname=tempnam($_ENV['TMP'],'doc_');
+        $dirname=tempnam($_ENV['TMP'], 'doc_');
 
 
         unlink($dirname);
-        mkdir ($dirname);
+        mkdir($dirname);
         // Retrieve the lob and save it into $dirname
         $this->db->start();
         $dm_info="select md_name,md_type,md_lob,md_filename,md_mimetype
-                 from document_modele where md_id=".$this->md_id;
-        $Res=$this->db->exec_sql($dm_info);
+                 from document_modele where md_id=$1";
+        $Res=$this->db->exec_sql($dm_info, [$this->md_id]);
 
-        $row=Database::fetch_array($Res,0);
+        $row=Database::fetch_array($Res, 0);
         $this->d_lob=$row['md_lob'];
         $this->d_filename=$row['md_filename'];
         $this->d_mimetype=$row['md_mimetype'];
@@ -119,22 +130,30 @@ class Document
 
         chdir($dirname);
         $filename=$row['md_filename'];
-        $exp=$this->db->lo_export($row['md_lob'],$dirname.DIRECTORY_SEPARATOR.$filename);
-        if ( $exp === false ) echo_warning( __FILE__.":".__LINE__."Export NOK $filename");
+        $exp=$this->db->lo_export($row['md_lob'], $dirname.DIRECTORY_SEPARATOR.$filename);
+        if ($exp===false)
+        {
+            record_log(sprintf('D1 ,  export failed %s', $filename));
+            throw new Exception(sprintf(_("Export a échoué pour %s", $filename)));
+        }
 
         $type="n";
         // if the doc is a OOo, we need to unzip it first
         // and the name of the file to change is always content.xml
-        if ( strpos($row['md_mimetype'],'vnd.oasis') != 0 )
+        if (strpos($row['md_mimetype'], 'vnd.oasis')!=0)
         {
             ob_start();
-	    $zip = new Zip_Extended;
-	    if ($zip->open($filename) === TRUE) {
-	      $zip->extractTo($dirname.DIRECTORY_SEPARATOR);
-	      $zip->close();
-	    } else {
-	      echo __FILE__.":".__LINE__."cannot unzip model ".$filename;
-	    }
+            $zip=new Zip_Extended;
+            if ($zip->open($filename)===TRUE)
+            {
+                $zip->extractTo($dirname.DIRECTORY_SEPARATOR);
+                $zip->close();
+            }
+            else
+            {
+                record_log(sprintf('D2  unzip failed %s', $filename));
+                throw new Exception(sprintf(_("Décompression a échoué %s", $filename)));
+            }
 
             // Remove the file we do  not need anymore
             unlink($filename);
@@ -143,43 +162,47 @@ class Document
             $type="OOo";
         }
         else
+        {
             $file_to_parse=$filename;
+        }
         // affect a number
         $this->d_number=$this->db->get_next_seq("seq_doc_type_".$row['md_type']);
 
         // parse the document - return the doc number ?
-        $this->ParseDocument($dirname,$file_to_parse,$type,$p_array);
+        $this->parseDocument($dirname, $file_to_parse, $type, $p_array);
 
         $this->db->commit();
         // if the doc is a OOo, we need to re-zip it
-        if ( strpos($row['md_mimetype'],'vnd.oasis') != 0 )
+        if (strpos($row['md_mimetype'], 'vnd.oasis')!=0)
         {
             ob_start();
-	    $zip = new Zip_Extended;
-            $res = $zip->open($filename, ZipArchive::CREATE);
-            if($res !== TRUE)
-	      {
-		throw new Exception ( __FILE__.":".__LINE__."cannot recreate zip");
-	      }
-	    $zip->add_recurse_folder($dirname.DIRECTORY_SEPARATOR);
-	    $zip->close();
+            $zip=new Zip_Extended;
+            $res=$zip->open($filename, ZipArchive::CREATE);
+            if ($res!==TRUE)
+            {
+                record_log(sprintf('D3  zip failed %s', $filename));
+                throw new Exception(_('Echec compression'));
+            }
+            $zip->add_recurse_folder($dirname.DIRECTORY_SEPARATOR);
+            $zip->close();
 
             ob_end_clean();
 
             $file_to_parse=$filename;
         }
-	if ( $p_filename !="") {
-			$this->d_filename=$this->compute_filename($p_filename, $this->d_filename);
-	}
-        $this->SaveGenerated($dirname.DIRECTORY_SEPARATOR.$file_to_parse);
+        if ($p_filename!="")
+        {
+            $this->d_filename=$this->compute_filename($p_filename, $this->d_filename);
+        }
+        $this->saveGenerated($dirname.DIRECTORY_SEPARATOR.$file_to_parse);
         // Invoice
-        $href=http_build_query(array('gDossier'=>Dossier::id(),"d_id"=>$this->d_id,'act'=>'RAW:document'));
+        $href=http_build_query(array('gDossier'=>Dossier::id(), "d_id"=>$this->d_id, 'act'=>'RAW:document'));
         $ret='<A class="mtitle" HREF="export.php?'.$href.'">'._('Document').'</A>';
-        
+
         return $ret;
     }
 
-    /*! ParseDocument
+    /* ! parseDocument
      * \brief This function parse a document and replace all
      *        the predefined tags by a value. This functions
      *        generate diffent documents (invoice, order, letter)
@@ -190,10 +213,11 @@ class Document
      * \param $p_type For the OOo document the tag are &lt and &gt instead of < and >
      * \param $p_array variable from $_POST
      */
-    function ParseDocument($p_dir,$p_file,$p_type,$p_array)
+
+    function parseDocument($p_dir, $p_file, $p_type, $p_array)
     {
 
-        /*!\note Replace in the doc the tags by their values.
+        /* !\note replace in the doc the tags by their values.
          *  - MY_*   table parameter
          *  - ART_VEN* table quant_sold for invoice
          *  - CUST_* table quant_sold and fiche for invoice
@@ -201,36 +225,37 @@ class Document
          */
         // open the document
         $infile_name=$p_dir.DIRECTORY_SEPARATOR.$p_file;
-        $h=fopen($infile_name,"r");
+        $h=fopen($infile_name, "r");
 
         // check if tmpdir exist otherwise create it
         $temp_dir=$_ENV['TMP'];
-        if ( is_dir($temp_dir) == false )
+        if (is_dir($temp_dir)==false)
         {
-            if ( mkdir($temp_dir) == false )
+            if (mkdir($temp_dir)==false)
             {
-                $msg=_("Ne peut pas créer le répertoire ".$temp_dir); 
+                $msg=sprintf(_("Ne peut pas créer le répertoire %s", $temp_dir));
+                report_log("D221".$msg);
                 throw new Exception($msg);
             }
         }
         // Compute output_name
-        $output_name=tempnam($temp_dir,"gen_doc_");
-        $output_file=fopen($output_name,"w+");
+        $output_name=tempnam($temp_dir, "gen_doc_");
+        $output_file=fopen($output_name, "w+");
         // check if the opening is sucessfull
-        if (  $h === false )
+        if ($h===false)
         {
-            echo __FILE__.":".__LINE__."cannot open $p_dir $p_file ";
-            $msg=_("Ne peut pas ouvrir $p_dir $p_file"); 
+            $msg=sprintf(_("Ne peut pas ouvrir [%s] [%s]"), $p_dir, $p_file);
+            report_log("D232".$msg);
             throw new Exception($msg);
         }
-        if ( $output_file == false)
+        if ($output_file==false)
         {
-            $msg=_("Ne peut pas ouvrir $p_dir $p_file"); 
-            echo $msg;
+            $msg=sprintf(_("Ne peut pas ouvrir [%s] [%s]"), $p_dir, $output_name);
+            record_log($msg);
             throw new Exception($msg);
         }
         // compute the regex
-        if ( $p_type=='OOo')
+        if ($p_type=='OOo')
         {
             $regex="/=*&lt;&lt;[A-Z]+_*[A-Z]*_*[A-Z]*_*[A-Z]*_*[0-9]*&gt;&gt;/i";
             $lt="&lt;";
@@ -243,69 +268,70 @@ class Document
             $gt=">";
         }
         //read the file
-        while(! feof($h))
-	  {
+        while (!feof($h))
+        {
             // replace the tag
             $buffer=fgets($h);
             // search in the buffer the magic << and >>
             // while preg_match_all finds something to replace
-            while ( preg_match_all ($regex,$buffer,$f) >0  )
-	      {
+            while (preg_match_all($regex, $buffer, $f)>0)
+            {
+
+                foreach ($f as $apattern)
+                {
+
+                    foreach ($apattern as $pattern)
+                    {
 
 
-                foreach ( $f as $apattern )
-		  {
+                        $to_remove=$pattern;
+                        // we remove the < and > from the pattern
+                        $tag=str_replace($lt, '', $pattern);
+                        $tag=str_replace($gt, '', $tag);
 
 
-		    foreach($apattern as $pattern)
-		      {
-
-
-			$to_remove=$pattern;
-			// we remove the < and > from the pattern
-			$tag=str_replace($lt,'',$pattern);
-			$tag=str_replace($gt,'',$tag);
-
-
-			// if the pattern if found we replace it
-			$value=$this->Replace($tag,$p_array);
-			if ( strpos($value,'ERROR') != false ) 		  $value="";
+                        // if the pattern if found we replace it
+                        $value=$this->replace($tag, $p_array);
+                        if (strpos($value, 'ERROR')!=false)
+                            $value="";
                         /*
                          * Change type of cell to numeric
                          *  allow numeric cel in ODT for the formatting and formula
                          */
-                        
-                        $buffer=\Document::replace_value($buffer,$pattern, $value, 1,$p_type);
-		      }
-		  }
-	      }
-            // write into the output_file
-            fwrite($output_file,$buffer);
 
-	  }
+                        $buffer=\Document::replace_value($buffer, $pattern, $value, 1, $p_type);
+                    }
+                }
+            }
+            // write into the output_file
+            fwrite($output_file, $buffer);
+        }
         fclose($h);
         fclose($output_file);
-        if ( ($ret=copy ($output_name,$infile_name)) == FALSE )
+        if (($ret=copy($output_name, $infile_name))==FALSE)
         {
-            echo _('Ne peut pas sauver '.$output_name.' vers '.$infile_name.' code d\'erreur ='.$ret);
+            $msg="D299 ".sprintf(_('Ne peut pas sauver [%s] vers [%s] code erreur = [%s]'), $output_name, $infile_name,
+                            $ret);
+            record_log($msg);
+            throw new Exception($msg);
         }
-
-
     }
-    /*! SaveGenerated
+
+    /* ! saveGenerated
      * \brief Save the generated Document
      * \param $p_file is the generated file
      *
      *
      * \return 0 if no error otherwise 1
      */
-    function SaveGenerated($p_file)
+
+    function saveGenerated($p_file)
     {
         // We save the generated file
         $doc=new Document($this->db);
         $this->db->start();
         $this->d_lob=$this->db->lo_import($p_file);
-        if ( $this->d_lob == false )
+        if ($this->d_lob==false)
         {
             echo "ne peut pas importer [$p_file]";
             return 1;
@@ -314,46 +340,50 @@ class Document
         $sql="insert into document(ag_id,d_lob,d_number,d_filename,d_mimetype)
              values ($1,$2,$3,$4,$5)";
 
-        $this->db->exec_sql($sql,      array($this->ag_id,
-                                             $this->d_lob,
-                                             $this->d_number,
-                                             $this->d_filename,
-                                             $this->d_mimetype));
+        $this->db->exec_sql($sql,
+                array($this->ag_id,
+            $this->d_lob,
+            $this->d_number,
+            $this->d_filename,
+            $this->d_mimetype));
         $this->d_id=$this->db->get_current_seq("document_d_id_seq");
         // Clean the file
-        unlink ($p_file);
+        unlink($p_file);
         $this->db->commit();
         return 0;
     }
-    /*! Upload
-     * \brief Upload a file into document
+
+    /* ! upload
+     * \brief upload a file into document
      *  all the needed data are in $_FILES we don't increment the seq
      * \param $p_file : array containing by default $_FILES
      *
      * \return
      */
-    function Upload($p_ag_id)
+
+    function upload($p_ag_id)
     {
         // nothing to save
-        if ( sizeof($_FILES) == 0 ) return;
+        if (sizeof($_FILES)==0)
+            return;
 
         /* for several files  */
         /* $_FILES is now an array */
         // Start Transaction
         $this->db->start();
         $name=$_FILES['file_upload']['name'];
-        for ($i = 0; $i < sizeof($name);$i++)
+        for ($i=0; $i<sizeof($name); $i++)
         {
-            $new_name=tempnam($_ENV['TMP'],'doc_');
+            $new_name=tempnam($_ENV['TMP'], 'doc_');
             // check if a file is submitted
-            if ( strlen($_FILES['file_upload']['tmp_name'][$i]) != 0 )
+            if (strlen($_FILES['file_upload']['tmp_name'][$i])!=0)
             {
                 // upload the file and move it to temp directory
-                if ( move_uploaded_file($_FILES['file_upload']['tmp_name'][$i],$new_name))
+                if (move_uploaded_file($_FILES['file_upload']['tmp_name'][$i], $new_name))
                 {
                     $oid=$this->db->lo_import($new_name);
                     // check if the lob is in the database
-                    if ( $oid == false )
+                    if ($oid==false)
                     {
                         $this->db->rollback();
                         return 1;
@@ -363,15 +393,17 @@ class Document
                 $this->d_lob=$oid;
                 $this->d_filename=$_FILES['file_upload']['name'][$i];
                 $this->d_mimetype=$_FILES['file_upload']['type'][$i];
-                $this->d_description=  strip_tags($_POST['input_desc'][$i]);
+                $this->d_description=strip_tags($_POST['input_desc'][$i]);
                 // insert into  the table
-                $sql="insert into document (ag_id, d_lob,d_filename,d_mimetype,d_number,d_description) values ($1,$2,$3,$4,$5,$6)";
-                $this->db->exec_sql($sql,array($p_ag_id,$this->d_lob,$this->d_filename,$this->d_mimetype,1,$this->d_description));
+                $sql="insert into document (ag_id, d_lob,d_filename,d_mimetype,d_number,d_description)"
+                        . " values ($1,$2,$3,$4,$5,$6)";
+                $this->db->exec_sql($sql,
+                        array($p_ag_id, $this->d_lob, $this->d_filename, $this->d_mimetype, 1, $this->d_description));
             }
         } /* end for */
         $this->db->commit();
-
     }
+
     /**
      * Copy a existing OID (LOB) into the table document
      * @note  use of global variable $cn which is the db connx to the current folder
@@ -381,79 +413,85 @@ class Document
      * @param type $p_mimetype mimetype of existing document
      * @param type $p_description Description of existing document (default empty)
      */
-    static function insert_existing_document($p_ag_id, $p_lob, $p_filename, $p_mimetype, $p_description = "")
+    static function insert_existing_document($p_ag_id, $p_lob, $p_filename, $p_mimetype, $p_description="")
     {
         global $cn;
         // insert into  the table
-        $sql = "insert into document (ag_id, d_lob,d_filename,d_mimetype,d_number,d_description) values ($1,$2,$3,$4,$5,$6)";
+        $sql="insert into document (ag_id, d_lob,d_filename,d_mimetype,d_number,d_description) "
+                . "values ($1,$2,$3,$4,$5,$6)";
         $cn->exec_sql($sql, array($p_ag_id, $p_lob, $p_filename, $p_mimetype, 1, $p_description));
     }
 
-    /*! a_ref
+    /* ! 
      * \brief create and compute a string for reference the doc <A ...>
      *
      * \return a string
      */
+
     function anchor()
     {
-        if ( $this->d_id == 0 )
+        if ($this->d_id==0)
             return '';
         $image='<IMG SRC="image/insert_table.gif" title="'.$this->d_filename.'" border="0">';
         $r="";
-        $href=http_build_query(array('gDossier'=>Dossier::id(),"d_id"=>$this->d_id,'act'=>'RAW:document'));
+        $href=http_build_query(array('gDossier'=>Dossier::id(), "d_id"=>$this->d_id, 'act'=>'RAW:document'));
 
         $r='<A class="mtitle" HREF="export.php?'.$href.'">'.$image.'</A>';
         return $r;
     }
+
     /** Get
-     * \brief Send the document
+     * \brief send the document
      */
-    function Send()
+    function send()
     {
         // retrieve the template and generate document
         $this->db->start();
         $ret=$this->db->exec_sql(
-                 "select d_id,d_lob,d_filename,d_mimetype from document where d_id=".$this->d_id );
-        if ( Database::num_row ($ret) == 0 )
+                "select d_id,d_lob,d_filename,d_mimetype from document where d_id=$1", [$this->d_id]);
+        if (Database::num_row($ret)==0)
+        {
             return;
-        $row=Database::fetch_array($ret,0);
+        }
+        $row=Database::fetch_array($ret, 0);
         //the document  is saved into file $tmp
-        $tmp=tempnam($_ENV['TMP'],'document_');
-        $this->db->lo_export($row['d_lob'],$tmp);
+        $tmp=tempnam($_ENV['TMP'], 'document_');
+        $this->db->lo_export($row['d_lob'], $tmp);
         $this->d_mimetype=$row['d_mimetype'];
         $this->d_filename=$row['d_filename'];
 
         // send it to stdout
-        ini_set('zlib.output_compression','Off');
+        ini_set('zlib.output_compression', 'Off');
         header("Pragma: public");
         header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-        header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+        header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
         header("Cache-Control: must-revalidate");
         header('Content-type: '.$this->d_mimetype);
-        header('Content-Disposition: attachment;filename="'.$this->d_filename.'"',FALSE);
+        header('Content-Disposition: attachment;filename="'.$this->d_filename.'"', FALSE);
         header("Accept-Ranges: bytes");
-        $file=fopen($tmp,'r');
-        while ( !feof ($file) )
+        $file=fopen($tmp, 'r');
+        while (!feof($file))
         {
-            echo fread($file,8192);
+            echo fread($file, 8192);
         }
         fclose($file);
 
-        unlink ($tmp);
+        unlink($tmp);
 
         $this->db->commit();
-
     }
-    /*!\brief get all the document of a given action
-     *\param $ag_id the ag_id from action::ag_id (primary key)
-     *\return an array of objects document or an empty array if nothing found
+
+    /* !\brief get all the document of a given action
+     * \param $ag_id the ag_id from action::ag_id (primary key)
+     * \return an array of objects document or an empty array if nothing found
      */
+
     function get_all($ag_id)
     {
         $res=$this->db->get_array('select d_id, ag_id, d_lob, d_number, d_filename,'.
-                                  ' d_mimetype,d_description from document where ag_id=$1',array($ag_id));
+                ' d_mimetype,d_description from document where ag_id=$1', array($ag_id));
         $a=array();
-        for ($i=0;$i<sizeof($res); $i++ )
+        for ($i=0; $i<sizeof($res); $i++)
         {
             $doc=new Document($this->db);
             $doc->d_id=$res[$i]['d_id'];
@@ -468,24 +506,27 @@ class Document
         return $a;
     }
 
-    /*!\brief Get  complete all the data member thx info from the database
+    /* !\brief Get  complete all the data member thx info from the database
      */
+
     function get()
     {
         $sql="select * from document where d_id=".$this->d_id;
         $ret=$this->db->exec_sql($sql);
-        if ( Database::num_row($ret) == 0 )
+        if (Database::num_row($ret)==0)
+        {
             return;
-        $row=Database::fetch_array($ret,0);
+        }
+        $row=Database::fetch_array($ret, 0);
         $this->ag_id=$row['ag_id'];
         $this->d_mimetype=$row['d_mimetype'];
         $this->d_filename=$row['d_filename'];
         $this->d_lob=$row['d_lob'];
         $this->d_number=$row['d_number'];
         $this->d_description=$row['d_description'];
-
     }
-    /*!
+
+    /* !
      * \brief replace the TAG by the real value, this value can be into
      * the database or in $_POST
      * The possible tags are
@@ -547,290 +588,294 @@ class Document
      * \param $p_array data from $_POST
      * \return String which must replace the tag
      */
-    function Replace($p_tag,$p_array)
+
+    function replace($p_tag, $p_array)
     {
-		global $g_parameter;
+        global $g_parameter;
         $p_tag=strtoupper($p_tag);
-        $p_tag=str_replace('=','',$p_tag);
+        $p_tag=str_replace('=', '', $p_tag);
         $r="Tag inconnu";
         static $aComment=NULL;
-        static  $counter_comment =1  ; /*<! counter for the comment , skip the first one which is the descrition*/
-        
+        static $counter_comment=1; /* <! counter for the comment , skip the first one which is the descrition */
+
         static $aRelatedAction=NULL;
-        static  $counter_related_action =0 ; /*<! counter for the related action */
-        
+        static $counter_related_action=0; /* <! counter for the related action */
+
         static $aRelatedOperation=NULL;
-        static  $counter_related_operation =0 ; /*<! counter for the related operation */
-        
+        static $counter_related_operation=0; /* <! counter for the related operation */
+
         static $aFileAttached=NULL;
-        static  $counter_file =0 ; /*<! counter for the file */
-        
-        static $aOtherCard = NULL;
-        static  $counter_other_card =0 ; /*<! counter for the other card */
-        
-        static $aTag = NULL;
-        static  $counter_tag =0 ; /*<! counter for the tags */   
-        
+        static $counter_file=0; /* <! counter for the file */
+
+        static $aOtherCard=NULL;
+        static $counter_other_card=0; /* <! counter for the other card */
+
+        static $aTag=NULL;
+        static $counter_tag=0; /* <! counter for the tags */
+
         switch ($p_tag)
         {
             case 'DATE':
-                    $r=(isset ($p_array['ag_timestamp']))?$p_array['ag_timestamp']:$p_array['e_date'];
-                    break;
-        case 'DATE_CALC':
+                $r=(isset($p_array['ag_timestamp']))?$p_array['ag_timestamp']:$p_array['e_date'];
+                break;
+            case 'DATE_CALC':
                 $r=' ';
-            // Date are in $p_array['ag_date']
-            // or $p_array['e_date']
-            if ( isset ($p_array['ag_timestamp'])) {
-                $date=format_date($p_array['ag_timestamp'],'DD.MM.YYYY','YYYY-MM-DD');
-                $r=$date;
-            }
-            if ( isset ($p_array['e_date'])) {
-                $date=format_date($p_array['e_date'],'DD.MM.YYYY','YYYY-MM-DD');
-                $r=$date;
-            }
-            return $r;
-            break;
+                // Date are in $p_array['ag_date']
+                // or $p_array['e_date']
+                if (isset($p_array['ag_timestamp']))
+                {
+                    $date=format_date($p_array['ag_timestamp'], 'DD.MM.YYYY', 'YYYY-MM-DD');
+                    $r=$date;
+                }
+                if (isset($p_array['e_date']))
+                {
+                    $date=format_date($p_array['e_date'], 'DD.MM.YYYY', 'YYYY-MM-DD');
+                    $r=$date;
+                }
+                return $r;
+                break;
             //
             //  the company priv
 
-        case 'MY_NAME':
-            $r=$g_parameter->MY_NAME;
-            break;
-        case 'MY_CP':
-            $r=$g_parameter->MY_CP;
-            break;
-        case 'MY_COMMUNE':
-            $r=$g_parameter->MY_COMMUNE;
-            break;
-        case 'MY_TVA':
-            $r=$g_parameter->MY_TVA;
-            break;
-        case 'MY_STREET':
-            $r=$g_parameter->MY_STREET;
-            break;
-        case 'MY_NUMBER':
-            $r=$g_parameter->MY_NUMBER;
-            break;
-        case 'MY_TEL':
-            $r=$g_parameter->MY_TEL;
-            break;
-        case 'MY_FAX':
-            $r=$g_parameter->MY_FAX;
-            break;
-        case 'MY_PAYS':
-            $r=$g_parameter->MY_PAYS;
-            break;
+            case 'MY_NAME':
+                $r=$g_parameter->MY_NAME;
+                break;
+            case 'MY_CP':
+                $r=$g_parameter->MY_CP;
+                break;
+            case 'MY_COMMUNE':
+                $r=$g_parameter->MY_COMMUNE;
+                break;
+            case 'MY_TVA':
+                $r=$g_parameter->MY_TVA;
+                break;
+            case 'MY_STREET':
+                $r=$g_parameter->MY_STREET;
+                break;
+            case 'MY_NUMBER':
+                $r=$g_parameter->MY_NUMBER;
+                break;
+            case 'MY_TEL':
+                $r=$g_parameter->MY_TEL;
+                break;
+            case 'MY_FAX':
+                $r=$g_parameter->MY_FAX;
+                break;
+            case 'MY_PAYS':
+                $r=$g_parameter->MY_PAYS;
+                break;
 
             // customer
-            /*\note The CUST_* are retrieved thx the $p_array['tiers']
+            /* \note The CUST_* are retrieved thx the $p_array['tiers']
              * which contains the quick_code
              */
-        case 'SOLDE':
-            $tiers=new Fiche($this->db);
-            $qcode=isset($p_array['qcode_dest'])?$p_array['qcode_dest']:$p_array['e_client'];
-            $tiers->get_by_qcode($qcode,false);
-            $p=$tiers->strAttribut(ATTR_DEF_ACCOUNT);
-            $poste=new Acc_Account_Ledger($this->db,$p);
-            $r=$poste->get_solde(' true' );
-            break;
-        case 'CUST_NAME':
-            $tiers=new Fiche($this->db);
-            $qcode=isset($p_array['qcode_dest'])?$p_array['qcode_dest']:$p_array['e_client'];
-            $tiers->get_by_qcode($qcode,false);
-            $r=$tiers->strAttribut(ATTR_DEF_NAME);
-            break;
-        case 'CUST_ADDR_1':
-            $tiers=new Fiche($this->db);
-            $qcode=isset($p_array['qcode_dest'])?$p_array['qcode_dest']:$p_array['e_client'];
-            $tiers->get_by_qcode($qcode,false);
-            $r=$tiers->strAttribut(ATTR_DEF_ADRESS);
+            case 'SOLDE':
+                $tiers=new Fiche($this->db);
+                $qcode=isset($p_array['qcode_dest'])?$p_array['qcode_dest']:$p_array['e_client'];
+                $tiers->get_by_qcode($qcode, false);
+                $p=$tiers->strAttribut(ATTR_DEF_ACCOUNT);
+                $poste=new Acc_Account_Ledger($this->db, $p);
+                $r=$poste->get_solde(' true');
+                break;
+            case 'CUST_NAME':
+                $tiers=new Fiche($this->db);
+                $qcode=isset($p_array['qcode_dest'])?$p_array['qcode_dest']:$p_array['e_client'];
+                $tiers->get_by_qcode($qcode, false);
+                $r=$tiers->strAttribut(ATTR_DEF_NAME);
+                break;
+            case 'CUST_ADDR_1':
+                $tiers=new Fiche($this->db);
+                $qcode=isset($p_array['qcode_dest'])?$p_array['qcode_dest']:$p_array['e_client'];
+                $tiers->get_by_qcode($qcode, false);
+                $r=$tiers->strAttribut(ATTR_DEF_ADRESS);
 
-            break ;
-        case 'CUST_CP':
-            $tiers=new Fiche($this->db);
+                break;
+            case 'CUST_CP':
+                $tiers=new Fiche($this->db);
 
-            $qcode=isset($p_array['qcode_dest'])?$p_array['qcode_dest']:$p_array['e_client'];
-            $tiers->get_by_qcode($qcode,false);
-            $r=$tiers->strAttribut(ATTR_DEF_CP);
+                $qcode=isset($p_array['qcode_dest'])?$p_array['qcode_dest']:$p_array['e_client'];
+                $tiers->get_by_qcode($qcode, false);
+                $r=$tiers->strAttribut(ATTR_DEF_CP);
 
-            break;
-        case 'CUST_CITY':
-            $tiers=new Fiche($this->db);
+                break;
+            case 'CUST_CITY':
+                $tiers=new Fiche($this->db);
 
-            $qcode=isset($p_array['qcode_dest'])?$p_array['qcode_dest']:$p_array['e_client'];
-            $tiers->get_by_qcode($qcode,false);
-            $r=$tiers->strAttribut(ATTR_DEF_CITY);
+                $qcode=isset($p_array['qcode_dest'])?$p_array['qcode_dest']:$p_array['e_client'];
+                $tiers->get_by_qcode($qcode, false);
+                $r=$tiers->strAttribut(ATTR_DEF_CITY);
 
-            break;
+                break;
 
-        case 'CUST_CO':
-            $tiers=new Fiche($this->db);
+            case 'CUST_CO':
+                $tiers=new Fiche($this->db);
 
-            $qcode=isset($p_array['qcode_dest'])?$p_array['qcode_dest']:$p_array['e_client'];
-            $tiers->get_by_qcode($qcode,false);
-            $r=$tiers->strAttribut(ATTR_DEF_PAYS);
+                $qcode=isset($p_array['qcode_dest'])?$p_array['qcode_dest']:$p_array['e_client'];
+                $tiers->get_by_qcode($qcode, false);
+                $r=$tiers->strAttribut(ATTR_DEF_PAYS);
 
-            break;
+                break;
             // Marchandise in $p_array['e_march*']
             // \see user_form_achat.php or user_form_ven.php
-        case 'CUST_VAT':
-            $tiers=new Fiche($this->db);
+            case 'CUST_VAT':
+                $tiers=new Fiche($this->db);
 
-            $qcode=isset($p_array['qcode_dest'])?$p_array['qcode_dest']:$p_array['e_client'];
-            $tiers->get_by_qcode($qcode,false);
-            $r=$tiers->strAttribut(ATTR_DEF_NUMTVA);
-            break;
-        case 'CUST_NUM':
-            $tiers=new Fiche($this->db);
-            $qcode=isset($p_array['qcode_dest'])?$p_array['qcode_dest']:$p_array['e_client'];
-            $tiers->get_by_qcode($qcode,false);
-            $r=$tiers->strAttribut(ATTR_DEF_NUMBER_CUSTOMER);
-            break;
-        case 'CUST_BANQUE_NO':
-            $tiers=new Fiche($this->db);
-            $qcode=isset($p_array['qcode_dest'])?$p_array['qcode_dest']:$p_array['e_client'];
-            $tiers->get_by_qcode($qcode,false);
-            $r=$tiers->strAttribut(ATTR_DEF_BQ_NO);
-            break;
-        case 'CUST_BANQUE_NAME':
-            $tiers=new Fiche($this->db);
-            $qcode=isset($p_array['qcode_dest'])?$p_array['qcode_dest']:$p_array['e_client'];
-            $tiers->get_by_qcode($qcode,false);
-            $r=$tiers->strAttribut(ATTR_DEF_BQ_NAME);
-            break;
+                $qcode=isset($p_array['qcode_dest'])?$p_array['qcode_dest']:$p_array['e_client'];
+                $tiers->get_by_qcode($qcode, false);
+                $r=$tiers->strAttribut(ATTR_DEF_NUMTVA);
+                break;
+            case 'CUST_NUM':
+                $tiers=new Fiche($this->db);
+                $qcode=isset($p_array['qcode_dest'])?$p_array['qcode_dest']:$p_array['e_client'];
+                $tiers->get_by_qcode($qcode, false);
+                $r=$tiers->strAttribut(ATTR_DEF_NUMBER_CUSTOMER);
+                break;
+            case 'CUST_BANQUE_NO':
+                $tiers=new Fiche($this->db);
+                $qcode=isset($p_array['qcode_dest'])?$p_array['qcode_dest']:$p_array['e_client'];
+                $tiers->get_by_qcode($qcode, false);
+                $r=$tiers->strAttribut(ATTR_DEF_BQ_NO);
+                break;
+            case 'CUST_BANQUE_NAME':
+                $tiers=new Fiche($this->db);
+                $qcode=isset($p_array['qcode_dest'])?$p_array['qcode_dest']:$p_array['e_client'];
+                $tiers->get_by_qcode($qcode, false);
+                $r=$tiers->strAttribut(ATTR_DEF_BQ_NAME);
+                break;
             /* -------------------------------------------------------------------------------- */
             /* BENEFIT (fee notes */
-        case 'BENEF_NAME':
-            $tiers=new Fiche($this->db);
-            $qcode=isset($p_array['qcode_benef'])?$p_array['qcode_benef']:'';
-            if ( $qcode=='')
-            {
-                $r='';
+            case 'BENEF_NAME':
+                $tiers=new Fiche($this->db);
+                $qcode=isset($p_array['qcode_benef'])?$p_array['qcode_benef']:'';
+                if ($qcode=='')
+                {
+                    $r='';
+                    break;
+                }
+                $tiers->get_by_qcode($qcode, false);
+                $r=$tiers->strAttribut(ATTR_DEF_NAME);
                 break;
-            }
-            $tiers->get_by_qcode($qcode,false);
-            $r=$tiers->strAttribut(ATTR_DEF_NAME);
-            break;
-        case 'BENEF_ADDR_1':
-            $tiers=new Fiche($this->db);
-            $qcode=isset($p_array['qcode_benef'])?$p_array['qcode_benef']:'';
-            if ( $qcode=='')
-            {
-                $r='';
+            case 'BENEF_ADDR_1':
+                $tiers=new Fiche($this->db);
+                $qcode=isset($p_array['qcode_benef'])?$p_array['qcode_benef']:'';
+                if ($qcode=='')
+                {
+                    $r='';
+                    break;
+                }
+                $tiers->get_by_qcode($qcode, false);
+                $r=$tiers->strAttribut(ATTR_DEF_ADRESS);
+
                 break;
-            }
-            $tiers->get_by_qcode($qcode,false);
-            $r=$tiers->strAttribut(ATTR_DEF_ADRESS);
+            case 'BENEF_CP':
+                $tiers=new Fiche($this->db);
 
-            break ;
-        case 'BENEF_CP':
-            $tiers=new Fiche($this->db);
+                $qcode=isset($p_array['qcode_benef'])?$p_array['qcode_benef']:'';
+                if ($qcode=='')
+                {
+                    $r='';
+                    break;
+                }
+                $tiers->get_by_qcode($qcode, false);
+                $r=$tiers->strAttribut(ATTR_DEF_CP);
 
-            $qcode=isset($p_array['qcode_benef'])?$p_array['qcode_benef']:'';
-            if ( $qcode=='')
-            {
-                $r='';
                 break;
-            }
-            $tiers->get_by_qcode($qcode,false);
-            $r=$tiers->strAttribut(ATTR_DEF_CP);
+            case 'BENEF_CITY':
+                $tiers=new Fiche($this->db);
 
-            break;
-        case 'BENEF_CITY':
-            $tiers=new Fiche($this->db);
+                $qcode=isset($p_array['qcode_benef'])?$p_array['qcode_benef']:'';
+                if ($qcode=='')
+                {
+                    $r='';
+                    break;
+                }
+                $tiers->get_by_qcode($qcode, false);
+                $r=$tiers->strAttribut(ATTR_DEF_CITY);
 
-            $qcode=isset($p_array['qcode_benef'])?$p_array['qcode_benef']:'';
-            if ( $qcode=='')
-            {
-                $r='';
                 break;
-            }
-            $tiers->get_by_qcode($qcode,false);
-            $r=$tiers->strAttribut(ATTR_DEF_CITY);
 
-            break;
+            case 'BENEF_CO':
+                $tiers=new Fiche($this->db);
 
-        case 'BENEF_CO':
-            $tiers=new Fiche($this->db);
+                $qcode=isset($p_array['qcode_benef'])?$p_array['qcode_benef']:'';
+                if ($qcode=='')
+                {
+                    $r='';
+                    break;
+                }
+                $tiers->get_by_qcode($qcode, false);
+                $r=$tiers->strAttribut(ATTR_DEF_PAYS);
 
-            $qcode=isset($p_array['qcode_benef'])?$p_array['qcode_benef']:'';
-            if ( $qcode=='')
-            {
-                $r='';
                 break;
-            }
-            $tiers->get_by_qcode($qcode,false);
-            $r=$tiers->strAttribut(ATTR_DEF_PAYS);
-
-            break;
             // Marchandise in $p_array['e_march*']
             // \see user_form_achat.php or user_form_ven.php
-        case 'BENEF_VAT':
-            $tiers=new Fiche($this->db);
+            case 'BENEF_VAT':
+                $tiers=new Fiche($this->db);
 
-            $qcode=isset($p_array['qcode_benef'])?$p_array['qcode_benef']:'';
-            if ( $qcode=='')
-            {
-                $r='';
+                $qcode=isset($p_array['qcode_benef'])?$p_array['qcode_benef']:'';
+                if ($qcode=='')
+                {
+                    $r='';
+                    break;
+                }
+                $tiers->get_by_qcode($qcode, false);
+                $r=$tiers->strAttribut(ATTR_DEF_NUMTVA);
                 break;
-            }
-            $tiers->get_by_qcode($qcode,false);
-            $r=$tiers->strAttribut(ATTR_DEF_NUMTVA);
-            break;
-        case 'BENEF_NUM':
-            $tiers=new Fiche($this->db);
-            $qcode=isset($p_array['qcode_benef'])?$p_array['qcode_benef']:'';
-            if ( $qcode=='')
-            {
-                $r='';
+            case 'BENEF_NUM':
+                $tiers=new Fiche($this->db);
+                $qcode=isset($p_array['qcode_benef'])?$p_array['qcode_benef']:'';
+                if ($qcode=='')
+                {
+                    $r='';
+                    break;
+                }
+                $tiers->get_by_qcode($qcode, false);
+                $r=$tiers->strAttribut(ATTR_DEF_NUMBER_CUSTOMER);
                 break;
-            }
-            $tiers->get_by_qcode($qcode,false);
-            $r=$tiers->strAttribut(ATTR_DEF_NUMBER_CUSTOMER);
-            break;
-        case 'BENEF_BANQUE_NO':
-            $tiers=new Fiche($this->db);
-            $qcode=isset($p_array['qcode_benef'])?$p_array['qcode_benef']:'';
-            if ( $qcode=='')
-            {
-                $r='';
+            case 'BENEF_BANQUE_NO':
+                $tiers=new Fiche($this->db);
+                $qcode=isset($p_array['qcode_benef'])?$p_array['qcode_benef']:'';
+                if ($qcode=='')
+                {
+                    $r='';
+                    break;
+                }
+                $tiers->get_by_qcode($qcode, false);
+                $r=$tiers->strAttribut(ATTR_DEF_BQ_NO);
                 break;
-            }
-            $tiers->get_by_qcode($qcode,false);
-            $r=$tiers->strAttribut(ATTR_DEF_BQ_NO);
-            break;
-        case 'BENEF_BANQUE_NAME':
-            $tiers=new Fiche($this->db);
-            $qcode=isset($p_array['qcode_benef'])?$p_array['qcode_benef']:'';
-            if ( $qcode=='')
-            {
-                $r='';
+            case 'BENEF_BANQUE_NAME':
+                $tiers=new Fiche($this->db);
+                $qcode=isset($p_array['qcode_benef'])?$p_array['qcode_benef']:'';
+                if ($qcode=='')
+                {
+                    $r='';
+                    break;
+                }
+                $tiers->get_by_qcode($qcode, false);
+                $r=$tiers->strAttribut(ATTR_DEF_BQ_NAME);
                 break;
-            }
-            $tiers->get_by_qcode($qcode,false);
-            $r=$tiers->strAttribut(ATTR_DEF_BQ_NAME);
-            break;
 
             // Marchandise in $p_array['e_march*']
             // \see user_form_achat.php or user_form_ven.php
-        case 'NUMBER':
-            $r=$this->d_number;
-            break;
-        case "DOCUMENT_ID":
-            if (isset($p_array['ag_id'])) return $p_array['ag_id'];
-            return "";
-            break;
+            case 'NUMBER':
+                $r=$this->d_number;
+                break;
+            case "DOCUMENT_ID":
+                if (isset($p_array['ag_id']))
+                    return $p_array['ag_id'];
+                return "";
+                break;
 
-        case 'USER' :
-            return $_SESSION[SESSION_KEY.'use_name'].', '.$_SESSION[SESSION_KEY.'use_first_name'];
+            case 'USER' :
+                return $_SESSION[SESSION_KEY.'use_name'].', '.$_SESSION[SESSION_KEY.'use_first_name'];
 
-            break;
-        case 'REFERENCE':
-            $act=new Follow_Up($this->db);
-            $act->ag_id=$this->ag_id;
-            $act->get();
-            $r=$act->ag_ref;
-            break;
+                break;
+            case 'REFERENCE':
+                $act=new Follow_Up($this->db);
+                $act->ag_id=$this->ag_id;
+                $act->get();
+                $r=$act->ag_ref;
+                break;
 
             /*
              *  - [VEN_ART_NAME]
@@ -844,413 +889,453 @@ class Document
              *  - [TOTAL_VEN_HTVA]
              *  - [DATE_LIMIT]
              */
-        case 'DATE_LIMIT_CALC':
-            if ( isset ($p_array["e_ech"] )) 
-                    return format_date($p_array["e_ech"],'DD.MM.YYYY','YYYY-MM-DD');
-            if ( isset ($p_array["ech"] )) 
-                    return format_date($p_array["ech"],'DD.MM.YYYY','YYYY-MM-DD');
-            if ( isset ($p_array["ag_remind_date"] )) 
-                    return format_date($p_array["ag_remind_date"],'DD.MM.YYYY','YYYY-MM-DD');
-            return "";
+            case 'DATE_LIMIT_CALC':
+                if (isset($p_array["e_ech"]))
+                    return format_date($p_array["e_ech"], 'DD.MM.YYYY', 'YYYY-MM-DD');
+                if (isset($p_array["ech"]))
+                    return format_date($p_array["ech"], 'DD.MM.YYYY', 'YYYY-MM-DD');
+                if (isset($p_array["ag_remind_date"]))
+                    return format_date($p_array["ag_remind_date"], 'DD.MM.YYYY', 'YYYY-MM-DD');
+                return "";
                 break;
-      case 'DATE_LIMIT':
-              if ( isset ($p_array["ech"] )) 
+            case 'DATE_LIMIT':
+                if (isset($p_array["ech"]))
                     return $p_array["ech"];
-             if ( isset ($p_array["e_ech"] )) 
+                if (isset($p_array["e_ech"]))
                     return $p_array["e_ech"];
-            if ( isset ($p_array["ag_remind_date"] )) 
+                if (isset($p_array["ag_remind_date"]))
                     return $p_array["ag_remind_date"];
-            return "";
-            break;
-        case 'MARCH_NEXT':
-            $this->counter++;
-            $r='';
-            break;
+                return "";
+                break;
+            case 'MARCH_NEXT':
+                $this->counter++;
+                $r='';
+                break;
 
-        case 'VEN_ART_NAME':
-            // check if the march exists
-            if ( ! isset ($p_array["e_march".$this->counter])) return "";
-            // check that something is sold
-            if ( $p_array['e_march'.$this->counter.'_price'] != 0 && $p_array['e_quant'.$this->counter] != 0 )
-            {
-                $f=new Fiche($this->db);
-                $f->get_by_qcode($p_array["e_march".$this->counter],false);
-                $r=$f->strAttribut(ATTR_DEF_NAME);
-            }
-            else $r = "";
-            break;
-       case 'VEN_ART_LABEL':
-            $id='e_march'.$this->counter."_label";
-            // check if the march exists
-
-            if (! isset ($p_array[$id]) || (isset ($p_array[$id]) && strlen(trim($p_array[$id])) == 0))
+            case 'VEN_ART_NAME':
+                // check if the march exists
+                if (!isset($p_array["e_march".$this->counter]))
+                    return "";
+                // check that something is sold
+                if ($p_array['e_march'.$this->counter.'_price']!=0&&$p_array['e_quant'.$this->counter]!=0)
                 {
-                    $id = 'e_march' . $this->counter;
+                    $f=new Fiche($this->db);
+                    $f->get_by_qcode($p_array["e_march".$this->counter], false);
+                    $r=$f->strAttribut(ATTR_DEF_NAME);
+                }
+                else
+                    $r="";
+                break;
+            case 'VEN_ART_LABEL':
+                $id='e_march'.$this->counter."_label";
+                // check if the march exists
+
+                if (!isset($p_array[$id])||(isset($p_array[$id])&&strlen(trim($p_array[$id]))==0))
+                {
+                    $id='e_march'.$this->counter;
                     // check if the march exists
                     if (!isset($p_array[$id]))
-                        $r= "";
-                    else 
+                        $r="";
+                    else
                     {
-                    // check that something is sold
-                        if ($p_array['e_march'.$this->counter. '_price'] != 0 
-                                && $p_array['e_quant' . $this->counter] != 0)
+                        // check that something is sold
+                        if ($p_array['e_march'.$this->counter.'_price']!=0&&$p_array['e_quant'.$this->counter]!=0)
                         {
-                            $f = new Fiche($this->db);
+                            $f=new Fiche($this->db);
                             $f->get_by_qcode($p_array[$id], false);
-                            $r = $f->strAttribut(ATTR_DEF_NAME);
-                        } else
-                            $r = "";
+                            $r=$f->strAttribut(ATTR_DEF_NAME);
+                        }
+                        else
+                            $r="";
                     }
                 }
                 else
                     $r=$p_array[$id];
-            break;
-        case 'VEN_ART_STOCK_CODE':
-                    $id = 'e_march' . $this->counter;
-                    // check if the march exists
-                    if (!isset($p_array[$id]))
-                        $r= "";
-                    else 
-                    {
+                break;
+            case 'VEN_ART_STOCK_CODE':
+                $id='e_march'.$this->counter;
+                // check if the march exists
+                if (!isset($p_array[$id]))
+                    $r="";
+                else
+                {
                     // check that something is sold
-                        if ($p_array['e_march' . $this->counter . '_price'] != 0 
-                                && $p_array['e_quant' . $this->counter] != 0)
-                        {
-                            $f = new Fiche($this->db);
-                            $f->get_by_qcode($p_array[$id], false);
-                            $r = $f->strAttribut(ATTR_DEF_STOCK);
-                            $r=($r == NOTFOUND)?'':$r;
-                        } 
+                    if ($p_array['e_march'.$this->counter.'_price']!=0&&$p_array['e_quant'.$this->counter]!=0)
+                    {
+                        $f=new Fiche($this->db);
+                        $f->get_by_qcode($p_array[$id], false);
+                        $r=$f->strAttribut(ATTR_DEF_STOCK);
+                        $r=($r==NOTFOUND)?'':$r;
                     }
-            break;
-        case 'VEN_QCODE':
-            $id='e_march'.$this->counter ;
-            if ( !isset ($p_array[$id]) ) return "";
-            return $p_array[$id];
-            break;
-        case 'VEN_ART_PRICE':
-            $id='e_march'.$this->counter.'_price' ;
-            if ( !isset ($p_array[$id]) ) return "";
-			if ( $p_array[$id]  == 0 ) return "";
-            $r=$p_array[$id];
-            break;
+                }
+                break;
+            case 'VEN_QCODE':
+                $id='e_march'.$this->counter;
+                if (!isset($p_array[$id]))
+                    return "";
+                return $p_array[$id];
+                break;
+            case 'VEN_ART_PRICE':
+                $id='e_march'.$this->counter.'_price';
+                if (!isset($p_array[$id]))
+                    return "";
+                if ($p_array[$id]==0)
+                    return "";
+                $r=$p_array[$id];
+                break;
 
-        case 'TVA_RATE':
-        case 'VEN_ART_TVA_RATE':
-            $id='e_march'.$this->counter.'_tva_id';
-            if ( !isset ($p_array[$id]) ) return "";
-            if ( $p_array[$id] == -1 || $p_array[$id]=='' ) return "";
-            $march_id='e_march'.$this->counter.'_price' ;
-            if ( ! isset ($p_array[$march_id])) return '';
-            $tva=new Acc_Tva($this->db);
-            $tva->set_parameter("id",$p_array[$id]);
-            if ( $tva->load() == -1) return '';
-            return $tva->get_parameter("rate");
-            break;
+            case 'TVA_RATE':
+            case 'VEN_ART_TVA_RATE':
+                $id='e_march'.$this->counter.'_tva_id';
+                if (!isset($p_array[$id]))
+                    return "";
+                if ($p_array[$id]==-1||$p_array[$id]=='')
+                    return "";
+                $march_id='e_march'.$this->counter.'_price';
+                if (!isset($p_array[$march_id]))
+                    return '';
+                $tva=new Acc_Tva($this->db);
+                $tva->set_parameter("id", $p_array[$id]);
+                if ($tva->load()==-1)
+                    return '';
+                return $tva->get_parameter("rate");
+                break;
 
-        case 'TVA_CODE':
-        case 'VEN_ART_TVA_CODE':
-            $id='e_march'.$this->counter.'_tva_id';
-            if ( !isset ($p_array[$id]) ) return "";
-            if ( $p_array[$id] == -1 ) return "";
-            $qt='e_quant'.$this->counter;
-            $price='e_march'.$this->counter.'_price' ;
-            if ( $p_array[$price] == 0 || $p_array[$qt] == 0
-                    || strlen(trim( $p_array[$price] )) ==0
-                    || strlen(trim($p_array[$qt])) ==0)
-                return "";
+            case 'TVA_CODE':
+            case 'VEN_ART_TVA_CODE':
+                $id='e_march'.$this->counter.'_tva_id';
+                if (!isset($p_array[$id]))
+                    return "";
+                if ($p_array[$id]==-1)
+                    return "";
+                $qt='e_quant'.$this->counter;
+                $price='e_march'.$this->counter.'_price';
+                if ($p_array[$price]==0||$p_array[$qt]==0||strlen(trim($p_array[$price]))==0||strlen(trim($p_array[$qt]))==0)
+                    return "";
 
-            $r=$p_array[$id];
-            break;
+                $r=$p_array[$id];
+                break;
 
-        case 'TVA_LABEL':
-            $id='e_march'.$this->counter.'_tva_id';
-            if ( !isset ($p_array[$id]) ) return "";
-            $march_id='e_march'.$this->counter.'_price' ;
-            if ( ! isset ($p_array[$march_id])) return '';
-            if ( $p_array[$march_id] == 0) return '';
-            $tva=new Acc_Tva($this->db,$p_array[$id]);
-            if ($tva->load() == -1 ) return "";
-            $r=$tva->get_parameter('label');
+            case 'TVA_LABEL':
+                $id='e_march'.$this->counter.'_tva_id';
+                if (!isset($p_array[$id]))
+                    return "";
+                $march_id='e_march'.$this->counter.'_price';
+                if (!isset($p_array[$march_id]))
+                    return '';
+                if ($p_array[$march_id]==0)
+                    return '';
+                $tva=new Acc_Tva($this->db, $p_array[$id]);
+                if ($tva->load()==-1)
+                    return "";
+                $r=$tva->get_parameter('label');
 
-            break;
+                break;
 
             /* total VAT for one sold */
-        case 'TVA_AMOUNT':
-        case 'VEN_TVA':
-            $qt='e_quant'.$this->counter;
-            $price='e_march'.$this->counter.'_price' ;
-            $tva='e_march'.$this->counter.'_tva_id';
-            /* if we do not use vat this var. is not set */
-            if ( !isset($p_array[$tva]) ) return '';
-            if ( !isset ($p_array [ 'e_march'.$this->counter ]) ) return "";
-             if ( !isset ($p_array[$tva]) ) return "";
-            // check that something is sold
-            if ( $p_array[$price] == 0 || $p_array[$qt] == 0
-                    || strlen(trim( $p_array[$price] )) ==0
-                    || strlen(trim($p_array[$qt])) ==0)
-                return "";
-            $r=$p_array['e_march'.$this->counter.'_tva_amount'];
-            break;
-            /* TVA automatically computed */
-        case 'VEN_ART_TVA':
-        
-            $qt='e_quant'.$this->counter;
-            $price='e_march'.$this->counter.'_price' ;
-            $tva='e_march'.$this->counter.'_tva_id';
-            if ( !isset ($p_array['e_march'.$this->counter]) ) return "";
-            if ( !isset ($p_array[$tva]) ) return "";
-            // check that something is sold
-            if ( $p_array[$price] == 0 || $p_array[$qt] == 0
-                    || strlen(trim( $p_array[$price] )) ==0
-                    || strlen(trim($p_array[$qt])) ==0)
-                return "";
-            $oTva=new Acc_Tva($this->db,$p_array[$tva]);
-            if ($oTva->load() == -1 ) return "";
-            $r=round($p_array[$price],2)*$oTva->get_parameter('rate');
-            $r=round($r,2);
-            break;
-
-        case 'VEN_ART_TVAC':
-            $qt='e_quant'.$this->counter;
-            $price='e_march'.$this->counter.'_price' ;
-            if ( !isset ($p_array['e_march'.$this->counter]) ) return "";
-             if ( !isset ($p_array['e_march'.$this->counter.'_tva_id']) ) return "";
-            // check that something is sold
-            if ( $p_array[$price] == 0 || $p_array[$qt] == 0
-                    || strlen(trim( $p_array[$price] )) ==0
-                    || strlen(trim($p_array[$qt])) ==0)
-                return "";
-            if ( ! isset ($p_array['e_march'.$this->counter.'_tva_id']) ) return '';
-            $tva=new Acc_Tva($this->db,$p_array['e_march'.$this->counter.'_tva_id'] );
-            if ($tva->load() == -1 )
-            {
-                $r=round($p_array[$price],2);
-            }
-            else
-            {
-                $r=round($p_array[$price]*$tva->get_parameter('rate')+$p_array[$price],2);
-            }
-
-            break;
-
-        case 'VEN_ART_QUANT':
-            $id='e_quant'.$this->counter;
-            if ( !isset ($p_array[$id]) ) return "";
-            // check that something is sold
-            if ( $p_array['e_march'.$this->counter.'_price'] == 0
-                    || $p_array['e_quant'.$this->counter] == 0
-                    || strlen(trim( $p_array['e_march'.$this->counter.'_price'] )) ==0
-                    || strlen(trim($p_array['e_quant'.$this->counter])) ==0 )
-                return "";
-            $r=$p_array[$id];
-            break;
-
-        case 'VEN_HTVA':
-            $id='e_march'.$this->counter.'_price' ;
-            $quant='e_quant'.$this->counter;
-            if ( !isset ($p_array[$id]) ) return "";
-
-            // check that something is sold
-            if ( $p_array['e_march'.$this->counter.'_price'] == 0 || $p_array['e_quant'.$this->counter] == 0
-                    || strlen(trim( $p_array['e_march'.$this->counter.'_price'] )) ==0
-                    || strlen(trim($p_array['e_quant'.$this->counter])) ==0)
-                return "";
-			bcscale(4);
-            $r=bcmul($p_array[$id],$p_array[$quant]);
-			$r=round($r,2);
-            break;
-
-        case 'VEN_TVAC':
-            $id='e_march'.$this->counter.'_tva_amount' ;
-            $price='e_march'.$this->counter.'_price' ;
-            $quant='e_quant'.$this->counter;
-            if ( ! isset($p_array['e_march'.$this->counter.'_price'])|| !isset($p_array['e_quant'.$this->counter])) {
-                return "";
-            }
-            // check that something is sold
-            if ( $p_array['e_march'.$this->counter.'_price'] == 0 || $p_array['e_quant'.$this->counter] == 0 ) { return "";}
-			bcscale(4);
-            // if TVA not exist
-            if ( ! isset($p_array[$id]))
-                $r=  bcmul($p_array[$price],$p_array[$quant]);
-            else{
-                $r=  bcmul($p_array[$price],$p_array[$quant]);
-                $r=bcadd($r,$p_array[$id]);
-			}
-			$r=round($r,2);
-			return $r;
-            break;
-
-        case 'TOTAL_VEN_HTVA':
-            bcscale(4);
-            $sum=0.0;
-            if ( !isset($p_array["nb_item"]) ) return "";
-            for ($i=0;$i<$p_array["nb_item"];$i++)
-            {
-                $sell='e_march'.$i.'_price';
-                $qt='e_quant'.$i;
-
-                if ( ! isset ($p_array[$sell]) ) break;
-
-                if ( strlen(trim($p_array[$sell])) == 0 ||
-                        strlen(trim($p_array[$qt])) == 0 ||
-                        $p_array[$qt]==0 || $p_array[$sell]==0)
-                    continue;
-                $tmp1=bcmul($p_array[$sell],$p_array[$qt]);
-                $sum=bcadd($sum,$tmp1);
-
-
-            }
-            $r=round($sum,2);
-            break;
-        case 'TOTAL_VEN_TVAC':
-            if ( !isset($p_array["nb_item"]) ) return "";
-            $sum=0.0;
-            bcscale(4);
-            for ($i=0;$i<$p_array["nb_item"];$i++)
-            {
-                $tva='e_march'.$i.'_tva_amount';
-                $tva_amount=0;
+            case 'TVA_AMOUNT':
+            case 'VEN_TVA':
+                $qt='e_quant'.$this->counter;
+                $price='e_march'.$this->counter.'_price';
+                $tva='e_march'.$this->counter.'_tva_id';
                 /* if we do not use vat this var. is not set */
-                if ( isset($p_array[$tva]) )
+                if (!isset($p_array[$tva]))
+                    return '';
+                if (!isset($p_array ['e_march'.$this->counter]))
+                    return "";
+                if (!isset($p_array[$tva]))
+                    return "";
+                // check that something is sold
+                if ($p_array[$price]==0||$p_array[$qt]==0||strlen(trim($p_array[$price]))==0||strlen(trim($p_array[$qt]))==0)
+                    return "";
+                $r=$p_array['e_march'.$this->counter.'_tva_amount'];
+                break;
+            /* TVA automatically computed */
+            case 'VEN_ART_TVA':
+
+                $qt='e_quant'.$this->counter;
+                $price='e_march'.$this->counter.'_price';
+                $tva='e_march'.$this->counter.'_tva_id';
+                if (!isset($p_array['e_march'.$this->counter]))
+                    return "";
+                if (!isset($p_array[$tva]))
+                    return "";
+                // check that something is sold
+                if ($p_array[$price]==0||$p_array[$qt]==0||strlen(trim($p_array[$price]))==0||strlen(trim($p_array[$qt]))==0)
+                    return "";
+                $oTva=new Acc_Tva($this->db, $p_array[$tva]);
+                if ($oTva->load()==-1)
+                    return "";
+                $r=round($p_array[$price], 2)*$oTva->get_parameter('rate');
+                $r=round($r, 2);
+                break;
+
+            case 'VEN_ART_TVAC':
+                $qt='e_quant'.$this->counter;
+                $price='e_march'.$this->counter.'_price';
+                if (!isset($p_array['e_march'.$this->counter]))
+                    return "";
+                if (!isset($p_array['e_march'.$this->counter.'_tva_id']))
+                    return "";
+                // check that something is sold
+                if ($p_array[$price]==0||$p_array[$qt]==0||strlen(trim($p_array[$price]))==0||strlen(trim($p_array[$qt]))==0)
+                    return "";
+                if (!isset($p_array['e_march'.$this->counter.'_tva_id']))
+                    return '';
+                $tva=new Acc_Tva($this->db, $p_array['e_march'.$this->counter.'_tva_id']);
+                if ($tva->load()==-1)
                 {
-                    $tva_amount=$p_array[$tva];
+                    $r=round($p_array[$price], 2);
+                }
+                else
+                {
+                    $r=round($p_array[$price]*$tva->get_parameter('rate')+$p_array[$price], 2);
                 }
-                $sell=$p_array['e_march'.$i.'_price'];
-                $qt=$p_array['e_quant'.$i];
-                $tot=bcmul($sell,$qt);
-                $tot=bcadd($tot,$tva_amount);
-                $sum=bcadd($sum,$tot);
-            }
-            $r=round($sum,2);
 
-            break;
-        case 'TOTAL_TVA':
-            if ( !isset($p_array["nb_item"]) ) return "";
-            $sum=0.0;
-            for ($i=0;$i<$p_array["nb_item"];$i++)
-            {
-                $tva='e_march'.$i.'_tva_amount';
-                if (! isset($p_array[$tva])) $tva_amount=0.0;
-                else {
-                    $tva_amount=$p_array[$tva];
-                    $tva_amount=($tva_amount=="")?0:$tva_amount;
-                }
-                $sum+=$tva_amount;
-                $sum=round($sum,2);
-            }
-            $r=$sum;
+                break;
 
-            break;
-        case 'BON_COMMANDE':
-            if ( isset($p_array['bon_comm']))
-                return $p_array['bon_comm'];
-            else
-                return "";
-            break;
-        case 'PJ':
-            if ( isset($p_array['e_pj']))
-                return $p_array['e_pj'];
-            else
-                return "";
+            case 'VEN_ART_QUANT':
+                $id='e_quant'.$this->counter;
+                if (!isset($p_array[$id]))
+                    return "";
+                // check that something is sold
+                if ($p_array['e_march'.$this->counter.'_price']==0||$p_array['e_quant'.$this->counter]==0||strlen(trim($p_array['e_march'.$this->counter.'_price']))==0||strlen(trim($p_array['e_quant'.$this->counter]))==0)
+                    return "";
+                $r=$p_array[$id];
+                break;
 
-        case 'OTHER_INFO':
-            if ( isset($p_array['other_info']))
-                return $p_array['other_info'];
-            else
+            case 'VEN_HTVA':
+                $id='e_march'.$this->counter.'_price';
+                $quant='e_quant'.$this->counter;
+                if (!isset($p_array[$id]))
+                    return "";
+
+                // check that something is sold
+                if ($p_array['e_march'.$this->counter.'_price']==0||$p_array['e_quant'.$this->counter]==0||strlen(trim($p_array['e_march'.$this->counter.'_price']))==0||strlen(trim($p_array['e_quant'.$this->counter]))==0)
+                    return "";
+                bcscale(4);
+                $r=bcmul($p_array[$id], $p_array[$quant]);
+                $r=round($r, 2);
+                break;
+
+            case 'VEN_TVAC':
+                $id='e_march'.$this->counter.'_tva_amount';
+                $price='e_march'.$this->counter.'_price';
+                $quant='e_quant'.$this->counter;
+                if (!isset($p_array['e_march'.$this->counter.'_price'])||!isset($p_array['e_quant'.$this->counter]))
+                {
+                    return "";
+                }
+                // check that something is sold
+                if ($p_array['e_march'.$this->counter.'_price']==0||$p_array['e_quant'.$this->counter]==0)
+                {
+                    return "";
+                }
+                bcscale(4);
+                // if TVA not exist
+                if (!isset($p_array[$id]))
+                    $r=bcmul($p_array[$price], $p_array[$quant]);
+                else
+                {
+                    $r=bcmul($p_array[$price], $p_array[$quant]);
+                    $r=bcadd($r, $p_array[$id]);
+                }
+                $r=round($r, 2);
+                return $r;
+                break;
+
+            case 'TOTAL_VEN_HTVA':
+                bcscale(4);
+                $sum=0.0;
+                if (!isset($p_array["nb_item"]))
+                    return "";
+                for ($i=0; $i<$p_array["nb_item"]; $i++)
+                {
+                    $sell='e_march'.$i.'_price';
+                    $qt='e_quant'.$i;
+
+                    if (!isset($p_array[$sell]))
+                        break;
+
+                    if (strlen(trim($p_array[$sell]))==0||
+                            strlen(trim($p_array[$qt]))==0||
+                            $p_array[$qt]==0||$p_array[$sell]==0)
+                        continue;
+                    $tmp1=bcmul($p_array[$sell], $p_array[$qt]);
+                    $sum=bcadd($sum, $tmp1);
+                }
+                $r=round($sum, 2);
+                break;
+            case 'TOTAL_VEN_TVAC':
+                if (!isset($p_array["nb_item"]))
+                    return "";
+                $sum=0.0;
+                bcscale(4);
+                for ($i=0; $i<$p_array["nb_item"]; $i++)
+                {
+                    $tva='e_march'.$i.'_tva_amount';
+                    $tva_amount=0;
+                    /* if we do not use vat this var. is not set */
+                    if (isset($p_array[$tva]))
+                    {
+                        $tva_amount=$p_array[$tva];
+                    }
+                    $sell=$p_array['e_march'.$i.'_price'];
+                    $qt=$p_array['e_quant'.$i];
+                    $tot=bcmul($sell, $qt);
+                    $tot=bcadd($tot, $tva_amount);
+                    $sum=bcadd($sum, $tot);
+                }
+                $r=round($sum, 2);
+
+                break;
+            case 'TOTAL_TVA':
+                if (!isset($p_array["nb_item"]))
+                    return "";
+                $sum=0.0;
+                for ($i=0; $i<$p_array["nb_item"]; $i++)
+                {
+                    $tva='e_march'.$i.'_tva_amount';
+                    if (!isset($p_array[$tva]))
+                        $tva_amount=0.0;
+                    else
+                    {
+                        $tva_amount=$p_array[$tva];
+                        $tva_amount=($tva_amount=="")?0:$tva_amount;
+                    }
+                    $sum+=$tva_amount;
+                    $sum=round($sum, 2);
+                }
+                $r=$sum;
+
+                break;
+            case 'BON_COMMANDE':
+                if (isset($p_array['bon_comm']))
+                    return $p_array['bon_comm'];
+                else
+                    return "";
+                break;
+            case 'PJ':
+                if (isset($p_array['e_pj']))
+                    return $p_array['e_pj'];
+                else
+                    return "";
+
+            case 'OTHER_INFO':
+                if (isset($p_array['other_info']))
+                    return $p_array['other_info'];
+                else
+                    return "";
+                break;
+            case 'LABELOP':
+                if (isset($p_array['e_comm']))
+                    return $p_array['e_comm'];
+                break;
+            case 'ACOMPTE':
+                if (isset($p_array['acompte']))
+                    return $p_array['acompte'];
+                return "0";
+                break;
+            case 'STOCK_NAME':
+                if (!isset($p_array['repo']))
+                    return "";
+                $ret=$this->db->get_value('select r_name from public.stock_repository where r_id=$1',
+                        array($p_array['repo']));
+                return $ret;
+            case 'STOCK_ADRESS':
+                if (!isset($p_array['repo']))
+                    return "";
+                $ret=$this->db->get_value('select r_adress from public.stock_repository where r_id=$1',
+                        array($p_array['repo']));
+                return $ret;
+            case 'STOCK_COUNTRY':
+                if (!isset($p_array['repo']))
+                    return "";
+                $ret=$this->db->get_value('select r_country from public.stock_repository where r_id=$1',
+                        array($p_array['repo']));
+                return $ret;
+            case 'STOCK_CITY':
+                if (!isset($p_array['repo']))
+                    return "";
+                $ret=$this->db->get_value('select r_city from public.stock_repository where r_id=$1',
+                        array($p_array['repo']));
+                return $ret;
+            case 'STOCK_PHONE':
+                if (!isset($p_array['repo']))
+                    return "";
+                $ret=$this->db->get_value('select r_phone from public.stock_repository where r_id=$1',
+                        array($p_array['repo']));
+                return $ret;
+            // Follow up
+            //Title
+            case 'TITLE':
+                if (isset($p_array['ag_title']))
+                    return $p_array['ag_title'];
                 return "";
-            break;
-        case 'LABELOP':
-            if ( isset($p_array['e_comm']))
-                return $p_array['e_comm'];
-            break;
-        case 'ACOMPTE':
-            if ( isset($p_array['acompte']))
-                return $p_array['acompte'];
-			return "0";
-            break;
-        case 'STOCK_NAME':
-                if ( ! isset ($p_array['repo'])) return "";
-                $ret=$this->db->get_value('select r_name from public.stock_repository where r_id=$1',array($p_array['repo']));
-                return $ret;
-        case 'STOCK_ADRESS':
-                if ( ! isset ($p_array['repo'])) return "";
-                $ret=$this->db->get_value('select r_adress from public.stock_repository where r_id=$1',array($p_array['repo']));
-                return $ret;
-        case 'STOCK_COUNTRY':
-                if ( ! isset ($p_array['repo'])) return "";
-                $ret=$this->db->get_value('select r_country from public.stock_repository where r_id=$1',array($p_array['repo']));
-                return $ret;
-        case 'STOCK_CITY':
-                if ( ! isset ($p_array['repo'])) return "";
-                $ret=$this->db->get_value('select r_city from public.stock_repository where r_id=$1',array($p_array['repo']));
-                return $ret;
-        case 'STOCK_PHONE':
-                if ( ! isset ($p_array['repo'])) return "";
-                $ret=$this->db->get_value('select r_phone from public.stock_repository where r_id=$1',array($p_array['repo']));
-                return $ret;
-        // Follow up
-        //Title
-        case 'TITLE':
-            if ( isset($p_array['ag_title']))                 return $p_array['ag_title'];
-            return "";
-            break;
-        // Description is the first comment
-        case 'DESCRIPTION':
-            if ( isset($p_array['ag_id'])) {
-                // retrieve first comment
-                $description=$this->db->get_value("select agc_comment "
-                        . "  from action_gestion_comment "
-                        . "where ag_id=$1 order by AGC_ID asc limit 1"
-                        ,[$p_array['ag_id']]);
-                return $description;
-            }
-            if ( isset($p_array['e_comm'])) {return $p_array['e_comm'] ; }
-            
-            return "";
-            break;
-      
-        // Comments, use a counter to move to the next comment, only for Follow-Up
-        //
-        case 'COMMENT':
-            if ( isset($p_array['ag_id'])) {
-                // Static value, if null the retrieve all of them
-                if ( $aComment == NULL ) {
-                    // retrieve comments
-                    $aComment=$this->db->get_array("select AGC_ID,agc_comment ,"
-                            ." to_char(agc_date,'DD-MM-YY HH24:MI') as str_date ,"
-                            . " tech_user "
-                            . "  from action_gestion_comment "
-                            . "where ag_id=$1 order by 1"
-                            ,[$p_array['ag_id']]);
+                break;
+            // Description is the first comment
+            case 'DESCRIPTION':
+                if (isset($p_array['ag_id']))
+                {
+                    // retrieve first comment
+                    $description=$this->db->get_value("select agc_comment "
+                            ."  from action_gestion_comment "
+                            ."where ag_id=$1 order by AGC_ID asc limit 1"
+                            , [$p_array['ag_id']]);
+                    return $description;
                 }
-                $nb_comment=count($aComment);
-                $description="";
-                if (count ($aComment) >  $counter_comment) {
-                    $description.= sprintf(_('le %s , %s écrit %s'),
-                            $aComment[$counter_comment]['str_date'],
-                            $aComment[$counter_comment]['tech_user'],
-                            $aComment[$counter_comment]['agc_comment']);
-                    $counter_comment++;
+                if (isset($p_array['e_comm']))
+                {
+                    return $p_array['e_comm'];
                 }
-                return $description;
-            }
-            return "";
-            break;
-        // Related Action, use a counter to move to the next related action, only for Follow-Up
-        //
-        case 'RELATED_ACTION':
-            if ( isset($p_array['ag_id'])) {
-                // Static value, if null the retrieve all of them
-                if ( $aRelatedAction == NULL ) {
-                    // retrieve parent
-                    $followup=new Follow_Up($this->db,$p_array["ag_id"]);
-                    $aRelatedAction=array();
-                    $aParent=$followup->get_parent();
-                    if ($aParent == -1 )return "";
-                    $nb_parent=count($aParent);
-                    $sql_related_action = "
+
+                return "";
+                break;
+
+            // Comments, use a counter to move to the next comment, only for Follow-Up
+            //
+            case 'COMMENT':
+                if (isset($p_array['ag_id']))
+                {
+                    // Static value, if null the retrieve all of them
+                    if ($aComment==NULL)
+                    {
+                        // retrieve comments
+                        $aComment=$this->db->get_array("select AGC_ID,agc_comment ,"
+                                ." to_char(agc_date,'DD-MM-YY HH24:MI') as str_date ,"
+                                ." tech_user "
+                                ."  from action_gestion_comment "
+                                ."where ag_id=$1 order by 1"
+                                , [$p_array['ag_id']]);
+                    }
+                    $nb_comment=count($aComment);
+                    $description="";
+                    if (count($aComment)>$counter_comment)
+                    {
+                        $description.=sprintf(_('le %s , %s écrit %s'), $aComment[$counter_comment]['str_date'],
+                                $aComment[$counter_comment]['tech_user'], $aComment[$counter_comment]['agc_comment']);
+                        $counter_comment++;
+                    }
+                    return $description;
+                }
+                return "";
+                break;
+            // Related Action, use a counter to move to the next related action, only for Follow-Up
+            //
+            case 'RELATED_ACTION':
+                if (isset($p_array['ag_id']))
+                {
+                    // Static value, if null the retrieve all of them
+                    if ($aRelatedAction==NULL)
+                    {
+                        // retrieve parent
+                        $followup=new Follow_Up($this->db, $p_array["ag_id"]);
+                        $aRelatedAction=array();
+                        $aParent=$followup->get_parent();
+                        if ($aParent==-1)
+                            return "";
+                        $nb_parent=count($aParent);
+                        $sql_related_action="
                  select ag_id,
                     f_id_dest,
                     (select ad_value from fiche_detail fd1 where fd1.ad_id=23 and fd1.f_id=f_id_dest) as qcode,
@@ -1260,46 +1345,49 @@ class Document
                     to_char(ag_timestamp,'DD.MM.YYYY') as strdate,
                     ag_ref
                     from action_gestion ag where ag_id=$1 ";
-                    
-                    for ($x = 0 ; $x < $nb_parent ; $x++ )
-                    {
-                        $aRelatedAction[]=$this->db->get_row($sql_related_action,[$aParent[$x]['aga_least']]);
-                        $aChild=$followup->get_children($aParent[$x]['aga_least']);
-                        $nb_child=count($aChild);
-                        for ($y=0;$y < $nb_child;$y++) {
-                            $aRelatedAction[]=$this->db->get_row($sql_related_action,[ $aChild[$y]['aga_greatest'] ]);
+
+                        for ($x=0; $x<$nb_parent; $x++)
+                        {
+                            $aRelatedAction[]=$this->db->get_row($sql_related_action, [$aParent[$x]['aga_least']]);
+                            $aChild=$followup->get_children($aParent[$x]['aga_least']);
+                            $nb_child=count($aChild);
+                            for ($y=0; $y<$nb_child; $y++)
+                            {
+                                $aRelatedAction[]=$this->db->get_row($sql_related_action,
+                                        [$aChild[$y]['aga_greatest']]);
+                            }
                         }
-                        
                     }
-                    
+                    $description="";
+                    if (count($aRelatedAction)>$counter_related_action)
+                    {
+                        $description=sprintf("docid %s %s %s %s %s %s %s",
+                                $aRelatedAction[$counter_related_action]['ag_id'],
+                                $aRelatedAction[$counter_related_action]['ag_ref'],
+                                $aRelatedAction[$counter_related_action]['strdate'],
+                                $aRelatedAction[$counter_related_action]['qcode'],
+                                $aRelatedAction[$counter_related_action]['card_fname'],
+                                $aRelatedAction[$counter_related_action]['card_name'],
+                                $aRelatedAction[$counter_related_action]['ag_title']
+                        );
+
+                        $counter_related_action++;
+                    }
+                    return $description;
                 }
-                $description="";
-                if (count ($aRelatedAction) >  $counter_related_action ) {
-                    $description = sprintf("docid %s %s %s %s %s %s %s",
-                            $aRelatedAction[$counter_related_action]['ag_id'],
-                            $aRelatedAction[$counter_related_action]['ag_ref'],
-                            $aRelatedAction[$counter_related_action]['strdate'],
-                            $aRelatedAction[$counter_related_action]['qcode'],
-                            $aRelatedAction[$counter_related_action]['card_fname'],
-                            $aRelatedAction[$counter_related_action]['card_name'],
-                            $aRelatedAction[$counter_related_action]['ag_title']
-                            );
-                    
-                    $counter_related_action++;
-                }
-                return $description;
-            }
-            return "";
-            break;
-            
-        // Concerned operation, use a counter to move to the next one, only for Follow-Up
-        //
-        case 'CONCERNED_OPERATION':
-            if ( isset($p_array['ag_id'])) {
-                // Static value, if null the retrieve all of them
-                if ( $aRelatedOperation == NULL ) {
-                    // retrieve comments
-                    $aRelatedOperation=$this->db->get_array("select ago_id,
+                return "";
+                break;
+
+            // Concerned operation, use a counter to move to the next one, only for Follow-Up
+            //
+            case 'CONCERNED_OPERATION':
+                if (isset($p_array['ag_id']))
+                {
+                    // Static value, if null the retrieve all of them
+                    if ($aRelatedOperation==NULL)
+                    {
+                        // retrieve comments
+                        $aRelatedOperation=$this->db->get_array("select ago_id,
                         j.jr_id,
                         j.jr_internal,
                         j.jr_comment,
@@ -1308,30 +1396,33 @@ class Document
 			from jrn as j 
                         join action_gestion_operation as ago on (j.jr_id=ago.jr_id)
 			where ag_id=$1 order by jr_date,jr_id"
-                            ,[$p_array['ag_id']]);
+                                , [$p_array['ag_id']]);
+                    }
+                    $description="";
+                    if (count($aRelatedOperation)>$counter_related_operation)
+                    {
+                        $description.=sprintf('%s %s %s %s ',
+                                $aRelatedOperation[$counter_related_operation]['str_date'],
+                                $aRelatedOperation[$counter_related_operation]['jr_internal'],
+                                $aRelatedOperation[$counter_related_operation]['jr_comment'],
+                                $aRelatedOperation[$counter_related_operation]['jr_pj_number']
+                        );
+                        $counter_related_operation++;
+                    }
+                    return $description;
                 }
-                $description="";
-                if (count ($aRelatedOperation) >  $counter_related_operation) {
-                    $description.= sprintf('%s %s %s %s ',
-                            $aRelatedOperation[$counter_related_operation]['str_date'],
-                            $aRelatedOperation[$counter_related_operation]['jr_internal'],
-                            $aRelatedOperation[$counter_related_operation]['jr_comment'],
-                            $aRelatedOperation[$counter_related_operation]['jr_pj_number']
-                            );
-                    $counter_related_operation++;
-                }
-                return $description;
-            }
-            return "";
-            break;
-        // Other card, use a counter to move to the next one, only for Follow-Up
-        //
-        case 'OTHER_CARDS':
-            if ( isset($p_array['ag_id'])) {
-                // Static value, if null the retrieve all of them
-                if ( $aOtherCard == NULL ) {
-                    // retrieve comments
-                    $aOtherCard=$this->db->get_array("
+                return "";
+                break;
+            // Other card, use a counter to move to the next one, only for Follow-Up
+            //
+            case 'OTHER_CARDS':
+                if (isset($p_array['ag_id']))
+                {
+                    // Static value, if null the retrieve all of them
+                    if ($aOtherCard==NULL)
+                    {
+                        // retrieve comments
+                        $aOtherCard=$this->db->get_array("
                         select 
                         (select ad_value from fiche_detail where f_id = ap.f_id and ad_id = 1) as cname,
                         (select ad_value from fiche_detail where f_id = ap.f_id and ad_id = 32) as cfname,
@@ -1342,179 +1433,192 @@ class Document
                          from action_person ap  
                          where ag_id=$1
                             "
-                            ,[$p_array['ag_id']]);
+                                , [$p_array['ag_id']]);
+                    }
+                    $description="";
+                    if (count($aOtherCard)>$counter_other_card)
+                    {
+                        $description.=sprintf('%s %s %s %s %s %s ', $aOtherCard[$counter_other_card]['cname'],
+                                $aOtherCard[$counter_other_card]['cfname'], $aOtherCard[$counter_other_card]['qcode'],
+                                $aOtherCard[$counter_other_card]['email'], $aOtherCard[$counter_other_card]['phone'],
+                                $aOtherCard[$counter_other_card]['mobile']);
+                        $counter_other_card++;
+                    }
+                    return $description;
                 }
-                $description="";
-                if (count ($aOtherCard) >  $counter_other_card ) {
-                    $description.= sprintf('%s %s %s %s %s %s ',
-                            $aOtherCard[$counter_other_card]['cname'],
-                            $aOtherCard[$counter_other_card]['cfname'],
-                            $aOtherCard[$counter_other_card]['qcode'],
-                            $aOtherCard[$counter_other_card]['email'],
-                            $aOtherCard[$counter_other_card]['phone'],
-                            $aOtherCard[$counter_other_card]['mobile']);
-                    $counter_other_card++;
-                }
-                return $description;
-            }
-            return "";
-            break;    
-        // Attachment , use a counter to move to the next one, only for Follow-Up
-        //
-        case 'ATTACHED_FILES':
-            if ( isset($p_array['ag_id'])) {
-                // Static value, if null the retrieve all of them
-                if ( $aFileAttached == NULL ) {
-                    // retrieve comments
-                    $aFileAttached=$this->db->get_array("
+                return "";
+                break;
+            // Attachment , use a counter to move to the next one, only for Follow-Up
+            //
+            case 'ATTACHED_FILES':
+                if (isset($p_array['ag_id']))
+                {
+                    // Static value, if null the retrieve all of them
+                    if ($aFileAttached==NULL)
+                    {
+                        // retrieve comments
+                        $aFileAttached=$this->db->get_array("
                         select d_filename,d_description from document d  where ag_id=$1
                             "
-                            ,[$p_array['ag_id']]);
+                                , [$p_array['ag_id']]);
+                    }
+                    $nb_comment=count($aFileAttached);
+                    $description="";
+                    if (count($aFileAttached)>$counter_file)
+                    {
+                        $description.=sprintf("%s %s ", $aFileAttached[$counter_file]['d_filename'],
+                                $aFileAttached [$counter_file]['d_description']);
+                        $counter_file++;
+                    }
+                    return $description;
                 }
-                $nb_comment=count($aFileAttached);
-                $description="";
-                if (count ($aFileAttached) >  $counter_file) {
-                    $description.= sprintf("%s %s ",
-                           $aFileAttached[$counter_file]['d_filename'],
-                           $aFileAttached [$counter_file]['d_description']);
-                    $counter_file++;
-                }
-                return $description;
-            }
-            return "";
-            break;    
-        // Tag , use a counter to move to the next one
-        case 'TAGS':
-            if ( isset($p_array['ag_id'])) {
-                // Static value, if null the retrieve all of them
-                if ( $aTag == NULL ) {
-                    // retrieve comments
-                    $aTag=$this->db->get_array("
+                return "";
+                break;
+            // Tag , use a counter to move to the next one
+            case 'TAGS':
+                if (isset($p_array['ag_id']))
+                {
+                    // Static value, if null the retrieve all of them
+                    if ($aTag==NULL)
+                    {
+                        // retrieve comments
+                        $aTag=$this->db->get_array("
                        select t_tag from action_tags at2 join tags t using(t_id)  where ag_id=$1 order by upper(t_tag)
                             "
-                            ,[$p_array['ag_id']]);
+                                , [$p_array['ag_id']]);
+                    }
+                    $description="";
+                    if (count($aTag)>$counter_tag)
+                    {
+                        $description.=sprintf("%s ", $aTag [$counter_tag]['t_tag']);
+                        $counter_tag++;
+                    }
+                    return $description;
                 }
-                $description="";
-                if (count ($aTag) > $counter_tag) {
-                    $description.= sprintf("%s ",
-                           $aTag [$counter_tag]['t_tag']);
-                    $counter_tag++;
+                
+                return "";
+                break;
+            case 'COMM_PAYMENT':
+                if (isset($p_array["e_comm_paiement"]))
+                {
+                    return $p_array["e_comm_paiement"];
                 }
-                return $description;
-            }
-            return "";
-            break;    
-        case 'COMM_PAYMENT':
-            if ( isset($p_array["e_comm_paiement"])) {
-            return $p_array["e_comm_paiement"];
-             } else return "";
-             
-        // priority of the follow up  document
+                else
+                {
+                    return "";
+                }
+
+            // priority of the follow up  document
             case 'PRIORITY':
-                if ( isset($p_array['ag_priority'])) {
-                    $aPriority=array(1=>_("Haute"),2=>_("Normale"),3=>_("Basse"));
+                if (isset($p_array['ag_priority']))
+                {
+                    $aPriority=array(1=>_("Haute"), 2=>_("Normale"), 3=>_("Basse"));
                     return $aPriority[$p_array["ag_priority"]];
                 }
                 return "";
-        // Priority of the follow up  document
+            // Priority of the follow up  document
             case 'GROUPMGT':
-                if ( isset($p_array['ag_dest'])) {
-                   $profile=$this->db->get_value("select p_name from profile where p_id=$1",array($p_array['ag_dest']));
-                   return $profile;
+                if (isset($p_array['ag_dest']))
+                {
+                    $profile=$this->db->get_value("select p_name from profile where p_id=$1", array($p_array['ag_dest']));
+                    return $profile;
                 }
                 return "";
-        // Hour in the follow up document
+            // Hour in the follow up document
             case 'HOUR':
-                if ( isset($p_array['ag_hour'])) {
+                if (isset($p_array['ag_hour']))
+                {
                     return $p_array["ag_hour"];
                 }
                 return "";
-        // State in the follow up document
+            // State in the follow up document
             case 'STATUS':
-                if ( isset($p_array['ag_state'])) {
+                if (isset($p_array['ag_state']))
+                {
                     $status=$this->db->get_value("
-                            select s_value from document_state where s_id=$1",array($p_array['ag_state']));
-                   return $status;
+                            select s_value from document_state where s_id=$1", array($p_array['ag_state']));
+                    return $status;
                 }
                 return "";
-         // type of document
+            // type of document
             case 'DOCUMENT_TYPE':
                 $ret="";
-                if ( isset($p_array['ag_id'])){
+                if (isset($p_array['ag_id']))
+                {
                     $ret=$this->db->get_value("select dt_value 
                                              from action_gestion 
                                              join document_type dt  on (ag_type=dt.dt_id) 
-                            where ag_id=$1",array($p_array["ag_id"]));
+                            where ag_id=$1", array($p_array["ag_id"]));
                 }
                 return $ret;
-                
-        
-    } // end switch 
+        } // end switch 
         /*
          * retrieve the value of ATTR for e_march
          */
-        if (preg_match('/^ATTR/', $p_tag) == 1)
+        if (preg_match('/^ATTR/', $p_tag)==1)
         {
             $r="";
             // Retrieve f_id
-            if ( isset ($p_array['e_march'.$this->counter]))
+            if (isset($p_array['e_march'.$this->counter]))
             {
-                $id = $p_array['e_march' . $this->counter];
-                $r=$this->replace_special_tag($id,$p_tag);
+                $id=$p_array['e_march'.$this->counter];
+                $r=$this->replace_special_tag($id, $p_tag);
             }
         }
         /*
          * retrieve the value of ATTR for e_march
          */
-        if (preg_match('/^BENEFATTR/', $p_tag) == 1)
+        if (preg_match('/^BENEFATTR/', $p_tag)==1)
         {
             $r="";
             $qcode=isset($p_array['qcode_benef'])?$p_array['qcode_benef']:'';
             // Retrieve f_id
-             $r=$this->replace_special_tag($qcode,$p_tag);
+            $r=$this->replace_special_tag($qcode, $p_tag);
         }
-        if (preg_match('/^CUSTATTR/', $p_tag) == 1)
+        if (preg_match('/^CUSTATTR/', $p_tag)==1)
         {
             $r="";
-            if ( isset($p_array['qcode_dest']) || isset($p_array['e_client']) )
+            if (isset($p_array['qcode_dest'])||isset($p_array['e_client']))
             {
                 $qcode=(isset($p_array['qcode_dest']))?$p_array['qcode_dest']:$p_array['e_client'];
-                $r=$this->replace_special_tag($qcode,$p_tag);
+                $r=$this->replace_special_tag($qcode, $p_tag);
             }
         }
         return $r;
     }
-    /*!\brief remove a row from the table document, the lob object is not deleted
+
+    /* !\brief remove a row from the table document, the lob object is not deleted
      *        because can be linked elsewhere
      */
+
     function remove()
     {
-      $d_lob=$this->db->get_value('select d_lob from document where d_id=$1',
-				  array($this->d_id));
+        $d_lob=$this->db->get_value('select d_lob from document where d_id=$1', array($this->d_id));
         $sql='delete from document where d_id='.$this->d_id;
         $this->db->exec_sql($sql);
-        if ( $d_lob != 0 )
+        if ($d_lob!=0)
             $this->db->lo_unlink($d_lob);
     }
-    /*!\brief Move a document from the table document into the concerned row
+
+    /* !\brief Move a document from the table document into the concerned row
      *        the document is not copied : it is only a link
      *
      * \param $p_internal internal code
      *
      */
-    function MoveDocumentPj($p_internal)
+
+    function moveDocumentPj($p_internal)
     {
         $sql="update jrn set jr_pj=$1,jr_pj_name=$2,jr_pj_type=$3 where jr_internal=$4";
 
-        $this->db->exec_sql($sql,array($this->d_lob,$this->d_filename,$this->d_mimetype,$p_internal));
+        $this->db->exec_sql($sql, array($this->d_lob, $this->d_filename, $this->d_mimetype, $p_internal));
         // clean the table document
         $sql='delete from document where d_id='.$this->d_id;
         $this->db->exec_sql($sql);
-
-
     }
+
     /**
-     *Replace a special tag *TAGxxxx with the value from fiche_detail, the xxxx
+     * replace a special tag *TAGxxxx with the value from fiche_detail, the xxxx
      * is the ad_value
      * @param $p_qcode qcode of the card
      * @param $p_tag tag to parse
@@ -1524,84 +1628,85 @@ class Document
     function replace_special_tag($p_qcode, $p_tag)
     {
         // check if the march exists
-        if ($p_qcode == "")
-            return "";
+        if ($p_qcode=="")             return "";
 
-        $f = new Fiche($this->db);
-        $found = $f->get_by_qcode($p_qcode, false);
+        $f=new Fiche($this->db);
+        $found=$f->get_by_qcode($p_qcode, false);
         // if not found exit
-        if ($found == 1)
-            return "";
+        if ($found==1)             return "";
 
         // get the ad_id
-        $attr=preg_replace("/^.*ATTR/","",$p_tag);
+        $attr=preg_replace("/^.*ATTR/", "", $p_tag);
 
-        if (isNumber($attr) == 0) return "";
-        $ad_type=$this->db->get_value("select ad_type from attr_def where ad_id=$1",array($attr));
+        if (isNumber($attr)==0)             return "";
+        
+        $ad_type=$this->db->get_value("select ad_type from attr_def where ad_id=$1", array($attr));
 
         // get ad_value
-        $ad_value=$this->db->get_value("select ad_value from fiche_detail where f_id=$1 and ad_id=$2",array($f->id,$attr));
+        $ad_value=$this->db->get_value("select ad_value from fiche_detail where f_id=$1 and ad_id=$2",
+                array($f->id, $attr));
 
         // if ad_id is type select execute select and get value
-        if ( $ad_type=="select")
+        if ($ad_type=="select")
         {
-            $sql=$this->db->get_value("select ad_extra from attr_def where ad_id=$1",array($attr));
-            $array= $this->db->make_array($sql);
-            for ($a=0;$a<count ($array);$a++)
+            $sql=$this->db->get_value("select ad_extra from attr_def where ad_id=$1", array($attr));
+            $array=$this->db->make_array($sql);
+            for ($a=0; $a<count($array); $a++)
             {
                 if ($array[$a]['value']==$ad_value)
                     return $array[$a]['label'];
             }
-            
         }
         // if ad_id is not type select get value
         return $ad_value;
     }
-    function update_description ($p_desc)
+
+    function update_description($p_desc)
     {
-        $this->db->exec_sql('update document set d_description = $1 where d_id=$2',
-                array($p_desc,$this->d_id));
+        $this->db->exec_sql('update document set d_description = $1 where d_id=$2', array($p_desc, $this->d_id));
     }
+
     /**
-     * Replace a pattern with a value in the buffer , handle the change for OOo type file and amount
+     * replace a pattern with a value in the buffer , handle the change for OOo type file and amount
      * 
      * @param string $p_buffer
      * @param string $_pattern
      * @param mixed $p_value
      */
-    static function replace_value($p_buffer, $p_pattern, $p_value,$p_limit=-1,$p_type='OOo')
+    static function replace_value($p_buffer, $p_pattern, $p_value, $p_limit=-1, $p_type='OOo')
     {
         $check=$p_pattern;
-        $check=str_replace(['&lt;','&gt;','<','>','='], "", $check);
-        if ( preg_replace('/[^[:alnum:]^_]/', '', $check) != $check)
+        $check=str_replace(['&lt;', '&gt;', '<', '>', '='], "", $check);
+        if (preg_replace('/[^[:alnum:]^_]/', '', $check)!=$check)
         {
             throw new Exception(sprintf(_("chaine à remplacer [%s] contient un caractère interdit"), $p_pattern));
         }
         $count=0;
-        if (is_numeric($p_value) && $p_type == 'OOo')
+        if (is_numeric($p_value)&&$p_type=='OOo')
         {
             /* -- works only with OOo Calc -- */
             $searched='/office:value-type="string"><text:p>'.$p_pattern.'/i';
             $replaced='office:value-type="float" office:value="'.$p_value.'"><text:p>'.$p_value;
-            $p_buffer=preg_replace($searched, $replaced, $p_buffer,$p_limit,$count);
-            if ( $count == 0) {
-            /* -- work with libreOffice > 5 -- */
+            $p_buffer=preg_replace($searched, $replaced, $p_buffer, $p_limit, $count);
+            if ($count==0)
+            {
+                /* -- work with libreOffice > 5 -- */
                 $searched='/office:value-type="string" calcext:value-type="string"><text:p>(<text:s\/>)*'.$p_pattern.'/i';
                 $replaced='office:value-type="float" office:value="'.$p_value.'"  calcext:value-type="float"><text:p>'.$p_value;
-                $p_buffer=preg_replace($searched, $replaced, $p_buffer,$p_limit,$count);
+                $p_buffer=preg_replace($searched, $replaced, $p_buffer, $p_limit, $count);
             }
         }
-        if ($count == 0)
+        if ($count==0)
         {
-            if ( $p_type=='OOo' )
+            if ($p_type=='OOo')
             {
-              $p_value=str_replace('&','&amp;',$p_value);
-              $p_value=str_replace('<','&lt;',$p_value);
-              $p_value=str_replace('>','&gt;',$p_value);
-              $p_value=str_replace('"','&quot;',$p_value);
-              $p_value=str_replace("'",'&apos;',$p_value);
+                $p_value=str_replace('&', '&amp;', $p_value);
+                $p_value=str_replace('<', '&lt;', $p_value);
+                $p_value=str_replace('>', '&gt;', $p_value);
+                $p_value=str_replace('"', '&quot;', $p_value);
+                $p_value=str_replace("'", '&apos;', $p_value);
             }
-            $p_buffer=preg_replace('/'.$p_pattern.'/i', $p_value, $p_buffer,$p_limit);
+            $p_buffer=preg_replace('/'.$p_pattern.'/i', $p_value, $p_buffer, $p_limit);
         }
         return $p_buffer;
     }
diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index 631e24c51..f2f8a01e7 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -53,14 +53,49 @@ class Fiche
     var $fiche_def_ref; /*!< $fiche_def_ref Type */
     var $row;           /*! < All the row from the ledgers */
     var $quick_code;		/*!< quick_code of the card */
+    private $f_enable;  /*!< if card is enable (fiche.f_enable) */
     function __construct($p_cn,$p_id=0)
     {
         $this->cn=$p_cn;
         $this->id=$p_id;
         $this->quick_code='';
         $this->attribut=array();
+        $f_enable='1';
     }
-    /**
+    public function get_id()
+    {
+        return $this->id;
+    }
+
+    public function get_fiche_def_ref()
+    {
+        return $this->fiche_def_ref;
+    }
+
+    public function get_f_enable()
+    {
+        return $this->f_enable;
+    }
+
+    public function set_id($id)
+    {
+        $this->id=$id;
+        return $this;
+    }
+
+    public function set_fiche_def_ref($fiche_def_ref)
+    {
+        $this->fiche_def_ref=$fiche_def_ref;
+        return $this;
+    }
+
+    public function set_f_enable($f_enable)
+    {
+        $this->f_enable=$f_enable;
+        return $this;
+    }
+
+        /**
      *@brief used with a usort function, to sort an array of Fiche on the name
      */
     static function cmp_name(Fiche $o1,Fiche $o2)
@@ -168,6 +203,7 @@ class Fiche
         {
             $row=Database::fetch_array($Ret,$i);
             $this->fiche_def=$row['fd_id'];
+            $this->f_enable=$row['f_enable'];
             $t=new Fiche_Attr ($this->cn);
             $t->ad_id=$row['ad_id'];
             $t->ad_text=$row['ad_text'];
@@ -581,7 +617,7 @@ class Fiche
         {
             return 'FNT';
         }
-
+        
         /* for each attribute */
         foreach ($attr as $r)
         {
@@ -749,7 +785,16 @@ class Fiche
             }
             $ret.="<TR>".td(_($r->ad_text).$bulle,'class="'.$class.'"').td($w->input()." ".$msg)." </TR>";
         }
-
+        // Display if the card is enable or not
+        $enable_is=new InputSwitch("f_enable");
+        $enable_is->value=$this->f_enable;
+        $enable_is->readOnly=$p_readonly;
+                
+        $ret.=tr( 
+                td(_("Actif")).td($enable_is->input())
+                );
+        
+        
         $ret.="</table>";
 
         return $ret;
@@ -801,9 +846,10 @@ class Fiche
         try
         {
             $this->cn->start();
-            $sql=sprintf("insert into fiche(f_id,fd_id)".
-                    " values (%d,%d)", $fiche_id, $p_fiche_def);
-            $Ret=$this->cn->exec_sql($sql);
+            
+            $Ret=$this->cn->exec_sql("insert into fiche(f_id,f_enable,fd_id) value ($1,$2,$3)",
+                    array($fiche_id, $p_array['f_enable'],$p_fiche_def));
+            
             // parse the $p_array array
             foreach ($p_array as $name=> $value)
             {
@@ -961,6 +1007,9 @@ class Fiche
         try
         {
             $this->cn->start();
+            
+            $this->cn->exec_sql("update fiche set f_enable=$1 where f_id=$2",array($p_array['f_enable'],$this->id));
+            
             // parse the $p_array array
             foreach ($p_array as $name=> $value)
             {
diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 7a57316ee..1be594160 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -596,9 +596,9 @@ class Follow_Up
             $act->save();
         }
 
-        /* Upload the documents */
+        /* upload the documents */
         $doc=new Document($this->db);
-        $doc->Upload($this->ag_id);
+        $doc->upload($this->ag_id);
         if (trim($this->ag_comment)!='' && Document_Option::can_add_comment($this->ag_id))
         {
             $this->db->exec_sql("insert into action_gestion_comment (ag_id,tech_user,agc_comment) values ($1,$2,$3)"
@@ -905,9 +905,9 @@ class Follow_Up
                 $this->ag_ref /* 11 */
             ));
         }
-        // Upload  documents
+        // upload  documents
         $doc=new Document($this->db);
-        $doc->Upload($this->ag_id);
+        $doc->upload($this->ag_id);
 
         /* save action details */
         $http=new HttpInput();
diff --git a/include/class/user.class.php b/include/class/user.class.php
index 2190bb048..3ad5bfefb 100644
--- a/include/class/user.class.php
+++ b/include/class/user.class.php
@@ -190,7 +190,8 @@ class User
 
 		if ($res == 0)
 		{
-			$cn->exec_sql($sql, array($_SESSION[SESSION_KEY.'g_user'], $_SERVER["REMOTE_ADDR"], $from, $_SERVER['REQUEST_URI'], 'FAIL'));
+			$cn->exec_sql($sql, array($_SESSION[SESSION_KEY.'g_user'], $_SERVER["REMOTE_ADDR"], 
+                            $from, $_SERVER['REQUEST_URI'], 'FAIL'));
 			if (!$silent)
 			{
 				echo '<script> alert(\''._('Utilisateur ou mot de passe incorrect').'\')</script>';
@@ -203,7 +204,8 @@ class User
 		else
 		{
 			if ($from == 'LOGIN')
-				$cn->exec_sql($sql, array($_SESSION[SESSION_KEY.'g_user'], $_SERVER["REMOTE_ADDR"], $from, $_SERVER['REQUEST_URI'], 'SUCCESS'));
+				$cn->exec_sql($sql, array($_SESSION[SESSION_KEY.'g_user'], $_SERVER["REMOTE_ADDR"], $from, 
+                                    $_SERVER['REQUEST_URI'], 'SUCCESS'));
 			$this->valid = 1;
 		}
 
@@ -249,7 +251,8 @@ class User
             if ($priv)
             {
                 // the access is granted
-                $jnt=$cn->get_value("select jnt_id from jnt_use_dos where dos_id=$1 and use_id=$2", array($db_id, $this->id));
+                $jnt=$cn->get_value("select jnt_id from jnt_use_dos where dos_id=$1 and use_id=$2",
+                        array($db_id, $this->id));
 
                 if ($cn->size()==0)
                 {
@@ -312,6 +315,11 @@ class User
 
 	function get_ledger($p_type = 'ALL', $p_access = 3,$disable=TRUE)
 	{
+            $p_type=strtoupper($p_type);
+            if (! in_array($p_type, ["FIN","ALL","ODS","VEN",'ACH'])) {
+                record_log(sprintf("UGL1, p_type %s",$p_type));
+                throw new Exception("UGL1"._("Type incorrecte"));
+            }
             if ($disable==TRUE) {
                 $sql_enable="";
             } else {
@@ -419,22 +427,26 @@ class User
 
 	function set_periode($p_periode)
 	{
-		$sql = "update user_local_pref set parameter_value='$p_periode' where user_id='$this->id' and parameter_type='PERIODE'";
-		$Res = $this->db->exec_sql($sql);
+		$sql = "update user_local_pref set parameter_value=$1 where user_id=$2 and parameter_type='PERIODE'";
+		$Res = $this->db->exec_sql($sql,[$p_periode,$this->id]);
 	}
 
 	private function set_default_periode()
 	{
 
 		/* get the first periode */
-		$sql = 'select min(p_id) as pid from parm_periode where p_closed = false and p_start = (select min(p_start) from parm_periode)';
+		$sql = 'select min(p_id) as pid '
+                        . ' from parm_periode '
+                        . ' where p_closed = false and p_start = (select min(p_start) from parm_periode)';
 		$Res = $this->db->exec_sql($sql);
 
 		$pid = Database::fetch_result($Res, 0, 0);
 		/* if all the periode are closed, then we use the last closed period */
 		if ($pid == null)
 		{
-			$sql = 'select min(p_id) as pid from parm_periode where p_start = (select max(p_start) from parm_periode)';
+			$sql = 'select min(p_id) as pid '
+                                . 'from parm_periode '
+                                . 'where p_start = (select max(p_start) from parm_periode)';
 			$Res2 = $this->db->exec_sql($sql);
 			$pid = Database::fetch_result($Res2, 0, 0);
 			if ($pid == null)
@@ -532,7 +544,6 @@ class User
 	 * \brief  Get the default user's preferences
 	 * \return array of (parameter_type => parameter_value)
 	 */
-
 	function get_preference()
 	{
 		$sql = "select parameter_type,parameter_value from user_local_pref where user_id=$1";
@@ -544,7 +555,16 @@ class User
 			$type = $row['parameter_type'];
 			$l_array[$type] = $row['parameter_value'];
 		}
-
+                $repo=new Database();
+                $a_global_pref=$repo->get_array("select parameter_type,parameter_value from user_global_pref 
+                                            where 
+                                            upper(user_id) = upper($1)",[$this->login]);
+                $nb_global=count($a_global_pref);
+                for ( $i = 0 ;$i< $nb_global ; $i++) {
+                    $idx=$a_global_pref[$i]['parameter_type'];
+                    $value=$a_global_pref[$i]['parameter_value'];
+                    $l_array[$idx]=$value;
+                }
 
 		return $l_array;
 	}
@@ -601,9 +621,9 @@ class User
 			}
 			return 0;
 		}
-		if ($Count == 1)
-			return 1;
-		echo "<H2 class=\"error\"> Action Invalide !!! $Count select * from user_sec_act where ua_login='$p_login' and ua_act_id=$p_action_id </H2>";
+		if ($Count == 1) 			return 1;
+                echo_error(_("Action invalide"));
+                record_log("User:check_action".sprintf("login %s ua_act_id %s",$this->login,$p_action_id));
 		exit();
 	}
 
@@ -620,7 +640,7 @@ class User
 		// Load everything in an array
 		$Res = $cn->exec_sql("select parameter_type,parameter_value from
                             user_global_pref
-                            where user_id='" . $this->login . "'");
+                            where user_id=$1",[$this->login]);
 		$Max = Database::num_row($Res);
 		if ($Max == 0)
 		{
@@ -635,7 +655,6 @@ class User
 			$row = Database::fetch_array($Res, $i);
 			$type = $row['parameter_type'];
 			$line[$type] = $row['parameter_value'];
-			;
 		}
 		// save array into g_ variable
 		$array_pref = array('g_theme' => 'THEME', 
@@ -756,18 +775,17 @@ class User
 			$this->audit('FAIL');
 			if ($p_js == 1)
 			{
-				echo "<script>";
-				echo "alert ('Cette action ne vous est pas autorisée. Contactez votre responsable');";
-				echo "</script>";
+                            echo create_script("alert_box(content[59])");
 			}
 			elseif ($p_js == 2) {
 				record_log(_("Access invalid").$p_action);
 			}
 			else
 			{
-				echo '<div class="redcontent">';
-				echo '<h2 class="error"> Cette action ne vous est pas autorisée Contactez votre responsable</h2>';
-				echo '</div>';
+                            echo '<h2 class="error">',
+                            htmlspecialchars(_("Cette action ne vous est pas autorisée Contactez votre responsable")),
+                                    '</h2>';
+                            echo '</div>';
 			}
 			exit(-1);
 		}
@@ -797,7 +815,6 @@ class User
 	 * \param $p_action requested action
 	 * \return nothing the program exits automatically
 	 */
-
 	function can_print($p_action, $p_js = 0)
 	{
 		if ($this->check_print($p_action) == 0)
@@ -805,15 +822,15 @@ class User
 			$this->audit('FAIL');
 			if ($p_js == 1)
 			{
-				echo "<script>";
-				echo "alert ('Cette action ne vous est pas autorisée. Contactez votre responsable');";
-				echo "</script>";
+                            echo create_script("alert_box(content[59])");
 			}
 			else
 			{
-				echo '<div class="redcontent">';
-				echo '<h2 class="error"> Cette action ne vous est pas autorisée Contactez votre responsable</h2>';
-				echo '</div>';
+                            echo '<div class="redcontent">';
+                            echo '<h2 class="error">',
+                            htmlspecialchars(_("Cette action ne vous est pas autorisée Contactez votre responsable")),
+                                    '</h2>';
+                            echo '</div>';
 			}
 			exit(-1);
 		}
diff --git a/include/company.inc.php b/include/company.inc.php
index 2bd6ae279..0f585a457 100644
--- a/include/company.inc.php
+++ b/include/company.inc.php
@@ -50,7 +50,7 @@ if (isset($_POST['record_company']))
 	$m->MY_STOCK =$http->post("p_stock");
 	$m->MY_ANC_FILTER=$http->post("p_anc_filter");
         try {
-            $m->Update();
+            $m->update();
         } catch (Exception $e) {
             alert($e->getMessage());
         }
diff --git a/include/export/export_document.php b/include/export/export_document.php
index fcc6ecbdb..1fd7d71b1 100644
--- a/include/export/export_document.php
+++ b/include/export/export_document.php
@@ -45,7 +45,7 @@ if ($action == 'sh')
             $d_id=$http->request('d_id',"number");
 		// retrieve the document
 		$doc = new Document($cn, $d_id);
-		$doc->Send();
+		$doc->send();
 	}
 }
 /* remove the document */
diff --git a/include/lib/sort_table.class.php b/include/lib/sort_table.class.php
index 6cbfcaae9..f981284e1 100644
--- a/include/lib/sort_table.class.php
+++ b/include/lib/sort_table.class.php
@@ -68,7 +68,7 @@ class Sort_Table
     {
 	if ($p_ind < 0 || $p_ind > $this->nb)
 	    return 'ERREUR TRI';
-	$file = str_replace('extension.php', '', $_SERVER['SCRIPT_FILENAME']);
+	$file = str_replace('extension.php', '', $_SERVER['PHP_SELF']);
 
 	$base = $this->array[$p_ind]['url'];
 	$str = '';
diff --git a/include/lib/user_common.php b/include/lib/user_common.php
index 5a2be362a..9b05639d0 100644
--- a/include/lib/user_common.php
+++ b/include/lib/user_common.php
@@ -115,7 +115,7 @@ function navigation_bar($p_offset,$p_line,$p_size=0,$p_page=1,$p_javascript="")
         $step=$p_size;
         $offset=($e-1)*$step;
 
-        $r='<A class="mtitle" href="'.basename($_SERVER['SCRIPT_FILENAME'])."?".$url."&offset=$offset&step=$step&page=$e&size=$step".'" '.$p_javascript.'>';
+        $r='<A class="mtitle" href="'.basename($_SERVER['PHP_SELF'])."?".$url."&offset=$offset&step=$step&page=$e&size=$step".'" '.$p_javascript.'>';
         $r.=" 	&larr;";
         // $r.='<INPUT TYPE="IMAGE" width="12" SRC="image/go-previous.png">';
         $r.="</A>&nbsp;&nbsp;";
@@ -181,35 +181,6 @@ function CleanUrl()
 {
     // Compute the url
     $url=http_build_query($_GET);
-   /* $get=$_GET;
-    if ( isset ($get) )
-    {
-        foreach ($get as $name=>$value )
-        {
-            // we clean the parameter offset, step, page and size
-            if (  ! in_array($name,array('offset','step','page','size','s','o','r_jrn')))
-            {
-                if (is_array($name)) {
-                    
-                } else {
-                    $url.=$and.$name."=".$value;
-                }
-                $and="&";
-            }// if
-        }//foreach
-        if ( isset($_GET['r_jrn']))
-        {
-            $r_jrn=$_GET['r_jrn'];
-            if (count($r_jrn) > 0 )
-            {
-                foreach ($r_jrn as $key=>$value)
-                {
-                    $url.=$and."r_jrn[$key]=".$value;
-                    $and="&";
-                }
-            }
-        }
-    }// if*/
     return $url;
 }
 function redirect($p_string,$p_time=0)
@@ -219,7 +190,8 @@ function redirect($p_string,$p_time=0)
     }
     echo '<HTML><head><META HTTP-EQUIV="REFRESH" content="'.$p_time.'; url='.$p_string.'"></head><body> Connecting... </body></html>';
 }
-/*!\brief remove the useless space, change comma by period and try to return
+/*!
+ * \brief remove the useless space, change comma by period and try to return
  * a number
  *\param $p_num number to format
  *\return the formatted number
diff --git a/include/template/menu.php b/include/template/menu.php
index 5c46026a7..ab2c2b824 100644
--- a/include/template/menu.php
+++ b/include/template/menu.php
@@ -1,25 +1,31 @@
 <?php
 //This file is part of NOALYSS and is under GPL 
 //see licence.txt
+
 ?><div class="<?php echo $style_menu; ?>">
-    <?php if ( count($amenu) > 4 && $level == 0) :
+    <?php if ( count($amenu) > 4 && $level == 0) {
 	$style ='style= "width:100%"';
-     elseif ($level==0):
-switch (count($amenu))
-{
-case 4:
-case 3:
-   $width=count($amenu)*20;
-   $left=round((100-$width)/2);
-$style="style=\"width:$width%;margin-left:$left%\"";
-break;
-default:
-$style="";
+    }
+     elseif ($level==0){
+        $http=new HttpInput();
+        $access_code=$http->request("ac");
+        switch (count($amenu))
+        {
+            case 4:
+            case 3:
+               $width=count($amenu)*20;
+               $left=round((100-$width)/2);
+            $style="style=\"width:$width%;margin-left:$left%\"";
+            break;
+            default:
+            $style="";
+        }   
+
 }
-	else:
+     else {
 		$style=" class=\"mtitle\"";
 
-    	endif;?>
+        }?>
 <table  <?php echo $style?> >
 
 
@@ -28,55 +34,57 @@ $style="";
 	global $g_user;
 	// Display the menu
 	for($i=0;$i < count($amenu);$i++):
-	    if ( (count($amenu)==1)):
+	    if ( (count($amenu)==1)) {
 		$class="selectedcell";
 ?>
 	<td class="<?php echo $class?>">
-            <a class="mtitle" href="do.php?gDossier=<?php echo Dossier::id()?>&ac=<?php echo $_REQUEST['ac']?>" title="<?php echo h(gettext($amenu[$i]['me_description']))?>" >
+            <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']))?>" >
 	    <?php echo gettext($amenu[$i]['me_menu'])?>
 	    </a>
 	</td>
 <?php 
-	    else:
-		$class="mtitle";
-		$js="";
-                
-		if ( $amenu[$i]['me_url']!='')
-		{
-			$url=$amenu[$i]['me_url'];
-		}
-		elseif ($amenu[$i]['me_javascript'] != '')
-		{
-			$url="javascript:void(0)";
-			$js=sprintf(' onclick="%s"',$amenu[$i]['me_javascript']);
-		}
-		else
-		{
-                    $a_request=explode('/', $_REQUEST['ac']);
-                    if ( $level == 0) {
-                        $url=$a_request[0];
-                        
-                        if (count($a_request) > 1 &&
-                            $url.'/'.$amenu[$i]['me_code'] == $a_request[0].'/'.$a_request[1]) 
-                                $class="selectedcell";
-                    } elseif ($level == 1)
+            }
+	    else {
+                    $class="mtitle";
+                    $js="";
+
+                    if ( $amenu[$i]['me_url']!='')
                     {
-                        $url=$a_request[0].'/'.$a_request[1];
+                            $url=$amenu[$i]['me_url'];
                     }
-                    $url.='/'.$amenu[$i]['me_code'];
-                    if ($url == $_REQUEST['ac']) $class="selectedcell";
-                    $url="do.php?gDossier=".Dossier::id()."&ac=".$url;
-		}
+                    elseif ($amenu[$i]['me_javascript'] != '')
+                    {
+                            $url="javascript:void(0)";
+                            $js=sprintf(' onclick="%s"',$amenu[$i]['me_javascript']);
+                    }
+                    else
+                    {
+                        $a_request=explode('/', $access_code);
+                        if ( $level == 0) {
+                            $url=$a_request[0];
 
-?>	<td class="<?php echo $class?>">
-	    <a class="mtitle" href="<?php echo $url;?>" <?php echo $js?> title="<?php echo h(gettext($amenu[$i]['me_description']))?>">
-	    <?php echo gettext($amenu[$i]['me_menu'])?>
-	    </a>
-	</td>
+                            if (count($a_request) > 1 &&
+                                $url.'/'.$amenu[$i]['me_code'] == $a_request[0].'/'.$a_request[1]) 
+                                    $class="selectedcell";
+                        } elseif ($level == 1)
+                        {
+                            $url=$a_request[0].'/'.$a_request[1];
+                        }
+                        $url.='/'.$amenu[$i]['me_code'];
+                        if ($url == $access_code ) $class="selectedcell";
+                        $url="do.php?gDossier=".Dossier::id()."&ac=".$url;
+                    }
+
+?>	
+<td class="<?php echo $class?>">
+    <a class="mtitle" href="<?php echo $url;?>" <?php echo $js?> title="<?php echo h(gettext($amenu[$i]['me_description']))?>">
+    <?php echo gettext($amenu[$i]['me_menu'])?>
+    </a>
+</td>
 
 
 <?php 
-endif;
+     } // end  elseif ($level==0) 
 
 	?>
 	<?php 

From 2e66a8790d907cb645d83fb7dad9149f38d59fd0 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 12 Jan 2021 12:12:35 +0100
Subject: [PATCH 208/257] Card : attribute 54 is now a column for each card

---
 include/ajax/ajax_card.php            | 2 +-
 include/class/card_multiple.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/ajax/ajax_card.php b/include/ajax/ajax_card.php
index 5c7cdac74..3c0e86d57 100644
--- a/include/ajax/ajax_card.php
+++ b/include/ajax/ajax_card.php
@@ -474,7 +474,7 @@ case 'fs':
      * if inactive == 0 , then only active card
      */
     if ( $inactive == 0 ) {
-        $sql.=" and f_id in (select f_id from fiche_detail where ad_id=54 and ad_value='1') ";
+        $sql.=" and f_enable='1' ";
     }
     
      /* We limit the search to MAX_SEARCH_CARD records */
diff --git a/include/class/card_multiple.class.php b/include/class/card_multiple.class.php
index 13ca09f54..06c665b77 100644
--- a/include/class/card_multiple.class.php
+++ b/include/class/card_multiple.class.php
@@ -102,7 +102,7 @@ class Card_Multiple
      */
     private function filter_enable_card()
     {
-        $filter_enable_card="  f_id in (select f_id from fiche_detail where ad_value = '1' and ad_id=54) ";
+        $filter_enable_card="  f_enable='1' ";
         return $filter_enable_card;
     }
     /**

From e846a5e585d4c5f3c09aa5d3070b0b5c05e4e990 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 12 Jan 2021 12:13:09 +0100
Subject: [PATCH 209/257] javascript message , use function htmlspecialchar
 instead of escape_xml

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

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

From 38ea5b395bfabbc389c7cc727512adb7cbe83540 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 12 Jan 2021 12:14:14 +0100
Subject: [PATCH 210/257] Correct bug #0001882: predefined operation ODS not
 visible

---
 include/class/pre_operation.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/class/pre_operation.class.php b/include/class/pre_operation.class.php
index cfadc0ec8..4a6ad1805 100644
--- a/include/class/pre_operation.class.php
+++ b/include/class/pre_operation.class.php
@@ -332,9 +332,8 @@ class Pre_operation
 
         $value=$this->db->get_array("select od_id,od_name,od_description from op_predef ".
             " where jrn_def_id=$1".
-            " and od_direct =$2".
             " order by od_name",
-            array($this->p_jrn,$this->od_direct ));
+            array($this->p_jrn));
 
         if ( $this->p_jrn=='') $value=array();
 

From 9e40622983b068731c9415f2d09f1ee7ad0f96ef Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 15 Jan 2021 15:39:41 +0100
Subject: [PATCH 211/257] =?UTF-8?q?Tache=20#1844=20Menu=20:=20ouverture=20?=
 =?UTF-8?q?menu=20par=20d=C3=A9faut?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/do.php                         |  24 ++-
 include/lib/ac_common.php           | 250 ++++++++++++++++++++--------
 sql/upgrade.sql                     |   5 +
 unit-test/global.php                |   2 +-
 unit-test/include/lib/ac_common.php | 171 +++++++++++++++++++
 5 files changed, 374 insertions(+), 78 deletions(-)
 create mode 100644 unit-test/include/lib/ac_common.php

diff --git a/html/do.php b/html/do.php
index 9a8641286..b91308fe0 100644
--- a/html/do.php
+++ b/html/do.php
@@ -241,6 +241,7 @@ if (isset($_REQUEST['ac']))
         fclose($file_loginput);
     }
 
+    // Priority to POST , otherwise "duplicate operation" doesn't work
     $ac_post = trim(strtoupper($http->post("ac","string","")));
     $ac_get  = trim(strtoupper($http->get("ac","string","")));
     
@@ -252,6 +253,8 @@ 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 
@@ -262,20 +265,35 @@ if (isset($_REQUEST['ac']))
                     array($AC,$user_profile));
             if ( count($pm_id) > 0 ) {
                 show_menu($pm_id[0]['pm_id']);
+                return;
             } else {
                 throw new Exception(_('Erreur menu'),10);
             }
         }
-        
-        $module_id=$cn->get_value('select 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 where p_id=$1 and upper(code)=upper($2)',
+        $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 
+            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 
+            where p_id            =$1 
+            and upper(code)=upper($2)',
                 array($user_profile,$AC));
         $g_user->audit();
         // Show module and highligt selected one
         show_module($module_id);
+        
+        
         show_menu( $amenu_id[0]['pm_id_v3']);
+
         show_menu( $amenu_id[0]['pm_id_v2']);
+
         show_menu($amenu_id[0]['pm_id_v1']);
+
+        
     } catch (Exception $e) {
         if ( $e->getCode() == 10 ) {
             alert(_('Accès menu impossible'));
diff --git a/include/lib/ac_common.php b/include/lib/ac_common.php
index 71e85fba2..635bb4501 100644
--- a/include/lib/ac_common.php
+++ b/include/lib/ac_common.php
@@ -625,7 +625,8 @@ function getPeriodeFromMonth($p_cn, $p_date)
     return $R;
 }
 
-/**\brief Decode the html for the widegt richtext and remove newline
+/**
+ * \brief Decode the html for the widegt richtext and remove newline
  * \param $p_html string to decode
  * \return the html code without new line
  */
@@ -651,8 +652,7 @@ function Decode($p_html)
 function sql_filter_per($p_cn, $p_from, $p_to, $p_form='p_id', $p_field='jr_tech_per')
 {
 
-    if ($p_form != 'p_id' &&
-	    $p_form != 'date')
+    if ($p_form != 'p_id' && $p_form != 'date')
     {
 	echo_error(__FILE__, __LINE__, 'Mauvais parametres ');
 	exit(-1);
@@ -662,18 +662,26 @@ function sql_filter_per($p_cn, $p_from, $p_to, $p_form='p_id', $p_field='jr_tech
     $p_field=  sql_string($p_field);
     if ($p_form == 'p_id')
     {
+        if ( isNUmber($p_from)==0 || isNUmber($p_to)==0){
+            throw new Exception("SFP1"._("Nombre invalide"));
+        }
 	// retrieve the date
 	$pPeriode = new Periode($p_cn);
 	$a_start = $pPeriode->get_date_limit($p_from);
 	$a_end = $pPeriode->get_date_limit($p_to);
-	if ($a_start == null || $a_end == null)
-	    throw new Exception(__FILE__ . __LINE__ . sprintf(_('Attention periode 
-		     non trouvee periode p_from= %s p_to_periode = %s'), $p_from ,
-		    $p_to));
+	if ($a_start==null||$a_end==null)
+        {
+            throw new Exception(__FILE__.__LINE__.sprintf(_('Attention periode 
+		     non trouvee periode p_from= %s p_to_periode = %s'), $p_from, $p_to));
+        }
 
 
-	$p_from = $a_start['p_start'];
+        $p_from = $a_start['p_start'];
 	$p_to = $a_end['p_end'];
+    }else {
+        if ( isDate($p_from)==NULL || isDate($p_to)==NULL){
+            throw new Exception("SFP2"._("Date invalide"));
+        }
     }
     if ($p_from == $p_to)
 	$periode = " $p_field = (select p_id from parm_periode " .
@@ -778,7 +786,7 @@ function shrink_date($p_date)
 /**
  * @brief shrink the date, make a date shorter for the printing
  * @param $p_date format DD.MM.YYYY
- * @return date in the format DDMMYY (size = 13 mm in arial 8)
+ * @return date in the format DD.MM.YY (size = 13 mm in arial 8)
  */
 function smaller_date($p_date)
 {
@@ -826,7 +834,7 @@ function format_date($p_date, $p_from_format = 'YYYY-MM-DD',$p_to_format='DD.MM.
        case 'YYYYMMDD':
             $str_date = $date[0] . $date[1] . $date[2];
             break;
-		 case 'YYYY/MM/DD':
+        case 'YYYY/MM/DD':
             $str_date = $date[0] . '/' . $date[1] . '/' . $date[2];
             break;
         case "DD.MM.YY":
@@ -1038,7 +1046,8 @@ function show_menu($module)
     if ($module == 0)return;
     static $level=0;
     global $g_user;
-    
+    $http=new HttpInput();
+    $access_code=$http->request("ac");
     $cn = Dossier::connect();
     /**
      * Show the submenus
@@ -1068,11 +1077,13 @@ function show_menu($module)
         else {
             $style_menu=$a_style_menu[$level];
         }
-		require NOALYSS_TEMPLATE.'/menu.php';
-    } // there is only one submenu so we include the code or javascript 
-      // or we show the submenu
-    elseif (count($amenu) == 1)
+	require NOALYSS_TEMPLATE.'/menu.php';
+          $level++;
+           return;
+    } elseif (count($amenu) == 1)
     {
+        // there is only one submenu so we include the code or javascript 
+        // or we show the submenu
         if ( trim($amenu[0]['me_url']) != "" ||
              trim ($amenu[0]['me_file']) != "" ||
              trim ($amenu[0]['me_javascript']) != "" )
@@ -1081,8 +1092,11 @@ function show_menu($module)
 		echo h2info(_($amenu[0]['me_menu']));
 		echo '</div>';
 		$module = $amenu[0]['pm_id'];
+                display_menu($module);
+                $level++;
+                return;
         } else {
-           $url=$_REQUEST['ac'].'/'.$amenu[0]['me_code'];
+           $url=$access_code.'/'.$amenu[0]['me_code'];
            echo '<a href="do.php?gDossier='.Dossier::id().'&ac='.$url.'">';
            echo _($amenu[0]['me_menu']);
            echo '</a>';
@@ -1091,67 +1105,85 @@ function show_menu($module)
         }
     }
     
+    // !!! this point should never be reached 
     // There is no submenu or only one
     if (empty($amenu) || count($amenu) == 1)
     {
-		$file = $cn->get_array("select me_file,me_parameter,me_javascript,me_type
-		from menu_ref
-		join profile_menu using (me_code)
-		join profile_user using (p_id)
-		where
-		pm_id=$1 and
-		user_name=$2 and
-		(me_file is not null or trim(me_file) <>'' or
-		me_javascript is not null or trim (me_javascript) <> '')", array($module,$g_user->login));
-
-		if (count($file)==0)
-		{
-                        return;
-		}
-
-		if ($file[0]['me_file'] != "")
-		{
-			if ($file[0]['me_parameter'] !== "")
-			{
-				// if there are paramter put them in superglobal
-				$array=compute_variable($file[0]['me_parameter']);
-				put_global($array);
-			}
-                        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
-                         */
-                        if (LOGINPUT) {
-                                $file_loginput=fopen($_ENV['TMP'].'/scenario-'.$_SERVER['REQUEST_TIME'].'.php','a+');
-                                fwrite($file_loginput, "include '".$file[0]['me_file']."';");
-                                fwrite($file_loginput,"\n");
-                                fclose($file_loginput);
-                        }
-			// if file is not a plugin, include the file, otherwise
-			// include the plugin launcher
-			if ( $file[0]['me_type'] != 'PL') {
-                            if (file_exists ($file[0]['me_file']) )
-                            {
-				require_once $file[0]['me_file'];
-                            } elseif ( file_exists(NOALYSS_INCLUDE.'/'.$file[0]['me_file'])) {
-				require_once NOALYSS_INCLUDE.'/'.$file[0]['me_file'];
-                            }else {                            
-                                echo echo_warning(_("Fichier non trouvé"));
-                            }
-                        } else {
-				require 'extension_get.inc.php';
-                        }
-
-			exit();
-		}
-		if ( $file[0]['me_javascript'] != '')
-		{
-                    $js=  str_replace('<DOSSIER>', dossier::id(), $file[0]['me_javascript']);
-                    echo create_script($js);
-		}
+        display_menu($module);
+                
     }
     $level++;
 }
+/**
+ * Display a menu
+ * @global type $g_user
+ * @param type $p_menuid
+ * @return type
+ */
+function display_menu($p_menuid)
+{
+    if ($p_menuid == 0) return;
+    global $g_user;
+    $cn=Dossier::connect();
+    
+    $file = $cn->get_array("
+        select me_file,me_parameter,me_javascript,me_type
+        from menu_ref
+        join profile_menu using (me_code)
+        join profile_user using (p_id)
+        where
+        pm_id=$1 and
+        user_name=$2 and
+        (me_file is not null or trim(me_file) <>'' or
+        me_javascript is not null or trim (me_javascript) <> '')", array($p_menuid,$g_user->login));
+
+    if (count($file)==0)
+    {
+            return;
+    }
+
+    if ($file[0]['me_file'] != "")
+    {
+            if ($file[0]['me_parameter'] !== "")
+            {
+                    // if there are paramter put them in superglobal
+                    $array=compute_variable($file[0]['me_parameter']);
+                    put_global($array);
+            }
+            tracedebug("'menu", $file[0]['me_file'],__FUNCTION__.__LINE__."line");
+            tracedebug("'menu", $file[0]['me_parameter'],__FUNCTION__.__LINE__."parm ");
+            /*
+             * Log the file we input to put in the folder test-noalyss for replaying it
+             */
+            if (LOGINPUT) {
+                    $file_loginput=fopen($_ENV['TMP'].'/scenario-'.$_SERVER['REQUEST_TIME'].'.php','a+');
+                    fwrite($file_loginput, "include '".$file[0]['me_file']."';");
+                    fwrite($file_loginput,"\n");
+                    fclose($file_loginput);
+            }
+            // if file is not a plugin, include the file, otherwise
+            // include the plugin launcher
+            if ( $file[0]['me_type'] != 'PL') {
+                if (file_exists ($file[0]['me_file']) )
+                {
+                    require_once $file[0]['me_file'];
+                } elseif ( file_exists(NOALYSS_INCLUDE.'/'.$file[0]['me_file'])) {
+                    require_once NOALYSS_INCLUDE.'/'.$file[0]['me_file'];
+                }else {                            
+                    echo echo_warning(_("Fichier non trouvé"));
+                }
+            } else {
+                    require 'extension_get.inc.php';
+            }
+
+            exit();
+    } elseif ( $file[0]['me_javascript'] != '')
+    {
+        $js=  str_replace('<DOSSIER>', dossier::id(), $file[0]['me_javascript']);
+        echo create_script($js);
+    } 
+
+}
 /**
  * Put in superglobal (get,post,request) the value contained in
  * the parameter field (me_parameter)
@@ -1332,7 +1364,7 @@ function is_msie()
 function record_log($p_message)
 {
     error_log("noalyss".print_r($p_message,true),0);
-    error_log("noalyss GET [".var_export($_GET, true)."] POST [".var_export($_POST, true)."]",0);
+    error_log("noalyss GET [".json_encode($_GET)."] POST [".json_encode($_POST)."]",0);
 }
 if(!function_exists('tracedebug')) {
   function tracedebug($file,$var, $label = NULL) {
@@ -1412,8 +1444,8 @@ function generate_random_string($car)
  * generate a string of p_car character and a input text with name p_ctl_name
  * work like a kind of captcha.The control code for checking is ctlcode.
  * You compare the content of the variable p_ctl_name with ctlcode
- * @param $p_ctl_name
- * @param $p_car
+ * @param $p_ctl_name name of the HTML input text
+ * @param $p_car length of the string
  */
 function confirm_with_string($p_ctl_name,$p_car)
 {
@@ -1424,3 +1456,73 @@ function confirm_with_string($p_ctl_name,$p_car)
     $r.=$ctl->input();
     return $r;
 }
+/**
+ * Find the menu marked as default in the given profile
+ * @param number $pn_menu (profile_menu.id)
+ */
+function find_default_menu($pn_menu)
+{
+    $cn=Dossier::connect();
+    $sql = '  select pm_id from profile_menu where pm_default =1 and pm_id_dep = $1';
+    $aresult=$cn->get_array($sql, [$pn_menu]);
+    if (empty($aresult)) {
+        return 0;
+    }
+    return $aresult[0]['pm_id'];
+}
+
+/**
+ * Check if there is a default menu for this user and add it. The array is filling from 1 to 3
+ * @verbatim
+ * 
+ * COMPTA              0   -   0 - 173
+ * COMPTA/MENUACH      0   - 173 -   3
+ * COMPTA/MENUACH/ACH  173 -   3 -  85
+ * 
+ * @endverbatim
+ * 
+ *
+ * @param array $pa_menu if the array of option ; index pm_id_v1 , pm_id_v2 and pm_id_v3
+ * 
+ */
+function complete_default_menu($pa_menu)
+{
+    $a_result=$pa_menu;
+    // find the first one which is null
+    if ($pa_menu[0]['pm_id_v2'] == 0) {
+        $tmp=find_default_menu($pa_menu[0]['pm_id_v1']);
+        if ( $tmp <> 0 ) {
+            $a_result[0]['pm_id_v2']=$pa_menu[0]['pm_id_v1'];
+            $a_result[0]['pm_id_v1']=$tmp;
+        }
+    }
+    if ($pa_menu[0]['pm_id_v3'] == 0) {
+         $tmp=find_default_menu($a_result[0]['pm_id_v1']);
+        if ( $tmp <> 0 ) {
+            $a_result[0]['pm_id_v3']=$a_result[0]['pm_id_v2'];
+            $a_result[0]['pm_id_v2']=$a_result[0]['pm_id_v1'];
+            $a_result[0]['pm_id_v1']=$tmp;
+        }
+    }
+    return $a_result;
+}
+/**
+ * rebuild the access code
+ * @see complete_default_menu
+ * @param array of number $pan_code index row [0] =  index pm_id_v1 , pm_id_v2 and pm_id_v3
+ */
+function rebuild_access_code($pan_code) 
+{
+    if ( empty ($pan_code)) {return;}
+    $s_result="";
+    $cn=Dossier::connect();
+    $an_code=['pm_id_v3','pm_id_v2','pm_id_v1'];
+    $sep="";
+    for ($i=0;$i<3;$i++)
+    {
+        $ix=$an_code[$i];
+        $s_result.=$sep.$cn->get_value("select me_code from profile_menu where pm_id=$1",[ $pan_code[0][$ix] ]);
+        $sep=($s_result != "" )?"/":"";
+    }
+    return $s_result;
+}
\ No newline at end of file
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index 08d570817..eb779b57d 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -204,3 +204,8 @@ 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/global.php b/unit-test/global.php
index 0d4a00530..8efdbcf21 100644
--- a/unit-test/global.php
+++ b/unit-test/global.php
@@ -34,4 +34,4 @@ $_SESSION[SESSION_KEY.'g_pass']='phpcompta';
 $_SESSION[SESSION_KEY.'g_pagesize']='50';
 $g_user=new User($g_connection);
 
-require_once __DIR__.'/facility.class.php';
\ No newline at end of file
+require_once __DIR__.'/facility.class.php';
diff --git a/unit-test/include/lib/ac_common.php b/unit-test/include/lib/ac_common.php
new file mode 100644
index 000000000..b2bc19e4e
--- /dev/null
+++ b/unit-test/include/lib/ac_common.php
@@ -0,0 +1,171 @@
+<?php
+
+use PHPUnit\Framework\TestCase;
+
+class Ac_CommonTest extends TestCase
+{
+
+    /**
+     * @covers remove_divide_zero()
+     */
+    function testRemove_divide_byZero()
+    {
+        $value_test=array("55/0.0", "55/1", "1000/0.0+1", "999/0.002+5", "1200/0+5", "0 /0",
+            "0.0/1", "0. 0/0.0");
+        $expected=array("0", "55/1", "0+1", "999/0.002+5", "0+5", "0", "0.0/1", "0");
+        $nb_value=count($value_test);
+        for ($i=0; $i<$nb_value; $i++)
+        {
+            $this->assertEquals(remove_divide_zero($value_test[$i]), $expected[$i]);
+        }
+    }
+
+    /**
+     * @covers find_default_menu
+     * @global type $g_connection
+     */
+    function testFind_default_menu()
+    {
+        global $g_connection;
+        $g_connection->exec_sql("update profile_menu set pm_default = 0 where pm_id in (173,3,85)");
+        $this->assertEquals(find_default_menu(173), 0, "assert COMPTA has not default depending menu");
+        $this->assertEquals(find_default_menu(3), 0, "assert COMPTA has not default depending menu");
+        $g_connection->exec_sql("update profile_menu set pm_default = 1 where pm_id in (3,85)");
+        $this->assertEquals(find_default_menu(3), 85, "assert ACH depends of MENUACH");
+        $this->assertEquals(find_default_menu(173), 3, "assert  MENUACH depends of COMPTA");
+    }
+
+    /**
+     * @covers rebuild_access_code
+     */
+    function testRebuild_access_code()
+    {
+        // use profile 1 , 
+        // COMPTA 173
+        // COMPTA/MENUACH 3
+        // COMPTA/MENUACH/ACH  85
+        $this->assertEquals(
+                "COMPTA",
+                rebuild_access_code(array(
+            array("pm_id_v3"=>"0", "pm_id_v2"=>"0", "pm_id_v1"=>"173"))), "COMPTA String must not changed"
+        );
+        $this->assertEquals(
+                "COMPTA/MENUACH", rebuild_access_code(array(array("pm_id_v3"=>"0", "pm_id_v2"=>"173", "pm_id_v1"=>"3"))),
+                "COMPTA/MENUACH ");
+
+        $this->assertEquals(
+                "COMPTA/MENUACH/ACH",
+                rebuild_access_code(array(array("pm_id_v3"=>"173", "pm_id_v2"=>"3", "pm_id_v1"=>"85"))),
+                "COMPTA/MENUACH/ACH String must not changed");
+    }
+
+    /**
+     * @covers Complete_default_menu()
+     */
+    function testComplete_default_menu()
+    {
+        // use profile 1 , 
+        // COMPTA 173
+        // COMPTA/MENUACH 3
+        // COMPTA/MENUACH/ACH  85
+        global $g_connection;
+        $g_connection->exec_sql("update profile_menu set pm_default = 0 where pm_id in (173,3,85)");
+        $this->assertEquals(
+                array(array("pm_id_v3"=>"0", "pm_id_v2"=>"0", "pm_id_v1"=>"173")),
+                complete_default_menu(array(
+            array("pm_id_v3"=>"0", "pm_id_v2"=>"0", "pm_id_v1"=>"173"))),
+                "complete_default_menu() not default menu to add"
+        );
+        $this->assertEquals(
+                array(array("pm_id_v3"=>"0", "pm_id_v2"=>"173", "pm_id_v1"=>"3")),
+                complete_default_menu(array(array("pm_id_v3"=>"0", "pm_id_v2"=>"173", "pm_id_v1"=>"3"))),
+                "complete_default_menu() not default menu to add"
+        );
+
+        $this->assertEquals(
+                array(array("pm_id_v3"=>"173", "pm_id_v2"=>"3", "pm_id_v1"=>"85")),
+                complete_default_menu(array(array("pm_id_v3"=>"173", "pm_id_v2"=>"3", "pm_id_v1"=>"85"))),
+                "complete_default_menu() not default menu to add"
+        );
+
+        // complete default menu
+        $g_connection->exec_sql("update profile_menu set pm_default = 1 where pm_id in (3)");
+        $this->assertEquals(
+                array(array("pm_id_v3"=>"173", "pm_id_v2"=>"3", "pm_id_v1"=>"85")),
+                complete_default_menu(array(array("pm_id_v3"=>"173", "pm_id_v2"=>"3", "pm_id_v1"=>"85"))),
+                "complete_default_menu() not default menu to add"
+        );
+        $this->assertEquals(
+                array(array("pm_id_v3"=>"0", "pm_id_v2"=>"173", "pm_id_v1"=>"3")),
+                complete_default_menu(array(array("pm_id_v3"=>"0", "pm_id_v2"=>"0", "pm_id_v1"=>"173"))),
+                "complete_default_menu() add menu MENUACH(pm_id:3)"
+        );
+        $g_connection->exec_sql("update profile_menu set pm_default = 1 where pm_id in (85)");
+        $this->assertEquals(
+                array(array("pm_id_v3"=>"173", "pm_id_v2"=>"3", "pm_id_v1"=>"85")),
+                complete_default_menu(array(array("pm_id_v3"=>"0", "pm_id_v2"=>"0", "pm_id_v1"=>"173"))),
+                "complete_default_menu() add menu MENUACH(pm_id:3) and ACH (pm_id:85)"
+        );
+
+        $g_connection->exec_sql("update profile_menu set pm_default = 0 where pm_id in (3)");
+        $this->assertEquals(
+                array(array("pm_id_v3"=>"0", "pm_id_v2"=>"0", "pm_id_v1"=>"173")),
+                complete_default_menu(array(array("pm_id_v3"=>"0", "pm_id_v2"=>"0", "pm_id_v1"=>"173"))),
+                "complete_default_menu() does not add any menu "
+        );
+    }
+
+    /**
+     * @covers format_date
+     */
+    function testFormat_Date()
+    {
+        $this->assertEquals("2020-10-11", format_date("11.10.2020", "DD.MM.YYYY", "YYYY-MM-DD"),
+                "date from DD.MM.YYYY to YYYY-MM-DD");
+        $this->assertEquals("11-10-2020", format_date("11.10.2020", "DD.MM.YYYY", "DD-MM-YYYY"),
+                "date from DD.MM.YYYY to DD-MM-YYYY");
+        $this->assertEquals("20201011", format_date("11.10.2020", "DD.MM.YYYY", "YYYYMMDD"),
+                "date from DD.MM.YYYY to YYYYMMDD");
+        $this->assertEquals("2020/10/11", format_date("11.10.2020", "DD.MM.YYYY", "YYYY/MM/DD"),
+                "date from DD.MM.YYYY to YYYY/MM/DD");
+        $this->assertEquals("11.10.20", format_date("11.10.2020", "DD.MM.YYYY", "DD.MM.YY"),
+                "date from DD.MM.YYYY to DD.MM.YY");
+        $this->assertEquals("11-10-20", format_date("11.10.2020", "DD.MM.YYYY", "DD-MM-YY"),
+                "date from DD.MM.YYYY to DD/MM/YY");
+    }
+
+    function testShrinkDate()
+    {
+        $this->assertEquals("101120", shrink_date("10.11.2020"), "shrink_date ");
+        $this->assertEquals("10.11.20", smaller_date("10.11.2020"), "smaller_date");
+    }
+
+    /**
+     * @covers sql_filter_per
+     */
+    function testSQL_filter_per()
+    {
+        global $g_connection;
+
+        $result="jr_tech_per in (select p_id from parm_periode  where ".
+                "p_start >= to_date('01.07.2018','DD.MM.YYYY') and p_end <= to_date('31.08.2018','DD.MM.YYYY'))";
+        $this->assertEquals(
+                $result, trim(sql_filter_per($g_connection, "01.07.2018", "31.08.2018", "date", "jr_tech_per")));
+
+        $result="j_tech_per in (select p_id from parm_periode  where ".
+                "p_start >= to_date('01.07.2018','DD.MM.YYYY') and p_end <= to_date('31.08.2018','DD.MM.YYYY'))";
+        $this->assertEquals(
+                $result, trim(sql_filter_per($g_connection, "01.07.2018", "31.08.2018", "date", "j_tech_per")));
+
+        $result="j_tech_per = (select p_id from parm_periode  where ".
+                " p_start = to_date('01.07.2018','DD.MM.YYYY'))";
+        $this->assertEquals(
+                $result, trim(sql_filter_per($g_connection, "01.07.2018", "01.07.2018", "date", "j_tech_per")));
+
+        $result="j_tech_per in (select p_id from parm_periode  where ".
+                "p_start >= to_date('01.07.2018','DD.MM.YYYY') and p_end <= to_date('31.08.2018','DD.MM.YYYY'))";
+        $this->assertEquals(
+                $result, trim(sql_filter_per($g_connection, 98, 99, "p_id", "j_tech_per")));
+    }
+
+}

From 01ef0a8d608dd3f25d9eac080d48cb6b565d887f Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Fri, 15 Jan 2021 17:12:15 +0100
Subject: [PATCH 212/257] Redirect if DB version not correct

---
 html/login.php | 52 ++++++++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/html/login.php b/html/login.php
index face7be1a..713142081 100644
--- a/html/login.php
+++ b/html/login.php
@@ -48,30 +48,33 @@ if (  isset ($_POST["p_user"] ) )
      * Check repository version
      */
 
-	if ($version != DBVERSIONREPO)
-	{
-		echo alert(_('Version de base de données incorrectes, vous devez mettre à jour'));
-		echo "<META HTTP-EQUIV=\"REFRESH\" content=\"0;url=admin-noalyss.php\">";
-		exit();
-	}
+    if ($version != DBVERSIONREPO)
+    {
+        echo html_page_start();
+        echo h1(_("Version base de donneés incorrecte"));
+        echo span(_('Un instant svp'));
+        echo alert(_('Version de base de données incorrectes, vous devez mettre à jour'));
+        echo "<META HTTP-EQUIV=\"REFRESH\" content=\"3;url=admin-noalyss.php??action=upgrade&sb=database\">";
+        exit();
+    }
     require_once NOALYSS_INCLUDE."/class/user.class.php";
     $User=new User($rep);
     $User->Check(false,'LOGIN');
     if ($g_captcha == true)
-      {
-	include("securimage/securimage.php");
-	$img = new Securimage();
-	$valid = $img->check($_POST['captcha_code']);
-	if ( $valid == false )
-	  {
-	    echo alert(_('Code invalide'));
-	    echo "<META HTTP-EQUIV=\"REFRESH\" content=\"0;url=index.php\">";
-	    exit();
-	  }
+    {
+          include("securimage/securimage.php");
+          $img = new Securimage();
+          $valid = $img->check($_POST['captcha_code']);
+          if ( $valid == false )
+          {
+          echo alert(_('Code invalide'));
+          echo "<META HTTP-EQUIV=\"REFRESH\" content=\"0;url=index.php\">";
+          exit();
       }
-      // force the nocache
-      $backurl='user_login.php?v='.microtime(true);
-      if ( isset ($_POST['backurl'])) {
+      }
+    // force the nocache
+    $backurl='user_login.php?v='.microtime(true);
+    if ( isset ($_POST['backurl'])) {
           $backurl=urldecode($_POST['backurl']);
       }
     echo "<META HTTP-EQUIV=\"REFRESH\" content=\"0;url={$backurl}\">";
@@ -86,10 +89,13 @@ else
      */
 
     if ( $version != DBVERSIONREPO)
-      {
-	echo alert(_('Version de base de données incorrectes, vous devez mettre à jour'));
-	echo "<META HTTP-EQUIV=\"REFRESH\" content=\"1;url=admin-noalyss.php\">";
-	exit();
+    {
+          echo html_page_start();
+          echo h1(_("Version base de donneés incorrecte"));
+          echo span(_('Un instant svp'));
+          echo alert(_('Version de base de données incorrectes, vous devez mettre à jour'));
+	    echo "<META HTTP-EQUIV=\"REFRESH\" content=\"3;url=admin-noalyss.php?action=upgrade&sb=database\">";
+	    exit();
 
       }
 

From 26bbcf61815d9e5ad544d7e0a542766ad748166b Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Sat, 16 Jan 2021 11:32:02 +0100
Subject: [PATCH 213/257] =?UTF-8?q?Tache=20#0001875:=20Demande=20am=C3=A9l?=
 =?UTF-8?q?ioration=20calendrier=20Choix=20de=20commencer=20calendrier=20e?=
 =?UTF-8?q?st=20une=20pr=C3=A9f=C3=A9rence=20utilisateur?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/do.php                      |  3 ++
 include/ajax/ajax_preference.php | 29 ++++++++++-
 include/class/user.class.php     | 70 ++++++++++++++++-----------
 include/lib/idate.class.php      | 83 +++++++++++++++++++++++++++++++-
 include/template/calendar.php    | 52 +++++++++++---------
 5 files changed, 183 insertions(+), 54 deletions(-)

diff --git a/html/do.php b/html/do.php
index b91308fe0..47f180f21 100644
--- a/html/do.php
+++ b/html/do.php
@@ -56,6 +56,9 @@ $cn = Dossier::connect();
 global $g_user, $cn,$g_parameter,$http;
 $g_user = new User($cn);
 $http=new HttpInput();
+if ( ! defined("FIRST_WEEK_DAY")) {
+    define ("FIRST_WEEK_DAY",$g_user->get_first_week_day());
+}
 /*
  * check that the database is not empty
  */
diff --git a/include/ajax/ajax_preference.php b/include/ajax/ajax_preference.php
index 3f7448b60..95589e736 100644
--- a/include/ajax/ajax_preference.php
+++ b/include/ajax/ajax_preference.php
@@ -69,7 +69,7 @@ if ( $action == 'display_form' )
     echo HtmlInput::title_box(_('Préférence'), 'preference_div');
     echo '<DIV class="content">';
     echo '<p class="notice">';
-    echo _("Après validation, recharger si vous changez la langue");
+    echo _("Après validation, recharger pour appliquer les changements");
     echo '</p>';
     //----------------------------------------------------------------------
     //
@@ -145,6 +145,29 @@ if ( $action == 'display_form' )
                         <?=$exercice->select("exercice_setting",$selected_exercice,$js)->input();?>
                     </td>
                 </tr>
+            <tr>
+                <td>
+                    <?=_("Premier jour semaine")?>
+                </td>
+                <td>
+                    <?php
+                        $aFirstDay=array(
+                            ["label"=>_("Lundi"),"value"=>1],
+                            ["label"=>_("Mardi"),"value"=>2],
+                            ["label"=>_("Mercredi"),"value"=>3],
+                            ["label"=>_("Jeudi"),"value"=>4],
+                            ["label"=>_("Vendredi"),"value"=>5],
+                            ["label"=>_("Samedi"),"value"=>6],
+                            ["label"=>_("Dimanche"),"value"=>0],
+                        );
+                        $selFirstDay=new ISelect("selFirstDay");
+                        $selFirstDay->value=$aFirstDay;
+                        $selFirstDay->selected=$g_user->get_first_week_day();
+                        echo $selFirstDay->input();
+                    ?>
+
+                </td>
+            </tr>
     		<tr>
                     
                     <td><?php echo _('Période');?></td>
@@ -303,6 +326,7 @@ if ($action == 'save')
     $csv_fieldsep=$http->post("csv_fieldsep","number");
     $csv_decimal=$http->post("csv_decimal","number");
     $csv_encoding=$http->post("csv_encoding");
+    $firstday=$http->post("selFirstDay","number");
     
     if (strlen(trim($pass_1)) != 0 && strlen(trim($pass_2)) != 0)
     {
@@ -322,8 +346,9 @@ if ($action == 'save')
     $g_user->save_global_preference('csv_fieldsep', $csv_fieldsep);
     $g_user->save_global_preference('csv_decimal', $csv_decimal);
     $g_user->save_global_preference('csv_encoding', $csv_encoding);
+    $g_user->save_global_preference('first_week_day', $firstday);
     $g_user->save_email($p_email);
-    
+
     $_SESSION[SESSION_KEY.'g_theme']=$style_user;
     $_SESSION[SESSION_KEY.'g_pagesize']=$p_size;
     $_SESSION[SESSION_KEY.'g_lang']=$lang;
diff --git a/include/class/user.class.php b/include/class/user.class.php
index 3ad5bfefb..0493b7345 100644
--- a/include/class/user.class.php
+++ b/include/class/user.class.php
@@ -127,7 +127,7 @@ class User
 		$this->login =strtolower($row['use_login']);
 		$this->admin = $row['use_admin'];
 		$this->password = $row['use_pass'];
-                $this->email=$row['use_email'];
+		$this->email=$row['use_email'];
 	}
 
 	function save()
@@ -555,16 +555,16 @@ class User
 			$type = $row['parameter_type'];
 			$l_array[$type] = $row['parameter_value'];
 		}
-                $repo=new Database();
-                $a_global_pref=$repo->get_array("select parameter_type,parameter_value from user_global_pref 
-                                            where 
-                                            upper(user_id) = upper($1)",[$this->login]);
-                $nb_global=count($a_global_pref);
-                for ( $i = 0 ;$i< $nb_global ; $i++) {
-                    $idx=$a_global_pref[$i]['parameter_type'];
-                    $value=$a_global_pref[$i]['parameter_value'];
-                    $l_array[$idx]=$value;
-                }
+		$repo=new Database();
+		$a_global_pref=$repo->get_array("select parameter_type,parameter_value from user_global_pref 
+									where 
+									upper(user_id) = upper($1)",[$this->login]);
+		$nb_global=count($a_global_pref);
+		for ( $i = 0 ;$i< $nb_global ; $i++) {
+			$idx=$a_global_pref[$i]['parameter_type'];
+			$value=$a_global_pref[$i]['parameter_value'];
+			$l_array[$idx]=$value;
+		}
 
 		return $l_array;
 	}
@@ -663,7 +663,8 @@ class User
                     'g_lang' => 'LANG',
                     'csv_fieldsep'=>'csv_fieldsep',
                     'csv_decimal'=>'csv_decimal' ,
-                    'csv_encoding'=>'csv_encoding');
+                    'csv_encoding'=>'csv_encoding',
+					'first_week_day'=>'first_week_day');
                 
 		foreach ($array_pref as $name => $parameter)
 		{
@@ -690,29 +691,28 @@ class User
 	{
 
 		$default_parameter = array("THEME" => "classic",
-			"PAGESIZE" => "50",
-			'TOPMENU' => 'TEXT',
-			'LANG' => 'fr_FR.utf8',
+						"PAGESIZE" => "50",
+						'TOPMENU' => 'TEXT',
+						'LANG' => 'fr_FR.utf8',
                         'csv_fieldsep'=>'0',
                         'csv_decimal'=>'0',
-                        'csv_encoding'=>'utf8'
+                        'csv_encoding'=>'utf8',
+						'first_week_day'=>1
                     );
 		$cn = new Database();
-		$Sql = "insert into user_global_pref(user_id,parameter_type,parameter_value)
-             values ('%s','%s','%s')";
+		$sql = "insert into user_global_pref(user_id,parameter_type,parameter_value)
+             values ($1,$2,$3)";
 		if ($p_type == "")
 		{
 			foreach ($default_parameter as $name => $value)
 			{
-				$Insert = sprintf($Sql, $this->login, $name, $value);
-				$cn->exec_sql($Insert);
+				$cn->exec_sql($sql,array($this->login,$name,$value));
 			}
 		}
 		else
 		{
 			$value = ($p_value == "") ? $default_parameter[$p_type] : $p_value;
-			$Insert = sprintf($Sql, $this->login, $p_type, $value);
-			$cn->exec_sql($Insert);
+			$cn->exec_sql($sql,array($this->login,$p_type,$value));
 		}
 	}
 
@@ -727,12 +727,13 @@ class User
 	function update_global_pref($p_type, $p_value = "")
 	{
 		$default_parameter = array("THEME" => "classic",
-			"PAGESIZE" => "50",
-			"LANG" => 'fr_FR.utf8',
-			'TOPMENU' => 'SELECT',
+						"PAGESIZE" => "50",
+						"LANG" => 'fr_FR.utf8',
+						'TOPMENU' => 'SELECT',
                         'csv_fieldsep'=>'0',
                         'csv_decimal'=>'0',
-                        'csv_encoding'=>'utf8'
+                        'csv_encoding'=>'utf8',
+						'first_week_day'=>1
                     );
 		$cn = new Database();
 		$Sql = "update user_global_pref set parameter_value=$1
@@ -1479,6 +1480,21 @@ class User
             $this->db->exec_sql("update user_active_security set us_action=$1 where us_login = $2",[$flag,$this->login]);
         }
     }
+
+	/**
+	 *
+	 */
+    function get_first_week_day()
+	{
+		$repocn=new Database();
+		$result=$repocn->get_value("select parameter_value from user_global_pref where parameter_type=$1 and user_id=$2 ",
+				array("first_week_day",$this->login));
+		if ($repocn->count() == 0 ) {
+			$this->save_global_preference("first_week_day",1);
+			return 1;
+		}
+		return $result;
+	}
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/include/lib/idate.class.php b/include/lib/idate.class.php
index 3deb069a9..805041b0f 100644
--- a/include/lib/idate.class.php
+++ b/include/lib/idate.class.php
@@ -37,6 +37,7 @@ class IDate extends HtmlInput
     var $placeholder;
     var $title;
     var $autofocus;
+    var $firstDate; //<! first day in the calendar : 0 for sunday
 
     function __construct($name='', $value='', $p_id="")
     {
@@ -46,7 +47,83 @@ class IDate extends HtmlInput
         $this->extra="";
         $this->style=' class="input_text" ';
         $this->autofocus=false;
+        $this->firstDate=(defined("FIRST_WEEK_DAY"))?FIRST_WEEK_DAY:0;
     }
+    /**
+     * @return string
+     */
+    public function get_placeholder()
+    {
+        return $this->placeholder;
+        return $this;
+    }
+
+    /**
+     * @param string $placeholder
+     */
+    public function set_placeholder($placeholder)
+    {
+        $this->placeholder = $placeholder;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function get_title()
+    {
+        return $this->title;
+        return $this;
+    }
+
+    /**
+     * @param string $title
+     */
+    public function set_title($title)
+    {
+        $this->title = $title;
+        return $this;
+    }
+
+    /**
+     * @return false
+     */
+    public function get_autofocus()
+    {
+        return $this->autofocus;
+        return $this;
+    }
+
+    /**
+     * @param false $autofocus
+     */
+    public function set_autofocus($autofocus)
+    {
+        $this->autofocus = $autofocus;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function get_firstDate()
+    {
+        return $this->firstDate;
+        return $this;
+    }
+
+    /**
+     * @param mixed $firstDate
+     */
+    public function set_firstDate($firstDate)
+    {
+        if (isNumber($firstDate)==0){
+            throw new Exception("IDATE1: invalide data");
+        }
+        $this->firstDate = $firstDate;
+        return $this;
+    }
+
 
     /*!\brief show the html  input of the widget */
 
@@ -83,10 +160,12 @@ class IDate extends HtmlInput
             button         :    "%s_trigger",  
             align          :    "Bl",         
             singleClick    :    true,
-            firstDay:0 
+            firstDay:%s 
         });
             </script>'
-                ,$this->id,$this->id);
+                ,$this->id,
+                $this->id,
+                $this->firstDate);
         return $r;
     }
 
diff --git a/include/template/calendar.php b/include/template/calendar.php
index 7b921e6f5..88effb67f 100644
--- a/include/template/calendar.php
+++ b/include/template/calendar.php
@@ -18,41 +18,47 @@
     <?php endif; ?>
 <tr>
 <?php
+$nFirstDay=$g_user->get_first_week_day();
+$nDay=$nFirstDay;
 for ($i=0;$i<=6;$i++){
 	echo "<th>";
-	echo $week[$i];
+	$nDay=($nDay>6)?0:$nDay;
+	echo $week[$nDay];
+	$nDay++;
 	echo "</th>";
 }
 ?>
 </tr>
 <?php
 $ind=1;
-$week=0;
+$week=$nFirstDay;
+$nCol=0;
 $today_month=date('m');
 $today_day=date('j');
 while ($ind <= $this->day) {
-if ( $week == 0 ) echo "<tr>";
-$class="workday";
-if ( $week == 0 || $week == 6) $class="weekend";
-// compute the date
-$timestamp_date=mktime(0,0,0,$this->month,$ind,$this->year);
-$date_calendar=date('w',$timestamp_date);
-$st="";
-if ( $today_month==$this->month && $today_day==$ind)
-  $st='  style="border:1px solid red" ';
-if ( $date_calendar == $week ) {
-	echo '<td class="'.$class.'" '.$st.'>'.'<span class="day">'.$ind."</span>";
-	echo $cell[$ind];
-	echo '</td>';
-	$ind++;$week++;
-} else {
-   echo "<td></td>";
-   $week++;
+    if ( $nCol == 0 ) echo "<tr>";
+    $class="workday";
+    if ( $week == 0 || $week == 6) $class="weekend";
+    // compute the date
+    $timestamp_date=mktime(0,0,0,$this->month,$ind,$this->year);
+    $date_calendar=date('w',$timestamp_date);
+    $st="";
+    if ( $today_month==$this->month && $today_day==$ind)
+      $st='  style="border:1px solid red" ';
+    if ( $date_calendar == $week ) {
+        echo '<td class="'.$class.'" '.$st.'>'.'<span class="day">'.$ind."</span>";
+        echo $cell[$ind];
+        echo '</td>';
+        $ind++;$week++;$nCol++;
+    } else {
+       echo "<td></td>";
+       $week++;$nCol++;
+    }
+    //if ( $ind > $this->day ) exit();
+    if ( $nCol == 7 ) { echo "</tr>";$nCol=0;}
+    if ( $week == 7 ) { $week=0;}
 }
-//if ( $ind > $this->day ) exit();
-if ( $week == 7 ) { echo "</tr>";$week=0;}
-}
-if ( $week != 0 ) { echo "</tr>";}
+if ( $nCol != 0 ) { echo "</tr>";}
 ?>
 
 </table>

From f0a66ec9357ba01fcebae5be75f01771e7278319 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Sat, 16 Jan 2021 11:32:02 +0100
Subject: [PATCH 214/257] =?UTF-8?q?Tache=20#0001875:=20Demande=20am=C3=A9l?=
 =?UTF-8?q?ioration=20calendrier=20Choix=20de=20commencer=20calendrier=20e?=
 =?UTF-8?q?st=20une=20pr=C3=A9f=C3=A9rence=20utilisateur?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/do.php                      |  3 ++
 include/ajax/ajax_preference.php | 29 ++++++++++-
 include/class/user.class.php     | 70 ++++++++++++++++-----------
 include/lib/idate.class.php      | 83 +++++++++++++++++++++++++++++++-
 include/template/calendar.php    | 52 +++++++++++---------
 5 files changed, 183 insertions(+), 54 deletions(-)

diff --git a/html/do.php b/html/do.php
index b91308fe0..47f180f21 100644
--- a/html/do.php
+++ b/html/do.php
@@ -56,6 +56,9 @@ $cn = Dossier::connect();
 global $g_user, $cn,$g_parameter,$http;
 $g_user = new User($cn);
 $http=new HttpInput();
+if ( ! defined("FIRST_WEEK_DAY")) {
+    define ("FIRST_WEEK_DAY",$g_user->get_first_week_day());
+}
 /*
  * check that the database is not empty
  */
diff --git a/include/ajax/ajax_preference.php b/include/ajax/ajax_preference.php
index 3f7448b60..95589e736 100644
--- a/include/ajax/ajax_preference.php
+++ b/include/ajax/ajax_preference.php
@@ -69,7 +69,7 @@ if ( $action == 'display_form' )
     echo HtmlInput::title_box(_('Préférence'), 'preference_div');
     echo '<DIV class="content">';
     echo '<p class="notice">';
-    echo _("Après validation, recharger si vous changez la langue");
+    echo _("Après validation, recharger pour appliquer les changements");
     echo '</p>';
     //----------------------------------------------------------------------
     //
@@ -145,6 +145,29 @@ if ( $action == 'display_form' )
                         <?=$exercice->select("exercice_setting",$selected_exercice,$js)->input();?>
                     </td>
                 </tr>
+            <tr>
+                <td>
+                    <?=_("Premier jour semaine")?>
+                </td>
+                <td>
+                    <?php
+                        $aFirstDay=array(
+                            ["label"=>_("Lundi"),"value"=>1],
+                            ["label"=>_("Mardi"),"value"=>2],
+                            ["label"=>_("Mercredi"),"value"=>3],
+                            ["label"=>_("Jeudi"),"value"=>4],
+                            ["label"=>_("Vendredi"),"value"=>5],
+                            ["label"=>_("Samedi"),"value"=>6],
+                            ["label"=>_("Dimanche"),"value"=>0],
+                        );
+                        $selFirstDay=new ISelect("selFirstDay");
+                        $selFirstDay->value=$aFirstDay;
+                        $selFirstDay->selected=$g_user->get_first_week_day();
+                        echo $selFirstDay->input();
+                    ?>
+
+                </td>
+            </tr>
     		<tr>
                     
                     <td><?php echo _('Période');?></td>
@@ -303,6 +326,7 @@ if ($action == 'save')
     $csv_fieldsep=$http->post("csv_fieldsep","number");
     $csv_decimal=$http->post("csv_decimal","number");
     $csv_encoding=$http->post("csv_encoding");
+    $firstday=$http->post("selFirstDay","number");
     
     if (strlen(trim($pass_1)) != 0 && strlen(trim($pass_2)) != 0)
     {
@@ -322,8 +346,9 @@ if ($action == 'save')
     $g_user->save_global_preference('csv_fieldsep', $csv_fieldsep);
     $g_user->save_global_preference('csv_decimal', $csv_decimal);
     $g_user->save_global_preference('csv_encoding', $csv_encoding);
+    $g_user->save_global_preference('first_week_day', $firstday);
     $g_user->save_email($p_email);
-    
+
     $_SESSION[SESSION_KEY.'g_theme']=$style_user;
     $_SESSION[SESSION_KEY.'g_pagesize']=$p_size;
     $_SESSION[SESSION_KEY.'g_lang']=$lang;
diff --git a/include/class/user.class.php b/include/class/user.class.php
index 3ad5bfefb..0493b7345 100644
--- a/include/class/user.class.php
+++ b/include/class/user.class.php
@@ -127,7 +127,7 @@ class User
 		$this->login =strtolower($row['use_login']);
 		$this->admin = $row['use_admin'];
 		$this->password = $row['use_pass'];
-                $this->email=$row['use_email'];
+		$this->email=$row['use_email'];
 	}
 
 	function save()
@@ -555,16 +555,16 @@ class User
 			$type = $row['parameter_type'];
 			$l_array[$type] = $row['parameter_value'];
 		}
-                $repo=new Database();
-                $a_global_pref=$repo->get_array("select parameter_type,parameter_value from user_global_pref 
-                                            where 
-                                            upper(user_id) = upper($1)",[$this->login]);
-                $nb_global=count($a_global_pref);
-                for ( $i = 0 ;$i< $nb_global ; $i++) {
-                    $idx=$a_global_pref[$i]['parameter_type'];
-                    $value=$a_global_pref[$i]['parameter_value'];
-                    $l_array[$idx]=$value;
-                }
+		$repo=new Database();
+		$a_global_pref=$repo->get_array("select parameter_type,parameter_value from user_global_pref 
+									where 
+									upper(user_id) = upper($1)",[$this->login]);
+		$nb_global=count($a_global_pref);
+		for ( $i = 0 ;$i< $nb_global ; $i++) {
+			$idx=$a_global_pref[$i]['parameter_type'];
+			$value=$a_global_pref[$i]['parameter_value'];
+			$l_array[$idx]=$value;
+		}
 
 		return $l_array;
 	}
@@ -663,7 +663,8 @@ class User
                     'g_lang' => 'LANG',
                     'csv_fieldsep'=>'csv_fieldsep',
                     'csv_decimal'=>'csv_decimal' ,
-                    'csv_encoding'=>'csv_encoding');
+                    'csv_encoding'=>'csv_encoding',
+					'first_week_day'=>'first_week_day');
                 
 		foreach ($array_pref as $name => $parameter)
 		{
@@ -690,29 +691,28 @@ class User
 	{
 
 		$default_parameter = array("THEME" => "classic",
-			"PAGESIZE" => "50",
-			'TOPMENU' => 'TEXT',
-			'LANG' => 'fr_FR.utf8',
+						"PAGESIZE" => "50",
+						'TOPMENU' => 'TEXT',
+						'LANG' => 'fr_FR.utf8',
                         'csv_fieldsep'=>'0',
                         'csv_decimal'=>'0',
-                        'csv_encoding'=>'utf8'
+                        'csv_encoding'=>'utf8',
+						'first_week_day'=>1
                     );
 		$cn = new Database();
-		$Sql = "insert into user_global_pref(user_id,parameter_type,parameter_value)
-             values ('%s','%s','%s')";
+		$sql = "insert into user_global_pref(user_id,parameter_type,parameter_value)
+             values ($1,$2,$3)";
 		if ($p_type == "")
 		{
 			foreach ($default_parameter as $name => $value)
 			{
-				$Insert = sprintf($Sql, $this->login, $name, $value);
-				$cn->exec_sql($Insert);
+				$cn->exec_sql($sql,array($this->login,$name,$value));
 			}
 		}
 		else
 		{
 			$value = ($p_value == "") ? $default_parameter[$p_type] : $p_value;
-			$Insert = sprintf($Sql, $this->login, $p_type, $value);
-			$cn->exec_sql($Insert);
+			$cn->exec_sql($sql,array($this->login,$p_type,$value));
 		}
 	}
 
@@ -727,12 +727,13 @@ class User
 	function update_global_pref($p_type, $p_value = "")
 	{
 		$default_parameter = array("THEME" => "classic",
-			"PAGESIZE" => "50",
-			"LANG" => 'fr_FR.utf8',
-			'TOPMENU' => 'SELECT',
+						"PAGESIZE" => "50",
+						"LANG" => 'fr_FR.utf8',
+						'TOPMENU' => 'SELECT',
                         'csv_fieldsep'=>'0',
                         'csv_decimal'=>'0',
-                        'csv_encoding'=>'utf8'
+                        'csv_encoding'=>'utf8',
+						'first_week_day'=>1
                     );
 		$cn = new Database();
 		$Sql = "update user_global_pref set parameter_value=$1
@@ -1479,6 +1480,21 @@ class User
             $this->db->exec_sql("update user_active_security set us_action=$1 where us_login = $2",[$flag,$this->login]);
         }
     }
+
+	/**
+	 *
+	 */
+    function get_first_week_day()
+	{
+		$repocn=new Database();
+		$result=$repocn->get_value("select parameter_value from user_global_pref where parameter_type=$1 and user_id=$2 ",
+				array("first_week_day",$this->login));
+		if ($repocn->count() == 0 ) {
+			$this->save_global_preference("first_week_day",1);
+			return 1;
+		}
+		return $result;
+	}
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/include/lib/idate.class.php b/include/lib/idate.class.php
index 3deb069a9..805041b0f 100644
--- a/include/lib/idate.class.php
+++ b/include/lib/idate.class.php
@@ -37,6 +37,7 @@ class IDate extends HtmlInput
     var $placeholder;
     var $title;
     var $autofocus;
+    var $firstDate; //<! first day in the calendar : 0 for sunday
 
     function __construct($name='', $value='', $p_id="")
     {
@@ -46,7 +47,83 @@ class IDate extends HtmlInput
         $this->extra="";
         $this->style=' class="input_text" ';
         $this->autofocus=false;
+        $this->firstDate=(defined("FIRST_WEEK_DAY"))?FIRST_WEEK_DAY:0;
     }
+    /**
+     * @return string
+     */
+    public function get_placeholder()
+    {
+        return $this->placeholder;
+        return $this;
+    }
+
+    /**
+     * @param string $placeholder
+     */
+    public function set_placeholder($placeholder)
+    {
+        $this->placeholder = $placeholder;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function get_title()
+    {
+        return $this->title;
+        return $this;
+    }
+
+    /**
+     * @param string $title
+     */
+    public function set_title($title)
+    {
+        $this->title = $title;
+        return $this;
+    }
+
+    /**
+     * @return false
+     */
+    public function get_autofocus()
+    {
+        return $this->autofocus;
+        return $this;
+    }
+
+    /**
+     * @param false $autofocus
+     */
+    public function set_autofocus($autofocus)
+    {
+        $this->autofocus = $autofocus;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function get_firstDate()
+    {
+        return $this->firstDate;
+        return $this;
+    }
+
+    /**
+     * @param mixed $firstDate
+     */
+    public function set_firstDate($firstDate)
+    {
+        if (isNumber($firstDate)==0){
+            throw new Exception("IDATE1: invalide data");
+        }
+        $this->firstDate = $firstDate;
+        return $this;
+    }
+
 
     /*!\brief show the html  input of the widget */
 
@@ -83,10 +160,12 @@ class IDate extends HtmlInput
             button         :    "%s_trigger",  
             align          :    "Bl",         
             singleClick    :    true,
-            firstDay:0 
+            firstDay:%s 
         });
             </script>'
-                ,$this->id,$this->id);
+                ,$this->id,
+                $this->id,
+                $this->firstDate);
         return $r;
     }
 
diff --git a/include/template/calendar.php b/include/template/calendar.php
index 7b921e6f5..88effb67f 100644
--- a/include/template/calendar.php
+++ b/include/template/calendar.php
@@ -18,41 +18,47 @@
     <?php endif; ?>
 <tr>
 <?php
+$nFirstDay=$g_user->get_first_week_day();
+$nDay=$nFirstDay;
 for ($i=0;$i<=6;$i++){
 	echo "<th>";
-	echo $week[$i];
+	$nDay=($nDay>6)?0:$nDay;
+	echo $week[$nDay];
+	$nDay++;
 	echo "</th>";
 }
 ?>
 </tr>
 <?php
 $ind=1;
-$week=0;
+$week=$nFirstDay;
+$nCol=0;
 $today_month=date('m');
 $today_day=date('j');
 while ($ind <= $this->day) {
-if ( $week == 0 ) echo "<tr>";
-$class="workday";
-if ( $week == 0 || $week == 6) $class="weekend";
-// compute the date
-$timestamp_date=mktime(0,0,0,$this->month,$ind,$this->year);
-$date_calendar=date('w',$timestamp_date);
-$st="";
-if ( $today_month==$this->month && $today_day==$ind)
-  $st='  style="border:1px solid red" ';
-if ( $date_calendar == $week ) {
-	echo '<td class="'.$class.'" '.$st.'>'.'<span class="day">'.$ind."</span>";
-	echo $cell[$ind];
-	echo '</td>';
-	$ind++;$week++;
-} else {
-   echo "<td></td>";
-   $week++;
+    if ( $nCol == 0 ) echo "<tr>";
+    $class="workday";
+    if ( $week == 0 || $week == 6) $class="weekend";
+    // compute the date
+    $timestamp_date=mktime(0,0,0,$this->month,$ind,$this->year);
+    $date_calendar=date('w',$timestamp_date);
+    $st="";
+    if ( $today_month==$this->month && $today_day==$ind)
+      $st='  style="border:1px solid red" ';
+    if ( $date_calendar == $week ) {
+        echo '<td class="'.$class.'" '.$st.'>'.'<span class="day">'.$ind."</span>";
+        echo $cell[$ind];
+        echo '</td>';
+        $ind++;$week++;$nCol++;
+    } else {
+       echo "<td></td>";
+       $week++;$nCol++;
+    }
+    //if ( $ind > $this->day ) exit();
+    if ( $nCol == 7 ) { echo "</tr>";$nCol=0;}
+    if ( $week == 7 ) { $week=0;}
 }
-//if ( $ind > $this->day ) exit();
-if ( $week == 7 ) { echo "</tr>";$week=0;}
-}
-if ( $week != 0 ) { echo "</tr>";}
+if ( $nCol != 0 ) { echo "</tr>";}
 ?>
 
 </table>

From a7b8d812509654ee125ef6e7c8af6384407e2b90 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sat, 16 Jan 2021 12:58:08 +0100
Subject: [PATCH 215/257] =?UTF-8?q?Tache=20#0001875:=20Demande=20am=C3=A9l?=
 =?UTF-8?q?ioration=20calendrier=20Code=20cleaning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/ajax.php               |  1 +
 html/ajax_misc.php          |  2 ++
 html/do.php                 |  4 +---
 include/lib/idate.class.php | 13 +++++--------
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/html/ajax.php b/html/ajax.php
index 4219a4cda..76bb6a257 100644
--- a/html/ajax.php
+++ b/html/ajax.php
@@ -28,6 +28,7 @@ $cn=Dossier::connect();
 $g_parameter=new Noalyss_Parameter_Folder($cn);
 $g_user=new User($cn);
 $g_user->check(true);
+IDate::set_firstDate($g_user->get_first_week_day());
 set_language();
 /* if a code has been asked */
 if (isset($_REQUEST['plugin_code']) )
diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index a1dfd697c..f0cd81541 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -94,6 +94,8 @@ else
     $g_user->check(true);
 }
 
+IDate::set_firstDate($g_user->get_first_week_day());
+
 // For progress bar, for saving time , we check and answer directly
 if ($op == "progressBar") {
     $task_id=$http->request("task_id");
diff --git a/html/do.php b/html/do.php
index 47f180f21..2b677236c 100644
--- a/html/do.php
+++ b/html/do.php
@@ -56,9 +56,7 @@ $cn = Dossier::connect();
 global $g_user, $cn,$g_parameter,$http;
 $g_user = new User($cn);
 $http=new HttpInput();
-if ( ! defined("FIRST_WEEK_DAY")) {
-    define ("FIRST_WEEK_DAY",$g_user->get_first_week_day());
-}
+IDate::set_firstDate($g_user->get_first_week_day());
 /*
  * check that the database is not empty
  */
diff --git a/include/lib/idate.class.php b/include/lib/idate.class.php
index 805041b0f..8eab4fdbc 100644
--- a/include/lib/idate.class.php
+++ b/include/lib/idate.class.php
@@ -37,7 +37,7 @@ class IDate extends HtmlInput
     var $placeholder;
     var $title;
     var $autofocus;
-    var $firstDate; //<! first day in the calendar : 0 for sunday
+    static $firstDate=0; //<! first day in the calendar : 0 for sunday
 
     function __construct($name='', $value='', $p_id="")
     {
@@ -47,7 +47,6 @@ class IDate extends HtmlInput
         $this->extra="";
         $this->style=' class="input_text" ';
         $this->autofocus=false;
-        $this->firstDate=(defined("FIRST_WEEK_DAY"))?FIRST_WEEK_DAY:0;
     }
     /**
      * @return string
@@ -108,20 +107,18 @@ class IDate extends HtmlInput
      */
     public function get_firstDate()
     {
-        return $this->firstDate;
-        return $this;
+        return self::$firstDate;
     }
 
     /**
      * @param mixed $firstDate
      */
-    public function set_firstDate($firstDate)
+    static function set_firstDate($firstDate)
     {
         if (isNumber($firstDate)==0){
             throw new Exception("IDATE1: invalide data");
         }
-        $this->firstDate = $firstDate;
-        return $this;
+        self::$firstDate= $firstDate;
     }
 
 
@@ -165,7 +162,7 @@ class IDate extends HtmlInput
             </script>'
                 ,$this->id,
                 $this->id,
-                $this->firstDate);
+                self::$firstDate);
         return $r;
     }
 

From 8005e0dbcef67389673194d4187fc9a5e9bc72f0 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Mon, 18 Jan 2021 15:35:33 +0100
Subject: [PATCH 216/257] =?UTF-8?q?Tache=200001885:=20=20postes=20utilisab?=
 =?UTF-8?q?les=20dans=20Op=C3=A9ration=20ODS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/js/accounting_item.js         | 4 ++++
 include/class/acc_ledger.class.php | 1 -
 include/class/fiche.class.php      | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/html/js/accounting_item.js b/html/js/accounting_item.js
index f7445bb81..c58b0e6e0 100644
--- a/html/js/accounting_item.js
+++ b/html/js/accounting_item.js
@@ -77,6 +77,10 @@ function search_poste(obj)
         if ( obj.jrn)
         {
             queryString+="&j="+obj.jrn;
+        }else {
+            if ($("p_jrn")) {
+                queryString+="&j="+$("p_jrn").value;
+            }
         }
         if ( obj.account)
         {
diff --git a/include/class/acc_ledger.class.php b/include/class/acc_ledger.class.php
index d7efb992f..e9683ee31 100644
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@ -927,7 +927,6 @@ class Acc_Ledger  extends jrn_def_sql
             // Account
             $poste=new IPoste();
             $poste->name='poste'.$i;
-            $poste->set_attribute('jrn', $this->id);
             $poste->set_attribute('ipopup', 'ipop_account');
             $poste->set_attribute('label', 'ld'.$i);
             $poste->set_attribute('account', 'poste'.$i);
diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index f2f8a01e7..e4942bb4a 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -477,6 +477,7 @@ class Fiche
             {
                 $w=new IPoste("av_text".$attr->ad_id);
                 $w->set_attribute('ipopup','ipop_account');
+                $w->set_attribute('jrn','0');
                 $w->set_attribute('account',"av_text".$attr->ad_id);
 				$w->dbl_click_history();
                 //  account created automatically
@@ -639,6 +640,7 @@ class Fiche
                     $w->id=$p_in."av_text".$r->ad_id;
                     $w->set_attribute('ipopup', 'ipop_account');
                     $w->set_attribute('account', $w->id);
+                    $w->set_attribute('jrn','0');
                     $w->dbl_click_history();
                     //  account created automatically
                     $w->table=0;
@@ -696,6 +698,7 @@ class Fiche
                             $w->table=0;
                             $bulle=Icon_Action::infobulle(14);
                             $w->value=$r->av_text;
+                            $w->set_attribute('jrn','0');
                             break;
                         case 'card':
                             $uniq=rand(0, 1000);

From da6ad03718ccee42ccf57e94df1359ea21429d82 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 21 Jan 2021 06:34:30 +0100
Subject: [PATCH 217/257] Security : constructor can take info from request

---
 include/class/user.class.php | 247 ++++++++++++++++++++++++++++++-----
 1 file changed, 215 insertions(+), 32 deletions(-)

diff --git a/include/class/user.class.php b/include/class/user.class.php
index 0493b7345..edc607d80 100644
--- a/include/class/user.class.php
+++ b/include/class/user.class.php
@@ -41,13 +41,13 @@ class User
 	var $db;
 	var $admin;
 	var $valid;
-        var $first_name;
-        var $name;
-        var $active ;
-        var $login ;
-        var $password ;
-        var $email ;
-        
+    var $first_name;
+    var $name;
+    var $active ;
+    var $login ;
+    var $password ;
+    var $email ;
+
 	function __construct($p_cn, $p_id = -1)
 	{
 		// if p_id is not set then check the connected user
@@ -55,17 +55,26 @@ class User
 		{
 			if (!isset($_SESSION[SESSION_KEY.'g_user']))
 			{
-				echo '<h2 class="error">' . _('Session expirée<br>Utilisateur déconnecté') . '</h2>';
-				redirect('index.php', 1);
-				exit();
+                $http=new \HttpInput();
+                $user_login=$http->request("p_user","string","");
+                $user_password=$http->request("p_pass","string","");
+
+                if ($user_login != "" && $user_password != "") {
+                    $_SESSION[SESSION_KEY."g_user"]=$user_login;
+                    $_SESSION[SESSION_KEY."g_pass"]=$user_password;
+                } else {
+                    echo '<h2 class="error">' . _('Session expirée<br>Utilisateur déconnecté') . '</h2>';
+                    redirect('index.php', 1);
+                    exit();
+                }
 			}
 
 			$this->login =strtolower($_SESSION[SESSION_KEY.'g_user']);
 			$this->pass = $_SESSION[SESSION_KEY.'g_pass'];
+			$this->id = -1;
+			$this->db = $p_cn;
 			$this->lang = (isset($_SESSION[SESSION_KEY.'g_lang'])) ? $_SESSION[SESSION_KEY.'g_lang'] : 'fr_FR.utf8';
 			$this->valid = (isset($_SESSION[SESSION_KEY.'isValid'])) ? 1 : 0;
-			$this->db = $p_cn;
-			$this->id = -1;
 			if (isset($_SESSION[SESSION_KEY.'g_theme']))
 				$this->theme = $_SESSION[SESSION_KEY.'g_theme'];
 
@@ -85,6 +94,182 @@ class User
 		}
 	}
 
+    /**
+     * @return int|mixed
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param int|mixed $id
+     */
+    public function setId(int $id): void
+    {
+        $this->id = $id;
+    }
+
+    /**
+     * @return default|mixed|string|string[]|null
+     */
+    public function getPass()
+    {
+        return $this->pass;
+    }
+
+    /**
+     * @param default|mixed|string|string[]|null $pass
+     */
+    public function setPass($pass): void
+    {
+        $this->pass = $pass;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getDb()
+    {
+        return $this->db;
+    }
+
+    /**
+     * @param mixed $db
+     */
+    public function setDb($db): void
+    {
+        $this->db = $db;
+    }
+
+    /**
+     * @return default|int|mixed|string|string[]|null
+     */
+    public function getAdmin()
+    {
+        return $this->admin;
+    }
+
+    /**
+     * @param default|int|mixed|string|string[]|null $admin
+     */
+    public function setAdmin($admin): void
+    {
+        $this->admin = $admin;
+    }
+
+    /**
+     * @return int
+     */
+    public function getValid(): int
+    {
+        return $this->valid;
+    }
+
+    /**
+     * @param int $valid
+     */
+    public function setValid(int $valid): void
+    {
+        $this->valid = $valid;
+    }
+
+    /**
+     * @return default|mixed|string|string[]|null
+     */
+    public function getFirstName()
+    {
+        return $this->first_name;
+    }
+
+    /**
+     * @param default|mixed|string|string[]|null $first_name
+     */
+    public function setFirstName($first_name): void
+    {
+        $this->first_name = $first_name;
+    }
+
+    /**
+     * @return default|mixed|string|string[]|null
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @param default|mixed|string|string[]|null $name
+     */
+    public function setName($name): void
+    {
+        $this->name = $name;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getActive()
+    {
+        return $this->active;
+    }
+
+    /**
+     * @param mixed $active
+     */
+    public function setActive($active): void
+    {
+        $this->active = $active;
+    }
+
+    /**
+     * @return string
+     */
+    public function getLogin(): string
+    {
+        return $this->login;
+    }
+
+    /**
+     * @param string $login
+     */
+    public function setLogin(string $login): void
+    {
+        $this->login = $login;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getPassword()
+    {
+        return $this->password;
+    }
+
+    /**
+     * @param mixed $password
+     */
+    public function setPassword($password): void
+    {
+        $this->password = $password;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getEmail()
+    {
+        return $this->email;
+    }
+
+    /**
+     * @param mixed $email
+     */
+    public function setEmail($email): void
+    {
+        $this->email = $email;
+    }
+
 	/**\brief load data from database.
 	 * if this->id == -1, it is unknown so we have to retrieve it
 	  from the database by the login
@@ -390,30 +575,29 @@ class User
 		return $sql;
 	}
 
+    /**
+     * synomym for isAdmin,
+     * @deprecated
+     */
+    function Admin()
+    {
+        return $this->isAdmin();
+    }
+
 	/**
-	 * \brief  Check if an user is an admin
+	 * @brief  Check if an user is an admin
 	 *
-	 * \return 1 for yes 0 for no
+	 * @return 1 for yes 0 for no
 	 */
-
-	function Admin()
+	function isAdmin()
 	{
-            $this->admin = 0;
-		if ($this->login != NOALYSS_ADMINISTRATOR )
-		{
-			$pass5 = md5($this->pass);
-			$sql = "select use_admin from ac_users where use_login=$1
-                 and use_active=1  ";
-
-			$cn = new Database();
-			$res = $cn->exec_sql($sql, array($this->login));
-			if (Database::num_row($res) == 0)
-				throw  new Exception(__FILE__ . " " . __LINE__ . " aucun resultat");
-			$this->admin = Database::fetch_result($res, 0);
-		}
-		else
-			$this->admin = 1;
+	    $this->admin = 0;
+        $pass5 = md5($this->pass);
+        $sql = "select count(*) from ac_users where use_login=$1
+             and use_active=1 and use_admin=1 ";
 
+        $cn = new Database();
+        $this->admin = $cn->get_value($sql, array($this->login));
 		return $this->admin;
 	}
 
@@ -424,7 +608,6 @@ class User
 	 * \param     - $p_user
 	 *
 	 */
-
 	function set_periode($p_periode)
 	{
 		$sql = "update user_local_pref set parameter_value=$1 where user_id=$2 and parameter_type='PERIODE'";

From 52cc9a97995065c68cfe28acf192446d204cec2e Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 21 Jan 2021 06:37:46 +0100
Subject: [PATCH 218/257] Fix : PHP compatibility with count Fix :
 Dossier::set_current Code cleaning ,

---
 include/class/acc_ledger.class.php        |  3 ++-
 include/class/acc_ledger_search.class.php |  5 +++--
 include/class/dossier.class.php           |  2 +-
 include/compta_fin_rec.inc.php            | 12 +++++++++---
 include/compta_fin_saldo.inc.php          |  4 ++--
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/include/class/acc_ledger.class.php b/include/class/acc_ledger.class.php
index e9683ee31..ae10b9096 100644
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@ -1388,12 +1388,13 @@ class Acc_Ledger  extends jrn_def_sql
     /**
      * @brief get the first ledger
      * @param  type
-     * @return the j_id
+     * @return the j_id or null if no user available
      */
     public function get_first($p_type, $p_access=3)
     {
         global $g_user;
         $all=$g_user->get_ledger($p_type, $p_access);
+        if (empty ($all)) return NULL;
         return $all[0];
     }
 
diff --git a/include/class/acc_ledger_search.class.php b/include/class/acc_ledger_search.class.php
index b435c8dc3..a85dfc59e 100644
--- a/include/class/acc_ledger_search.class.php
+++ b/include/class/acc_ledger_search.class.php
@@ -1198,7 +1198,8 @@ class Acc_Ledger_Search
         echo HtmlInput::title_box(_("Journaux"), $p_div."jrn_search");
         echo '<div style="padding:5px">';
         echo '<form method="GET" id="'.$p_div.'search_frm" onsubmit="return hide_ledger_choice(\''.$p_div.'search_frm\')">';
-        echo HtmlInput::hidden('nb_jrn', count($p_array));
+        $nb_array=(empty($p_array))?0:count($p_array);
+        echo HtmlInput::hidden('nb_jrn', $nb_array);
         echo _('Filtre ').HtmlInput::filter_table($p_div.'tb_jrn', '0,1,2', 2);
         echo HtmlInput::anchor_action(_('Inverser sel'),' toggle_checkbox(\''."{$p_div}search_frm".'\')','sel_'.$p_div,"nav");
         echo "-";
@@ -1222,7 +1223,7 @@ class Acc_Ledger_Search
         
         echo '</td>';
         echo '</tr>';
-        for ($e=0;$e<count($p_array);$e++)
+        for ($e=0;$e<$nb_array;$e++)
         {
             $row=$p_array[$e];
 //            if ( $row['jrn_enable']==0) continue;
diff --git a/include/class/dossier.class.php b/include/class/dossier.class.php
index 25e04259b..031f91573 100644
--- a/include/class/dossier.class.php
+++ b/include/class/dossier.class.php
@@ -418,7 +418,7 @@ class Dossier
      */
     static function set_current($p_dossier) {
         
-        put_global(["gDossier"=>$p_dossier]);
+        put_global([ [ "key"=>"gDossier","value"=>$p_dossier]]);
         self::check();
         
     }
diff --git a/include/compta_fin_rec.inc.php b/include/compta_fin_rec.inc.php
index 8b53fa8bd..6fc2dd936 100644
--- a/include/compta_fin_rec.inc.php
+++ b/include/compta_fin_rec.inc.php
@@ -134,11 +134,17 @@ $Ledger = new Acc_Ledger_Fin($cn, 0);
 if (!isset($_REQUEST['p_jrn']))
 {
 	$a = $Ledger->get_first('fin');
-	$Ledger->id = $a['jrn_def_id'];
+	if ( isset($a['jrn_def_id'])) {
+	    $Ledger->id = $a['jrn_def_id'];
+    } else {
+	    $Ledger->id=0;
+    }
 }
 else
-	$Ledger->id = $_REQUEST['p_jrn'];
-$jrn_priv = $g_user->get_ledger_access($Ledger->id);
+{
+    $Ledger->id =$http->request("p_jrn","number",0);
+}
+$jrn_priv = ($Ledger->id == 0)?"X":$g_user->get_ledger_access($Ledger->id);
 if (isset($_GET["p_jrn"]) && $jrn_priv == "X")
 {
 	NoAccess();
diff --git a/include/compta_fin_saldo.inc.php b/include/compta_fin_saldo.inc.php
index 42b6e9bde..cc0d95790 100644
--- a/include/compta_fin_saldo.inc.php
+++ b/include/compta_fin_saldo.inc.php
@@ -62,9 +62,9 @@ $filter_year="  j_tech_per in (select p_id from parm_periode where  p_exercice='
 $idx=0;
 bcscale(2);
 $tot_extrait=0; $tot_diff=0; $tot_operation=0;
-
+$nb_array=(empty($array))?0:count($array);
 // for each account
-for ($i=0; $i<count($array); $i++)
+for ($i=0; $i<$nb_array; $i++)
 {
     if ($array[$i]->id==0)
     {

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 219/257] 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 220/257] 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 221/257] 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 222/257] 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 223/257] =?UTF-8?q?New=20#0001887:=20ANCGL=20ajout=20champ?=
 =?UTF-8?q?s=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 224/257] 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 225/257] 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 226/257] 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 227/257] 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 228/257] 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 229/257] =?UTF-8?q?Fix=20#0001277:=20<<header>>=20ne=20sup?=
 =?UTF-8?q?porte=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 230/257] 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 231/257] 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 232/257] =?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 233/257] =?UTF-8?q?New=200001893:=20Date=20remplacement=20?=
 =?UTF-8?q?auto=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 234/257] 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 235/257] 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 236/257] =?UTF-8?q?New=20:=20Task=20#1894:=20Gestion=20:?=
 =?UTF-8?q?=20ajout=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 237/257] 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 238/257] 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 239/257] 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 240/257] 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 241/257] 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 242/257] 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 243/257] 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 244/257] 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 245/257] 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 246/257] 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 247/257] 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 248/257] 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 249/257] 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 250/257] 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 251/257] 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 252/257] 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 253/257] 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 254/257] 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 255/257] 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 256/257] 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 257/257] 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