Anzahlungs-Rg.: Kein Zahlungsabschnitt in der Maske

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index e199bcadf2b457288f1cbf353bce47059c8d9962..14b3946d9da7bf204f7ec021e6bd352dccd02e11 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -246,8 +246,13 @@ sub prepare_invoice {
   if ($form->{type} eq "credit_note") {
     $form->{type}     = "credit_note";
     $form->{formname} = "credit_note";
   if ($form->{type} eq "credit_note") {
     $form->{type}     = "credit_note";
     $form->{formname} = "credit_note";

+
+  } elsif ($form->{type} eq "invoice_for_advance_payment") {
+    $form->{type}     = "invoice_for_advance_payment";
+

   } elsif ($form->{formname} eq "proforma" ) {
     $form->{type}     = "invoice";
   } elsif ($form->{formname} eq "proforma" ) {
     $form->{type}     = "invoice";

+

   } else {
     $form->{type}     = "invoice";
     $form->{formname} = "invoice";
   } else {
     $form->{type}     = "invoice";
     $form->{formname} = "invoice";


@@ -559,6 +564,7 @@ sub form_header {
     $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
   }
 
     $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
   }
 

+  $TMPL_VAR{is_type_invoice_for_advance_payment} = $form->{type} eq "invoice_for_advance_payment";

   $TMPL_VAR{is_type_credit_note} = $form->{type}   eq "credit_note";
   $TMPL_VAR{is_format_html}      = $form->{format} eq 'html';
   $TMPL_VAR{dateformat}          = $myconfig{dateformat};
   $TMPL_VAR{is_type_credit_note} = $form->{type}   eq "credit_note";
   $TMPL_VAR{is_format_html}      = $form->{format} eq 'html';
   $TMPL_VAR{dateformat}          = $myconfig{dateformat};


@@ -702,6 +708,7 @@ sub form_footer {
   }
 
   print $form->parse_html_template('is/form_footer', {
   }
 
   print $form->parse_html_template('is/form_footer', {

+    is_type_invoice_for_advance_payment => ($form->{type} eq "invoice_for_advance_payment"),

     is_type_credit_note => ($form->{type} eq "credit_note"),
     totalpaid           => $totalpaid,
     paid_missing        => $form->{invtotal} - $totalpaid,
     is_type_credit_note => ($form->{type} eq "credit_note"),
     totalpaid           => $totalpaid,
     paid_missing        => $form->{invtotal} - $totalpaid,

diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html
index 7d4c6089d167e11d9291b6364c4926fa2db35532..a3116851518429ab54f5665f6ddf931d9b519910 100644 (file)
--- a/templates/webpages/is/form_footer.html
+++ b/templates/webpages/is/form_footer.html
@@ -135,7 +135,9 @@
    </td>
   </tr>
 
    </td>
   </tr>
 

-[% PROCESS 'is/_payments.html' %]
+[% IF !is_type_invoice_for_advance_payment %]
+  [% PROCESS 'is/_payments.html' %]
+[% END %]

  </table>
 </div>
 [% PROCESS 'webdav/_list.html' %]
  </table>
 </div>
 [% PROCESS 'webdav/_list.html' %]