From 7acef0849bae285e415a30d46c61e06d3d37f068 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Sun, 8 Aug 2010 16:39:51 +0000
Subject: [PATCH]  We can now filter for creating a new card by ledger and by
 cred or deb or both , remove bug : display card details when card is empty it
  fails

---
 html/ajax_card.php | 58 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 45 insertions(+), 13 deletions(-)

diff --git a/html/ajax_card.php b/html/ajax_card.php
index b5a394566..89f0e9388 100644
--- a/html/ajax_card.php
+++ b/html/ajax_card.php
@@ -104,8 +104,13 @@ case 'rmfa':
 
 case 'dc':
    $f=new Fiche($cn);
-   $f->get_by_qcode($qcode);
-   $html=$f->Display(true);
+   if ( $qcode != '')
+     {
+       $f->get_by_qcode($qcode);
+       $html=$f->Display(true);
+     }
+   else 
+     $html=h2info('Aucune fiche demandée');
   break;
   /* ------------------------------------------------------------ */
   /* Blank card */
@@ -134,17 +139,44 @@ case 'bc':
   /* ------------------------------------------------------------ */
 case 'st':
   $sql="select fd_id,fd_label from fiche_def";
-  if ( $ledger != -1 ) {
-    $l=new Acc_Ledger($cn,$ledger);
-    $sql.='  where fd_id in ('.$l->get_all_fiche_def().')';
-  } else
-    if ( isset($cat)) {
-      $sql=$sql.sprintf(' where frd_id = '.FormatString ($cat));
-    } else 
-      if ( isset($fil) && strlen(trim($fil)) > 0 ){
-	$sql=$sql.sprintf(" where fd_id in (%s)",
-			  FormatString($fil));
-      }
+  /*  if we filter  thanks the ledger*/
+  if ( $ledger != -1 ) 
+    {
+      /* we want the card for deb or cred or both of this ledger */
+      switch( $fil  ) 
+	{
+	case -1:
+	  $l=new Acc_Ledger($cn,$ledger);
+	  $sql.='  where fd_id in ('.$l->get_all_fiche_def().')';
+	  break;
+	case 'cred':
+	  $l=new Acc_Ledger($cn,$ledger);
+	  $prop=$l->get_propertie();
+	  if ( $prop['jrn_def_fiche_cred']=='')$prop=-1;
+	  $sql.='  where fd_id in ('.$prop['jrn_def_fiche_cred'].')';
+	  break;
+	case 'deb':
+	  $l=new Acc_Ledger($cn,$ledger);
+	  $prop=$l->get_propertie();
+	  if ( $prop=='')$prop=-1;
+	  $sql.='  where fd_id in ('.$prop['jrn_def_fiche_deb'].')';
+	  break;
+	}
+    } 
+  else
+    {
+      /* we filter thanks a given model of card */
+      if ( isset($cat)) {
+	$sql=$sql.sprintf(' where frd_id = '.FormatString ($cat));
+      } 
+      else 
+	/* we filter thanks a given list of category of card
+	 */
+	if ( isset($fil) && strlen(trim($fil)) > 0 ){
+	  $sql=$sql.sprintf(" where fd_id in (%s)",
+			    FormatString($fil));
+	}
+    }
   $array=$cn->make_array($sql);
   if ( empty($array)) {
     $html=_("Aucune catégorie de fiche ne correspondant à".