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

[nomail]

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

date: 2004/07/19 15:53:49;  author: ceb;  state: Exp;  lines: +9 -3

Log Message:
update
=====================================================================
Index: projects/inc/class.boprojects.inc.php
diff -u projects/inc/class.boprojects.inc.php:1.146 
projects/inc/class.boprojects.inc.php:1.147
--- projects/inc/class.boprojects.inc.php:1.146 Thu Jul 15 21:47:46 2004
+++ projects/inc/class.boprojects.inc.php       Mon Jul 19 15:53:49 2004
@@ -846,18 +846,21 @@
                                                        case 'project':
                                                                $h_sub = 
$this->sohours->get_time_used(array('project_id' => $subs[$i]['project_id']));
 
+                                                               
//_debug_array($h_sub);
+
                                                                
if(is_array($h_sub))
                                                                {
                                                                        
foreach($h_sub as $hs)
                                                                        {
                                                                                
if($subs[$i]['billable'] == 'Y' && $hs['billable'] == 'Y')
                                                                                
{
-                                                                               
        $sub_b_budget += $this->calculate_budget(array('factor' => 
$subs[$i]['project_accounting_factor'],'minutes' => $hs['minutes'],
+                                                                               
        $sub_b_budget += $this->calculate_budget(array('factor' => 
$subs[$i]['acc_factor'],'minutes' => $hs['minutes'],
                                                                                
                                                                                
                        'surcharge' => $hs['surcharge']));
+                                                                               
        //echo 'sub_b_budget: ' . $sub_b_budget;
                                                                                
}
                                                                                
else
                                                                                
{
-                                                                               
        $sub_nb_budget += $this->calculate_budget(array('factor' => 
$subs[$i]['project_accounting_factor'],'minutes' => $hs['minutes'],
+                                                                               
        $sub_nb_budget += $this->calculate_budget(array('factor' => 
$subs[$i]['acc_factor'],'minutes' => $hs['minutes'],
                                                                                
                                                                                
                        'surcharge' => $hs['surcharge']));
                                                                                
}
                                                                        }
@@ -906,6 +909,9 @@
                                                }
                                                $nb_budget_jobs += 
$sub_nb_budget;
                                                $acc['b_budget_jobs'] += 
$sub_b_budget;
+
+                                               //echo 'nb_budget_jobs: ' . 
$nb_budget_jobs;
+                                               //echo 'b_budget_jobs: ' . 
$b_budget_jobs;
                                        }
                                        $acc['u_budget_jobs'] = 
$acc['b_budget_jobs'] + $nb_budget_jobs;
                                }