Rerun of implemented Selectable Print Orientation (Portrait, Landscape) for all repor...

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

diff --git a/reporting/rep305.php b/reporting/rep305.php
index 3fdef19ed092cc2e6bb77db024158198afa3f707..083d73f537a6adab0c9511cb3e42a0693318dcb8 100644 (file)
--- a/reporting/rep305.php
+++ b/reporting/rep305.php
@@ -63,11 +63,14 @@ function getSuppInvDetails($grn_item_id)
        $sql = "SELECT
                        ".TB_PREF."supp_invoice_items.supp_trans_no inv_no,
                        ".TB_PREF."supp_invoice_items.quantity inv_qty,
-                       ".TB_PREF."supp_invoice_items.unit_price inv_price
-                       FROM ".TB_PREF."grn_items, ".TB_PREF."supp_invoice_items
+                       IF (".TB_PREF."supp_trans.tax_included = 1, ".TB_PREF."supp_invoice_items.unit_price - ".TB_PREF."supp_invoice_items.unit_tax, ".TB_PREF."supp_invoice_items.unit_price) inv_price
+                       FROM ".TB_PREF."grn_items, ".TB_PREF."supp_trans, ".TB_PREF."supp_invoice_items
                        WHERE ".TB_PREF."grn_items.id = ".TB_PREF."supp_invoice_items.grn_item_id
                        AND ".TB_PREF."grn_items.po_detail_item = ".TB_PREF."supp_invoice_items.po_detail_item_id
                        AND ".TB_PREF."grn_items.item_code = ".TB_PREF."supp_invoice_items.stock_id
+                       AND ".TB_PREF."supp_trans.type = ".TB_PREF."supp_invoice_items.supp_trans_type
+                       AND ".TB_PREF."supp_trans.trans_no = ".TB_PREF."supp_invoice_items.supp_trans_no
+                       AND ".TB_PREF."supp_invoice_items.supp_trans_type = 20
                        AND ".TB_PREF."supp_invoice_items.grn_item_id = ".$grn_item_id."
                        ORDER BY ".TB_PREF."supp_invoice_items.id asc";
 
@@ -83,12 +86,14 @@ function print_grn_valuation()
        $from = $_POST['PARAM_0'];
        $to = $_POST['PARAM_1'];
        $comments = $_POST['PARAM_2'];
-       $destination = $_POST['PARAM_3'];
+       $orientation = $_POST['PARAM_3'];
+       $destination = $_POST['PARAM_4'];
        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');
     $dec = user_price_dec();
 
        $cols = array(0, 75, 225, 260, 295, 330, 370, 410, 455, 515);
@@ -99,7 +104,9 @@ function print_grn_valuation()
     $params =   array(         0 => $comments,
                                    1 => array('text' => _('Period'),'from' => $from, 'to' => $to));
 
-    $rep = new FrontReport(_('GRN Valuation Report'), "GRNValuationReport", user_pagesize());
+    $rep = new FrontReport(_('GRN Valuation Report'), "GRNValuationReport", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
@@ -126,8 +133,7 @@ function print_grn_valuation()
                }
                $curr = get_supplier_currency($trans['supplier_id']);
                $rate = get_exchange_rate_from_home_currency($curr, sql2date($trans['delivery_date']));
-               $trans['unit_price'] *= $rate;
-               $trans['act_price'] *= $rate;
+               $trans['std_cost_unit'] *= $rate;
 
                $rep->NewLine();
                $rep->TextCol(0, 1, $trans['item_code']);
@@ -145,7 +151,7 @@ function print_grn_valuation()
                                $rep->TextCol(4, 5, $inv['inv_no']);
                                $rep->AmountCol(5, 6, $inv['inv_qty'], $qdec);
                                $rep->AmountCol(6, 7, $inv['inv_price'], $dec);
-                               $rep->AmountCol(7, 8, $trans['unit_price'], $dec);
+                               $rep->AmountCol(7, 8, $trans['std_cost_unit'], $dec);
                                $amt = round2($inv['inv_qty'] * $inv['inv_price'], $dec);
                                $rep->AmountCol(8, 9, $amt, $dec);
                                $rep->NewLine();