fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [15462] controller: hours labour


From: sigurdne
Subject: [Fmsystem-commits] [15462] controller: hours labour
Date: Mon, 15 Aug 2016 07:53:08 +0000 (UTC)

Revision: 15462
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15462
Author:   sigurdne
Date:     2016-08-15 07:53:08 +0000 (Mon, 15 Aug 2016)
Log Message:
-----------
controller: hours labour

Modified Paths:
--------------
    trunk/controller/inc/class.uicomponent.inc.php

Modified: trunk/controller/inc/class.uicomponent.inc.php
===================================================================
--- trunk/controller/inc/class.uicomponent.inc.php      2016-08-15 07:02:35 UTC 
(rev 15461)
+++ trunk/controller/inc/class.uicomponent.inc.php      2016-08-15 07:53:08 UTC 
(rev 15462)
@@ -919,10 +919,10 @@
                                for ($_month = 1; $_month < 13; $_month++)
                                {
                                        $row[$_month] = 
$this->translate_calendar_info($entry[$_month], $year, $_month, $filter_status, 
$found_at_least_one, $keep_only_assigned_to);
-                                       if ($row[$_month] && (!$user_id || 
$entry[$_month]['info']['assigned_to'] == $user_id))
+                                       if(true)// ($row[$_month] && (!$user_id 
|| $entry[$_month]['info']['assigned_to'] == $user_id))
                                        {
-                                               $row_sum[$_month] = 
$entry[$_month]['info']['service_time'] + 
$entry[$_month]['info']['controle_time'];
-                                               $row_sum_actual[$_month] = + 
$entry[$_month]['info']['billable_hours'];
+                                               $row_sum[$_month] = 
(float)$entry[$_month]['info']['service_time'] + 
(float)$entry[$_month]['info']['controle_time'];
+                                               $row_sum_actual[$_month] = + 
(float)$entry[$_month]['info']['billable_hours'];
                                        }
                                        else
                                        {




reply via email to

[Prev in Thread] Current Thread [Next in Thread]