[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.10,1.11
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.10,1.11 setup.inc.php,1.8,1.9 tables_update.inc.php,1.8,1.9 |
|
Date: |
Wed, 18 Sep 2002 15:54:17 -0400 |
Update of /cvsroot/phpgroupware/property/setup
In directory subversions:/tmp/cvs-serv10860/setup
Modified Files:
tables_current.inc.php setup.inc.php tables_update.inc.php
Log Message:
no message
Index: tables_current.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/setup/tables_current.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** tables_current.inc.php 16 Sep 2002 16:05:43 -0000 1.10
--- tables_current.inc.php 18 Sep 2002 19:54:15 -0000 1.11
***************
*** 447,450 ****
--- 447,451 ----
'id' => array('type' => 'int', 'precision' =>
4,'nullable' => False),
'num' => array('type' => 'varchar', 'precision'
=> 20,'nullable' => False),
+ 'project_id' => array('type' => 'int',
'precision' => 4,'nullable' => False),
'owner' => array('type' => 'int', 'precision'
=> 4,'nullable' => False),
'access' => array('type' => 'varchar',
'precision' => 7,'nullable' => True),
***************
*** 459,464 ****
'descr' => array('type' => 'text','nullable' =>
True),
'title' => array('type' => 'varchar',
'precision' => 255,'nullable' => False),
! 'budget' => array('type' => 'decimal',
'precision' => 20, 'scale' => 2,'nullable' => False,'default' => '0.00'),
! 'actual_cost' => array('type' => 'decimal',
'precision' => 20, 'scale' => 2,'nullable' => False,'default' => '0.00'),
'addition' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'rig_addition' => array('type' => 'int',
'precision' => 4,'nullable' => True),
--- 460,465 ----
'descr' => array('type' => 'text','nullable' =>
True),
'title' => array('type' => 'varchar',
'precision' => 255,'nullable' => False),
! 'budget' => array('type' => 'decimal',
'precision' => 20, 'scale' => 2,'nullable' => True,'default' => '0.00'),
! 'actual_cost' => array('type' => 'decimal',
'precision' => 20, 'scale' => 2,'nullable' => True,'default' => '0.00'),
'addition' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'rig_addition' => array('type' => 'int',
'precision' => 4,'nullable' => True),
***************
*** 481,485 ****
'key_responsible' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'integration' => array('type' => 'int',
'precision' => 4,'nullable' => True),
! 'charge_tenant' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'sent_by_email' => array('type' => 'int',
'precision' => 4,'nullable' => True)
),
--- 482,486 ----
'key_responsible' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'integration' => array('type' => 'int',
'precision' => 4,'nullable' => True),
! 'charge_tenant' => array('type' => 'int',
'precision' => 2,'nullable' => True),
'sent_by_email' => array('type' => 'int',
'precision' => 4,'nullable' => True)
),
***************
*** 590,607 ****
),
- 'fm_wo_wrkorderactivities' => array(
- 'fd' => array(
- 'id' => array('type' => 'auto','nullable' =>
False),
- 'wrkorder_id' => array('type' => 'int',
'precision' => 4,'nullable' => False),
- 'activity_id' => array('type' => 'int',
'precision' => 4,'nullable' => False),
- 'billable' => array('type' => 'varchar',
'precision' => 255,'nullable' => False,'default' => 'N'),
- 'vendor' => array('type' => 'int', 'precision'
=> 4,'nullable' => True)
- ),
- 'pk' => array('id'),
- 'fk' => array(),
- 'ix' => array(),
- 'uc' => array()
- ),
-
'fm_wo_hours' => array(
'fd' => array(
--- 591,594 ----
***************
*** 1068,1074 ****
'uc' => array()
),
! 'fm_request_priority_key', array(
'fd' => array(
! 'id' => array('type' => 'int','precision' =>
4,'nullable' => False),
'safety' => array('type' => 'int','precision'
=> 4,'nullable' => True),
'aesthetics' => array('type' => 'int',
'precision' => 4,'nullable' => True),
--- 1055,1061 ----
'uc' => array()
),
! 'fm_request_priority_key' => array(
'fd' => array(
! 'id' => array('type' => 'int', 'precision' =>
4,'nullable' => False),
'safety' => array('type' => 'int','precision'
=> 4,'nullable' => True),
'aesthetics' => array('type' => 'int',
'precision' => 4,'nullable' => True),
***************
*** 1078,1081 ****
--- 1065,1119 ----
'residential_environment' => array('type' =>
'int', 'precision' => 4,'nullable' => True),
'authorities_demands' => array('type' => 'int',
'precision' => 4,'nullable' => True)
+ ),
+ 'pk' => array('id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ ),
+
+ 'fm_wo_projectbranch' => array(
+ 'fd' => array(
+ 'id' => array('type' => 'auto','nullable' =>
False),
+ 'project_id' => array('type' => 'int',
'precision' => 4,'nullable' => False),
+ 'branch_id' => array('type' => 'int',
'precision' => 4,'nullable' => False)
+ ),
+ 'pk' => array('id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ ),
+ 'fm_wo_project' => array(
+ 'fd' => array(
+ 'id' => array('type' => 'int', 'precision' =>
4,'nullable' => False),
+ 'num' => array('type' => 'varchar', 'precision'
=> 20,'nullable' => False),
+ 'owner' => array('type' => 'int', 'precision'
=> 4,'nullable' => False),
+ 'access' => array('type' => 'varchar',
'precision' => 7,'nullable' => True),
+ 'category' => array('type' => 'int',
'precision' => 4,'nullable' => False),
+ 'entry_date' => array('type' => 'int',
'precision' => 4,'nullable' => False),
+ 'start_date' => array('type' => 'int',
'precision' => 4,'nullable' => False),
+ 'end_date' => array('type' => 'int',
'precision' => 4,'nullable' => False),
+ 'coordinator' => array('type' => 'int',
'precision' => 4,'nullable' => False),
+ 'status' => array('type' => 'varchar',
'precision' => 20,'nullable' => False,'default' => 'active'),
+ 'descr' => array('type' => 'text','nullable' =>
True),
+ 'title' => array('type' => 'varchar',
'precision' => 255,'nullable' => False),
+ 'budget' => array('type' => 'decimal',
'precision' => 20, 'scale' => 2,'nullable' => True,'default' => '0.00'),
+ 'actual_cost' => array('type' => 'decimal',
'precision' => 20, 'scale' => 2,'nullable' => True,'default' => '0.00'),
+ '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),
+ 'tenant_id' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'tenant_name' => array('type' => 'varchar',
'precision' => 50,'nullable' => True),
+ 'contact_phone' => array('type' => 'varchar',
'precision' => 12,'nullable' => True),
+ 'key_fetch' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'key_deliver' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'other_branch' => array('type' => 'varchar',
'precision' => 255,'nullable' => True),
+ 'key_responsible' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'charge_tenant' => array('type' => 'int',
'precision' => 2,'nullable' => True)
),
'pk' => array('id'),
Index: setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/setup/setup.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** setup.inc.php 16 Sep 2002 16:05:43 -0000 1.8
--- setup.inc.php 18 Sep 2002 19:54:15 -0000 1.9
***************
*** 10,14 ****
$setup_info['property']['name'] = 'property';
$setup_info['property']['title'] = 'Property';
! $setup_info['property']['version'] = '0.1.1.008';
$setup_info['property']['app_order'] = 14;
$setup_info['property']['enable'] = 1;
--- 10,14 ----
$setup_info['property']['name'] = 'property';
$setup_info['property']['title'] = 'Property';
! $setup_info['property']['version'] = '0.1.1.009';
$setup_info['property']['app_order'] = 14;
$setup_info['property']['enable'] = 1;
***************
*** 45,49 ****
'fm_wo_branch',
'fm_wo_wrkorderbranch',
- 'fm_wo_wrkorderactivities',
'fm_wo_hours',
'fm_wo_key_loc',
--- 45,48 ----
***************
*** 58,61 ****
--- 57,62 ----
'fm_wo_chapter',
'fm_wo_ns3420',
+ 'fm_wo_project',
+ 'fm_wo_projectbranch',
'fm_property_value',
'phpgw_fm_tts_tickets',
Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/setup/tables_update.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** tables_update.inc.php 16 Sep 2002 16:05:43 -0000 1.8
--- tables_update.inc.php 18 Sep 2002 19:54:15 -0000 1.9
***************
*** 237,240 ****
--- 237,310 ----
}
+ $test[] = '0.1.1.008';
+ function property_upgrade0_1_1_008()
+ {
+ global $setup_info, $phpgw_setup;
+
+ $phpgw_setup->oProc->AddColumn('fm_wo_wrkorders','project_id',
array('type' => 'int', 'precision' => 4,'nullable' => True));
+ $phpgw_setup->oProc->DropTable('fm_wo_wrkorderactivities');
+
+ $phpgw_setup->oProc->CreateTable(
+ 'fm_wo_projectbranch', array(
+ 'fd' => array(
+ 'id' => array('type' => 'int','precision' =>
4,'nullable' => False),
+ 'project_id' => array('type' =>
'int','precision' => 4,'nullable' => True),
+ 'branch_id' => array('type' => 'int',
'precision' => 4,'nullable' => True)
+ ),
+ 'pk' => array('id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+
+ )
+ );
+
+ $phpgw_setup->oProc->CreateTable(
+ 'fm_wo_project', array(
+ 'fd' => array(
+ 'id' => array('type' => 'int', 'precision' =>
4,'nullable' => False),
+ 'num' => array('type' => 'varchar', 'precision'
=> 20,'nullable' => False),
+ 'owner' => array('type' => 'int', 'precision'
=> 4,'nullable' => False),
+ 'access' => array('type' => 'varchar',
'precision' => 7,'nullable' => True),
+ 'category' => array('type' => 'int',
'precision' => 4,'nullable' => False),
+ 'entry_date' => array('type' => 'int',
'precision' => 4,'nullable' => False),
+ 'start_date' => array('type' => 'int',
'precision' => 4,'nullable' => False),
+ 'end_date' => array('type' => 'int',
'precision' => 4,'nullable' => False),
+ 'coordinator' => array('type' => 'int',
'precision' => 4,'nullable' => False),
+ 'status' => array('type' => 'varchar',
'precision' => 20,'nullable' => False,'default' => 'active'),
+ 'descr' => array('type' => 'text','nullable' =>
True),
+ 'title' => array('type' => 'varchar',
'precision' => 255,'nullable' => False),
+ 'budget' => array('type' => 'decimal',
'precision' => 20, 'scale' => 2,'nullable' => True,'default' => '0.00'),
+ 'actual_cost' => array('type' => 'decimal',
'precision' => 20, 'scale' => 2,'nullable' => True,'default' => '0.00'),
+ '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),
+ 'tenant_id' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'tenant_name' => array('type' => 'varchar',
'precision' => 50,'nullable' => True),
+ 'contact_phone' => array('type' => 'varchar',
'precision' => 12,'nullable' => True),
+ 'key_fetch' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'key_deliver' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'other_branch' => array('type' => 'varchar',
'precision' => 255,'nullable' => True),
+ 'key_responsible' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'charge_tenant' => array('type' => 'int',
'precision' => 4,'nullable' => True)
+ ),
+ 'pk' => array('id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ )
+ );
+
+
+ $setup_info['property']['currentver'] = '0.1.1.009';
+ return $setup_info['property']['currentver'];
+ }
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.10,1.11 setup.inc.php,1.8,1.9 tables_update.inc.php,1.8,1.9,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/inc header.inc.php,1.10,1.11 class.fm_wrkorder.inc.php,1.5,1.6
- Next by Date:
[Phpgroupware-cvs] CVS: property list_workorder.php,1.5,1.6 add_workorder.php,1.4,1.5 edit_workorder.php,1.4,1.5 list_ticket.php,1.3,1.4 view_workorder.php,1.3,1.4
- Previous by thread:
[Phpgroupware-cvs] CVS: property/inc header.inc.php,1.10,1.11 class.fm_wrkorder.inc.php,1.5,1.6
- Next by thread:
[Phpgroupware-cvs] CVS: property list_workorder.php,1.5,1.6 add_workorder.php,1.4,1.5 edit_workorder.php,1.4,1.5 list_ticket.php,1.3,1.4 view_workorder.php,1.3,1.4
- Index(es):