X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdn.pl;h=ee77c822472979bf01d347700a039ec46b22ce4c;hb=599030d5e26bcef0f9850ddbbedba106ded70ebb;hp=2ec5ab005c6396fa56ea57cd9f7304f53f05026c;hpb=8f98fc19d76ab2d20022b3103ac22618bbde5656;p=kivitendo-erp.git
diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl
index 2ec5ab005..ee77c8224 100644
--- a/bin/mozilla/dn.pl
+++ b/bin/mozilla/dn.pl
@@ -36,8 +36,8 @@ use SL::PE;
use SL::DN;
use Data::Dumper;
-require "$form->{path}/io.pl";
-require "$form->{path}/arap.pl";
+require "bin/mozilla/io.pl";
+require "bin/mozilla/arap.pl";
1;
@@ -51,10 +51,10 @@ sub edit_config {
$form->{title} = $locale->text('Edit Dunning Process Config');
$form->{callback} =
- "$form->{script}?action=edit_config&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+ "$form->{script}?action=edit_config&login=$form->{login}&password=$form->{password}"
unless $form->{callback};
- @column_index = qw(dunning_level dunning_description active auto email payment_terms terms fee interest template);
+ @column_index = qw(dunning_level dunning_description active auto email payment_terms terms fee interest_rate template);
$column_header{dunning_level} =
qq|
|
@@ -88,7 +88,7 @@ sub edit_config {
qq| | |
. $locale->text('Fee')
. qq| | |;
- $column_header{interest} =
+ $column_header{interest_rate} =
qq||
. $locale->text('Interest Rate')
. qq| | |;
@@ -105,7 +105,7 @@ sub edit_config {
- $form->{title} |
+ $form->{title} |
|;
@@ -141,7 +141,7 @@ sub edit_config {
$column_data{payment_terms} = qq| | |;
$column_data{terms} = qq| | |;
$column_data{fee} = qq| | |;
- $column_data{interest} = qq|% | |;
+ $column_data{interest_rate} = qq|% | |;
$column_data{template} = qq| | |;
@@ -163,9 +163,8 @@ sub edit_config {
$column_data{dunning_level} =
qq|$i | |;
$column_data{dunning_description} = qq| | |;
- my $active = "";
$column_data{active} =
- qq| | |;
+ qq| | |;
my $email = "";
$column_data{email} =
qq| | |;
@@ -175,7 +174,7 @@ sub edit_config {
$column_data{payment_terms} = qq| | |;
$column_data{terms} = qq| | |;
$column_data{fee} = qq| | |;
- $column_data{interest} = qq|% | |;
+ $column_data{interest_rate} = qq|% | |;
$column_data{template} = qq| | |;
@@ -202,7 +201,6 @@ sub edit_config {
-{path}>
{login}>
{password}>
@@ -262,34 +260,21 @@ sub add {
|
| if $form->{selectdepartment};
- $form->{title} = $locale->text('Start Dunning Process');
- $form->{nextsub} = "show_invoices";
- # use JavaScript Calendar or not
- $form->{jsscript} = $jscalendar;
- $jsscript = "";
- if ($form->{jsscript}) {
+ $form->{title} = $locale->text('Start Dunning Process');
+ $form->{nextsub} = "show_invoices";
- # with JavaScript Calendar
- $button1 = qq|
-
- text('button') . qq|> |
- |;
+ $form->{jsscript} = 1;
+ $form->{fokus} = "search.customer";
+ $form->{javascript} .= qq||;
+ $form->header();
- #write Trigger
- $jsscript =
- Form->write_trigger(\%myconfig, "1", "paymentuntil", "BR", "trigger1");
- } else {
+ $onload = qq|focus()|;
+ $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
+ $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
- # without JavaScript Calendar
- $button1 =
- qq| | |;
- }
- $form->{fokus} = "search.customer";
- $form->header;
print qq|
-
+
@@ -346,7 +326,6 @@ sub add {
{nextsub}>
-{path}>
{login}>
{password}>
@@ -382,24 +361,33 @@ sub show_invoices {
$form->{nextsub} = "save_dunning";
-
+
+ $form->{jsscript} = 1;
+ $form->{javascript} .= qq||;
+
$form->{callback} =
- "$form->{script}?action=show_invoices&path=$form->{path}&login=$form->{login}&password=$form->{password}&customer=$form->{customer}&invnumber=$form->{invnumber}&ordnumber=$form->{ordnumber}&paymentuntil=$form->{paymentuntil}&groupinvoices=$form->{groupinvoices}&minamount=$form->{minamount}&dunning_level=$form->{dunning_level}¬es=$form->{notes}"
+ "$form->{script}?action=show_invoices&login=$form->{login}&password=$form->{password}&customer=$form->{customer}&invnumber=$form->{invnumber}&ordnumber=$form->{ordnumber}&paymentuntil=$form->{paymentuntil}&groupinvoices=$form->{groupinvoices}&minamount=$form->{minamount}&dunning_level=$form->{dunning_level}¬es=$form->{notes}"
unless $form->{callback};
- @column_index = qw(dunning_description active email customername invnumber invdate inv_duedate invamount next_duedate fee interest );
+ @column_index = qw(dunning_description dunning_description_next active email customername invnumber invdate inv_duedate amount next_duedate fee interest );
$column_header{dunning_description} =
- qq||
+ qq| | |
. $locale->text('Current / Next Level')
. qq| | |;
$column_header{active} =
qq||
- . $locale->text('Active?')
+ . NTI($cgi->checkbox('-name' => 'selectall_active',
+ '-label' => $locale->text('Active?'),
+ '-checked' => 0,
+ '-onclick' => "checkbox_check_all('selectall_active', 'active_', 1, " . scalar(@{ $form->{DUNNINGS} }) . ")"))
. qq| | |;
$column_header{email} =
qq||
- . $locale->text('eMail?')
+ . NTI($cgi->checkbox('-name' => 'selectall_email',
+ '-label' => $locale->text('eMail?'),
+ '-checked' => 0,
+ '-onclick' => "checkbox_check_all('selectall_email', 'email_', 1, " . scalar(@{ $form->{DUNNINGS} }) . ")"))
. qq| | |;
$column_header{customername} =
qq||
@@ -421,7 +409,7 @@ sub show_invoices {
qq| | |
. $locale->text('Invdate')
. qq| | |;
- $column_header{invamount} =
+ $column_header{amount} =
qq||
. $locale->text('Amount')
. qq| | |;
@@ -431,7 +419,7 @@ sub show_invoices {
. qq||;
$column_header{interest} =
qq||
- . $locale->text('Total Interest')
+ . $locale->text('Interest')
. qq| | |;
$form->header;
@@ -446,11 +434,11 @@ sub show_invoices {
|;
- &print_options;
+ print_options();
print qq|