[Fmsystem-commits] [15110] Syncromind: Merge 14936:15027 from trunk

[sigurdne]

Revision: 15110
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15110
Author:   sigurdne
Date:     2016-05-13 12:23:12 +0000 (Fri, 13 May 2016)
Log Message:
-----------
Syncromind: Merge 14936:15027 from trunk

Modified Paths:
--------------
    branches/dev-syncromind-2/property/setup/default_records.inc.php

Modified: branches/dev-syncromind-2/property/setup/default_records.inc.php
===================================================================
--- branches/dev-syncromind-2/property/setup/default_records.inc.php    
2016-05-13 12:22:41 UTC (rev 15109)
+++ branches/dev-syncromind-2/property/setup/default_records.inc.php    
2016-05-13 12:23:12 UTC (rev 15110)
@@ -36,6 +36,7 @@
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations 
(app_id, name, descr) VALUES ({$app_id}, '.custom', 'custom queries')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations 
(app_id, name, descr, allow_grant, allow_c_function, allow_c_attrib, 
c_attrib_table) VALUES ({$app_id}, '.project', 'Demand -> Workorder', 1, 1, 1, 
'fm_project')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations 
(app_id, name, descr, allow_grant, allow_c_function, allow_c_attrib, 
c_attrib_table) VALUES ({$app_id}, '.project.workorder', 'Workorder', 1, 1 ,1, 
'fm_workorder')");
+       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations 
(app_id, name, descr, allow_c_function) VALUES ({$app_id}, 
'.project.workorder.transfer', 'Transfer Workorder', 1)");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations 
(app_id, name, descr, allow_grant, allow_c_function, allow_c_attrib, 
c_attrib_table) VALUES ({$app_id}, '.project.request', 'Request', 1, 1 ,1, 
'fm_request')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations 
(app_id, name, descr, allow_grant, allow_c_function, allow_c_attrib, 
c_attrib_table) VALUES ({$app_id}, '.ticket', 'Helpdesk', 1, 1, 1, 
'fm_tts_tickets')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations 
(app_id, name, descr, allow_c_attrib, c_attrib_table) VALUES ({$app_id}, 
'.ticket.order', 'Helpdesk ad hock order', 1, 'fm_tts_tickets')");
@@ -631,7 +632,7 @@
 
        $location_id = $GLOBALS['phpgw']->locations->get_id('property', 
".location.{$location_type}");
 
-               for($i = 0; $i < count($default_attrib['id']); $i++)
+       for($i = 0; $i < count($default_attrib['id']); $i++)
        {
                $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
phpgw_cust_attribute (location_id, 
id,column_name,datatype,precision_,input_text,statustext,nullable,custom)"
                        . " VALUES ("