[Fmsystem-commits] [15148] Syncromind: Merge 14936:15027 from trunk

[sigurdne]

Revision: 15148
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15148
Author:   sigurdne
Date:     2016-05-13 12:25:42 +0000 (Fri, 13 May 2016)
Log Message:
-----------
Syncromind: Merge 14936:15027 from trunk

Modified Paths:
--------------
    branches/dev-syncromind-2/rental/inc/model/class.contract.inc.php

Modified: branches/dev-syncromind-2/rental/inc/model/class.contract.inc.php
===================================================================
--- branches/dev-syncromind-2/rental/inc/model/class.contract.inc.php   
2016-05-13 12:25:40 UTC (rev 15147)
+++ branches/dev-syncromind-2/rental/inc/model/class.contract.inc.php   
2016-05-13 12:25:42 UTC (rev 15148)
@@ -784,7 +784,7 @@
                        // The contract is active only parts of the current 
year, we must calculate the total sum using the billing logic
 
                        $total_sum = 0; // Holding the total price of the 
contract current year
-                       $contract_price_items = 
rental_socontract_price_item::get_instance()->get(null, null, null, null, null, 
null, array(
+                       $contract_price_items = 
rental_socontract_price_item::get_instance()->get(0, 0, '', false, '', '', 
array(
                                'contract_id' => $this->get_id()));
 
 
@@ -1031,7 +1031,7 @@
 
                public function set_adjustable( $adjustable )
                {
-                       $this->adjustable = (boolean)$adjustable;
+                       $this->adjustable = (bool)$adjustable;
                }
 
                public function is_adjustable()
@@ -1200,7 +1200,7 @@
 
                public function set_publish_comment( $publish_comment )
                {
-                       $this->publish_comment = (boolean)$publish_comment;
+                       $this->publish_comment = (bool)$publish_comment;
                }
 
                /**