[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 05/27: Merge branch 'r700-currency' of gitlab
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 05/27: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency |
Date: |
Sat, 11 Jul 2020 13:25:15 -0400 (EDT) |
sparkyx pushed a commit to annotated tag E-8000
in repository noalyss.
commit 67f1a5440d8f174189b24d3e73f4155f23e7e80f
Merge: 0fb8ece d951014
Author: Dany De Bontridder <dany@alchimerys.be>
AuthorDate: Tue Jan 8 21:41:18 2019 +0100
Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into
r700-currency
dev/extract_text.sh | 5 +-
html/ajax_misc.php | 7 +-
html/do.php | 27 +-
html/js/acc_ledger.js | 10 +-
html/js/scripts.js | 33 +-
html/lang/en_US/LC_MESSAGES/messages.po | 815 ++--
html/lang/messages.po | 4479 +++++++++++++++-----
html/lang/nl_NL/LC_MESSAGES/messages.po | 807 ++--
html/style-classic7.css | 24 +-
html/style-print.css | 3 +
html/user_login.php | 2 +-
include/ajax/ajax_anc_accounting.php | 2 +
include/ajax/ajax_bank_saldo.php | 75 +-
include/ajax/ajax_search_operation.php | 4 +-
include/balance.inc.php | 4 +-
include/class/acc_account_ledger.class.php | 54 +-
include/class/acc_balance.class.php | 6 +-
include/class/acc_currency.class.php | 17 +
include/class/acc_ledger.class.php | 118 +-
include/class/acc_ledger_fin.class.php | 167 +-
.../class/acc_ledger_history_financial.class.php | 10 +-
include/class/acc_ledger_history_generic.class.php | 39 +-
.../class/acc_ledger_history_purchase.class.php | 33 +-
include/class/acc_ledger_history_sale.class.php | 39 +-
include/class/acc_ledger_purchase.class.php | 36 +-
include/class/acc_ledger_search.class.php | 15 +-
include/class/acc_ledger_sold.class.php | 36 +-
include/class/acc_operation.class.php | 2 +-
include/class/acc_reconciliation.class.php | 10 +-
include/class/document.class.php | 87 +-
include/class/fiche.class.php | 92 +-
include/class/pre_op_advanced.class.php | 2 +-
include/class/pre_operation.class.php | 1 +
include/class/print_ledger_fin.class.php | 48 +-
include/class/print_ledger_misc.class.php | 14 +-
include/compta_fin.inc.php | 26 +-
include/compta_fin_saldo.inc.php | 27 +-
include/constant.php | 15 +-
include/database/jrn_def_sql.class.php | 43 +-
include/export/export_balance_pdf.php | 500 ++-
include/export/export_fiche_detail_csv.php | 12 +-
include/export/export_ledger_csv.php | 18 +-
include/export/export_poste_detail_csv.php | 11 +-
include/lib/ac_common.php | 28 +-
include/lib/http_input.class.php | 4 +-
include/lib/iconcerned.class.php | 18 +-
include/lib/iselect.class.php | 16 +
include/lib/manage_table_sql.class.php | 46 +-
include/profile.inc.php | 24 +-
include/sql/patch/upgrade130.sql | 46 +
include/sql/patch/upgrade131.sql | 180 +
.../acc_ledger_history_financial_oneline.php | 18 +-
.../acc_ledger_history_purchase_extended.php | 13 +-
.../acc_ledger_history_purchase_oneline.php | 15 +-
.../template/acc_ledger_history_sale_extended.php | 13 +-
.../template/acc_ledger_history_sale_oneline.php | 14 +-
include/template/form_ledger_fin.php | 81 +-
include/template/ledger_detail_bottom.php | 9 +-
include/template/ledger_detail_fin.php | 13 +
include/template/param_jrn.php | 19 +-
include/template/stock_inv.php | 3 +-
sql/upgrade.sql | 22 -
62 files changed, 5836 insertions(+), 2521 deletions(-)
- [Noalyss-commit] [noalyss] annotated tag E-8000 created (now 9258255), Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 02/27: Merge branch 'r700-currency' of ssh://ns3git/srv/git/noalyss into r700-currency, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 01/27: Fix todo_list : if list empty , gets an error in php 7.2, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 03/27: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 04/27: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 06/27: translation, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 07/27: Mantis #0001688: Affichage centime dans l'écran de confirmation, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 11/27: Mantis #0001682: CA - ajouter possibilité d'exporter le plan analytique, missing file, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 05/27: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 10/27: Mantis #0001682: CA - ajouter possibilité d'exporter le plan analytique, add action CSV:Analytic_Axis, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 15/27: Mantis #1643: Déplacement du "bouton" «retour en-haut/calculatrice», Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 18/27: Mantis #0001614: Problème bilans , changement pour bilan ASBL, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 23/27: Merge issue : inappropriate rollback, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 24/27: Fix Inappropriate merge, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 25/27: Wrong merge broke fiche.class.php, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 26/27: Fix broken merge, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 27/27: Fiche.clasS.php fix broken merge, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 08/27: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 09/27: Mantis #0001666: Export CSV depuis histo ne filtre pas par journal, Dany De Bontridder, 2020/07/11