MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
-$page_security = 2;
+$page_security = 'SA_ITEMSVALREP';
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
$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 QtyOnHand
FROM (".TB_PREF."stock_master,
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,
function print_stock_check()
{
- global $comp_path, $path_to_root, $pic_height, $pic_width;
+ global $comp_path, $path_to_root, $pic_height;
$category = $_POST['PARAM_0'];
$location = $_POST['PARAM_1'];
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);
if ($shortage)
{
$short = _('Yes');
$catt = '';
while ($trans=db_fetch($res))
{
+ if ($location == 'all')
+ $loc_code = "";
+ else
+ $loc_code = $location;
$demandqty = get_demand_qty($trans['stock_id'], $loc_code);
$demandqty += get_demand_asm_qty($trans['stock_id'], $loc_code);
$onorder = get_on_porder_qty($trans['stock_id'], $loc_code);
$catt = $trans['cat_description'];
$rep->NewLine();
}
- if ($location == 'all')
- $loc_code = "";
- else
- $loc_code = $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, $trans['QtyOnHand'], $dec);
if ($check)
{
$rep->End();
}
-?>
\ No newline at end of file
+?>