[Noalyss-commit] [noalyss] 02/11: Merge branch 'master' of ssh://ns3git/srv/git/noalyss

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit b26a77da33f57b398956990da07f57c0de137e8e
Merge: 5a36734 eaca444
Author: Dany De Bontridder <address@hidden>
Date:   Wed Apr 25 21:24:01 2018 +0200

    Merge branch 'master' of ssh://ns3git/srv/git/noalyss

 html/index.php                              |   6 +-
 html/js/scripts.js                          |   2 +-
 html/lang/en_US/LC_MESSAGES/messages.po     | 522 +++++++++++++++++++---------
 html/lang/messages.po                       | 510 ++++++++++++++++++---------
 html/lang/nl_NL/LC_MESSAGES/messages.po     | 512 ++++++++++++++++++---------
 include/admin_repo.inc.php                  |   2 +-
 include/class/acc_bilan.class.php           |   5 +
 include/class/acc_ledger_purchase.class.php |  13 +-
 include/class/acc_ledger_sold.class.php     |   2 +-
 include/class/document.class.php            |   7 +-
 include/database.item.php                   |   2 +-
 include/export/export_fiche_balance_csv.php |   4 +-
 include/lib/noalyss_csv.class.php           |   6 +-
 13 files changed, 1081 insertions(+), 512 deletions(-)