[Noalyss-commit] [noalyss] 70/218: Merge tag 'rel7008' into r700-currency

[Dany De Bontridder]

sparkyx pushed a commit to branch entreprise
in repository noalyss.

commit 2f1d694a8d928e2c6800483b7f0dbc8c2ffd8fad
Merge: 9b6bf6c 6fa0199
Author: Dany De Bontridder <address@hidden>
Date:   Sat Jul 21 20:31:59 2018 +0200

    Merge tag 'rel7008' into r700-currency
    
    2018-07-21 : bug fixes
    
    Conflicts:
        include/class/acc_ledger_history.class.php

 html/lang/en_US/LC_MESSAGES/messages.po            | 437 ++++++++++++++++---
 html/lang/messages.po                              | 427 +++++++++++++++---
 html/lang/nl_NL/LC_MESSAGES/messages.po            | 480 +++++++++++++++++----
 include/ajax/ajax_anc_detail_operation.php         |   2 +-
 include/anc_od.inc.php                             |   2 +-
 include/class/acc_ledger_history.class.php         |   5 +
 .../class/acc_ledger_history_financial.class.php   |   7 +-
 .../class/acc_ledger_history_purchase.class.php    |  11 +-
 include/class/acc_ledger_history_sale.class.php    |  11 +-
 include/class/acc_ledger_search.class.php          |  63 ++-
 include/class/anc_acc_list.class.php               |  15 +-
 include/class/anc_operation.class.php              |  22 +-
 include/class/package_repository.class.php         |  24 +-
 include/class/print_ledger.class.php               |  10 +-
 include/class/print_ledger_misc.class.php          |  14 +-
 include/export/export_ledger_csv.php               | 172 ++++----
 include/history_operation.inc.php                  |  27 +-
 .../acc_ledger_history_financial_oneline.php       |   8 +
 .../acc_ledger_history_purchase_detail.php         |   4 +-
 .../acc_ledger_history_purchase_extended.php       |   4 +-
 .../acc_ledger_history_purchase_oneline.php        |   4 +-
 .../template/acc_ledger_history_sale_detail.php    |   4 +-
 .../template/acc_ledger_history_sale_extended.php  |   4 +-
 .../template/acc_ledger_history_sale_oneline.php   |   4 +-
 include/upgrade-core.php                           |  12 +
 include/upgrade-plugin.php                         |  12 +
 include/upgrade-template.php                       |  12 +
 27 files changed, 1432 insertions(+), 365 deletions(-)