[Fmsystem-commits] [14957] rental: prepare for php 7

[Sigurd Nes]

Revision: 14957
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14957
Author:   sigurdne
Date:     2016-04-30 15:24:22 +0000 (Sat, 30 Apr 2016)
Log Message:
-----------
rental: prepare for php 7

Modified Paths:
--------------
    trunk/rental/inc/class.uibilling.inc.php
    trunk/rental/inc/class.uicontract.inc.php
    trunk/rental/inc/class.uimakepdf.inc.php
    trunk/rental/inc/model/class.agresso_gl07.inc.php
    trunk/rental/inc/model/class.agresso_lg04.inc.php
    trunk/rental/inc/model/class.invoice.inc.php

Modified: trunk/rental/inc/class.uibilling.inc.php
===================================================================
--- trunk/rental/inc/class.uibilling.inc.php    2016-04-30 15:23:44 UTC (rev 
14956)
+++ trunk/rental/inc/class.uibilling.inc.php    2016-04-30 15:24:22 UTC (rev 
14957)
@@ -272,7 +272,7 @@
                                        {
                                                if 
(!array_key_exists($contract_price_item->get_contract_id(), $contracts))
                                                {
-                                                       $aditional_contracts = 
rental_socontract::get_instance()->get(null, null, null, null, null, null, 
array(
+                                                       $aditional_contracts = 
rental_socontract::get_instance()->get(0, 0, '', false, '', '', array(
                                                                'contract_id' 
=> $contract_price_item->get_contract_id(), 'contract_type' => $contract_type));
                                                        if 
(count($aditional_contracts) == 1)
                                                        {
@@ -562,7 +562,7 @@
                                }
 
                                $existing_billing_options[] = array('id' => 
'new_billing', 'name' => lang('new_billing'));
-                               $result_objects = 
rental_sobilling::get_instance()->get(null, null, null, null, null, null, array(
+                               $result_objects = 
rental_sobilling::get_instance()->get(0, 0, '', false, '', '', array(
                                        'location_id' => $contract_type));
                                foreach ($result_objects as $billing)
                                {
@@ -824,7 +824,7 @@
                        $GLOBALS['phpgw_info']['flags']['app_header'] .= '::' . 
lang('invoice_run');
 
                        $billing_job = 
rental_sobilling::get_instance()->get_single((int)phpgw::get_var('id'));
-                       $billing_info_array = 
rental_sobilling_info::get_instance()->get(null, null, null, null, null, null, 
array(
+                       $billing_info_array = 
rental_sobilling_info::get_instance()->get(0, 0, '', false, '', '', array(
                                'billing_id' => phpgw::get_var('id')));
 
                        if ($billing_job == null) // Not found
@@ -1061,7 +1061,7 @@
                        $result = 
rental_sobilling::get_instance()->store($billing_job);
 
                        //set deleted=true on billing_info
-                       $billing_infos = 
rental_sobilling_info::get_instance()->get(null, null, null, null, null, null, 
array(
+                       $billing_infos = 
rental_sobilling_info::get_instance()->get(0, 0, '', false, '', '', array(
                                'billing_id' => phpgw::get_var('id')));
                        foreach ($billing_infos as $billing_info)
                        {
@@ -1070,11 +1070,11 @@
                        }
 
                        //set is_billed on invoice price items to false
-                       $billing_job_invoices = 
rental_soinvoice::get_instance()->get(null, null, null, null, null, null, array(
+                       $billing_job_invoices = 
rental_soinvoice::get_instance()->get(0, 0, '', false, '', '', array(
                                'billing_id' => phpgw::get_var('id')));
                        foreach ($billing_job_invoices as $invoice)
                        {
-                               $price_items = 
rental_socontract_price_item::get_instance()->get(null, null, null, null, null, 
null, array(
+                               $price_items = 
rental_socontract_price_item::get_instance()->get(0, 0, '', false, '', '', 
array(
                                        'contract_id' => 
$invoice->get_contract_id(), 'one_time' => true, 'include_billed' => true));
                                foreach ($price_items as $price_item)
                                {
@@ -1308,7 +1308,7 @@
                                else
                                {
                                        $billing_job = 
rental_sobilling::get_instance()->get_single((int)phpgw::get_var('id'));
-                                       $billing_info_array = 
rental_sobilling_info::get_instance()->get(null, null, null, null, null, null, 
array(
+                                       $billing_info_array = 
rental_sobilling_info::get_instance()->get(0, 0, '', false, '', '', array(
                                                'billing_id' => 
phpgw::get_var('id')));
                                        $type = phpgw::get_var('type', 
'string', 'GET', 'bk');
                                        if ($billing_job == null) // Not found

Modified: trunk/rental/inc/class.uicontract.inc.php
===================================================================
--- trunk/rental/inc/class.uicontract.inc.php   2016-04-30 15:23:44 UTC (rev 
14956)
+++ trunk/rental/inc/class.uicontract.inc.php   2016-04-30 15:24:22 UTC (rev 
14957)
@@ -921,7 +921,7 @@
                                        if (isset($price_items_only))
                                        {
                                                //export contract price items
-                                               $result_objects_pi = 
rental_socontract_price_item::get_instance()->get(null, null, null, null, null, 
null, array(
+                                               $result_objects_pi = 
rental_socontract_price_item::get_instance()->get(0, 0, '', false, '', '', 
array(
                                                        'contract_id' => 
$result->get_id(), 'export' => 'true', 'include_billed' => 'true'));
                                                foreach ($result_objects_pi as 
$result_pi)
                                                {
@@ -1648,7 +1648,7 @@
                        $datatable_def = array_merge($datatable_def, 
$tableDef_composite, $tableDef_party, $tableDef_price, $tableDef_invoice, 
$tableDef_document, $tableDef_notification);
 
                        /*                       * 
***************************** invoice filters */
-                       $invoices = rental_soinvoice::get_instance()->get(null, 
null, null, false, null, null, array(
+                       $invoices = rental_soinvoice::get_instance()->get(0, 0, 
'', false, '', '', array(
                                'contract_id' => $contract->get_id()));
                        if ($invoices != null && count($invoices) > 0)
                        {
@@ -2129,7 +2129,7 @@
                                /*                               * 
********************************************************************************
 */
 
                                /*                               * 
***************************** invoice filters */
-                               $invoices = 
rental_soinvoice::get_instance()->get(null, null, null, false, null, null, 
array(
+                               $invoices = 
rental_soinvoice::get_instance()->get(0, 0, '', false, '', '', array(
                                        'contract_id' => $contract->get_id()));
                                if ($invoices != null && count($invoices) > 0)
                                {

Modified: trunk/rental/inc/class.uimakepdf.inc.php
===================================================================
--- trunk/rental/inc/class.uimakepdf.inc.php    2016-04-30 15:23:44 UTC (rev 
14956)
+++ trunk/rental/inc/class.uimakepdf.inc.php    2016-04-30 15:24:22 UTC (rev 
14957)
@@ -90,20 +90,20 @@
                                                
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'], 
lang('permission_denied_view_contract'));
                                        }
 
-                                       $parties = 
rental_soparty::get_instance()->get(null, null, null, null, null, null, array(
+                                       $parties = 
rental_soparty::get_instance()->get(0, 0, '', false, '', '', array(
                                                'contract_id' => 
$contract->get_id()));
                                        $party = reset($parties); //
 
                                        $contract_dates = 
$contract->get_contract_date();
 
-                                       $composites = 
rental_socomposite::get_instance()->get(null, null, null, null, null, null, 
array(
+                                       $composites = 
rental_socomposite::get_instance()->get(0, 0, '', false, '', '', array(
                                                'contract_id' => 
$contract->get_id()));
                                        $composite = reset($composites);
 
                                        $units = $composite->get_units();
 
 
-                                       $price_items = 
rental_socontract_price_item::get_instance()->get(null, null, null, null, null, 
null, array(
+                                       $price_items = 
rental_socontract_price_item::get_instance()->get(0, 0, '', false, '', '', 
array(
                                                'contract_id' => 
$contract->get_id()));
                                        $months = 
rental_socontract::get_instance()->get_months_in_term($contract->get_term_id());
 

Modified: trunk/rental/inc/model/class.agresso_gl07.inc.php
===================================================================
--- trunk/rental/inc/model/class.agresso_gl07.inc.php   2016-04-30 15:23:44 UTC 
(rev 14956)
+++ trunk/rental/inc/model/class.agresso_gl07.inc.php   2016-04-30 15:24:22 UTC 
(rev 14957)
@@ -139,7 +139,7 @@
                        {
                                $missing_billing_info[] = 'Project id can not 
be more than 6 characters.';
                        }
-                       $price_items = 
rental_socontract_price_item::get_instance()->get(null, null, null, null, null, 
null, array(
+                       $price_items = 
rental_socontract_price_item::get_instance()->get(0, 0, '', false, '', '', 
array(
                                'contract_id' => $contract->get_id()));
                        foreach ($price_items as $price_item) // Runs through 
all items
                        {
@@ -168,12 +168,12 @@
                        $decimal_separator = 
isset($GLOBALS['phpgw_info']['user']['preferences']['rental']['decimal_separator'])
 ? $GLOBALS['phpgw_info']['user']['preferences']['rental']['decimal_separator'] 
: ',';
                        $thousands_separator = 
isset($GLOBALS['phpgw_info']['user']['preferences']['rental']['thousands_separator'])
 ? 
$GLOBALS['phpgw_info']['user']['preferences']['rental']['thousands_separator'] 
: '.';
                        // We need all invoices for this billing
-                       $invoices = rental_soinvoice::get_instance()->get(null, 
null, 'id', true, null, null, array(
+                       $invoices = rental_soinvoice::get_instance()->get(0, 0, 
'id', true, '', '', array(
                                'billing_id' => $this->billing_job->get_id()));
                        foreach ($invoices as $invoice) // Runs through all 
invoices
                        {
                                // We need all price items in the invoice
-                               $price_items = 
rental_soinvoice_price_item::get_instance()->get(null, null, null, null, null, 
null, array(
+                               $price_items = 
rental_soinvoice_price_item::get_instance()->get(0, 0, '', false, '', '', array(
                                        'invoice_id' => $invoice->get_id()));
                                // HACK to get the needed location code for the 
building
                                $building_location_code = 
rental_socomposite::get_instance()->get_building_location_code($invoice->get_contract_id());

Modified: trunk/rental/inc/model/class.agresso_lg04.inc.php
===================================================================
--- trunk/rental/inc/model/class.agresso_lg04.inc.php   2016-04-30 15:23:44 UTC 
(rev 14956)
+++ trunk/rental/inc/model/class.agresso_lg04.inc.php   2016-04-30 15:24:22 UTC 
(rev 14957)
@@ -88,7 +88,7 @@
                        $decimal_separator = 
isset($GLOBALS['phpgw_info']['user']['preferences']['rental']['decimal_separator'])
 ? $GLOBALS['phpgw_info']['user']['preferences']['rental']['decimal_separator'] 
: ',';
                        $thousands_separator = 
isset($GLOBALS['phpgw_info']['user']['preferences']['rental']['thousands_separator'])
 ? 
$GLOBALS['phpgw_info']['user']['preferences']['rental']['thousands_separator'] 
: '.';
                        // We need all invoices for this billing
-                       $invoices = rental_soinvoice::get_instance()->get(null, 
null, 'id', true, null, null, array(
+                       $invoices = rental_soinvoice::get_instance()->get(0, 0, 
'id', true, '', '', array(
                                'billing_id' => $this->billing_job->get_id()));
 
 
@@ -129,11 +129,11 @@
                        foreach ($invoices as $invoice) // Runs through all 
invoices
                        {
                                // We need all price items in the invoice
-                               $price_items = 
rental_soinvoice_price_item::get_instance()->get(null, null, null, null, null, 
null, array(
+                               $price_items = 
rental_soinvoice_price_item::get_instance()->get(0, 0, '', false, '', '', array(
                                        'invoice_id' => $invoice->get_id()));
                                $composite_name = '';
                                // We need to get the composites to get a 
composite name for the Agresso export
-                               $composites = 
rental_socomposite::get_instance()->get(null, null, null, null, null, null, 
array(
+                               $composites = 
rental_socomposite::get_instance()->get(0, 0, '', false, '', '', array(
                                        'contract_id' => 
$invoice->get_contract_id()));
                                if ($composites != null && count($composites) > 
0)
                                {
@@ -194,18 +194,18 @@
                        $decimal_separator = 
isset($GLOBALS['phpgw_info']['user']['preferences']['rental']['decimal_separator'])
 ? $GLOBALS['phpgw_info']['user']['preferences']['rental']['decimal_separator'] 
: ',';
                        $thousands_separator = 
isset($GLOBALS['phpgw_info']['user']['preferences']['rental']['thousands_separator'])
 ? 
$GLOBALS['phpgw_info']['user']['preferences']['rental']['thousands_separator'] 
: '.';
                        // We need all invoices for this billing
-                       $invoices = rental_soinvoice::get_instance()->get(null, 
null, 'id', true, null, null, array(
+                       $invoices = rental_soinvoice::get_instance()->get(0, 0, 
'id', true, '', '', array(
                                'billing_id' => $this->billing_job->get_id()));
                        $dateformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
 
                        foreach ($invoices as $invoice) // Runs through all 
invoices
                        {
                                // We need all price items in the invoice
-                               $price_items = 
rental_soinvoice_price_item::get_instance()->get(null, null, null, null, null, 
null, array(
+                               $price_items = 
rental_soinvoice_price_item::get_instance()->get(0, 0, '', false, '', '', array(
                                        'invoice_id' => $invoice->get_id()));
                                $composite_name = '';
                                // We need to get the composites to get a 
composite name for the Agresso export
-                               $composites = 
rental_socomposite::get_instance()->get(null, null, null, null, null, null, 
array(
+                               $composites = 
rental_socomposite::get_instance()->get(0, 0, '', false, '', '', array(
                                        'contract_id' => 
$invoice->get_contract_id()));
                                if ($composites != null && count($composites) > 
0)
                                {

Modified: trunk/rental/inc/model/class.invoice.inc.php
===================================================================
--- trunk/rental/inc/model/class.invoice.inc.php        2016-04-30 15:23:44 UTC 
(rev 14956)
+++ trunk/rental/inc/model/class.invoice.inc.php        2016-04-30 15:24:22 UTC 
(rev 14957)
@@ -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()));
                        }