From f653144c5a99874e54e64755b7d76fe696bbffed Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 3 Oct 2004 18:31:14 +0000 Subject: [PATCH] Trad: Traduction de chaines non traduites dans l'espace charges sociales --- htdocs/compta/charges.php | 35 ++++++++++++++------------ htdocs/compta/sociales/charges.php | 40 +++++++++++++++++++----------- htdocs/langs/en_US/admin.lang | 1 + htdocs/langs/fr_FR/admin.lang | 1 + htdocs/langs/fr_FR/main.lang | 1 + 5 files changed, 47 insertions(+), 31 deletions(-) diff --git a/htdocs/compta/charges.php b/htdocs/compta/charges.php index 36948a9019c..c79a3268d21 100644 --- a/htdocs/compta/charges.php +++ b/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 ''; +print '
'; print ''; print '
'; -print ''; -print ""; +print '
'; +print ""; print ""; -print "\n"; +print "\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 ""; + dolibarr_print_error($db); } print "
Factures
".$db->error()."

"; - -/* - * - * - */ - - - print '
'; diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php index 5fc806135d2..0240f1586b5 100644 --- a/htdocs/compta/sociales/charges.php +++ b/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 "
id&action=update\" method=\"post\">"; - print ''; + print '
'; - print ""; + print ""; - print ""; + print ""; print '"; @@ -144,13 +154,13 @@ if ($chid > 0) if ($cha->paye==0) { print ''; - print ""; - print ""; + print '"; + print '"; } else { print ''; - print ""; - print ""; + print ""; + print ''; } @@ -160,7 +170,7 @@ if ($chid > 0) print "\n"; - print ''; + print '
'; if (! $_GET["action"]) { @@ -173,19 +183,19 @@ if ($chid > 0) // Supprimer if ($cha->paye == 0 && $totalpaye <=0 && $user->rights->compta->charges) { - print "id&action=delete\">Supprimer"; + print "id&action=delete\">".$langs->trans("Delete").""; } // Emettre paiement if ($cha->paye == 0 && round($resteapayer) > 0 && $user->rights->compta->charges) { - print "id&action=create\">Emettre paiement"; + print "id&action=create\">".$langs->trans("DoPaiement").""; } // Classer 'payé' if ($cha->paye == 0 && round($resteapayer) <=0 && $user->rights->compta->charges) { - print "id&action=payed\">Classer 'Payée'"; + print "id&action=payed\">".$langs->trans("ClassifyPayed").""; } print ""; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 34064d7befc..d3288ed4102 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/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 Update now. WebServer=Web server diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 79254d3e2c1..00d560fa957 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/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 Mettre à jour. WebServer=Serveur Web diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 6f0186219c3..e8a40e0ce22 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/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
".$langs->trans("Type")."$cha->type_libellePaiements
".$langs->trans("Type")."$cha->type_libelle".$langs->trans("Paiements")."
Période".dolibarr_print_date($cha->periode,"%Y")."
".$langs->trans("Period")."".dolibarr_print_date($cha->periode,"%Y")."'; /* @@ -105,8 +116,8 @@ if ($chid > 0) $num = $db->num_rows(); $i = 0; $total = 0; echo ''; - print ''; - print ""; + print ''; + print ''; $var=True; while ($i < $num) @@ -114,7 +125,6 @@ if ($chid > 0) $objp = $db->fetch_object( $i); $var=!$var; print "\n"; print "\n"; print '\n"; @@ -136,7 +146,7 @@ if ($chid > 0) print "
Date'.$langs->trans("Type").'Montant 
'.$langs->trans("Date").''.$langs->trans("Type").''.$langs->trans("Amount").' 
"; - //print ''.img_file().''; print dolibarr_print_date($objp->dp)."$objp->paiement_type $objp->num_paiement'.price($objp->amount)."".MAIN_MONNAIE."
"; $db->free(); } else { - print $db->error(); + dolibarr_print_error($db); } print "
'.$langs->trans("Label").'
Date d'échéancedate_ech)."\">
Montant TTCamount\">
'.$langs->trans("DateDue")."date_ech)."\">
'.$langs->trans("AmountTTC")."amount\">
'.$langs->trans("Label").''.$cha->lib.'
Date d'échéance".dolibarr_print_date($cha->date_ech)."
Montant TTC".price($cha->amount)."
".$langs->trans("DateDue")."".dolibarr_print_date($cha->date_ech)."
'.$langs->trans("AmountTTC").''.price($cha->amount).'