[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 14/54: Merge branch 'dev7109' into entreprise
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 14/54: Merge branch 'dev7109' into entreprise |
Date: |
Sat, 11 Jul 2020 13:26:48 -0400 (EDT) |
sparkyx pushed a commit to annotated tag entreprise-0500
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] 02/54: Cosmetic adapt color, (continued)
- [Noalyss-commit] [noalyss] 02/54: Cosmetic adapt color, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 03/54: Mantis #0001618: Journaux - choix du type en premier, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 04/54: Php7.2 incompatibility, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 06/54: mantis #1690: Bug : impossible d'utiliser < dans Inplace_Edit Replace strip_tags , add a space before the "<", Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 07/54: Mantis #1693: CA - problème avec la balance croisée double, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 08/54: translation, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 10/54: Merge with dev7109, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 12/54: Merge branch 'dev7109' into entreprise, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 09/54: Merge branch 'entreprise' of gitlab.noalyss.eu:noalyss/noalyss into entreprise, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 13/54: Merge branch 'dev7109' into entreprise, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 14/54: Merge branch 'dev7109' into entreprise,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 18/54: Merge branch 'dev7109' into entreprise, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 19/54: Merge branch 'dev7109' into entreprise, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 20/54: Apparence 7.1, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 23/54: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 11/54: Merge branch 'master' into entreprise, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 15/54: Cosmetic, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 16/54: Merge branch 'dev7109' into entreprise, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 17/54: Cosmetic, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 21/54: Improve apparence, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 22/54: Improve appearance, Dany De Bontridder, 2020/07/11