[0004216] Print Work Orders: database error fixed when voided WO is in selected range.

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

diff --git a/reporting/rep501.php b/reporting/rep501.php
index 45047adc021cbac1139fcbda68595977e5394307..25b39fd6f354bd896f1e4078eea6f3aafbb4bb06 100644 (file)
--- a/reporting/rep501.php
+++ b/reporting/rep501.php
@@ -32,8 +32,8 @@ function getTransactions($from, $to)
        $sql = "SELECT *
                FROM
                        ".TB_PREF."dimensions
-               WHERE reference >= ".db_escape($from)."
-               AND reference <= ".db_escape($to)."
+               WHERE id >= ".db_escape($from)."
+               AND id <= ".db_escape($to)."
                ORDER BY
                        reference";
 
@@ -74,12 +74,14 @@ function print_dimension_summary()
     $todim = $_POST['PARAM_1'];
     $showbal = $_POST['PARAM_2'];
     $comments = $_POST['PARAM_3'];
-       $destination = $_POST['PARAM_4'];
+       $orientation = $_POST['PARAM_4'];
+       $destination = $_POST['PARAM_5'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
+       $orientation = ($orientation ? 'L' : 'P');
        $cols = array(0, 50, 210, 250, 320, 395, 465,   515);
 
        $headers = array(_('Reference'), _('Name'), _('Type'), _('Date'), _('Due Date'), _('Closed'), _('YTD'));
@@ -87,13 +89,15 @@ function print_dimension_summary()
        $aligns = array('left', 'left', 'left', 'left', 'left', 'left', 'right');
 
     $params =   array(         0 => $comments,
-                                   1 => array('text' => _('Dimension'), 'from' => $fromdim, 'to' => $todim));
+                                   1 => array('text' => _('Dimension'), 'from' => get_dimension_string($fromdim), 'to' => get_dimension_string($todim)));
 
-    $rep = new FrontReport(_('Dimension Summary'), "DimensionSummary", user_pagesize());
+    $rep = new FrontReport(_('Dimension Summary'), "DimensionSummary", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
-    $rep->Header();
+    $rep->NewPage();
 
        $res = getTransactions($fromdim, $todim);
        while ($trans=db_fetch($res))
@@ -119,4 +123,3 @@ function print_dimension_summary()
     $rep->End();
 }
 
-?>
\ No newline at end of file