X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=3bc2211a36ec10d244106d5555d8f806685d4b81;hb=9fd46de37d7906b7c104c17112b34bae7d534d67;hp=39a9f34c9d3949712803951a0cd9861ce65dfb11;hpb=d5e79bebec5059297273a0451b65934264e3da17;p=kivitendo-erp.git

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 39a9f34c9..3bc2211a3 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -891,7 +891,8 @@ sub form_footer {
 
         $tax .= qq|
 	      <tr>
-		<th align=right>$form->{"${item}_description"}</th>
+		<th align=right>$form->{"${item}_description"}&nbsp;|
+		                    . $form->{"${item}_rate"} * 100 .qq|%</th>
 		<td align=right>$form->{"${item}_total"}</td>
 	      </tr>
 |;
@@ -930,7 +931,8 @@ sub form_footer {
 
         $tax .= qq|
 	      <tr>
-		<th align=right>Enthaltene $form->{"${item}_description"}</th>
+		<th align=right>Enthaltene $form->{"${item}_description"}&nbsp;|
+		                    . $form->{"${item}_rate"} * 100 .qq|%</th>
 		<td align=right>$form->{"${item}_total"}</td>
 	      </tr>
 	      <tr>
@@ -1048,6 +1050,12 @@ sub form_footer {
 
   if (($form->{id})) {
     print qq|
+  	<input type="button" class="submit" onclick="set_history_window(|
+  	. Q($form->{id})
+  	. qq|);" name="history" id="history" value="|
+  	. $locale->text('history')
+  	. qq|">
+
 <br>| . $locale->text("Workflow $form->{type}") . qq|<br>
 <input class=submit type=submit name=action value="|
       . $locale->text('Save as new') . qq|">
@@ -1114,17 +1122,7 @@ sub form_footer {
 <input type=hidden name=path value=$form->{path}>
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
-|;
-# button for saving history
-print qq|
-  	<input type=button class=submit onclick=set_history_window(|
-  	. $form->{id} 
-  	. qq|); name=history id=history value=|
-  	. $locale->text('history') 
-  	. qq|>|;
-# /button for saving history
-
-qq|
+
 </form>
 
 </body>
@@ -1935,17 +1933,18 @@ sub save_and_close {
   }
 
   relink_accounts();
+
+  $form->error($err) if (!OE->save(\%myconfig, \%$form));
+
   # saving the history
   if(!exists $form->{addition}) {
   	$form->{addition} = "SAVED";
   	$form->save_history($form->dbconnect(\%myconfig));
   }
-  # /saving the history 
+  # /saving the history
 
-  $form->redirect(
-            $form->{label} . " $form->{$ordnumber} " . $locale->text('saved!'))
-    if (OE->save(\%myconfig, \%$form));
-  $form->error($err);
+  $form->redirect($form->{label} . " $form->{$ordnumber} " .
+                  $locale->text('saved!'));
 
   $lxdebug->leave_sub();
 }
@@ -2015,6 +2014,9 @@ sub save {
     unless $form->{$ordnumber};
 
   relink_accounts();
+
+  OE->save(\%myconfig, \%$form);
+
   # saving the history
   if(!exists $form->{addition}) {
   	$form->{addition} = "SAVED";
@@ -2022,7 +2024,6 @@ sub save {
   }
   # /saving the history 
 
-  OE->save(\%myconfig, \%$form);
   $form->{simple_save} = 1;
   if(!$form->{print_and_save}) {
     set_headings("edit");