[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/setup tables_current.inc.php tables_up...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/setup tables_current.inc.php tables_up... |
|
Date: |
Fri, 07 Apr 2006 13:27:49 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Branch:
Changes by: Sigurd Nes <address@hidden> 06/04/07 13:27:49
Modified files:
setup : tables_current.inc.php tables_update.inc.php
setup.inc.php
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/tables_current.inc.php.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/tables_update.inc.php.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/setup.inc.php.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
Patches:
Index: property/setup/setup.inc.php
diff -u property/setup/setup.inc.php:1.35 property/setup/setup.inc.php:1.36
--- property/setup/setup.inc.php:1.35 Wed Apr 5 13:10:10 2006
+++ property/setup/setup.inc.php Fri Apr 7 13:27:49 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: setup.inc.php,v 1.35 2006/04/05 13:10:10 sigurdne Exp $
+ * @version $Id: setup.inc.php,v 1.36 2006/04/07 13:27:49 sigurdne Exp $
*/
$setup_info['property']['name'] = 'property';
@@ -198,7 +198,8 @@
'fm_r_agreement_common',
'fm_r_agreement_c_history',
'fm_budget',
- 'fm_budget_period'
+ 'fm_budget_period',
+ 'fm_budget_cost'
);
/* The hooks this app includes, needed for hooks registration */
Index: property/setup/tables_current.inc.php
diff -u property/setup/tables_current.inc.php:1.52
property/setup/tables_current.inc.php:1.53
--- property/setup/tables_current.inc.php:1.52 Thu Apr 6 13:34:39 2006
+++ property/setup/tables_current.inc.php Fri Apr 7 13:27:49 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.52 2006/04/06 13:34:39
sigurdne Exp $
+ * @version $Id: tables_current.inc.php,v 1.53 2006/04/07 13:27:49
sigurdne Exp $
*/
$phpgw_baseline = array(
@@ -2160,13 +2160,13 @@
'fd' => array(
'id' => array('type' => 'int', 'precision' =>
4,'nullable' => False),
'year' => array('type' => 'int', 'precision' =>
4,'nullable' => False),
- 'b_group' => array('type' =>
'varchar','precision' => '4','nullable' => False),
+ 'b_account_id' => array('type' =>
'varchar','precision' => '4','nullable' => False),
'district_id' => array('type' => 'int',
'precision' => 4,'nullable' => False),
'revision' => array('type' => 'int',
'precision' => 4,'nullable' => False),
'access' => array('type' =>
'varchar','precision' => '7','nullable' => True),
'user_id' => array('type' => 'int', 'precision'
=> 4,'nullable' => True),
'entry_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
- 'budget_cost' => array('type' => 'decimal',
'precision' => 20, 'scale' => 2,'nullable' => True),
+ 'budget_cost' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'remark' => array('type' => 'text','nullable'
=> True)
),
'pk' => array('id'),
@@ -2176,18 +2176,30 @@
),
'fm_budget_period' => array(
'fd' => array(
- 'year' => array('type' => 'int', 'precision' =>
4,'nullable' => True),
+ 'year' => array('type' => 'int', 'precision' =>
4,'nullable' => False),
'month' => array('type' => 'int', 'precision'
=> 4,'nullable' => False),
- 'b_group' => array('type' =>
'varchar','precision' => '4','nullable' => False),
+ 'b_account_id' => array('type' =>
'varchar','precision' => '4','nullable' => False),
'percent' => array('type' => 'int','precision'
=> '4','nullable' => True),
'user_id' => array('type' => 'int', 'precision'
=> 4,'nullable' => True),
'entry_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'remark' => array('type' => 'text','nullable'
=> True)
),
- 'pk' => array('year','month','b_group'),
+ 'pk' => array('year','month','b_account_id'),
'fk' => array(),
'ix' => array(),
'uc' => array()
+ ),
+ 'fm_budget_cost' => array(
+ 'fd' => array(
+ 'id' => array('type' => 'auto','precision' =>
'4','nullable' => False),
+ 'year' => array('type' => 'int', 'precision' =>
4,'nullable' => False),
+ 'month' => array('type' => 'int', 'precision'
=> 4,'nullable' => False),
+ 'b_account_id' => array('type' =>
'varchar','precision' => '20','nullable' => False),
+ 'amount' => array('type' => 'int','precision'
=> '4','nullable' => True)
+ ),
+ 'pk' => array('id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array('year','month','b_account_id')
)
-
);
Index: property/setup/tables_update.inc.php
diff -u property/setup/tables_update.inc.php:1.37
property/setup/tables_update.inc.php:1.38
--- property/setup/tables_update.inc.php:1.37 Thu Apr 6 13:34:39 2006
+++ property/setup/tables_update.inc.php Fri Apr 7 13:27:49 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.37 2006/04/06 13:34:39
sigurdne Exp $
+ * @version $Id: tables_update.inc.php,v 1.38 2006/04/07 13:27:49
sigurdne Exp $
*/
/**
@@ -1101,42 +1101,59 @@
$GLOBALS['phpgw_setup']->oProc->CreateTable(
'fm_budget', array(
'fd' => array(
- 'int' => array('type' => 'int',
'precision' => 4,'nullable' => False),
+ 'id' => array('type' => 'int',
'precision' => 4,'nullable' => False),
'year' => array('type' => 'int',
'precision' => 4,'nullable' => False),
- 'b_group' => array('type' =>
'varchar','precision' => '4','nullable' => False),
+ 'b_account_id' => array('type' =>
'varchar','precision' => '20','nullable' => False),
'district_id' => array('type' => 'int',
'precision' => 4,'nullable' => False),
'revision' => array('type' => 'int',
'precision' => 4,'nullable' => False),
'access' => array('type' =>
'varchar','precision' => '7','nullable' => True),
'user_id' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'entry_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
- 'budget_cost' => array('type' =>
'decimal', 'precision' => 20, 'scale' => 2,'nullable' => True),
+ 'budget_cost' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'remark' => array('type' =>
'text','nullable' => True)
),
'pk' => array('id'),
'fk' => array(),
'ix' => array(),
- 'uc' =>
array('year','b_group','district_id','revision')
+ 'uc' =>
array('year','b_account_id','district_id','revision')
)
);
$GLOBALS['phpgw_setup']->oProc->CreateTable(
'fm_budget_period', array(
'fd' => array(
- 'year' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'year' => array('type' => 'int',
'precision' => 4,'nullable' => False),
'month' => array('type' => 'int',
'precision' => 4,'nullable' => False),
- 'b_group' => array('type' =>
'varchar','precision' => '4','nullable' => False),
+ 'b_account_id' => array('type' =>
'varchar','precision' => '20','nullable' => False),
'percent' => array('type' =>
'int','precision' => '4','nullable' => True),
'user_id' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'entry_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'remark' => array('type' =>
'text','nullable' => True)
),
- 'pk' => array('year','month','b_group'),
+ 'pk' => array('year','month','b_account_id'),
'fk' => array(),
'ix' => array(),
'uc' => array()
)
);
+
+ $GLOBALS['phpgw_setup']->oProc->CreateTable(
+ 'fm_budget_cost', array(
+ 'fd' => array(
+ 'id' => array('type' =>
'auto','precision' => '4','nullable' => False),
+ 'year' => array('type' => 'int',
'precision' => 4,'nullable' => False),
+ 'month' => array('type' => 'int',
'precision' => 4,'nullable' => False),
+ 'b_account_id' => array('type' =>
'varchar','precision' => '20','nullable' => False),
+ 'amount' => array('type' =>
'int','precision' => '4','nullable' => True)
+ ),
+ 'pk' => array('id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array('year','month','b_account_id')
+ )
+ );
+
$GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit();
$GLOBALS['setup_info']['property']['currentver'] = '0.9.17.517';