[Fmsystem-commits] [10231] Logistic: Fixed column from parent_id to parent_activity_id

[Torstein]

Revision: 10231
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10231
Author:   vator
Date:     2012-10-16 09:11:36 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
Logistic: Fixed column from parent_id to parent_activity_id

Modified Paths:
--------------
    trunk/logistic/inc/class.soactivity.inc.php

Modified: trunk/logistic/inc/class.soactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.soactivity.inc.php 2012-10-16 09:10:21 UTC (rev 
10230)
+++ trunk/logistic/inc/class.soactivity.inc.php 2012-10-16 09:11:36 UTC (rev 
10231)
@@ -209,7 +209,7 @@
 
                                
$activity->set_name($this->unmarshal($this->db->f('name'), 'string'));
                                
$activity->set_description($this->unmarshal($this->db->f('description'), 
'string'));
-                               
$activity->set_parent_id($this->unmarshal($this->db->f('parent_id'), 'int'));
+                               
$activity->set_parent_id($this->unmarshal($this->db->f('parent_activity_id'), 
'int'));
                                
$activity->set_project_id($this->unmarshal($this->db->f('project_id'), 'int'));
                                
$activity->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));
                                
$activity->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));