From fe7555d24296b85a49fd6821297b46df918159ea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 2 May 2004 13:49:15 +0000
Subject: [PATCH] =?UTF-8?q?New:=20Possibilit=E9=20de=20trier=20sur=20tous?=
 =?UTF-8?q?=20les=20champs=20du=20tableau=20pour=20l'=E9cran=20de=20liste?=
 =?UTF-8?q?=20des=20charges=20sociales.=20New:=20La=20colonne=20pay=E9/non?=
 =?UTF-8?q?=20pay=E9=20s'affiche=20en=20rouge=20si=20impay=E9=20(comme=20l?=
 =?UTF-8?q?es=20factures).=20New:=20Le=20type=20et=20libell=E9=20s=E9par?=
 =?UTF-8?q?=E9=20en=202=20colonnes=20distinctes=20plutot=20qu'une=20commun?=
 =?UTF-8?q?e=20contenant=202=20valeurs=20l'une=20=E0=20c=F4t=E9=20de=20l'a?=
 =?UTF-8?q?utre.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/sociales/index.php | 58 +++++++++++++++++++-------------
 1 file changed, 35 insertions(+), 23 deletions(-)

diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index 4f8fca43f72..89230e8053a 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -64,12 +64,8 @@ if ($_GET["action"] == 'del')
     }
 }
 
-if ($_GET["action"] == 'edit')
-{
-	print "La modification est le paiement des charges n'est pas encore disponible.\nSeule leur saisie est possible, sans interaction avec le compte pour l'instant.\n";
-}
-
-
+$year=$_GET["year"];
+$filtre=$_GET["filtre"];
 
 /*
  *  Affichage liste et formulaire des charges.
@@ -77,20 +73,36 @@ if ($_GET["action"] == 'edit')
 
 print_titre("Charges sociales $year");
 
+print "<br>\n";
+
 print "<table class=\"noborder\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
 print "<tr class=\"liste_titre\">";
-print '<td>Echeance/Date</td><td>Période</td><td colspan="2" align="left">';
-print_liste_field_titre("Libellé",$PHP_SELF,"c.libelle");
-print '</td><td align="right">Montant</td><td align="center">Payé</td><td>&nbsp;</td>';
+print '<td>';
+print_liste_field_titre("Echéance/Date",$PHP_SELF,"de");
+print '</td><td>';
+print_liste_field_titre("Période",$PHP_SELF,"periode");
+print '</td><td align="left">';
+print_liste_field_titre("Type",$PHP_SELF,"type");
+print '</td><td align="left">';
+print_liste_field_titre("Libellé",$PHP_SELF,"s.libelle");
+print '</td><td align="right">';
+print_liste_field_titre("Montant",$PHP_SELF,"s.amount");
+print '</td><td align="center">';
+print_liste_field_titre("Payé",$PHP_SELF,"s.paye");
+print '</td><td>&nbsp;</td>';
 print "</tr>\n";
 
 
-$sql = "SELECT s.rowid as id, c.libelle as nom, s.amount,".$db->pdate("s.date_ech")." as de, s.date_pai, s.libelle, s.paye,".$db->pdate("s.periode")." as periode,".$db->pdate("s.date_pai")." as dp";
+$sql = "SELECT s.rowid as id, c.libelle as type, s.amount,".$db->pdate("s.date_ech")." as de, s.date_pai, s.libelle, s.paye,".$db->pdate("s.periode")." as periode,".$db->pdate("s.date_pai")." as dp";
 $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s";
 $sql .= " WHERE s.fk_type = c.id";
 if ($year > 0)
 {
-  $sql .= " AND date_format(s.periode, '%Y') = $year";
+    $sql .= " AND date_format(s.periode, '%Y') = $year";
+}
+if ($filtre) {
+    $filtre=ereg_replace(":","=",$filtre);
+    $sql .= " AND $filtre";
 }
 $sql .= " ORDER BY lower(s.date_ech) DESC";
 
@@ -102,6 +114,7 @@ if ( $db->query($sql) )
   while ($i < $num)
     {
       $obj = $db->fetch_object( $i);
+
       $var = !$var;
       print "<tr $bc[$var]>";
       print '<td>'.strftime("%d %b %y",$obj->de).'</td>';
@@ -112,16 +125,16 @@ if ( $db->query($sql) )
       	print '&nbsp;';
       }
       print '</td>';
-      print '<td>'.$obj->nom.'</td><td>'.$obj->libelle.'</td>';
+      print '<td>'.$obj->type.'</td><td>'.$obj->libelle.'</td>';
       print '<td align="right">'.price($obj->amount).'</td>';
       
       if ($obj->paye)
 	{
-	  print '<td align="center">'.strftime("%d/%m/%y",$obj->dp).'</td>';
+	  print '<td align="center" class="normal">'.strftime("%d/%m/%y",$obj->dp).'</td>';
 	  print '<td>&nbsp;</td>';
 	} else {
-	  print '<td align="center">Non</td>';
-	  print '<td align="center"><a href="'.$PHP_SELF.'?action=edit&id='.$obj->id.'">'.img_edit().'</a>';
+	  print '<td align="center"><a class="impayee" href="'.$PHP_SELF.'?filtre=paye:0">Non</a></td>';
+	  print '<td align="center"><a href="charges.php?id='.$obj->id.'">'.img_edit().'</a>';
 	  print ' &nbsp; <a href="'.$PHP_SELF.'?action=del&id='.$obj->id.'">'.img_delete().'</a></td>';
 	}
       print '</tr>';
@@ -132,9 +145,9 @@ else
 {
   print $db->error();
 }
+
 /*
- * 
- *
+ * Forumalaire d'ajout d'une charge
  *
  */
 print '<tr class="form"><form method="post" action="index.php">';
@@ -142,10 +155,9 @@ print '<input type="hidden" name="action" value="add">';
 print '<td><input type="text" size="8" name="date"> YYYYMMDD</td>';
 print '<td>&nbsp;</td>';
 
-print '<td colspan="2" align="left"><select name="type">';
+print '<td align="left"><select name="type">';
 
-
-$sql = "SELECT c.id, c.libelle as nom FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+$sql = "SELECT c.id, c.libelle as type FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
 $sql .= " ORDER BY lower(c.libelle) ASC";
 
 if ( $db->query($sql) )
@@ -156,13 +168,13 @@ if ( $db->query($sql) )
   while ($i < $num)
     {
       $obj = $db->fetch_object( $i);
-      print '<option value="'.$obj->id.'">'.$obj->nom;
+      print '<option value="'.$obj->id.'">'.$obj->type;
       $i++;
     }
 }
 print '</select>';
-
-print '<input type="text" size="20" name="libelle"></td>';
+print '</td>';
+print '<td align="left"><input type="text" size="20" name="libelle"></td>';
 print '<td align="right"><input type="text" size="6" name="amount"></td>';
 print '<td>&nbsp;</td>';