Merge pull request #1859 from FHenry/3.6

Fix SQL syntax

ChangeLog

@@ -10,6 +10,7 @@ For users:
 - Fix: error "menu param is not inside list" into pos module.
 - Fix: Salary payments are not reflected on the reporting sheets
 - Fix: Unsubscribe emailing not working
+- Fix: Trigger on create category call failed because user is not passed on card
 
 ***** ChangeLog for 3.6 compared to 3.5.* *****
 For users:

htdocs/admin/limits.php

@@ -206,9 +206,9 @@ else
 	// Add vat rates examples specific to country
 	$vat_rates=array();
 
-	$sql.="SELECT taux as vat_rate";
+	$sql="SELECT taux as vat_rate";
 	$sql.=" FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
-	$sql.=" WHERE t.active=1 AND t.fk_pays = p.rowid AND p.code='".$mysoc->country_code."' AND taux != 0";
+	$sql.=" WHERE t.active=1 AND t.fk_pays = p.rowid AND p.code='".$mysoc->country_code."' AND taux <> 0";
 	$sql.=" ORDER BY t.taux ASC";
 	$resql=$db->query($sql);
 	if ($resql)

htdocs/categories/class/categorie.class.php

@@ -137,7 +137,7 @@ class Categorie extends CommonObject
 	 *          					-3 : categorie invalide
 	 * 								-4 : category already exists
 	 */
-	function create($user='')
+	function create($user)
 	{
 		global $conf,$langs,$hookmanager;
 		$langs->load('categories');