Fix: [ bug #1631 ] technical error in the display of associated objects
/ erreur technique à l'affichage des objets associés à un projet
This commit is contained in:
parent
737dfab5b2
commit
05059da9e8
@ -411,13 +411,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->jdate($dates)."'";
|
$sql.=" AND ".$datefieldname." >= '".$this->db->idate($dates)."'";
|
||||||
}
|
}
|
||||||
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->jdate($datee)."'";
|
$sql.=" AND ".$datefieldname." <= '".$this->db->idate($datee)."'";
|
||||||
}
|
}
|
||||||
if (! $sql) return -1;
|
if (! $sql) return -1;
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||||
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
* Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
* Copyright (C) 2005-2010 Regis Houssin <regis.houssin@capnetworks.com>
|
* Copyright (C) 2005-2010 Regis Houssin <regis.houssin@capnetworks.com>
|
||||||
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
|
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
|
||||||
*
|
*
|
||||||
@ -155,7 +155,7 @@ print '</td></tr>';
|
|||||||
|
|
||||||
print '</table>';
|
print '</table>';
|
||||||
|
|
||||||
print '</div>';
|
dol_fiche_end();
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user