[Fmsystem-commits] [15764] property: invoice handling

[sigurdne]

Revision: 15764
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15764
Author:   sigurdne
Date:     2016-09-30 07:03:33 +0000 (Fri, 30 Sep 2016)
Log Message:
-----------
property: invoice handling

Modified Paths:
--------------
    trunk/property/inc/class.soinvoice.inc.php
    trunk/property/inc/class.uitts.inc.php

Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php  2016-09-30 02:18:37 UTC (rev 
15763)
+++ trunk/property/inc/class.soinvoice.inc.php  2016-09-30 07:03:33 UTC (rev 
15764)
@@ -596,6 +596,11 @@
                                $where = 'AND';
                        }
 
+                       if(!$filtermethod)
+                       {
+                               return array();
+                       }
+
                        $groupmethod = "GROUP BY 
pmwrkord_code,bilagsnr,bilagsnr_ut,fakturanr,"
                                . " 
currency,budsjettansvarligid,org_name,periode,periodization,periodization_start,external_voucher_id";
 

Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php      2016-09-30 02:18:37 UTC (rev 
15763)
+++ trunk/property/inc/class.uitts.inc.php      2016-09-30 07:03:33 UTC (rev 
15764)
@@ -2563,14 +2563,16 @@
 
                        // start invoice
                        $invoices = array();
-                       $active_invoices = 
execMethod('property.soinvoice.read_invoice_sub_sum', array(
-                               'order_id' => $ticket['order_id']));
-                       $historical_invoices = 
execMethod('property.soinvoice.read_invoice_sub_sum', array(
-                               'order_id' => $ticket['order_id'],
-                               'paid' => true));
-                       $invoices = array_merge($active_invoices, 
$historical_invoices);
+                       if(!empty($ticket['order_id']))
+                       {
+                               $active_invoices = 
execMethod('property.soinvoice.read_invoice_sub_sum', array(
+                                       'order_id' => $ticket['order_id']));
+                               $historical_invoices = 
execMethod('property.soinvoice.read_invoice_sub_sum', array(
+                                       'order_id' => $ticket['order_id'],
+                                       'paid' => true));
+                               $invoices = array_merge($active_invoices, 
$historical_invoices);
+                       }
 
-
                        $link_data_invoice1 = array
                                (
                                'menuaction' => 'property.uiinvoice.index',