From: Philip Reetz <p.reetz@linet-services.de>
Date: Mon, 18 May 2009 16:10:05 +0000 (+0000)
Subject: Die Variablen wurden beim Umwandeln zu spaet gesichert
X-Git-Tag: release-2.6.0rc1~29
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;ds=sidebyside;h=563cbd552dc52fb59a28cccd33d2672e1933be54;p=kivitendo-erp.git

Die Variablen wurden beim Umwandeln zu spaet gesichert
---

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index b337842ff..43b360f53 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -205,6 +205,7 @@ sub order_links {
   $form->{jsscript} = 1;
 
   my $editing = $form->{id};
+  $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes));
 
   OE->retrieve(\%myconfig, \%$form);
 
@@ -217,7 +218,6 @@ sub order_links {
 
   $form->{"$form->{vc}_id"} ||= $form->{"all_$form->{vc}"}->[0]->{id} if $form->{"all_$form->{vc}"};
 
-  $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes));
   $form->{shipto} = 1 if $form->{id};
 
   # get customer / vendor
@@ -342,7 +342,7 @@ sub form_header {
   $credittext = $locale->text('Credit Limit exceeded!!!');
 
   my $follow_up_vc                =  $form->{ $form->{vc} eq 'customer' ? 'customer' : 'vendor' };
-  $follow_up_vc                   =~ s/--\d*\s*$//;
+  $follow_up_vc                   =~ s/--.*?//;
   $TMPL_VAR{follow_up_trans_info} =  ($form->{type} =~ /_quotation$/ ? $form->{quonumber} : $form->{ordnumber}) . " ($follow_up_vc)";
 
   if ($form->{id}) {