[Phpcompta-dev] r4470 - in phpcompta/trunk: html include

[phpcompta-dev]

Author: danydb
Date: 2011-11-24 14:36:17 +0100 (Thu, 24 Nov 2011)
New Revision: 4470

Modified:
   phpcompta/trunk/html/style-color.css
   phpcompta/trunk/html/style-light.css
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/class_acc_ledger.php
   phpcompta/trunk/include/operation_ods_new.inc.php
Log:
cosmetic alignement + totaux ODS

Modified: phpcompta/trunk/html/style-color.css
===================================================================
--- phpcompta/trunk/html/style-color.css        2011-11-24 13:15:46 UTC (rev 
4469)
+++ phpcompta/trunk/html/style-color.css        2011-11-24 13:36:17 UTC (rev 
4470)
@@ -938,8 +938,7 @@
 table.info_op
 {
        font-size:18;
-       margin-right:30%;
-       width:20%;
+       width:100%;
 
 }
 table.info_op tr

Modified: phpcompta/trunk/html/style-light.css
===================================================================
--- phpcompta/trunk/html/style-light.css        2011-11-24 13:15:46 UTC (rev 
4469)
+++ phpcompta/trunk/html/style-light.css        2011-11-24 13:36:17 UTC (rev 
4470)
@@ -940,8 +940,7 @@
 table.info_op
 {
        font-size:18;
-       margin-right:30%;
-       width:20%;
+       width:100%;
 
 }
 table.info_op tr

Modified: phpcompta/trunk/html/style.css
===================================================================
--- phpcompta/trunk/html/style.css      2011-11-24 13:15:46 UTC (rev 4469)
+++ phpcompta/trunk/html/style.css      2011-11-24 13:36:17 UTC (rev 4470)
@@ -940,9 +940,7 @@
 table.info_op
 {
        font-size:18;
-       margin-right:30%;
-       width:20%;
-
+       width:100%;
 }
 table.info_op tr
 {

Modified: phpcompta/trunk/include/class_acc_ledger.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger.php        2011-11-24 13:15:46 UTC 
(rev 4469)
+++ phpcompta/trunk/include/class_acc_ledger.php        2011-11-24 13:36:17 UTC 
(rev 4470)
@@ -1337,8 +1337,8 @@
         {
             $lPeriode->find_periode($e_date);
         }
-               $total=0;
-               bcscale(2);
+       $total_deb=0;$total_cred=0;
+       bcscale(2);
 
         $ret="";
         $ret.="<table >";
@@ -1422,10 +1422,15 @@
                 continue;
             
$ret.="<td>".h(${"ld".$i}).HtmlInput::hidden('ld'.$i,${'ld'.$i})."</td>";
             if ( isset(${"ck$i"}))
-                               $ret.="<td 
class=\"num\">".nbm(${"amount".$i}).HtmlInput::hidden('amount'.$i,${'amount'.$i})."</td>".td("");
-                       else
-                               $ret.=td("")."<td 
class=\"num\">".nbm(${"amount".$i}).HtmlInput::hidden('amount'.$i,${'amount'.$i})."</td>";
-                       $total=bcadd($total,${"amount".$i});
+             {
+               $ret.="<td 
class=\"num\">".nbm(${"amount".$i}).HtmlInput::hidden('amount'.$i,${'amount'.$i})."</td>".td("");
+               $total_deb=bcadd($total_deb,${'amount'.$i});
+             }
+           else
+             {
+               $ret.=td("")."<td 
class=\"num\">".nbm(${"amount".$i}).HtmlInput::hidden('amount'.$i,${'amount'.$i})."</td>";
+               $total_cred=bcadd($total_cred,${"amount".$i});
+             }
             $ret.="<td>";
             $ret.=(isset(${"ck$i"}))?HtmlInput::hidden('ck'.$i,${'ck'.$i}):"";
             $ret.="</td>";
@@ -1456,7 +1461,7 @@
 
             $ret.="</tr>";
         }
-               
$ret.=tr(td('').td(_('Totaux')).td($total,'class="num"').td($total,'class="num"'),'class="footer"');
+               
$ret.=tr(td('').td(_('Totaux')).td($total_deb,'class="num"').td($total_cred,'class="num"'),'class="footer"');
         $ret.="</table>";
                if ( $g_parameter->MY_ANALYTIC!='nu'  && $p_readonly==false)
                        $ret.='<input type="button" class="button" 
value="'._('verifie Imputation Analytique').'" onClick="verify_ca(\'\');">';
@@ -1586,11 +1591,11 @@
                $ret.=$f_add_button->input();
         $ret.='<table id="quick_item" style="width:100%">';
         $ret.='<tr>'.
-              '<th >Quickcode'.$info.'</th>'.
-              '<th >'._('Poste').$info_poste.'</th>'.
-              '<th >'._('Libellé').'</th>'.
-              '<th>'._('Montant').'</th>'.
-              '<th>'._('Débit').'</th>'.
+              '<th style="text-align:left">Quickcode'.$info.'</th>'.
+              '<th style="text-align:left">'._('Poste').$info_poste.'</th>'.
+              '<th style="text-align:left">'._('Libellé').'</th>'.
+              '<th style="text-align:left">'._('Montant').'</th>'.
+              '<th style="text-align:left">'._('Débit').'</th>'.
               '</tr>';
 
 

Modified: phpcompta/trunk/include/operation_ods_new.inc.php
===================================================================
--- phpcompta/trunk/include/operation_ods_new.inc.php   2011-11-24 13:15:46 UTC 
(rev 4469)
+++ phpcompta/trunk/include/operation_ods_new.inc.php   2011-11-24 13:36:17 UTC 
(rev 4470)
@@ -92,7 +92,7 @@
 
 echo HtmlInput::submit('summary', _('Sauvez'));
 
-echo '<div style="position:absolute;right:20px">';
+echo '<div style="position:absolute;width:40%;right:20px">';
 echo '<table class="info_op">'.
  '<tr>'.td(_('Débit')) . '<td id="totalDeb"></td>' .
  td(_('Crédit')) . ' <td id="totalCred"></td>' .