X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fis.pl;h=838498033ad1a89cc2098972a1f440bdfd8a81aa;hb=9d11b0deda799764a58062b3df97e076cc26820e;hp=0be63a5467faf7755641b28d651d894db2d288f5;hpb=41fab322c61944257e0c21c8469a6e931bbd8307;p=kivitendo-erp.git

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 0be63a546..838498033 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -385,7 +385,7 @@ sub setup_is_action_bar {
           disabled => !$may_edit_create ? t8('You must not change this invoice.')
                     : !$form->{id}      ? t8('This invoice has not been posted yet.')
                     :                     undef,
-          only_if  => $::instance_conf->get_is_show_mark_as_paid && $form->{type} ne "invoice_for_advance_payment",
+          only_if  => ($::instance_conf->get_is_show_mark_as_paid && $form->{type} ne "invoice_for_advance_payment") || $form->{type} eq 'final_invoice',
         ],
       ], # end of combobox "Post"
 
@@ -624,11 +624,11 @@ sub form_header {
     $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{numberformat}                        = $myconfig{numberformat};
+  $TMPL_VAR{is_type_normal_invoice} = $form->{type} eq "invoice";
+  $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{numberformat}           = $myconfig{numberformat};
 
   # hiddens
   $TMPL_VAR{HIDDENS} = [qw(
@@ -768,7 +768,7 @@ sub 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_normal_invoice              => ($form->{type} eq "invoice"),
     is_type_credit_note                 => ($form->{type} eq "credit_note"),
     totalpaid                           => $totalpaid,
     paid_missing                        => $form->{invtotal} - $totalpaid,
@@ -1048,6 +1048,8 @@ sub post {
     my @current_taxaccounts = (split(/ /, $form->{taxaccounts}));
     $form->error($locale->text('Cannot post invoice for advance payment with more than one tax'))
       if (scalar @current_taxaccounts > 1);
+    $form->error($locale->text('Cannot post invoice for advance payment with taxincluded'))
+      if ($form->{taxincluded});
   }
 
   for my $i (1 .. $form->{paidaccounts}) {