[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 203/238: Merge branch 'dev7109' into entrepri
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 203/238: Merge branch 'dev7109' into entreprise |
Date: |
Sat, 26 Oct 2019 04:41:07 -0400 (EDT) |
sparkyx pushed a commit to annotated tag rel7110
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
- [Noalyss-commit] [noalyss] 194/238: TEST : fix some little bugs, (continued)
- [Noalyss-commit] [noalyss] 194/238: TEST : fix some little bugs, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 187/238: Wrong merge broke fiche.class.php, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 178/238: Mantis #1665: Pouvoir modifier l'ordre dans les listing de compta analytique, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 183/238: Fix bug from merge, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 181/238: Mantis #1611: Problème Plan comptable - mise en évidence poste utilisés, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 185/238: Merge issue : inappropriate rollback, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 198/238: Merge branch 'entreprise' of gitlab.noalyss.eu:noalyss/noalyss into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 213/238: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 216/238: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 217/238: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 203/238: Merge branch 'dev7109' into entreprise,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 209/238: Apparence 7.1, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 197/238: translation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 218/238: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 199/238: Merge with dev7109, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 206/238: Cosmetic, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 210/238: Improve apparence, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 237/238: Acc_Ledger : problem with acc_ledger::load(), Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 229/238: Task #1759 = PRINTBAL sur 4 colonnes, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 224/238: Improve PHPUNIT Test for phpunit7 and phpunit8, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 91/238: PHP 7.2 : fix incomptability, Dany De Bontridder, 2019/10/26