X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fis.pl;h=10dc43ef1574bb0c4ef6777295c3773c87f85b87;hb=84bed7a655edfe816ad2a04b5549b6bd6a968c79;hp=bf64bb612a7034460dacfed1f023f6767d335d89;hpb=2ff471a7b78c1085bbc0adff525fbf589127d819;p=kivitendo-erp.git diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index bf64bb612..10dc43ef1 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -35,8 +35,8 @@ use SL::IS; use SL::PE; use Data::Dumper; -require "$form->{path}/io.pl"; -require "$form->{path}/arap.pl"; +require "bin/mozilla/io.pl"; +require "bin/mozilla/arap.pl"; require "bin/mozilla/drafts.pl"; 1; @@ -61,7 +61,7 @@ sub add { $form->{callback} = - "$form->{script}?action=add&type=$form->{type}&login=$form->{login}&path=$form->{path}&password=$form->{password}" + "$form->{script}?action=add&type=$form->{type}&login=$form->{login}&password=$form->{password}" unless $form->{callback}; $form{jsscript} = "date"; @@ -172,13 +172,13 @@ sub invoice_links { chomp $curr[0]; $form->{defaultcurrency} = $curr[0]; - map { $form->{selectcurrency} .= "\n" } @curr; $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}"; if (@{ $form->{all_customer} }) { $form->{customer} = "$form->{customer}--$form->{customer_id}"; - map { $form->{selectcustomer} .= "\n" } (@{ $form->{all_customer} }); } @@ -189,7 +189,7 @@ sub invoice_links { map { $form->{selectdepartment} .= - "\n" } (@{ $form->{all_departments} }); } @@ -198,7 +198,7 @@ sub invoice_links { # sales staff if ($form->{all_employees}) { $form->{selectemployee} = ""; - map { $form->{selectemployee} .= "\n" } (@{ $form->{all_employees} }); } @@ -208,7 +208,8 @@ sub invoice_links { foreach $key (keys %{ $form->{AR_links} }) { foreach $ref (@{ $form->{AR_links}{$key} }) { - $form->{"select$key"} .= "\n"; } if ($key eq "AR_paid") { @@ -328,38 +329,11 @@ sub form_header { } my $set_duedate_url = - "$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=set_duedate"; + "$form->{script}?login=$form->{login}&password=$form->{password}&action=set_duedate"; my $pjx = new CGI::Ajax( 'set_duedate' => $set_duedate_url ); push(@ { $form->{AJAX} }, $pjx); - if (@{ $form->{TAXZONE} }) { - $form->{selecttaxzone} = ""; - foreach $item (@{ $form->{TAXZONE} }) { - if ($item->{id} == $form->{taxzone_id}) { - $form->{selecttaxzone} .= - ""; - } else { - $form->{selecttaxzone} .= - ""; - } - - } - } else { - $form->{selecttaxzone} =~ s/ selected//g; - if ($form->{taxzone_id} ne "") { - $form->{selecttaxzone} =~ s/value=$form->{taxzone_id}/value=$form->{taxzone_id} selected/; - } - } - - $taxzone = qq| -
| . $locale->text('Max. Dunning Level') . qq|: | +| . $locale->text('Max. Dunning Level') . qq|: | $form->{max_dunning_level} | -| . $locale->text('Dunning Amount') . qq|: | +| . $locale->text('Dunning Amount') . qq|: | | . $form->format_amount(\%myconfig, $form->{dunning_amount},2) . qq| | @@ -523,11 +533,10 @@ sub form_header { # with JavaScript Calendar $button1 = qq| -{invdate}> | -text('button') . qq|> | - |; - ++ | |; + #write Trigger $jsscript = Form->write_trigger(\%myconfig, "1", @@ -537,28 +546,28 @@ sub form_header { # without JavaScript Calendar $button1 = - qq| | {invdate}> | |; + qq||; $button2 = - qq| | {duedate}> | |; + qq||; } } else { if ($form->{jsscript}) { # with JavaScript Calendar $button1 = qq| - | {invdate}> | -text('button') . qq|> | ++ | |; $button2 = qq| - | {duedate}> | -text('button') . qq|> | ++ | |; $button3 = qq| - | {deliverydate}> | -text('button') . qq|> | ++ | |; #write Trigger @@ -573,9 +582,9 @@ sub form_header { # without JavaScript Calendar $button1 = - qq| | {invdate}> | |; + qq||; $button2 = - qq| | {duedate}> | |; + qq|{duedate} onBlur=\"check_right_date_format(this)\"> | |; } } if ($form->{resubmit} && ($form->{format} eq "html")) { @@ -584,9 +593,10 @@ sub form_header { } elsif ($form->{resubmit}) { $onload = qq|document.invoice.submit()|; } else { - $onload = "fokus()"; + $onload = "focus()"; } - + $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; + $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; $credittext = $locale->text('Credit Limit exceeded!!!'); if ($creditwarning) { $onload = qq|alert('$credittext')|; @@ -610,69 +620,45 @@ sub form_header { -
---|