[Noalyss-commit] [noalyss] 02/02: Task #1072 - PRINTJRN : Totaux PRINTJRN Totaux HTML ven & ach

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 6a945b7b861bdf7eb5a2b9db7928aad0a09f0ba4
Author: Dany De Bontridder <address@hidden>
Date:   Sat Dec 13 20:51:15 2014 +0100

    Task #1072 - PRINTJRN : Totaux
    PRINTJRN Totaux HTML ven & ach
---
 include/template/print_ledger_simple.php |   84 ++++++++++++++++++++++++------
 1 files changed, 67 insertions(+), 17 deletions(-)

diff --git a/include/template/print_ledger_simple.php 
b/include/template/print_ledger_simple.php
index a3b821d..75903de 100644
--- a/include/template/print_ledger_simple.php
+++ b/include/template/print_ledger_simple.php
@@ -12,13 +12,14 @@
         <th style="text-align:right">HTVA</th>
         <th style="text-align:right">Privé</th>
         <th style="text-align:right">DNA</th>
-        <th style="text-align:right">TVA ND</th>
+        
         
 <?php
 $col_tva="";
 
  if ( $own->MY_TVA_USE=='Y')
         {
+            echo '<th style="text-align:right">TVA ND</th>';
             $a_Tva=$cn->get_array("select tva_id,tva_label from tva_rate where 
tva_rate != 0.0000 order by tva_rate");
             foreach($a_Tva as $line_tva)
             {
@@ -33,6 +34,13 @@ echo $col_tva;
 <?php
 $i = 0;
 $cn->prepare('reconcile_date','select * from jrn where jr_id in (select 
jra_concerned from jrn_rapt where jr_id = $1 union all select jr_id from 
jrn_rapt where jra_concerned=$1)');
+$tot['htva']=0;
+$tot['dep_priv']=0;
+$tot['dna']=0;
+$tot['tva_nd']=0;
+$tot['tvac']=0;
+$tot['tva']=array();
+bcscale(2);
 foreach ($Row as $line) {
     $i++;
     /*
@@ -50,37 +58,45 @@ foreach ($Row as $line) {
     echo td($tiers);
     echo "<TD>" . h($line['comment']) . "</TD>";
     $dep_priv=($line['dep_priv']==0)?"":nbm($line['dep_priv']);
+    $tot['dep_priv']=bcadd($tot['dep_priv'],  floatval($line['dep_priv']));
     $dna=($line['dna']==0)?"":nbm($line['dna']);
-    $tva_dna=($line['tva_dna']==0)?"":nbm($line['tva_dna']);
+    $tot['dna']=bcadd($tot['dna'],floatval($line['dna']));
     echo "<TD class=\"num\">" . nbm($line['HTVA']) . "</TD>";
+    $tot['htva']=bcadd($tot['htva'],  floatval($line['HTVA']));
+    
     echo "<TD class=\"num\">" .$dep_priv . "</TD>";
     echo "<TD class=\"num\">" . $dna . "</TD>";
-    echo "<TD class=\"num\">" . $tva_dna. "</TD>";
     if ($own->MY_TVA_USE == 'Y' )
     {
+        $tva_dna=($line['tva_dna']==0)?"":nbm($line['tva_dna']);
+        $tot['tva_nd']=bcadd($tot['tva_nd'],  floatval($line['tva_dna']));
+        echo "<TD class=\"num\">" . $tva_dna. "</TD>";
         $a_tva_amount=array();
         foreach ($line['TVA'] as $lineTVA)
+            {
+                foreach ($a_Tva as $idx=>$line_tva)
                 {
-                    foreach ($a_Tva as $idx=>$line_tva)
-                    {
 
-                        if ($line_tva['tva_id'] == $lineTVA[1][0])
-                        {
-                            $a=$line_tva['tva_id'];
-                            $a_tva_amount[$a]=$lineTVA[1][2];
-                        }
-                    }
-                }
-                    foreach ($a_Tva as $line_tva)
+                    if ($line_tva['tva_id'] == $lineTVA[1][0])
                     {
                         $a=$line_tva['tva_id'];
-                        if ( isset($a_tva_amount[$a]))
-                            echo '<td 
class="num">'.nb($a_tva_amount[$a]).'</td>';
-                        else
-                            printf("<td class=\"num\"></td>");
+                        $a_tva_amount[$a]=$lineTVA[1][2];
                     }
+                }
+            }
+        foreach ($a_Tva as $line_tva)
+        {
+            $a=$line_tva['tva_id'];
+            if ( isset($a_tva_amount[$a])) {
+                echo '<td class="num">'.nb($a_tva_amount[$a]).'</td>';
+                
$tot['tva'][$a]=(isset($tot['tva'][$a]))?bcadd($tot['tva'][$a],floatval($a_tva_amount[$a])):floatval($a_tva_amount[$a]);
+            }
+            else
+                printf("<td class=\"num\"></td>");
+        }
     }
     echo '<td class="num">'.$line['TVAC'].'</td>';
+    $tot['tvac']=bcadd($tot['tvac'], floatval($line['TVAC']));
     /*
      * If reconcile print them
      */
@@ -97,5 +113,39 @@ foreach ($Row as $line) {
     echo '</td>';
     echo "</tr>";
 }
+/** 
+ * summary
+ */
 ?>
+    <tr class="highlight">
+        <td>
+            <?php echo _('Totaux')?>
+        </td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td class="num"><?php echo nbm($tot['htva']); ?></td>
+        <td class="num"><?php echo nbm($tot['dep_priv']) ?></td>
+        <td class="num"><?php echo nbm($tot['dna'])?></td>
+        <?php if ($own->MY_TVA_USE == 'Y' ): ?>
+            <td><?php echo nbm($tot['tva_nd']) ?></td>
+            <?php  foreach ($a_Tva as $line_tva) :
+                        $a=$line_tva['tva_id'];
+                        if ( isset($tot['tva'][$a])) :
+                    ?>
+                        <td class="num"><?php echo nbm($tot['tva'][$a])?></td>
+                    <?php else : ?>
+                        <td>
+
+                        </td>
+                    <?php endif; ?>
+                <?php endforeach;?>
+        <?php endif; ?>
+        <td class="num"><?php echo nbm($tot['tvac'])?></td>
+        <td></td>
+    </tr>
+        
+        
 </table>
\ No newline at end of file