[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11880] Merge 11875:11879 from trunk
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [11880] Merge 11875:11879 from trunk |
Date: |
Tue, 01 Apr 2014 07:37:43 +0000 |
Revision: 11880
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11880
Author: sigurdne
Date: 2014-04-01 07:37:42 +0000 (Tue, 01 Apr 2014)
Log Message:
-----------
Merge 11875:11879 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/rental/setup/default_records.inc.php
branches/Version-1_0-branch/rental/setup/phpgw_no.lang
branches/Version-1_0-branch/rental/setup/setup.inc.php
branches/Version-1_0-branch/rental/setup/tables_update.inc.php
Modified: branches/Version-1_0-branch/rental/setup/default_records.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/setup/default_records.inc.php
2014-03-31 11:51:41 UTC (rev 11879)
+++ branches/Version-1_0-branch/rental/setup/default_records.inc.php
2014-04-01 07:37:42 UTC (rev 11880)
@@ -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: branches/Version-1_0-branch/rental/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/rental/setup/phpgw_no.lang 2014-03-31
11:51:41 UTC (rev 11879)
+++ branches/Version-1_0-branch/rental/setup/phpgw_no.lang 2014-04-01
07:37:42 UTC (rev 11880)
@@ -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: branches/Version-1_0-branch/rental/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/setup/setup.inc.php 2014-03-31
11:51:41 UTC (rev 11879)
+++ branches/Version-1_0-branch/rental/setup/setup.inc.php 2014-04-01
07:37:42 UTC (rev 11880)
@@ -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: branches/Version-1_0-branch/rental/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/setup/tables_update.inc.php
2014-03-31 11:51:41 UTC (rev 11879)
+++ branches/Version-1_0-branch/rental/setup/tables_update.inc.php
2014-04-01 07:37:42 UTC (rev 11880)
@@ -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'];
+ }
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11880] Merge 11875:11879 from trunk,
Sigurd Nes <=