[Phpcompta-dev] r4448 - phpcompta/trunk/include

[phpcompta-dev]

Author: danydb
Date: 2011-11-23 14:41:55 +0100 (Wed, 23 Nov 2011)
New Revision: 4448

Modified:
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
Log:
#466 text alignement

Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_purchase.php       2011-11-22 
22:50:44 UTC (rev 4447)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php       2011-11-23 
13:41:55 UTC (rev 4448)
@@ -1271,20 +1271,20 @@
         $r.='<TR>';
         $r.="<th>Code</th>";
         $r.="<th>"._('Dénomination')."</th>";
-        $r.="<th>"._('prix')."</th>";
+        $r.="<th style=\"text-align:right\">"._('prix')."</th>";
         /* vat use */
         if ( $g_parameter->MY_TVA_USE=='Y')
         {
-            $r.="<th>"._('quantité')."</th>";
-            $r.="<th>tva</th>";
-            $r.='<th> '._('Montant TVA').'</th>';
-            $r.='<th>'._('Montant HTVA').'</th>';
-            $r.='<th>'._('Totaux').'</th>';
+            $r.="<th style=\"text-align:right\">"._('quantité')."</th>";
+            $r.="<th style=\"text-align:right\">tva</th>";
+            $r.='<th style="text-align:right"> '._('Montant TVA').'</th>';
+            $r.='<th style="text-align:right">'._('Montant HTVA').'</th>';
+            $r.='<th style="text-align:right">'._('Totaux').'</th>';
         }
         else
         {
-            $r.="<th>"._('quantité')."</th>";
-            $r.='<th> '._('Total')."</th>";
+            $r.="<th style=\"text-align:right\">"._('quantité')."</th>";
+            $r.='<th style="text-align:right"> '._('Total')."</th>";
         }
 
         /* if we use the AC */
@@ -1359,25 +1359,25 @@
             $r.='<TD style="width:60%;border-bottom:1px dotted grey;">';
             $r.=$fiche_name;
             $r.='</td>';
-            $r.='<td align="right">';
+            $r.='<td class="num">';
             $r.=nbm(${"e_march".$i."_price"});
             $r.='</td>';
-            $r.='<td align="right">';
+            $r.='<td class="num">';
             $r.=nbm(${"e_quant".$i});
             $r.='</td>';
             if ($g_parameter->MY_TVA_USE == 'Y')
             {
-                $r.='<td align="right">';
+                $r.='<td class="num">';
                 $r.=$oTva->get_parameter('label');
                 $r.='</td>';
-                $r.='<td align="right">';
+                $r.='<td class="num">';
                 $r.=nbm($tva_item);
                 $r.='</td>';
-                               $r.='<td align="right">';
+                               $r.='<td class="num">';
                                $r.=nbm(round($amount,2));
                                $r.='</td>';
             }
-                       $r.='<td align="right">';
+                       $r.='<td class="num">';
             $r.=nbm(round($tot_row,2));
             $r.='</td>';
             // encode the pa

Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_sold.php   2011-11-22 22:50:44 UTC 
(rev 4447)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php   2011-11-23 13:41:55 UTC 
(rev 4448)
@@ -671,15 +671,15 @@
         $r.='<TR>';
         $r.="<th>"._('Code')."</th>";
         $r.="<th>"._('Dénomination')."</th>";
-        $r.="<th>"._('prix')."</th>";
-        $r.="<th>"._('quantité')."</th>";
-        $r.="<th>"._('tva')."</th>";
+        $r.="<th style=\"text-align:right\">"._('prix')."</th>";
+        $r.="<th style=\"text-align:right\">"._('quantité')."</th>";
+        $r.="<th style=\"text-align:right\">"._('tva')."</th>";
 
 
         if ( $g_parameter->MY_TVA_USE=='Y')
         {
-            $r.='<th> '._('Montant TVA').'</th>';
-            $r.='<th>'._('Montant HTVA').'</th>';
+            $r.='<th style="text-align:right"> '._('Montant TVA').'</th>';
+            $r.='<th style="text-align:right">'._('Montant HTVA').'</th>';
         }
         /* if we use the AC */
         if ($g_parameter->MY_ANALYTIC!='nu')
@@ -736,18 +736,18 @@
             $r.='<TD style="width:60%;border-bottom:1px dotted grey;">';
             $r.=$fiche_name;
             $r.='</td>';
-            $r.='<td align="right">';
+            $r.='<td class="num">';
             $r.=nbm(${"e_march".$i."_price"});
             $r.='</td>';
-            $r.='<td align="right">';
-            $r.=${"e_quant".$i};
+            $r.='<td class="num">';
+            $r.=nbm(${"e_quant".$i});
             $r.='</td>';
             if ( $g_parameter->MY_TVA_USE=='Y')
             {
-                $r.='<td align="right">';
+                $r.='<td class="num">';
                 $r.=$oTva->get_parameter('label');
                 $r.='</td>';
-                $r.='<td align="right">';
+                $r.='<td class="num">';
                 $r.=nbm($tva_item);
                 /* warning if tva_computed and given are not the
                    same */
@@ -757,7 +757,7 @@
                 }
                 $r.='</td>';
             }
-            $r.='<td align="right">';
+            $r.='<td class="num">';
             $r.=nbm($amount);
             $r.='</td>';
 
@@ -789,7 +789,7 @@
         if (! $p_summary )
                {
                        $r.=$this->extra_info();
-               $r.='<div 
style="width:40%;position:float;float:right;text-align:right;padding-left:5%;padding-right:5%;color:blue;font-size:1.2em;font-weight:bold">';
+                         $r.='<div 
style="width:40%;position:float;float:right;text-align:right;padding-left:5%;padding-right:5%;color:blue;font-size:1.2em;font-weight:bold">';
                }
                else
                        $r.='<div 
style="width:60%;position:float;float:left;text-align:right;padding-left:5%;padding-right:5%;color:blue;font-size:1.2em;font-weight:bold">';