Wiedervorlagen korrekt anzeigen.

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 797c2600246c59ca15b4e8f861da1fb575c16f8d..b1aa9f3c5dae0079987bcb3b9eb585b3a3b1ce0b 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -404,7 +404,7 @@ sub form_footer {
   # follow ups
   if ($form->{id}) {
     $form->{follow_ups}            = FU->follow_ups('trans_id' => $form->{id}) || [];
   # follow ups
   if ($form->{id}) {
     $form->{follow_ups}            = FU->follow_ups('trans_id' => $form->{id}) || [];

-    $form->{follow_ups_unfinished} = sum map { $_->{due} * 1 } @{ $form->{follow_ups} };
+    $form->{follow_ups_unfinished} = ( sum map { $_->{due} * 1 } @{ $form->{follow_ups} } ) || 0;

   }
 
   # payments
   }
 
   # payments

diff --git a/templates/webpages/is/form_footer_de.html b/templates/webpages/is/form_footer_de.html
index 66283ec776388266da35f8dbc14ec580352e5cc7..bb8ac22d9e596ec45e1ca127564d12425ffa769e 100644 (file)
--- a/templates/webpages/is/form_footer_de.html
+++ b/templates/webpages/is/form_footer_de.html
@@ -32,7 +32,7 @@
           </script>
          </td>
         </tr>
           </script>
          </td>
         </tr>

-[%- IF id %]
+[%- IF id && follow_ups.size %]

         <tr>
           <td colspan="2">
             [%- LxERP.format_string('Es gibt #1 Wiedervorlage(n), von denen #2 fällig ist/sind.',
         <tr>
           <td colspan="2">
             [%- LxERP.format_string('Es gibt #1 Wiedervorlage(n), von denen #2 fällig ist/sind.',


@@ -66,7 +66,6 @@
   [%- END %]
        <table>
 
   [%- END %]
        <table>
 

-[%#- subtotal %]

 [%- UNLESS taxincluded %]
         <tr>
          <th align="right">Zwischensumme</th>
 [%- UNLESS taxincluded %]
         <tr>
          <th align="right">Zwischensumme</th>

diff --git a/templates/webpages/is/form_footer_master.html b/templates/webpages/is/form_footer_master.html
index a3d53fd5ab86439392b6f4749c9b33c4e7afde0f..f780367254aee246f0d3d3d514947cf047c0eef4 100644 (file)
--- a/templates/webpages/is/form_footer_master.html
+++ b/templates/webpages/is/form_footer_master.html
@@ -32,7 +32,7 @@
           </script>
          </td>
         </tr>
           </script>
          </td>
         </tr>

-[%- IF id %]
+[%- IF id && follow_ups.size %]

         <tr>
           <td colspan="2">
             [%- LxERP.format_string('<translate>There are #1 unfinished follow-ups of which #2 are due.</translate>',
         <tr>
           <td colspan="2">
             [%- LxERP.format_string('<translate>There are #1 unfinished follow-ups of which #2 are due.</translate>',


@@ -66,7 +66,6 @@
   [%- END %]
        <table>
 
   [%- END %]
        <table>
 

-[%#- subtotal %]

 [%- UNLESS taxincluded %]
         <tr>
          <th align="right"><translate>Subtotal</translate></th>
 [%- UNLESS taxincluded %]
         <tr>
          <th align="right"><translate>Subtotal</translate></th>