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

Merge remote-tracking branch 'Upstream/3.9' into 3.9-p8

Browse Source
This commit is contained in:
aspangaro 2016-01-21 05:46:11 +01:00
commit 8a36bda3d2
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/projet/list.php
View File

@ -209,15 +209,15 @@ if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
if ($smonth > 0) if ($smonth > 0)
{ {
if ($syear > 0 && empty($sday)) 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)) 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 else
$sql.= " AND date_format(p.datee, '%m') = '".$smonth."'"; $sql.= " AND date_format(p.dateo, '%m') = '".$smonth."'";
} }
else if ($syear > 0) 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) if ($month > 0)
{ {

12
htdocs/projet/tasks/list.php
View File

@ -234,18 +234,6 @@ print "</table>";
print '</form>'; print '</form>';
print '</div>';
/*
* Actions
*/
if ($user->rights->projet->creer)
{
print '<div class="tabsAction">';
print '<a class="butAction" href="'.DOL_URL_ROOT.'/projet/tasks.php?action=create">'.$langs->trans('AddTask').'</a>';
print '</div>';
}
llxFooter(); llxFooter();