From 50908eba1894ecc27b9fa3198a4f70d82745b57b Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Fri, 29 Oct 2010 22:55:40 +0000
Subject: [PATCH] =?UTF-8?q?task=20#5=20:=20am=C3=A9lioration=20des=20perfo?=
 =?UTF-8?q?rmances=20pour=20la=20recherche=20de=20fiche?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/lettering.gestion.inc.php            | 14 ++++++++------
 include/template/letter_all.php              | 12 ++++++------
 include/template/letter_prop.php             |  2 +-
 include/template/result_cat_card_summary.php |  6 ++++--
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/include/lettering.gestion.inc.php b/include/lettering.gestion.inc.php
index e06a67db1..56fa50fcf 100644
--- a/include/lettering.gestion.inc.php
+++ b/include/lettering.gestion.inc.php
@@ -60,12 +60,14 @@ if ( isset($_POST['record']))
 //--------------------------------------------------------------------------------
 // Show the result
 //--------------------------------------------------------------------------------
-if ( isDate($_GET['start']) == null || isDate($_GET['end']) == null )
-{
-    echo alert(_('Date malformée, désolé'));
-    exit();
-}
-
+if ( isset($_GET['start']) && isset($_GET['end']))
+  {
+    if ( isDate($_GET['start']) == null || isDate($_GET['end']) == null )
+      {
+	echo alert(_('Date malformée, désolé'));
+	exit();
+      }
+  }
 echo '<div id="list">';
 $fiche=new Fiche($cn,$_REQUEST['f_id']);
 $quick_code=$fiche->get_quick_code();
diff --git a/include/template/letter_all.php b/include/template/letter_all.php
index fc63beffe..1e7da0e0d 100644
--- a/include/template/letter_all.php
+++ b/include/template/letter_all.php
@@ -65,7 +65,7 @@ $r=sprintf('<A class="detail" style="text-decoration:underline" HREF="javascript
 ?>
   <td> <?=$r?> </td>
   <td> <?=h($this->content[$i]['jr_comment'])?> </td>
-<td> <?=$this->content[$i]['j_montant']?> </td>
+  <td style="text-align:right"> <?=nb($this->content[$i]['j_montant'])?> </td>
 <td> <?=($this->content[$i]['j_debit']=='t')?'D':'C'?> </td>
 <td>
 <?php
@@ -95,12 +95,12 @@ $amount_cred+=($this->content[$i]['j_debit']=='f')?$this->content[$i]['j_montant
     endfor;
 ?>
 </table>
-<h2 class="info2" style="margin:0 0"> Solde débit  : <?=$amount_deb?>
-<h2 class="info2"  style="margin:0 0"> Solde crédit : <?=$amount_cred?>
- <? $solde=$amount_deb-$amount_cred; 
+<h2 class="info2" style="margin:0 0"> Solde débit  : <?=nb($amount_deb);?>
+<h2 class="info2"  style="margin:0 0"> Solde crédit : <?=nb($amount_cred);?>
+  <? $solde=bcsub($amount_deb,$amount_cred);
 if ( $solde > 0 ) :
 ?>
-<h2 class="info2"  style="margin:0 0"> Solde débiteur       : <?=$solde?>
+  <h2 class="info2"  style="margin:0 0"> Solde débiteur       : <?=nb($solde)?>
 <? else : ?>
-<h2 class="info2"  style="margin:0 0"> Solde créditeur       : <?=abs($solde)?>
+     <h2 class="info2"  style="margin:0 0"> Solde créditeur       : <?=nb(abs($solde))?>
 <? endif; ?>
diff --git a/include/template/letter_prop.php b/include/template/letter_prop.php
index 8b4693c44..322558b82 100644
--- a/include/template/letter_prop.php
+++ b/include/template/letter_prop.php
@@ -71,7 +71,7 @@ $r=sprintf('<A class="detail" style="text-decoration:underline"  HREF="javascrip
 ?>
 <td> <?=$r?> </td>
 <td> <?=$this->content[$i]['jr_comment']?> </td>
-<td> <?=$this->content[$i]['j_montant']?> </td>
+  <td> <?=nb($this->content[$i]['j_montant'])?> </td>
 <td> <?=($this->content[$i]['j_debit']=='t')?'D':'C'?> </td>
 <td>
 <?php
diff --git a/include/template/result_cat_card_summary.php b/include/template/result_cat_card_summary.php
index 60c67fa6b..609e37241 100644
--- a/include/template/result_cat_card_summary.php
+++ b/include/template/result_cat_card_summary.php
@@ -14,8 +14,10 @@ foreach ($array as $row ) :
    echo '<tr class="odd">';
    else 
    echo '<tr class="even">';
- $row->getAttribut();
- foreach($row->attribut as $attr) :
+   $fiche=new Fiche($cn);
+   $fiche->id=$row['f_id'];
+ $fiche->getAttribut();
+ foreach($fiche->attribut as $attr) :
     echo td($attr->av_text,'style="padding: 0 10 1 10;white-space:nowrap;"');
  endforeach;       
  echo '</tr>';