[Fmsystem-commits] [10941] Property: budget handling

[Sigurd Nes]

Revision: 10941
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10941
Author:   sigurdne
Date:     2013-02-28 17:54:19 +0000 (Thu, 28 Feb 2013)
Log Message:
-----------
Property: budget handling

Modified Paths:
--------------
    trunk/property/inc/class.soproject.inc.php
    trunk/property/inc/class.uiproject.inc.php

Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php  2013-02-28 16:53:55 UTC (rev 
10940)
+++ trunk/property/inc/class.soproject.inc.php  2013-02-28 17:54:19 UTC (rev 
10941)
@@ -2932,7 +2932,7 @@
                {
                        if($transfer_budget_year && $execute && $new_budget)
                        {
-                               echo "<H1> Overføre budsjett for valgte 
prosjekt/bestillinger til år {$transfer_budget_year} </H1>";
+               //              echo "<H1> Overføre budsjett for valgte 
prosjekt/bestillinger til år {$transfer_budget_year} </H1>";
                                $soworkorder = 
CreateObject('property.soworkorder');
 
                                foreach($ids as $_id)

Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php  2013-02-28 16:53:55 UTC (rev 
10940)
+++ trunk/property/inc/class.uiproject.inc.php  2013-02-28 17:54:19 UTC (rev 
10941)
@@ -2519,9 +2519,9 @@
                                                                                
                                array('key' => 
'title','label'=>lang('title'),'sortable'=>true,'resizeable'=>true),
                                                                                
                                array('key' => 
'status','label'=>lang('status'),'sortable'=>true,'resizeable'=>true),
                                                                                
                                array('key' => 
'num_open','label'=>lang('open'),'sortable'=>true,'resizeable'=>true 
,'formatter'=>'FormatterRight'),
-                                                                               
                                array('key' => 
'project_type','label'=>lang('project 
type'),'sortable'=>false,'resizeable'=>true),
+                                                                               
                                array('key' => 
'project_type','label'=>lang('project 
type'),'sortable'=>true,'resizeable'=>true),
                                                                                
                                array('key' => 
'budget','label'=>lang('budget'),'sortable'=>false,'resizeable'=>true),
-                                                                               
                                array('key' => 
'obligation','label'=>lang('obligation'),'sortable'=>false,'resizeable'=>true),
+                                                                               
                                array('key' => 
'obligation','label'=>lang('obligation'),'sortable'=>true,'resizeable'=>true),
                                                                                
                                array('key' => 
'new_budget','label'=>lang('new'),'sortable'=>false,'resizeable'=>true),
                                                                                
                                array('key' => 'select','label'=> 
lang('select'), 
'sortable'=>false,'resizeable'=>false,'formatter'=>'myFormatterCheck','width'=>30)
                                                                                
                                ))
@@ -2537,10 +2537,10 @@
                                                                                
                                array('key' => 
'start_date','label'=>lang('date'),'sortable'=>false,'resizeable'=>true),
                                                                                
                                array('key' => 
'title','label'=>lang('title'),'sortable'=>true,'resizeable'=>true),
                                                                                
                                array('key' => 
'status','label'=>lang('status'),'sortable'=>true,'resizeable'=>true),
-                                                                               
                                array('key' => 
'project_type','label'=>lang('project 
type'),'sortable'=>false,'resizeable'=>true),
+                                                                               
                                array('key' => 
'project_type','label'=>lang('project 
type'),'sortable'=>true,'resizeable'=>true),
                                                                                
                                array('key' => 
'budget','label'=>lang('budget'),'sortable'=>false,'resizeable'=>true),
-                                                                               
                                array('key' => 
'obligation','label'=>lang('obligation'),'sortable'=>false,'resizeable'=>true),
-                                                                               
                                array('key' => 
'continuous','label'=>lang('continuous'),'sortable'=>false,'resizeable'=>true),
+                                                                               
                                array('key' => 
'obligation','label'=>lang('obligation'),'sortable'=>true,'resizeable'=>true),
+                                                                               
                                array('key' => 
'continuous','label'=>lang('continuous'),'sortable'=>true,'resizeable'=>true),
                                                                                
                                array('key' => 
'new_budget','label'=>lang('new'),'sortable'=>false,'resizeable'=>true),
                                                                                
                                array('key' => 
'actual_cost','label'=>lang('actual cost'),'sortable'=>true,'resizeable'=>true 
,'formatter'=>'FormatterRight'),
                                                                                
                                array('key' => 'select','label'=> 
lang('select'), 
'sortable'=>false,'resizeable'=>false,'formatter'=>'myFormatterCheck','width'=>30)