From b140eddef5ae3c6c324433a8f5088ca5d2dcf470 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Thu, 24 Nov 2011 13:36:17 +0000
Subject: [PATCH] cosmetic alignement + totaux ODS

---
 html/style-color.css              |  3 +--
 html/style-light.css              |  3 +--
 html/style.css                    |  4 +---
 include/class_acc_ledger.php      | 29 +++++++++++++++++------------
 include/operation_ods_new.inc.php |  2 +-
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/html/style-color.css b/html/style-color.css
index 14471dd1e..650a01b82 100644
--- a/html/style-color.css
+++ b/html/style-color.css
@@ -938,8 +938,7 @@ table.table_large td, table.result td
 table.info_op
 {
 	font-size:18;
-	margin-right:30%;
-	width:20%;
+	width:100%;
 
 }
 table.info_op tr
diff --git a/html/style-light.css b/html/style-light.css
index 0dbf399b9..7e2cc13fe 100644
--- a/html/style-light.css
+++ b/html/style-light.css
@@ -940,8 +940,7 @@ table.table_large td, table.result td
 table.info_op
 {
 	font-size:18;
-	margin-right:30%;
-	width:20%;
+	width:100%;
 
 }
 table.info_op tr
diff --git a/html/style.css b/html/style.css
index 752ab279e..a9edec017 100644
--- a/html/style.css
+++ b/html/style.css
@@ -940,9 +940,7 @@ table.table_large td, table.result td
 table.info_op
 {
 	font-size:18;
-	margin-right:30%;
-	width:20%;
-
+	width:100%;
 }
 table.info_op tr
 {
diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php
index 51e7622da..f57f0f93c 100644
--- a/include/class_acc_ledger.php
+++ b/include/class_acc_ledger.php
@@ -1337,8 +1337,8 @@ class Acc_Ledger extends jrn_def_sql
         {
             $lPeriode->find_periode($e_date);
         }
-		$total=0;
-		bcscale(2);
+	$total_deb=0;$total_cred=0;
+	bcscale(2);
 
         $ret="";
         $ret.="<table >";
@@ -1422,10 +1422,15 @@ class Acc_Ledger extends jrn_def_sql
                 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 @@ class Acc_Ledger extends jrn_def_sql
 
             $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 @@ class Acc_Ledger extends jrn_def_sql
 		$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>';
 
 
diff --git a/include/operation_ods_new.inc.php b/include/operation_ods_new.inc.php
index 3dd6fb0de..65a2206ff 100644
--- a/include/operation_ods_new.inc.php
+++ b/include/operation_ods_new.inc.php
@@ -92,7 +92,7 @@ echo HtmlInput::button('add', _('Ajout d\'une ligne'), 'onClick="quick_writing_a
 
 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>' .