[Phpgroupware-cvs] CVS: property/setup default_records.inc.php,1.11,1.12 setup.inc.php,1.33,1.34 tables_current.inc.php,1.56,1.57

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/setup
In directory subversions:/tmp/cvs-serv2236/setup

Modified Files:
        default_records.inc.php setup.inc.php tables_current.inc.php 
Log Message:
no message

Index: default_records.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/setup/default_records.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** default_records.inc.php     1 Apr 2003 16:37:37 -0000       1.11
--- default_records.inc.php     8 Apr 2003 12:38:09 -0000       1.12
***************
*** 17,20 ****
--- 17,26 ----
  
  #
+ #`fm_meter_category`
+ #
+ 
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_request_type (id, 
descr) VALUES ('El_ANLEGG', 'Power meter')");
+ 
+ #
  # `fm_wo_branch`
  #

Index: setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/setup/setup.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** setup.inc.php       2 Apr 2003 19:25:01 -0000       1.33
--- setup.inc.php       8 Apr 2003 12:38:09 -0000       1.34
***************
*** 80,83 ****
--- 80,84 ----
                'fm_location',
                'fm_meter',
+               'fm_meter_category',
                'fm_equipment',
                'fm_equipment_status',

Index: tables_current.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/setup/tables_current.inc.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -r1.56 -r1.57
*** tables_current.inc.php      3 Apr 2003 19:12:45 -0000       1.56
--- tables_current.inc.php      8 Apr 2003 12:38:09 -0000       1.57
***************
*** 35,39 ****
                                'property_id' => array('type' => 
'varchar','precision' => '4','nullable' => False),
                                'building_id' => array('type' => 
'char','precision' => '2','nullable' => False),
!                               'building_name' => array('type' => 
'varchar','precision' => '50','nullable' => True),
                                'general_address' => array('type' => 
'varchar','precision' => '50','nullable' => True),
                                'Driftstatus' => array('type' => 
'int','precision' => '2','nullable' => True),
--- 35,39 ----
                                'property_id' => array('type' => 
'varchar','precision' => '4','nullable' => False),
                                'building_id' => array('type' => 
'char','precision' => '2','nullable' => False),
!                               'name' => array('type' => 'varchar','precision' 
=> '50','nullable' => True),
                                'general_address' => array('type' => 
'varchar','precision' => '50','nullable' => True),
                                'Driftstatus' => array('type' => 
'int','precision' => '2','nullable' => True),
***************
*** 100,105 ****
                                'type' => array('type' => 'varchar','precision' 
=> '20','nullable' => True),
                                'location_code' => array('type' => 
'varchar','precision' => '20','nullable' => False),
                                'entry_date' => array('type' => 
'int','precision' => '4','nullable' => True),
!                               'user_created' => array('type' => 
'int','precision' => '4','nullable' => True)
                        ),
                        'pk' => array('id','location_code'),
--- 100,110 ----
                                'type' => array('type' => 'varchar','precision' 
=> '20','nullable' => True),
                                'location_code' => array('type' => 
'varchar','precision' => '20','nullable' => False),
+                               'address' => array('type' => 
'varchar','precision' => '50','nullable' => True),
+                               'property_id' => array('type' => 
'varchar','precision' => '4','nullable' => False),
+                               'building_id' => array('type' => 
'varchar','precision' => '2','nullable' => true),
+                               'entrance_id' => array('type' => 
'varchar','precision' => '2','nullable' => true),
                                'entry_date' => array('type' => 
'int','precision' => '4','nullable' => True),
!                               'user_created' => array('type' => 
'int','precision' => '4','nullable' => True),
!                               'remark' => array('type' => 
'varchar','precision' => '255','nullable' => true)
                        ),
                        'pk' => array('id','location_code'),
***************
*** 108,111 ****
--- 113,129 ----
                        'uc' => array()
                ),
+ 
+               'fm_meter_category' => array(
+                       'fd' => array(
+                               'id' => array('type' => 'varchar', 'precision' 
=> 20,'nullable' => False),
+                               'descr' => array('type' => 'varchar', 
'precision' => 255,'nullable' => False)
+                       ),
+                       'pk' => array('id'),
+                       'fk' => array(),
+                       'ix' => array(),
+                       'uc' => array()
+               ),
+ 
+ 
                'fm_streetaddress' => array(
                        'fd' => array(