Merge pull request #6036 from hregis/4.0_bug
Fix: use string instead integer
This commit is contained in:
commit
66901e8602
@ -64,7 +64,7 @@ $search_state=trim(GETPOST("search_state"));
|
|||||||
$search_country=GETPOST("search_country",'int');
|
$search_country=GETPOST("search_country",'int');
|
||||||
$search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
|
$search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
|
||||||
$search_user=GETPOST('search_user','int');
|
$search_user=GETPOST('search_user','int');
|
||||||
$search_request_author=GETPOST('search_request_author','int');
|
$search_request_author=GETPOST('search_request_author','alpha');
|
||||||
$search_ht=GETPOST('search_ht');
|
$search_ht=GETPOST('search_ht');
|
||||||
$search_ttc=GETPOST('search_ttc');
|
$search_ttc=GETPOST('search_ttc');
|
||||||
$search_status=(GETPOST('search_status','alpha')!=''?GETPOST('search_status','alpha'):GETPOST('statut','alpha')); // alpha and not intbecause it can be '6,7'
|
$search_status=(GETPOST('search_status','alpha')!=''?GETPOST('search_status','alpha'):GETPOST('statut','alpha')); // alpha and not intbecause it can be '6,7'
|
||||||
@ -192,7 +192,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
|
|||||||
$search_type='';
|
$search_type='';
|
||||||
$search_country='';
|
$search_country='';
|
||||||
$search_type_thirdparty='';
|
$search_type_thirdparty='';
|
||||||
$search_request_author=-1;
|
$search_request_author='';
|
||||||
$search_total_ht='';
|
$search_total_ht='';
|
||||||
$search_total_vat='';
|
$search_total_vat='';
|
||||||
$search_total_ttc='';
|
$search_total_ttc='';
|
||||||
@ -300,7 +300,7 @@ if ($search_ref) $sql .= natural_search('cf.ref', $search_ref);
|
|||||||
if ($search_refsupp) $sql.= natural_search("cf.ref_supplier", $search_refsupp);
|
if ($search_refsupp) $sql.= natural_search("cf.ref_supplier", $search_refsupp);
|
||||||
if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
|
if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
|
||||||
if ($search_company) $sql .= natural_search('s.nom', $search_company);
|
if ($search_company) $sql .= natural_search('s.nom', $search_company);
|
||||||
if ($search_request_author > 0) $sql.= " AND u.login LIKE '%".$db->escape($search_request_author)."%'";
|
if ($search_request_author) $sql.= " AND u.login LIKE '%".$db->escape($search_request_author)."%'";
|
||||||
if ($billed != '' && $billed >= 0) $sql .= " AND cf.billed = ".$billed;
|
if ($billed != '' && $billed >= 0) $sql .= " AND cf.billed = ".$billed;
|
||||||
|
|
||||||
//Required triple check because statut=0 means draft filter
|
//Required triple check because statut=0 means draft filter
|
||||||
@ -410,7 +410,7 @@ if ($resql)
|
|||||||
if ($search_ref) $param.='&search_ref='.$search_ref;
|
if ($search_ref) $param.='&search_ref='.$search_ref;
|
||||||
if ($search_company) $param.='&search_company='.$search_company;
|
if ($search_company) $param.='&search_company='.$search_company;
|
||||||
if ($search_user > 0) $param.='&search_user='.$search_user;
|
if ($search_user > 0) $param.='&search_user='.$search_user;
|
||||||
if ($search_request_author > 0) $param.='&search_request_author='.$search_request_author;
|
if ($search_request_author) $param.='&search_request_author='.$search_request_author;
|
||||||
if ($search_sale > 0) $param.='&search_sale='.$search_sale;
|
if ($search_sale > 0) $param.='&search_sale='.$search_sale;
|
||||||
if ($search_total_ht != '') $param.='&search_total_ht='.$search_total_ht;
|
if ($search_total_ht != '') $param.='&search_total_ht='.$search_total_ht;
|
||||||
if ($search_total_ttc != '') $param.="&search_total_ttc=".$search_total_ttc;
|
if ($search_total_ttc != '') $param.="&search_total_ttc=".$search_total_ttc;
|
||||||
@ -551,7 +551,7 @@ if ($resql)
|
|||||||
if (! empty($arrayfields['u.login']['checked']))
|
if (! empty($arrayfields['u.login']['checked']))
|
||||||
{
|
{
|
||||||
print '<td class="liste_titre">';
|
print '<td class="liste_titre">';
|
||||||
//print '<input type="text" class="flat" size="6" name="search_request_author" value="'.$search_request_author.'">';
|
print '<input type="text" class="flat" size="6" name="search_request_author" value="'.$search_request_author.'">';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
// Thirpdarty
|
// Thirpdarty
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user