diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index fbeacb61d88..6c309e63fcb 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -130,7 +130,7 @@ if ($result) print ''; if (! $boxes[$position][$obj->rowid]) { - print 'Ajouter'; + print ''.$langs->trans("Add").''; } else { diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index b664e395519..a345f8349a2 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -152,7 +152,7 @@ if ($_GET["id"]) print ''; } } - print ''; + print ''; print ""; print ''; } diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index 419bd1e8db4..d0a00dcbe51 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -64,7 +65,7 @@ if ($result) print ''; print ''.$langs->trans("Permission").''; print ''.$langs->trans("Module").''; - print ''.$langs->trans("Défaut").''; + print ''.$langs->trans("Default").''; print ' '; print "\n"; $old = $obj->module; @@ -77,15 +78,13 @@ if ($result) print ''; print ''; - print ''; - print 'Enlever'; + print ''.img_edit_removed().''; } else { print ' '; print ''; - print ''; - print 'Ajouter'; + print ''.img_edit_add().''; } print ''; diff --git a/htdocs/boutique/livre/fiche.php b/htdocs/boutique/livre/fiche.php index a348179526c..dce38d5c6b5 100644 --- a/htdocs/boutique/livre/fiche.php +++ b/htdocs/boutique/livre/fiche.php @@ -315,7 +315,7 @@ else print 'Auteur(s)'; $htmls->select_array("coauteurid", $auteur->liste_array()); - print ' '; + print ' '; print ""; print "
\n"; @@ -324,7 +324,7 @@ else $listecat = new Categorie($db); print 'Catégories'; $htmls->select_array("catid", $listecat->liste_array()); - print ' '; + print ' '; print "
"; print "\n"; diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 0899b4ded0f..e841f1a0da0 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -236,7 +236,7 @@ if ($_GET["action"] == 'create') print ''; if($afaire <> 1) { - print ''; + print ''; } else { diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index 1c8d1599fad..2024452185d 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -96,13 +96,15 @@ if ($_GET["action"] == 'create') if ( $db->query($sql) ) { + $langs->load("companies"); + $i = 0 ; $numdest = $db->num_rows(); if ($numdest==0) { print 'Cette societe n\'a pas de contact, veuillez en créer un avant de faire votre proposition commerciale
'; - print 'Ajouter un contact'; + print ''.$langs->trans("AddContact").''; } else { diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 46d78d6d2e8..a8b256811cf 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -406,7 +406,7 @@ if ($_socid > 0) print ''; print ''; print ""; - print ""; + print ""; $sql = "SELECT p.idp, p.name, p.firstname, p.poste, p.phone, p.fax, p.email, p.note FROM ".MAIN_DB_PREFIX."socpeople as p WHERE p.fk_soc = $objsoc->id ORDER by p.datec"; $result = $db->query($sql); diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index dfdd45cccd9..393cfad66de 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -507,7 +507,7 @@ if ($_GET["propalid"]) print ''; print ''; print ''; - print ''; + print ''; print ''; /* @@ -519,7 +519,7 @@ if ($_GET["propalid"]) print ''; print ''; print ''; - print ''; + print ''; print "\n"; } print "
Ajouter
'.$langs->trans("Add").'
Prénom NomPosteTélFaxEmailid&action=create\">Ajouter
id&action=create\">".$langs->trans("Add")."
%
% 
"; diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php index 384668a199e..b4ec8afd73c 100644 --- a/htdocs/comm/prospect/fiche.php +++ b/htdocs/comm/prospect/fiche.php @@ -30,6 +30,9 @@ $user->getrights('fichinter'); $user->getrights('commande'); $user->getrights('projet'); +$langs->load('companies'); + + if ($_GET["action"] == 'cstc') { $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm = ".$_GET["stcomm"]; @@ -232,10 +235,10 @@ if ($socid > 0) */ print ''; - print ''; - print ''; - print ""; - print ""; + print ''; + print ''; + print ''; + print ""; $sql = "SELECT p.idp, p.name, p.firstname, p.poste, p.phone, p.fax, p.email, p.note FROM ".MAIN_DB_PREFIX."socpeople as p WHERE p.fk_soc = $societe->id ORDER by p.datec"; $result = $db->query($sql); diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 09639c5e20f..1d4412e63c1 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -653,14 +654,14 @@ else print ''; print ''; - print ''; + print ''; $var=!$var; print ""; print ''; print ''; print ''; - print ''; + print ''; print "\n"; print ""; diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index f49692b72be..d876ff7462d 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -293,7 +293,7 @@ if ($account > 0) print ''; print ''; print ''; - print ''; + print ''; print ''; } diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php index 19b22d60211..302beb7f8a4 100644 --- a/htdocs/compta/bank/categ.php +++ b/htdocs/compta/bank/categ.php @@ -81,7 +81,7 @@ if ($result) } print ""; print ""; -print ""; +print ""; print "
Prénom NomPosteTélFaxEmailid&action=create\">Ajouter
'.$langs->trans("Firstname").' '.$langs->trans("Name").'Poste'.$langs->trans("Tel").''.$langs->trans("Fax").''.$langs->trans("EMail").'id&action=create\">".$langs->trans("Add")."
 %
% 
YYYY MMDD Description0000.000000.00
 
trans("Add")."\"
"; diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 9a0ecdfbc61..2458dd88c2e 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -204,7 +204,7 @@ if ($result) print " "; - print ''; + print ''; print ""; print ""; diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php index 39f4eb87cb7..2a6f5184f9a 100644 --- a/htdocs/compta/bank/virement.php +++ b/htdocs/compta/bank/virement.php @@ -127,7 +127,8 @@ print "\n"; print ''; print ''; -print "".''; +print ""; +print ''; print ""; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 749a9a12184..085ffcc8102 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1041,7 +1041,7 @@ else print ''; print ''; print ' %'; - print ''; + print ''; if ($conf->service->enabled) { print ''; print 'Si produit de type service à durée limitée: Du '; diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php index e14300da6c8..2f6521d42f8 100644 --- a/htdocs/compta/fiche.php +++ b/htdocs/compta/fiche.php @@ -371,7 +371,7 @@ if ($socid > 0) print 'Prénom Nom'; print 'PosteTél'; print "FaxEmail"; - print "id."&action=create\">Ajouter"; + print "id."&action=create\">".$langs->trans("Add").""; $sql = "SELECT p.idp, p.name, p.firstname, p.poste, p.phone, p.fax, p.email, p.note FROM ".MAIN_DB_PREFIX."socpeople as p WHERE p.fk_soc = $societe->id ORDER by p.datec"; $result = $db->query($sql); diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index e6066e6e820..3a242a0dd64 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -220,7 +220,7 @@ if ($user->rights->compta->charges->creer) { print ''; print ' '; - print ''; + print ''; print ''; } diff --git a/htdocs/compta/voyage/index.php b/htdocs/compta/voyage/index.php index 6f8343747bb..dfc77e2e879 100644 --- a/htdocs/compta/voyage/index.php +++ b/htdocs/compta/voyage/index.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -122,7 +123,7 @@ if ($result) { print ""; - print ""; + print "trans("Add")."\""; print "Réduction"; print "'; - print ''; + print ''; print ""; print ""; } diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 0b9e80f5761..1f081248479 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -368,7 +368,7 @@ else $html->select_tva("tauxtva"); print ''; print ' '; - print ''; + print ''; print ""; print ""; } diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index 2f49b85a025..37efcbb1ce0 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -151,10 +151,11 @@ if ( $societe->fetch($socid) ) * Boutons Actions */ $langs->load("bills"); + $langs->load("companies"); print '
'; print ''.$langs->trans("CreateBill").''; - print 'Ajouter un contact'; + print ''.$langs->trans("AddContact").''; print '
'; @@ -167,7 +168,7 @@ if ( $societe->fetch($socid) ) print '
'; - print ""; + print ''; print ''; print ""; print ""; diff --git a/htdocs/fourn/people.php b/htdocs/fourn/people.php index b0ada3a6faf..0495ec48058 100644 --- a/htdocs/fourn/people.php +++ b/htdocs/fourn/people.php @@ -1,6 +1,7 @@ - * Copyright (C) 2003 Éric Seigne + * Copyright (C) 2003 Éric Seigne + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -164,10 +165,12 @@ if ($socid > 0) { if ($action == 'addcontact') { + $langs->load("companies"); + print "
"; print ""; print "
Prénom Nom
'.$langs->trans("FirstName").' '.$langs->trans("LastName").'Poste'.$langs->trans("Tel").'".$langs->trans("Fax")."".$langs->trans("EMail")."Ajouter
"; - print ""; + print ""; print ""; print ""; print ""; @@ -175,7 +178,7 @@ if ($socid > 0) { print ""; print ""; print "
Ajouter le contact
".$langs->trans("AddContact")."
NomPrenom
Poste
Fax
Email
"; - print ""; + print "trans("Add")."\">"; print ""; } /* diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 4721b406b70..c334acfe639 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -1,9 +1,11 @@ -# Dolibarr language file - fr_US - soc +# Dolibarr language file - en_US - soc NewCompany=New company (prospect, customer, supplier) Company=Company Companies=Companies Name=Name -Surname=Surname +LastName=Lastname +Firstname=Firstname +Surname=Surname/Pseudo Address=Addrese State=State Country=Country @@ -20,4 +22,5 @@ ProspectCustomer=Prospect / Customer Prospect=Prospect Customer=Customer Supplier=Supplier -CompanyList=Companies' list \ No newline at end of file +CompanyList=Companies' list +AddContact=Add new contact \ No newline at end of file diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index eb52360bd91..dd4adb6622a 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -8,6 +8,7 @@ Activate=Activate Activated=Activated Add=Add Delete=Delete +Remove=Remove Resiliate=Resiliate Cancel=Cancel Modify=Modify @@ -52,3 +53,4 @@ Second=Second Cut=Cut Copy=Copy Paste=Paste +Default=Default diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index 8290b9cbc0a..31e13b18a28 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -3,7 +3,9 @@ NewCompany=Nouvelle soci Company=Société Companies=Sociétés Name=Nom -Surname=Prénom +LastName=Nom +Firstname=Prénom +Surname=Surnom/Pseudo Address=Adresse State=Département/Province/Canton Country=Pays @@ -20,4 +22,5 @@ ProspectCustomer=Prospect / Client Prospect=Prospect Customer=Client Supplier=Fournisseur -CompanyList=Liste des sociétés \ No newline at end of file +CompanyList=Liste des sociétés +AddContact=Ajouter un contact \ No newline at end of file diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index babad3e5747..eb0fcb29371 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -8,6 +8,7 @@ Activate=Activer Activated=Activé Add=Ajouter Delete=Supprimer +Remove=Enlever Resiliate=Résilier Cancel=Annuler Modify=Modifier @@ -52,3 +53,4 @@ Second=Seconde Cut=Couper Copy=Copier Paste=Coller +Default=Defaut \ No newline at end of file diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index 0e767137829..f8d3bd81ee7 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -247,6 +247,9 @@ function dolibarr_print_phone($phone) } } +/*! + \brief Affiche logo fichier +*/ function img_file($alt = "default") { if ($alt="default") { @@ -256,6 +259,9 @@ function img_file($alt = "default") return ''.$alt.''; } +/*! + \brief Affiche logo nouveau fichier +*/ function img_file_new($alt = "default") { if ($alt="default") { @@ -265,7 +271,9 @@ function img_file_new($alt = "default") return ''.$alt.''; } - +/*! + \brief Affiche logo pdf +*/ function img_pdf($alt = "default") { if ($alt="default") { @@ -275,7 +283,32 @@ function img_pdf($alt = "default") return ''.$alt.''; } +/*! + \brief Affiche logo + +*/ +function img_edit_add($alt = "default") +{ + if ($alt="default") { + global $langs; + $alt=$langs->trans("Add"); + } + return ''.$alt.''; +} +/*! + \brief Affiche logo - +*/ +function img_edit_removed($alt = "default") +{ + if ($alt="default") { + global $langs; + $alt=$langs->trans("Remove"); + } + return ''.$alt.''; +} +/*! + \brief Affiche logo editer/modifier fiche +*/ function img_edit($alt = "default") { if ($alt="default") { @@ -285,6 +318,9 @@ function img_edit($alt = "default") return ''.$alt.''; } +/*! + \brief Affiche logo effacer +*/ function img_delete($alt = "default") { if ($alt="default") { @@ -294,6 +330,9 @@ function img_delete($alt = "default") return ''.$alt.''; } +/*! + \brief Affiche logo désactiver +*/ function img_disable($alt = "default") { if ($alt="default") { @@ -304,6 +343,17 @@ function img_disable($alt = "default") } +/*! + \brief Affiche logo info +*/ +function img_info($alt = "Informations") +{ + return ''.$alt.''; +} + +/*! + \brief Affiche logo warning +*/ function img_warning($alt = "default") { if ($alt="default") { @@ -313,11 +363,9 @@ function img_warning($alt = "default") return ''.$alt.''; } -function img_info($alt = "Informations") -{ - return ''.$alt.''; -} - +/*! + \brief Affiche logo alerte +*/ function img_alerte($alt = "default") { if ($alt="default") { @@ -327,7 +375,9 @@ function img_alerte($alt = "default") return ''.$alt.''; } - +/*! + \brief Affiche logo téléphone in +*/ function img_phone_in($alt = "default") { if ($alt="default") { @@ -337,6 +387,9 @@ function img_phone_in($alt = "default") return ''.$alt.''; } +/*! + \brief Affiche logo téléphone out +*/ function img_phone_out($alt = "default") { if ($alt="default") { @@ -346,7 +399,9 @@ function img_phone_out($alt = "default") return ''.$alt.''; } - +/*! + \brief Affiche logo suivant +*/ function img_next($alt = "default") { if ($alt="default") { @@ -356,6 +411,9 @@ function img_next($alt = "default") return ''.$alt.''; } +/*! + \brief Affiche logo précédent +*/ function img_previous($alt = "default") { if ($alt="default") { diff --git a/htdocs/product/album/fiche.php b/htdocs/product/album/fiche.php index 7c96a566fa8..b9a52fb7647 100644 --- a/htdocs/product/album/fiche.php +++ b/htdocs/product/album/fiche.php @@ -162,7 +162,7 @@ else print "Artiste/Groupe"; $htmls->select_array("ga", $ga->liste_array()); print ""; - print ' '; + print ' '; print ""; print ''; diff --git a/htdocs/product/categorie/fiche.php b/htdocs/product/categorie/fiche.php index a20f7553698..ffdd3add0b3 100644 --- a/htdocs/product/categorie/fiche.php +++ b/htdocs/product/categorie/fiche.php @@ -148,7 +148,7 @@ else print "Artiste/Groupe"; $htmls->select_array("ga", $ga->liste_array()); print ""; - print ' '; + print ' '; print ""; print ''; diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 227e1ba8fa6..c90b98d98c7 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -639,7 +639,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) print ' %'; print " ".$product->stock_proposition; print ''; - print ''; + print ''; print ""; print ''; $i++; @@ -666,7 +666,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) print ' Rem.'; print ' %'; print ''; - print ''; + print ''; print ''; print ''; } @@ -709,7 +709,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) print ' Rem.'; print ' %'; print ''; - print ''; + print ''; print ""; print ''; $i++; diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index c4114bed464..2d801743182 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -101,7 +102,7 @@ if ($_GET["id"]) print 'Statistiques'; print 'Prix de vente'.price($product->price).''; print ''; - print 'Fournisseurs [Ajouter]'; + print 'Fournisseurs ['.$langs->trans("Add").']'; $sql = "SELECT s.nom, s.idp"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."product_fournisseur as pf"; @@ -187,12 +188,12 @@ if ($_GET["id"]) } print ''; print ''; print 'Nb de pièce'; print ' '; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/soc.php b/htdocs/soc.php index c24520961e8..67a1f2d198c 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -334,7 +334,7 @@ else print ''.$langs->trans("Edit").''; - print 'Ajouter un contact'; + print ''.$langs->trans("AddContact").''; print ''; /* diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/fiche.php index 76b5322ead6..5ccc14351ca 100644 --- a/htdocs/societe/notify/fiche.php +++ b/htdocs/societe/notify/fiche.php @@ -211,7 +211,7 @@ if ( $soc->fetch($soc->id) ) print ''; $html->select_array("actionid",$actions); print ''; - print ''; + print ''; print ''; } diff --git a/htdocs/theme/eldy/img/edit_add.png b/htdocs/theme/eldy/img/edit_add.png new file mode 100755 index 00000000000..19c76cf0474 Binary files /dev/null and b/htdocs/theme/eldy/img/edit_add.png differ diff --git a/htdocs/theme/eldy/img/edit_remove.png b/htdocs/theme/eldy/img/edit_remove.png new file mode 100755 index 00000000000..30aa655c8e7 Binary files /dev/null and b/htdocs/theme/eldy/img/edit_remove.png differ diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index a76c99e03eb..33a44147665 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -219,7 +219,7 @@ else $oldmod = $obj->module; $var = !$var; } - print 'Ajouter'; + print ''.$langs->trans("Add").''; print ''.$obj->libelle . ''.$obj->module . ''; $i++;