[Phpgroupware-cvs] property/setup tables_current.inc.php tables_up...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/04/06 13:34:39

Modified files:
        setup          : tables_current.inc.php tables_update.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/tables_current.inc.php.diff?tr1=1.51&tr2=1.52&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/tables_update.inc.php.diff?tr1=1.36&tr2=1.37&r1=text&r2=text

Patches:
Index: property/setup/tables_current.inc.php
diff -u property/setup/tables_current.inc.php:1.51 
property/setup/tables_current.inc.php:1.52
--- property/setup/tables_current.inc.php:1.51  Wed Apr  5 13:10:10 2006
+++ property/setup/tables_current.inc.php       Thu Apr  6 13:34:39 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.51 2006/04/05 13:10:10 
sigurdne Exp $
+       * @version $Id: tables_current.inc.php,v 1.52 2006/04/06 13:34:39 
sigurdne Exp $
        */
 
        $phpgw_baseline = array(
@@ -2158,7 +2158,8 @@
                ),
                'fm_budget' => array(
                        'fd' => array(
-                               'year' => array('type' => 'int', 'precision' => 
4,'nullable' => True),
+                               '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),
                                'district_id' => array('type' => 'int', 
'precision' => 4,'nullable' => False),
                                'revision' => array('type' => 'int', 
'precision' => 4,'nullable' => False),
@@ -2166,13 +2167,12 @@
                                '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'),
+                       'pk' => array('id'),
                        'fk' => array(),
                        'ix' => array(),
-                       'uc' => array()
+                       'uc' => array('year','b_group','district_id','revision')
                ),
                'fm_budget_period' => array(
                        'fd' => array(
Index: property/setup/tables_update.inc.php
diff -u property/setup/tables_update.inc.php:1.36 
property/setup/tables_update.inc.php:1.37
--- property/setup/tables_update.inc.php:1.36   Wed Apr  5 13:10:10 2006
+++ property/setup/tables_update.inc.php        Thu Apr  6 13:34:39 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.36 2006/04/05 13:10:10 
sigurdne Exp $
+       * @version $Id: tables_update.inc.php,v 1.37 2006/04/06 13:34:39 
sigurdne Exp $
        */
 
        /**
@@ -1101,7 +1101,8 @@
                $GLOBALS['phpgw_setup']->oProc->CreateTable(
                        'fm_budget', array(
                                'fd' => array(
-                                       'year' => array('type' => 'int', 
'precision' => 4,'nullable' => True),
+                                       'int' => array('type' => 'int', 
'precision' => 4,'nullable' => False),
+                                       'year' => array('type' => 'int', 
'precision' => 4,'nullable' => False),
                                        '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),
@@ -1109,13 +1110,12 @@
                                        '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'),
+                               'pk' => array('id'),
                                'fk' => array(),
                                'ix' => array(),
-                               'uc' => array()
+                               'uc' => 
array('year','b_group','district_id','revision')
                        )
                );