[Fmsystem-commits] [15612] Syncromind: merge 15610:15611 from trunk

[sigurdne]

Revision: 15612
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15612
Author:   sigurdne
Date:     2016-09-07 18:54:03 +0000 (Wed, 07 Sep 2016)
Log Message:
-----------
Syncromind: merge 15610:15611 from trunk

Modified Paths:
--------------
    branches/dev-syncromind-2/rental/setup/tables_update.inc.php

Property Changed:
----------------
    branches/dev-syncromind-2/


Property changes on: branches/dev-syncromind-2
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14934-14935,15165-15215,15218-15220,15222-15304,15306-15337,15339,15341-15398,15400-15421,15423-15474,15476-15607,15609
   + /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14934-14935,15165-15215,15218-15220,15222-15304,15306-15337,15339,15341-15398,15400-15421,15423-15474,15476-15607,15609,15611

Modified: branches/dev-syncromind-2/rental/setup/tables_update.inc.php
===================================================================
--- branches/dev-syncromind-2/rental/setup/tables_update.inc.php        
2016-09-07 18:52:55 UTC (rev 15611)
+++ branches/dev-syncromind-2/rental/setup/tables_update.inc.php        
2016-09-07 18:54:03 UTC (rev 15612)
@@ -641,8 +641,15 @@
                {
                        
$GLOBALS['phpgw_setup']->oProc->RenameColumn('rental_application', 
'composite_type', 'composite_type_id');
                }
+               if(isset($metadata['address_1']))
+               {
+                       
$GLOBALS['phpgw_setup']->oProc->RenameColumn('rental_application', 'address_1', 
'address1');
+               }
+               if(isset($metadata['address_2']))
+               {
+                       
$GLOBALS['phpgw_setup']->oProc->RenameColumn('rental_application', 'address_2', 
'address2');
+               }
 
-
                if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
                {
                        $GLOBALS['setup_info']['rental']['currentver'] = 
'0.1.0.28';