From 17ceca3758810e5b0bf6c907798acf80cb28991c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jan 2016 16:44:04 +0100 Subject: [PATCH 1/2] Fix: no create button on list --- htdocs/projet/tasks/list.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index d23617192b3..b2e16e7c21e 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -234,18 +234,6 @@ print ""; print ''; -print ''; - -/* - * Actions - */ -if ($user->rights->projet->creer) -{ - print '
'; - print ''.$langs->trans('AddTask').''; - print '
'; -} - llxFooter(); From 6eb6b0315fe8be4da83516a2b8ea9eacb6d0622e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Jan 2016 16:46:54 +0100 Subject: [PATCH 2/2] Fix bad field used for search on start date --- htdocs/projet/list.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index d0a1ac2c599..732022c0963 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -209,15 +209,15 @@ if ($search_societe) $sql .= natural_search('s.nom', $search_societe); if ($smonth > 0) { if ($syear > 0 && empty($sday)) - $sql.= " AND p.datee BETWEEN '".$db->idate(dol_get_first_day($syear,$smonth,false))."' AND '".$db->idate(dol_get_last_day($syear,$smonth,false))."'"; + $sql.= " AND p.dateo BETWEEN '".$db->idate(dol_get_first_day($syear,$smonth,false))."' AND '".$db->idate(dol_get_last_day($syear,$smonth,false))."'"; else if ($syear > 0 && ! empty($sday)) - $sql.= " AND p.datee BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $smonth, $sday, $syear))."'"; + $sql.= " AND p.dateo BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $smonth, $sday, $syear))."'"; else - $sql.= " AND date_format(p.datee, '%m') = '".$smonth."'"; + $sql.= " AND date_format(p.dateo, '%m') = '".$smonth."'"; } else if ($syear > 0) { - $sql.= " AND p.datee BETWEEN '".$db->idate(dol_get_first_day($syear,1,false))."' AND '".$db->idate(dol_get_last_day($syear,12,false))."'"; + $sql.= " AND p.dateo BETWEEN '".$db->idate(dol_get_first_day($syear,1,false))."' AND '".$db->idate(dol_get_last_day($syear,12,false))."'"; } if ($month > 0) {