[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 50/173: Merge branch 'r700-currency' of gitla
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 50/173: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency |
Date: |
Mon, 22 Mar 2021 12:58:38 -0400 (EDT) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 6c90a40068cd680f76211ef4aa00e085ee69d374
Merge: 67f1a54 5f55c27
Author: Dany De Bontridder <dany@alchimerys.be>
AuthorDate: Thu Jan 24 17:29:27 2019 +0100
Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into
r700-currency
html/fid_card.php | 25 +--
html/js/acc_currency.js | 77 ++++++++-
html/js/acc_ledger.js | 6 +-
html/js/anc_script.js | 2 -
html/js/compute_direct.js | 10 ++
html/js/scripts.js | 2 +-
include/class/acc_account_ledger.class.php | 21 ++-
include/class/acc_compute.class.php | 4 +-
include/class/acc_ledger.class.php | 209 ++++++++++++++++++++---
include/class/acc_ledger_fin.class.php | 72 ++++++--
include/class/acc_ledger_purchase.class.php | 29 ++--
include/class/acc_ledger_sold.class.php | 34 ++--
include/class/anc_operation.class.php | 2 +-
include/class/currency_mtable.class.php | 45 +++--
include/class/fiche.class.php | 6 +-
include/class/follow_up.class.php | 2 +-
include/class/noalyss_parameter_folder.class.php | 5 +-
include/class/print_ledger_fin.class.php | 20 +--
include/class/print_ledger_misc.class.php | 2 +-
include/company.inc.php | 28 ++-
include/compta_fin.inc.php | 2 +-
include/compta_ods.inc.php | 10 +-
include/constant.php | 2 +-
include/database/jrn_def_sql.class.php | 1 +
include/lib/impress.class.php | 3 -
include/lib/iselect.class.php | 7 +-
include/lib/manage_table_sql.class.php | 20 ++-
include/operation_ods_confirm.inc.php | 2 +-
include/operation_ods_new.inc.php | 29 +++-
include/param_pcmn.inc.php | 2 +-
include/sql/patch/upgrade131.sql | 4 +-
include/sql/patch/upgrade132.sql | 15 ++
include/template/form_ledger_detail.php | 2 +-
include/template/ledger_detail_ach.php | 8 +-
include/template/ledger_detail_fin.php | 2 +-
include/template/ledger_detail_misc.php | 26 ++-
include/template/ledger_detail_ven.php | 9 +-
sql/upgrade.sql | 13 ++
38 files changed, 599 insertions(+), 159 deletions(-)
- [Noalyss-commit] [noalyss] 17/173: Translation, (continued)
- [Noalyss-commit] [noalyss] 17/173: Translation, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 23/173: Currency : precision 6, display default currency , protect used currency against delete, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 27/173: Currency : detail operation Purchase , the amount in currency were wrong in the summary, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 37/173: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 38/173: Merge branch 'master' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 39/173: Currency : because of Misc Operation, the tiers must also be saved into operation_currency. Fix also PRINTJRN for currency, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 44/173: Currency Show currency info for MISC, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 46/173: Typo, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 48/173: translation, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 49/173: Mantis #0001688: Affichage centime dans l'écran de confirmation, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 50/173: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 51/173: Mantis #0001666: Export CSV depuis histo ne filtre pas par journal, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 54/173: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 55/173: mantis #1690: Bug : impossible d'utiliser < dans Inplace_Edit Use base64_decode to protect the string in serialize, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 57/173: Mantis #1643: Déplacement du "bouton" «retour en-haut/calculatrice», Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 60/173: Mantis #0001614: Problème bilans , changement pour bilan ASBL, Dany De Bontridder, 2021/03/22
- [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