[Fmsystem-commits] [6765] Merge 6763:6764 from trunk

[Sigurd Nes]

Revision: 6765
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6765
Author:   sigurdne
Date:     2011-01-13 19:31:12 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
Merge 6763:6764 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/property/inc/class.uiworkorder.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-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764

Modified: branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php  
2011-01-13 19:29:36 UTC (rev 6764)
+++ branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php  
2011-01-13 19:31:12 UTC (rev 6765)
@@ -867,6 +867,8 @@
                                {
                                        $values['descr'] .= ": " . 
$ticket_notes[$i]['value_note'];
                                }
+
+                               $values['location_data'] = 
$ticket['location_data'];
                        }
 
                        if(isset($values['origin']) && $values['origin'])
@@ -1211,8 +1213,15 @@
                                $location_template_type = 'form';
                                $_location_data = array();
 
-                               if(isset($values['location_data']) && 
$values['location_data'])
+                               if(!$values['location_data'] && $origin_id)
                                {
+                                       $location_code = 
isset($values['location_code']) && $values['location_code'] ? 
$values['location_code'] : implode("-", $values['location']);
+                                       $values['extra']['view'] = true;
+                                       $values['location_data'] = 
$bolocation->read_single($location_code,$values['extra']);
+                               }
+
+                               if($values['location_data'])
+                               {
                                        $_location_data = 
$values['location_data'];
                                }
                                else