[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11739] avoid duplicate sums for fictive periods
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [11739] avoid duplicate sums for fictive periods |
Date: |
Sun, 23 Feb 2014 17:14:37 +0000 |
Revision: 11739
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11739
Author: sigurdne
Date: 2014-02-23 17:14:37 +0000 (Sun, 23 Feb 2014)
Log Message:
-----------
avoid duplicate sums for fictive periods
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 2014-02-22 22:09:05 UTC (rev
11738)
+++ trunk/property/inc/class.soproject.inc.php 2014-02-23 17:14:37 UTC (rev
11739)
@@ -953,7 +953,7 @@
'combined_cost' => 0,
'budget'
=> 0,
'obligation' => 0,
- 'actual_cost' => 0
+ 'actual_cost' => 0,
);
$_orders[] = $this->db->f('workorder_id');
}
@@ -972,6 +972,11 @@
{
foreach($order_budgets[$entry['workorder_id']]
as $budget)
{
+ if($budget['active'] == 2)
+ {
+ continue;
+ }
+
if($year)
{
if($budget['year'] == $year)
Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php 2014-02-22 22:09:05 UTC
(rev 11738)
+++ trunk/property/inc/class.soworkorder.inc.php 2014-02-23 17:14:37 UTC
(rev 11739)
@@ -798,6 +798,11 @@
$order_budget =
$this->get_budget($workorder['workorder_id']);
foreach($order_budget as $entry)
{
+ if($entry['active'] == 2)
+ {
+ continue;
+ }
+
if ($filter_year && $filter_year !=
'all')
{
if($entry['year'] ==
$filter_year)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11739] avoid duplicate sums for fictive periods,
Sigurd Nes <=