projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Versteckte Felder in Lieferscheinen besser beibehalten
[kivitendo-erp.git]
/
bin
/
mozilla
/
dn.pl
diff --git
a/bin/mozilla/dn.pl
b/bin/mozilla/dn.pl
index
01658ab
..
9cac44e
100644
(file)
--- a/
bin/mozilla/dn.pl
+++ b/
bin/mozilla/dn.pl
@@
-251,7
+251,8
@@
sub save_dunning {
$form->{language_id} = $saved_language_id;
$form->{language_id} = $saved_language_id;
- if($form->{DUNNING_PDFS}) {
+ if (scalar @{ $form->{DUNNING_PDFS} }) {
+ $form->{dunning_id} = strftime("%Y%m%d", localtime time) if scalar @{ $form->{DUNNING_PDFS}} > 1;
DN->melt_pdfs(\%myconfig, $form, $form->{copies});
}
DN->melt_pdfs(\%myconfig, $form, $form->{copies});
}
@@
-498,6
+499,7
@@
sub print_multiple {
if (!$form->{force_lang}) {
$form->{language_id} = $language_ids[$i];
}
if (!$form->{force_lang}) {
$form->{language_id} = $language_ids[$i];
}
+ $form->{dunning_id} = $dunning_id;
DN->print_invoice_for_fees(\%myconfig, $form, $dunning_id);
DN->print_dunning(\%myconfig, $form, $dunning_id);
$i++;
DN->print_invoice_for_fees(\%myconfig, $form, $dunning_id);
DN->print_dunning(\%myconfig, $form, $dunning_id);
$i++;
@@
-505,7
+507,7
@@
sub print_multiple {
$form->{language_id} = $saved_language_id;
if (scalar @{ $form->{DUNNING_PDFS} }) {
$form->{language_id} = $saved_language_id;
if (scalar @{ $form->{DUNNING_PDFS} }) {
- $form->{dunning_id} = strftime("%Y%m%d", localtime time);
+ $form->{dunning_id} = strftime("%Y%m%d", localtime time)
if scalar @{ $form->{DUNNING_PDFS}} > 1
;
DN->melt_pdfs(\%myconfig, $form, $form->{copies});
if ($form->{media} eq 'printer') {
DN->melt_pdfs(\%myconfig, $form, $form->{copies});
if ($form->{media} eq 'printer') {