[Fmsystem-commits] [11879] Added new contract-term, free-of-charge

[Erik Holm-Larsen]

Revision: 11879
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11879
Author:   erikhl
Date:     2014-03-31 11:51:41 +0000 (Mon, 31 Mar 2014)
Log Message:
-----------
Added new contract-term, free-of-charge

Modified Paths:
--------------
    trunk/rental/setup/default_records.inc.php
    trunk/rental/setup/phpgw_no.lang
    trunk/rental/setup/setup.inc.php
    trunk/rental/setup/tables_update.inc.php

Modified: trunk/rental/setup/default_records.inc.php
===================================================================
--- trunk/rental/setup/default_records.inc.php  2014-03-28 14:19:56 UTC (rev 
11878)
+++ trunk/rental/setup/default_records.inc.php  2014-03-31 11:51:41 UTC (rev 
11879)
@@ -243,7 +243,7 @@
 $oProc->query("INSERT INTO rental_billing_term (title, months) VALUES 
('monthly','1')");
 $oProc->query("INSERT INTO rental_billing_term (title, months) VALUES 
('annually','12')");
 $oProc->query("INSERT INTO rental_billing_term (title, months) VALUES 
('half-year','6')");
-$oProc->query("INSERT INTO rental_billing_term (title, months) VALUES 
('quarterly','3')");
+$oProc->query("INSERT INTO rental_billing_term (title, months) VALUES 
('free_of_charge','0')");
 
 //$oProc->query("INSERT INTO rental_price_item (title, agresso_id, is_area, 
price) VALUES ('Fellesareal', '123456789', true, 34.59)");
 //$oProc->query("INSERT INTO rental_price_item (title, agresso_id, is_area, 
price) VALUES ('Administrasjon', 'Y900', true, 23.00)");

Modified: trunk/rental/setup/phpgw_no.lang
===================================================================
--- trunk/rental/setup/phpgw_no.lang    2014-03-28 14:19:56 UTC (rev 11878)
+++ trunk/rental/setup/phpgw_no.lang    2014-03-31 11:51:41 UTC (rev 11879)
@@ -592,4 +592,5 @@
 year   rental  no      År
 yes    rental  no      Ja
 your_notifications     rental  no      Dine varsler
-Download Excel export   rental  no  Last ned eksportfil i Excel-format
\ No newline at end of file
+Download Excel export  rental  no      Last ned eksportfil i Excel-format
+free_of_charge rental  no      Vederlagsfritt
\ No newline at end of file

Modified: trunk/rental/setup/setup.inc.php
===================================================================
--- trunk/rental/setup/setup.inc.php    2014-03-28 14:19:56 UTC (rev 11878)
+++ trunk/rental/setup/setup.inc.php    2014-03-31 11:51:41 UTC (rev 11879)
@@ -1,6 +1,6 @@
 <?php
        $setup_info['rental']['name'] = 'rental';               // Module 
identifier
-       $setup_info['rental']['version'] = '0.1.0.16';  // Current module 
version
+       $setup_info['rental']['version'] = '0.1.0.17';  // Current module 
version
        $setup_info['rental']['app_order'] = 51;                // (?)
        $setup_info['rental']['tables'] = array(
                'rental_party',                                         // All 
contract participants, tenants etc.

Modified: trunk/rental/setup/tables_update.inc.php
===================================================================
--- trunk/rental/setup/tables_update.inc.php    2014-03-28 14:19:56 UTC (rev 
11878)
+++ trunk/rental/setup/tables_update.inc.php    2014-03-31 11:51:41 UTC (rev 
11879)
@@ -286,4 +286,14 @@
                $GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.16';
                return $GLOBALS['setup_info']['rental']['currentver'];
        }
-
+    
+    $test[] = '0.1.0.16';
+       function rental_upgrade0_1_0_16()
+       {       
+               $sql = "INSERT INTO rental_billing_term (title, months) VALUES 
('free_of_charge','0')";
+               $db = clone $GLOBALS['phpgw']->db;
+               $result = $db->query($sql, __LINE__, __FILE__);
+                               
+               $GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.17';
+               return $GLOBALS['setup_info']['rental']['currentver'];
+       }