[Noalyss-commit] [noalyss] 09/39: Compatility PHP7.4

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit e7f4184ef8b71f6bf51050181f0e064d1d81cb30
Author: Dany De Bontridder <dany@alchimerys.be>
AuthorDate: Sun May 24 19:07:41 2020 +0200

    Compatility PHP7.4
---
 include/class/acc_ledger.class.php                 | 36 ++++++++--------------
 include/class/acc_ledger_history_generic.class.php |  2 +-
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/include/class/acc_ledger.class.php 
b/include/class/acc_ledger.class.php
index b2f05da..d43dcd9 100644
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@ -2416,22 +2416,17 @@ class Acc_Ledger  extends jrn_def_sql
         switch ($this->jrn_def_type)
         {
             case 'ACH':
-                
$this->jrn_def_fiche_cred=(isset($ACH_FICHECRED))?join($ACH_FICHECRED,
-                                ','):'';
-                
$this->jrn_def_fiche_deb=(isset($ACH_FICHEDEB))?join($ACH_FICHEDEB,
-                                ','):"";
+                
$this->jrn_def_fiche_cred=(isset($ACH_FICHECRED))?join(',',$ACH_FICHECRED):'';
+                
$this->jrn_def_fiche_deb=(isset($ACH_FICHEDEB))?join(',',$ACH_FICHEDEB):"";
                 break;
             case 'VEN':
-                
$this->jrn_def_fiche_cred=(isset($VEN_FICHECRED))?join($VEN_FICHECRED,
-                                ','):'';
-                
$this->jrn_def_fiche_deb=(isset($VEN_FICHEDEB))?join($VEN_FICHEDEB,
-                                ','):"";
+                
$this->jrn_def_fiche_cred=(isset($VEN_FICHECRED))?join(',',$VEN_FICHECRED):'';
+                
$this->jrn_def_fiche_deb=(isset($VEN_FICHEDEB))?join(',',$VEN_FICHEDEB):"";
 
                 break;
             case 'ODS':
                 $this->jrn_def_class_deb=$p_jrn_class_deb;
-                
$this->jrn_def_fiche_deb=(isset($ODS_FICHEDEB))?join($ODS_FICHEDEB,
-                                ','):''; ;
+                
$this->jrn_def_fiche_deb=(isset($ODS_FICHEDEB))?join(',',$ODS_FICHEDEB):''; ;
                 $this->jrn_def_fiche_cred=null;
                 break;
 
@@ -2440,8 +2435,7 @@ class Acc_Ledger  extends jrn_def_sql
                 $result=$a->get_by_qcode(trim(strtoupper($_POST['bank'])), 
false);
                 $bank=$a->id;
                 $this->jrn_def_bank=$bank;
-                
$this->jrn_def_fiche_deb=(isset($FIN_FICHEDEB))?join($FIN_FICHEDEB,
-                                ','):"";
+                
$this->jrn_def_fiche_deb=(isset($FIN_FICHEDEB))?join(',',$FIN_FICHEDEB):"";
                 if ($result==-1)
                     throw new Exception(_("Aucun compte en banque n'est 
donné"));
                 $this->jrn_def_num_op=(isset($numb_operation))?1:0;
@@ -2605,22 +2599,17 @@ class Acc_Ledger  extends jrn_def_sql
         switch ($this->jrn_def_type)
         {
             case 'ACH':
-                
$this->jrn_def_fiche_cred=(isset($ACH_FICHECRED))?join($ACH_FICHECRED,
-                                ','):'';
-                
$this->jrn_def_fiche_deb=(isset($ACH_FICHEDEB))?join($ACH_FICHEDEB,
-                                ','):"";
+                
$this->jrn_def_fiche_cred=(isset($ACH_FICHECRED))?join(',',$ACH_FICHECRED):'';
+                
$this->jrn_def_fiche_deb=(isset($ACH_FICHEDEB))?join(',',$ACH_FICHEDEB):"";
                 break;
             case 'VEN':
-                
$this->jrn_def_fiche_cred=(isset($VEN_FICHECRED))?join($VEN_FICHECRED,
-                                ','):'';
-                
$this->jrn_def_fiche_deb=(isset($VEN_FICHEDEB))?join($VEN_FICHEDEB,
-                                ','):"";
+                
$this->jrn_def_fiche_cred=(isset($VEN_FICHECRED))?join(',',$VEN_FICHECRED):'';
+                
$this->jrn_def_fiche_deb=(isset($VEN_FICHEDEB))?join(',',$VEN_FICHEDEB):"";
 
                 break;
             case 'ODS':
                 $this->jrn_def_class_deb=$p_jrn_class_deb;
-                
$this->jrn_def_fiche_deb=(isset($ODS_FICHEDEB))?join($ODS_FICHEDEB,
-                                ','):''; ;
+                
$this->jrn_def_fiche_deb=(isset($ODS_FICHEDEB))?join(',',$ODS_FICHEDEB):''; ;
                 $this->jrn_def_fiche_cred=null;
                 break;
             case 'FIN':
@@ -2628,8 +2617,7 @@ class Acc_Ledger  extends jrn_def_sql
                 $result=$a->get_by_qcode(trim(strtoupper($_POST['bank'])), 
false);
                 $bank=$a->id;
                 $this->jrn_def_bank=$bank;
-                
$this->jrn_def_fiche_deb=(isset($FIN_FICHEDEB))?join($FIN_FICHEDEB,
-                                ','):"";
+                
$this->jrn_def_fiche_deb=(isset($FIN_FICHEDEB))?join(',',$FIN_FICHEDEB):"";
                 if ($result==-1)
                     throw new Exception(_("Aucun compte en banque n'est 
donné"));
                 $this->jrn_def_num_op=(isset($numb_operation))?1:0;
diff --git a/include/class/acc_ledger_history_generic.class.php 
b/include/class/acc_ledger_history_generic.class.php
index 97207cf..54ee831 100644
--- a/include/class/acc_ledger_history_generic.class.php
+++ b/include/class/acc_ledger_history_generic.class.php
@@ -417,7 +417,7 @@ class Acc_Ledger_History_Generic extends Acc_Ledger_History
     function get_rowSimple($trunc=0, $p_limit=-1, $p_offset=-1)
     {
         global $g_user;
-        $jrn=" jrn_def_id in (".join($this->ma_ledger, ",").")";
+        $jrn=" jrn_def_id in (".join(',',$this->ma_ledger).")";
 
         $periode=sql_filter_per($this->db, $this->m_from, $this->m_to, 'p_id',
                 'jr_tech_per');