[Fmsystem-commits] [10679] property: budget listing

[Sigurd Nes]

Revision: 10679
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10679
Author:   sigurdne
Date:     2013-01-16 09:46:36 +0000 (Wed, 16 Jan 2013)
Log Message:
-----------
property: budget listing

Modified Paths:
--------------
    trunk/property/inc/class.uiworkorder.inc.php
    trunk/property/js/yahoo/workorder.edit.js

Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php        2013-01-16 09:06:12 UTC 
(rev 10678)
+++ trunk/property/inc/class.uiworkorder.inc.php        2013-01-16 09:46:36 UTC 
(rev 10679)
@@ -1827,7 +1827,7 @@
                                        'values'        =>      
json_encode(array(      array('key' => 
'year','label'=>lang('year'),'sortable'=>false,'resizeable'=>true),
                                                                                
                                array('key' => 
'month','label'=>lang('month'),'sortable'=>false,'resizeable'=>true),
                                                                                
                                array('key' => 
'budget','label'=>lang('budget'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterAmount0'),
-                                                                               
        //                      array('key' => 'sum_orders','label'=> 
lang('order'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterAmount0'),
+                                                                               
                                array('key' => 'sum_orders','label'=> 
lang('order'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterAmount0'),
                                                                                
                                array('key' => 
'sum_oblications','label'=>lang('sum 
orders'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterAmount0'),
                                                                                
                                array('key' => 
'actual_cost','label'=>lang('actual 
cost'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterAmount0'),
                                                                                
                                array('key' => 
'diff','label'=>lang('difference'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterAmount0'),

Modified: trunk/property/js/yahoo/workorder.edit.js
===================================================================
--- trunk/property/js/yahoo/workorder.edit.js   2013-01-16 09:06:12 UTC (rev 
10678)
+++ trunk/property/js/yahoo/workorder.edit.js   2013-01-16 09:46:36 UTC (rev 
10679)
@@ -166,7 +166,7 @@
        this.addFooterDatatable5 = function(paginator,datatable)
        {
                tmp_sum1 = getTotalSum_active('budget',0,paginator,datatable);
- //            tmp_sum2 = 
getTotalSum_active('sum_orders',0,paginator,datatable);
+               tmp_sum2 = 
getTotalSum_active('sum_orders',0,paginator,datatable);
                tmp_sum3 = 
getTotalSum_active('sum_oblications',0,paginator,datatable);
                tmp_sum4 = 
getTotalSum_active('actual_cost',0,paginator,datatable);
                tmp_sum5 = getTotalSum_active('diff',0,paginator,datatable);
@@ -188,7 +188,7 @@
                td_sum('Sum');
                td_empty(1);
                td_sum(tmp_sum1);
-//             td_sum(tmp_sum2);
+               td_sum(tmp_sum2);
                td_sum(tmp_sum3);
                td_sum(tmp_sum4);
                td_sum(tmp_sum5);