X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep303.php;h=25b7a68ca589dd9a1462cc6e5302e253dc895847;hb=8ea6c4dd0d9b31b3456d012b0c94339b801bee0c;hp=b46e1d817ed714ff1a6f1ca01b448768c26595a9;hpb=ad96cd0abbfd826592b851b8e0cb6d89e450fdf4;p=fa-stable.git diff --git a/reporting/rep303.php b/reporting/rep303.php index b46e1d81..25b7a68c 100644 --- a/reporting/rep303.php +++ b/reporting/rep303.php @@ -9,12 +9,12 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_ITEMSVALREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt // date_: 2005-05-19 -// Title: Stock Check +// Title: Stock Check Sheet // ---------------------------------------------------------------- $path_to_root=".."; @@ -22,7 +22,8 @@ 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"); +include_once($path_to_root . "/includes/db/manufacturing_db.inc"); //---------------------------------------------------------------------------------------------------- @@ -43,9 +44,9 @@ function getTransactions($category, $location) 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'"; + $sql .= " AND ".TB_PREF."stock_master.category_id = ".db_escape($category); if ($location != 'all') - $sql .= " AND ".TB_PREF."stock_moves.loc_code = '$location'"; + $sql .= " AND IF(".TB_PREF."stock_moves.stock_id IS NULL, '1=1',".TB_PREF."stock_moves.loc_code = ".db_escape($location).")"; $sql .= " GROUP BY ".TB_PREF."stock_master.category_id, ".TB_PREF."stock_category.description, ".TB_PREF."stock_master.stock_id, @@ -56,50 +57,6 @@ function getTransactions($category, $location) return db_query($sql,"No transactions were returned"); } -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 "; - 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); - return $DemandRow['QtyDemand']; -} - -function getDemandAsmQty($stockid, $location) -{ - $sql = "SELECT SUM((".TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent)*".TB_PREF."bom.quantity) - AS Dem - FROM ".TB_PREF."sales_order_details, - ".TB_PREF."sales_orders, - ".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 "; - 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'"; - - $TransResult = db_query($sql,"No transactions were returned"); - if (db_num_rows($TransResult)==1) - { - $DemandRow = db_fetch_row($TransResult); - $DemandQty = $DemandRow[0]; - } - else - $DemandQty = 0.0; - - return $DemandQty; -} - //---------------------------------------------------------------------------------------------------- function print_stock_check() @@ -110,44 +67,55 @@ function print_stock_check() $location = $_POST['PARAM_1']; $pictures = $_POST['PARAM_2']; $check = $_POST['PARAM_3']; - $comments = $_POST['PARAM_4']; - $destination = $_POST['PARAM_5']; + $shortage = $_POST['PARAM_4']; + $comments = $_POST['PARAM_5']; + $destination = $_POST['PARAM_6']; if ($destination) include_once($path_to_root . "/reporting/includes/excel_report.inc"); else include_once($path_to_root . "/reporting/includes/pdf_report.inc"); - if ($category == reserved_words::get_all_numeric()) + if ($category == ALL_NUMERIC) $category = 0; if ($category == 0) $cat = _('All'); else $cat = get_category_name($category); - if ($location == reserved_words::get_all()) + if ($location == ALL_TEXT) $location = 'all'; if ($location == 'all') $loc = _('All'); else $loc = $location; - + if ($shortage) + { + $short = _('Yes'); + $available = _('Shortage'); + } + else + { + $short = _('No'); + $available = _('Available'); + } 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'); + $cols = array(0, 100, 250, 295, 345, 390, 445, 515); + $headers = array(_('Stock ID'), _('Description'), _('Quantity'), _('Check'), _('Demand'), $available, _('On Order')); + $aligns = array('left', 'left', 'right', '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'); + $cols = array(0, 100, 250, 315, 380, 445, 515); + $headers = array(_('Stock ID'), _('Description'), _('Quantity'), _('Demand'), $available, _('On Order')); + $aligns = array('left', 'left', 'right', 'right', 'right', 'right'); } $params = array( 0 => $comments, 1 => array('text' => _('Category'), 'from' => $cat, 'to' => ''), - 2 => array('text' => _('Location'), 'from' => $loc, 'to' => '')); + 2 => array('text' => _('Location'), 'from' => $loc, 'to' => ''), + 3 => array('text' => _('Only Shortage'), 'from' => $short, 'to' => '')); if ($pictures) $user_comp = user_company(); @@ -164,6 +132,16 @@ function print_stock_check() $catt = ''; while ($trans=db_fetch($res)) { + if ($location == 'all') + $loc_code = ""; + else + $loc_code = $location; + $demandqty = get_demand_qty($trans['stock_id'], $loc_code); + $demandqty += get_demand_asm_qty($trans['stock_id'], $loc_code); + $onorder = get_on_porder_qty($trans['stock_id'], $loc_code); + $onorder += get_on_worder_qty($trans['stock_id'], $loc_code); + if ($shortage && $trans['QtyOnHand'] - $demandqty >= 0) + continue; if ($catt != $trans['cat_description']) { if ($catt != '') @@ -176,12 +154,6 @@ function print_stock_check() $catt = $trans['cat_description']; $rep->NewLine(); } - 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']); @@ -192,21 +164,24 @@ function print_stock_check() $rep->TextCol(3, 4, "_________"); $rep->AmountCol(4, 5, $demandqty, $dec); $rep->AmountCol(5, 6, $trans['QtyOnHand'] - $demandqty, $dec); + $rep->AmountCol(6, 7, $onorder, $dec); } else { $rep->AmountCol(3, 4, $demandqty, $dec); $rep->AmountCol(4, 5, $trans['QtyOnHand'] - $demandqty, $dec); + $rep->AmountCol(5, 6, $onorder, $dec); } 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(); } @@ -217,4 +192,4 @@ function print_stock_check() $rep->End(); } -?> \ No newline at end of file +?>