diff --git a/htdocs/comm/pre.inc.php b/htdocs/comm/pre.inc.php index 6154e863e8c..e84fd4969c2 100644 --- a/htdocs/comm/pre.inc.php +++ b/htdocs/comm/pre.inc.php @@ -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); diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 0c5b3b4d0c3..2143bbc3eb8 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -402,10 +402,7 @@ if ($_GET["propalid"]) print ""; print ''.$langs->trans("Ref").''.$langs->trans("ProductOrService").''; print ''.$langs->trans("VAT").''.$langs->trans("Qty").'RemiseP.U.'; - if ($propal->statut == 0) - { - print " "; - } + print " "; print "\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 ''; } + else { + print ' '; + } print ""; $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 " \n"; print ''.$objp->description.''; @@ -467,36 +468,33 @@ if ($_GET["propalid"]) } else { - print '-'; + print ' '; } print ""; $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 = ""; $num = $db->num_rows(); $i = 0; while ($i < $num) - { + { $objp = $db->fetch_object($result); $opt .= "\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 " "; + print " "; print ''; print ' %'; print ' '; print ''; print "\n"; } + print ""; print '
'; + } + print ''; + + /* * Barre d'actions */ @@ -552,7 +555,7 @@ if ($_GET["propalid"]) { if ($user->rights->propale->creer) { - print "id&action=modif\">".$langs->trans("Save").""; + print "id&action=modif\">".$langs->trans("Edit").""; } } @@ -585,9 +588,6 @@ if ($_GET["propalid"]) } } - print ""; - } - // Close if ($propal->statut != 0) { @@ -597,6 +597,10 @@ if ($_GET["propalid"]) } } + print ""; + + } + /* diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index aa24ff9de50..4fe3eda2267 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -142,4 +142,6 @@ ChangedBy=Changed by ReCalculate=Rebuild ResultOk=Success ResultKo=Failure -Reporting=Reporting \ No newline at end of file +Reporting=Reporting +Drafts=Drafts +Opened=Ouverts \ No newline at end of file diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index ac80404b179..b8cd83c64ac 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -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 diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 37ca4b074f6..6bb1a3b2153 100755 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - projects Project=Project Projects=Projects -NewProject=New project \ No newline at end of file +NewProject=New project +AddProject=Créer projet \ No newline at end of file diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index 056712badef..11ac027834f 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/htdocs/langs/en_US/propal.lang @@ -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 ? diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 16a1c28d255..c430b0bc07c 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -143,4 +143,6 @@ ChangedBy=Modifi ReCalculate=Re-calculer ResultOk=Succès ResultKo=Echec -Reporting=Rapports \ No newline at end of file +Reporting=Rapports +Drafts=Brouillons +Opened=Ouverts \ No newline at end of file diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang index e881230277a..8dc4ddc4c10 100644 --- a/htdocs/langs/fr_FR/products.lang +++ b/htdocs/langs/fr_FR/products.lang @@ -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 diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang index 30457f8257f..a5395643768 100755 --- a/htdocs/langs/fr_FR/projects.lang +++ b/htdocs/langs/fr_FR/projects.lang @@ -1,4 +1,5 @@ # Dolibarr language file - fr_FR - projects Project=Projet Projects=Projets -NewProject=Nouveau projet \ No newline at end of file +NewProject=Nouveau projet +AddProject=Créer projet \ No newline at end of file diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang index 84abd1806ed..622a54f913d 100644 --- a/htdocs/langs/fr_FR/propal.lang +++ b/htdocs/langs/fr_FR/propal.lang @@ -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