[Phpgroupware-cvs] CVS: property/inc header.inc.php,1.12,1.13 functions.inc.php,1.5,1.6

[Sigurd Nes <address@hidden>]

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

Modified Files:
        header.inc.php functions.inc.php 
Log Message:
no message

Index: header.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/header.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** header.inc.php      20 Sep 2002 17:05:35 -0000      1.12
--- header.inc.php      24 Sep 2002 15:44:46 -0000      1.13
***************
*** 208,212 ****
                $t->set_var('tr_color2',$phpgw_info['theme']['row_off']);
                $admin_info = lang('Workorder');
! 
        }
        else
--- 208,221 ----
                $t->set_var('tr_color2',$phpgw_info['theme']['row_off']);
                $admin_info = lang('Workorder');
!               if($admin_workorder)
!               {
!                       
$t->set_var('sub_workorder_recurrence',$phpgw->link('/property/list_recurrence.php','sub=p_workorder'));
!                       
$t->set_var('sublang_workorder_recurrence',lang('Recurrence'));
!               }
!               else
!               {
!                       $t->set_var('sub_workorder_recurrence','');
!                       $t->set_var('sublang_workorder_recurrence','');
!               }
        }
        else
***************
*** 222,225 ****
--- 231,238 ----
          $t->set_var('sublang_workorder_template','');
          $t->set_var('sublang_workorder_project','');
+               $t->set_var('sub_workorder_recurrence','');
+               $t->set_var('sublang_workorder_recurrence','');
+ 
+ 
        }
  

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/functions.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** functions.inc.php   6 Sep 2002 20:33:35 -0000       1.5
--- functions.inc.php   24 Sep 2002 15:44:46 -0000      1.6
***************
*** 685,691 ****
  //------------------------------------------------------
  
!       function create_voucherid($year)
        {
- //            global $GLOBALS['phpgw'], $year;
                $GLOBALS['phpgw']->db->query("select value from IDGenerator 
where name = 'Bilagsnummer'");
                $GLOBALS['phpgw']->db->next_record();
--- 685,690 ----
  //------------------------------------------------------
  
!       function create_voucherid()
        {
                $GLOBALS['phpgw']->db->query("select value from IDGenerator 
where name = 'Bilagsnummer'");
                $GLOBALS['phpgw']->db->next_record();
***************
*** 771,779 ****
        }
  
! 
! 
! 
  // ---------invoice
- 
- 
  ?>
--- 770,792 ----
        }
  
!       function get_list_role($role='',$join='')
!       {
!               $db2=$GLOBALS['phpgw']->db;
!               $sql = "SELECT * FROM phpgw_accounts $join fm_admin on 
phpgw_accounts.account_id=fm_admin.account_id where $role ='1'";
!               $db2->query($sql,__LINE__,__FILE__);
!               while ($db2->next_record())
!               {
!                       $employees[] = Array(
!                               'account_id'        => $db2->f('account_id'),
!                               'account_lid'       => $db2->f('account_lid'),
!                               'account_type'      => $db2->f('account_type'),
!                               'account_firstname' => 
$db2->f('account_firstname'),
!                               'account_lastname'  => 
$db2->f('account_lastname'),
!                               'account_status'    => 
$db2->f('account_status'),
!                               'account_expires'   => 
$db2->f('account_expires')
!                       );
!               }
!               return $employees;
!       }
  // ---------invoice
  ?>