From af0023e07e144ca31d465b098c36c45971269438 Mon Sep 17 00:00:00 2001 From: Thomas Heck Date: Mon, 10 Sep 2012 08:59:45 +0200 Subject: [PATCH] =?utf8?q?Wiedervorlagen=20f=C3=BCr=20Lieferscheine?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit fixt #1981 --- SL/FU.pm | 14 ++++++++++++++ bin/mozilla/do.pl | 5 +++++ templates/webpages/do/form_footer.html | 1 + templates/webpages/do/form_header.html | 7 +++++++ 4 files changed, 27 insertions(+) diff --git a/SL/FU.pm b/SL/FU.pm index e2d2fc99b..27836e0ad 100644 --- a/SL/FU.pm +++ b/SL/FU.pm @@ -330,6 +330,20 @@ sub link_details { 'title' => $locale->text('Sales quotation') . " $params{trans_info}", }; + } elsif ($params{trans_type} eq 'sales_delivery_order') { + + $link = { + 'url' => 'do.pl?action=edit&type=sales_delivery_order&id=' . $params{trans_id} . '&edit_note_id=' . $form->quote($params{note_id}), + 'title' => $locale->text('Sales delivery order') .' '. $params{trans_info}, + }; + + } elsif ($params{trans_type} eq 'purchase_delivery_order') { + + $link = { + 'url' => 'do.pl?action=edit&type=purchase_delivery_order&id=' . $params{trans_id} . '&edit_note_id=' . $form->quote($params{note_id}), + 'title' => $locale->text('Purchase delivery order') .' '. $params{trans_info}, + }; + } elsif ($params{trans_type} eq 'sales_order') { $link = { 'url' => 'oe.pl?action=edit&type=sales_order&id=' . $params{trans_id}, diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index 25020a09c..d58c82653 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -307,6 +307,11 @@ sub form_header { $form->{onload} .= "document.do.submit();" } + my $follow_up_vc = $form->{ $form->{vc} eq 'customer' ? 'customer' : 'vendor' }; + $follow_up_vc =~ s/--\d*\s*$//; + + $form->{follow_up_trans_info} = $form->{donumber} .'('. $follow_up_vc .')'; + $form->header(); # Fix für Bug 1082 Erwartet wird: 'abteilungsNAME--abteilungsID' # und Erweiterung für Bug 1760: diff --git a/templates/webpages/do/form_footer.html b/templates/webpages/do/form_footer.html index a6a51299e..cc7d34b44 100644 --- a/templates/webpages/do/form_footer.html +++ b/templates/webpages/do/form_footer.html @@ -74,6 +74,7 @@ [%- END %] [%- END %] [%- IF id %] + [%- UNLESS closed %] [%- END %] diff --git a/templates/webpages/do/form_header.html b/templates/webpages/do/form_header.html index ec1e06eb0..b9c1d690b 100644 --- a/templates/webpages/do/form_header.html +++ b/templates/webpages/do/form_header.html @@ -12,6 +12,7 @@ +