[Fmsystem-commits] [11308] Merge 11305:11306 from trunk

[Sigurd Nes]

Revision: 11308
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11308
Author:   sigurdne
Date:     2013-09-19 17:21:30 +0000 (Thu, 19 Sep 2013)
Log Message:
-----------
Merge 11305:11306 from trunk

Modified Paths:
--------------
    
branches/Version-1_0-branch/catch/inc/custom/default/update_location_at_record.php

Modified: 
branches/Version-1_0-branch/catch/inc/custom/default/update_location_at_record.php
===================================================================
--- 
branches/Version-1_0-branch/catch/inc/custom/default/update_location_at_record.php
  2013-09-19 17:17:28 UTC (rev 11307)
+++ 
branches/Version-1_0-branch/catch/inc/custom/default/update_location_at_record.php
  2013-09-19 17:21:30 UTC (rev 11308)
@@ -45,12 +45,13 @@
                                $p_cat_id = $origin_arr[3];
                                if($origin_table)
                                {
-                                       $this->db2->query("SELECT 
location_code, address FROM {$origin_table} WHERE num = 
'{$target_id}'",__LINE__,__FILE__);
+                                       $this->db2->query("SELECT 
location_code, address, id AS target_id FROM {$origin_table} WHERE num = 
'{$target_id}'",__LINE__,__FILE__);
                                        $this->db2->next_record();
                                        $origin_location_code           = 
$this->db2->f('location_code');
                                        $origin_address                         
= $this->db2->f('address');
                                        $value_set['location_code'] = 
$origin_location_code;
-                                       $value_set['p_num']             = 
$target_id;
+//                                     $value_set['p_num']             = 
$target_id;
+                                       $value_set['p_num']             = 
$this->db2->f('target_id');
                                        $value_set['p_entity_id']       = 
$p_entity_id;
                                        $value_set['p_cat_id']          = 
$p_cat_id;
                                        $origin_location_code_arr       = 
explode('-',$origin_location_code);