Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: select if field is null

Browse Source
This commit is contained in:
Laurent Destailleur
2015-01-22 20:09:57 +01:00
parent c4782f960c
commit 7b8b189bac
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/projet/class/project.class.php
View File

@@ -416,13 +416,13 @@ class Project extends CommonObject
{ {
if (empty($datefieldname) && ! empty($this->table_element_date)) $datefieldname=$this->table_element_date; if (empty($datefieldname) && ! empty($this->table_element_date)) $datefieldname=$this->table_element_date;
if (empty($datefieldname)) return 'Error this object has no date field defined'; if (empty($datefieldname)) return 'Error this object has no date field defined';
$sql.=" AND ".$datefieldname." >= '".$this->db->idate($dates)."'"; $sql.=" AND (".$datefieldname." >= '".$this->db->idate($dates)."' OR ".$datefieldname." IS NULL)";
} }
if ($datee > 0) if ($datee > 0)
{ {
if (empty($datefieldname) && ! empty($this->table_element_date)) $datefieldname=$this->table_element_date; if (empty($datefieldname) && ! empty($this->table_element_date)) $datefieldname=$this->table_element_date;
if (empty($datefieldname)) return 'Error this object has no date field defined'; if (empty($datefieldname)) return 'Error this object has no date field defined';
$sql.=" AND ".$datefieldname." <= '".$this->db->idate($datee)."'"; $sql.=" AND (".$datefieldname." <= '".$this->db->idate($datee)."' OR ".$datefieldname." IS NULL)";
} }
if (! $sql) return -1; if (! $sql) return -1;