Record status edition added.

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

diff --git a/reporting/rep303.php b/reporting/rep303.php
index 302051f19f8dc1afbc079f853d0dc3db4d01d138..f50361e5e4251b651b361628976fe848cd25068c 100644 (file)
--- a/reporting/rep303.php
+++ b/reporting/rep303.php
@@ -22,11 +22,10 @@ include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/gl/includes/gl_db.inc");
-include_once($path_to_root . "/inventory/includes/db/items_category_db.inc");
+include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_stock_check();
 
 function getTransactions($category, $location)
@@ -114,15 +113,9 @@ function print_stock_check()
     $comments = $_POST['PARAM_4'];
        $destination = $_POST['PARAM_5'];
        if ($destination)
-       {
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
-               $filename = "StockCheckSheet.xml";
-       }       
        else
-       {
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-               $filename = "StockCheckSheet.pdf";
-       }
 
        if ($category == reserved_words::get_all_numeric())
                $category = 0;
@@ -161,7 +154,7 @@ function print_stock_check()
        else
                $user_comp = "";
 
-    $rep = new FrontReport(_('Stock Check Sheets'), $filename, user_pagesize());
+    $rep = new FrontReport(_('Stock Check Sheets'), "StockCheckSheet", user_pagesize());
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
@@ -207,13 +200,14 @@ function print_stock_check()
                }
                if ($pictures)
                {
-                       $image = $comp_path .'/'. $user_comp . '/images/' . $trans['stock_id'] . '.jpg';
+                       $image = $comp_path .'/'. $user_comp . '/images/' 
+                               . item_img_name($trans['stock_id']) . '.jpg';
                        if (file_exists($image))
                        {
                                $rep->NewLine();
                                if ($rep->row - $pic_height < $rep->bottomMargin)
                                        $rep->Header();
-                               $rep->AddImage($image, $rep->cols[1], $rep->row - $pic_height, $pic_width, $pic_height);
+                               $rep->AddImage($image, $rep->cols[1], $rep->row - $pic_height, 0, $pic_height);
                                $rep->row -= $pic_height;
                                $rep->NewLine();
                        }