projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Two small bugs fixed in bank payment edition.
[fa-stable.git]
/
reporting
/
includes
/
reports_classes.inc
diff --git
a/reporting/includes/reports_classes.inc
b/reporting/includes/reports_classes.inc
index c824ddc311dd3e036fd7fee7dadd9837b5d5e92f..cffe6cb3e793f6fab0f85100fb0a51bcf7171fc0 100644
(file)
--- a/
reporting/includes/reports_classes.inc
+++ b/
reporting/includes/reports_classes.inc
@@
-47,7
+47,7
@@
class BoxReports
function getDisplay($class=null)
{
function getDisplay($class=null)
{
- global $
table_style, $
path_to_root, $pdf_debug, $Ajax;
+ global $path_to_root, $pdf_debug, $Ajax;
$temp = array_values($this->ar_classes);
$temp = array_values($this->ar_classes);
@@
-81,7
+81,7
@@
class BoxReports
. "<form method='POST' action='$action' target='_blank'>\n";
$st_params .= submit('Rep'.$report->id,
_("Display: ") . access_string($report->name, true),
. "<form method='POST' action='$action' target='_blank'>\n";
$st_params .= submit('Rep'.$report->id,
_("Display: ") . access_string($report->name, true),
- false, '', $pdf_debug ? false : 'default') . hidden('REP_ID', $report->id, false).'<br><br>';
+ false, '', $pdf_debug ? false : 'default
process
') . hidden('REP_ID', $report->id, false).'<br><br>';
$st_params .= $this->getOptions($report->get_controls());
$st_params .= "\n</form></td></tr></table>\n";
set_focus('Rep'.$report->id);
$st_params .= $this->getOptions($report->get_controls());
$st_params .= "\n</form></td></tr></table>\n";
set_focus('Rep'.$report->id);
@@
-164,7
+164,7
@@
class BoxReports
//
function get_ctrl($name, $type)
{
//
function get_ctrl($name, $type)
{
- global $path_to_root, $use_date_picker, $pdf_debug, $print_invoice_no;
+ global $path_to_root, $use_date_picker, $pdf_debug, $print_invoice_no
, $def_print_destination
;
$st = '';
switch ($type)
$st = '';
switch ($type)
@@
-221,7
+221,10
@@
class BoxReports
case 'DESTINATION':
$sel = array(_("PDF/Printer"), "Excel");
case 'DESTINATION':
$sel = array(_("PDF/Printer"), "Excel");
- return array_selector($name, null, $sel);
+ $def = 0;
+ if (isset($def_print_destination) && $def_print_destination == 1)
+ $def = 1;
+ return array_selector($name, $def, $sel);
case 'COMPARE':
$sel = array(_("Accumulated"), _("Period Y-1"), _("Budget"));
case 'COMPARE':
$sel = array(_("Accumulated"), _("Period Y-1"), _("Budget"));
@@
-395,7
+398,8
@@
class BoxReports
$tag_type = TAG_ACCOUNT;
else
$tag_type = TAG_DIMENSION;
$tag_type = TAG_ACCOUNT;
else
$tag_type = TAG_DIMENSION;
- return tag_list($name, 5, $tag_type, true, _("No tags"));
+ //return tag_list($name, 5, $tag_type, true, false, _("No tags"));
+ return tag_list($name, 5, $tag_type, true);
}
return '';
}
return '';