Trad: Traduction de chaines non traduites dans l'espace charges sociales

htdocs/compta/charges.php

@@ -19,10 +19,20 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  */
+
+/*!	\file htdocs/compta/charges.php
+		\ingroup    compta
+		\brief      Page liste des charges sociales
+		\version    $Revision$
+*/
+
 require("./pre.inc.php");
 
+$langs->load("compta");
+
 llxHeader();
 
+
 function valeur($sql) {
   global $db;
   if ( $db->query($sql) ) {
@@ -33,10 +43,10 @@ function valeur($sql) {
   }
   return $valeur;
 }
-/*
- *
- */
 
+/*
+ * Action ajout en bookmark
+ */
 if ($action == 'add_bookmark') {
   $sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_soc, dateb, fk_user) VALUES ($socidp, now(),".$user->id.");";
   if (! $db->query($sql) ) {
@@ -49,17 +59,18 @@ if ($action == 'del_bookmark') {
   $result = $db->query($sql);
 }
 
+
 print_titre("Charges");
 
-print '<TABLE border="0" width="100%" cellspacing="0" cellpadding="4">';
+print '<table width="100%">';
 
 print '<tr><td valign="top" width="30%">';
 
 
-print '<TABLE border="0" cellspacing="0" cellpadding="3" width="100%">';
+print '<table class="noborder" width="100%">';
-print "<TR class=\"liste_titre\">";
+print "<tr class=\"liste_titre\">";
 print "<td colspan=\"2\">Factures</td>";
-print "</TR>\n";
+print "</tr>\n";
 
 $sql = "SELECT c.libelle as nom, sum(s.amount) as total";
 $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s";
@@ -79,20 +90,12 @@ if ( $db->query($sql) ) {
     $i++;
   }
 } else {
-  print "<tr><td>".$db->error()."</td></tr>";
+  dolibarr_print_error($db);
 }
 
 
 print "</table><br>";
 
-
-/*
- *
- *
- */
-
-
-
 print '</td></tr>';
 
 print '</table>';

htdocs/compta/sociales/charges.php

@@ -19,8 +19,19 @@
  * $Source$
  *
  */
+
+/*!	\file htdocs/compta/sociales/charges.php
+		\ingroup    compta
+		\brief      Fiche d'une charge sociale
+		\version    $Revision$
+*/
+
 require("./pre.inc.php");
 
+$langs->load("compta");
+$langs->load("bills");
+
+
 $user->getrights('compta');
 
 if (!$user->admin && !$user->rights->compta->charges)
@@ -83,11 +94,11 @@ if ($chid > 0)
 
       print "<form action=\"charges.php?id=$cha->id&amp;action=update\" method=\"post\">";
 
-	  print '<table class="border" cellspacing="0" cellpadding="2" width="100%">';
+	  print '<table class="border" width="100%">';
 
-	  print "<tr><td>".$langs->trans("Type")."</td><td>$cha->type_libelle</td><td>Paiements</td></tr>";
+	  print "<tr><td>".$langs->trans("Type")."</td><td>$cha->type_libelle</td><td>".$langs->trans("Paiements")."</td></tr>";
 
-	  print "<tr><td>Période</td><td>".dolibarr_print_date($cha->periode,"%Y")."</td>";
+	  print "<tr><td>".$langs->trans("Period")."</td><td>".dolibarr_print_date($cha->periode,"%Y")."</td>";
       print '<td rowspan="5" valign="top">';
 	  	  
     	  /*
@@ -105,8 +116,8 @@ if ($chid > 0)
     	    $num = $db->num_rows();
     	    $i = 0; $total = 0;
     	    echo '<table class="noborder" width="100%" cellspacing="0" cellpadding="3">';
-    	    print '<tr class="liste_titre"><td>Date</td><td>'.$langs->trans("Type").'</td>';
+    	    print '<tr class="liste_titre"><td>'.$langs->trans("Date").'</td><td>'.$langs->trans("Type").'</td>';
-    	    print "<td align=\"right\">Montant</TD><td>&nbsp;</td></tr>";
+    	    print '<td align="right">'.$langs->trans("Amount").'</td><td>&nbsp;</td></tr>';
         
     	    $var=True;
     	    while ($i < $num)
@@ -114,7 +125,6 @@ if ($chid > 0)
     		$objp = $db->fetch_object( $i);
     		$var=!$var;
     		print "<tr $bc[$var]><td>";
-    		//print '<a href="'.DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$objp->rowid.'">'.img_file().'</a>';
     		print dolibarr_print_date($objp->dp)."</td>\n";
     		print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
     		print '<td align="right">'.price($objp->amount)."</td><td>".MAIN_MONNAIE."</td>\n";
@@ -136,7 +146,7 @@ if ($chid > 0)
     	    print "</table>";
     	    $db->free();
     	  } else {
-    	    print $db->error();
+    	    dolibarr_print_error($db);
     	  }
     	  print "</td>";
 
@@ -144,13 +154,13 @@ if ($chid > 0)
 
       if ($cha->paye==0) {
           print '<tr><td>'.$langs->trans("Label").'</td><td><input type="text" name="desc" size="40" value="'.stripslashes($cha->lib).'"></td></tr>';
-    	  print "<tr><td>Date d'échéance</td><td><input type=\"text\" name=\"amount\" value=\"".strftime("%Y%m%d",$cha->date_ech)."\"></td></tr>";
+    	  print '<tr><td>'.$langs->trans("DateDue")."</td><td><input type=\"text\" name=\"amount\" value=\"".strftime("%Y%m%d",$cha->date_ech)."\"></td></tr>";
-    	  print "<tr><td>Montant TTC</td><td><b><input type=\"text\" name=\"amount\" value=\"$cha->amount\"></b></td></tr>";
+    	  print '<tr><td>'.$langs->trans("AmountTTC")."</td><td><b><input type=\"text\" name=\"amount\" value=\"$cha->amount\"></b></td></tr>";
         }
       else {
           print '<tr><td>'.$langs->trans("Label").'</td><td>'.$cha->lib.'</td></tr>';
-    	  print "<tr><td>Date d'échéance</td><td>".dolibarr_print_date($cha->date_ech)."</td></tr>";
+    	  print "<tr><td>".$langs->trans("DateDue")."</td><td>".dolibarr_print_date($cha->date_ech)."</td></tr>";
-    	  print "<tr><td>Montant TTC</td><td><b>".price($cha->amount)."</b></td></tr>";
+    	  print '<tr><td>'.$langs->trans("AmountTTC").'</td><td><b>'.price($cha->amount).'</b></td></tr>';
       }
 
 
@@ -160,7 +170,7 @@ if ($chid > 0)
     
      print "</form>\n";
 
-	print '</div>';
+	print '<br></div>';
 
     if (! $_GET["action"]) {
 
@@ -173,19 +183,19 @@ if ($chid > 0)
 	    // Supprimer
 	    if ($cha->paye == 0 && $totalpaye <=0 && $user->rights->compta->charges)
 	      {
-		print "<a class=\"tabAction\" href=\"charges.php?id=$cha->id&amp;action=delete\">Supprimer</a>";
+		print "<a class=\"tabAction\" href=\"charges.php?id=$cha->id&amp;action=delete\">".$langs->trans("Delete")."</a>";
 	      } 
 
 	    // Emettre paiement 
 	    if ($cha->paye == 0 && round($resteapayer) > 0 && $user->rights->compta->charges)
 	      {
-		print "<a class=\"tabAction\" href=\"../paiement_charge.php?id=$cha->id&amp;action=create\">Emettre paiement</a>";
+		print "<a class=\"tabAction\" href=\"../paiement_charge.php?id=$cha->id&amp;action=create\">".$langs->trans("DoPaiement")."</a>";
 	      }
 	    
 	    // Classer 'payé'
 	    if ($cha->paye == 0 && round($resteapayer) <=0 && $user->rights->compta->charges)
 	      {
-		print "<a class=\"tabAction\" href=\"charges.php?id=$cha->id&amp;action=payed\">Classer 'Payée'</a>";
+		print "<a class=\"tabAction\" href=\"charges.php?id=$cha->id&amp;action=payed\">".$langs->trans("ClassifyPayed")."</a>";
 	      }
 	    
 	    print "</div>";

htdocs/langs/en_US/admin.lang

@@ -28,6 +28,7 @@ DictionnaryRegion=Regions
 DictionnaryCountry=Countries
 DictionnaryCivility=Civility title
 DictionnaryActions=Actions list
+DictionnarySocialContributions=Social contributions types
 AlwaysActive=Always active
 UpdateRequired=Your system need to be updated. For this click on <a href="%s">Update now</a>.
 WebServer=Web server

htdocs/langs/fr_FR/admin.lang

@@ -32,6 +32,7 @@ DictionnaryRegion=R
 DictionnaryCountry=Pays
 DictionnaryCivility=Titres de civilité
 DictionnaryActions=Liste des actions
+DictionnarySocialContributions=Types de charges sociales
 AlwaysActive=Toujours actif
 UpdateRequired=Votre système nécessite une mise à jour. Pour cela cliquez sur <a href="%s">Mettre à jour</a>.
 WebServer=Serveur Web

htdocs/langs/fr_FR/main.lang

@@ -83,6 +83,7 @@ DateCreation=Date de cr
 DateModification=Date de modification
 DateValidation=Date de validation
 DateClosing=Date de clôture
+DateDue=Date échéance
 Year=Année
 Month=Mois
 Day=Jour