[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/setup default_records.inc.php setup.in...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/setup default_records.inc.php setup.in... |
|
Date: |
Tue, 28 Feb 2006 13:29:13 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Branch:
Changes by: Sigurd Nes <address@hidden> 06/02/28 13:29:13
Modified files:
setup : default_records.inc.php setup.inc.php
tables_current.inc.php tables_update.inc.php
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/default_records.inc.php.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/setup.inc.php.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/tables_current.inc.php.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/tables_update.inc.php.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
Patches:
Index: property/setup/default_records.inc.php
diff -u property/setup/default_records.inc.php:1.20
property/setup/default_records.inc.php:1.21
--- property/setup/default_records.inc.php:1.20 Sun Feb 12 18:12:02 2006
+++ property/setup/default_records.inc.php Tue Feb 28 13:29:12 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage setup
- * @version $Id: default_records.inc.php,v 1.20 2006/02/12 18:12:02
sigurdne Exp $
+ * @version $Id: default_records.inc.php,v 1.21 2006/02/28 13:29:12
sigurdne Exp $
*/
@@ -28,6 +28,7 @@
#
//$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_meter_category (id,
descr) VALUES ('1', 'Power meter')");
+$GLOBALS['phpgw_setup']->oProc->query("DELETE from phpgw_config WHERE
config_app='property'");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_config (config_app,
config_name, config_value) VALUES ('property','meter_table', 'fm_entity_1_1')");
#
@@ -87,9 +88,9 @@
# fm_branch
#
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_branch (id, num, descr)
VALUES (1, 'rør', 'rørlegger')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_branch (id, num, descr)
VALUES (1, 'rør', 'rørlegger')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_branch (id, num, descr)
VALUES (2, 'maler', 'maler')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_branch (id, num, descr)
VALUES (3, 'tomrer', 'Tømrer')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_branch (id, num, descr)
VALUES (3, 'tomrer', 'Tømrer')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_branch (id, num, descr)
VALUES (4, 'renhold', 'Renhold')");
#
@@ -202,8 +203,8 @@
#
# fm_ns3420
#
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_ns3420 (id, tekst1,
enhet) VALUES ('D00', 'RIGGING, KLARGJØRING', 'RS')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_ns3420 (id, tekst1,
enhet,tekst2) VALUES ('D20', 'RIGGING, ANLEGGSTOMT', 'RS','TILFØRSEL- OG
FORSYNINGSANLEGG')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_ns3420 (id, tekst1,
enhet) VALUES ('D00', 'RIGGING, KLARGJÃRING', 'RS')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_ns3420 (id, tekst1,
enhet,tekst2) VALUES ('D20', 'RIGGING, ANLEGGSTOMT', 'RS','TILFÃRSEL- OG
FORSYNINGSANLEGG')");
#
# Data-ark for tabell fm_idgenerator
@@ -553,14 +554,17 @@
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location_attrib (
type_id, id, column_name, input_text, statustext, datatype, list, attrib_sort,
size, precision_, scale, default_value, nullable,custom) VALUES (1, 12,
'part_of_town_id', 'part_of_town_id', 'part_of_town_id', 'I', NULL, NULL, NULL,
4, NULL, NULL, 'True', NULL)");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location_attrib (
type_id, id, column_name, input_text, statustext, datatype, list, attrib_sort,
size, precision_, scale, default_value, nullable,custom) VALUES (1, 13,
'owner_id', 'owner_id', 'owner_id', 'I', NULL, NULL, NULL, 4, NULL, NULL,
'True', NULL)");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location_attrib (
type_id, id, column_name, input_text, statustext, datatype, list, attrib_sort,
size, precision_, scale, default_value, nullable,custom) VALUES (1, 14,
'change_type', 'change_type', 'change_type', 'I', NULL, NULL, NULL, 4, NULL,
NULL, 'True', NULL)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location_attrib (
type_id, id, column_name, input_text, statustext, datatype, list, attrib_sort,
precision_, scale, default_value, nullable,custom) VALUES (1, 15,
'rental_area', 'Rental area', 'Rental area', 'N', NULL, 5, 20, 2, NULL, 'True',
1)");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location_attrib (
type_id, id, column_name, input_text, statustext, datatype, list, attrib_sort,
size, precision_, scale, default_value, nullable,custom) VALUES (2, 9,
'status', 'Status', 'Status', 'LB', NULL, 1, NULL, NULL, NULL, NULL, 'True',
1)");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location_attrib (
type_id, id, column_name, input_text, statustext, datatype, list, attrib_sort,
size, precision_, scale, default_value, nullable,custom) VALUES (2, 10,
'remark', 'Remark', 'Remark', 'T', NULL, 2, NULL, NULL, NULL, NULL, 'True',
1)");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location_attrib (
type_id, id, column_name, input_text, statustext, datatype, list, attrib_sort,
size, precision_, scale, default_value, nullable,custom) VALUES (2, 11,
'change_type', 'change_type', 'change_type', 'I', NULL, NULL, NULL, 4, NULL,
NULL, 'True', NULL)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location_attrib (
type_id, id, column_name, input_text, statustext, datatype, list, attrib_sort,
precision_, scale, default_value, nullable,custom) VALUES (2, 12,
'rental_area', 'Rental area', 'Rental area', 'N', NULL, 3, 20, 2, NULL, 'True',
1)");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location_attrib (
type_id, id, column_name, input_text, statustext, datatype, list, attrib_sort,
size, precision_, scale, default_value, nullable,custom) VALUES (3, 10,
'status', 'Status', 'Status', 'LB', NULL, 1, NULL, NULL, NULL, NULL, 'True',
1)");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location_attrib (
type_id, id, column_name, input_text, statustext, datatype, list, attrib_sort,
size, precision_, scale, default_value, nullable,custom) VALUES (3, 11,
'remark', 'Remark', 'Remark', 'T', NULL, 2, NULL, NULL, NULL, NULL, 'True',
1)");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location_attrib (
type_id, id, column_name, input_text, statustext, datatype, list, attrib_sort,
size, precision_, scale, default_value, nullable,custom) VALUES (3, 12,
'change_type', 'change_type', 'change_type', 'I', NULL, NULL, NULL, 4, NULL,
NULL, 'True', NULL)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location_attrib (
type_id, id, column_name, input_text, statustext, datatype, list, attrib_sort,
precision_, scale, default_value, nullable,custom) VALUES (3, 13,
'rental_area', 'Rental area', 'Rental area', 'N', NULL, 3, 20, 2, NULL, 'True',
1)");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location_attrib (
type_id, id, column_name, input_text, statustext, datatype, list, attrib_sort,
size, precision_, scale, default_value, nullable,custom) VALUES (4, 11,
'status', 'Status', 'Status', 'LB', NULL, 1, NULL, NULL, NULL, NULL, 'True',
1)");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location_attrib (
type_id, id, column_name, input_text, statustext, datatype, list, attrib_sort,
size, precision_, scale, default_value, nullable,custom) VALUES (4, 12,
'remark', 'Remark', 'Remark', 'T', NULL, 2, NULL, NULL, NULL, NULL, 'True',
1)");
@@ -568,6 +572,7 @@
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location_attrib (
type_id, id, column_name, input_text, statustext, datatype, list, attrib_sort,
size, precision_, scale, default_value, nullable,custom) VALUES (4, 14,
'street_number', 'street_number', 'street_number', 'I', NULL, NULL, NULL, 4,
NULL, NULL, 'True', NULL)");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location_attrib (
type_id, id, column_name, input_text, statustext, datatype, list, attrib_sort,
size, precision_, scale, default_value, nullable,custom) VALUES (4, 15,
'tenant_id', 'tenant_id', 'tenant_id', 'I', NULL, NULL, NULL, 4, NULL, NULL,
'True', NULL)");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location_attrib (
type_id, id, column_name, input_text, statustext, datatype, list, attrib_sort,
size, precision_, scale, default_value, nullable,custom) VALUES (4, 16,
'change_type', 'change_type', 'change_type', 'I', NULL, NULL, NULL, 4, NULL,
NULL, 'True', NULL)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_location_attrib (
type_id, id, column_name, input_text, statustext, datatype, list, attrib_sort,
precision_, scale, default_value, nullable,custom) VALUES (4, 17,
'rental_area', 'Rental area', 'Rental area', 'N', NULL, 4, 20, 2, NULL, 'True',
1)");
#
# Dumping data for table fm_location_choice
Index: property/setup/setup.inc.php
diff -u property/setup/setup.inc.php:1.30 property/setup/setup.inc.php:1.31
--- property/setup/setup.inc.php:1.30 Tue Feb 21 14:48:22 2006
+++ property/setup/setup.inc.php Tue Feb 28 13:29:12 2006
@@ -8,12 +8,12 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage setup
- * @version $Id: setup.inc.php,v 1.30 2006/02/21 14:48:22 sigurdne Exp $
+ * @version $Id: setup.inc.php,v 1.31 2006/02/28 13:29:12 sigurdne Exp $
*/
$setup_info['property']['name'] = 'property';
$setup_info['property']['title'] = 'Property';
- $setup_info['property']['version'] = '0.9.17.513';
+ $setup_info['property']['version'] = '0.9.17.514';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
Index: property/setup/tables_current.inc.php
diff -u property/setup/tables_current.inc.php:1.47
property/setup/tables_current.inc.php:1.48
--- property/setup/tables_current.inc.php:1.47 Tue Feb 21 14:48:22 2006
+++ property/setup/tables_current.inc.php Tue Feb 28 13:29:12 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage setup
- * @version $Id: tables_current.inc.php,v 1.47 2006/02/21 14:48:22
sigurdne Exp $
+ * @version $Id: tables_current.inc.php,v 1.48 2006/02/28 13:29:12
sigurdne Exp $
*/
$phpgw_baseline = array(
@@ -234,6 +234,7 @@
'remark' => array('type' => 'text','nullable'
=> True),
'kostra_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'change_type' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'rental_area' => array('type' =>
'decimal','precision' => '20','scale' => '2','nullable' => True,'default' =>
'0.00')
),
'pk' => array('loc1'),
'fk' => array(),
@@ -255,6 +256,7 @@
'remark' => array('type' => 'text','nullable'
=> True),
'kostra_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'change_type' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'rental_area' => array('type' =>
'decimal','precision' => '20','scale' => '2','nullable' => True,'default' =>
'0.00'),
'exp_date' => array('type' =>
'timestamp','nullable' => True,'default' => 'current_timestamp')
),
'pk' => array(),
@@ -284,6 +286,7 @@
'status' => array('type' => 'int','precision'
=> '4','nullable' => True),
'remark' => array('type' => 'text','nullable'
=> True),
'change_type' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'rental_area' => array('type' =>
'decimal','precision' => '20','scale' => '2','nullable' => True,'default' =>
'0.00')
),
'pk' => array('loc1','loc2'),
'fk' => array('loc1' => 'fm_location1.loc1'),
@@ -302,6 +305,7 @@
'status' => array('type' => 'int','precision'
=> '4','nullable' => True),
'remark' => array('type' => 'text','nullable'
=> True),
'change_type' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'rental_area' => array('type' =>
'decimal','precision' => '20','scale' => '2','nullable' => True,'default' =>
'0.00'),
'exp_date' => array('type' =>
'timestamp','nullable' => True,'default' => 'current_timestamp')
),
'pk' => array(),
@@ -332,6 +336,7 @@
'status' => array('type' => 'int','precision'
=> '4','nullable' => True),
'remark' => array('type' => 'text','nullable'
=> True),
'change_type' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'rental_area' => array('type' =>
'decimal','precision' => '20','scale' => '2','nullable' => True,'default' =>
'0.00')
),
'pk' => array('loc1','loc2','loc3'),
'fk' => array('loc1' => 'fm_location2.loc1','loc2' =>
'fm_location2.loc2'),
@@ -351,6 +356,7 @@
'status' => array('type' => 'int','precision'
=> '4','nullable' => True),
'remark' => array('type' => 'text','nullable'
=> True),
'change_type' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'rental_area' => array('type' =>
'decimal','precision' => '20','scale' => '2','nullable' => True,'default' =>
'0.00'),
'exp_date' => array('type' =>
'timestamp','nullable' => True,'default' => 'current_timestamp')
),
'pk' => array(),
@@ -386,6 +392,7 @@
'status' => array('type' => 'int','precision'
=> '4','nullable' => True),
'remark' => array('type' => 'text','nullable'
=> True),
'change_type' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'rental_area' => array('type' =>
'decimal','precision' => '20','scale' => '2','nullable' => True,'default' =>
'0.00')
),
'pk' => array('loc1','loc2','loc3','loc4'),
'fk' => array('loc1' => 'fm_location3.loc1','loc2' =>
'fm_location3.loc2','loc3' => 'fm_location3.loc3'),
@@ -409,6 +416,7 @@
'status' => array('type' => 'int','precision'
=> '4','nullable' => True),
'remark' => array('type' => 'text','nullable'
=> True),
'change_type' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'rental_area' => array('type' =>
'decimal','precision' => '20','scale' => '2','nullable' => True,'default' =>
'0.00'),
'exp_date' => array('type' =>
'timestamp','nullable' => True,'default' => 'current_timestamp')
),
'pk' => array(),
Index: property/setup/tables_update.inc.php
diff -u property/setup/tables_update.inc.php:1.30
property/setup/tables_update.inc.php:1.31
--- property/setup/tables_update.inc.php:1.30 Tue Feb 21 14:48:22 2006
+++ property/setup/tables_update.inc.php Tue Feb 28 13:29:12 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage setup
- * @version $Id: tables_update.inc.php,v 1.30 2006/02/21 14:48:22
sigurdne Exp $
+ * @version $Id: tables_update.inc.php,v 1.31 2006/02/28 13:29:12
sigurdne Exp $
*/
/**
@@ -1014,3 +1014,38 @@
$GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit();
return $GLOBALS['setup_info']['property']['currentver'];
}
+
+ /**
+ * Update property version from 0.9.17.513 to 0.9.17.514
+ */
+
+ $test[] = '0.9.17.513';
+ function property_upgrade0_9_17_513()
+ {
+
+
+ $soadmin_location =
CreateObject('property.soadmin_location','property');
+
+ for ($i=1; $i<=4; $i++)
+ {
+ $attrib= array(
+ 'column_name' => 'rental_area',
+ 'input_text' => 'Rental area',
+ 'statustext' => 'Rental area',
+ 'type_id' => $i,
+ 'lookup_form' => False,
+ 'list' => False,
+ 'column_info' => array('type' =>'N',
+ 'precision' => 20,
+ 'scale' => 2,
+ 'default' => '0.00',
+ 'nullable' => 'True')
+ );
+ $soadmin_location->add_attrib($attrib);
+ }
+
+
+ $GLOBALS['setup_info']['property']['currentver'] = '0.9.17.514';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/setup default_records.inc.php setup.in...,
Sigurd Nes <=