[Phpcompta-dev] r5158 - phpcompta/tags/rel650/include/template

[phpcompta-dev]

Author: danydb
Date: 2012-12-06 21:42:51 +0100 (Thu, 06 Dec 2012)
New Revision: 5158

Modified:
   phpcompta/tags/rel650/include/template/ledger_detail_ach.php
   phpcompta/tags/rel650/include/template/ledger_detail_ven.php
Log:
0000762: TVA intracommunautaire

Modified: phpcompta/tags/rel650/include/template/ledger_detail_ach.php
===================================================================
--- phpcompta/tags/rel650/include/template/ledger_detail_ach.php        
2012-12-05 20:08:07 UTC (rev 5157)
+++ phpcompta/tags/rel650/include/template/ledger_detail_ach.php        
2012-12-06 20:42:51 UTC (rev 5158)
@@ -179,10 +179,15 @@
 
     if ($owner->MY_TVA_USE=='Y')
       {
-       $tva_amount=bcadd($q['qp_vat'],$q['qp_nd_tva']);
-       $tva_amount=bcadd($tva_amount,$q['qp_nd_tva_recup']);
-       $row.=td(nbm($tva_amount),'class="num"');
-       $row.=td(nbm($tvac),'class="num"');
+               $tva_amount=bcadd($q['qp_vat'],$q['qp_nd_tva']);
+               $tva_amount=bcadd($tva_amount,$q['qp_nd_tva_recup']);
+               $class="";
+               if ($tva->get_parameter("both_side")==1) {
+                       $class=' style="text-decoration:line-through"';
+                       $tvac=bcsub($tvac,$q['qp_vat']);
+               }
+               $row.=td(nbm($tva_amount),'class="num" '.$class);
+               $row.=td(nbm($tvac),'class="num"');
       }
     $total_tvac+=$tvac;
     $total_htva+=$htva;

Modified: phpcompta/tags/rel650/include/template/ledger_detail_ven.php
===================================================================
--- phpcompta/tags/rel650/include/template/ledger_detail_ven.php        
2012-12-05 20:08:07 UTC (rev 5157)
+++ phpcompta/tags/rel650/include/template/ledger_detail_ven.php        
2012-12-06 20:42:51 UTC (rev 5158)
@@ -175,8 +175,12 @@
     $tvac=bcadd($htva,$q['qs_vat']);
     if ($owner->MY_TVA_USE=='Y')
       {
-       $row.=td(nbm($q['qs_vat']),'class="num"');
-       $row.=td(nbm($tvac),'class="num"');
+               if ($tva->get_parameter("both_side")==1) {
+                       $class=' style="text-decoration:line-through"';
+                       $tvac=bcsub($tvac,$q['qs_vat']);
+               }
+               $row.=td(nbm($q['qs_vat']),'class="num"'.$class);
+               $row.=td(nbm($tvac),'class="num"');
       }
     $total_tvac=bcadd($total_tvac,$tvac);
     $total_htva=bcadd($total_htva,$htva);



---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu