Loeschen von Drafts flexibler.

[kivitendo-erp.git] / bin / mozilla / is.pl

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index b05c8fd..30d0a07 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -856,8 +856,7 @@ sub form_footer {
 
         $tax .= qq|
              <tr>
-               <th align=right>$form->{"${item}_description"}&nbsp;|
-               . $form->{"${item}_rate"} * 100 .qq|%</th>
+               <th align=right>$form->{"${item}_description"}</th>
                <td align=right>$form->{"${item}_total"}</td>
              </tr>
 |;
@@ -896,8 +895,7 @@ sub form_footer {
 
         $tax .= qq|
              <tr>
-               <th align=right>Enthaltene $form->{"${item}_description"}&nbsp;|
-                  . $form->{"${item}_rate"} * 100 .qq|%</th>
+               <th align=right>Enthaltene $form->{"${item}_description"}</th>
                <td align=right>$form->{"${item}_total"}</td>
              </tr>
              <tr>
@@ -1453,7 +1451,7 @@ sub post {
     if (!(IS->post_invoice(\%myconfig, \%$form))) {
       $form->error($locale->text('Cannot post invoice!'));
     }
-    remove_draft();
+    remove_draft() if $form->{remove_draft};
     # saving the history
        if(!exists $form->{addition}) {
          $form->{addition} = "PRINTED AND POSTED";
@@ -1463,7 +1461,7 @@ sub post {
     
   } else {
     if (IS->post_invoice(\%myconfig, \%$form)){
-      remove_draft();
+      remove_draft() if $form->{remove_draft};
        # saving the history
         if(!exists $form->{addition}) {
                        if($form->{storno}) {