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

[sigurdne]

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

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

Modified: 
branches/dev-syncromind-2/rental/inc/model/class.invoice_price_item.inc.php
===================================================================
--- branches/dev-syncromind-2/rental/inc/model/class.invoice_price_item.inc.php 
2016-05-13 12:25:48 UTC (rev 15150)
+++ branches/dev-syncromind-2/rental/inc/model/class.invoice_price_item.inc.php 
2016-05-13 12:25:51 UTC (rev 15151)
@@ -21,14 +21,14 @@
                protected $timestamp_end; // End date for the given invoice
                public static $so;
 
-               public function __construct( int $decimals, int $id, int 
$invoice_id, string $title, string $agresso_id, boolean $is_area, float 
$price_per_year, float $area, int $count, int $timestamp_start, int 
$timestamp_end )
+               public function __construct( int $decimals, int $id, int 
$invoice_id, string $title, string $agresso_id, bool $is_area, float 
$price_per_year, float $area, int $count, int $timestamp_start, int 
$timestamp_end )
                {
                        $this->decimals = (int)$decimals;
                        $this->id = (int)$id;
                        $this->invoice_id = (int)$invoice_id;
                        $this->title = $title;
                        $this->agresso_id = $agresso_id;
-                       $this->is_area = (boolean)$is_area;
+                       $this->is_area = (bool)$is_area;
                        $this->price_per_year = (float)$price_per_year;
                        $this->area = (float)$area;
                        $this->count = (int)$count;
@@ -47,9 +47,9 @@
                        return $this->invoice_id;
                }
 
-               public function set_is_area( boolean $is_area )
+               public function set_is_area( bool $is_area )
                {
-                       $this->is_area = (boolean)$is_area;
+                       $this->is_area = (bool)$is_area;
                        $this->total_price = null; // Needs to be re-calculated
                }