[Noalyss-commit] [noalyss] 28/219: Task #0001447: Solde des opérations rapprochées Take in account the VAT autopurged

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 6250745630d1849b10bc347c9df87807ef21acc0
Author: Dany De Bontridder <address@hidden>
Date:   Thu Aug 31 10:52:18 2017 +0200

    Task #0001447: Solde des opérations rapprochées
    Take in account the VAT autopurged
---
 include/template/ledger_detail_bottom.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/template/ledger_detail_bottom.php 
b/include/template/ledger_detail_bottom.php
index 72eddd8..c8c4061 100644
--- a/include/template/ledger_detail_bottom.php
+++ b/include/template/ledger_detail_bottom.php
@@ -157,7 +157,9 @@ endif;
 <?php 
 
 if ($aRap  != null ) {
+    $amount_tva_include=(isset($tvac))?$tvac:$detail->det->jr_montant;
   $tableid="tb".$div;
+  $total_rec=0;
   echo '<table id="'.$tableid.'">';
   for ($e=0;$e<count($aRap);$e++)  {
     $opRap=new Acc_Operation($cn);
@@ -165,6 +167,7 @@ if ($aRap  != null ) {
     $internal=$opRap->get_internal();
     $array_jr=$cn->get_array('select 
jr_date,jr_pj_number,jr_montant,jr_comment from jrn where 
jr_id=$1',array($aRap[$e]));
     $amount=$array_jr[0]['jr_montant'];
+    $total_rec=bcadd($total_rec,$amount);
     $str="modifyOperation(".$aRap[$e].",".$gDossier.")";
     
     // If write access , allow to drop Reconciles operations
@@ -193,7 +196,8 @@ if ($aRap  != null ) {
             td('<a class="line" href="javascript:void(0)" onclick="'.$str.'" 
>'.$internal.'</A>').
             td($pj_nb).
             td($comment).
-            td(nbm($amount)).
+            td(_('montant').'='.nbm($amount)).
+            td(_('delta').'='.nbm(bcsub($amount_tva_include,$total_rec))).
             td($remove),' id = "row'.$e.'"');
   }
   echo '</table>';