X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep302.php;h=75feef57e657d6cf1286dd100fbf1bfdcac86515;hb=2bbf52478cf6cbf4fb89395f18390f1a6af93f40;hp=fc600e965739f212f06a5e1522d8cedccdf3a3aa;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;p=fa-stable.git diff --git a/reporting/rep302.php b/reporting/rep302.php index fc600e96..75feef57 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,6 +23,7 @@ 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"); //---------------------------------------------------------------------------------------------------- @@ -33,7 +34,7 @@ function getTransactions($category, $location) $sql = "SELECT ".TB_PREF."stock_master.category_id, ".TB_PREF."stock_category.description AS cat_description, ".TB_PREF."stock_master.stock_id, - ".TB_PREF."stock_master.description, + ".TB_PREF."stock_master.description, ".TB_PREF."stock_master.inactive, 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 qty_on_hand FROM (".TB_PREF."stock_master, @@ -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, @@ -57,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'); @@ -155,19 +97,19 @@ function print_inventory_planning() 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; + $loc = get_location_name($location); $cols = array(0, 50, 150, 180, 210, 240, 270, 300, 330, 390, 435, 480, 525); @@ -191,7 +133,7 @@ function print_inventory_planning() $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); - $rep->Header(); + $rep->NewPage(); $res = getTransactions($category, $location); $catt = ''; @@ -212,21 +154,22 @@ 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']); $rep->TextCol(0, 1, $trans['stock_id']); - $rep->TextCol(1, 2, $trans['description']); + $rep->TextCol(1, 2, $trans['description'].($trans['inactive']==1 ? " ("._("Inactive").")" : ""), -1); $rep->AmountCol(2, 3, $period['prd0'], $dec); $rep->AmountCol(3, 4, $period['prd1'], $dec); $rep->AmountCol(4, 5, $period['prd2'], $dec); $rep->AmountCol(5, 6, $period['prd3'], $dec); $rep->AmountCol(6, 7, $period['prd4'], $dec); - + $MaxMthSales = Max($period['prd0'], $period['prd1'], $period['prd2'], $period['prd3']); $IdealStockHolding = $MaxMthSales * 3; $rep->AmountCol(7, 8, $IdealStockHolding, $dec);