From dfc5a98dc134ef76284d62044bdfa1306f78a919 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Nov 2014 01:05:30 +0100
Subject: [PATCH] =?UTF-8?q?Fix:=20[=20bug=20#1631=20]=20technical=20error?=
=?UTF-8?q?=20in=20the=20display=20of=20associated=20objects=20/=20erreur?=
=?UTF-8?q?=20technique=20=C3=A0=20l'affichage=20des=20objets=20associ?=
=?UTF-8?q?=C3=A9s=20=C3=A0=20un=20projet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
htdocs/projet/class/project.class.php | 4 ++--
htdocs/projet/element.php | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index f294fa560ac..738eec46ec0 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -411,13 +411,13 @@ class Project extends CommonObject
{
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';
- $sql.=" AND ".$datefieldname." >= '".$this->db->jdate($dates)."'";
+ $sql.=" AND ".$datefieldname." >= '".$this->db->idate($dates)."'";
}
if ($datee > 0)
{
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';
- $sql.=" AND ".$datefieldname." <= '".$this->db->jdate($datee)."'";
+ $sql.=" AND ".$datefieldname." <= '".$this->db->idate($datee)."'";
}
if (! $sql) return -1;
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index c7f772ef93d..1d4218d1cb9 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -1,6 +1,6 @@
<?php
/* 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) 2012 Juanjo Menent <jmenent@2byte.es>
*
@@ -155,7 +155,7 @@ print '</td></tr>';
print '</table>';
-print '</div>';
+dol_fiche_end();
/*
--
GitLab