[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/setup default_records.inc.php phpgw_no...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/setup default_records.inc.php phpgw_no... |
|
Date: |
Wed, 05 Apr 2006 13:10:10 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Branch:
Changes by: Sigurd Nes <address@hidden> 06/04/05 13:10:10
Modified files:
setup : default_records.inc.php phpgw_no.lang
setup.inc.php tables_current.inc.php
tables_update.inc.php
Log message:
no message
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/default_records.inc.php.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/phpgw_no.lang.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/setup.inc.php.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/tables_current.inc.php.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/tables_update.inc.php.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
Patches:
Index: property/setup/default_records.inc.php
diff -u property/setup/default_records.inc.php:1.23
property/setup/default_records.inc.php:1.24
--- property/setup/default_records.inc.php:1.23 Thu Mar 2 12:46:10 2006
+++ property/setup/default_records.inc.php Wed Apr 5 13:10:10 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.23 2006/03/02 12:46:10
sigurdne Exp $
+ * @version $Id: default_records.inc.php,v 1.24 2006/04/05 13:10:10
sigurdne Exp $
*/
@@ -209,6 +209,9 @@
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr)
VALUES ('.b_account', 'Budget account')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr)
VALUES ('.tenant_claim', 'Tenant claim')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr)
VALUES ('.r_agreement', 'Rental agreement')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr)
VALUES ('.budget', 'Budet')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr)
VALUES ('.budget.obligations', 'Obligations')");
+
#
Index: property/setup/phpgw_no.lang
diff -u property/setup/phpgw_no.lang:1.8 property/setup/phpgw_no.lang:1.9
--- property/setup/phpgw_no.lang:1.8 Tue Mar 14 12:52:05 2006
+++ property/setup/phpgw_no.lang Wed Apr 5 13:10:10 2006
@@ -1595,3 +1595,5 @@
You have to select type of invoice property no Du må velge art
Your message could not be sent! property no Din melding
kunne ikke sendes
Your message could not be sent by mail! property no Din
melding kunne ikke sendes med epost!
+obligations property no forpliktelser
+contractual obligations property no forpliktelser
Index: property/setup/setup.inc.php
diff -u property/setup/setup.inc.php:1.34 property/setup/setup.inc.php:1.35
--- property/setup/setup.inc.php:1.34 Sat Mar 11 23:20:49 2006
+++ property/setup/setup.inc.php Wed Apr 5 13:10:10 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.34 2006/03/11 23:20:49 skwashd Exp $
+ * @version $Id: setup.inc.php,v 1.35 2006/04/05 13:10:10 sigurdne Exp $
*/
$setup_info['property']['name'] = 'property';
$setup_info['property']['title'] = 'Property';
- $setup_info['property']['version'] = '0.9.17.516';
+ $setup_info['property']['version'] = '0.9.17.517';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
@@ -196,7 +196,9 @@
'fm_r_agreement_item',
'fm_r_agreement_item_history',
'fm_r_agreement_common',
- 'fm_r_agreement_c_history'
+ 'fm_r_agreement_c_history',
+ 'fm_budget',
+ 'fm_budget_period'
);
/* 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.50
property/setup/tables_current.inc.php:1.51
--- property/setup/tables_current.inc.php:1.50 Fri Mar 10 09:20:53 2006
+++ property/setup/tables_current.inc.php Wed Apr 5 13:10:10 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.50 2006/03/10 09:20:53
sigurdne Exp $
+ * @version $Id: tables_current.inc.php,v 1.51 2006/04/05 13:10:10
sigurdne Exp $
*/
$phpgw_baseline = array(
@@ -2138,9 +2138,9 @@
'fm_r_agreement_c_history' => array(
'fd' => array(
- 'agreement_id' => array('type' => 'int',
'precision' => 4,'nullable' => False,'default' => '0'),
- 'c_id' => array('type' => 'int', 'precision' =>
4,'nullable' => False,'default' => '0'),
- 'id' => array('type' => 'int', 'precision' =>
4,'nullable' => False,'default' => '0'),
+ 'agreement_id' => array('type' => 'int',
'precision' => 4,'nullable' => False),
+ 'c_id' => array('type' => 'int', 'precision' =>
4,'nullable' => False),
+ 'id' => array('type' => 'int', 'precision' =>
4,'nullable' => False),
'from_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'to_date' => array('type' => 'int', 'precision'
=> 4,'nullable' => True),
'user_id' => array('type' => 'int', 'precision'
=> 4,'nullable' => True),
@@ -2155,6 +2155,39 @@
'fk' => array(),
'ix' => array(),
'uc' => array()
+ ),
+ 'fm_budget' => array(
+ 'fd' => array(
+ 'year' => array('type' => 'int', 'precision' =>
4,'nullable' => True),
+ 'b_group' => 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),
+ 'actual_cost' => array('type' => 'decimal',
'precision' => 20, 'scale' => 2,'nullable' => True),
+ 'remark' => array('type' => 'text','nullable'
=> True)
+ ),
+ 'pk' =>
array('year','b_group','district_id','revision'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ ),
+ 'fm_budget_period' => array(
+ 'fd' => array(
+ 'year' => array('type' => 'int', 'precision' =>
4,'nullable' => True),
+ 'month' => array('type' => 'int', 'precision'
=> 4,'nullable' => False),
+ 'b_group' => 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'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
)
);
Index: property/setup/tables_update.inc.php
diff -u property/setup/tables_update.inc.php:1.35
property/setup/tables_update.inc.php:1.36
--- property/setup/tables_update.inc.php:1.35 Fri Mar 24 07:35:09 2006
+++ property/setup/tables_update.inc.php Wed Apr 5 13:10:10 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.35 2006/03/24 07:35:09
sigurdne Exp $
+ * @version $Id: tables_update.inc.php,v 1.36 2006/04/05 13:10:10
sigurdne Exp $
*/
/**
@@ -1086,3 +1086,59 @@
return $GLOBALS['setup_info']['property']['currentver'];
}
+ /**
+ * Update property version from 0.9.17.516 to 0.9.17.517
+ */
+
+ $test[] = '0.9.17.516';
+ function property_upgrade0_9_17_516()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
fm_acl_location (id, descr) VALUES ('.budget', 'Budget')");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
fm_acl_location (id, descr) VALUES ('.budget.obligations', 'Obligations')");
+
+ $GLOBALS['phpgw_setup']->oProc->CreateTable(
+ 'fm_budget', array(
+ 'fd' => array(
+ 'year' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'b_group' => 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),
+ 'actual_cost' => array('type' =>
'decimal', 'precision' => 20, 'scale' => 2,'nullable' => True),
+ 'remark' => array('type' =>
'text','nullable' => True)
+ ),
+ 'pk' =>
array('year','b_group','district_id','revision'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ )
+ );
+
+ $GLOBALS['phpgw_setup']->oProc->CreateTable(
+ 'fm_budget_period', array(
+ 'fd' => array(
+ 'year' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'month' => array('type' => 'int',
'precision' => 4,'nullable' => False),
+ 'b_group' => 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'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ )
+ );
+
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit();
+
+ $GLOBALS['setup_info']['property']['currentver'] = '0.9.17.517';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/setup default_records.inc.php phpgw_no...,
Sigurd Nes <=