[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php,1.42.2.5.2.15,1.42.2.5.2.16 class.uiprojects.inc.php,1.47.2.7.2.14,1.47.2.7.2.15

[Bettina Gille <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.boprojects.inc.php class.uiprojects.inc.php 
Log Message:
update

Index: class.boprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.42.2.5.2.15
retrieving revision 1.42.2.5.2.16
diff -C2 -r1.42.2.5.2.15 -r1.42.2.5.2.16
*** class.boprojects.inc.php    14 Jun 2003 20:37:52 -0000      1.42.2.5.2.15
--- class.boprojects.inc.php    14 Jun 2003 21:36:16 -0000      1.42.2.5.2.16
***************
*** 556,560 ****
                        }
  
- 
                        if (strlen($values['title']) >= 255)
                        {
--- 556,559 ----
***************
*** 605,612 ****
                        }
  
! /*                    if ($values['edate'] < $values['sdate'] && 
$values['edate'] && $values['sdate'])
                        {
!                               $error[] = lang('Ending date can not be before 
start date');
!                       } */
  
                        if ($action == 'subs')
--- 604,622 ----
                        }
  
!                       if ($action == 'mains')
                        {
!                               if ((!$values['budget'] || 
floatval($values['budget']) == 0) && $values['pcosts'])
!                               {
!                                       $error[] = lang('please specify the 
budget');
!                               }
! 
!                               if (($values['budget'] && 
floatval($values['budget']) > 0) && ($values['pcosts'] && 
floatval($values['pcosts']) > 0))
!                               {
!                                       if ($values['pcosts'] > 
$values['budget'])
!                                       {
!                                               $error[] = lang('pcosts can not 
be higher than the budget');
!                                       }
!                               }
!                       }
  
                        if ($action == 'subs')

Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.7.2.14
retrieving revision 1.47.2.7.2.15
diff -C2 -r1.47.2.7.2.14 -r1.47.2.7.2.15
*** class.uiprojects.inc.php    14 Jun 2003 20:37:52 -0000      1.47.2.7.2.14
--- class.uiprojects.inc.php    14 Jun 2003 21:36:16 -0000      1.47.2.7.2.15
***************
*** 658,661 ****
--- 658,667 ----
                                
$GLOBALS['phpgw']->template->set_var('pcosts',$parent['pcosts']);
  
+                               
$GLOBALS['phpgw']->template->set_var('lang_ptime_main',lang('time planned main 
project') . ':&nbsp;' . lang('work hours'));
+                               
$GLOBALS['phpgw']->template->set_var('ptime_main',$parent['phours']);
+ 
+                               
$GLOBALS['phpgw']->template->set_var('lang_budget_main',lang('budget main 
project') . ':&nbsp;' . $prefs['currency']);
+                               
$GLOBALS['phpgw']->template->set_var('budget_main',$parent['budget']);
+ 
                                if(!$values['coordinator'])
                                {