[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 114/162: Currency : export CSV history for ca
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 114/162: Currency : export CSV history for card and accounting, fix bug with unneeded oc_vat_amount + add the currency rate |
Date: |
Sat, 11 Jul 2020 13:23:56 -0400 (EDT) |
sparkyx pushed a commit to annotated tag E-4
in repository noalyss.
commit b2ab12f8c9c0c8183045fe578246015683c74559
Author: Dany De Bontridder <danydb@noalyss.eu>
AuthorDate: 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");
- [Noalyss-commit] [noalyss] 102/162: Currency : adapt for bank saldo, (continued)
- [Noalyss-commit] [noalyss] 102/162: Currency : adapt for bank saldo, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 103/162: Currency : export PDF and CSV with currency for printing financial ledger listing(oneline), Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 101/162: Background color, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 104/162: acc_ledger_fin . translation, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 106/162: Currency : All ledger's listing mode , html , csv and pdf, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 111/162: Currency : ledger printing for FIN + detail operation, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 105/162: Indentation, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 108/162: currency : sale extended html , csv, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 109/162: change background, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 113/162: Currency : cosmetic display history : show only the value of the card/accounting, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 114/162: Currency : export CSV history for card and accounting, fix bug with unneeded oc_vat_amount + add the currency rate,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 115/162: currency : adapt middle of payment, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 117/162: Currency : error when displaying, add 4 due to a mistype instruction, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 118/162: Currency : display correctly the saldo at the end / beginning operation, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 107/162: Currency : sales in listing mode, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 122/162: Merge branch 'master' into r700-currency, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 112/162: Database upgrade 131, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 116/162: Currency : send the saldo for financial ledger, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 123/162: Merge commit '3f53de417dd89e9a90a386404f93f8648155e046' into r700-currency, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 110/162: Currency : purchase oneline + extended html and csv, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 119/162: Currency = payment automatic for Sales and Purchases, Dany De Bontridder, 2020/07/11