[Phpgroupware-cvs] projects/inc/class.boprojects.inc.php, 1.143

[nomail]

Update of /projects/inc
Modified Files:
        Branch: 
          class.boprojects.inc.php

date: 2004/06/21 15:38:14;  author: ceb;  state: Exp;  lines: +10 -3

Log Message:
update
=====================================================================
Index: projects/inc/class.boprojects.inc.php
diff -u projects/inc/class.boprojects.inc.php:1.142 
projects/inc/class.boprojects.inc.php:1.143
--- projects/inc/class.boprojects.inc.php:1.142 Mon Jun 21 14:35:34 2004
+++ projects/inc/class.boprojects.inc.php       Mon Jun 21 15:38:14 2004
@@ -660,17 +660,21 @@
 
                                $h_pro = 
$this->sohours->get_time_used(array('project_id' => $params['project_id']));
 
+                               //echo 'boprojects->get_budget: time used 
project only:';
+                               //_debug_array($h_pro);
+
+                               $uhours_pro_bill = $uhours_pro_nobill = 
$uhours_pro = 0;
                                if(is_array($h_pro))
                                {
                                        foreach($h_pro as $hp)
                                        {
                                                if($hp['billable'] == 'Y')
                                                {
-                                                       $uhours_pro_bill += 
$h_pro['minutes'];
+                                                       $uhours_pro_bill += 
$hp['minutes'];
                                                } 
                                                elseif($hp['billable'] == 'N')
                                                {
-                                                       $uhours_pro_nobill += 
$h_pro['minutes'];
+                                                       $uhours_pro_nobill += 
$hp['minutes'];
                                                }
                                        }
                                        $uhours_pro = $uhours_pro_bill + 
$uhours_pro_nobill;
@@ -698,6 +702,9 @@
                                $formatted_ahours_pro           = 
$this->sohours->format_wh($params['ptime'] - $uhours_pro);
                                $acc['ahours_pro']                      = 
$formatted_ahours_pro['whwm'];
 
+                               //echo 'uhours_pro:' . $uhours_pro;
+                               //_debug_array($acc);
+
                                // ------ jobs included ------
 
                                $h_jobs_bill = 
$this->sohours->get_time_used(array('project_array' => $sub_pro_bill)); // 
project is billable