[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10922] Property: budget handling
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [10922] Property: budget handling |
Date: |
Mon, 18 Feb 2013 18:13:20 +0000 |
Revision: 10922
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10922
Author: sigurdne
Date: 2013-02-18 18:13:19 +0000 (Mon, 18 Feb 2013)
Log Message:
-----------
Property: budget handling
Modified Paths:
--------------
trunk/property/inc/class.soproject.inc.php
trunk/property/inc/class.soworkorder.inc.php
Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php 2013-02-18 15:16:00 UTC (rev
10921)
+++ trunk/property/inc/class.soproject.inc.php 2013-02-18 18:13:19 UTC (rev
10922)
@@ -2157,14 +2157,24 @@
foreach ($order_budgets as $_order_id => $order_budget
)
{
+
+/*
+if(!$order_budget[0]['closed_order'])
+{
+// _debug_array($order_budget);
+}
+*/
+
foreach ($order_budget as $budget_entry)
{
$period = $budget_entry['period'];
$year = $budget_entry['year'];
$_found = false;
- if(isset($project_budget[$period]))
+ if(isset($project_budget[$period]) &&
!$budget_entry['closed_order'])
{
+//_debug_array($_order_id);
+//_debug_array($budget_entry);
$_orders[$period]['actual_cost'] += $budget_entry['actual_cost'];
$_orders[$period]['sum_oblications'] += $budget_entry['sum_oblications'];
$_orders[$period]['sum_orders']
+= $budget_entry['sum_orders'];
@@ -2198,6 +2208,7 @@
}
$sort_period = array();
//_debug_array($_orders);
+//die();
$_values = array();
foreach ($project_budget as $period => $_budget)
Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php 2013-02-18 15:16:00 UTC
(rev 10921)
+++ trunk/property/inc/class.soworkorder.inc.php 2013-02-18 18:13:19 UTC
(rev 10922)
@@ -1842,7 +1842,7 @@
$sort_period = array();
$values = array();
-//_debug_array($project_budget);die();
+//_debug_array($order_budget);die();
//$test = 0;
$_delay_period = 0;
foreach ($order_budget as $period => $_budget)
@@ -1904,6 +1904,7 @@
'sum_orders' =>
$_sum_orders,
'sum_oblications' =>
$_sum_oblications,
'actual_cost' =>
$_actual_cost,
+ 'closed_order' =>
$_budget['closed_order']
);
$sort_period[] = $period;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10922] Property: budget handling,
Sigurd Nes <=