projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dokumentationsupdate
[kivitendo-erp.git]
/
SL
/
DN.pm
diff --git
a/SL/DN.pm
b/SL/DN.pm
index
45248a5
..
45bc367
100644
(file)
--- a/
SL/DN.pm
+++ b/
SL/DN.pm
@@
-288,7
+288,7
@@
sub save_dunning {
(SELECT SUM(fee)
FROM dunning_config
WHERE dunning_level <= (SELECT dunning_level FROM dunning_config WHERE id = ?)),
(SELECT SUM(fee)
FROM dunning_config
WHERE dunning_level <= (SELECT dunning_level FROM dunning_config WHERE id = ?)),
- (SELECT (amount - paid) * (current_date -
trans
date) FROM ar WHERE id = ?)
+ (SELECT (amount - paid) * (current_date -
due
date) FROM ar WHERE id = ?)
* (SELECT interest_rate FROM dunning_config WHERE id = ?)
/ 360,
current_date,
* (SELECT interest_rate FROM dunning_config WHERE id = ?)
/ 360,
current_date,
@@
-363,7
+363,7
@@
sub send_email {
return;
}
return;
}
- my $template =
PlainTextTemplate->new(undef, $form,
$myconfig);
+ my $template =
SL::Template::create(type => 'PlainText', form => $form, myconfig =>
$myconfig);
my $mail = Mailer->new();
$mail->{from} = $myconfig->{email};
$mail->{to} = $ref->{recipient};
my $mail = Mailer->new();
$mail->{from} = $myconfig->{email};
$mail->{to} = $ref->{recipient};
@@
-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,
@@
-613,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';
@@
-661,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} };