[Fmsystem-commits] [10405]

[Torstein]

Revision: 10405
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10405
Author:   vator
Date:     2012-11-01 10:32:10 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------


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

Modified: trunk/logistic/inc/class.uiactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.uiactivity.inc.php 2012-11-01 10:18:56 UTC (rev 
10404)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2012-11-01 10:32:10 UTC (rev 
10405)
@@ -135,7 +135,7 @@
                                                        'sortable' => false
                                                ),
                                                array(
-                                                       'key' => 
'responsible_user_id',
+                                                       'key' => 
'responsible_user_name',
                                                        'label' => 
lang('Responsible user'),
                                                        'sortable' => false
                                                ),
@@ -296,16 +296,16 @@
                                                
                                                if($total_num_alloc == 
$total_num_required)
                                                {
-                                                       $status = "Krav dekket";
+                                                       $status = "Behov 
dekket";
                                                }
                                                else
                                                {
-                                                       $status = "Mangler i 
krav (" . ($total_num_required - $total_num_alloc) . ")" ;
+                                                       $status = "Udekket 
behov (" . ($total_num_required - $total_num_alloc) . ")" ;
                                                }
                                        }
                                        else
                                        {
-                                               $status = "Ingen registerte 
krav";
+                                               $status = "Ingen registerte 
behov";
                                        }
                                        
                                        $activity_arr = $activity->serialize();