PHP 7.4 Bugs in some reports.

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

diff --git a/reporting/rep306.php b/reporting/rep306.php
index 7e5c56c265e47da0796205c0289130703054911c..00cddadc1f96a000cd4c3fe61ff9abd0d87a2f55 100644 (file)
--- a/reporting/rep306.php
+++ b/reporting/rep306.php
@@ -38,18 +38,19 @@ function getTransactions($category, $location, $fromsupp, $item, $from, $to)
                        item.stock_id,
                        item.description, item.inactive,
                        move.loc_code,
-                       supplier.supplier_id,
+                       supplier.supplier_id , IF(ISNULL(grn.rate), credit.rate, grn.rate) ex_rate,
                        supplier.supp_name AS supplier_name,
                        move.tran_date,
                        move.qty AS qty,
                        move.price
-               FROM ".TB_PREF."stock_master item,
-                       ".TB_PREF."stock_category category,
-                       ".TB_PREF."suppliers supplier,
-                       ".TB_PREF."stock_moves move
+               FROM ".TB_PREF."stock_moves move
+                               LEFT JOIN ".TB_PREF."supp_trans credit ON credit.trans_no=move.trans_no AND credit.type=move.type
+                               LEFT JOIN ".TB_PREF."grn_batch grn ON grn.id=move.trans_no AND 25=move.type
+                               LEFT JOIN ".TB_PREF."suppliers supplier ON IFNULL(grn.supplier_id, credit.supplier_id)=supplier.supplier_id,
+                       ".TB_PREF."stock_master item,
+                       ".TB_PREF."stock_category category
                WHERE item.stock_id=move.stock_id
                AND item.category_id=category.category_id
-               AND move.person_id=supplier.supplier_id
                AND move.tran_date>='$from'
                AND move.tran_date<='$to'
                AND (move.type=".ST_SUPPRECEIVE." OR move.type=".ST_SUPPCREDIT.")
@@ -88,9 +89,8 @@ function get_supp_inv_reference($supplier_id, $stock_id, $date)
        return $row[0];
     else
        return '';
-}    
-    
-       
+}
+
 //----------------------------------------------------------------------------------------------------
 
 function print_inventory_purchase()
@@ -224,8 +224,7 @@ function print_inventory_purchase()
                }
                
                $curr = get_supplier_currency($trans['supplier_id']);
-               $rate = get_exchange_rate_from_home_currency($curr, sql2date($trans['tran_date']));
-               $trans['price'] *= $rate;
+               $trans['price'] *= $trans['ex_rate'];
                $rep->NewLine();
                $trans['supp_reference'] = get_supp_inv_reference($trans['supplier_id'], $trans['stock_id'], $trans['tran_date']);
                $rep->fontSize -= 2;
@@ -267,7 +266,7 @@ function print_inventory_purchase()
                        $rep->NewLine();
                        $rep->NewLine();
                        $total_supp = $total_qty = 0.0;
-                       $supplier_name = $trans['supplier_name'];
+                       $supplier_name = isset($trans['supplier_name']) ? $trans['supplier_name'] : "";
                }       
        }
        if ($supplier_name != '')