Skip to content
Snippets Groups Projects
Commit 629271cf authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

FIX Bad position of parameters on llxHeader (so online help not visible)

parent e5d0258f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 49 additions and 27 deletions
htdocs/margin/tabs/productMargins.php
+ 6
− 3
View file @ 629271cf
......@@ -65,12 +65,15 @@ $invoicestatic=new Facture($db);
$form = new Form($db);
if ($id > 0 || ! empty($ref))
{
$result = $object->fetch($id, $ref);
$result = $object->fetch($id, $ref);
$helpurl='';
if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) $helpurl='EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos';
if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) $helpurl='EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios';
llxHeader("","",$langs->trans("CardProduct".$object->type));
llxHeader("", $langs->trans("CardProduct".$object->type), $help_url);
/*
* En mode visu
......
htdocs/product/composition/card.php
+ 5
− 1
View file @ 629271cf
......@@ -133,6 +133,10 @@ else if($action==='save_composed_product')
* View
*/
$helpurl='';
if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) $helpurl='EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos';
if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) $helpurl='EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios';
$product_fourn = new ProductFournisseur($db);
$productstatic = new Product($db);
$form = new Form($db);
......@@ -176,7 +180,7 @@ if ($action == 'search')
//print $sql;
llxHeader("","",$langs->trans("CardProduct".$object->type));
llxHeader("", $langs->trans("CardProduct".$object->type), $helpurl);
$head=product_prepare_head($object);
$titre=$langs->trans("CardProduct".$object->type);
......
htdocs/product/document.php
+ 5
− 1
View file @ 629271cf
......@@ -166,7 +166,11 @@ if ($action=='filemerge')
$form = new Form($db);
llxHeader("","",$langs->trans("CardProduct".$object->type));
$helpurl='';
if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) $helpurl='EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos';
if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) $helpurl='EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios';
llxHeader("", $langs->trans("CardProduct".$object->type), $help_url);
if ($object->id)
......
htdocs/product/fournisseurs.php
+ 5
− 1
View file @ 629271cf
......@@ -274,13 +274,17 @@ if (empty($reshook))
* view
*/
$helpurl='';
if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) $helpurl='EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos';
if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) $helpurl='EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios';
$form = new Form($db);
if ($id > 0 || $ref)
{
if ($action <> 're-edit')
{
llxHeader("","",$langs->trans("CardProduct".$object->type));
llxHeader("", $langs->trans("CardProduct".$object->type), $helpurl);
}
if ($result)
......
htdocs/product/index.php
+ 2
− 1
View file @ 629271cf
......@@ -49,6 +49,7 @@ $product_static = new Product($db);
*/
$transAreaType = $langs->trans("ProductsAndServicesArea");
$helpurl='';
if (! isset($_GET["type"]))
{
......@@ -66,7 +67,7 @@ if ((isset($_GET["type"]) && $_GET["type"] == 1) || empty($conf->product->enable
$helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
}
llxHeader("",$langs->trans("ProductsAndServices"),$helpurl);
llxHeader("", $langs->trans("ProductsAndServices"), $helpurl);
$linkback="";
print load_fiche_titre($transAreaType,$linkback,'title_products.png');
......
htdocs/product/info.php
+ 6
− 4
View file @ 629271cf
......@@ -56,13 +56,15 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
* View
*/
$form=new Form($b);
$title=$langs->trans("Product");
$helpurl='';
if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) $helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) $helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
llxHeader('',$title,$help_url);
$title=$langs->trans("Product");
$form=new Form($b);
llxHeader('', $title, $help_url);
if ($id > 0 || $ref)
{
......
htdocs/product/popuprop.php
+ 3
− 7
View file @ 629271cf
......@@ -61,23 +61,19 @@ $helpurl='';
if ($type == '0')
{
$helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
//$title=$langs->trans("StatisticsOfProducts");
$title=$langs->trans("Statistics");
}
else if ($type == '1')
{
$helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
//$title=$langs->trans("StatisticsOfServices");
$title=$langs->trans("Statistics");
}
else
{
$helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
//$title=$langs->trans("StatisticsOfProductsOrServices");
$title=$langs->trans("Statistics");
}
$title=$langs->trans("Statistics");
llxHeader('','',$helpurl);
llxHeader('', $title, $helpurl);
print load_fiche_titre($title, $mesg,'title_products.png');
......
htdocs/product/price.php
+ 6
− 1
View file @ 629271cf
......@@ -618,7 +618,12 @@ if (! empty($id) || ! empty($ref))
// fetch updated prices
$object->fetch($id, $ref);
}
llxHeader("", "", $langs->trans("CardProduct" . $object->type));
$helpurl='';
if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) $helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) $helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
llxHeader("", $langs->trans("CardProduct" . $object->type), $hepl_url);
$head = product_prepare_head($object);
$titre = $langs->trans("CardProduct" . $object->type);
......
htdocs/product/reassort.php
+ 4
− 4
View file @ 629271cf
......@@ -101,10 +101,13 @@ if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || ! empty($conf->global
// None
/*
* View
*/
$helpurl='EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
$form=new Form($db);
$htmlother=new FormOther($db);
......@@ -184,9 +187,6 @@ if ($resql)
exit;
}
$helpurl='';
$helpurl='EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
if (isset($type))
{
if ($type==1) { $texte = $langs->trans("Services"); }
......@@ -197,7 +197,7 @@ if ($resql)
$texte.=' ('.$langs->trans("Stocks").')';
llxHeader("",$texte,$helpurl);
llxHeader("", $texte, $helpurl);
if ($sref || $snom || $sall || GETPOST('search'))
{
......
htdocs/product/reassortlot.php
+ 2
− 3
View file @ 629271cf
......@@ -100,6 +100,8 @@ if (! empty($_POST["button_removefilter_x"]))
* View
*/
$helpurl='EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
$form=new Form($db);
$htmlother=new FormOther($db);
......@@ -192,9 +194,6 @@ if ($resql)
exit;
}
$helpurl='';
$helpurl='EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
if (isset($type))
{
if ($type==1) { $texte = $langs->trans("Services"); }
......
htdocs/product/traduction.php
+ 5
− 1
View file @ 629271cf
......@@ -163,7 +163,11 @@ $result = $object->fetch($id,$ref);
* View
*/
llxHeader("","",$langs->trans("Translation"));
$helpurl='';
if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) $helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) $helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
llxHeader("", $langs->trans("Translation"), $help_url);
$form = new Form($db);
$formadmin=new FormAdmin($db);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment