[Phpgroupware-cvs] hrm/setup tables_current.inc.php setup.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    hrm
Changes by:     Sigurd Nes <sigurdne>   06/10/05 13:14:13

Modified files:
        setup          : tables_current.inc.php setup.inc.php 

Log message:
        Clean up

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/hrm/setup/tables_current.inc.php?cvsroot=phpgroupware&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/hrm/setup/setup.inc.php?cvsroot=phpgroupware&r1=1.11&r2=1.12

Patches:
Index: tables_current.inc.php
===================================================================
RCS file: /sources/phpgroupware/hrm/setup/tables_current.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- tables_current.inc.php      1 Sep 2006 12:08:27 -0000       1.18
+++ tables_current.inc.php      5 Oct 2006 13:14:13 -0000       1.19
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package hrm
        * @subpackage setup
-       * @version $Id: tables_current.inc.php,v 1.18 2006/09/01 12:08:27 
sigurdne Exp $
+       * @version $Id: tables_current.inc.php,v 1.19 2006/10/05 13:14:13 
sigurdne Exp $
        */
 
        $phpgw_baseline = array(
@@ -173,32 +173,6 @@
                        'ix' => array(),
                        'uc' => array()
                ),
-               'phpgw_hrm_acl' => array(
-                       'fd' => array(
-                               'acl_appname' => array('type' => 
'varchar','precision' => '50'),
-                               'acl_location' => array('type' => 
'varchar','precision' => '255'),
-                               'acl_account' => array('type' => 
'int','precision' => '4'),
-                               'acl_grantor' => array('type' => 
'int','precision' => '4','nullable' => True),
-                               'acl_rights' => array('type' => 
'int','precision' => '4'),
-                               'acl_type' => array('type' => 'int','precision' 
=> '2')
-                       ),
-                       'pk' => array(),
-                       'ix' => array(),
-                       'fk' => array(),
-                       'uc' => array()
-               ),
-               'phpgw_hrm_acl_location' => array(
-                       'fd' => array(
-                               'appname' => array('type' => 
'varchar','precision' => '25','nullable' => False),
-                               'id' => array('type' => 'varchar','precision' 
=> '50','nullable' => False),
-                               'descr' => array('type' => 
'varchar','precision' => '50','nullable' => False),
-                               'allow_grant' => array('type' => 
'int','precision' => '4','nullable' => True)
-                       ),
-                       'pk' => array('appname','id'),
-                       'fk' => array(),
-                       'ix' => array(),
-                       'uc' => array()
-               ),
                'phpgw_hrm_experience_category' => array(
                        'fd' => array(
                                'id' => array('type' => 'int','precision' => 
'4','nullable' => False),

Index: setup.inc.php
===================================================================
RCS file: /sources/phpgroupware/hrm/setup/setup.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- setup.inc.php       1 Sep 2006 12:08:27 -0000       1.11
+++ setup.inc.php       5 Oct 2006 13:14:13 -0000       1.12
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package hrm
        * @subpackage setup
-       * @version $Id: setup.inc.php,v 1.11 2006/09/01 12:08:27 sigurdne Exp $
+       * @version $Id: setup.inc.php,v 1.12 2006/10/05 13:14:13 sigurdne Exp $
        */
 
        $setup_info['hrm']['name']      = 'hrm';
@@ -52,8 +52,6 @@
                Training items is categorized as education, courses or work 
experiences';
 
        $setup_info['hrm']['tables'] = array(
-               'phpgw_hrm_acl',
-               'phpgw_hrm_acl_location',
                'phpgw_hrm_org',
                'phpgw_hrm_job',
                'phpgw_hrm_task',