[Fmsystem-commits] [11668] property: periodization

[Sigurd Nes]

Revision: 11668
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11668
Author:   sigurdne
Date:     2014-02-10 14:21:26 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
property: periodization

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

Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php        2014-02-10 12:29:53 UTC 
(rev 11667)
+++ trunk/property/inc/class.soworkorder.inc.php        2014-02-10 14:21:26 UTC 
(rev 11668)
@@ -2021,7 +2021,7 @@
 
                                $_found = false;
                                
-                               
if(isset($_orders_paid_or_pending['periodization']))
+                               
if(isset($_orders_paid_or_pending['periodization']) && 
$_orders_paid_or_pending['periodization'])
                                {
                                        $order_budget[$periode]['actual_cost'] 
+= $_orders_paid_or_pending['actual_cost'];
                                        
$order_budget[$periode]['actual_period'] = $periode;

Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php  2014-02-10 12:29:53 UTC (rev 
11667)
+++ trunk/property/inc/class.uiproject.inc.php  2014-02-10 14:21:26 UTC (rev 
11668)
@@ -2006,6 +2006,8 @@
                                                                                
                                array('key' => 
'amount','label'=>lang('amount'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterAmount2'),
                                                                                
                                array('key' => 
'approved_amount','label'=>lang('approved 
amount'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterAmount2'),
                                                                                
                                array('key' => 
'period','label'=>lang('period'),'sortable'=>true,'resizeable'=>true),
+                                                                               
                                array('key' => 
'periodization','label'=>lang('periodization'),'sortable'=>false,'resizeable'=>true),
+                                                                               
                                array('key' => 
'periodization_start','label'=>lang('periodization 
start'),'sortable'=>false,'resizeable'=>true),
                                                                                
                                array('key' => 
'currency','label'=>lang('currency'),'sortable'=>false,'resizeable'=>true),
                                                                                
                                array('key' => 
'type','label'=>lang('type'),'sortable'=>true,'resizeable'=>true),
                                                                                
                                array('key' => 
'budget_responsible','label'=>lang('budget 
responsible'),'sortable'=>true,'resizeable'=>true),
@@ -2476,6 +2478,8 @@
                                        'workorder_id'                  => 
$entry['workorder_id'],
                                        'status'                                
=> $entry['status'],
                                        'period'                                
=> $entry['period'],
+                                       'periodization'                 => 
$entry['periodization'],
+                                       'periodization_start'   => 
$entry['periodization_start'],
                                        'invoice_id'                    => 
$entry['invoice_id'],
                                        'budget_account'                => 
$entry['budget_account'],
                                        'dima'                                  
=> $entry['dima'],