[Noalyss-commit] [noalyss] 203/218: Merge branch 'dev7109' into entreprise

[Dany De Bontridder]

sparkyx pushed a commit to branch entreprise
in repository noalyss.

commit 41ae4b8b802696a1e89927a0de09d5ebe7ac91b7
Merge: 6872a81 ad8315f
Author: Dany De Bontridder <address@hidden>
Date:   Mon Aug 26 16:22:29 2019 +0200

    Merge branch 'dev7109' into entreprise

 include/class/acc_ledger.class.php   | 1 -
 include/export/export_ledger_pdf.php | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --cc include/class/acc_ledger.class.php
index 939d4a8,165f792..ba433ec
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@@ -62,13 -60,14 +62,12 @@@ require_once NOALYSS_INCLUDE.'/class/pr
  class Acc_Ledger extends jrn_def_sql
  {
  
 -    var $id;   /*     * < jrn_def.jrn_def_id */
 -    var $db;   /*     * < database connextion */
 -    var $row;   /*     * < row of the ledger */
 -    var $type;   /*     * < type of the ledger ACH ODS FIN
 -      VEN or GL */
 -    var $nb;   /*     * < default number of rows by
 -      default 10 */
 -
 +    var $id;     /**< jrn_def.jrn_def_id */
-     var $name;   /**< jrn_def.jrn_def_name */
 +    var $db;     /**< database connextion */
 +    var $row;    /**< row of the ledger */
 +    var $type;   /**< type of the ledger ACH ODS FIN   VEN or GL */
 +    var $nb;     /**< default number of rows by  default 10 */
 +    var $currency_id;
      /**
       * @param $p_cn database connexion
       * @param $p_id jrn.jrn_def_id