diff --git a/ChangeLog b/ChangeLog index ef7c7a9cadc24008d5beccc82f24f189f32fc462..53dde2583f095957c52ceea24a537a3319f89555 100644 --- a/ChangeLog +++ b/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: diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php index 69237fe4f74e6d883a3deeac5821d84f4e786fe9..9c0bc80a25a9ed39963434fab816a78a0f65be49 100644 --- a/htdocs/admin/limits.php +++ b/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) diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index ad436d5c6c8b331846ab71a3ec5bad5d679d369c..c4de7377ebddab82ef26b39d5400863e18ac4b05 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/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');