[Fmsystem-commits] [11601] property: more on order budget

[Sigurd Nes]

Revision: 11601
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11601
Author:   sigurdne
Date:     2014-01-16 19:23:19 +0000 (Thu, 16 Jan 2014)
Log Message:
-----------
property: more on order budget

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

Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php        2014-01-16 14:44:14 UTC 
(rev 11600)
+++ trunk/property/inc/class.soworkorder.inc.php        2014-01-16 19:23:19 UTC 
(rev 11601)
@@ -1788,6 +1788,7 @@
                        . " ORDER BY year, month";
 
                        $this->db->query($sql,__LINE__,__FILE__);
+                       $_check_periodization = array();
                        $_order_budget = array();
                        while ($this->db->next_record())
                        {
@@ -1816,6 +1817,14 @@
 
                                $active_period[$period] = 
(int)$this->db->f('active');
 
+                               /**
+                               * If the order is periodized - do not calculate 
fictitious periods
+                               **/
+                               $_check_periodization[$year] += 1;
+                               if($calculate_fictive_periods)
+                               {
+                                       $calculate_fictive_periods = 
$_check_periodization[$year] > 1 ? false : true;
+                               }
                                if($continuous)
                                {
                                        $sum_year_budget[$year]                 
+= $budget;
@@ -1830,7 +1839,6 @@
                        * ellers: Start-periode blir måned for start-dato for 
bestilling dersom den ligger frem i tid 
                        * ellers: Dersom start-dato for bestilling er passert - 
blir start-periode inneværende måned.
                        **/
-
                        $fictive_period = array();
                        $order_budget = array();
                        if($continuous && $calculate_fictive_periods)