From 8d8be88daf699ebc9fb8ba8ae79593ef97368a73 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 11 Aug 2005 20:24:58 +0000
Subject: [PATCH] =?UTF-8?q?Am=E9lioration=20gestion=20des=20charges=20soci?=
 =?UTF-8?q?ales?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/sociales/charges.php |  4 ++--
 htdocs/compta/sociales/index.php   |  4 ++--
 htdocs/compta/sociales/pre.inc.php | 29 +++++++++++++----------------
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php
index 590c3e1f658..b37b5348d5e 100644
--- a/htdocs/compta/sociales/charges.php
+++ b/htdocs/compta/sociales/charges.php
@@ -77,7 +77,7 @@ if ($chid > 0)
 	   */
 
 	  //$head[0][0] = DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id;
-	  $head[0][1] = "Charge sociale : No $cha->id";
+	  $head[0][1] = $langs->trans("SocialContribution").": $cha->id";
 	  $h = 1;
 	  $a = 0;
 
@@ -172,7 +172,7 @@ if ($chid > 0)
     
      print "</form>\n";
 
-	print '<br></div>';
+	print '</div>';
 
     if (! $_GET["action"]) {
 
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index fc2297b1d33..3cfd6d64fe7 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -227,7 +227,7 @@ if ( $db->query($sql) )
 
       $var = !$var;
       print "<tr $bc[$var]>";
-      print '<td width="80">';
+      print '<td width="60">';
       print '<a href="charges.php?id='.$obj->id.'">'.img_file().' '.$obj->id.'</a>';
       print '</td>';
 
@@ -239,7 +239,7 @@ if ( $db->query($sql) )
       	print '&nbsp;';
       }
       print '</td>';
-      print '<td>'.$obj->type_lib.'</td><td>'.$obj->libelle.'</td>';
+      print '<td>'.$obj->type_lib.'</td><td>'.dolibarr_trunc($obj->libelle,36).'</td>';
       print '<td align="right" width="100">'.price($obj->amount).'</td>';
       
       if ($obj->paye)
diff --git a/htdocs/compta/sociales/pre.inc.php b/htdocs/compta/sociales/pre.inc.php
index 320eaad333f..11d444f1877 100644
--- a/htdocs/compta/sociales/pre.inc.php
+++ b/htdocs/compta/sociales/pre.inc.php
@@ -24,22 +24,19 @@ require("../../main.inc.php");
 
 function llxHeader($head = "")
 {
-  global $user, $conf, $langs;
-
-
-  /*
-   *
-   *
-   */
-  top_menu($head);
-
-  $menu = new Menu();
-
-  $menu->add("../charges/",$langs->trans("Charges"));
-  $menu->add_submenu("index.php",$langs->trans("SocialContributions"));
-  //  $menu->add_submenu("/compta/sociales/conf.php","Conf");
-
-  left_menu($menu->liste);
+    global $user, $conf, $langs;
+    $langs->load("compta");
+    $langs->load("propal");
+    
+    top_menu($head);
+    
+    $menu = new Menu();
+    
+    $menu->add("../charges/",$langs->trans("Contributions"));
+    $menu->add_submenu("index.php",$langs->trans("SocialContributions"));
+    //  $menu->add_submenu("/compta/sociales/conf.php","Conf");
+    
+    left_menu($menu->liste);
 }
 
 ?>