[Fmsystem-commits] [11667] property: periodization

[Sigurd Nes]

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

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-02-10 10:28:03 UTC 
(rev 11666)
+++ trunk/property/inc/class.soworkorder.inc.php        2014-02-10 12:29:53 UTC 
(rev 11667)
@@ -1944,6 +1944,7 @@
                                        $periodization_start = 
$entry['periodization_start'] ? $entry['periodization_start'] : 
$entry['periodization'];
                                        
                                        $periodization_start_year = 
(int)substr($periodization_start, 0, 4 );
+                                       $periodization_start_month = 
(int)substr($periodization_start, -2);
 
                                        $sql = "SELECT month, value, dividend, 
divisor"
                                        . " FROM fm_eco_periodization_outline  
WHERE periodization_id = {$entry['periodization']} ORDER BY month ASC";
@@ -1981,11 +1982,13 @@
                                                        $partial_actual_cost = 
$entry['actual_cost'] * $outline['value'] / 100;
                                                }
 
-                                               $_future_year_count = 
floor(($outline['month']-1) / 12);
+                                               $_period_month = 
(int)$periodization_start_month + (int)$outline['month'] -1;
+                                               
+                                               $_future_year_count = 
floor(($_period_month-1) / 12);
 
                                                $_periodization_start_year =  
$periodization_start_year + $_future_year_count;
 
-                                               $_month = $outline['month'] - 
($_future_year_count * 12);
+                                               $_month = $_period_month - 
($_future_year_count * 12);
 
                                                $orders_paid_or_pending[] = 
array
                                                (