[Noalyss-commit] [noalyss] 118/238: Currency : export CSV history for card and accounting, fix bug with unneeded oc_vat_amount + add the currency rate

[Dany De Bontridder]

sparkyx pushed a commit to annotated tag rel7110
in repository noalyss.

commit b2ab12f8c9c0c8183045fe578246015683c74559
Author: Dany De Bontridder <address@hidden>
Date:   Sun Dec 9 11:21:48 2018 +0100

    Currency : export CSV history for card and accounting, fix bug
    with unneeded oc_vat_amount + add the currency rate
---
 include/class/acc_account_ledger.class.php |  1 +
 include/class/fiche.class.php              |  1 +
 include/export/export_fiche_detail_csv.php | 11 ++++++++++-
 include/export/export_poste_detail_csv.php | 10 +++++++++-
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/include/class/acc_account_ledger.class.php 
b/include/class/acc_account_ledger.class.php
index bcf3b12..57e9ee7 100644
--- a/include/class/acc_account_ledger.class.php
+++ b/include/class/acc_account_ledger.class.php
@@ -186,6 +186,7 @@ class Acc_Account_Ledger
         cred 
         full  join deb using (jl_id) where jl_id=(select distinct jl_id from 
sqlletter  where sqlletter.j_id=j1.j_id  )) as delta_letter
             ,jrn.currency_rate
+            ,jrn.currency_rate_ref
             ,jrn.currency_id
             ,(select cr_code_iso from currency where id=jrn.currency_id) as 
cr_code_iso
             ,j_montant
diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index 6beb6df..d103100 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -1269,6 +1269,7 @@ class Fiche
                                     full  join deb using (jl_id) where 
jl_id=(select distinct jl_id from sqlletter  where sqlletter.j_id=j1.j_id  )) 
as delta_letter,
                                                                  jrn_def_code,
                                   jrn.currency_rate,
+                                 jrn.currency_rate_ref,
                                     jrn.currency_id,
                                     (select cr_code_iso from currency where 
id=jrn.currency_id) as cr_code_iso,
                                     j_montant,
diff --git a/include/export/export_fiche_detail_csv.php 
b/include/export/export_fiche_detail_csv.php
index 60d740e..bc2aac1 100644
--- a/include/export/export_fiche_detail_csv.php
+++ b/include/export/export_fiche_detail_csv.php
@@ -77,6 +77,8 @@ if ( ! isset ($_REQUEST['oper_detail']))
                 _("Type"),
                 _("Code devise"),
                 _("Devise"),
+                _("Taux utilisé") ,
+                _("Taux référence"),
                 _("Débit"),
                 _("Crédit"),
                 _("Prog."),
@@ -107,6 +109,11 @@ if ( ! isset ($_REQUEST['oper_detail']))
                 $export->add("");
                 $export->add("");
                 $export->add("");
+                $export->add("");
+                $export->add("");
+                $export->add("");
+                $export->add("");
+                
                 $export->add($tot_deb,"number");
                 $export->add($tot_cred,"number");
                 $export->add($diff,"number");
@@ -134,7 +141,9 @@ if ( ! isset ($_REQUEST['oper_detail']))
         $export->add($op['description']);
         $export->add($op['jr_optype']);
         $export->add($op['cr_code_iso']);
-        $export->add(bcadd($op['oc_amount'],$op['oc_vat_amount']),"number");
+        $export->add($op['oc_amount'],"number");
+        $export->add($op['currency_rate'],"number");
+        $export->add($op['currency_rate_ref'],"number");
         $export->add($op['deb_montant'],"number");
         $export->add($op['cred_montant'],"number");
         $export->add(abs($progress),"number");
diff --git a/include/export/export_poste_detail_csv.php 
b/include/export/export_poste_detail_csv.php
index 4a3887d..6250a00 100644
--- a/include/export/export_poste_detail_csv.php
+++ b/include/export/export_poste_detail_csv.php
@@ -88,6 +88,8 @@ if ( ! isset ($_REQUEST['oper_detail']))
         $title[]=_("Type");
         $title[]=_("Code devise");
         $title[]=_("Devise");
+        $title[]=_("Taux utilisé");
+        $title[]=_("Taux référence");
         $title[]=_("Débit");
         $title[]=_("Crédit");
         $title[]=_("Prog.");
@@ -119,6 +121,10 @@ if ( ! isset ($_REQUEST['oper_detail']))
                 $export->add("");
                 $export->add("");
                 $export->add("");
+                $export->add("");
+                $export->add("");
+                $export->add("");
+                $export->add("");
                 
                 $export->add($tot_deb,"number");
                 $export->add($tot_cred,"number");
@@ -150,7 +156,9 @@ if ( ! isset ($_REQUEST['oper_detail']))
             $export->add($op['description']);
             $export->add($op['jr_optype']);
             $export->add($op['cr_code_iso']);
-            
$export->add(bcadd($op['oc_amount'],$op['oc_vat_amount']),"number");
+            $export->add($op['oc_amount'],"number");
+            $export->add($op['currency_rate'],"number");
+            $export->add($op['currency_rate_ref'],"number");
             
             $export->add($op['deb_montant'],"number");
             $export->add($op['cred_montant'],"number");