[Noalyss-commit] [noalyss] 03/17: Bug : Impression achat TVAC mode ligne TVAC toujours null

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 2b4f820adea0209ee8689299afae4d055c89e689
Author: Dany wm De Bontridder <danydb@noalyss.eu>
AuthorDate: Thu Oct 20 23:22:41 2022 +0200

    Bug : Impression achat TVAC mode ligne TVAC toujours null
---
 include/template/acc_ledger_history_purchase_oneline.php | 10 ++++++----
 include/template/menu.php                                |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/template/acc_ledger_history_purchase_oneline.php 
b/include/template/acc_ledger_history_purchase_oneline.php
index b3e8aa70f..9c57fa649 100644
--- a/include/template/acc_ledger_history_purchase_oneline.php
+++ b/include/template/acc_ledger_history_purchase_oneline.php
@@ -21,7 +21,7 @@
 
 if (!defined('ALLOWED'))
     die('Appel direct ne sont pas permis');
-
+\Noalyss\Dbg::echo_file(__FILE__);
 /**
  * @file
  * @brief display purchase on one line with sum of VAT, Operation, Private exp.
@@ -58,7 +58,7 @@ bcscale(2);
         <th class="num">
             <?=_('TVA')?>
         </th>
-        <?php if ($nb_other_tax>0) :?>
+        <?php if ($nb_other_tax<>0) :?>
         <th class="num">
             <?=_('Autre Taxe')?>
         </th>
@@ -123,14 +123,16 @@ for ($i=0;$i<$nb_data;$i++):
         <td class="num">
             
<?=nbm(bcsub($this->data[$i]['vat'],$this->data[$i]['tva_sided']))?>
         </td>
+        <?php if ($nb_other_tax<>0) :?>
         <td class="num">
             <?=nbm($this->data[$i]['other_tax_amount'])?>
         </td>
-        <?php if ($nb_other_tax>0) :?>
+        <?php endif;?>
+
         <td class="num">
+
             <?=nbm(bcadd($this->data[$i]['other_tax_amount'] 
,$this->data[$i]['tvac']))?>
         </td>
-        <?php endif;?>
         <td class="num">
             <?php if ( $this->data[$i]['currency_id'] != '0') : ?>
             <?=nbm ( 
bcadd($this->data[$i]['sum_oc_amount'],$this->data[$i]['sum_oc_vat_amount'],2),2)?>
diff --git a/include/template/menu.php b/include/template/menu.php
index a28e62d41..3d2756ad4 100644
--- a/include/template/menu.php
+++ b/include/template/menu.php
@@ -78,8 +78,8 @@ EOF;
 
 ?>     
 <li class="<?=$class_list_element?>">
-    <a class="<?=$class_link?>" href="<?php echo $url;?>" <?php echo $js?> 
title="<?php echo h(gettext($amenu[$i]['me_description']))?>">
-    <?php echo gettext($amenu[$i]['me_menu'])?>
+    <a class="<?=$class_link?>" href="<?php echo $url;?>" <?php echo $js?> 
title="<?php  if ( ! empty($amenu[$i]['me_description'])) echo 
h(gettext($amenu[$i]['me_description']))?>">
+    <?php if ( ! empty($amenu[$i]['me_menu'])) echo 
gettext($amenu[$i]['me_menu'])?>
     </a>
 </li>