X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fir.pl;h=4f40da73f3eaf0f5b7809dbac9496b11462a3e12;hb=98ad02ca3b8d9e9c00775b4768e7060388efbed1;hp=6744764c66ffc9d30f69a058b98224816df4e189;hpb=cfc6a60d53597f6a879b28af37f84b4b5fa4cc6b;p=kivitendo-erp.git diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl index 6744764c6..4f40da73f 100644 --- a/bin/mozilla/ir.pl +++ b/bin/mozilla/ir.pl @@ -32,11 +32,13 @@ #====================================================================== use SL::IR; +use SL::IS; use SL::PE; require "$form->{path}/io.pl"; require "$form->{path}/arap.pl"; require "$form->{path}/common.pl"; +require "bin/mozilla/drafts.pl"; 1; @@ -45,6 +47,8 @@ require "$form->{path}/common.pl"; sub add { $lxdebug->enter_sub(); + return $lxdebug->leave_sub() if (load_draft_maybe()); + $form->{title} = $locale->text('Add Vendor Invoice'); &invoice_links; @@ -56,7 +60,11 @@ sub add { sub edit { $lxdebug->enter_sub(); - + + # show history button + $form->{javascript} = qq||; + #/show hhistory button + $form->{title} = $locale->text('Edit Vendor Invoice'); &invoice_links; @@ -232,6 +240,9 @@ sub form_header { #quote selectvendor Bug 133 $form->{"selectvendor"} = $form->quote($form->{"selectvendor"}); + #substitute \n and \r to \s (bug 543) + $form->{"selectvendor"} =~ s/[\n\r]/ /g; + $form->{exchangerate} = $form->format_amount(\%myconfig, $form->{exchangerate}); @@ -269,7 +280,8 @@ sub form_header { "all" => 0, "old_id" => \@old_project_ids }); - my (%labels, @values); + my %labels; + my @values = (undef); foreach my $item (@{ $form->{"ALL_CONTACTS"} }) { push(@values, $item->{"cp_id"}); $labels{$item->{"cp_id"}} = $item->{"cp_name"} . @@ -321,7 +333,10 @@ sub form_header { $vendor = ($form->{selectvendor}) - ? qq|\n| + ? qq|\n| : qq||; $department = qq| @@ -395,6 +410,8 @@ sub form_header { {storno}> {storno_id}> +| . ($form->{saved_message} ? qq|
$form->{saved_message}
| : "") . qq| +$form->{title} | @@ -549,7 +566,8 @@ sub form_footer { $tax .= qq|||
---|---|---|
$form->{"${item}_description"} | +$form->{"${item}_description"} | + . $form->{"${item}_rate"} * 100 .qq|% | $form->{"${item}_total"} |
Enthaltene $form->{"${item}_description"} | +Enthaltene $form->{"${item}_description"} | + . $form->{"${item}_rate"} * 100 .qq|% | $form->{"${item}_total"} |