X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fis.pl;h=b603f773a1311596fcc8c66e59cb5fced35fa913;hb=3f4a45a96efc9e44bc3cd58874128dc36cc667cf;hp=fbfabe6d7d6af076e8d8abed08d4f85ad01a2334;hpb=91ea86b4c90a12c046c6eb37e0ca9f5b9672b81f;p=kivitendo-erp.git

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index fbfabe6d7..b603f773a 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -923,9 +923,23 @@ sub form_footer {
 	      </tr>
 	    </table>
 	  </td>
-	  <td align="right" width="100%">
+          <td>
+            <table>
+            <tr>
+              <th  align=left>| . $locale->text('Ertrag') . qq|</th>
+              <td>| .  $form->format_amount(\%myconfig, $form->{marge_total}, 2, 0) . qq|</td>
+            </tr>
+            <tr>
+              <th  align=left>| . $locale->text('Ertrag prozentual') . qq|</th>
+              <td>| .  $form->format_amount(\%myconfig, $form->{marge_percent}, 2, 0) . qq| %</td>
+            </tr>
+            <input type=hidden name="marge_total" value="$form->{"marge_total"}">
+            <input type=hidden name="marge_percent" value="$form->{"marge_percent"}">
+            </table>
+          </td>
+	  <td align="right">
 	    $taxincluded
-	    <table width="100%">
+	    <table>
 	      $subtotal
 	      $tax
 	      <tr>
@@ -951,11 +965,11 @@ sub form_footer {
       <td align="left" width="30%"><b>Dateiname</b></td>
       <td align="left" width="70%"><b>Webdavlink</b></td>
 |;
-    foreach $file (keys %{ $form->{WEBDAV} }) {
+    foreach $file (@{ $form->{WEBDAV} }) {
       $webdav_list .= qq|
       <tr>
-        <td align="left">$file</td>
-        <td align="left"><a href="$form->{WEBDAV}{$file}">$form->{WEBDAV}{$file}</a></td>
+        <td align="left">$file->{name}</td>
+        <td align="left"><a href="$file->{link}">$file->{type}</a></td>
       </tr>
 |;
     }
@@ -1461,9 +1475,9 @@ sub post {
     }
   }
 
-  ($form->{AR})      = split /--/, $form->{AR};
-  ($form->{AR_paid}) = split /--/, $form->{AR_paid};
-  $form->{storno}    = 0;
+  ($form->{AR})        = split /--/, $form->{AR};
+  ($form->{AR_paid})   = split /--/, $form->{AR_paid};
+  $form->{storno}    ||= 0;
 
   $form->{label} = $locale->text('Invoice');
 
@@ -1561,7 +1575,6 @@ sub preview {
   $form->{preview} = 1;
   $old_form = new Form;
   for (keys %$form) { $old_form->{$_} = $form->{$_} }
-  $old_form->{rowcount}++;
 
   &print_form($old_form);
   $lxdebug->leave_sub();