[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6742] Merge 6740:6741 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6742] Merge 6740:6741 from trunk |
|
Date: |
Mon, 10 Jan 2011 10:23:00 +0000 |
Revision: 6742
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6742
Author: sigurdne
Date: 2011-01-10 10:23:00 +0000 (Mon, 10 Jan 2011)
Log Message:
-----------
Merge 6740:6741 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/booking/setup/setup.inc.php
branches/Version-1_0-branch/booking/setup/tables_current.inc.php
branches/Version-1_0-branch/booking/setup/tables_update.inc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741
Modified: branches/Version-1_0-branch/booking/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/setup/setup.inc.php 2011-01-10
10:21:40 UTC (rev 6741)
+++ branches/Version-1_0-branch/booking/setup/setup.inc.php 2011-01-10
10:23:00 UTC (rev 6742)
@@ -1,6 +1,6 @@
<?php
$setup_info['booking']['name'] = 'booking';
- $setup_info['booking']['version'] = '0.2.03';
+ $setup_info['booking']['version'] = '0.2.04';
$setup_info['booking']['app_order'] = 9;
$setup_info['booking']['enable'] = 1;
$setup_info['booking']['app_group'] = 'office';
Modified: branches/Version-1_0-branch/booking/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/setup/tables_current.inc.php
2011-01-10 10:21:40 UTC (rev 6741)
+++ branches/Version-1_0-branch/booking/setup/tables_current.inc.php
2011-01-10 10:23:00 UTC (rev 6742)
@@ -204,7 +204,7 @@
'organization_id' => array('type' =>
'int','precision' => '4','nullable' => False),
'from_' => array('type' =>
'timestamp','nullable' => False),
'to_' => array('type' => 'timestamp','nullable'
=> False),
- 'cost' => array('type' => 'decimal','precision'
=> '10', 'scale'=>'2', 'nullable' => False),
+ 'cost' => array('type' => 'decimal',
'precision' => 10, 'scale' => 2,'nullable' => True,'default' => '0.0'),
'season_id' => array('type' =>
'int','precision' => '4','nullable' => False),
'completed' => array('type' => 'int',
'precision' => '4', 'nullable' => False, 'default' => 0),
),
@@ -228,7 +228,7 @@
'active' => array('type' => 'int', 'precision'
=> 4,'nullable' => False,'default' => '1'),
'activity_id' => array('type' => 'int',
'precision' => 4,'nullable' => False),
'completed' => array('type' => 'int',
'precision' => 4,'nullable' => False,'default' => '0'),
- 'cost' => array('type' => 'decimal',
'precision' => 10, 'scale' => 2,'nullable' => False,'default' => '0.0'),
+ 'cost' => array('type' => 'decimal',
'precision' => 10, 'scale' => 2,'nullable' => True,'default' => '0.0'),
'application_id' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'reminder' => array('type' => 'int',
'precision' => 4,'nullable' => False,'default' => '0'),
'secret' => array('type' => 'text','nullable'
=> False),
@@ -276,7 +276,7 @@
'season_id' => array('type' =>
'int','precision' => '4','nullable' => False),
'organization_id' => array('type' =>
'int','precision' => '4','nullable' => False),
'wday' => array('type' => 'int','precision' =>
'4','nullable' => False),
- 'cost' => array('type' => 'decimal','precision'
=> '10', 'scale'=>'2', 'nullable' => False),
+ 'cost' => array('type' => 'decimal',
'precision' => 10, 'scale' => 2,'nullable' => True,'default' => '0.0'),
'from_' => array('type' => 'time','nullable' =>
False),
'to_' => array('type' => 'time','nullable' =>
False),
),
@@ -517,7 +517,7 @@
'description' => array('type' =>
'text','nullable' => False),
'from_' => array('type' =>
'timestamp','nullable' => False),
'to_' => array('type' => 'timestamp','nullable'
=> False),
- 'cost' => array('type' => 'decimal',
'precision' => 10, 'scale' => 2,'nullable' => False),
+ 'cost' => array('type' => 'decimal',
'precision' => 10, 'scale' => 2,'nullable' => True,'default' => '0.0'),
'building_name' => array('type' => 'varchar',
'precision' => 50,'nullable' => False),
'contact_name' => array('type' => 'varchar',
'precision' => 50,'nullable' => False),
'contact_email' => array('type' => 'varchar',
'precision' => 50,'nullable' => False),
@@ -654,7 +654,7 @@
'reservation_type' => array('type' =>
'varchar', 'precision' => '70', 'nullable' => False),
'reservation_id' => array('type'
=> 'int', 'precision' => '4', 'nullable' => False),
'season_id' => array('type'
=> 'int', 'precision' => '4'),
- 'cost' => array('type' => 'decimal','precision'
=> '10', 'scale'=>'2', 'nullable' => False),
+ 'cost' => array('type' => 'decimal',
'precision' => 10, 'scale' => 2,'nullable' => True,'default' => '0.0'),
'from_' => array('type' => 'timestamp',
'nullable' => false),
'to_' => array('type' => 'timestamp',
'nullable' => false),
'organization_id' => array('type'
=> 'int', 'precision' => '4'),
Modified: branches/Version-1_0-branch/booking/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/setup/tables_update.inc.php
2011-01-10 10:21:40 UTC (rev 6741)
+++ branches/Version-1_0-branch/booking/setup/tables_update.inc.php
2011-01-10 10:23:00 UTC (rev 6742)
@@ -2432,3 +2432,27 @@
}
}
+ $test[] = '0.2.03';
+ /**
+ * Update booking version from 0.2.02 to 0.2.03
+ * Add custom fields to request
+ *
+ */
+ function booking_upgrade0_2_03()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('bb_completed_reservation','cost',array('type'
=> 'decimal', 'precision' => 10, 'scale' => 2,'nullable' => true,'default' =>
'0.0'));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('bb_wtemplate_alloc','cost',array('type'
=> 'decimal', 'precision' => 10, 'scale' => 2,'nullable' => true,'default' =>
'0.0'));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('bb_allocation','cost',array('type'
=> 'decimal', 'precision' => 10, 'scale' => 2,'nullable' => true,'default' =>
'0.0'));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('bb_booking','cost',array('type' =>
'decimal', 'precision' => 10, 'scale' => 2,'nullable' => true,'default' =>
'0.0'));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('bb_event','cost',array('type' =>
'decimal', 'precision' => 10, 'scale' => 2,'nullable' => true,'default' =>
'0.0'));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['booking']['currentver'] =
'0.2.04';
+ return $GLOBALS['setup_info']['booking']['currentver'];
+ }
+ }
+
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6742] Merge 6740:6741 from trunk,
Sigurd Nes <=