[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 135/173: Merge branch 'dev7220' into entrepri
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 135/173: Merge branch 'dev7220' into entreprise |
Date: |
Mon, 22 Mar 2021 12:59:11 -0400 (EDT) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit f65faea43a8e094e4cf7946b1cd9bedbd9a33490
Merge: f05bafc 8413182
Author: Dany De Bontridder <danydb@noalyss.eu>
AuthorDate: Sat Apr 4 14:04:17 2020 +0200
Merge branch 'dev7220' into entreprise
html/install.php | 8 +-
html/js/acc_ledger.js | 16 +++
html/js/card.js | 2 +
html/js/scripts.js | 18 ++-
html/style-classic.css | 110 ++++++++++++++++++
html/style-classic7.css | 140 ++++++++++++++++++++++-
html/style-light.css | 118 +++++++++++++++++++
include/ajax/ajax_card.php | 9 +-
include/class/acc_balance.class.php | 7 +-
include/class/acc_ledger.class.php | 1 +
include/class/acc_ledger_purchase.class.php | 2 +-
include/class/acc_ledger_sold.class.php | 3 +-
include/class/acc_plan_mtable.class.php | 81 ++++++++++----
include/class/fiche.class.php | 16 ++-
include/class/html_input_noalyss.class.php | 61 ++++++++++
include/class/pre_op_ach.class.php | 19 ++--
include/class/pre_op_advanced.class.php | 1 +
include/class/pre_op_ven.class.php | 2 +-
include/class/pre_operation.class.php | 16 +--
include/compta_fin.inc.php | 2 +-
include/export/export_balance_pdf.php | 21 ++--
include/lib/html_tab.class.php | 22 +++-
include/lib/message_javascript.php | 1 +
include/lib/noalyss_csv.class.php | 116 ++++++++++++++++++-
include/lib/output_html_tab.class.php | 168 ++++++++++++++++++++++++----
include/operation_ods_new.inc.php | 2 +-
include/template/predf_ledger_detail.php | 2 +-
27 files changed, 866 insertions(+), 98 deletions(-)
diff --cc include/class/acc_ledger.class.php
index 8bf4f50,b2f05da..b6a0682
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@@ -47,9 -47,8 +47,10 @@@ require_once NOALYSS_INCLUDE.'/database
require_once NOALYSS_INCLUDE.'/class/acc_payment.class.php';
require_once NOALYSS_INCLUDE.'/class/acc_ledger_history.class.php';
require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
+require_once NOALYSS_INCLUDE.'/class/acc_currency.class.php';
+require_once NOALYSS_INCLUDE.'/database/operation_currency_sql.class.php';
require_once NOALYSS_INCLUDE.'/class/pre_op_ods.class.php';
+ require_once NOALYSS_INCLUDE.'/class/html_input_noalyss.class.php';
/** \file
* @brief Class for jrn, class acc_ledger for manipulating the ledger
- [Noalyss-commit] [noalyss] 97/173: Merge branch 'accept7100' into entreprise, (continued)
- [Noalyss-commit] [noalyss] 97/173: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 102/173: Task #0001698: Problème affichage historique fiches, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 141/173: Merge commit '3e075a0a1aa8b6e42c458571ef0380a9c38f18fa' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 106/173: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 108/173: Bug with p_jrn, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 109/173: Task #1759 = PRINTBAL sur 4 colonnes, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 112/173: Save_form_plan must use the array, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 116/173: Merge branch 'dev7102' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 119/173: improve test for fiche get_row, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 134/173: Merge branch 'dev7202' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 135/173: Merge branch 'dev7220' into entreprise,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 137/173: Fiche.Test : add test cmp_name and get_row, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 145/173: Merge branch 'entreprise' into next-release-8, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 138/173: Test Unit Acc_Account_Legder , rounded value fixed, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 139/173: Fix cosmetic and typo, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 147/173: Error : duplicate function update_row, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 151/173: htmlspecialchars use HTML5 and UTF8, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 114/173: fixup! Printtva , under some circumstance tva_summary::check fails, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 131/173: Merge branch 'dev-7201' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 142/173: Merge commit 'db9d4c53d1325b1ab3c8a3fcae6ddd201799fb42' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 146/173: Merge branch 'pre7300' into entreprise, Dany De Bontridder, 2021/03/22