[Noalyss-commit] [noalyss] 65/218: Merge branch 'master' into r700-currency

[Dany De Bontridder]

sparkyx pushed a commit to branch entreprise
in repository noalyss.

commit 457290f4e2a07a8a06123123f87d82091b7dbac0
Merge: 4ca14cb f19a96a
Author: Dany De Bontridder <address@hidden>
Date:   Sun Jun 17 18:49:14 2018 +0200

    Merge branch 'master' into r700-currency
    
    Conflicts:
        include/class/acc_ledger.class.php
        include/constant.php
        include/export/export_fiche_balance_csv.php
        include/lib/http_input.class.php
        sql/upgrade.sql

 include/cfgledger.inc.php        | 2 ++
 include/lib/http_input.class.php | 6 ++++--
 sql/upgrade.sql                  | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --cc sql/upgrade.sql
index 5449b50,f3340f5..5334158
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@@ -53,4 -52,4 +52,5 @@@ begi
                  p_price_unit);
          return;
  end;
++ $function$
   $function$