admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Task #0001447: Solde des opérations rapprochées

Browse source 
Take in account the VAT autopurged
This commit is contained in:
Dany De Bontridder 2017-08-31 10:52:18 +02:00
parent c587b47be8
commit 6250745630
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/template/ledger_detail_bottom.php
View file

@ -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>';