From cc858b2af001679fc995e5b4ce18edfdac4e02be Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Mon, 1 Sep 2014 22:41:36 +0200 Subject: [PATCH] Fix SQL syntax ChangeLog --- ChangeLog | 1 + htdocs/admin/limits.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b66c5a981f1..be220bb0220 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,6 +103,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 781bc24aa09..1f07743b402 100644 --- a/htdocs/admin/limits.php +++ b/htdocs/admin/limits.php @@ -204,9 +204,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_country as c"; - $sql.=" WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$mysoc->country_code."' AND taux != 0"; + $sql.=" WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$mysoc->country_code."' AND taux <> 0"; $sql.=" ORDER BY t.taux ASC"; $resql=$db->query($sql); if ($resql)