lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trad: Encore de la traduction

Browse Source
This commit is contained in:
Laurent Destailleur 2004-10-29 22:17:32 +00:00
parent e5ccc155fd
commit fb1f14a0a8
7 changed files with 79 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
htdocs/comm/action/pre.inc.php
View File

@ -19,10 +19,17 @@
* $Source$
*
*/
/*! \file htdocs/admin/pre.inc.php
\brief Fichier gestionnaire du menu de gauche de l'espace configuration
\version $Revision$
*/
require("../../main.inc.php");
function llxHeader($head = "", $urlp = "") {
global $conf;
global $conf,$langs;
/*
*
@ -32,23 +39,37 @@ function llxHeader($head = "", $urlp = "") {
$menu = new Menu();
$menu->add(DOL_URL_ROOT."/comm/action/", "Actions");
$menu->add(DOL_URL_ROOT."/comm/action/", $langs->trans("Actions"));
$menu->add_submenu(DOL_URL_ROOT."/comm/action/?time=today", "Aujourd'hui");
$menu->add_submenu(DOL_URL_ROOT."/comm/action/?time=today", $langs->trans("Today"));
$menu->add(DOL_URL_ROOT."/comm/clients.php", "Clients");
if ($conf->societe->enabled) {
$langs->load("companies");
$menu->add_submenu(DOL_URL_ROOT."/comm/contact.php", "Contacts");
$menu->add(DOL_URL_ROOT."/comm/clients.php", $langs->trans("Customer"));
$menu->add(DOL_URL_ROOT."/comm/prospect/prospects.php", "Prospects");
$menu->add_submenu(DOL_URL_ROOT."/comm/contact.php", $langs->trans("Contacts"));
}
if ($conf->commercial->enabled) {
$langs->load("commercial");
$menu->add(DOL_URL_ROOT."/comm/propal.php", "Propales");
$menu->add(DOL_URL_ROOT."/comm/prospect/prospects.php", $langs->trans("Prospects"));
}
if ($conf->propal->enabled) {
$langs->load("propal");
$menu->add(DOL_URL_ROOT."/comm/propal.php", $langs->trans("Propales"));
}
if ($conf->projet->enabled) {
$menu->add(DOL_URL_ROOT."/projet/index.php", "Projets");
$langs->load("projects");
$menu->add(DOL_URL_ROOT."/projet/index.php", $langs->trans("Projects"));
}
$menu->add(DOL_URL_ROOT."/comm/action/rapport/", "Rapport");
$menu->add(DOL_URL_ROOT."/comm/action/rapport/", $langs->trans("Reporting"));
left_menu($menu->liste);

4
htdocs/comm/mailing.php
View File

@ -2,6 +2,7 @@
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Guillaume Delecourt <guillaume.delecourt@opensides.be>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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
@ -24,9 +25,9 @@
/*!
\file htdocs/comm/mailing.php
\ingroup
\brief Page pour faire des mailing
*/
require("./pre.inc.php");
$langs->load("admin");
@ -34,6 +35,7 @@ $langs->load("commercial");
$langs->load("users");
$langs->load("bills");
$langs->load("companies");
$langs->load("other");
/*
* Modules optionnels

62
htdocs/comm/propal.php
View File

@ -29,7 +29,10 @@
require("./pre.inc.php");
$langs->load("companies");
$user->getrights('propale');
if (!$user->rights->propale->lire)
accessforbidden();
@ -109,7 +112,7 @@ if ($_POST["action"] == 'add')
}
}
if ($action == 'pdf')
if ($_GET["action"] == 'pdf')
{
$propal = new Propal($db);
$propal->fetch($propalid);
@ -218,15 +221,13 @@ if ($_GET["valid"] == 1 && $user->rights->propale->valider)
}
llxHeader();
/******************************************************************************/
/* Fin des Actions */
/******************************************************************************/
/*
*
* Mode fiche
*
* Affichage fiche propal en mode visu
*
*/
if ($_GET["propalid"])
@ -244,10 +245,10 @@ if ($_GET["propalid"])
$h = 1;
$a = 0;
$head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?propalid='.$propal->id;
$head[$h][1] = "Note";
$head[$h][1] = $langs->trans("Note");
$h++;
$head[$h][0] = DOL_URL_ROOT.'/comm/propal/info.php?propalid='.$propal->id;
$head[$h][1] = "Info";
$head[$h][1] = $langs->trans("Info");
dolibarr_fiche_head($head, $a, $societe->nom);
@ -290,9 +291,9 @@ if ($_GET["propalid"])
print '<input type="hidden" name="action" value="setremise">';
}
print "<table class=\"border\" cellspacing=\"0\" cellpadding=\"2\" width=\"100%\">";
print "<table class=\"border\" width=\"100%\">";
print '<tr><td>Société</td><td colspan="3">';
print '<tr><td>'.$langs->trans("Companies").'</td><td colspan="3">';
if ($societe->client == 1)
{
$url ='fiche.php?socid='.$societe->id;
@ -304,7 +305,7 @@ if ($_GET["propalid"])
print '<a href="'.$url.'">'.$societe->nom.'</a></td>';
print '<td>'.$langs->trans("Status").'</td><td align="center"><b>'.$obj->lst.'</b></td></tr>';
print '<tr><td>Date</td><td colspan="3">'.strftime("%A %d %B %Y",$propal->date);
print '<tr><td>'.$langs->trans("Date").'</td><td colspan="3">'.strftime("%A %d %B %Y",$propal->date);
if ($propal->fin_validite)
{
print " (".strftime("%d %B %Y",$propal->fin_validite).")";
@ -318,13 +319,15 @@ if ($_GET["propalid"])
print "<tr><td>Destinataire</td><td colspan=\"3\">$obj->firstname $obj->name &lt;$obj->email&gt;</td>";
print '<td valign="top" colspan="2" width="50%" rowspan="5">Note :<br>'. nl2br($propal->note)."</td></tr>";
print '<td valign="top" colspan="2" width="50%" rowspan="5">'.$langs->trans("Note").' :<br>'. nl2br($propal->note)."</td></tr>";
if ($propal->projet_id)
{
$langs->load("projects");
$projet = new Project($db);
$projet->fetch($propal->projet_id);
print '<tr><td>Projet</td><td colspan="3">';
print '<tr><td>'.$langs->trans("Projects").'</td><td colspan="3">';
print '<a href="../projet/fiche.php?id='.$projet->id.'">';
print $projet->title.'</a></td></tr>';
}
@ -336,7 +339,7 @@ if ($_GET["propalid"])
{
print '<tr><td>Remise <a href="propal/aideremise.php?propalid='.$propal->id.'">?</a></td>';
print '<td align="right"><input type="text" name="remise" size="3" value="'.$propal->remise_percent.'">%</td>';
print '<td><input type="submit" value="Appliquer"></td>';
print '<td><input type="submit" value="'.$langs->trans("Save").'"></td>';
}
else
@ -349,8 +352,8 @@ if ($_GET["propalid"])
/*
*
*/
print '<tr><td>Montant HT</td><td align="right">'.price($obj->price + $obj->remise).' euros</td>';
print '<td align="right">TVA</td><td align="right">'.price($propal->total_tva).' euros</td></tr>';
print '<tr><td>'.$langs->trans("AmountHT").'</td><td align="right">'.price($obj->price + $obj->remise).' euros</td>';
print '<td align="right">'.$langs->trans("VAT").'</td><td align="right">'.price($propal->total_tva).' euros</td></tr>';
/*
*
@ -806,21 +809,12 @@ if ($_GET["propalid"])
}
else
{
print "Num rows = " . $db->num_rows();
print "<p><b>$sql";
dolibarr_print_error($db);
}
}
else
{
print $db->error();
print "<p><b>$sql";
}
/*
*
*
*
*/
} else {
}
else
{
/****************************************************************************
* *
* *
@ -937,7 +931,7 @@ if ($_GET["propalid"])
print " <a href=\"propal.php?year=$y&amp;month=$m\">";
print strftime("%B",$objp->dp)."</a>\n";
print " <a href=\"propal.php?year=$y\">";
print strftime("%Y",$objp->dp)."</a></TD>\n";
print strftime("%Y",$objp->dp)."</a></td>\n";
print "<td align=\"right\">".price($objp->price)."</td>\n";
print "<td align=\"center\">$objp->statut</td>\n";
@ -954,9 +948,11 @@ if ($_GET["propalid"])
}
else
{
print $db->error();
dolibarr_print_error($db);
}
}
$db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
?>

3
htdocs/langs/en_US/main.lang
View File

@ -141,4 +141,5 @@ Qty=Qty
ChangedBy=Changed by
ReCalculate=Rebuild
ResultOk=Success
ResultKo=Failure
ResultKo=Failure
Reporting=Reporting

11
htdocs/langs/en_US/other.lang
View File

@ -1,4 +1,13 @@
# Dolibarr language file - en_US - other
Calendar=Calendar
LoginWebcal=Login for Webcalendar
AddCalendarEntry=Add entry in calendar
AddCalendarEntry=Add entry in calendar
Mailing=Mailing
MailingDesc=This page allows you to send mailings to a group of people.
MailingResult=Sending mails result
MailFrom=Sender
MailReply=Reply to
MailTo=Receiver(s)
MailTopic=Subject
MailText=Message
MailFile=Attach a file

3
htdocs/langs/fr_FR/main.lang
View File

@ -142,4 +142,5 @@ Qty=Qt
ChangedBy=Modifié par
ReCalculate=Re-calculer
ResultOk=Succès
ResultKo=Echec
ResultKo=Echec
Reporting=Rapports

5
htdocs/langs/fr_FR/other.lang
View File

@ -2,11 +2,12 @@
Calendar=Calendrier
LoginWebcal=Login Webcalendar
AddCalendarEntry=Ajouter entrée dans le calendrier
MailingDesc=Cette écran vous permet d'envoyer des mailing à un groupe de personne.
Mailing=Mailing
MailingDesc=Cet écran vous permet d'envoyer des mailing à un groupe de personne.
MailingResult=Résultat de l'envoi du mailing
MailFrom=Emetteur
MailReply=Répondre à
MailTo=Destinataire(s)
MailTopic=Sujet
MailText=Message
MailFile=Joindre un fichier
MailFile=Joindre un fichier