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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2016-07-28 12:17:00 +02:00
parent e5d0258f33
commit 629271cf85
11 changed files with 49 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/margin/tabs/productMargins.php
View File

@ -65,12 +65,15 @@ $invoicestatic=new Facture($db);
$form = new Form($db); $form = new Form($db);
if ($id > 0 || ! empty($ref)) if ($id > 0 || ! empty($ref))
{ {
$result = $object->fetch($id, $ref); $result = $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ó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);
/* /*
* En mode visu * En mode visu

6
htdocs/product/composition/card.php
View File

@ -133,6 +133,10 @@ else if($action==='save_composed_product')
* View * 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); $product_fourn = new ProductFournisseur($db);
$productstatic = new Product($db); $productstatic = new Product($db);
$form = new Form($db); $form = new Form($db);
@ -176,7 +180,7 @@ if ($action == 'search')
//print $sql; //print $sql;
llxHeader("","",$langs->trans("CardProduct".$object->type)); llxHeader("", $langs->trans("CardProduct".$object->type), $helpurl);
$head=product_prepare_head($object); $head=product_prepare_head($object);
$titre=$langs->trans("CardProduct".$object->type); $titre=$langs->trans("CardProduct".$object->type);

6
htdocs/product/document.php
View File

@ -166,7 +166,11 @@ if ($action=='filemerge')
$form = new Form($db); $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) if ($object->id)

6
htdocs/product/fournisseurs.php
View File

@ -274,13 +274,17 @@ if (empty($reshook))
* view * 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); $form = new Form($db);
if ($id > 0 || $ref) if ($id > 0 || $ref)
{ {
if ($action <> 're-edit') if ($action <> 're-edit')
{ {
llxHeader("","",$langs->trans("CardProduct".$object->type)); llxHeader("", $langs->trans("CardProduct".$object->type), $helpurl);
} }
if ($result) if ($result)

3
htdocs/product/index.php
View File

@ -49,6 +49,7 @@ $product_static = new Product($db);
*/ */
$transAreaType = $langs->trans("ProductsAndServicesArea"); $transAreaType = $langs->trans("ProductsAndServicesArea");
$helpurl=''; $helpurl='';
if (! isset($_GET["type"])) 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'; $helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
} }
llxHeader("",$langs->trans("ProductsAndServices"),$helpurl); llxHeader("", $langs->trans("ProductsAndServices"), $helpurl);
$linkback=""; $linkback="";
print load_fiche_titre($transAreaType,$linkback,'title_products.png'); print load_fiche_titre($transAreaType,$linkback,'title_products.png');

10
htdocs/product/info.php
View File

@ -56,13 +56,15 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
* View * View
*/ */
$form=new Form($b);
$title=$langs->trans("Product");
$helpurl=''; $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") == '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'; 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) if ($id > 0 || $ref)
{ {

10
htdocs/product/popuprop.php
View File

@ -61,23 +61,19 @@ $helpurl='';
if ($type == '0') if ($type == '0')
{ {
$helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos'; $helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
//$title=$langs->trans("StatisticsOfProducts");
$title=$langs->trans("Statistics");
} }
else if ($type == '1') else if ($type == '1')
{ {
$helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios'; $helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
//$title=$langs->trans("StatisticsOfServices");
$title=$langs->trans("Statistics");
} }
else else
{ {
$helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios'; $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'); print load_fiche_titre($title, $mesg,'title_products.png');

7
htdocs/product/price.php
View File

@ -618,7 +618,12 @@ if (! empty($id) || ! empty($ref))
// fetch updated prices // fetch updated prices
$object->fetch($id, $ref); $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); $head = product_prepare_head($object);
$titre = $langs->trans("CardProduct" . $object->type); $titre = $langs->trans("CardProduct" . $object->type);

8
htdocs/product/reassort.php
View File

@ -101,10 +101,13 @@ if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || ! empty($conf->global
// None // None
/* /*
* View * View
*/ */
$helpurl='EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
$form=new Form($db); $form=new Form($db);
$htmlother=new FormOther($db); $htmlother=new FormOther($db);
@ -184,9 +187,6 @@ if ($resql)
exit; exit;
} }
$helpurl='';
$helpurl='EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
if (isset($type)) if (isset($type))
{ {
if ($type==1) { $texte = $langs->trans("Services"); } if ($type==1) { $texte = $langs->trans("Services"); }
@ -197,7 +197,7 @@ if ($resql)
$texte.=' ('.$langs->trans("Stocks").')'; $texte.=' ('.$langs->trans("Stocks").')';
llxHeader("",$texte,$helpurl); llxHeader("", $texte, $helpurl);
if ($sref || $snom || $sall || GETPOST('search')) if ($sref || $snom || $sall || GETPOST('search'))
{ {

5
htdocs/product/reassortlot.php
View File

@ -100,6 +100,8 @@ if (! empty($_POST["button_removefilter_x"]))
* View * View
*/ */
$helpurl='EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
$form=new Form($db); $form=new Form($db);
$htmlother=new FormOther($db); $htmlother=new FormOther($db);
@ -192,9 +194,6 @@ if ($resql)
exit; exit;
} }
$helpurl='';
$helpurl='EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
if (isset($type)) if (isset($type))
{ {
if ($type==1) { $texte = $langs->trans("Services"); } if ($type==1) { $texte = $langs->trans("Services"); }

6
htdocs/product/traduction.php
View File

@ -163,7 +163,11 @@ $result = $object->fetch($id,$ref);
* View * 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); $form = new Form($db);
$formadmin=new FormAdmin($db); $formadmin=new FormAdmin($db);