[Noalyss-commit] [noalyss] 29/73: Cosmetic : display properly currency in detail operation

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 8708c63b71a51ec60f5deb31805f4afd1a08973d
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Sun Apr 18 16:13:12 2021 +0200

    Cosmetic : display properly currency in detail operation
---
 include/config.inc.example              | 13 ++++++++++---
 include/template/ledger_detail_ach.php  |  6 +++---
 include/template/ledger_detail_misc.php |  7 ++++---
 include/template/ledger_detail_ven.php  |  6 +++---
 include/template/ledger_search.php      | 11 +++++++++++
 5 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/include/config.inc.example b/include/config.inc.example
index 56bbdff..4f95799 100644
--- a/include/config.inc.example
+++ b/include/config.inc.example
@@ -19,8 +19,15 @@ define ("LOCALE",1);
 define ("domaine","");
 define ("MULTI",1);
 define ("dbname","");
- // Uncomment to DEBUG
-// define ("DEBUG",TRUE);
+
+/* 
+    * DEBUGNOALYSS let you see more information when you develop.
+    * 0 = for production
+    * 1 = display all errors
+    * 2 = display all errors + more information 
+    */
+
+define ("DEBUGNOALYSS",0);
 // Uncomment to log your input
 // define ("LOGINPUT",TRUE);
 // Uncomment if you want to activate the possibility to reinitialize
@@ -73,4 +80,4 @@ define ("dbname","");
 // Define a random session key if you work with different version of NOALYSS
 // define ('SESSION_KEY','abcde');
 // Max size is defined by default to 2MB, it could be also needed to modify 
PHP Ini file
-//    define ("MAX_FILE_SIZE",2097152);
\ No newline at end of file
+//    define ("MAX_FILE_SIZE",2097152);
diff --git a/include/template/ledger_detail_ach.php 
b/include/template/ledger_detail_ach.php
index 70f303b..c8116da 100644
--- a/include/template/ledger_detail_ach.php
+++ b/include/template/ledger_detail_ach.php
@@ -287,9 +287,9 @@ $str_anc="";
         $four_space="&nbsp;"."&nbsp;"."&nbsp;"."&nbsp;";
         
         echo  $currency->get_code(),$four_space;
-        echo _("Taux utilisé"),"&nbsp;", $obj->det->currency_rate,$four_space;
-        echo _("Taux Réf"), "&nbsp;",$obj->det->currency_rate_ref.$four_space;
-        echo _("Montant en devise"), 
"&nbsp;",nbm($sum_charge_euro).$four_space;
+        echo _("Taux utilisé"),"&nbsp;", 
nbm($obj->det->currency_rate,4),$four_space;
+        echo _("Taux Réf"), 
"&nbsp;",nbm($obj->det->currency_rate_ref,4).$four_space;
+        echo _("Montant en devise"), 
"&nbsp;",nbm($sum_charge_euro,4).$four_space;
     }
 ?>
 
diff --git a/include/template/ledger_detail_misc.php 
b/include/template/ledger_detail_misc.php
index e48be4c..fd2a400 100644
--- a/include/template/ledger_detail_misc.php
+++ b/include/template/ledger_detail_misc.php
@@ -207,9 +207,10 @@ $amount_idx=0; $sum_prod_currency=0;
         $four_space="&nbsp;"."&nbsp;"."&nbsp;"."&nbsp;";
         
         echo  $currency->get_code(),$four_space;
-        echo _("Taux utilisé"),"&nbsp;", $obj->det->currency_rate,$four_space;
-        echo _("Taux Réf"), "&nbsp;",$obj->det->currency_rate_ref.$four_space;
-        echo _("Montant en devise"), "&nbsp;",$sum_prod_currency,$four_space;
+        echo _("Taux utilisé"),"&nbsp;", 
nbm($obj->det->currency_rate,4),$four_space;
+        echo _("Taux Réf"), 
"&nbsp;",nbm($obj->det->currency_rate_ref,4).$four_space;
+        echo _("Montant en devise"), 
"&nbsp;",nbm($sum_prod_currency,4).$four_space;    
+        
     }
 ?>      
 </div>
diff --git a/include/template/ledger_detail_ven.php 
b/include/template/ledger_detail_ven.php
index 347f98b..ae5c1db 100644
--- a/include/template/ledger_detail_ven.php
+++ b/include/template/ledger_detail_ven.php
@@ -297,9 +297,9 @@ echo $ipaid->input();
         $four_space="&nbsp;"."&nbsp;"."&nbsp;"."&nbsp;";
         
         echo  $currency->get_code(),$four_space;
-        echo _("Taux utilisé"),"&nbsp;", $obj->det->currency_rate,$four_space;
-        echo _("Taux Réf"), "&nbsp;",$obj->det->currency_rate_ref.$four_space;
-        echo _("Montant en devise"), "&nbsp;",$sum_prod_currency,$four_space;
+        echo _("Taux utilisé"),"&nbsp;", 
nbm($obj->det->currency_rate,4),$four_space;
+        echo _("Taux Réf"), 
"&nbsp;",nbm($obj->det->currency_rate_ref,4).$four_space;
+        echo _("Montant en devise"), 
"&nbsp;",nbm($sum_prod_currency,4).$four_space;
     }
 ?>            
 <?php
diff --git a/include/template/ledger_search.php 
b/include/template/ledger_search.php
index 7461998..458512a 100644
--- a/include/template/ledger_search.php
+++ b/include/template/ledger_search.php
@@ -87,6 +87,17 @@ echo $f_accounting->input();  ?>
 <?php echo $f_paid->input();  ?>
 </td>
 </tr>
+
+<tr>
+<td style="text-align:right;width:30em">
+       <?php echo _('Devise')?>
+</td>
+
+<td>
+<?php echo $sCurrency->input();  ?>
+</td>
+</tr>
+
 <tr>
     
 <td  style="text-align:right;width:30em">