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

[Dany De Bontridder]

sparkyx pushed a commit to branch entreprise
in repository noalyss.

commit 3aec0e2e579b2f90af6566f7010301d9044876e3
Merge: 2134aef 836ac70
Author: Dany De Bontridder <address@hidden>
Date:   Tue Dec 18 00:03:34 2018 +0100

    Merge branch 'master' into r700-currency
    
    * master:
      cfgcurrency : file for the new version : if the file to include does not 
exist then display a warning and exit look also into NOALYSS_INCLUDE
      cfgcurrency : file for the new version : if the file to include does not 
exist then display a warning and exit look also into NOALYSS_INCLUDE
      cfgcurrency : file for the new version : if the file to include does not 
exist then display a warning and exit
      Pre_Operation : add attribut
      predefined operation , find a label for an accounting thx its value, the 
pk is now an numeric id
      predefined operation , invalid value for database::setp
      Database upgrade 131
      change background
      Indentation
      acc_ledger_fin . translation
      Background color
      reverse for quant_fin
      Quant_Fin : set the j_id when an operation is recorded
      Version DB 131
      Currency : SQL quant_fin is adapted

 include/class/acc_ledger_fin.class.php  |  9 +++++----
 include/class/pre_op_advanced.class.php |  2 +-
 include/class/pre_operation.class.php   |  1 +
 include/lib/ac_common.php               | 12 ++++++++++--
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --cc include/class/acc_ledger_fin.class.php
index 3b5c119,4c2ab45..9d7b682
--- a/include/class/acc_ledger_fin.class.php
+++ b/include/class/acc_ledger_fin.class.php
@@@ -1209,12 -1153,13 +1209,13 @@@ class Acc_Ledger_Fin extends Acc_Ledge
  
        /**
         * insert into the quant_fin table
-        * @param $bank_id is the f_id of the bank
-        * @param $jr_id is the jrn.jr_id of the operation
-        * @param $other is the f_id of the benefit
-        * @param $amount is the amount
+        * @param integer $bank_id is the f_id of the bank
+        * @param integer $jr_id is the jrn.jr_id of the operation
+        * @param integer $other is the f_id of the benefit
+        * @param integer $amount is the amount
+          * @param integer $p_j_id is the j_id of the operation
         */
 -      function insert_quant_fin($p_bankid, $p_jrid, $p_otherid, 
$p_amount,$p_j_id)
 +      function insert_quant_fin($p_bankid, $p_jrid, $p_otherid, 
$p_amount,$p_j_id_currency)
        {
                $sql = "INSERT INTO quant_fin(qf_bank, jr_id, qf_other, 
qf_amount,j_id)
                     VALUES ($1, $2, $3, $4,$5);";