X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep303.php;h=bc04f7694e6fba1afdf97e2f90fe2af2b93897a1;hb=4e657ee817bcaecc22780c26a29b87790f0cab04;hp=1cfab257919bd862636f370bd1107bab99d407f0;hpb=c09be0dad6b05131e240349a375af7a4b7bf3444;p=fa-stable.git diff --git a/reporting/rep303.php b/reporting/rep303.php index 1cfab257..bc04f769 100644 --- a/reporting/rep303.php +++ b/reporting/rep303.php @@ -26,13 +26,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 +53,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 +72,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'"; @@ -101,7 +103,8 @@ function print_stock_check() $category = $_POST['PARAM_0']; $location = $_POST['PARAM_1']; $pictures = $_POST['PARAM_2']; - $comments = $_POST['PARAM_3']; + $check = $_POST['PARAM_3']; + $comments = $_POST['PARAM_4']; if ($category == reserved_words::get_all_numeric()) $category = 0; @@ -117,11 +120,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' => ''), @@ -154,22 +165,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)); + if ($check) + { + $rep->TextCol(3, 4, "_________"); + $rep->TextCol(4, 5, number_format2($demandqty, $dec)); + $rep->TextCol(5, 6, number_format2($trans['QtyOnHand'] - $demandqty, $dec)); + } + else + { + $rep->TextCol(3, 4, number_format2($demandqty, $dec)); + $rep->TextCol(4, 5, number_format2($trans['QtyOnHand'] - $demandqty, $dec)); + } if ($pictures) { $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;