[Fmsystem-commits] [6482] merge 6479:6480 from trunk

[Sigurd Nes]

Revision: 6482
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6482
Author:   sigurdne
Date:     2010-10-13 08:35:26 +0000 (Wed, 13 Oct 2010)
Log Message:
-----------
merge 6479:6480 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/rental/setup/default_records.inc.php

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480

Modified: branches/Version-1_0-branch/rental/setup/default_records.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/setup/default_records.inc.php    
2010-10-13 08:30:37 UTC (rev 6481)
+++ branches/Version-1_0-branch/rental/setup/default_records.inc.php    
2010-10-13 08:35:26 UTC (rev 6482)
@@ -40,7 +40,7 @@
 
 
 // Open the text file from the setup folder in the rental module of portico 
estate
-$lines = file(PHPGW_SERVER_ROOT."/rental/setup/internal_structure.txt");
+/*$lines = file(PHPGW_SERVER_ROOT."/rental/setup/internal_structure.txt");
 // Read the first line to get the headers out of the way
 $result = array();
 $dep_nr = '';
@@ -64,7 +64,7 @@
        }
        
$GLOBALS['phpgw']->locations->add(".ORG.BK.{$dep_nr}.{$unit_nr}",$unit_name,'rental',false);
 }
-
+*/
 $GLOBALS['phpgw']->locations->add('.RESPONSIBILITY',                   'Fields 
of responsibilities',                           'rental',false);
 
 $loc_id_internal       = 
$GLOBALS['phpgw']->locations->add('.RESPONSIBILITY.INTERNAL',         'Field of 
responsibility: internleie',                          'rental',false);