[Phpgroupware-cvs] CVS: property/inc header.inc.php,1.5,1.6 class.fm_wrkorder.inc.php,1.2,1.3 hook_settings.inc.php,1.1.1.1,1.2

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv31437/inc

Modified Files:
        header.inc.php class.fm_wrkorder.inc.php hook_settings.inc.php 
Log Message:
no message

Index: header.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/header.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** header.inc.php      3 Sep 2002 22:15:38 -0000       1.5
--- header.inc.php      4 Sep 2002 17:56:09 -0000       1.6
***************
*** 166,170 ****
                
$t->set_var('sub_workorder_list',$phpgw->link('/property/list_workorder.php','sub=p_workorder'));
                
$t->set_var('sub_workorder_request',$phpgw->link('/property/list_request.php','sub=p_workorder'));
!               
$t->set_var('sub_workorder_archive',$phpgw->link('/property/workorder_archive.php','sub=p_workorder'));
                $t->set_var('sublang_workorder_list',lang('Workorder'));
                $t->set_var('sublang_workorder_request',lang('Request'));
--- 166,171 ----
                
$t->set_var('sub_workorder_list',$phpgw->link('/property/list_workorder.php','sub=p_workorder'));
                
$t->set_var('sub_workorder_request',$phpgw->link('/property/list_request.php','sub=p_workorder'));
!               
$t->set_var('sub_workorder_archive',$phpgw->link('/property/list_workorder.php','sub=p_workorder&status=Avsluttet'));
! //            
$t->set_var('sub_workorder_archive',$phpgw->link('/property/workorder_archive.php','sub=p_workorder'));
                $t->set_var('sublang_workorder_list',lang('Workorder'));
                $t->set_var('sublang_workorder_request',lang('Request'));

Index: class.fm_wrkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.fm_wrkorder.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.fm_wrkorder.inc.php   3 Sep 2002 22:15:38 -0000       1.2
--- class.fm_wrkorder.inc.php   4 Sep 2002 17:56:09 -0000       1.3
***************
*** 46,50 ****
                        if ($status == 'Avsluttet')
                        {
!                               $statussort = " where status = 'Avsluttet' OR 
status = 'Avbrutt'";
                        }
                        else
--- 46,50 ----
                        if ($status == 'Avsluttet')
                        {
!                               $statussort = " where (status = 'Avsluttet' OR 
status = 'Avbrutt')";
                        }
                        else

Index: hook_settings.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_settings.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** hook_settings.inc.php       28 Aug 2002 16:43:17 -0000      1.1.1.1
--- hook_settings.inc.php       4 Sep 2002 17:56:09 -0000       1.2
***************
*** 54,68 ****
        create_input_box('Yout Cellphone','cellphone');
  
! //    
$email=$GLOBALS['phpgw_info']['user']['preferences']['email']['address'];
  
! //    $GLOBALS['phpgw']->preferences->add("property","email",$email);
! //    $GLOBALS['phpgw']->preferences->save_repository();
! //    echo 'email: '.$email .'<BR>';
  
! //    if(!$email)
! //    {
! //            create_input_box('Yout Email','email');
! //    }
  
  
  /*    $categories = CreateObject('phpgwapi.categories');
--- 54,70 ----
        create_input_box('Yout Cellphone','cellphone');
  
!       create_select_box('Workorder Approval 
From','workorder_approval_from',$_accounts);
  
! /*    
$email=$GLOBALS['phpgw_info']['user']['preferences']['email']['address'];
  
!       $GLOBALS['phpgw']->preferences->add("property","email",$email);
!       $GLOBALS['phpgw']->preferences->save_repository();
!       echo 'email: '.$email .'<BR>';
  
+       if(!$email)
+       {
+               create_input_box('Yout Email','email');
+       }
+ */
  
  /*    $categories = CreateObject('phpgwapi.categories');