[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 113/162: Currency : cosmetic display history
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 113/162: Currency : cosmetic display history : show only the value of the card/accounting |
Date: |
Sat, 11 Jul 2020 13:23:55 -0400 (EDT) |
sparkyx pushed a commit to annotated tag E-4
in repository noalyss.
commit 7280cfd320c3ef0a941d6d60e16c1ce154674c95
Author: Dany De Bontridder <danydb@noalyss.eu>
AuthorDate: Sun Dec 9 11:12:28 2018 +0100
Currency : cosmetic display history : show only the value of the
card/accounting
---
include/class/acc_account_ledger.class.php | 8 +++++++-
include/class/fiche.class.php | 13 ++++++++++---
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/include/class/acc_account_ledger.class.php
b/include/class/acc_account_ledger.class.php
index f588761..bcf3b12 100644
--- a/include/class/acc_account_ledger.class.php
+++ b/include/class/acc_account_ledger.class.php
@@ -474,8 +474,14 @@ class Acc_Account_Ledger
"<TD>".$tiers."</TD>".
"<TD>".h($op['description'])."</TD>".
td($op['jr_optype']);
+ /// If the currency is not the default one , then show
the amount
+ if ( $op['currency_id'] > 0 && $op['oc_amount'] != 0)
+ {
echo td($op['cr_code_iso']).
-
td(nbm(bcadd($op['oc_amount'],$op['oc_vat_amount'],4)),'style="text-align:right;padding-left:10px;"');
+
td(nbm(bcadd($op['oc_amount'],4)),'style="text-align:right;padding-left:10px;"');
+ } else {
+ echo td().td();
+ }
echo
"<TD
style=\"text-align:right;padding-left:10px;\">".nbm($op['deb_montant'])."</TD>".
diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index 6f62be3..6beb6df 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -1471,7 +1471,7 @@ class Fiche
"<TH style=\"text-align:left\">"._('Description')." </TH>".
"<TH style=\"text-align:left\">"._('Type')." </TH>".
"<TH style=\"text-align:left\">"._('ISO')."</TH>".
- "<TH style=\"text-align:left\">"._('Dev.')."</TH>".
+ "<TH style=\"text-align:right\">"._('Dev.')."</TH>".
"<TH style=\"text-align:right\">"._('Débit')." </TH>".
"<TH style=\"text-align:right\">"._('Crédit')." </TH>".
th('Prog.','style="text-align:right"').
@@ -1537,8 +1537,15 @@ class Fiche
"<TD>".h($op['description'])."</TD>".
td($op['jr_optype']);
+ /// If the currency is not the default one , then show the amount
+ if ( $op['currency_id'] > 0 && $op['oc_amount'] != 0)
+ {
echo td($op['cr_code_iso']).
-
td(nbm(bcadd($op['oc_amount'],$op['oc_vat_amount'],4)),'style="text-align:right;padding-left:10px;"');
+
td(nbm(bcadd($op['oc_amount'],4)),'style="text-align:right;padding-left:10px;"');
+ } else {
+ echo td().td();
+ }
+
echo "<TD
style=\"text-align:right\">".nbm($op['deb_montant'])."</TD>".
"<TD
style=\"text-align:right\">".nbm($op['cred_montant'])."</TD>".
td(nbm(abs($progress)).$side,'style="text-align:right"').
@@ -1592,7 +1599,7 @@ class Fiche
echo '<TR>';
echo '<TD><form method="GET" ACTION="">'.
- HtmlInput::submit('bt_other',"Autre poste").
+ HtmlInput::submit('bt_other',_("Autre poste")).
HtmlInput::array_to_hidden(array('gDossier','ac'), $_REQUEST).
dossier::hidden().
$hid->input("type","poste").$hid->input('p_action','impress')."</form></TD>";
- [Noalyss-commit] [noalyss] 100/162: Reverse for Currency, (continued)
- [Noalyss-commit] [noalyss] 100/162: Reverse for Currency, Dany De Bontridder, 2020/07/11
- [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 <=
- [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, 2020/07/11
- [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