projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed mysqli related warnings.
[fa-stable.git]
/
reporting
/
rep302.php
diff --git
a/reporting/rep302.php
b/reporting/rep302.php
index 75feef57e657d6cf1286dd100fbf1bfdcac86515..55c766c02440db9448d6e0a3556573e5dd6d85ed 100644
(file)
--- a/
reporting/rep302.php
+++ b/
reporting/rep302.php
@@
-40,7
+40,7
@@
function getTransactions($category, $location)
FROM (".TB_PREF."stock_master,
".TB_PREF."stock_category)
LEFT JOIN ".TB_PREF."stock_moves ON
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
)
+ (".TB_PREF."stock_master.stock_id=".TB_PREF."stock_moves.stock_id)
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)
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)
@@
-75,8
+75,7
@@
function getPeriods($stockid, $location)
FROM ".TB_PREF."stock_moves
WHERE stock_id='$stockid'
AND loc_code ='$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);
$TransResult = db_query($sql,"No transactions were returned");
return db_fetch($TransResult);
@@
-91,12
+90,14
@@
function print_inventory_planning()
$category = $_POST['PARAM_0'];
$location = $_POST['PARAM_1'];
$comments = $_POST['PARAM_2'];
$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 ($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)
@@
-129,7
+130,9
@@
function print_inventory_planning()
1 => array('text' => _('Category'), 'from' => $cat, 'to' => ''),
2 => array('text' => _('Location'), 'from' => $loc, 'to' => ''));
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->Font();
$rep->Info($params, $cols, $headers, $aligns);
@@
-188,4
+191,3
@@
function print_inventory_planning()
$rep->End();
}
$rep->End();
}
-?>
\ No newline at end of file