phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: property/setup default_records.inc.php,1.25,1.26


From: Sigurd Nes <address@hidden>
Subject: [Phpgroupware-cvs] CVS: property/setup default_records.inc.php,1.25,1.26 setup.inc.php,1.56,1.57 tables_current.inc.php,1.109,1.110
Date: Tue, 01 Jul 2003 07:19:29 -0400

Update of /cvsroot/phpgroupware/property/setup
In directory subversions:/tmp/cvs-serv7181/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.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** default_records.inc.php     30 Jun 2003 10:49:14 -0000      1.25
--- default_records.inc.php     1 Jul 2003 11:19:24 -0000       1.26
***************
*** 10,14 ****
  
  #
! #`fm_request_category`
  #
  
--- 10,14 ----
  
  #
! #fm_request_category
  #
  
***************
*** 17,21 ****
  
  #
! #`fm_meter_category`
  #
  
--- 17,21 ----
  
  #
! #fm_meter_category
  #
  
***************
*** 23,27 ****
  
  #
! # `fm_branch`
  #
  
--- 23,27 ----
  
  #
! # fm_branch
  #
  
***************
*** 32,36 ****
  
  #
! # `fm_workorder_status`
  #
  
--- 32,36 ----
  
  #
! # fm_workorder_status
  #
  
***************
*** 41,45 ****
  
  #
! # `fm_request_status`
  #
  
--- 41,45 ----
  
  #
! # fm_request_status
  #
  
***************
*** 49,53 ****
  
  #
! # `fm_drawing_status`
  #
  
--- 49,53 ----
  
  #
! # fm_drawing_status
  #
  
***************
*** 57,61 ****
  
  #
! # `fm_drawing_category`
  #
  
--- 57,61 ----
  
  #
! # fm_drawing_category
  #
  
***************
*** 65,69 ****
  
  #
! # `fm_document_category`
  #
  
--- 65,69 ----
  
  #
! # fm_document_category
  #
  
***************
*** 73,77 ****
  
  #
! # `fm_tts_category`
  #
  
--- 73,77 ----
  
  #
! # fm_tts_category
  #
  
***************
*** 82,86 ****
  
  #
! # `fm_document_status`
  #
  
--- 82,86 ----
  
  #
! # fm_document_status
  #
  
***************
*** 90,94 ****
  
  #
! # `fm_equipment_status`
  #
  
--- 90,94 ----
  
  #
! # fm_equipment_status
  #
  
***************
*** 99,103 ****
  
  #
! # `fm_standard_unit`
  #
  
--- 99,103 ----
  
  #
! # fm_standard_unit
  #
  
***************
*** 114,118 ****
  
  #
! #  `fm_agreement_status`
  #
  $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_agreement_status (id, 
descr) VALUES ('closed', 'Closed')");
--- 114,118 ----
  
  #
! #  fm_agreement_status
  #
  $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_agreement_status (id, 
descr) VALUES ('closed', 'Closed')");
***************
*** 121,125 ****
  
  #
! #  `fm_submodule`
  #
  $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_submodule (id, descr) 
VALUES ('.location', 'Location')");
--- 121,125 ----
  
  #
! #  fm_submodule
  #
  $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_submodule (id, descr) 
VALUES ('.location', 'Location')");
***************
*** 134,138 ****
  
  #
! #  `fm_ns3420`
  #
  $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_ns3420 (id, tekst1, 
enhet) VALUES ('D00', 'RIGGING, KLARGJØRING', 'RS')");
--- 134,138 ----
  
  #
! #  fm_ns3420
  #
  $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_ns3420 (id, tekst1, 
enhet) VALUES ('D00', 'RIGGING, KLARGJØRING', 'RS')");
***************
*** 140,144 ****
  
  #
! # Data-ark for tabell `fm_idgenerator`
  #
  
--- 140,144 ----
  
  #
! # Data-ark for tabell fm_idgenerator
  #
  
***************
*** 151,155 ****
  
  #
! # Dumping data for table `fm_location_config`
  #
  
--- 151,155 ----
  
  #
! # Dumping data for table fm_location_config
  #
  
***************
*** 161,165 ****
  
  #
! # Dumping data for table `fm_location_type`
  #
  
--- 161,165 ----
  
  #
! # Dumping data for table fm_location_type
  #
  
***************
*** 168,171 ****
--- 168,235 ----
  $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location_type (id, 
name, descr) VALUES (3, 'entrance', 'Entrance')");
  $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location_type (id, 
name, descr) VALUES (4, 'apartment', 'Apartment')");
+ 
+ 
+ #
+ # Dumping data for table fm_tenant_category
+ #
+ 
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tenant_category (id, 
descr) VALUES (1, 'male')");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tenant_category (id, 
descr) VALUES (2, 'female')");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tenant_category (id, 
descr) VALUES (3, 'organization')");
+ 
+ #
+ # Dumping data for table fm_ecoart
+ #
+ 
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_ecoart (id, name, 
beskrivelse) VALUES (1, 'faktura', NULL)");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_ecoart (id, name, 
beskrivelse) VALUES (2, 'kreditnota', NULL)");
+ 
+ 
+ #
+ # Dumping data for table fm_ecobilagtype
+ #
+ 
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_ecobilagtype (id, name, 
beskrivelse) VALUES (1, 'Drift, vedlikehold', NULL)");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_ecobilagtype (id, name, 
beskrivelse) VALUES (2, 'Prosjekt, Kontrakt', NULL)");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_ecobilagtype (id, name, 
beskrivelse) VALUES (3, 'Prosjekt, Tillegg', NULL)");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_ecobilagtype (id, name, 
beskrivelse) VALUES (4, 'Prosjekt, LP-stign', NULL)");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_ecobilagtype (id, name, 
beskrivelse) VALUES (5, 'Adminstrasjon', NULL)");
+ 
+ #
+ # Dumping data for table fm_ecomva
+ #
+ 
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_ecomva (id, name, 
beskrivelse) VALUES (2, 'Mva 2', NULL)");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_ecomva (id, name, 
beskrivelse) VALUES (1, 'Mva 1', NULL)");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_ecomva (id, name, 
beskrivelse) VALUES (0, 'ingen', NULL)");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_ecomva (id, name, 
beskrivelse) VALUES (3, 'Mva 3', NULL)");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_ecomva (id, name, 
beskrivelse) VALUES (4, 'Mva 4', NULL)");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_ecomva (id, name, 
beskrivelse) VALUES (5, 'Mva 5', 'Renhold')");
+ 
+ #
+ # Dumping data for table fm_location1_category
+ #
+ 
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location1_category (id, 
descr) VALUES (1, 'SOMETHING')");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location1_category (id, 
descr) VALUES (99, 'OBSOLETE')");
+ #
+ # Dumping data for table fm_location2_category
+ #
+ 
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location2_category (id, 
descr) VALUES (1, 'SOMETHING')");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location2_category (id, 
descr) VALUES (99, 'OBSOLETE')");
+ #
+ # Dumping data for table fm_location3_category
+ #
+ 
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location3_category (id, 
descr) VALUES (1, 'SOMETHING')");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location3_category (id, 
descr) VALUES (99, 'OBSOLETE')");
+ #
+ # Dumping data for table fm_location4_category
+ #
+ 
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location4_category (id, 
descr) VALUES (1, 'SOMETHING')");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location4_category (id, 
descr) VALUES (99, 'OBSOLETE')");
+ 
  
  ?>

Index: setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/setup/setup.inc.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -r1.56 -r1.57
*** setup.inc.php       1 Jul 2003 09:01:50 -0000       1.56
--- setup.inc.php       1 Jul 2003 11:19:24 -0000       1.57
***************
*** 76,79 ****
--- 76,80 ----
                'fm_streetaddress',
                'fm_tenant',
+               'fm_tenant_category',
                'fm_district',
                'fm_location',
***************
*** 97,106 ****
                'fm_equipment_type',
                'fm_equipment_type_attrib',
-               'fm_property_attrib',
-               'fm_property_category',
-               'fm_building_category',
-               'fm_entrance_category',
-               'fm_apartment_category',
-               'fm_property_type_attrib',
                'fm_building_part',
                'fm_drawing',
--- 98,101 ----

Index: tables_current.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/setup/tables_current.inc.php,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -r1.109 -r1.110
*** tables_current.inc.php      1 Jul 2003 09:01:50 -0000       1.109
--- tables_current.inc.php      1 Jul 2003 11:19:24 -0000       1.110
***************
*** 107,115 ****
                'fm_tenant' => array(
                        'fd' => array(
!                               'tenant_id' => array('type' => 
'int','precision' => '4','nullable' => False),
                                'first_name' => array('type' => 
'char','precision' => '30','nullable' => True),
                                'last_name' => array('type' => 
'char','precision' => '30','nullable' => True),
                                'contact_phone' => array('type' => 
'varchar','precision' => '12','nullable' => True),
!                               'sex_id' => array('type' => 'int','precision' 
=> '2','nullable' => True),
                                'Flytte_ID' => array('type' => 
'int','precision' => '2','nullable' => True),
                                'Kontrakttype_ID' => array('type' => 
'char','precision' => '2','nullable' => True),
--- 107,115 ----
                'fm_tenant' => array(
                        'fd' => array(
!                               'tenant_id' => array('type' => 
'auto','precision' => '4','nullable' => False),
                                'first_name' => array('type' => 
'char','precision' => '30','nullable' => True),
                                'last_name' => array('type' => 
'char','precision' => '30','nullable' => True),
                                'contact_phone' => array('type' => 
'varchar','precision' => '12','nullable' => True),
!                               'category' => array('type' => 'int','precision' 
=> '2','nullable' => True),
                                'Flytte_ID' => array('type' => 
'int','precision' => '2','nullable' => True),
                                'Kontrakttype_ID' => array('type' => 
'char','precision' => '2','nullable' => True),
***************
*** 127,130 ****
--- 127,141 ----
                        'uc' => array()
                ),
+               'fm_tenant_category' => array(
+                       'fd' => array(
+                               'id' => array('type' => 'int','precision' => 
'4','nullable' => False),
+                               'descr' => array('type' => 
'varchar','precision' => '255','nullable' => False)
+                       ),
+                       'pk' => array('id'),
+                       'fk' => array(),
+                       'ix' => array(),
+                       'uc' => array()
+               ),
+ 
                'fm_district' => array(
                        'fd' => array(
***************
*** 414,487 ****
                ),
  
-               'fm_property_attrib' => array(
-                       'fd' => array(
-                               'location_code' => array('type' => 
'varchar','precision' => '20','nullable' => False),
-                               'property_type_id' => array('type' => 
'int','precision' => '4','nullable' => False),
-                               'property_type_attrib_class_id' => array('type' 
=> 'varchar','precision' => '20','nullable' => True),
-                               'p_type_attrib_id' => array('type' => 
'varchar','precision' => '20','nullable' => False),
-                               'c' => array('type' => 'varchar','precision' => 
'50','nullable' => True),
-                               'i' => array('type' => 'int','precision' => 
'4','nullable' => True),
-                               'n' => array('type' => 'decimal','precision' => 
'10','scale' => '2','nullable' => True),
-                               'd' => array('type' => 'timestamp','nullable' 
=> True,'default' => 'current_timestamp'),
-                               't' => array('type' => 'text','nullable' => 
True)
-                       ),
-                       'pk' => 
array('location_code','property_type_id','p_type_attrib_id'),
-                       'fk' => array(),
-                       'ix' => array('location_code'),
-                       'uc' => array()
-               ),
-               'fm_property_category' => array(
-                       'fd' => array(
-                               'id' => array('type' => 'int','precision' => 
'4','nullable' => False),
-                               'descr' => array('type' => 
'varchar','precision' => '50','nullable' => True)
-                       ),
-                       'pk' => array('id'),
-                       'fk' => array(),
-                       'ix' => array(),
-                       'uc' => array()
-               ),
-               'fm_building_category' => array(
-                       'fd' => array(
-                               'id' => array('type' => 'int','precision' => 
'4','nullable' => False),
-                               'descr' => array('type' => 
'varchar','precision' => '50','nullable' => True)
-                       ),
-                       'pk' => array('id'),
-                       'fk' => array(),
-                       'ix' => array(),
-                       'uc' => array()
-               ),
-               'fm_entrance_category' => array(
-                       'fd' => array(
-                               'id' => array('type' => 'int','precision' => 
'4','nullable' => False),
-                               'descr' => array('type' => 
'varchar','precision' => '50','nullable' => True)
-                       ),
-                       'pk' => array('id'),
-                       'fk' => array(),
-                       'ix' => array(),
-                       'uc' => array()
-               ),
-               'fm_apartment_category' => array(
-                       'fd' => array(
-                               'id' => array('type' => 'int','precision' => 
'4','nullable' => False),
-                               'descr' => array('type' => 
'varchar','precision' => '50','nullable' => True)
-                       ),
-                       'pk' => array('id'),
-                       'fk' => array(),
-                       'ix' => array(),
-                       'uc' => array()
-               ),
-               'fm_property_type_attrib' => array(
-                       'fd' => array(
-                               'id' => array('type' => 'int','precision' => 
'4','nullable' => False),
-                               'type_id' => array('type' => 'int','precision' 
=> '4','nullable' => False),
-                               'name' => array('type' => 'varchar','precision' 
=> '20','nullable' => True),
-                               'descr' => array('type' => 
'varchar','precision' => '50','nullable' => True),
-                               'datatype' => array('type' => 
'char','precision' => '1','nullable' => True)
-                       ),
-                       'pk' => array('id','type_id'),
-                       'fk' => array(),
-                       'ix' => array(),
-                       'uc' => array()
-               ),
                'fm_building_part' => array(
                        'fd' => array(
--- 425,428 ----





reply via email to

[Prev in Thread] Current Thread [Next in Thread]