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

[sigurdne]

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

Modified Paths:
--------------
    branches/dev-syncromind-2/property/inc/class.uiinvoice.inc.php

Modified: branches/dev-syncromind-2/property/inc/class.uiinvoice.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uiinvoice.inc.php      
2016-05-13 12:07:05 UTC (rev 15088)
+++ branches/dev-syncromind-2/property/inc/class.uiinvoice.inc.php      
2016-05-13 12:07:07 UTC (rev 15089)
@@ -933,6 +933,7 @@
                        $order = phpgw::get_var('order');
                        $draw = phpgw::get_var('draw', 'int');
                        $columns = phpgw::get_var('columns');
+                       $export = phpgw::get_var('export', 'bool');
 
                        $params = array
                                (
@@ -941,7 +942,7 @@
                                'query' => $search['value'],
                                'order' => 
$columns[$order[0]['column']]['data'],
                                'sort' => $order[0]['dir'],
-                               'allrows' => phpgw::get_var('length', 'int') == 
-1,
+                               'allrows' => phpgw::get_var('length', 'int') == 
-1 || $export,
                                'start_date' => $start_date,
                                'end_date' => $end_date,
                                'paid' => $paid,
@@ -956,7 +957,7 @@
 
                        $invoice_list = $this->bo->read_invoice($params);
 
-                       if (phpgw::get_var('export', 'bool'))
+                       if ($export)
                        {
                                return $invoice_list;
                        }