[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 83/173: Merge branch 'dev7109' into entrepris
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 83/173: Merge branch 'dev7109' into entreprise |
Date: |
Mon, 22 Mar 2021 12:58:51 -0400 (EDT) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 41ae4b8b802696a1e89927a0de09d5ebe7ac91b7
Merge: 6872a81 ad8315f
Author: Dany De Bontridder <danydb@noalyss.eu>
AuthorDate: 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] 61/173: Mantis #1611: Problème Plan comptable - mise en évidence poste utilisés, (continued)
- [Noalyss-commit] [noalyss] 61/173: Mantis #1611: Problème Plan comptable - mise en évidence poste utilisés, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 62/173: Bug : CARD misplace of "Search Card", Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 63/173: Fix bug from merge, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 65/173: Merge issue : inappropriate rollback, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 66/173: Fix Inappropriate merge, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 69/173: Fiche.clasS.php fix broken merge, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 70/173: translate, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 73/173: Php7.2 incompatibility, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 78/173: Merge branch 'entreprise' of gitlab.noalyss.eu:noalyss/noalyss into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 81/173: Merge branch 'dev7109' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 83/173: Merge branch 'dev7109' into entreprise,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 84/173: Cosmetic, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 85/173: Merge branch 'dev7109' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 87/173: Merge branch 'dev7109' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 89/173: Apparence 7.1, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 90/173: Improve apparence, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 91/173: Improve appearance, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 93/173: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 98/173: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 110/173: Merge branch 'bug-printtva' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 111/173: If currency not given then supposed to be the default one (id=0), Dany De Bontridder, 2021/03/22