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

[sigurdne]

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

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

Modified: branches/dev-syncromind-2/rental/inc/model/class.invoice.inc.php
===================================================================
--- branches/dev-syncromind-2/rental/inc/model/class.invoice.inc.php    
2016-05-13 12:25:45 UTC (rev 15149)
+++ branches/dev-syncromind-2/rental/inc/model/class.invoice.inc.php    
2016-05-13 12:25:48 UTC (rev 15150)
@@ -392,12 +392,12 @@
                                        'month' => date('m', 
$timestamp_invoice_start));
                                //$contract_price_items = 
$socontract_price_item->get($start_index, $num_of_objects, $sort_field, 
$sort_ascending, $search_for, $search_type, $filters2);
 
-                               $contract_price_items = 
rental_socontract_price_item::get_instance()->get(null, null, null, null, null, 
null, $filters2);
-                               //$contract_price_items = 
rental_socontract_price_item::get_instance()->get(null, null, null, null, null, 
null, array('contract_id' => $contract->get_id(), 'one_time' => true));
+                               $contract_price_items = 
rental_socontract_price_item::get_instance()->get(0, 0, '', false, '', '', 
$filters2);
+                               //$contract_price_items = 
rental_socontract_price_item::get_instance()->get(0, 0, '', false, '', '', 
array('contract_id' => $contract->get_id(), 'one_time' => true));
                        }
                        else
                        {
-                               $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' => $contract->get_id()));
                        }