X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdn.pl;h=293f076406360ad4a357b5ec309cb05fa51e1e1a;hb=6bad0469c4f5bb92830f77cf7675e76730e79ae4;hp=1992ce8108cec2916c09750db8aa363cd7a40239;hpb=840aea131eef33512dccc13184e01affafaafb37;p=kivitendo-erp.git diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl index 1992ce810..293f07640 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,7 +51,7 @@ 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); @@ -201,7 +201,6 @@ sub edit_config { -{path}> {login}> {password}> @@ -271,7 +270,7 @@ sub add { # with JavaScript Calendar $button1 = qq| - + text('button') . qq|> |; @@ -283,12 +282,16 @@ sub add { # without JavaScript Calendar $button1 = - qq||; + qq||; } $form->{fokus} = "search.customer"; + $form->{javascript} .= qq||; $form->header; + $onload = qq|focus()|; + $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; + $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; print qq| - +
{script}> @@ -344,7 +347,6 @@ sub add { {nextsub}> -{path}> {login}> {password}> @@ -382,7 +384,7 @@ sub show_invoices { $form->{nextsub} = "save_dunning"; $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 ); @@ -508,7 +510,7 @@ sub show_invoices {
|; - &print_options; + print_options(); print qq|
{script}> @@ -519,7 +521,6 @@ sub show_invoices { -{path}> {login}> {password}> @@ -552,7 +553,8 @@ sub save { DN->save_config(\%myconfig, \%$form); # saving the history if(!exists $form->{addition} && $form->{id} ne "") { - $form->{addition} = "SAVED FOR DUNNING"; + $form->{snumbers} = qq|dunning_id_| . $form->{"dunning_id"}; + $form->{addition} = "SAVED FOR DUNNING"; $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history @@ -606,7 +608,8 @@ sub save_dunning { } # saving the history if(!exists $form->{addition} && $form->{id} ne "") { - $form->{addition} = "DUNNING STARTED"; + $form->{snumbers} = qq|dunning_id_| . $form->{"dunning_id"}; + $form->{addition} = "DUNNING STARTED"; $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history @@ -621,7 +624,7 @@ sub set_email { my $callback = "$form->{script}?action=set_email&"; map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" } - (qw(login path password name input_subject input_body input_attachment email_subject email_body email_attachment), grep({ /^[fl]_/ } keys %$form))); + (qw(login password name input_subject input_body input_attachment email_subject email_body email_attachment), grep({ /^[fl]_/ } keys %$form))); if ($form->{email_attachment}) { $form->{email_attachment} = "checked"; @@ -687,22 +690,22 @@ sub search { # with JavaScript Calendar $button1 = qq| - + text('button') . qq|> |; $button2 = qq| - + text('button') . qq|> |; $button3 = qq| - + text('button') . qq|> |; $button4 = qq| - + text('button') . qq|> |; @@ -714,19 +717,24 @@ sub search { # without JavaScript Calendar $button1 = - qq||; + qq||; $button2 = - qq||; - $button1 = - qq||; - $button1 = - qq||; + qq||; + $button3 = + qq||; + $button4 = + qq||; } $form->{fokus} = "search.customer"; + $form->{javascript} .= qq||; $form->header; + $onload = qq|focus()|; + $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; + $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; + print qq| - + {script}> @@ -787,7 +795,6 @@ sub search { {nextsub}> -{path}> {login}> {password}> @@ -819,7 +826,7 @@ sub show_dunning { $form->{callback} = - "$form->{script}?action=show_dunning&path=$form->{path}&login=$form->{login}&password=$form->{password}&customer=$form->{customer}&invnumber=$form->{invnumber}&ordnumber=$form->{ordnumber}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&dunningfrom=$form->{dunningfrom}&dunningto=$form->{dunningto}¬es=$form->{notes}&showold=$form->{showold}&dunning_level=$form->{dunning_level}" + "$form->{script}?action=show_dunning&login=$form->{login}&password=$form->{password}&customer=$form->{customer}&invnumber=$form->{invnumber}&ordnumber=$form->{ordnumber}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&dunningfrom=$form->{dunningfrom}&dunningto=$form->{dunningto}¬es=$form->{notes}&showold=$form->{showold}&dunning_level=$form->{dunning_level}" unless $form->{callback}; @column_index = qw(dunning_description customername invnumber invdate inv_duedate invamount dunning_date next_duedate fee interest ); @@ -925,7 +932,7 @@ sub show_dunning { $column_data{dunning_description} = qq|| . H($ref->{dunning_description}) . qq||; } else { $column_data{dunning_description} = qq| |; @@ -935,7 +942,7 @@ sub show_dunning { $column_data{invnumber} = qq|{id}) . - join(map({ "&${_}=" . E($form->{$_}) } qw(login path password callback))) . + join("", map({ "&${_}=" . E($form->{$_}) } qw(login password callback))) . qq|">| . H($ref->{invnumber}) . qq||; map { print "$column_data{$_}\n" } @column_index; @@ -964,7 +971,6 @@ sub show_dunning { -{path}> {login}> {password}>