projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typos in Dokumentation korrigiert
[kivitendo-erp.git]
/
bin
/
mozilla
/
dn.pl
diff --git
a/bin/mozilla/dn.pl
b/bin/mozilla/dn.pl
index
627f696
..
6b2cad0
100644
(file)
--- a/
bin/mozilla/dn.pl
+++ b/
bin/mozilla/dn.pl
@@
-31,7
+31,7
@@
#
#======================================================================
#
#======================================================================
-use POSIX;
+use POSIX
qw(strftime)
;
use SL::IS;
use SL::PE;
use SL::IS;
use SL::PE;
@@
-105,8
+105,6
@@
sub add {
$form->{SHOW_DEPARTMENT_SELECTION} = $form->{all_departments} && scalar @{ $form->{all_departments} || [] };
$form->{title} = $locale->text('Start Dunning Process');
$form->{SHOW_DEPARTMENT_SELECTION} = $form->{all_departments} && scalar @{ $form->{all_departments} || [] };
$form->{title} = $locale->text('Start Dunning Process');
- $form->{jsscript} = 1;
- $form->{fokus} = "search.customer";
$form->header();
print $form->parse_html_template("dunning/add");
$form->header();
print $form->parse_html_template("dunning/add");
@@
-144,7
+142,6
@@
sub show_invoices {
$form->{type} = 'dunning';
$form->{rowcount} = scalar @{ $form->{DUNNINGS} };
$form->{type} = 'dunning';
$form->{rowcount} = scalar @{ $form->{DUNNINGS} };
- $form->{jsscript} = 1;
$form->{callback} ||= build_std_url("action=show_invoices", qw(customer invnumber ordnumber groupinvoices minamount dunning_level notes));
$form->{PRINT_OPTIONS} = print_options('inline' => 1,
$form->{callback} ||= build_std_url("action=show_invoices", qw(customer invnumber ordnumber groupinvoices minamount dunning_level notes));
$form->{PRINT_OPTIONS} = print_options('inline' => 1,
@@
-154,8
+151,6
@@
sub show_invoices {
'no_opendocument' => 1,);
$form->header();
'no_opendocument' => 1,);
$form->header();
- $form->{onload} = "document.getElementsByName('language_id')[0].disabled =
- !document.getElementsByName('force_lang')[0].checked;";
print $form->parse_html_template("dunning/show_invoices");
$main::lxdebug->leave_sub();
print $form->parse_html_template("dunning/show_invoices");
$main::lxdebug->leave_sub();
@@
-256,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});
}
@@
-285,7
+281,7
@@
sub set_email {
$main::auth->assert('dunning_edit');
$form->{"title"} = $locale->text("Set eMail text");
$main::auth->assert('dunning_edit');
$form->{"title"} = $locale->text("Set eMail text");
- $form->header();
+ $form->header(
no_layout => 1
);
print($form->parse_html_template("dunning/set_email"));
$main::lxdebug->leave_sub();
print($form->parse_html_template("dunning/set_email"));
$main::lxdebug->leave_sub();
@@
-302,7
+298,7
@@
sub search {
$form->get_lists("customers" => "ALL_CUSTOMERS",
"departments" => "ALL_DEPARTMENTS");
$form->get_lists("customers" => "ALL_CUSTOMERS",
"departments" => "ALL_DEPARTMENTS");
- $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);
+ $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all
_sorted
(query => [ deleted => 0 ]);
DN->get_config(\%myconfig, \%$form);
DN->get_config(\%myconfig, \%$form);
@@
-310,16
+306,10
@@
sub search {
$form->{SHOW_DEPARTMENT_DDBOX} = scalar @{ $form->{ALL_CUSTOMERS} };
$form->{SHOW_DUNNING_LEVELS} = scalar @{ $form->{DUNNING} };
$form->{SHOW_DEPARTMENT_DDBOX} = scalar @{ $form->{ALL_CUSTOMERS} };
$form->{SHOW_DUNNING_LEVELS} = scalar @{ $form->{DUNNING} };
- $form->{jsscript} = 1;
$form->{title} = $locale->text('Dunnings');
$form->{title} = $locale->text('Dunnings');
- $form->{fokus} = "search.customer";
$form->header();
$form->header();
- $form->{onload} = qq|focus()|
- . qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|
- . qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
-
print $form->parse_html_template("dunning/search");
$main::lxdebug->leave_sub();
print $form->parse_html_template("dunning/search");
$main::lxdebug->leave_sub();
@@
-460,8
+450,6
@@
sub show_dunning {
$report->set_options_from_form();
$report->set_options_from_form();
- $form->{onload} = "document.getElementsByName('language_id')[0].disabled =
- !document.getElementsByName('force_lang')[0].checked;";
$report->generate_with_headers();
$main::lxdebug->leave_sub();
$report->generate_with_headers();
$main::lxdebug->leave_sub();
@@
-511,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++;
@@
-518,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') {