projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Buchungen wurden nicht korrekt angezeigt, wenn gleiche Referenz aber unterschiedliche
[kivitendo-erp.git]
/
bin
/
mozilla
/
rp.pl
diff --git
a/bin/mozilla/rp.pl
b/bin/mozilla/rp.pl
index
cc27224
..
da1a265
100644
(file)
--- a/
bin/mozilla/rp.pl
+++ b/
bin/mozilla/rp.pl
@@
-41,6
+41,7
@@
require "bin/mozilla/common.pl";
use SL::PE;
use SL::RP;
use SL::USTVA;
use SL::PE;
use SL::RP;
use SL::USTVA;
+use SL::Iconv;
1;
1;
@@
-146,7
+147,7
@@
sub report {
'-labels' => \%project_labels));
# use JavaScript Calendar or not
'-labels' => \%project_labels));
# use JavaScript Calendar or not
- $form->{jsscript} =
$jscalendar
;
+ $form->{jsscript} =
1
;
$jsscript = "";
if ($form->{report} eq "ustva") {
$department = "";
$jsscript = "";
if ($form->{report} eq "ustva") {
$department = "";
@@
-1946,8
+1947,6
@@
sub e_mail {
sub send_email {
$lxdebug->enter_sub();
sub send_email {
$lxdebug->enter_sub();
- $form->{OUT} = "$sendmail";
-
$form->{subject} = $locale->text('Statement') . qq| - $form->{todate}|
unless $form->{subject};
$form->{subject} = $locale->text('Statement') . qq| - $form->{todate}|
unless $form->{subject};
@@
-1955,10
+1954,10
@@
sub send_email {
$form->{"statement_1"} = 1;
$form->{"statement_1"} = 1;
- &print_form;
+ $form->{media} = 'email';
+ print_form();
- $form->redirect(
- $locale->text('Statement sent to') . " $form->{$form->{ct}}");
+ $form->redirect($locale->text('Statement sent to') . " $form->{$form->{ct}}");
$lxdebug->leave_sub();
}
$lxdebug->leave_sub();
}
@@
-1982,7
+1981,6
@@
sub print {
$form->error($locale->text('Nothing selected!')) unless $selected;
if ($form->{media} eq 'printer') {
$form->error($locale->text('Nothing selected!')) unless $selected;
if ($form->{media} eq 'printer') {
- $form->{OUT} = "| $myconfig{printer}";
$form->{"$form->{ct}_id"} = "";
} else {
$form->{"statement_1"} = 1;
$form->{"$form->{ct}_id"} = "";
} else {
$form->{"statement_1"} = 1;
@@
-1990,7
+1988,7
@@
sub print {
RP->aging(\%myconfig, \%$form);
RP->aging(\%myconfig, \%$form);
-
&print_form
;
+
print_form()
;
$form->redirect($locale->text('Statements sent to printer!'))
if ($form->{media} eq 'printer');
$form->redirect($locale->text('Statements sent to printer!'))
if ($form->{media} eq 'printer');
@@
-2009,6
+2007,11
@@
sub print_form {
" " => "_"
);
" " => "_"
);
+ foreach my $key (keys %replacements) {
+ my $new_key = SL::Iconv::convert("ISO-8859-15", $dbcharset, $key);
+ $replacements{$new_key} = $replacements{$key} if $new_key ne $key;
+ }
+
$form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1);
$form->{templates} = "$myconfig{templates}";
$form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1);
$form->{templates} = "$myconfig{templates}";
@@
-2025,8
+2028,10
@@
sub print_form {
$attachment_suffix = "pdf";
}
$attachment_suffix = "pdf";
}
- $form->{IN} = "$form->{type}.$suffix";
-
+ $form->{IN} = "$form->{type}.$suffix";
+ $form->{OUT} =
+ $form->{media} eq 'email' ? $sendmail :
+ $form->{media} eq 'printer' ? "| $myconfig{printer}" : "";
# Save $form->{email} because it will be overwritten.
$form->{EMAIL_RECIPIENT} = $form->{email};
# Save $form->{email} because it will be overwritten.
$form->{EMAIL_RECIPIENT} = $form->{email};