[Fmsystem-commits] [10952] Property: budget handling

[Sigurd Nes]

Revision: 10952
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10952
Author:   sigurdne
Date:     2013-03-03 19:44:03 +0000 (Sun, 03 Mar 2013)
Log Message:
-----------
Property: budget handling

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

Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php  2013-03-03 17:33:27 UTC (rev 
10951)
+++ trunk/property/inc/class.soproject.inc.php  2013-03-03 19:44:03 UTC (rev 
10952)
@@ -2890,19 +2890,25 @@
 
                                if($last_budget >= 0)
                                {
-                                       if($subtract <= $last_budget)
+                                       if($paid_last_year <= $last_budget)
                                        {
                                                $_perform_subtraction = true;
                                        }
                                }
                                else
                                {
-                                       if($subtract >= $last_budget)
+                                       if($paid_last_year >= $last_budget)
                                        {
                                                $_perform_subtraction = true;
                                        }
                                }
-
+/*
+_debug_array($last_budget);
+_debug_array($paid_last_year);
+_debug_array($subtract);
+_debug_array($_perform_subtraction);
+die();
+*/
                                if($_perform_subtraction)
                                {
                                        $transferred = 
$this->update_budget($id, $latest_year, $periodization_id, $subtract, false, 
'subtract');