[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 164/238: Currency Show currency info for MISC
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 164/238: Currency Show currency info for MISC |
Date: |
Sat, 26 Oct 2019 04:40:57 -0400 (EDT) |
sparkyx pushed a commit to annotated tag rel7110
in repository noalyss.
commit 51550b445677d735bc5e7039b978441a0f73da7a
Author: Dany De Bontridder <address@hidden>
Date: Sat Jan 12 14:56:14 2019 +0100
Currency Show currency info for MISC
---
include/template/ledger_detail_misc.php | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/include/template/ledger_detail_misc.php
b/include/template/ledger_detail_misc.php
index 27ce898..fa82e72 100644
--- a/include/template/ledger_detail_misc.php
+++ b/include/template/ledger_detail_misc.php
@@ -112,7 +112,7 @@ echo th(_('Crédit'), 'style="text-align:right"');
$str_anc.= Anc_Plan::hidden($a_anc);
}
echo '</tr>';
-$amount_idx=0;
+$amount_idx=0; $sum_prod_currency=0;
for ($e=0;$e<count($obj->det->array);$e++) {
$row=''; $q=$obj->det->array;
$view_history = HtmlInput::history_account($q[$e]['j_poste'],
$q[$e]['j_poste'], "", $exercice);
@@ -159,6 +159,14 @@ $amount_idx=0;
$montant=td(nbm($q[$e]['j_montant']),'class="num"');
$row.=($q[$e]['j_debit']=='t')?$montant:td('');
$row.=($q[$e]['j_debit']=='f')?$montant:td('');
+ /*
+ * Compute total in currency if not default one
+ */
+ if ( $obj->det->currency_id != 0 && $q[$e]['j_debit']=='f' ) {
+ $value=$obj->db->get_value("select oc_amount+oc_vat_amount from
operation_currency where j_id=$1",[$q[$e]['j_id']]);
+ $sum_prod_currency=bcadd($sum_prod_currency,$value,2);
+
+ }
/* Analytic accountancy */
if ( $owner->MY_ANALYTIC != "nu" /*&& $div=='popup'*/){
if ( preg_match('/^(6|7)/',$q[$e]['j_poste'])) {
@@ -188,6 +196,22 @@ $amount_idx=0;
}
?>
</table>
+<?php
+/*
+ * Info about currency if not in euro
+ */
+ // Add a row with currency and amount
+ if ( $obj->det->currency_id != "" && $obj->det->currency_id > 0)
+ {
+ $currency=new Acc_Currency($obj->db, $obj->det->currency_id);
+ $four_space=" "." "." "." ";
+
+ echo $currency->get_code(),$four_space;
+ echo _("Taux utilisé")," ", $obj->det->currency_rate,$four_space;
+ echo _("Taux Réf"), " ",$obj->det->currency_rate_ref.$four_space;
+ echo _("Montant en devise"), " ",$sum_prod_currency,$four_space;
+ }
+?>
</div>
<?php
require_once NOALYSS_TEMPLATE.'/ledger_detail_bottom.php';
- [Noalyss-commit] [noalyss] 125/238: Merge branch 'master' into r700-currency, (continued)
- [Noalyss-commit] [noalyss] 125/238: Merge branch 'master' into r700-currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 170/238: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 129/238: Esthetic with button "Add accounting", Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 144/238: Currency : meaning 1 EUR is worth x currency for Sales, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 132/238: Translation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 120/238: Currency : send the saldo for financial ledger, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 145/238: 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/10/26
- [Noalyss-commit] [noalyss] 140/238: Misc. Operation : input : Missing tag TR, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 137/238: Translation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 141/238: Currency : for misc. operation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 164/238: Currency Show currency info for MISC,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 161/238: PHP 7.2 incomptability : sizeof of not array, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 166/238: Typo, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 154/238: by default jrn is an empty array, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 149/238: Currency : purchase, save all detail also in currency, fix problem with the advance payment, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 160/238: Protect parameters, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 157/238: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 162/238: Currency - fix view, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 150/238: Currency : detail operation Sale , the amount in currency were wrong in the summary, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 165/238: Database upgrade, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 158/238: Merge branch 'master' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2019/10/26