[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9748] property: calculation
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [9748] property: calculation |
Date: |
Thu, 05 Jul 2012 09:35:12 +0000 |
Revision: 9748
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9748
Author: sigurdne
Date: 2012-07-05 09:35:12 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
property: calculation
Modified Paths:
--------------
trunk/property/inc/class.soproject.inc.php
Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php 2012-07-05 08:53:50 UTC (rev
9747)
+++ trunk/property/inc/class.soproject.inc.php 2012-07-05 09:35:12 UTC (rev
9748)
@@ -1649,9 +1649,9 @@
$_sum_orders +=
$order['amount'];
// $_sum_orders -=
$order['actual_cost'];
- if($budget > 0)
+ if($budget >= 0)
{
-
if($order['actual_cost'] > 0)
+
if($order['actual_cost'] >= 0)
{
$_sum_orders -=
$order['actual_cost'];
}
@@ -1664,7 +1664,7 @@
}
else // income
{
-
if($order['actual_cost'] > 0)
+
if($order['actual_cost'] >= 0)
{
$_sum_orders +=
$order['actual_cost'];
}
@@ -1701,6 +1701,7 @@
reset($orders);
//remaining
+//_debug_array($orders);
foreach ($orders as $year => $_orders)
{
$_sum_orders = 0;
@@ -1709,8 +1710,18 @@
foreach ($_orders as $order_id => $order)
{
$_sum_orders += $order['amount'];
- $_sum_orders -= $order['actual_cost'];
- $_sum_orders = $_sum_orders > 0 ?
$_sum_orders : 0;
+
+ if($order['actual_cost'] > 0 &&
($order['amount'] - $order['actual_cost']) > 0)
+ {
+ $_sum_orders -=
$order['actual_cost'];
+ $_sum_orders = $_sum_orders > 0
? $_sum_orders : 0;
+ }
+ else if($order['actual_cost'] < 0 &&
($order['amount'] - $order['actual_cost']) < 0)//income
+ {
+ $_sum_orders -=
$order['actual_cost'];
+ $_sum_orders = $_sum_orders < 0
? $_sum_orders : 0;
+ }
+
$_actual_cost += $order['actual_cost'];
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9748] property: calculation,
Sigurd Nes <=