diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 0d420fec720..904f40937bd 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -594,7 +594,17 @@ if ($_GET["action"] == 'create' && ($user->rights->produit->creer || $user->righ } } - llxHeader("","",$langs->trans("CardProduct".$product->type)); + $helpurl=''; + if (isset($_GET["type"]) && $_GET["type"] == 0) + { + $helpurl='EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos'; + } + if (isset($_GET["type"]) && $_GET["type"] == 1) + { + $helpurl='EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios'; + } + + llxHeader("",$helpurl,$langs->trans("CardProduct".$product->type)); if ($mesg) print $mesg."\n"; diff --git a/htdocs/product/index.php b/htdocs/product/index.php index bb691281abd..ee9e96f8457 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -39,11 +39,22 @@ $staticproduct=new Product($db); * View */ -$transAreaType = $langs->trans("ProductsAndServicesArea"); -if (isset($_GET["type"]) && $_GET["type"] == 0) $transAreaType = $langs->trans("ProductsArea"); -if (isset($_GET["type"]) && $_GET["type"] == 1) $transAreaType = $langs->trans("ServicesArea"); -llxHeader("","",$langs->trans("ProductsAndServices")); + +$transAreaType = $langs->trans("ProductsAndServicesArea"); +$helpurl=''; +if (isset($_GET["type"]) && $_GET["type"] == 0) +{ + $transAreaType = $langs->trans("ProductsArea"); + $helpurl='EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos'; +} +if (isset($_GET["type"]) && $_GET["type"] == 1) +{ + $transAreaType = $langs->trans("ServicesArea"); + $helpurl='EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios'; +} + +llxHeader("",$helpurl,$langs->trans("ProductsAndServices")); print_fiche_titre($transAreaType); diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php index c3321c1a6d4..0fac3a39e26 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/liste.php @@ -55,6 +55,7 @@ $page = $_GET["page"]; $limit = $conf->liste_limit; $offset = $limit * $page ; + /* * Actions */ @@ -72,9 +73,9 @@ if ($conf->categorie->enabled && isset($_REQUEST['catid'])) } + /* - * Affichage mode liste - * + * View */ if ($_GET["canvas"] <> '' && file_exists('templates/product.'.$_GET["canvas"].'.class.php') ) @@ -172,7 +173,17 @@ if ($resql) $envente = (isset($_GET["envente"])?$_GET["envente"]:$_POST["envente"]); } - llxHeader("","",$texte); + $helpurl=''; + if (isset($_GET["type"]) && $_GET["type"] == 0) + { + $helpurl='EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos'; + } + if (isset($_GET["type"]) && $_GET["type"] == 1) + { + $helpurl='EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios'; + } + + llxHeader("",$helpurl,$texte); // Displays product removal confirmation if (!empty($_GET['delprod'])) @@ -195,7 +206,7 @@ if ($resql) } if ($conf->droitpret->enabled && isset($_GET["canvas"])) - { + { $smarty->assign('datas', $object->list_datas); $smarty->assign('url_root', $dolibarr_main_url_root); $smarty->assign('theme', $conf->theme); @@ -222,7 +233,7 @@ if ($resql) $smarty->template_dir = DOL_DOCUMENT_ROOT . '/core/templates/'; $template = 'error.tpl'; } - + $smarty->display($template); } else diff --git a/htdocs/product/pre.inc.php b/htdocs/product/pre.inc.php index 823feed3fe4..8f3da1ecaa0 100644 --- a/htdocs/product/pre.inc.php +++ b/htdocs/product/pre.inc.php @@ -29,7 +29,7 @@ require("../main.inc.php"); $langs->load("products"); -function llxHeader($head = "", $urlp = "", $title="") +function llxHeader($head = "", $help_url = "", $title="") { global $user, $conf, $langs; @@ -115,6 +115,6 @@ function llxHeader($head = "", $urlp = "", $title="") $menu->add(DOL_URL_ROOT."/categories/index.php?type=0", $langs->trans("ProductsCategoriesShort")); } - left_menu($menu->liste); + left_menu($menu->liste, $help_url); } ?>