X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep302.php;h=6e0ddfd41f462cb6486598bae2ffc2f552bd6d37;hb=e8152d62c89b6487b11c6a3879f0346dbd66dd45;hp=0a633335cb86ec688afeb7afcdfa89dbf1d86f9a;hpb=020667053df74a6490e60413c1e773a746c926b6;p=fa-stable.git diff --git a/reporting/rep302.php b/reporting/rep302.php index 0a633335..6e0ddfd4 100644 --- a/reporting/rep302.php +++ b/reporting/rep302.php @@ -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, ".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, - ".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 = ".db_escape($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 = ".db_escape($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); @@ -86,17 +84,19 @@ function getPeriods($stockid, $location) function print_inventory_planning() { - global $path_to_root; + global $path_to_root, $tmonths; $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"); + $orientation = ($orientation ? 'L' : 'P'); if ($category == ALL_NUMERIC) $category = 0; if ($category == 0) @@ -113,13 +113,12 @@ function print_inventory_planning() $cols = array(0, 50, 150, 180, 210, 240, 270, 300, 330, 390, 435, 480, 525); - $per0 = strftime('%b',mktime(0,0,0,date('m'),1,date('Y'))); - $per1 = strftime('%b',mktime(0,0,0,date('m')-1,1,date('Y'))); - $per2 = strftime('%b',mktime(0,0,0,date('m')-2,1,date('Y'))); - $per3 = strftime('%b',mktime(0,0,0,date('m')-3,1,date('Y'))); - $per4 = strftime('%b',mktime(0,0,0,date('m')-4,1,date('Y'))); - - $headers = array(_('Category'), '', $per4, $per3, $per2, $per1, $per0, '3*M', + $per0 = $tmonths[date('n',mktime(0,0,0,date('m'),1,date('Y')))]; + $per1 = $tmonths[date('n',mktime(0,0,0,date('m')-1,1,date('Y')))]; + $per2 = $tmonths[date('n',mktime(0,0,0,date('m')-2,1,date('Y')))]; + $per3 = $tmonths[date('n',mktime(0,0,0,date('m')-3,1,date('Y')))]; + $per4 = $tmonths[date('n',mktime(0,0,0,date('m')-4,1,date('Y')))]; + $headers = array(_('Category'), '', $per4, $per3, $per2, $per1, $per0, _('3*M'), _('QOH'), _('Cust Ord'), _('Supp Ord'), _('Sugg Ord')); $aligns = array('left', 'left', 'right', 'right', 'right', 'right', 'right', 'right', @@ -129,11 +128,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 = ''; @@ -188,4 +189,3 @@ function print_inventory_planning() $rep->End(); } -?> \ No newline at end of file