Merged changes form stable branch up to 2.3.13

[fa-stable.git] / reporting / rep105.php

diff --git a/reporting/rep105.php b/reporting/rep105.php
index e0dd503637cd407d4acce43c597582fb9074fe80..70c8c0d0a203cac7bb1aaf90d28ea15033ef9dfe 100644 (file)
--- a/reporting/rep105.php
+++ b/reporting/rep105.php
@@ -96,7 +96,7 @@ function print_order_status_list()
        if ($location == null)
                $loc = _('All');
        else
-               $loc = $location;
+               $loc = get_location_name($location);
        if ($backorder == 0)
                $back = _('All Orders');
        else
@@ -132,11 +132,6 @@ function print_order_status_list()
 
        while ($myrow=db_fetch($result))
        {
-               if ($rep->row < $rep->bottomMargin + (2 * $rep->lineHeight))
-               {
-                       $orderno = 0;
-                       $rep->NewPage();
-               }
                $rep->NewLine(0, 2, false, $orderno);
                if ($orderno != $myrow['order_no'])
                {
@@ -168,11 +163,6 @@ function print_order_status_list()
                        $rep->Font();
                }
                $rep->NewLine();
-               if ($rep->row < $rep->bottomMargin + (2 * $rep->lineHeight))
-               {
-                       $orderno = 0;
-                       $rep->NewPage();
-               }
        }
        $rep->Line($rep->row);
        $rep->End();