[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 118/218: Currency : export CSV history for ca
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 118/218: Currency : export CSV history for card and accounting, fix bug with unneeded oc_vat_amount + add the currency rate |
Date: |
Thu, 12 Sep 2019 15:58:51 -0400 (EDT) |
sparkyx pushed a commit to branch entreprise
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");
- [Noalyss-commit] [noalyss] 138/218: Translation, (continued)
- [Noalyss-commit] [noalyss] 138/218: Translation, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 139/218: Translation, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 137/218: Translation, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 140/218: Misc. Operation : input : Missing tag TR, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 144/218: Currency : meaning 1 EUR is worth x currency for Sales, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 141/218: Currency : for misc. operation, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 159/218: Currency : because of Misc Operation, the tiers must also be saved into operation_currency. Fix also PRINTJRN for currency, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 166/218: Typo, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 79/218: Bug : in Purchase and Sale , the last rows disappear when we change the ledger, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 104/218: Reverse for Currency, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 118/218: 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] 146/218: Currency : history for accounting , correct amount in currency, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 145/218: Currency : the meaning is : 1 euro is worth xxx Currency , so we divide the amount with the currency rate to compute the EUR value, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 150/218: Currency : detail operation Sale , the amount in currency were wrong in the summary, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 154/218: by default jrn is an empty array, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 164/218: Currency Show currency info for MISC, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 161/218: PHP 7.2 incomptability : sizeof of not array, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 155/218: Task #0001309: Association d'une opération avec elle-même., Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 158/218: Merge branch 'master' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 160/218: Protect parameters, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 167/218: Currency : set default accounting for change difference when using currency, Dany De Bontridder, 2019/09/12