[Fmsystem-commits] [9499] property: budget-column

[Sigurd Nes]

Revision: 9499
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9499
Author:   sigurdne
Date:     2012-06-04 17:52:57 +0000 (Mon, 04 Jun 2012)
Log Message:
-----------
property: budget-column

Modified Paths:
--------------
    trunk/property/inc/class.soworkorder.inc.php

Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php        2012-06-04 17:25:48 UTC 
(rev 9498)
+++ trunk/property/inc/class.soworkorder.inc.php        2012-06-04 17:52:57 UTC 
(rev 9499)
@@ -287,18 +287,31 @@
                                $uicols['classname'][]          = '';
                                $uicols['sortable'][]           = '';
 
+                               $cols .= ',fm_workorder.budget';
+                               $cols_return[] = 'budget';
+                               $uicols['input_type'][]         = 'text';
+                               $uicols['name'][]                       = 
'budget';
+                               $uicols['descr'][]                      = 
lang('budget');
+                               $uicols['statustext'][]         = 
lang('budget');
+                               $uicols['exchange'][]           = false;
+                               $uicols['align'][]                      = '';
+                               $uicols['datatype'][]           = '';
+                               $uicols['formatter'][]          = 
'myFormatCount2';
+                               $uicols['classname'][]          = 'rightClasss';
+                               $uicols['sortable'][]           = false;
+
                                $cols .= ',fm_workorder.combined_cost';
                                $cols_return[] = 'combined_cost';
                                $uicols['input_type'][]         = 'text';
                                $uicols['name'][]                       = 
'combined_cost';
-                               $uicols['descr'][]                      = 
lang('Cost');
+                               $uicols['descr'][]                      = 
lang('sum orders');
                                $uicols['statustext'][]         = lang('Cost - 
either budget or calculation');
                                $uicols['exchange'][]           = false;
                                $uicols['align'][]                      = '';
                                $uicols['datatype'][]           = '';
                                $uicols['formatter'][]          = 
'myFormatCount2';
                                $uicols['classname'][]          = 'rightClasss';
-                               $uicols['sortable'][]           = true;
+                               $uicols['sortable'][]           = false;
 
                                $cols .= ',fm_workorder.actual_cost';
                                $cols_return[] = 'actual_cost';
@@ -438,6 +451,9 @@
                                        case 'ecodimb':
                                                $order_field = ", 
fm_workorder.ecodimb";
                                                break;
+                                       case 'budget':
+                                               $order_field = ", 
fm_workorder.budget";
+                                               break;
                                        default:
                                                $order_field = ", {$order}";
                                }