projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'frameless_w_fixed_header-div'
[kivitendo-erp.git]
/
bin
/
mozilla
/
gl.pl
diff --git
a/bin/mozilla/gl.pl
b/bin/mozilla/gl.pl
index
fb6166f
..
fd67b5f
100644
(file)
--- a/
bin/mozilla/gl.pl
+++ b/
bin/mozilla/gl.pl
@@
-220,13
+220,8
@@
sub search {
);
$::form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);
);
$::form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);
- my $onload = "focus()"
- . qq|;setupDateFormat('|. $::myconfig{dateformat} . qq|', '| . $::locale->text("Falsches Datumsformat!") . qq|')|
- . qq|;setupPoints('|. $::myconfig{numberformat} . qq|', '| . $::locale->text("wrongformat") . qq|')|;
-
$::form->header;
print $::form->parse_html_template('gl/search', {
$::form->header;
print $::form->parse_html_template('gl/search', {
- onload => $onload,
department_label => sub { ("$_[0]{description}--$_[0]{id}")x2 },
employee_label => sub { "$_[0]{id}--$_[0]{name}" },
});
department_label => sub { ("$_[0]{description}--$_[0]{id}")x2 },
employee_label => sub { "$_[0]{id}--$_[0]{name}" },
});
@@
-494,7
+489,7
@@
sub generate_report {
$data .= $sh;
$row->{balance}->{data} = $data;
$data .= $sh;
$row->{balance}->{data} = $data;
-
+
if ( !$form->{report_generator_csv_options_for_import} ) {
$report->add_separator();
$report->add_data($row);
if ( !$form->{report_generator_csv_options_for_import} ) {
$report->add_separator();
$report->add_data($row);
@@
-928,8
+923,6
@@
sub delete {
$form->header;
print qq|
$form->header;
print qq|
-<body>
-
<form method=post action=gl.pl>
|;
<form method=post action=gl.pl>
|;