[Phpgroupware-cvs] CVS: projects/inc class.uibilling.inc.php,1.24,1.25

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv1122

Modified Files:
        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.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** class.uibilling.inc.php     24 May 2002 23:54:12 -0000      1.24
--- class.uibilling.inc.php     5 Jul 2002 15:35:24 -0000       1.25
***************
*** 658,662 ****
                                                $onehour = 
$aes*$inv['billperae'];
                                                $sumaes += $aes;
!                                               $summe += 
$inv['billperae']*$aes;
                                        }
                                        else
--- 658,662 ----
                                                $onehour = 
$aes*$inv['billperae'];
                                                $sumaes += $aes;
!                                               // $summe += 
$inv['billperae']*$aes;
                                        }
                                        else
***************
*** 671,677 ****
                                                                . sprintf 
("%02d",(int)($sumhours-floor($sumhours/60)*60));
  
!                                               $summe = 
($sumhours/60)*$inv['billperae'];
                                        }
  
  // --------------------- template declaration for list records 
---------------------------
  
--- 671,679 ----
                                                                . sprintf 
("%02d",(int)($sumhours-floor($sumhours/60)*60));
  
!                                               // $summe = 
($sumhours/60)*$inv['billperae'];
                                        }
  
+                                       $summe += $onehour;
+ 
  // --------------------- template declaration for list records 
---------------------------
  
***************
*** 888,892 ****
                                                }
                                                $onehour = 
$inv['billperae']*$aes;
!                                       $sum_netto += $onehour;
                                        }
                                        else
--- 890,894 ----
                                                }
                                                $onehour = 
$inv['billperae']*$aes;
!                                       // $sum_netto += $onehour;
                                        }
                                        else
***************
*** 896,904 ****
                                                $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']);
--- 898,907 ----
                                                $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']);