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

Merge pull request #1247 from altairis-fr/3.4

Browse Source 
fix bug on filter and sort
This commit is contained in:
Laurent Destailleur 2013-09-27 09:01:17 -07:00
commit 7ac7034494
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -26,6 +26,8 @@ Fix: Delete linked element to supplier invoice when deleted
Fix: [ bug #1061 ] Bad info shipped products Fix: [ bug #1061 ] Bad info shipped products
Fix: [ bug #1062 ] Documents lost in propals and contracts validating Fix: [ bug #1062 ] Documents lost in propals and contracts validating
Fix: Supplier price displayed on document lines and margin infos didnt take discount Fix: Supplier price displayed on document lines and margin infos didnt take discount
Fix: sorting on qty did not work in supplier product list
Fix: there was no escaping on filter fields in supplier product list
Qual: Add travis-ci integration Qual: Add travis-ci integration

8
htdocs/fourn/product/liste.php
View File

@ -113,15 +113,15 @@ else
} }
if ($sref) if ($sref)
{ {
$sql .= " AND p.ref LIKE '%".$sref."%'"; $sql .= " AND p.ref LIKE '%".$db->escape($sref)."%'";
} }
if ($sRefSupplier) if ($sRefSupplier)
{ {
$sql .= " AND ppf.ref_fourn LIKE '%".$sRefSupplier."%'"; $sql .= " AND ppf.ref_fourn LIKE '%".$db->escape($sRefSupplier)."%'";
} }
if ($snom) if ($snom)
{ {
$sql .= " AND p.label LIKE '%".$snom."%'"; $sql .= " AND p.label LIKE '%".$db->escape($snom)."%'";
} }
if($catid) if($catid)
{ {
@ -181,7 +181,7 @@ if ($resql)
print_liste_field_titre($langs->trans("Label"),"liste.php", "p.label",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Label"),"liste.php", "p.label",$param,"","",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Supplier"),"liste.php", "ppf.fk_soc",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Supplier"),"liste.php", "ppf.fk_soc",$param,"","",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("BuyingPrice"),"liste.php", "ppf.price",$param,"",'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("BuyingPrice"),"liste.php", "ppf.price",$param,"",'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("QtyMin"),"liste.php", "ppf.qty",$param,"",'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("QtyMin"),"liste.php", "ppf.quantity",$param,"",'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("UnitPrice"),"liste.php", "ppf.unitprice",$param,"",'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("UnitPrice"),"liste.php", "ppf.unitprice",$param,"",'align="right"',$sortfield,$sortorder);
print "</tr>\n"; print "</tr>\n";