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

FIX CUnit->fetch id/rowid

Browse Source
This commit is contained in:
Maxime Lecoq 2020-04-24 21:08:47 +02:00
parent e84601f5ed
commit 9ed7ff80a1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/cunits.class.php
View File

@ -147,7 +147,7 @@ class CUnits // extends CommonObject
/** /**
* Load object in memory from database * Load object in memory from database
* *
* @param int $id Id object * @param int $id Id of CUnit object to fetch (rowid)
* @param string $code Code * @param string $code Code
* @param string $short_label Short Label ('g', 'kg', ...) * @param string $short_label Short Label ('g', 'kg', ...)
* @param string $unit_type Unit type ('size', 'surface', 'volume', 'weight', ...) * @param string $unit_type Unit type ('size', 'surface', 'volume', 'weight', ...)
@ -168,7 +168,7 @@ class CUnits // extends CommonObject
$sql .= " t.active"; $sql .= " t.active";
$sql .= " FROM ".MAIN_DB_PREFIX."c_units as t"; $sql .= " FROM ".MAIN_DB_PREFIX."c_units as t";
$sql_where = array(); $sql_where = array();
if ($id) $sql_where[] = " t.id = ".$id; if ($id) $sql_where[] = " t.rowid = ".$id;
if ($unit_type) $sql_where[] = " t.unit_type = '".$this->db->escape($unit_type)."'"; if ($unit_type) $sql_where[] = " t.unit_type = '".$this->db->escape($unit_type)."'";
if ($code) $sql_where[] = " t.code = '".$this->db->escape($code)."'"; if ($code) $sql_where[] = " t.code = '".$this->db->escape($code)."'";
if ($short_label) $sql_where[] = " t.short_label = '".$this->db->escape($short_label)."'"; if ($short_label) $sql_where[] = " t.short_label = '".$this->db->escape($short_label)."'";