[Phpgroupware-cvs] CVS: timetrack/setup default_records.inc.php,1.1,1.2 phpgw_fr.lang,1.1,1.2 tables_update.inc.php,1.1,1.2 setup.inc.php,1.5,1.6 tables_baseline.inc.php,1.3,1.4 tables_current.inc.php,1.7,1.8 index.php,1.4,NONE

[Bob Schader <address@hidden>]

Update of /cvsroot/phpgroupware/timetrack/setup
In directory subversions:/tmp/cvs-serv19513/setup

Modified Files:
        setup.inc.php tables_baseline.inc.php tables_current.inc.php 
Added Files:
        default_records.inc.php phpgw_fr.lang tables_update.inc.php 
Removed Files:
        index.php 
Log Message:
Merged 0_9_14 branch back into head




Index: setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/timetrack/setup/setup.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** setup.inc.php       13 Jan 2002 20:33:47 -0000      1.5
--- setup.inc.php       18 Mar 2002 03:18:05 -0000      1.6
***************
*** 14,28 ****
        $setup_info['timetrack']['name']    = 'timetrack';
        $setup_info['timetrack']['title']   = 'timetrack';
!       $setup_info['timetrack']['version'] = '0.9.13';
        $setup_info['timetrack']['app_order'] = 3;
        $setup_info['timetrack']['enable']  = 1;
  
        $setup_info['timetrack']['tables'][] = 'phpgw_ttrack_customers';
!       $setup_info['timetrack']['tables'][] = 'phpgw_ttrack_employee_profiles';
        $setup_info['timetrack']['tables'][] = 'phpgw_ttrack_job_details';
        $setup_info['timetrack']['tables'][] = 'phpgw_ttrack_job_status';
        $setup_info['timetrack']['tables'][] = 'phpgw_ttrack_jobs';
        $setup_info['timetrack']['tables'][] = 'phpgw_ttrack_locations';
!       $setup_info['timetrack']['tables'][] = 'phpgw_ttrack_work_catagories';
  
        /* The hooks this app includes, needed for hooks registration */
--- 14,28 ----
        $setup_info['timetrack']['name']    = 'timetrack';
        $setup_info['timetrack']['title']   = 'timetrack';
!       $setup_info['timetrack']['version'] = '0.9.13.001';
        $setup_info['timetrack']['app_order'] = 3;
        $setup_info['timetrack']['enable']  = 1;
  
        $setup_info['timetrack']['tables'][] = 'phpgw_ttrack_customers';
!       $setup_info['timetrack']['tables'][] = 'phpgw_ttrack_emplyprof';
        $setup_info['timetrack']['tables'][] = 'phpgw_ttrack_job_details';
        $setup_info['timetrack']['tables'][] = 'phpgw_ttrack_job_status';
        $setup_info['timetrack']['tables'][] = 'phpgw_ttrack_jobs';
        $setup_info['timetrack']['tables'][] = 'phpgw_ttrack_locations';
!       $setup_info['timetrack']['tables'][] = 'phpgw_ttrack_wk_cat';
  
        /* The hooks this app includes, needed for hooks registration */

Index: tables_baseline.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/timetrack/setup/tables_baseline.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** tables_baseline.inc.php     16 Jul 2001 13:24:25 -0000      1.3
--- tables_baseline.inc.php     18 Mar 2002 03:18:05 -0000      1.4
***************
*** 39,43 ****
                        'uc' => array()
                ),
- 
                'phpgw_ttrack_employee_profiles' => array(
                        'fd' => array(
--- 39,42 ----
***************
*** 60,64 ****
                        'uc' => array()
                ),
- 
                'phpgw_ttrack_job_details' => array(
                        'fd' => array(
--- 59,62 ----
***************
*** 83,87 ****
                        'uc' => array()
                ),
- 
                'phpgw_ttrack_job_status' => array(
                        'fd' => array(
--- 81,84 ----
***************
*** 94,98 ****
                        'uc' => array()
                ),
- 
                'phpgw_ttrack_jobs' => array(
                        'fd' => array(
--- 91,94 ----
***************
*** 124,128 ****
                        'uc' => array()
                ),
- 
                'phpgw_ttrack_locations' => array(
                        'fd' => array(
--- 120,123 ----
***************
*** 135,139 ****
                        'uc' => array()
                ),
- 
                'phpgw_ttrack_work_catagories' => array(
                        'fd' => array(
--- 130,133 ----
***************
*** 145,150 ****
                        'ix' => array(),
                        'uc' => array()
!               ),
! 
        );
  ?>
--- 139,143 ----
                        'ix' => array(),
                        'uc' => array()
!               )
        );
  ?>

Index: tables_current.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/timetrack/setup/tables_current.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** tables_current.inc.php      18 Aug 2001 00:32:56 -0000      1.7
--- tables_current.inc.php      18 Mar 2002 03:18:05 -0000      1.8
***************
*** 39,44 ****
                        'uc' => array()
                ),
! 
!               'phpgw_ttrack_employee_profiles' => array(
                        'fd' => array(
                                'id' => array('type' => 'int', 'precision' => 
4,'nullable' => False),
--- 39,43 ----
                        'uc' => array()
                ),
!               'phpgw_ttrack_emplyprof' => array(
                        'fd' => array(
                                'id' => array('type' => 'int', 'precision' => 
4,'nullable' => False),
***************
*** 60,64 ****
                        'uc' => array()
                ),
- 
                'phpgw_ttrack_job_details' => array(
                        'fd' => array(
--- 59,62 ----
***************
*** 83,87 ****
                        'uc' => array()
                ),
- 
                'phpgw_ttrack_job_status' => array(
                        'fd' => array(
--- 81,84 ----
***************
*** 94,98 ****
                        'uc' => array()
                ),
- 
                'phpgw_ttrack_jobs' => array(
                        'fd' => array(
--- 91,94 ----
***************
*** 124,128 ****
                        'uc' => array()
                ),
- 
                'phpgw_ttrack_locations' => array(
                        'fd' => array(
--- 120,123 ----
***************
*** 135,140 ****
                        'uc' => array()
                ),
! 
!               'phpgw_ttrack_work_catagories' => array(
                        'fd' => array(
                                'work_catagory_id' => array('type' => 
'auto','nullable' => False),
--- 130,134 ----
                        'uc' => array()
                ),
!               'phpgw_ttrack_wk_cat' => array(
                        'fd' => array(
                                'work_catagory_id' => array('type' => 
'auto','nullable' => False),

--- index.php DELETED ---