[0004212] Work Order Entry: fixed error when voided WO refence is reused.

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

diff --git a/reporting/rep204.php b/reporting/rep204.php
index 21624cf489481b56811fff5291f4c426b4082212..51fbf012d66c5182f1752500694e54818bbf2f1b 100644 (file)
--- a/reporting/rep204.php
+++ b/reporting/rep204.php
@@ -29,30 +29,30 @@ print_outstanding_GRN();
 
 function getTransactions($fromsupp)
 {
-       $sql = "SELECT ".TB_PREF."grn_batch.id,
+       $sql = "SELECT grn.id,
                        order_no,
-                       ".TB_PREF."grn_batch.supplier_id,
-                       ".TB_PREF."suppliers.supp_name,
-                       ".TB_PREF."grn_items.item_code,
-                       ".TB_PREF."grn_items.description,
+                       grn.supplier_id,
+                       supplier.supp_name,
+                       item.item_code,
+                       item.description,
                        qty_recd,
                        quantity_inv,
                        std_cost_unit,
                        act_price,
                        unit_price
-               FROM ".TB_PREF."grn_items,
-                       ".TB_PREF."grn_batch,
-                       ".TB_PREF."purch_order_details,
-                       ".TB_PREF."suppliers
-               WHERE ".TB_PREF."grn_batch.supplier_id=".TB_PREF."suppliers.supplier_id
-               AND ".TB_PREF."grn_batch.id = ".TB_PREF."grn_items.grn_batch_id
-               AND ".TB_PREF."grn_items.po_detail_item = ".TB_PREF."purch_order_details.po_detail_item
-               AND qty_recd-quantity_inv <>0 ";
+               FROM ".TB_PREF."grn_items item,
+                       ".TB_PREF."grn_batch grn,
+                       ".TB_PREF."purch_order_details poline,
+                       ".TB_PREF."suppliers supplier
+               WHERE grn.supplier_id=supplier.supplier_id
+               AND grn.id = item.grn_batch_id
+               AND item.po_detail_item = poline.po_detail_item
+               AND qty_recd-quantity_inv!=0";
 
        if ($fromsupp != ALL_TEXT)
-               $sql .= "AND ".TB_PREF."grn_batch.supplier_id =".db_escape($fromsupp)." ";
-       $sql .= "ORDER BY ".TB_PREF."grn_batch.supplier_id,
-                       ".TB_PREF."grn_batch.id";
+               $sql .= " AND grn.supplier_id =".db_escape($fromsupp);
+
+       $sql .= " ORDER BY grn.supplier_id,     grn.id";
 
     return db_query($sql, "No transactions were returned");
 }
@@ -65,12 +65,14 @@ function print_outstanding_GRN()
 
     $fromsupp = $_POST['PARAM_0'];
     $comments = $_POST['PARAM_1'];
-       $destination = $_POST['PARAM_2'];
+       $orientation = $_POST['PARAM_2'];
+       $destination = $_POST['PARAM_3'];
        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');
        if ($fromsupp == ALL_TEXT)
                $from = _('All');
        else
@@ -87,7 +89,9 @@ function print_outstanding_GRN()
     $params =   array(         0 => $comments,
                                    1 => array('text' => _('Supplier'), 'from' => $from, 'to' => ''));
 
-    $rep = new FrontReport(_('Outstanding GRNs Report'), "OutstandingGRN", user_pagesize());
+    $rep = new FrontReport(_('Outstanding GRNs Report'), "OutstandingGRN", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
@@ -148,4 +152,3 @@ function print_outstanding_GRN()
     $rep->End();
 }
 
-?>
\ No newline at end of file