X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep302.php;h=cdfd0e9a21e89d81a92422c3d063453f77f6d2ae;hb=5a3cbfe6d2df1c8c32edcab8bf93e8a8432a15fc;hp=e92c27c5ff4a5fc4249f40c28861e55c86f828b8;hpb=2383d33373d6ddec06906658a0ed6398077c1147;p=fa-stable.git diff --git a/reporting/rep302.php b/reporting/rep302.php index e92c27c5..cdfd0e9a 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 @@ -31,28 +31,27 @@ print_inventory_planning(); 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, - 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, - ".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')"; + $sql = "SELECT item.category_id, + category.description AS cat_description, + item.stock_id, + item.description, item.inactive, + IF(move.stock_id IS NULL, '', move.loc_code) AS loc_code, + SUM(IF(move.stock_id IS NULL, 0, move.qty)) AS qty_on_hand + FROM (".TB_PREF."stock_master item," + .TB_PREF."stock_category category) + LEFT JOIN ".TB_PREF."stock_moves move ON item.stock_id=move.stock_id + WHERE item.category_id=category.category_id + AND (item.mb_flag='B' OR item.mb_flag='M')"; if ($category != 0) - $sql .= " AND ".TB_PREF."stock_master.category_id = '$category'"; + $sql .= " AND item.category_id = ".db_escape($category); if ($location != 'all') - $sql .= " AND IF(".TB_PREF."stock_moves.stock_id IS NULL, '1=1',".TB_PREF."stock_moves.loc_code = '$location')"; - $sql .= " GROUP BY ".TB_PREF."stock_master.category_id, - ".TB_PREF."stock_category.description, - ".TB_PREF."stock_master.stock_id, - ".TB_PREF."stock_master.description - ORDER BY ".TB_PREF."stock_master.category_id, - ".TB_PREF."stock_master.stock_id"; + $sql .= " AND IF(move.stock_id IS NULL, '1=1',move.loc_code = ".db_escape($location).")"; + $sql .= " GROUP BY item.category_id, + category.description, + item.stock_id, + item.description + ORDER BY item.category_id, + item.stock_id"; return db_query($sql,"No transactions were returned"); @@ -75,8 +74,7 @@ function getPeriods($stockid, $location) FROM ".TB_PREF."stock_moves WHERE stock_id='$stockid' AND loc_code ='$location' - AND (type=13 OR type=11) - AND visible=1"; + AND (type=13 OR type=11)"; $TransResult = db_query($sql,"No transactions were returned"); return db_fetch($TransResult); @@ -91,25 +89,27 @@ function print_inventory_planning() $category = $_POST['PARAM_0']; $location = $_POST['PARAM_1']; $comments = $_POST['PARAM_2']; - $destination = $_POST['PARAM_3']; + $orientation = $_POST['PARAM_3']; + $destination = $_POST['PARAM_4']; 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()) + $orientation = ($orientation ? 'L' : 'P'); + 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); @@ -129,11 +129,13 @@ function print_inventory_planning() 1 => array('text' => _('Category'), 'from' => $cat, 'to' => ''), 2 => array('text' => _('Location'), 'from' => $loc, 'to' => '')); - $rep = new FrontReport(_('Inventory Planning Report'), "InventoryPlanning", user_pagesize()); + $rep = new FrontReport(_('Inventory Planning Report'), "InventoryPlanning", user_pagesize(), 9, $orientation); + if ($orientation == 'L') + recalculate_cols($cols); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); - $rep->Header(); + $rep->NewPage(); $res = getTransactions($category, $location); $catt = ''; @@ -163,13 +165,13 @@ function print_inventory_planning() $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); @@ -188,4 +190,3 @@ function print_inventory_planning() $rep->End(); } -?> \ No newline at end of file