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

Trad: Traductions sur propals et menu espace commercial

Browse Source
This commit is contained in:
Laurent Destailleur 2004-11-07 15:45:38 +00:00
parent 4aaffd9264
commit cb4dcbe582
10 changed files with 76 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
htdocs/comm/pre.inc.php
View File

@ -20,45 +20,53 @@
* $Source$
*
*/
/*! \file htdocs/comm/pre.inc.php
\ingroup commercial
\brief Fichier de gestion du menu gauche de l'espace commercial
\version $Revision$
*/
require("../main.inc.php");
function llxHeader($head = "", $urlp = "") {
global $user, $conf, $langs;
/*
*
*
*/
top_menu($head);
$menu = new Menu();
$menu->add(DOL_URL_ROOT."/comm/clients.php", "Clients");
$menu->add(DOL_URL_ROOT."/comm/clients.php", $langs->trans("Customers"));
$menu->add_submenu(DOL_URL_ROOT."/comm/contact.php?type=c", "Contacts");
$menu->add_submenu(DOL_URL_ROOT."/comm/contact.php?type=c", $langs->trans("Contacts"));
$menu->add(DOL_URL_ROOT."/comm/prospect/prospects.php", "Prospects");
$menu->add(DOL_URL_ROOT."/comm/prospect/prospects.php", $langs->trans("Prospects"));
$menu->add_submenu(DOL_URL_ROOT."/comm/contact.php?type=p", "Contacts");
$menu->add_submenu(DOL_URL_ROOT."/comm/contact.php?type=p", $langs->trans("Contacts"));
$menu->add(DOL_URL_ROOT."/comm/action/index.php", $langs->trans("Actions"));
$menu->add(DOL_URL_ROOT."/comm/action/index.php", "Actions");
if ($conf->propal->enabled && $user->rights->propale->lire)
{
$menu->add(DOL_URL_ROOT."/comm/propal.php", "Prop. commerciales");
$menu->add_submenu("propal.php?viewstatut=0", "Brouillons");
$menu->add_submenu("propal.php?viewstatut=1", "Ouvertes");
$langs->load("propal");
$menu->add(DOL_URL_ROOT."/comm/propal.php", $langs->trans("Prop"));
$menu->add_submenu("propal.php?viewstatut=0", $langs->trans("Drafts"));
$menu->add_submenu("propal.php?viewstatut=1", $langs->trans("Opened"));
$menu->add_submenu("./propal/stats/", $langs->trans("Statistics"));
}
if ($conf->contrat->enabled)
{
$menu->add(DOL_URL_ROOT."/contrat/index.php", "Contrats");
$langs->load("contracts");
$menu->add(DOL_URL_ROOT."/contrat/index.php", $langs->trans("Contracts"));
}
if ($conf->commande->enabled )
{
$menu->add(DOL_URL_ROOT."/commande/index.php", "Commandes");
$langs->load("orders");
$menu->add(DOL_URL_ROOT."/commande/index.php", $langs->trans("Orders"));
}
if ($conf->fichinter->enabled )
@ -68,16 +76,18 @@ function llxHeader($head = "", $urlp = "") {
if ($conf->produit->enabled || $conf->service->enabled)
{
$chaine="";
if ($conf->produit->enabled) { $chaine.="Produits"; }
$langs->load("products");
$chaine="";
if ($conf->produit->enabled) { $chaine.=$langs->trans("Products"); }
if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; }
if ($conf->service->enabled) { $chaine.="Services"; }
if ($conf->service->enabled) { $chaine.=$langs->trans("Services"); }
$menu->add(DOL_URL_ROOT."/product/index.php", "$chaine");
}
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"));
}
left_menu($menu->liste);

54
htdocs/comm/propal.php
View File

@ -402,10 +402,7 @@ if ($_GET["propalid"])
print "<tr class=\"liste_titre\">";
print '<td>'.$langs->trans("Ref").'</td><td>'.$langs->trans("ProductOrService").'</td>';
print '<td align="center">'.$langs->trans("VAT").'</td><td align="center">'.$langs->trans("Qty").'</td><td align="center">Remise</td><td align="right">P.U.</td>';
if ($propal->statut == 0)
{
print "<td>&nbsp;</td>";
}
print "<td>&nbsp;</td>";
print "</tr>\n";
$sql = "SELECT pt.rowid, p.label as product, p.ref, pt.price, pt.qty, p.rowid as prodid, pt.tva_tx, pt.remise_percent, pt.subprice";
@ -436,6 +433,9 @@ if ($_GET["propalid"])
print img_delete();
print '</a></td>';
}
else {
print '<td>&nbsp;</td>';
}
print "</tr>";
$i++;
@ -445,13 +445,14 @@ if ($_GET["propalid"])
$sql = "SELECT pt.rowid, pt.description, pt.price, pt.qty, pt.tva_tx, pt.remise_percent, pt.subprice";
$sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pt WHERE pt.fk_propal = $propal->id AND pt.fk_product = 0";
if ($db->query($sql))
$result = $db->query($sql);
if ($result)
{
$num = $db->num_rows();
$i = 0;
while ($i < $num)
{
$objp = $db->fetch_object();
{
$objp = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]><td>&nbsp;</td>\n";
print '<td>'.$objp->description.'</td>';
@ -467,36 +468,33 @@ if ($_GET["propalid"])
}
else
{
print '<td>-</td>';
print '<td>&nbsp;</td>';
}
print "</tr>";
$i++;
}
}
}
if ($propal->statut == 0 && $user->rights->propale->creer)
{
$sql = "SELECT p.rowid,p.label,p.ref,p.price FROM ".MAIN_DB_PREFIX."product as p WHERE p.envente=1 ORDER BY p.nbvente DESC LIMIT 20";
// RyXéo on a ORDER BY p.ref et pas de limit
$result = $db->query($sql);
if ($result)
{
$opt = "<option value=\"0\" selected></option>";
$num = $db->num_rows(); $i = 0;
while ($i < $num)
{
{
$objp = $db->fetch_object($result);
$opt .= "<option value=\"$objp->rowid\">[$objp->ref] ".substr($objp->label,0,40)."</option>\n";
$i++;
}
}
$db->free();
}
else
{
dolibarr_print_error($db);
}
}
$db->free();
}
else
{
dolibarr_print_error($db);
}
/*
* Ligne d'ajout de produits/services personalisé
@ -518,18 +516,23 @@ if ($_GET["propalid"])
* Ligne d'ajout de produits/services prédéfinis
*/
$var=!$var;
print "<tr $bc[$var]><td>&nbsp;</td><td colspan=\"2\"><select name=\"idprod\">$opt</select></td>";
print "<tr $bc[$var]><td>&nbsp;</td><td colspan=\"2\"><select name=\"idprod\">".$opt."</select></td>";
print '<td align="center"><input type="text" size="3" name="qty" value="1"></td>';
print '<td align="center"><input type="text" size="3" name="remise" value="'.$societe->remise_client.'"> %</td>';
print '<td>&nbsp;</td>';
print '<td align="center"><input type="submit" value="'.$langs->trans("Add").'" name="addligne"></td>';
print "</tr>\n";
}
print "</table>";
print '</form><br>';
}
print '</div>';
/*
* Barre d'actions
*/
@ -552,7 +555,7 @@ if ($_GET["propalid"])
{
if ($user->rights->propale->creer)
{
print "<a class=\"tabAction\" href=\"propal.php?propalid=$propal->id&amp;action=modif\">".$langs->trans("Save")."</a>";
print "<a class=\"tabAction\" href=\"propal.php?propalid=$propal->id&amp;action=modif\">".$langs->trans("Edit")."</a>";
}
}
@ -585,9 +588,6 @@ if ($_GET["propalid"])
}
}
print "</div>";
}
// Close
if ($propal->statut != 0)
{
@ -597,6 +597,10 @@ if ($_GET["propalid"])
}
}
print "</div>";
}
/*

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

@ -142,4 +142,6 @@ ChangedBy=Changed by
ReCalculate=Rebuild
ResultOk=Success
ResultKo=Failure
Reporting=Reporting
Reporting=Reporting
Drafts=Drafts
Opened=Ouverts

1
htdocs/langs/en_US/products.lang
View File

@ -7,6 +7,7 @@ NewProduct=New product
NewService=New service
ProductCode=Product code
ServiceCode=Service code
ProductOrService=Product or Service
ProductsAndServices=Products and Services
ProductsAndServicesOnSell=Products and Services on sell
ProductsAndServicesNotOnSell=Products and Services out of sell

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

@ -1,4 +1,5 @@
# Dolibarr language file - en_US - projects
Project=Project
Projects=Projects
NewProject=New project
NewProject=New project
AddProject=Créer projet

8
htdocs/langs/en_US/propal.lang
View File

@ -1,6 +1,8 @@
# Dolibarr language file - en_US - propal
Prop=Commercial proposal
NewProp=New commercial proposal
Prospect=Prospect
ProspectList=Prospect list
DeleteProp=Delete proposition
AddProp=Add a proposition
ConfirmDeleteProp=Are you sure you want to delete this proposition ?
DeleteProp=Delete commercial proposal
AddProp=Add proposal
ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ?

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

@ -143,4 +143,6 @@ ChangedBy=Modifi
ReCalculate=Re-calculer
ResultOk=Succès
ResultKo=Echec
Reporting=Rapports
Reporting=Rapports
Drafts=Brouillons
Opened=Ouverts

1
htdocs/langs/fr_FR/products.lang
View File

@ -7,6 +7,7 @@ NewProduct=Nouveau produit
NewService=Nouveau service
ProductCode=Code produit
ServiceCode=Code service
ProductOrService=Produit ou Service
ProductsAndServices=Produits et Services
ProductsAndServicesOnSell=Produits et Services en vente
ProductsAndServicesNotOnSell=Produits et Services hors vente

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

@ -1,4 +1,5 @@
# Dolibarr language file - fr_FR - projects
Project=Projet
Projects=Projets
NewProject=Nouveau projet
NewProject=Nouveau projet
AddProject=Créer projet

2
htdocs/langs/fr_FR/propal.lang
View File

@ -1,4 +1,6 @@
# Dolibarr language file - fr_FR - propal
Prop=Proposition commerciale
NewProp=Nouvelle proposition commerciale
Prospect=Prospect
ProspectList=Liste des prospects
DeleteProp=Effacer une action