[Noalyss-commit] [noalyss] 02/173: Merge branch 'r700-currency' of ssh://ns3git/srv/git/noalyss into r700-currency

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 48a4700a8fae4658a0606925504fcddcd3601063
Merge: 531df93 f8db1e5
Author: Dany De Bontridder <dany@alchimerys.be>
AuthorDate: Wed May 23 15:59:27 2018 +0200

    Merge branch 'r700-currency' of ssh://ns3git/srv/git/noalyss into 
r700-currency

 html/ajax_misc.php                                 |  54 ++++++
 html/js/acc_currency.js                            |  89 +++++++++
 html/js/acc_ledger.js                              |   4 +-
 html/js/card.js                                    |   2 -
 include/acc_currency_cfg.inc.php                   |   5 +-
 include/ajax/ajax_anc_key_compute.php              |   3 +-
 include/ajax/ajax_currency.php                     |   1 +
 include/class/acc_account_ledger.class.php         |  38 ++--
 include/class/acc_compute.class.php                |  23 ++-
 include/class/acc_currency.class.php               | 138 ++++++++++++++
 include/class/acc_ledger.class.php                 |  23 ++-
 include/class/acc_ledger_purchase.class.php        | 189 ++++++++++++++----
 include/class/acc_ledger_sold.class.php            | 211 +++++++++++++++++----
 include/class/acc_operation.class.php              |  33 +++-
 include/class/anc_operation.class.php              |  41 +++-
 include/class/currency_mtable.class.php            |  28 ++-
 include/class/fiche.class.php                      |  30 ++-
 include/compta_ach.inc.php                         |   2 +-
 include/compta_ven.inc.php                         |   2 +-
 include/constant.php                               |   2 +-
 include/database/operation_currency_sql.class.php  |  67 +++++++
 .../database/v_currency_last_value_sql.class.php   |  12 ++
 include/export/export_fiche_detail_csv.php         |   7 +
 include/export/export_poste_detail_csv.php         |   9 +
 include/lib/icon_action.class.php                  |  36 ++++
 include/lib/inum.class.php                         |  37 ++++
 .../sql/patch/upgrade128.sql                       |  41 +++-
 include/sql/patch/upgrade129.sql                   |  59 ++++++
 include/template/form_ledger_detail.php            |  49 ++++-
 include/template/ledger_detail_ach.php             |  54 ++++--
 include/template/ledger_detail_bottom.php          |   2 +-
 include/template/ledger_detail_ven.php             |  55 +++++-
 sql/upgrade.sql                                    | 126 ++++++------
 33 files changed, 1248 insertions(+), 224 deletions(-)