[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] projects/inc/class.boprojects.inc.php, 1.146
From: |
nomail |
Subject: |
[Phpgroupware-cvs] projects/inc/class.boprojects.inc.php, 1.146 |
Date: |
Thu, 15 Jul 2004 23:47:46 +0200 |
Update of /projects/inc
Modified Files:
Branch:
class.boprojects.inc.php
date: 2004/07/15 21:47:46; author: ceb; state: Exp; lines: +11 -2
Log Message:
update
=====================================================================
Index: projects/inc/class.boprojects.inc.php
diff -u projects/inc/class.boprojects.inc.php:1.145
projects/inc/class.boprojects.inc.php:1.146
--- projects/inc/class.boprojects.inc.php:1.145 Sun Jun 27 20:06:29 2004
+++ projects/inc/class.boprojects.inc.php Thu Jul 15 21:47:46 2004
@@ -517,6 +517,8 @@
function calculate_budget($data = 0)
{
+ //_debug_array($data);
+
if($this->siteconfig['accounting'] == 'activity')
{
$budget =
$this->sohours->calculate_activity_budget(array('project_id' =>
$data['project_id'],'project_array' => $data['project_array']));
@@ -527,10 +529,17 @@
$factor_per_minute = $data['factor']/60;
$surcharge =
$data['surcharge']>0?$this->return_value('charge',$data['surcharge']):0;
+
+ //echo 'boprojects->calculate_budget:
SURCHARGE: ' . $surcharge . '<br>';
+
$budget =
round($factor_per_minute*$data['minutes'],2);
+
+ //echo 'BUDGET: ' . $budget . '<br>';
if($surcharge>0)
{
$add_surcharge =
($budget*$surcharge)/100;
+ //echo 'ADD SURCHARGE: ' .
$add_surcharge . '<br>';
+
return $budget + $add_surcharge;
}
else
@@ -806,7 +815,7 @@
}
}
}
-
$bill =
$this->calculate_budget($wh['factor'],$wh['minutes'],$wh['surcharge']);
+
$bill = $this->calculate_budget(array('factor' => $wh['factor'],'minutes' =>
$wh['minutes'],'surcharge' => $wh['surcharge']));
if($wh['billable'] == 'Y')
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] projects/inc/class.boprojects.inc.php, 1.146,
nomail <=