X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep302.php;h=8e5bb6ddfd2e39e0898149e167842b5d82295df1;hb=8ea6c4dd0d9b31b3456d012b0c94339b801bee0c;hp=41bc978cca648f01cc63f04a199b34f18dea5dc5;hpb=f50187b9c3095886d7fd847f635cd8763109a75e;p=fa-stable.git diff --git a/reporting/rep302.php b/reporting/rep302.php index 41bc978c..8e5bb6dd 100644 --- a/reporting/rep302.php +++ b/reporting/rep302.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_ITEMSANALYTIC'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -23,10 +23,10 @@ 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/db/manufacturing_db.inc"); //---------------------------------------------------------------------------------------------------- -// trial_inquiry_controls(); print_inventory_planning(); function getTransactions($category, $location) @@ -44,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, @@ -58,65 +58,6 @@ function getTransactions($category, $location) } -function getCustQty($stockid, $location) -{ - $sql = "SELECT SUM(".TB_PREF."sales_order_details.quantity - ".TB_PREF."sales_order_details.qty_sent) AS qty_demand - 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['qty_demand']; -} - -function getCustAsmQty($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 getSuppQty($stockid, $location) -{ - $sql = "SELECT SUM(".TB_PREF."purch_order_details.quantity_ordered - ".TB_PREF."purch_order_details.quantity_received) AS QtyOnOrder - FROM ".TB_PREF."purch_order_details, - ".TB_PREF."purch_orders - WHERE ".TB_PREF."purch_order_details.order_no = ".TB_PREF."purch_orders.order_no - AND ".TB_PREF."purch_order_details.item_code = '$stockid'"; - if ($location != "") - $sql .= " AND ".TB_PREF."purch_orders.into_stock_location= '$location'"; - - $TransResult = db_query($sql,"No transactions were returned"); - $DemandRow = db_fetch($TransResult); - return $DemandRow['QtyOnOrder']; -} - function getPeriods($stockid, $location) { $date5 = date('Y-m-d'); @@ -152,24 +93,18 @@ function print_inventory_planning() $comments = $_POST['PARAM_2']; $destination = $_POST['PARAM_3']; if ($destination) - { include_once($path_to_root . "/reporting/includes/excel_report.inc"); - $filename = "InventoryPlanning.xml"; - } else - { include_once($path_to_root . "/reporting/includes/pdf_report.inc"); - $filename = "InventoryPlanning.pdf"; - } - 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'); @@ -194,7 +129,7 @@ function print_inventory_planning() 1 => array('text' => _('Category'), 'from' => $cat, 'to' => ''), 2 => array('text' => _('Location'), 'from' => $loc, 'to' => '')); - $rep = new FrontReport(_('Inventory Planning Report'), $filename, user_pagesize()); + $rep = new FrontReport(_('Inventory Planning Report'), "InventoryPlanning", user_pagesize()); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); @@ -219,10 +154,11 @@ function print_inventory_planning() if ($location == 'all') $loc_code = ""; else - $loc_code = $trans['loc_code']; - $custqty = getCustQty($trans['stock_id'], $loc_code); - $custqty += getCustAsmQty($trans['stock_id'], $loc_code); - $suppqty = getSuppQty($trans['stock_id'], $loc_code); + $loc_code = $location; + $custqty = get_demand_qty($trans['stock_id'], $loc_code); + $custqty += get_demand_asm_qty($trans['stock_id'], $loc_code); + $suppqty = get_on_porder_qty($trans['stock_id'], $loc_code); + $suppqty += get_on_worder_qty($trans['stock_id'], $loc_code); $period = getPeriods($trans['stock_id'], $trans['loc_code']); $rep->NewLine(); $dec = get_qty_dec($trans['stock_id']);