[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: projects/inc class.uibilling.inc.php,1.18.2.5,1.
From: |
Bettina Gille <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: projects/inc class.uibilling.inc.php,1.18.2.5,1.18.2.6 |
Date: |
Fri, 05 Jul 2002 11:34:34 -0400 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv926
Modified Files:
Tag: Version-0_9_14-branch
class.uibilling.inc.php
Log Message:
fix in billing section
Index: class.uibilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uibilling.inc.php,v
retrieving revision 1.18.2.5
retrieving revision 1.18.2.6
diff -C2 -r1.18.2.5 -r1.18.2.6
*** class.uibilling.inc.php 19 Mar 2002 23:45:42 -0000 1.18.2.5
--- class.uibilling.inc.php 5 Jul 2002 15:34:32 -0000 1.18.2.6
***************
*** 662,666 ****
$onehour =
$aes*$inv['billperae'];
$sumaes += $aes;
! $summe +=
$inv['billperae']*$aes;
}
else
--- 662,666 ----
$onehour =
$aes*$inv['billperae'];
$sumaes += $aes;
! // $summe +=
$inv['billperae']*$aes;
}
else
***************
*** 675,681 ****
. sprintf
("%02d",(int)($sumhours-floor($sumhours/60)*60));
! $summe =
($sumhours/60)*$inv['billperae'];
}
// --------------------- template declaration for list records
---------------------------
--- 675,683 ----
. sprintf
("%02d",(int)($sumhours-floor($sumhours/60)*60));
! // $summe =
($sumhours/60)*$inv['billperae'];
}
+ $summe += $onehour;
+
// --------------------- template declaration for list records
---------------------------
***************
*** 892,896 ****
}
$onehour =
$inv['billperae']*$aes;
! $sum_netto += $onehour;
}
else
--- 894,898 ----
}
$onehour =
$inv['billperae']*$aes;
! // $sum_netto += $onehour;
}
else
***************
*** 900,908 ****
$aes =
floor($inv['minutes']/60) . ':'
. sprintf
("%02d",(int)($inv['minutes']-floor($inv['minutes']/60)*60));
- $sum_netto += $onehour;
! $sumhours += $inv['minutes'];
! $sum_netto =
($sumhours/60)*$inv['billperae'];
}
$this->t->set_var('billperae',$inv['billperae']);
--- 902,911 ----
$aes =
floor($inv['minutes']/60) . ':'
. sprintf
("%02d",(int)($inv['minutes']-floor($inv['minutes']/60)*60));
! // $sumhours += $inv['minutes'];
! // $sum_netto =
($sumhours/60)*$inv['billperae'];
}
+
+ $sum_netto += $onehour;
$this->t->set_var('billperae',$inv['billperae']);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: projects/inc class.uibilling.inc.php,1.18.2.5,1.18.2.6,
Bettina Gille <address@hidden> <=