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

Merge pull request #12202 from atm-gauthier/10.0_fix_search_on_product_and_service

Browse Source 
FIX : if we search something with global search, and after with form …
This commit is contained in:
Laurent Destailleur 2019-10-22 20:06:10 +02:00 committed by GitHub
commit 2f0b791cfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/product/list.php
View File

@ -450,6 +450,7 @@ if ($resql)
if($type == Product::TYPE_SERVICE) $rightskey='service'; if($type == Product::TYPE_SERVICE) $rightskey='service';
if($user->rights->{$rightskey}->creer) if($user->rights->{$rightskey}->creer)
{ {
$oldtype=$type;
if ($type === "") { if ($type === "") {
$newcardbutton.= dolGetButtonTitle($langs->trans('NewProduct'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&type=0'); $newcardbutton.= dolGetButtonTitle($langs->trans('NewProduct'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&type=0');
$type = Product::TYPE_SERVICE; $type = Product::TYPE_SERVICE;
@ -457,6 +458,7 @@ if ($resql)
$label='NewProduct'; $label='NewProduct';
if($type == Product::TYPE_SERVICE) $label='NewService'; if($type == Product::TYPE_SERVICE) $label='NewService';
$newcardbutton.= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&type='.$type); $newcardbutton.= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&type='.$type);
$type=$oldtype;
} }
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">'; print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';