Merge remote-tracking branch 'origin/3.4' into 3.4_backported

Dolibarr · Sep 28, 2013 · 3ac305e · 3ac305e
2 parents 3a2cdbf + b695204
commit 3ac305e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -26,6 +26,8 @@ Fix: Delete linked element to supplier invoice when deleted
 Fix: [ bug #1061 ] Bad info shipped products
 Fix: [ bug #1062 ] Documents lost in propals and contracts validating
 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
 
 

diff --git a/htdocs/fourn/product/liste.php b/htdocs/fourn/product/liste.php
@@ -113,15 +113,15 @@
 	}
 	if ($sref)
 	{
-		$sql .= " AND p.ref LIKE '%".$sref."%'";
+		$sql .= " AND p.ref LIKE '%".$db->escape($sref)."%'";
 	}
 	if ($sRefSupplier)
 	{
-		$sql .= " AND ppf.ref_fourn LIKE '%".$sRefSupplier."%'";
+		$sql .= " AND ppf.ref_fourn LIKE '%".$db->escape($sRefSupplier)."%'";
 	}
 	if ($snom)
 	{
-		$sql .= " AND p.label LIKE '%".$snom."%'";
+		$sql .= " AND p.label LIKE '%".$db->escape($snom)."%'";
 	}
 	if($catid)
 	{
@@ -181,7 +181,7 @@
 	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("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 "</tr>\n";
 

diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php
@@ -35,7 +35,7 @@
 $err=error_reporting();
 error_reporting(0);		// Disable all errors
 //error_reporting(E_ALL);
-@set_time_limit(300);	// Need more than 240 on Windows 7/64
+@set_time_limit(900);	// Need 900 on some OS like Windows 7/64
 error_reporting($err);
 
 $action=GETPOST('action');

diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
@@ -343,8 +343,9 @@
 				// We don't have supplier, so we try to guess.
 				// For this we build a fictive supplier with same properties than user but using vat)
 				$mysoc2=dol_clone($mysoc);
+				$mysoc2->name='Fictive seller with same country';
 				$mysoc2->tva_assuj=1;
-				$default_vat=get_default_tva($mysoc2, $mysoc, 0, $product->id);
+				$default_vat=get_default_tva($mysoc2, $mysoc, $product->id, 0);
 
 				print '<tr><td class="fieldrequired">'.$langs->trans("VATRateForSupplierProduct").'</td>';
 				print '<td>';