Removed obsolete stock_move.discount_percent field

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

diff --git a/reporting/rep204.php b/reporting/rep204.php
index 07e84e736ac9487948654a197d6dd5c19f823f92..ba14f2ceac4ccc1964c393b6e61480a57873f86a 100644 (file)
--- a/reporting/rep204.php
+++ b/reporting/rep204.php
@@ -9,7 +9,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 2;
+$page_security = 'SA_SUPPLIERANALYTIC';
 // ----------------------------------------------------------------
 // $ Revision: 2.0 $
 // Creator:    Joe Hunt
@@ -48,7 +48,8 @@ function getTransactions($fromsupp)
                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 ";
-       if ($fromsupp != reserved_words::get_all_numeric())
+
+       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";
@@ -64,13 +65,15 @@ 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");
 
-       if ($fromsupp == reserved_words::get_all_numeric())
+       $orientation = ($orientation ? 'L' : 'P');
+       if ($fromsupp == ALL_TEXT)
                $from = _('All');
        else
                $from = get_supplier_name($fromsupp);
@@ -79,18 +82,20 @@ function print_outstanding_GRN()
        $cols = array(0, 40, 80, 190,   250, 320, 385, 450,     515);
 
        $headers = array(_('GRN'), _('Order'), _('Item') . '/' . _('Description'), _('Qty Recd'), _('qty Inv'), _('Balance'),
-               _('Std Cost'), _('Value'));
+               _('Act Price'), _('Value'));
 
        $aligns = array('left', 'left', 'left', 'right', 'right', 'right', 'right', 'right');
 
     $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);
-    $rep->Header();
+    $rep->NewPage();
 
        $Tot_Val=0;
        $Supplier = '';
@@ -121,9 +126,9 @@ function print_outstanding_GRN()
                $rep->AmountCol(3, 4, $GRNs['qty_recd'], $dec2);
                $rep->AmountCol(4, 5, $GRNs['quantity_inv'], $dec2);
                $QtyOstg = $GRNs['qty_recd'] - $GRNs['quantity_inv'];
-               $Value = ($GRNs['qty_recd'] - $GRNs['quantity_inv']) * $GRNs['std_cost_unit'];
+               $Value = ($GRNs['qty_recd'] - $GRNs['quantity_inv']) * $GRNs['act_price'];
                $rep->AmountCol(5, 6, $QtyOstg, $dec2);
-               $rep->AmountCol(6, 7, $GRNs['std_cost_unit'], $dec);
+               $rep->AmountCol(6, 7, $GRNs['act_price'], $dec);
                $rep->AmountCol(7, 8, $Value, $dec);
                $Tot_Val += $Value;
                $SuppTot_Val += $Value;
@@ -147,4 +152,3 @@ function print_outstanding_GRN()
     $rep->End();
 }
 
-?>
\ No newline at end of file