projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Additional access control related ui helpers added: check_edit_access, access_post...
[fa-stable.git]
/
reporting
/
rep303.php
diff --git
a/reporting/rep303.php
b/reporting/rep303.php
index a7beebc1988b1ba5b0a39a83b44acc6a18be8b63..9794e8c7b3b58b907b5c13565e7c6dc451adf7f5 100644
(file)
--- a/
reporting/rep303.php
+++ b/
reporting/rep303.php
@@
-29,7
+29,7
@@
include_once($path_to_root . "/includes/db/manufacturing_db.inc");
print_stock_check();
print_stock_check();
-function getTransactions($category, $location)
+function getTransactions($category, $location
, $item_like
)
{
$sql = "SELECT ".TB_PREF."stock_master.category_id,
".TB_PREF."stock_category.description AS cat_description,
{
$sql = "SELECT ".TB_PREF."stock_master.category_id,
".TB_PREF."stock_category.description AS cat_description,
@@
-48,6
+48,15
@@
function getTransactions($category, $location)
$sql .= " AND ".TB_PREF."stock_master.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 .= " AND ".TB_PREF."stock_master.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).")";
+ if($item_like)
+ {
+ $regexp = null;
+
+ if(sscanf($item_like, "/%s", $regexp)==1)
+ $sql .= " AND ".TB_PREF."stock_master.stock_id RLIKE ".db_escape($regexp);
+ else
+ $sql .= " AND ".TB_PREF."stock_master.stock_id LIKE ".db_escape($item_like);
+ }
$sql .= " GROUP BY ".TB_PREF."stock_master.category_id,
".TB_PREF."stock_category.description,
".TB_PREF."stock_master.stock_id,
$sql .= " GROUP BY ".TB_PREF."stock_master.category_id,
".TB_PREF."stock_category.description,
".TB_PREF."stock_master.stock_id,
@@
-62,7
+71,7
@@
function getTransactions($category, $location)
function print_stock_check()
{
function print_stock_check()
{
- global $path_to_root, $
pic_height
;
+ global $path_to_root, $
SysPrefs
;
$category = $_POST['PARAM_0'];
$location = $_POST['PARAM_1'];
$category = $_POST['PARAM_0'];
$location = $_POST['PARAM_1'];
@@
-70,14
+79,17
@@
function print_stock_check()
$check = $_POST['PARAM_3'];
$shortage = $_POST['PARAM_4'];
$no_zeros = $_POST['PARAM_5'];
$check = $_POST['PARAM_3'];
$shortage = $_POST['PARAM_4'];
$no_zeros = $_POST['PARAM_5'];
- $comments = $_POST['PARAM_6'];
- $destination = $_POST['PARAM_7'];
+ $like = $_POST['PARAM_6'];
+ $comments = $_POST['PARAM_7'];
+ $orientation = $_POST['PARAM_8'];
+ $destination = $_POST['PARAM_9'];
if ($destination)
include_once($path_to_root . "/reporting/includes/excel_report.inc");
else
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
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)
if ($category == ALL_NUMERIC)
$category = 0;
if ($category == 0)
@@
-128,13
+140,15
@@
function print_stock_check()
else
$user_comp = "";
else
$user_comp = "";
- $rep = new FrontReport(_('Stock Check Sheets'), "StockCheckSheet", user_pagesize());
+ $rep = new FrontReport(_('Stock Check Sheets'), "StockCheckSheet", user_pagesize(), 9, $orientation);
+ if ($orientation == 'L')
+ recalculate_cols($cols);
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
$rep->NewPage();
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
$rep->NewPage();
- $res = getTransactions($category, $location);
+ $res = getTransactions($category, $location
, $like
);
$catt = '';
while ($trans=db_fetch($res))
{
$catt = '';
while ($trans=db_fetch($res))
{
@@
-190,10
+204,10
@@
function print_stock_check()
if (file_exists($image))
{
$rep->NewLine();
if (file_exists($image))
{
$rep->NewLine();
- if ($rep->row - $pic_height < $rep->bottomMargin)
+ if ($rep->row - $
SysPrefs->
pic_height < $rep->bottomMargin)
$rep->NewPage();
$rep->NewPage();
- $rep->AddImage($image, $rep->cols[1], $rep->row - $
pic_height, 0, $
pic_height);
- $rep->row -= $pic_height;
+ $rep->AddImage($image, $rep->cols[1], $rep->row - $
SysPrefs->pic_height, 0, $SysPrefs->
pic_height);
+ $rep->row -= $
SysPrefs->
pic_height;
$rep->NewLine();
}
}
$rep->NewLine();
}
}
@@
-203,4
+217,3
@@
function print_stock_check()
$rep->End();
}
$rep->End();
}
-?>