[Fmsystem-commits] [12081] fix on extra adjustment

[Erik Holm-Larsen]

Revision: 12081
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12081
Author:   erikhl
Date:     2014-09-08 07:22:52 +0000 (Mon, 08 Sep 2014)
Log Message:
-----------
fix on extra adjustment

Modified Paths:
--------------
    trunk/rental/inc/class.soadjustment.inc.php
    trunk/rental/setup/tables_update.inc.php

Modified: trunk/rental/inc/class.soadjustment.inc.php
===================================================================
--- trunk/rental/inc/class.soadjustment.inc.php 2014-09-08 07:03:33 UTC (rev 
12080)
+++ trunk/rental/inc/class.soadjustment.inc.php 2014-09-08 07:22:52 UTC (rev 
12081)
@@ -207,7 +207,7 @@
 
                //get incomplete adjustments for today
                $adjustments_query = "SELECT * FROM rental_adjustment WHERE NOT 
is_executed AND (adjustment_date < {$next_day} AND adjustment_date >= 
{$prev_day})";
-               var_dump($adjustments_query);
+               //var_dump($adjustments_query);
                $result = $this->db->query($adjustments_query);
                //var_dump("etter spr");
                //there are un-executed adjustments
@@ -278,8 +278,8 @@
                         }
                         $adjustable_contracts .= "(adjustment_year IS NULL OR 
adjustment_year = 0)";   
                         $adjustable_contracts .= "))";
-                       var_dump($adjustable_contracts);
-                        die();
+                       //var_dump($adjustable_contracts);
+                        //die();
                        $result = $this->db->query($adjustable_contracts);
                        while($this->db->next_record())
                        {

Modified: trunk/rental/setup/tables_update.inc.php
===================================================================
--- trunk/rental/setup/tables_update.inc.php    2014-09-08 07:03:33 UTC (rev 
12080)
+++ trunk/rental/setup/tables_update.inc.php    2014-09-08 07:22:52 UTC (rev 
12081)
@@ -355,7 +355,7 @@
                return $GLOBALS['setup_info']['rental']['currentver'];
        }
         
-        $test[] = '0.1.0.18';
+        $test[] = '0.1.0.19';
        function rental_upgrade0_1_0_19()
        {
                // Add unit_leader column