diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 533b48ab6af..0ff2f4acd8c 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -552,7 +552,7 @@ print '
'; if ($user->admin) { - print "Editer"; + print "".$langs->trans("Edit").""; if ($adh->statut < 1) { diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index 6f5ea8f18c4..91fbc46b1cf 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -104,7 +104,7 @@ else // Boutons d'action print '
'; - print 'Editer'; + print ''.$langs->trans("Edit").''; print '
'; diff --git a/htdocs/boutique/auteur/fiche.php b/htdocs/boutique/auteur/fiche.php index 25d29e4f74e..719a73fe6f0 100644 --- a/htdocs/boutique/auteur/fiche.php +++ b/htdocs/boutique/auteur/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 @@ -180,32 +181,19 @@ else /* */ /* ************************************************************************** */ -print '
'; + print '
'; -if ($action == 'create') -{ - print '
'; -} -else -{ - print ''; -} - -print ''; -print ''; -print ''; - -if(sizeof($livres)==0 && $id) -{ - print ''; -} -else -{ - print ''; -} - -print '
-[Editer]---[Supprimer][Supprimer]

'; + if ($action != 'create') + { + print ''.$langs->trans("Edit").''; + } + + if(sizeof($livres)==0 && $id) + { + print ''.$langs->trans("Delete").''; + } + print '
'; $db->close(); diff --git a/htdocs/boutique/editeur/fiche.php b/htdocs/boutique/editeur/fiche.php index 7c83d06fe29..995cf7928a8 100644 --- a/htdocs/boutique/editeur/fiche.php +++ b/htdocs/boutique/editeur/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 @@ -177,33 +178,17 @@ else /* */ /* ************************************************************************** */ -print '
'; - -if ($action == 'create') +print '
'; +if ($action != 'create') { - print '
'; + print ''.$langs->trans("Edit").''; } -else -{ - print ''; -} - -print ''; -print ''; -print ''; if(sizeof($livres)==0 && $id) { - print ''; + print ''.$langs->trans("Delete").''; } -else -{ - print ''; -} - - -print '
-[Editer]---[Supprimer][Supprimer]

'; - +print ''; $db->close(); diff --git a/htdocs/boutique/livre/fiche.php b/htdocs/boutique/livre/fiche.php index 5054ede3473..a348179526c 100644 --- a/htdocs/boutique/livre/fiche.php +++ b/htdocs/boutique/livre/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 @@ -426,23 +427,14 @@ else /* */ /* ************************************************************************** */ -print '
'; - -if ($action == 'create') +print '
'; +if ($action != 'create') { - print '
'; -} -else -{ - print ''; + print ''.$langs->trans("Edit").''; } -print ''; -//print ''; -print ''; -print ''; -print ''; -print '
-[Editer]-[Update Osc]--[Supprimer]

'; +print ''.$langs->trans("Delete").''; +print ''; $db->close(); diff --git a/htdocs/boutique/newsletter/fiche.php b/htdocs/boutique/newsletter/fiche.php index ad539297822..af278037f24 100644 --- a/htdocs/boutique/newsletter/fiche.php +++ b/htdocs/boutique/newsletter/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 @@ -256,53 +257,27 @@ else /* */ /* ************************************************************************** */ -print '
'; - -if ($action == 'create') +print '
'; +if ($newsletter->status == 0) { - print '
'; -} -elseif ($newsletter->status == 0) -{ - print ''; -} -else -{ - print ''; + print ''.$langs->trans("Edit").''; } if ($newsletter->status == 0 && $id) { - print ''; -} -else -{ - print ''; + print ''.$langs->trans("Valid").''; } if ($newsletter->status == 1) { - print ''; + print ''.$langs->trans("Send").''; } -else -{ - print ''; -} - -print ''; if($id && $newsletter->status == 0) { - print ''; + print ''.$langs->trans("Delete").''; } -else -{ - print ''; -} - - -print '
-[Editer]-[Valider]-[Envoyer]--[Supprimer]-

'; - +print ''; $db->close(); diff --git a/htdocs/boutique/notification/fiche.php b/htdocs/boutique/notification/fiche.php index ac51bcac6d1..995037caf2d 100644 --- a/htdocs/boutique/notification/fiche.php +++ b/htdocs/boutique/notification/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 @@ -127,22 +128,13 @@ else /* */ /* ************************************************************************** */ -print '
'; -print ''; -print ''; -print ''; -if ($action == 'create') +print '
'; +if ($action != 'create') { - print '
'; + print ''.$langs->trans("Edit").''; } -else -{ - print ''; -} -print ''; -print '
----[Editer]-

'; - +print ''; $db->close(); diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index a90394db214..0899b4ded0f 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/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 @@ -362,14 +363,14 @@ if ($_GET["id"]) if ($_GET["action"] == 'edit') { - print 'Annuler'; + print ''.$langs->trans("Cancel").''; } else { - print 'Editer'; + print ''.$langs->trans("Edit").''; } - print 'Supprimer'; + print ''.$langs->trans("Delete").''; print ''; } diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php index 22e996ee903..ffdc2d3a616 100644 --- a/htdocs/comm/propal/note.php +++ b/htdocs/comm/propal/note.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 @@ -131,7 +132,7 @@ if ($_GET["propalid"]) if ($user->rights->propale->creer && $_GET["action"] <> 'edit') { - print "id&action=edit\">Editer"; + print "id&action=edit\">".$langs->trans("Edit").""; } print ""; diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index c5756f289de..e4a7a76b4db 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -222,7 +222,7 @@ else if ($user->admin) { - print 'Editer'; + print ''.$langs->trans("Edit").''; } print ''; diff --git a/htdocs/compta/charges/fiche.php b/htdocs/compta/charges/fiche.php deleted file mode 100644 index c50ade8c70a..00000000000 --- a/htdocs/compta/charges/fiche.php +++ /dev/null @@ -1,221 +0,0 @@ - - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ - * - */ - -require("./pre.inc.php"); -require("../service.class.php"); - -llxHeader(); - -$user->getrights('compta'); - -if (!$user->admin && !$user->rights->compta->charges) - accessforbidden(); - -if ($action == 'add') { - $service = new Service($db); - - $service->ref = $ref; - $service->libelle = $label; - $service->price = $price; - $service->description = $desc; - - $id = $service->create($user); - - if ($comm_now && $id) { - $service->start_comm($id, $user); - } - -} - -if ($action == 'set_datedeb') { - $service = new Service($db); - $service->start_comm($id, $user->id, $datedeb); -} -if ($action == 'set_datefin') { - $service = new Service($db); - $service->stop_comm($id, $user->id, $datefin); -} - -if ($action == 'update') { - $service = new Service($db); - - $service->ref = $ref; - $service->libelle = $label; - $service->price = $price; - $service->description = $desc; - - $service->update($id, $user); -} - - -if ($action == 'create') { - - print_titre("Nouveau service"); - print '
'; - print ''; - print ''; - - print ''; - print ''; - - print ''; - print ''; - - print ''; - print ''; - - print '"; - - print ''; - print ''; - - print ''; - print ''; - print '
Référence
Libelle
Prix
Description'; - print "
Commercialisé
'; - -} else { - - if ($id) { - - $service = new Service($db); - $service->fetch($id); - - print '
Fiche service

'; - - print ''; - - print ''; - print ''; - print ''; - print ''; - - print ''; - print ''; - print ''; - print ''; - - print ''; - print ''; - - print ''; - - if ($service->fin_epoch < time()) { - print ''; - } else { - print ''; - } - - print '
Référence'.$service->ref.'Créé le'.$service->tms.'
Libelle'.$service->libelle.'Début comm'.$service->debut.'
Prix'.price($service->price).'Fin comm'.$service->fin.' 
'.$service->fin.' 
Description'; - print nl2br($service->description); - print '
'; - - - print '
'; - - print ''; - - print ''; - - print ''; - print ''; - print ''; - - print '
-[Editer][Date de debut][Date de fin]-

'; - - - /* - * - * - * - */ - if ($action == 'datedeb') { - print '

Affectation de la date de début de commercialisation

'; - print '
'; - print ''; - print ''; - print ''; - print ''; - print ''; - print '
Date de debut de commercialisation

'; - } - /* - * - * - * - */ - if ($action == 'datefin') { - print '

Affectation de la date de fin de commercialisation

'; - print '
'; - print ''; - print ''; - print ''; - print ''; - print ''; - print '
Date de fin de commercialisation

'; - } - /* - * - * Mode edition - * - */ - - if ($action == 'edit') { - print '
Editer la fiche service

'; - print '
'; - print ''; - print ''; - - print ''; - print ''; - - print ''; - print ''; - - print ''; - print ''; - - print '"; - - print ''; - print ''; - print '
Référence
Libelle
Prix
Description'; - print "
'; - } - - - } - -} - - - -$db->close(); - -llxFooter("Dernière modification $Date$ révision $Revision$"); -?> diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index 9dfa6fbebd2..d3a6715fe80 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -206,8 +206,8 @@ print '
'; if ($_GET["action"] != 'create') { - print 'Editer'; - print 'Supprimer'; + print ''.$langs->trans('Edit').''; + print ''.$langs->trans('Delete').''; } print '
'; diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index 2e0d732d644..3c563fd49b0 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/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 @@ -251,7 +252,7 @@ if ($rowid > 0 && $action == 'edit') * Case 1 */ - print '[Editer]'; + print '['.$langs->trans('Edit').']'; /* * Case 2 diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php index b094396b35a..eca37697f0f 100644 --- a/htdocs/compta/facture/note.php +++ b/htdocs/compta/facture/note.php @@ -136,7 +136,7 @@ if ($_GET["facid"]) if ($user->rights->facture->creer && $_GET["action"] <> 'edit') { - print "id&action=edit\">Editer"; + print "id&action=edit\">".$langs->trans('Edit').""; } print ""; diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index 9deb696e7a4..e6066e6e820 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -170,7 +170,7 @@ if ( $db->query($sql) ) print 'Impayé'; print ''; if ($user->rights->compta->charges->creer) { - print ''.img_edit().''; + print ''.img_edit().''; } if ($user->rights->compta->charges->supprimer) { print '   '.img_delete().''; diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 0fffd00604b..f5ca1417d88 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -331,14 +331,14 @@ else print ""; + // Barre d'actions if ($user->societe_id == 0) { print '
'; - print 'Editer'; - - print 'Supprimer'; + print ''.$langs->trans('Edit').''; + print ''.$langs->trans('Delete').''; if ($contact->user_id == 0 && $user->admin) { diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index 8a2e14f942b..6bc82cd7702 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -141,13 +141,14 @@ else print "
"; + // Barre d'actions if ($user->societe_id == 0) { print '
'; - print 'Editer'; + print ''.$langs->trans('Edit').''; - print 'Supprimer'; + print ''.$langs->trans('Delete').''; print "
"; } diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index b9640d72d8c..0b9e80f5761 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -548,13 +548,13 @@ else } else { - print 'Editer'; + print ''.$langs->trans('Edit').''; } } if ($fac->statut == 1 && price($resteapayer) <= 0 && $fac->paye == 0 && $user->societe_id == 0) { - print "id&action=payed\">Classer 'Payée'"; + print "id&action=payed\">".$langs->trans('ClassifyPayed').""; } if ($user->societe_id == 0) @@ -562,11 +562,11 @@ else if ($fac->statut == 0) { if ($_GET["action"] <> "edit") - print "id&action=valid\">Valider"; + print "id&action=valid\">".$langs->trans('Valid').""; } else { - print "id&action=copy&socid=$fac->socidp\">Copier"; + print "id&action=copy&socid=$fac->socidp\">".$langs->trans('Copy').""; } } diff --git a/htdocs/postnuke/articles/fiche.php b/htdocs/postnuke/articles/fiche.php index 0ae83906c52..875ad71dbe1 100644 --- a/htdocs/postnuke/articles/fiche.php +++ b/htdocs/postnuke/articles/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 @@ -119,22 +120,12 @@ if ($id) /* */ /* ************************************************************************** */ -print '
'; - -if ($action == 'create') +print '
'; +if ($action != 'create') { - print '
'; + print ''.$langs->trans('Edit').''; } -else -{ - print ''; -} - -print ''; -print ''; -print ''; -print ''; -print '
-[Editer]----

'; +print ''; $db->close(); diff --git a/htdocs/product/album/fiche.php b/htdocs/product/album/fiche.php index 2eac495fb26..7c96a566fa8 100644 --- a/htdocs/product/album/fiche.php +++ b/htdocs/product/album/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 @@ -200,7 +201,7 @@ if ($action == 'create') } else { - print '[Editer]'; + print '['.$langs->trans("Edit").']'; } print '-'; print '
'; diff --git a/htdocs/product/categorie/fiche.php b/htdocs/product/categorie/fiche.php index a7ed8808718..a20f7553698 100644 --- a/htdocs/product/categorie/fiche.php +++ b/htdocs/product/categorie/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 @@ -178,7 +179,7 @@ if ($action == 'create') } else { - print '[Editer]'; + print '['.$langs->trans("Edit").']'; } print '-'; print '
'; diff --git a/htdocs/product/concert/fiche.php b/htdocs/product/concert/fiche.php index f9b246f4143..fb0b5fd418f 100644 --- a/htdocs/product/concert/fiche.php +++ b/htdocs/product/concert/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 @@ -172,7 +173,7 @@ if ($action == 'create') } else { - print '[Editer]'; + print '['.$langs->trans("Edit").']'; } print '-'; print '
'; diff --git a/htdocs/product/concert/fichelieu.php b/htdocs/product/concert/fichelieu.php index 0e8dd83b4d9..6fd594d072c 100644 --- a/htdocs/product/concert/fichelieu.php +++ b/htdocs/product/concert/fichelieu.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 @@ -140,7 +141,7 @@ if ($action == 'create') } else { - print '[Editer]'; + print '['.$langs->trans("Edit").']'; } print '-'; print '
'; diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 4ac562c6384..227e1ba8fa6 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/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 @@ -583,7 +584,7 @@ if ($_GET["action"] == '') { if ($user->rights->produit->modifier || $user->rights->produit->creer) { - print 'Editer'; + print ''.$langs->trans("Edit").''; } } if ($product->type == 0 && defined("MAIN_MODULE_STOCK")) diff --git a/htdocs/product/groupart/fiche.php b/htdocs/product/groupart/fiche.php index ab78bc4b5ef..83a8904d8fc 100644 --- a/htdocs/product/groupart/fiche.php +++ b/htdocs/product/groupart/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 @@ -152,7 +153,7 @@ if ($action == 'create') } else { - print '[Editer]'; + print '['.$langs->trans("Edit").']'; } print '-'; print '
'; diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php index dbc7c29784a..da9c63e97df 100644 --- a/htdocs/product/stock/fiche.php +++ b/htdocs/product/stock/fiche.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur + * 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 @@ -182,7 +182,7 @@ if ($action == '' && ($user->rights->produit->modifier || $user->rights->produit if ($action == '') { - print "id\">Editer"; + print "id\">".$langs->trans("Edit").""; } print ""; diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php index 5c69369b808..51fb1e243ed 100644 --- a/htdocs/projet/fiche.php +++ b/htdocs/projet/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 @@ -164,10 +165,10 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer) } else { - print 'Editer'; + print ''.$langs->trans("Edit").''; } - print 'Supprimer'; + print ''.$langs->trans("Delete").''; print ""; } diff --git a/htdocs/soc.php b/htdocs/soc.php index d519983b8bf..c24520961e8 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -332,7 +332,7 @@ else */ print '
'; - print 'Editer'; + print ''.$langs->trans("Edit").''; print 'Ajouter un contact'; diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 333dbe5f568..a76c99e03eb 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -366,7 +366,7 @@ else if ($user->admin) { - print 'Editer'; + print ''.$langs->trans("Edit").''; } if ($user->id == $id or $user->admin)