[Phpgroupware-cvs] CVS: property/setup default_records.inc.php,1.6,1.7 setup.inc.php,1.19,1.20 tables_current.inc.php,1.32,1.33

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/setup
In directory subversions:/tmp/cvs-serv5594/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.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** default_records.inc.php     7 Feb 2003 11:18:44 -0000       1.6
--- default_records.inc.php     15 Feb 2003 19:51:40 -0000      1.7
***************
*** 10,14 ****
  
  #
! # Data-ark for tabell `fm_request_type`
  #
  
--- 10,14 ----
  
  #
! #`fm_request_type`
  #
  
***************
*** 17,21 ****
  
  #
! # Data-ark for tabell `fm_wo_branch`
  #
  
--- 17,21 ----
  
  #
! # `fm_wo_branch`
  #
  
***************
*** 25,31 ****
  $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_wo_branch (id, num, 
descr) VALUES (4, 'renhold', 'Renhold')");
  
- 
  #
! # Data-ark for tabell `fm_wo_wrkorders_status`
  #
  
--- 25,30 ----
  $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_wo_branch (id, num, 
descr) VALUES (4, 'renhold', 'Renhold')");
  
  #
! # `fm_wo_wrkorders_status`
  #
  
***************
*** 34,37 ****
--- 33,46 ----
  $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_wo_wrkorders_status 
(id, descr) VALUES ('request', '')");
  $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_wo_wrkorders_status 
(id, descr) VALUES ('closed', 'avsluttet')");
+ 
+ #
+ # `fm_equipment_status`
+ #
+ 
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_equipment_status (id, 
descr) VALUES ('active', 'Aktive')");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_equipment_status (id, 
descr) VALUES ('not_active', 'Not active')");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_equipment_status (id, 
descr) VALUES ('defect', 'Defect')");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_equipment_status (id, 
descr) VALUES ('scrap', 'Scrap')");
+ 
  #
  #  `fm_wo_agreement_status`

Index: setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/setup/setup.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** setup.inc.php       11 Feb 2003 20:41:19 -0000      1.19
--- setup.inc.php       15 Feb 2003 19:51:40 -0000      1.20
***************
*** 43,46 ****
--- 43,47 ----
                'boei_seksjon',
                'fm_equipment',
+               'fm_equipment_status',
                'fm_equipment_attrib',
                'fm_equipment_type',

Index: tables_current.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/setup/tables_current.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** tables_current.inc.php      12 Feb 2003 19:33:37 -0000      1.32
--- tables_current.inc.php      15 Feb 2003 19:51:40 -0000      1.33
***************
*** 277,292 ****
                                'equipment_type_id' => array('type' => 
'int','precision' => '4','nullable' => True),
                                'descr' => array('type' => 
'varchar','precision' => '255','nullable' => True),
                                'category' => array('type' => 'int','precision' 
=> '4','nullable' => True),
                                'owner' => array('type' => 'int','precision' => 
'4','nullable' => True),
                                'access' => array('type' => 
'varchar','precision' => '7','nullable' => True),
                                'location_code' => array('type' => 
'varchar','precision' => '20','nullable' => True),
!                               'objekt_id' => array('type' => 
'varchar','precision' => '4','nullable' => True),
                                'property_name' => array('type' => 
'varchar','precision' => '50','nullable' => True),
!                               'bygg_id' => array('type' => 'char','precision' 
=> '2','nullable' => True),
                                'building_name' => array('type' => 
'varchar','precision' => '50','nullable' => True),
!                               'seksjons_id' => array('type' => 
'char','precision' => '2','nullable' => True),
!                               'etasje' => array('type' => 
'varchar','precision' => '6','nullable' => True),
!                               'leie_id' => array('type' => 'char','precision' 
=> '3','nullable' => True),
!                               'street' => array('type' => 
'varchar','precision' => '50','nullable' => True),
                                'vendor_id' => array('type' => 
'int','precision' => '4','nullable' => True),
                                'date' => array('type' => 'int','precision' => 
'4','nullable' => True),
--- 277,294 ----
                                'equipment_type_id' => array('type' => 
'int','precision' => '4','nullable' => True),
                                'descr' => array('type' => 
'varchar','precision' => '255','nullable' => True),
+                               'cost' => array('type' => 'decimal', 
'precision' => 20, 'scale' => 2,'nullable' => True,'default' => '0.00'),
                                'category' => array('type' => 'int','precision' 
=> '4','nullable' => True),
                                'owner' => array('type' => 'int','precision' => 
'4','nullable' => True),
                                'access' => array('type' => 
'varchar','precision' => '7','nullable' => True),
                                'location_code' => array('type' => 
'varchar','precision' => '20','nullable' => True),
!                               'property_id' => array('type' => 
'varchar','precision' => '4','nullable' => True),
                                'property_name' => array('type' => 
'varchar','precision' => '50','nullable' => True),
!                               'building_id' => array('type' => 
'char','precision' => '2','nullable' => True),
                                'building_name' => array('type' => 
'varchar','precision' => '50','nullable' => True),
!                               'entrance_id' => array('type' => 
'char','precision' => '2','nullable' => True),
!                               'floor' => array('type' => 
'varchar','precision' => '6','nullable' => True),
!                               'apartment_id' => array('type' => 
'char','precision' => '3','nullable' => True),
!                               'street_name' => array('type' => 
'varchar','precision' => '50','nullable' => True),
!                               'street_number' => array('type' => 
'varchar','precision' => '5','nullable' => True),
                                'vendor_id' => array('type' => 
'int','precision' => '4','nullable' => True),
                                'date' => array('type' => 'int','precision' => 
'4','nullable' => True),
***************
*** 299,302 ****
--- 301,316 ----
                        'uc' => array()
                ),
+ 
+               'fm_equipment_status' => 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_equipment_attrib' => array(
                        'fd' => array(
***************
*** 321,325 ****
                                'id' => array('type' => 'int','precision' => 
'4','nullable' => False),
                                'name' => array('type' => 'varchar','precision' 
=> '20','nullable' => True),
!                               'descr' => array('type' => 
'varchar','precision' => '50','nullable' => True)
                        ),
                        'pk' => array('id'),
--- 335,340 ----
                                'id' => array('type' => 'int','precision' => 
'4','nullable' => False),
                                'name' => array('type' => 'varchar','precision' 
=> '20','nullable' => True),
!                               'descr' => array('type' => 
'varchar','precision' => '50','nullable' => True),
!                               'prefix' => array('type' => 
'varchar','precision' => '8','nullable' => True)
                        ),
                        'pk' => array('id'),
***************
*** 363,367 ****
                                'id' => array('type' => 'int','precision' => 
'4','nullable' => False),
                                'name' => array('type' => 'varchar','precision' 
=> '20','nullable' => True),
!                               'descr' => array('type' => 
'varchar','precision' => '50','nullable' => True)
                        ),
                        'pk' => array('id'),
--- 378,383 ----
                                'id' => array('type' => 'int','precision' => 
'4','nullable' => False),
                                'name' => array('type' => 'varchar','precision' 
=> '20','nullable' => True),
!                               'descr' => array('type' => 
'varchar','precision' => '50','nullable' => True),
!                               'prefix' => array('type' => 
'varchar','precision' => '8','nullable' => True)
                        ),
                        'pk' => array('id'),