X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/a96b6e954640c26516962ad7cee25a98b90eb883..56f1a79e930b58250a21189303e328bce2896f8d:/SL/Form.pm diff --git a/SL/Form.pm b/SL/Form.pm index 239f7b938..668fd9e44 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -450,6 +450,7 @@ sub header { push @header, " " if $self->{landscape}; push @header, "" if -f $self->{favicon}; push @header, map { qq|| } $layout->javascripts; + push @header, ''; push @header, $self->{javascript} if $self->{javascript}; push @header, map { $_->show_javascript } @{ $self->{AJAX} || [] }; @@ -549,8 +550,10 @@ sub _prepare_html_template { } $language = "de" unless ($language); - if (-f "templates/webpages/${file}.html") { - $file = "templates/webpages/${file}.html"; + my $webpages_path = $::request->layout->webpages_path; + + if (-f "${webpages_path}/${file}.html") { + $file = "${webpages_path}/${file}.html"; } elsif (ref $file eq 'SCALAR') { # file is a scalarref, use inline mode @@ -1151,6 +1154,7 @@ sub get_formname_translation { bin_list => $main::locale->text('Bin List'), credit_note => $main::locale->text('Credit Note'), invoice => $main::locale->text('Invoice'), + invoice_copy => $main::locale->text('Invoice Copy'), pick_list => $main::locale->text('Pick List'), proforma => $main::locale->text('Proforma Invoice'), purchase_order => $main::locale->text('Purchase Order'),