[Fmsystem-commits] [15397] rental: tables for application

[sigurdne]

Revision: 15397
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15397
Author:   sigurdne
Date:     2016-08-01 13:18:12 +0000 (Mon, 01 Aug 2016)
Log Message:
-----------
rental: tables for application

Modified Paths:
--------------
    trunk/rental/setup/setup.inc.php
    trunk/rental/setup/tables_current.inc.php
    trunk/rental/setup/tables_update.inc.php

Modified: trunk/rental/setup/setup.inc.php
===================================================================
--- trunk/rental/setup/setup.inc.php    2016-07-30 16:42:15 UTC (rev 15396)
+++ trunk/rental/setup/setup.inc.php    2016-08-01 13:18:12 UTC (rev 15397)
@@ -1,6 +1,6 @@
 <?php
        $setup_info['rental']['name'] = 'rental';  // Module identifier
-       $setup_info['rental']['version'] = '0.1.0.23'; // Current module version
+       $setup_info['rental']['version'] = '0.1.0.24'; // Current module version
        $setup_info['rental']['app_order'] = 51;  // (?)
        $setup_info['rental']['tables'] = array(
                'rental_party', // All contract participants, tenants etc.
@@ -25,7 +25,9 @@
                'rental_price_item', // Price items in concept 'Prisbok'
                'rental_contract_types', // Contract types
                'rental_billing_info', // Term information for each billing
-               'rental_adjustment'  // Price regulations
+               'rental_adjustment',  // Price regulations
+               'rental_application',
+               'rental_application_composite'
        );
        $setup_info['rental']['enable'] = 1;
        $setup_info['rental']['app_group'] = 'office';

Modified: trunk/rental/setup/tables_current.inc.php
===================================================================
--- trunk/rental/setup/tables_current.inc.php   2016-07-30 16:42:15 UTC (rev 
15396)
+++ trunk/rental/setup/tables_current.inc.php   2016-08-01 13:18:12 UTC (rev 
15397)
@@ -472,7 +472,7 @@
                        'fk' => array(),
                        'ix' => array(),
                        'uc' => array()
-               ),/*
+               ),
                'rental_application' => array(
                        'fd' => array(
                                'id' => array('type' => 'auto', 'nullable' => 
false),
@@ -507,5 +507,19 @@
                        'fk' => array(),
                        'ix' => array(),
                        'uc' => array()
-               )*/
+               ),
+               'rental_application_composite' => array(
+                       'fd' => array(
+                               'id' => array('type' => 'auto', 'nullable' => 
false),
+                               'application_id' => array('type' => 'int', 
'precision' => '4', 'nullable' => false),
+                               'composite_id' => array('type' => 'int', 
'precision' => '4', 'nullable' => false)
+                       ),
+                       'pk' => array('id'),
+                       'fk' => array(
+                               'rental_application' => array('application_id' 
=> 'id'),
+                               'rental_composite' => array('composite_id' => 
'id')
+                       ),
+                       'ix' => array(),
+                       'uc' => array()
+               )
        );

Modified: trunk/rental/setup/tables_update.inc.php
===================================================================
--- trunk/rental/setup/tables_update.inc.php    2016-07-30 16:42:15 UTC (rev 
15396)
+++ trunk/rental/setup/tables_update.inc.php    2016-08-01 13:18:12 UTC (rev 
15397)
@@ -410,3 +410,66 @@
        }
 
 
+       $test[] = '0.1.0.23';
+       function rental_upgrade0_1_0_23()
+       {
+
+               $GLOBALS['phpgw_setup']->oProc->CreateTable(
+                                       'rental_application', array(
+                                               'fd' => array(
+                                                       'id' => array('type' => 
'auto', 'nullable' => false),
+                                                       'ecodimb' => 
array('type' => 'int', 'precision' => '4', 'nullable' => false),
+                                                       'district_id' => 
array('type' => 'int', 'precision' => '4', 'nullable' => false),
+                                                       'composite_type_id' => 
array('type' => 'int', 'precision' => '4', 'nullable' => false),
+                                                       'cleaning' => 
array('type' => 'int', 'precision' => '2', 'nullable' => false),
+                                                       'payment_method' => 
array('type' => 'int', 'precision' => '2', 'nullable' => false),
+                                                       'date_start' => 
array('type' => 'int', 'precision' => '8', 'nullable' => true),
+                                                       'date_end' => 
array('type' => 'int', 'precision' => '8', 'nullable' => true),
+                                                       'entry_date' => 
array('type' => 'int', 'precision' => '8', 'nullable' => true),
+                                                       'identifier' => 
array('type' => 'int', 'precision' => '4', 'nullable' => false),
+                                                       'adjustment_type' => 
array('type' => 'varchar', 'precision' => '255', 'nullable' => true),
+                                                       'firstname' => 
array('type' => 'varchar', 'precision' => '64', 'nullable' => true),
+                                                       'lastname' => 
array('type' => 'varchar', 'precision' => '64', 'nullable' => true),
+                                                       'title' => array('type' 
=> 'varchar', 'precision' => '255', 'nullable' => true),
+                                                       'company_name' => 
array('type' => 'varchar', 'precision' => '255', 'nullable' => true),
+                                                       'department' => 
array('type' => 'varchar', 'precision' => '255', 'nullable' => true),
+                                                       'address_1' => 
array('type' => 'varchar', 'precision' => '255', 'nullable' => true),
+                                                       'address_2' => 
array('type' => 'varchar', 'precision' => '255', 'nullable' => true),
+                                                       'postal_code' => 
array('type' => 'varchar', 'precision' => '255', 'nullable' => true),
+                                                       'place' => array('type' 
=> 'varchar', 'precision' => '255', 'nullable' => true),
+                                                       'phone' => array('type' 
=> 'varchar', 'precision' => '255', 'nullable' => true),
+                                                       'email' => array('type' 
=> 'varchar', 'precision' => '255', 'nullable' => true),
+                                                       'account_number' => 
array('type' => 'varchar', 'precision' => '255', 'nullable' => true),
+                                                       'unit_leader' => 
array('type' => 'varchar', 'precision' => '255', 'nullable' => true),
+                                                       'comment' => 
array('type' => 'text', 'nullable' => true),
+                                                       'status' => 
array('type' => 'int', 'precision' => '2', 'nullable' => false),
+
+                                               ),
+                                               'pk' => array('id'),
+                                               'fk' => array(),
+                                               'ix' => array(),
+                                               'uc' => array()
+                                       )
+                               );
+                       $GLOBALS['phpgw_setup']->oProc->CreateTable(
+                                       'rental_application_composite', array(
+                                               'fd' => array(
+                                                       'id' => array('type' => 
'auto', 'nullable' => false),
+                                                       'application_id' => 
array('type' => 'int', 'precision' => '4', 'nullable' => false),
+                                                       'composite_id' => 
array('type' => 'int', 'precision' => '4', 'nullable' => false)
+                                               ),
+                                               'pk' => array('id'),
+                                               'fk' => array(
+                                                       'rental_application' => 
array('application_id' => 'id'),
+                                                       'rental_composite' => 
array('composite_id' => 'id')
+                                               ),
+                                               'ix' => array(),
+                                               'uc' => array()
+                                       )
+                               );
+
+               $GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.24';
+               return $GLOBALS['setup_info']['rental']['currentver'];
+       }
+
+