[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/setup setup.inc.php,1.53,1.54 tables_cu
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/setup setup.inc.php,1.53,1.54 tables_current.inc.php,1.102,1.103 |
|
Date: |
Sat, 28 Jun 2003 12:11:50 -0400 |
Update of /cvsroot/phpgroupware/property/setup
In directory subversions:/tmp/cvs-serv26697/setup
Modified Files:
setup.inc.php tables_current.inc.php
Log Message:
Remove the old location hierarchy
Index: setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/setup/setup.inc.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** setup.inc.php 13 Jun 2003 11:05:30 -0000 1.53
--- setup.inc.php 28 Jun 2003 16:11:47 -0000 1.54
***************
*** 73,84 ****
$setup_info['property']['tables'] = array(
'fm_part_of_town',
- 'fm_building',
'fm_gab_location',
'fm_streetaddress',
- 'fm_apartment',
'fm_tenant',
- 'fm_property',
'fm_district',
- 'fm_entrance',
'fm_location',
'fm_location1',
--- 73,80 ----
Index: tables_current.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/setup/tables_current.inc.php,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -r1.102 -r1.103
*** tables_current.inc.php 27 Jun 2003 12:43:19 -0000 1.102
--- tables_current.inc.php 28 Jun 2003 16:11:47 -0000 1.103
***************
*** 31,80 ****
),
! 'fm_building' => array(
! 'fd' => array(
! 'location_code' => array('type' =>
'varchar','precision' => '16','nullable' => True),
! '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),
! 'gabnr' => array('type' =>
'varchar','precision' => '20','nullable' => True),
! 'Gaardsnr' => array('type' =>
'varchar','precision' => '6','nullable' => True),
! 'Bruksnr' => array('type' =>
'varchar','precision' => '6','nullable' => True),
! 'Festenr' => array('type' =>
'varchar','precision' => '6','nullable' => True),
! 'Opprinnelse' => array('type' =>
'varchar','precision' => '50','nullable' => True),
! 'byggeaar' => array('type' =>
'varchar','precision' => '4','nullable' => True),
! 'Byggekostnad' => array('type' =>
'int','precision' => '4','nullable' => True),
! 'Utbedringsaar' => array('type' =>
'varchar','precision' => '4','nullable' => True),
! 'Utbedringskostnad' => array('type' =>
'int','precision' => '4','nullable' => True),
! 'Byggtype_ID' => array('type' =>
'char','precision' => '2','nullable' => True),
! 'ByggStd_ID' => array('type' =>
'char','precision' => '2','nullable' => True),
! 'TotalBRA' => array('type' => 'int','precision'
=> '4','nullable' => True),
! 'LoftsAreal' => array('type' =>
'int','precision' => '2','nullable' => True),
! 'KjellerAreal' => array('type' =>
'int','precision' => '2','nullable' => True),
! 'TakAreal' => array('type' => 'int','precision'
=> '2','nullable' => True),
! 'Antallfloorr' => array('type' =>
'int','precision' => '2','nullable' => True),
! 'ArkitektTegninger' => array('type' =>
'int','precision' => '2','nullable' => True),
! 'Byggtegninger' => array('type' =>
'int','precision' => '2','nullable' => True),
! 'VVSTegninger' => array('type' =>
'int','precision' => '2','nullable' => True),
! 'ElektroTegninger' => array('type' =>
'int','precision' => '2','nullable' => True),
! 'Utendorstegninger' => array('type' =>
'int','precision' => '2','nullable' => True),
! 'ForsikringsTakst' => array('type' =>
'int','precision' => '4','nullable' => True),
! 'FTakstDato' => array('type' =>
'varchar','precision' => '10','nullable' => True),
! 'VerdiTakst' => array('type' =>
'int','precision' => '4','nullable' => True),
! 'VTakstDato' => array('type' =>
'varchar','precision' => '10','nullable' => True),
! 'remark' => array('type' => 'text','nullable'
=> True),
! 'tid' => array('type' => 'char','precision' =>
'1','nullable' => True),
! 'owner' => array('type' => 'int','precision' =>
'4','nullable' => True),
! 'entry_date' => array('type' =>
'int','precision' => '4','nullable' => True),
! 'access' => array('type' =>
'varchar','precision' => '7','nullable' => True),
! 'cat_id' => array('type' => 'int','precision'
=> '4','nullable' => True),
! 'property_type_id' => array('type' =>
'int','precision' => '4','nullable' => True)
! ),
! 'pk' => array('property_id','building_id'),
! 'fk' => array('property_id' =>
'fm_property.property_id'),
! 'ix' => array('location_code'),
! 'uc' => array()
! ),
'fm_gab_location' => array(
'fd' => array(
--- 31,35 ----
),
!
'fm_gab_location' => array(
'fd' => array(
***************
*** 138,205 ****
'uc' => array()
),
! 'fm_apartment' => array(
! 'fd' => array(
! 'location_code' => array('type' =>
'varchar','precision' => '16','nullable' => True),
! 'property_id' => array('type' =>
'varchar','precision' => '4','nullable' => False),
! 'building_id' => array('type' =>
'char','precision' => '2','nullable' => True),
! 'entrance_id' => array('type' =>
'char','precision' => '2','nullable' => True),
! 'apartment_id' => array('type' =>
'char','precision' => '3','nullable' => False),
! 'floor' => array('type' =>
'varchar','precision' => '6','nullable' => True),
! 'street_id' => array('type' =>
'int','precision' => '4','nullable' => True),
! 'street_number' => array('type' =>
'varchar','precision' => '10','nullable' => True),
! 'descr' => array('type' =>
'varchar','precision' => '35','nullable' => True),
! 'remark' => array('type' => 'text','nullable'
=> True),
! 'tenant_id' => array('type' =>
'int','precision' => '4','nullable' => True),
! 'Flyttenr' => array('type' =>
'char','precision' => '2','nullable' => True),
! 'AntallRom' => array('type' =>
'int','precision' => '2','nullable' => True),
! 'Boareal' => array('type' => 'int','precision'
=> '4','nullable' => True),
! 'AndelAvFellesareal' => array('type' =>
'int','precision' => '2','nullable' => True),
! 'Livslopsstd' => array('type' =>
'int','precision' => '2','nullable' => True),
! 'Heis' => array('type' => 'int','precision' =>
'2','nullable' => True),
! 'Driftsstatus_ID' => array('type' =>
'int','precision' => '2','nullable' => True),
! 'FerdigDato' => array('type' =>
'varchar','precision' => '10','nullable' => True),
! 'LedigfraDato' => array('type' =>
'varchar','precision' => '10','nullable' => True),
! 'Ledigmeldingsstatus' => array('type' =>
'int','precision' => '2','nullable' => True),
! 'Ledigmeldingskommentar' => array('type' =>
'varchar','precision' => '80','nullable' => True),
! 'LedigmeldtDato' => array('type' =>
'varchar','precision' => '10','nullable' => True),
! 'AvhendetDato' => array('type' =>
'varchar','precision' => '10','nullable' => True),
! 'Husleiesaken' => array('type' =>
'int','precision' => '2','nullable' => True),
! 'Husleie' => array('type' => 'int','precision'
=> '4','nullable' => True),
! 'StromBrensel' => array('type' =>
'int','precision' => '4','nullable' => True),
! 'Markedsleie' => array('type' =>
'int','precision' => '4','nullable' => True),
! 'JustertMarkedsleie' => array('type' =>
'int','precision' => '4','nullable' => True),
! 'IndeksDato' => array('type' =>
'varchar','precision' => '10','nullable' => True),
! 'NyHusleie' => array('type' =>
'int','precision' => '4','nullable' => True),
! 'NyHusleieFraDato' => array('type' =>
'varchar','precision' => '10','nullable' => True),
! 'NyStromBrensel' => array('type' =>
'int','precision' => '4','nullable' => True),
! 'NyStromBrenselFraDato' => array('type' =>
'varchar','precision' => '10','nullable' => True),
! 'Seksjonsnr' => array('type' =>
'varchar','precision' => '6','nullable' => True),
! 'Beregnet_BOA' => array('type' =>
'int','precision' => '2','nullable' => True),
! 'floor_beskrivelse' => array('type' =>
'varchar','precision' => '10','nullable' => True),
! 'ReturNklFraOppsynsmann' => array('type' =>
'varchar','precision' => '10','nullable' => True),
! 'Kategori' => array('type' =>
'char','precision' => '2','nullable' => True),
! 'DatoKPIregulert' => array('type' =>
'varchar','precision' => '10','nullable' => True),
! 'DatoGLregulert' => array('type' =>
'varchar','precision' => '10','nullable' => True),
! 'DatoUtsattGLregulering' => array('type' =>
'varchar','precision' => '10','nullable' => True),
! 'KPIPeriode' => array('type' =>
'varchar','precision' => '6','nullable' => True),
! 'GjengsLeie' => array('type' =>
'int','precision' => '4','nullable' => True),
! 'Klage' => array('type' => 'int','precision' =>
'2','nullable' => True),
! 'FemAarsKlausul' => array('type' =>
'int','precision' => '2','nullable' => True),
! 'DatoGLfastsatt' => array('type' =>
'varchar','precision' => '10','nullable' => True),
! 'PrisVarsling' => array('type' =>
'int','precision' => '2','nullable' => True),
! 'NyLeieSendtTilBOA' => array('type' =>
'int','precision' => '2','nullable' => True),
! 'tid' => array('type' => 'char','precision' =>
'1','nullable' => True),
! 'owner' => array('type' => 'int','precision' =>
'4','nullable' => True),
! 'entry_date' => array('type' =>
'int','precision' => '4','nullable' => True),
! 'access' => array('type' =>
'varchar','precision' => '7','nullable' => True),
! 'cat_id' => array('type' => 'int','precision'
=> '4','nullable' => True),
! 'power_meter_id' => array('type' =>
'varchar','precision' => '20','nullable' => True),
! 'property_type_id' => array('type' =>
'int','precision' => '4','nullable' => True)
! ),
! 'pk' => array('property_id','apartment_id'),
! 'fk' => array('property_id' =>
'fm_property.property_id','apartment_id' => 'fm_property.apartment_id'),
! 'ix' => array('location_code'),
! 'uc' => array()
! ),
'fm_location' => array(
'fd' => array(
--- 93,97 ----
'uc' => array()
),
!
'fm_location' => array(
'fd' => array(
***************
*** 235,263 ****
'uc' => array()
),
- 'fm_property' => array(
- 'fd' => array(
- 'location_code' => array('type' =>
'varchar','precision' => '16','nullable' => True),
- 'property_id' => array('type' =>
'varchar','precision' => '4','nullable' => False),
- 'name' => array('type' => 'varchar','precision'
=> '50','nullable' => True),
- 'general_address' => array('type' =>
'varchar','precision' => '50','nullable' => True),
- 'part_of_town_id' => array('type' =>
'int','precision' => '2','nullable' => True),
- 'Postnr_ID' => array('type' =>
'varchar','precision' => '4','nullable' => True),
- 'owner_id' => array('type' => 'int','precision'
=> '4','nullable' => True),
- 'SystemLaas' => array('type' =>
'int','precision' => '2','nullable' => True),
- 'Systemnr' => array('type' =>
'varchar','precision' => '10','nullable' => True),
- 'SystemLaasAnmerkning' => array('type' =>
'varchar','precision' => '80','nullable' => True),
- 'GenerellInfo' => array('type' =>
'text','nullable' => True),
- 'BomiljoInfo' => array('type' =>
'text','nullable' => True),
- 'tid' => array('type' => 'char','precision' =>
'1','nullable' => True),
- 'owner' => array('type' => 'int','precision' =>
'4','nullable' => True),
- 'entry_date' => array('type' =>
'int','precision' => '4','nullable' => True),
- 'access' => array('type' =>
'varchar','precision' => '7','nullable' => True),
- 'cat_id' => array('type' => 'int','precision'
=> '4','nullable' => True)
- ),
- 'pk' => array('property_id'),
- 'fk' => array(),
- 'ix' => array('location_code'),
- 'uc' => array()
- ),
'fm_district' => array(
'fd' => array(
--- 127,130 ----
***************
*** 270,295 ****
'uc' => array()
),
! 'fm_entrance' => array(
! 'fd' => array(
! 'location_code' => array('type' =>
'varchar','precision' => '16','nullable' => True),
! 'property_id' => array('type' =>
'varchar','precision' => '4','nullable' => False),
! 'building_id' => array('type' =>
'char','precision' => '2','nullable' => False),
! 'entrance_id' => array('type' =>
'char','precision' => '2','nullable' => False),
! 'descr' => array('type' =>
'varchar','precision' => '35','nullable' => True),
! 'remark' => array('type' => 'text','nullable'
=> True),
! 'Totalt_Fellesareal' => array('type' =>
'int','precision' => '2','nullable' => True),
! 'tid' => array('type' => 'char','precision' =>
'1','nullable' => True),
! 'owner' => array('type' => 'int','precision' =>
'4','nullable' => True),
! 'entry_date' => array('type' =>
'int','precision' => '4','nullable' => True),
! 'access' => array('type' =>
'varchar','precision' => '7','nullable' => True),
! 'cat_id' => array('type' => 'int','precision'
=> '4','nullable' => True),
! 'power_meter_id' => array('type' =>
'varchar','precision' => '20','nullable' => True),
! 'property_type_id' => array('type' =>
'int','precision' => '4','nullable' => True)
! ),
! 'pk' =>
array('property_id','building_id','entrance_id'),
! 'fk' => array('property_id' =>
'fm_building.property_id','building_id' => 'fm_building.building_id'),
! 'ix' => array('location_code'),
! 'uc' => array()
! ),
'fm_equipment' => array(
'fd' => array(
--- 137,141 ----
'uc' => array()
),
!
'fm_equipment' => array(
'fd' => array(
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/setup setup.inc.php,1.53,1.54 tables_current.inc.php,1.102,1.103,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: news_admin/inc class.bonews.inc.php,1.1.2.1.2.2,1.1.2.1.2.3 class.sonews.inc.php,1.1.2.1.2.4,1.1.2.1.2.5 class.uinews.inc.php,1.10.2.6.2.3,1.10.2.6.2.4 class.bo.inc.php,1.1.2.3,NONE class.so.inc.php,1.1.2.3,NONE class.ui.inc.php,1.1.2.3,NONE
- Next by Date:
[Phpgroupware-cvs] CVS: property/templates/default invoice.xsl,1.27,1.28 location.xsl,1.17,1.18 lookup.xsl,1.20,1.21 apartment.xsl,1.6,NONE building.xsl,1.10,NONE entrance.xsl,1.6,NONE property.xsl,1.12,NONE
- Previous by thread:
[Phpgroupware-cvs] CVS: news_admin/inc class.bonews.inc.php,1.1.2.1.2.2,1.1.2.1.2.3 class.sonews.inc.php,1.1.2.1.2.4,1.1.2.1.2.5 class.uinews.inc.php,1.10.2.6.2.3,1.10.2.6.2.4 class.bo.inc.php,1.1.2.3,NONE class.so.inc.php,1.1.2.3,NONE class.ui.inc.php,1.1.2.3,NONE
- Next by thread:
[Phpgroupware-cvs] CVS: property/templates/default invoice.xsl,1.27,1.28 location.xsl,1.17,1.18 lookup.xsl,1.20,1.21 apartment.xsl,1.6,NONE building.xsl,1.10,NONE entrance.xsl,1.6,NONE property.xsl,1.12,NONE
- Index(es):