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

FIX for stickler

Browse Source
This commit is contained in:
atm-quentin 2020-01-31 11:36:53 +01:00
parent fee113bfb5
commit 398e83d1cc
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/lib/date.lib.php
View File

@ -969,7 +969,6 @@ function monthArray($outputlangs, $short = 0)
* @param int $year Year number
* @return array Week numbers
*/
function getWeekNumbersOfMonth($month, $year)
{
$nb_days = cal_days_in_month(CAL_GREGORIAN, $month, $year);

1
htdocs/core/lib/project.lib.php
View File

@ -1727,6 +1727,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
* @param int $restricteditformytask 0=No restriction, 1=Enable add time only if task is a task i am affected to
* @param array $isavailable Array with data that say if user is available for several days for morning and afternoon
* @param int $oldprojectforbreak Old project id of last project break
* @param array $Tweek Array of week numbers
* @return array Array with time spent for $fuser for each day of week on tasks in $lines and substasks
*/
function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, &$isavailable, $oldprojectforbreak = 0, $TWeek = array())

3
htdocs/projet/activity/permonth.php
View File

@ -480,7 +480,8 @@ print '<td class="liste_titre"></td>';
print '<td class="liste_titre right"><input type="text" size="4" name="search_declared_progress" value="'.dol_escape_htmltag($search_declared_progress).'"></td>';
print '<td class="liste_titre"></td>';
print '<td class="liste_titre"></td>';
for ($idw=0;$idw<count($TWeek);$idw++)
$countWeek = count($TWeek);
for ($idw=0;$idw<$countWeek;$idw++)
{
print '<td class="liste_titre"></td>';
}