X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Frep303.php;h=302051f19f8dc1afbc079f853d0dc3db4d01d138;hb=f50187b9c3095886d7fd847f635cd8763109a75e;hp=801561f197ddccba89e3108ff0e8a0cdc8ba3afa;hpb=7a50c189ea995d5fe6785feb7710c00396065d2b;p=fa-stable.git diff --git a/reporting/rep303.php b/reporting/rep303.php index 801561f1..302051f1 100644 --- a/reporting/rep303.php +++ b/reporting/rep303.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 2; // ---------------------------------------------------------------- // $ Revision: 2.0 $ @@ -7,13 +16,13 @@ $page_security = 2; // date_: 2005-05-19 // Title: Stock Check // ---------------------------------------------------------------- -$path_to_root="../"; +$path_to_root=".."; -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 . "/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"); //---------------------------------------------------------------------------------------------------- @@ -26,13 +35,13 @@ function getTransactions($category, $location) ".TB_PREF."stock_category.description AS cat_description, ".TB_PREF."stock_master.stock_id, ".TB_PREF."stock_master.description, - ".TB_PREF."stock_moves.loc_code, - SUM(".TB_PREF."stock_moves.qty) AS QtyOnHand - FROM ".TB_PREF."stock_master, - ".TB_PREF."stock_category, - ".TB_PREF."stock_moves - WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."stock_moves.stock_id - AND ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id + IF(".TB_PREF."stock_moves.stock_id IS NULL, '', ".TB_PREF."stock_moves.loc_code) AS loc_code, + SUM(IF(".TB_PREF."stock_moves.stock_id IS NULL,0,".TB_PREF."stock_moves.qty)) AS QtyOnHand + FROM (".TB_PREF."stock_master, + ".TB_PREF."stock_category) + LEFT JOIN ".TB_PREF."stock_moves ON + (".TB_PREF."stock_master.stock_id=".TB_PREF."stock_moves.stock_id OR ".TB_PREF."stock_master.stock_id IS NULL) + WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id AND (".TB_PREF."stock_master.mb_flag='B' OR ".TB_PREF."stock_master.mb_flag='M')"; if ($category != 0) $sql .= " AND ".TB_PREF."stock_master.category_id = '$category'"; @@ -53,9 +62,10 @@ function getDemandQty($stockid, $location) $sql = "SELECT SUM(".TB_PREF."sales_order_details.quantity - ".TB_PREF."sales_order_details.qty_sent) AS QtyDemand FROM ".TB_PREF."sales_order_details, ".TB_PREF."sales_orders - WHERE ".TB_PREF."sales_order_details.order_no=".TB_PREF."sales_orders.order_no AND - ".TB_PREF."sales_orders.from_stk_loc ='$location' AND - ".TB_PREF."sales_order_details.stk_code = '$stockid'"; + WHERE ".TB_PREF."sales_order_details.order_no=".TB_PREF."sales_orders.order_no AND "; + if ($location != "") + $sql .= TB_PREF."sales_orders.from_stk_loc ='$location' AND "; + $sql .= TB_PREF."sales_order_details.stk_code = '$stockid'"; $TransResult = db_query($sql,"No transactions were returned"); $DemandRow = db_fetch($TransResult); @@ -71,9 +81,10 @@ function getDemandAsmQty($stockid, $location) ".TB_PREF."bom, ".TB_PREF."stock_master WHERE ".TB_PREF."sales_order_details.stk_code=".TB_PREF."bom.parent AND - ".TB_PREF."sales_orders.order_no = ".TB_PREF."sales_order_details.order_no AND - ".TB_PREF."sales_orders.from_stk_loc='$location' AND - ".TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent > 0 AND + ".TB_PREF."sales_orders.order_no = ".TB_PREF."sales_order_details.order_no AND "; + if ($location != "") + $sql .= TB_PREF."sales_orders.from_stk_loc ='$location' AND "; + $sql .= TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent > 0 AND ".TB_PREF."bom.component='$stockid' AND ".TB_PREF."stock_master.stock_id=".TB_PREF."bom.parent AND ".TB_PREF."stock_master.mb_flag='A'"; @@ -94,16 +105,24 @@ function getDemandAsmQty($stockid, $location) function print_stock_check() { - global $path_to_root, $pic_height, $pic_width; - - include_once($path_to_root . "reporting/includes/pdf_report.inc"); + global $comp_path, $path_to_root, $pic_height, $pic_width; $category = $_POST['PARAM_0']; $location = $_POST['PARAM_1']; $pictures = $_POST['PARAM_2']; - $comments = $_POST['PARAM_3']; - - $dec = user_qty_dec(); + $check = $_POST['PARAM_3']; + $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; @@ -119,11 +138,19 @@ function print_stock_check() else $loc = $location; - $cols = array(0, 100, 305, 375, 445, 515); - - $headers = array(_('Category'), _('Description'), _('Quantity'), _('Demand'), _('Difference')); + if ($check) + { + $cols = array(0, 100, 250, 305, 375, 445, 515); + $headers = array(_('Category'), _('Description'), _('Quantity'), _('Check'), _('Demand'), _('Difference')); + $aligns = array('left', 'left', 'right', 'right', 'right', 'right'); + } + else + { + $cols = array(0, 100, 305, 375, 445, 515); + $headers = array(_('Category'), _('Description'), _('Quantity'), _('Demand'), _('Difference')); + $aligns = array('left', 'left', 'right', 'right', 'right'); + } - $aligns = array('left', 'left', 'right', 'right', 'right'); $params = array( 0 => $comments, 1 => array('text' => _('Category'), 'from' => $cat, 'to' => ''), @@ -134,7 +161,7 @@ function print_stock_check() else $user_comp = ""; - $rep = new FrontReport(_('Stock Check Sheets'), "StockCheckSheet.pdf", user_pagesize()); + $rep = new FrontReport(_('Stock Check Sheets'), $filename, user_pagesize()); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); @@ -156,21 +183,35 @@ function print_stock_check() $catt = $trans['cat_description']; $rep->NewLine(); } - $demandqty = getDemandQty($trans['stock_id'], $trans['loc_code']); - $demandqty += getDemandAsmQty($trans['stock_id'], $trans['loc_code']); + if ($location == 'all') + $loc_code = ""; + else + $loc_code = $trans['loc_code']; + $demandqty = getDemandQty($trans['stock_id'], $loc_code); + $demandqty += getDemandAsmQty($trans['stock_id'], $loc_code); $rep->NewLine(); + $dec = get_qty_dec($trans['stock_id']); $rep->TextCol(0, 1, $trans['stock_id']); $rep->TextCol(1, 2, $trans['description']); - $rep->TextCol(2, 3, number_format2($trans['QtyOnHand'], $dec)); - $rep->TextCol(3, 4, number_format2($demandqty, $dec)); - $rep->TextCol(4, 5, number_format2($trans['QtyOnHand'] - $demandqty, $dec)); + $rep->AmountCol(2, 3, $trans['QtyOnHand'], $dec); + if ($check) + { + $rep->TextCol(3, 4, "_________"); + $rep->AmountCol(4, 5, $demandqty, $dec); + $rep->AmountCol(5, 6, $trans['QtyOnHand'] - $demandqty, $dec); + } + else + { + $rep->AmountCol(3, 4, $demandqty, $dec); + $rep->AmountCol(4, 5, $trans['QtyOnHand'] - $demandqty, $dec); + } if ($pictures) { - $image = $path_to_root . "inventory/manage/image/" . $user_comp . "/" . $trans['stock_id'] . ".jpg"; + $image = $comp_path .'/'. $user_comp . '/images/' . $trans['stock_id'] . '.jpg'; if (file_exists($image)) { $rep->NewLine(); - if ($rep->row - $height < $rep->bottomMargin) + if ($rep->row - $pic_height < $rep->bottomMargin) $rep->Header(); $rep->AddImage($image, $rep->cols[1], $rep->row - $pic_height, $pic_width, $pic_height); $rep->row -= $pic_height; @@ -179,6 +220,7 @@ function print_stock_check() } } $rep->Line($rep->row - 4); + $rep->NewLine(); $rep->End(); }