projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Funktionsnamensauflösung gefixt
[kivitendo-erp.git]
/
SL
/
DN.pm
diff --git
a/SL/DN.pm
b/SL/DN.pm
index
0ac071c
..
f1e132f
100644
(file)
--- a/
SL/DN.pm
+++ b/
SL/DN.pm
@@
-469,6
+469,7
@@
sub get_invoices {
qq|SELECT
a.id, a.ordnumber, a.transdate, a.invnumber, a.amount,
ct.name AS customername, a.customer_id, a.duedate,
qq|SELECT
a.id, a.ordnumber, a.transdate, a.invnumber, a.amount,
ct.name AS customername, a.customer_id, a.duedate,
+ a.amount - a.paid AS open_amount,
cfg.dunning_description, cfg.dunning_level,
cfg.dunning_description, cfg.dunning_level,
@@
-600,6
+601,11
@@
sub get_dunning {
push(@values, $form->{dunningto});
}
push(@values, $form->{dunningto});
}
+ if ($form->{salesman_id}) {
+ $where .= qq| AND a.salesman_id = ?|;
+ push(@values, conv_i($form->{salesman_id}));
+ }
+
my %sort_columns = (
'dunning_description' => [ qw(dn.dunning_description customername invnumber) ],
'customername' => [ qw(customername invnumber) ],
my %sort_columns = (
'dunning_description' => [ qw(dn.dunning_description customername invnumber) ],
'customername' => [ qw(customername invnumber) ],
@@
-608,6
+614,7
@@
sub get_dunning {
'duedate' => [ qw(a.duedate a.invnumber) ],
'dunning_date' => [ qw(dunning_date a.invnumber) ],
'dunning_duedate' => [ qw(dunning_duedate a.invnumber) ],
'duedate' => [ qw(a.duedate a.invnumber) ],
'dunning_date' => [ qw(dunning_date a.invnumber) ],
'dunning_duedate' => [ qw(dunning_duedate a.invnumber) ],
+ 'salesman' => [ qw(salesman) ],
);
my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
);
my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
@@
-656,29
+663,26
@@
sub melt_pdfs {
my $in = IO::File->new("gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=- $inputfiles |");
$form->error($main::locale->text('Could not spawn ghostscript.')) unless $in;
my $in = IO::File->new("gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=- $inputfiles |");
$form->error($main::locale->text('Could not spawn ghostscript.')) unless $in;
- my $out;
-
if ($form->{media} eq 'printer') {
$form->get_printer_code($myconfig);
if ($form->{media} eq 'printer') {
$form->get_printer_code($myconfig);
+ my $out;
if ($form->{printer_command}) {
$out = IO::File->new("| $form->{printer_command}");
}
if ($form->{printer_command}) {
$out = IO::File->new("| $form->{printer_command}");
}
+ $::locale->with_raw_io($out, sub { $out->print($_) while <$in> });
+
$form->error($main::locale->text('Could not spawn the printer command.')) unless $out;
} else {
my $dunning_filename = $form->get_formname_translation('dunning');
$form->error($main::locale->text('Could not spawn the printer command.')) unless $out;
} else {
my $dunning_filename = $form->get_formname_translation('dunning');
- $out = IO::File->new('>-');
- $out->print(qq|Content-Type: Application/PDF\n| .
- qq|Content-Disposition: attachment; filename="${dunning_filename}_${dunning_id}.pdf"\n\n|);
- }
+ print qq|Content-Type: Application/PDF\n| .
+ qq|Content-Disposition: attachment; filename="${dunning_filename}_${dunning_id}.pdf"\n\n|;
- while (my $line = <$in>) {
- $out->print($line);
+ $::locale->with_raw_io(\*STDOUT, sub { print while <$in> });
}
$in->close();
}
$in->close();
- $out->close();
map { unlink("${main::spool}/$_") } @{ $form->{DUNNING_PDFS} };
map { unlink("${main::spool}/$_") } @{ $form->{DUNNING_PDFS} };