projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some smaller fixes (see CHANGELOG)
[fa-stable.git]
/
reporting
/
includes
/
reports_classes.inc
diff --git
a/reporting/includes/reports_classes.inc
b/reporting/includes/reports_classes.inc
index 761ef43cb922364f0e28d5740e9ad38a9b5b70af..995a39d73c7a535481c3678fd155ecb1e765958a 100644
(file)
--- a/
reporting/includes/reports_classes.inc
+++ b/
reporting/includes/reports_classes.inc
@@
-85,7
+85,13
@@
class Report
}
function getDisplay()
{
}
function getDisplay()
{
- global $path_to_root, $use_date_picker;
+ global $comp_path, $path_to_root, $use_date_picker;
+
+ $rep_file = $comp_path.'/'.user_company().
+ "/reporting/rep".$this->id.".php";
+ if (!file_exists($rep_file))
+ $rep_file = $path_to_root ."/reporting/rep".$this->id.".php";
+
$st = "
<script language='javascript'>
function displayReport_" . $this->id . "() {
$st = "
<script language='javascript'>
function displayReport_" . $this->id . "() {
@@
-98,7
+104,7
@@
class Report
window.open('','REP_WINDOW','toolbar=no,scrollbar=no,resizable=yes,menubar=no');
document.forms[0].target='REP_WINDOW';
window.open('','REP_WINDOW','toolbar=no,scrollbar=no,resizable=yes,menubar=no');
document.forms[0].target='REP_WINDOW';
- document.forms[0].action= '
" . $path_to_root . "/reporting/rep" . $this->id . ".php
';
+ document.forms[0].action= '
$rep_file
';
document.forms[0].submit();
}
function checkDate(pObj) {
document.forms[0].submit();
}
function checkDate(pObj) {