projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initialized upgrade procedures for FA 2.4
[fa-stable.git]
/
reporting
/
rep501.php
diff --git
a/reporting/rep501.php
b/reporting/rep501.php
index 9694b7a3b33298251ecbea7b7fe40c5835434d32..22c00c34855850075c00726ff2a5649d32decf3d 100644
(file)
--- a/
reporting/rep501.php
+++ b/
reporting/rep501.php
@@
-9,7
+9,7
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
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_DIMENSIONREP'
;
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
@@
-25,7
+25,6
@@
include_once($path_to_root . "/gl/includes/gl_db.inc");
//----------------------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------------------
-// trial_inquiry_controls();
print_dimension_summary();
function getTransactions($from, $to)
print_dimension_summary();
function getTransactions($from, $to)
@@
-33,8
+32,8
@@
function getTransactions($from, $to)
$sql = "SELECT *
FROM
".TB_PREF."dimensions
$sql = "SELECT *
FROM
".TB_PREF."dimensions
- WHERE
reference >= '$from'
- AND
reference <= '$to'
+ WHERE
id >= ".db_escape($from)."
+ AND
id <= ".db_escape($to)."
ORDER BY
reference";
ORDER BY
reference";
@@
-77,15
+76,9
@@
function print_dimension_summary()
$comments = $_POST['PARAM_3'];
$destination = $_POST['PARAM_4'];
if ($destination)
$comments = $_POST['PARAM_3'];
$destination = $_POST['PARAM_4'];
if ($destination)
- {
include_once($path_to_root . "/reporting/includes/excel_report.inc");
include_once($path_to_root . "/reporting/includes/excel_report.inc");
- $filename = "DimensionSummary.xml";
- }
else
else
- {
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
- $filename = "DimensionSummary.pdf";
- }
$cols = array(0, 50, 210, 250, 320, 395, 465, 515);
$cols = array(0, 50, 210, 250, 320, 395, 465, 515);
@@
-94,13
+87,13
@@
function print_dimension_summary()
$aligns = array('left', 'left', 'left', 'left', 'left', 'left', 'right');
$params = array( 0 => $comments,
$aligns = array('left', 'left', 'left', 'left', 'left', 'left', 'right');
$params = array( 0 => $comments,
- 1 => array('text' => _('Dimension'), 'from' =>
$fromdim, 'to' => $todim
));
+ 1 => array('text' => _('Dimension'), 'from' =>
get_dimension_string($fromdim), 'to' => get_dimension_string($todim)
));
- $rep = new FrontReport(_('Dimension Summary'),
$filename
, user_pagesize());
+ $rep = new FrontReport(_('Dimension Summary'),
"DimensionSummary"
, user_pagesize());
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
- $rep->
Header
();
+ $rep->
NewPage
();
$res = getTransactions($fromdim, $todim);
while ($trans=db_fetch($res))
$res = getTransactions($fromdim, $todim);
while ($trans=db_fetch($res))