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

Merge pull request #1859 from FHenry/3.6

Browse Source 
Fix SQL syntax
This commit is contained in:
Juanjo Menent 2014-09-01 22:26:21 +02:00
commit 2d0f353529
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -10,6 +10,7 @@ For users:
- Fix: error "menu param is not inside list" into pos module. - Fix: error "menu param is not inside list" into pos module.
- Fix: Salary payments are not reflected on the reporting sheets - Fix: Salary payments are not reflected on the reporting sheets
- Fix: Unsubscribe emailing not working - 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.* ***** ***** ChangeLog for 3.6 compared to 3.5.* *****
For users: For users:

4
htdocs/admin/limits.php
View File

@ -206,9 +206,9 @@ else
// Add vat rates examples specific to country // Add vat rates examples specific to country
$vat_rates=array(); $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.=" 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"; $sql.=" ORDER BY t.taux ASC";
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)

2
htdocs/categories/class/categorie.class.php
View File

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