[Fmsystem-commits] [10124] property: more on budgets

[Sigurd Nes]

Revision: 10124
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10124
Author:   sigurdne
Date:     2012-10-07 12:24:38 +0000 (Sun, 07 Oct 2012)
Log Message:
-----------
property: more on budgets

Modified Paths:
--------------
    trunk/property/inc/class.soproject.inc.php
    trunk/property/inc/class.uiproject.inc.php
    trunk/property/js/yahoo/project.edit.js

Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php  2012-10-05 11:55:19 UTC (rev 
10123)
+++ trunk/property/inc/class.soproject.inc.php  2012-10-07 12:24:38 UTC (rev 
10124)
@@ -1817,6 +1817,13 @@
                                                }
                                                
                                                $_actual_cost += 
$order['actual_cost'];
+
+                                               //override if periode is closed
+                                               
if(isset($closed_period[$period]) && $closed_period[$period])
+                                               {
+                                                       $_sum_orders = 0;
+                                               }
+
                                        }
 
                                        unset($orders[$period]);
@@ -1863,12 +1870,18 @@
                                        }
 
                                        $_actual_cost += $order['actual_cost'];
+
+                                       //override if periode is closed
+                                       if(isset($closed_period[$period]) && 
$closed_period[$period])
+                                       {
+                                               $_sum_orders = 0;
+                                       }
                                }
 
                                $values[] = array
                                (
                                        'project_id'            => $project_id,
-                                       'period'                                
=> $period,
+                                       'period'                        => 
$period,
                                        'budget'                        => 0,
                                        'sum_orders'            => $_sum_orders,
                                        'actual_cost'           => 
$_actual_cost,
@@ -1889,6 +1902,7 @@
                                $month = substr( $entry['period'], 4, 2 );
                                $entry['month'] = $month == '00' ? '' : $month;
                                $entry['diff'] = $entry['budget'] - 
$entry['sum_orders'] - $entry['actual_cost'];
+       //                      $entry['deviation'] = $entry['budget'] - 
$entry['actual_cost'];
                                $entry['closed'] = 
$closed_period[$entry['period']];
                        }
 

Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php  2012-10-05 11:55:19 UTC (rev 
10123)
+++ trunk/property/inc/class.uiproject.inc.php  2012-10-07 12:24:38 UTC (rev 
10124)
@@ -1720,6 +1720,7 @@
                                                                                
                                array('key' => 'sum_orders','label'=>lang('sum 
orders'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterAmount0'),
                                                                                
                                array('key' => 
'actual_cost','label'=>lang('actual 
cost'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterAmount2'),
                                                                                
                                array('key' => 
'diff','label'=>lang('difference'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterAmount2'),
+                                                                               
//                              array('key' => 
'deviation','label'=>lang('deviation'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterAmount2'),
                                                                                
                                array('key' => 
'closed','label'=>lang('closed'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterCenter'),
                                                                                
                                array('key' => 'closed_orig','hidden' => true),
                                                                                
                                array('key' => 
'delete_year','label'=>lang('Delete'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterCenter')))

Modified: trunk/property/js/yahoo/project.edit.js
===================================================================
--- trunk/property/js/yahoo/project.edit.js     2012-10-05 11:55:19 UTC (rev 
10123)
+++ trunk/property/js/yahoo/project.edit.js     2012-10-07 12:24:38 UTC (rev 
10124)
@@ -97,6 +97,7 @@
                tmp_sum2 = getTotalSum('sum_orders',0,paginator,datatable);
                tmp_sum3 = getTotalSum('actual_cost',2,paginator,datatable);
                tmp_sum4 = getTotalSum('diff',2,paginator,datatable);
+ //            tmp_sum5 = getTotalSum('deviation',2,paginator,datatable);
 
                if(typeof(tableYUI0)=='undefined')
                {
@@ -117,6 +118,7 @@
                td_sum(tmp_sum2);
                td_sum(tmp_sum3);
                td_sum(tmp_sum4);
+//             td_sum(tmp_sum5);
                td_empty(3);
 
                myfoot = tableYUI0.createTFoot();