Den Storno-Button wirklich nur dann anzeigen, wenn die Rechnung noch nicht storniert...

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 04ca53ee46202a369c7ded891a1ef612a52ebc2e..d72ca7ed852868aa8f7bbb34edbfeeab35a04d57 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -786,12 +786,14 @@ sub form_footer {
   $closedto = $form->datetonum($form->{closedto}, \%myconfig);
 
   if ($form->{id}) {
   $closedto = $form->datetonum($form->{closedto}, \%myconfig);
 
   if ($form->{id}) {

+    my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ap");
+

     print qq|<input class=submit type=submit name=action value="|
       . $locale->text('Post Payment') . qq|">
 |;
     print qq|<input class=submit type=submit name=action value="|
       . $locale->text('Storno') . qq|">
     print qq|<input class=submit type=submit name=action value="|
       . $locale->text('Post Payment') . qq|">
 |;
     print qq|<input class=submit type=submit name=action value="|
       . $locale->text('Storno') . qq|">

-| unless ($form->{storno});
+| if ($show_storno);

     if ($form->{radier}) {
     print qq|
     <input class=submit type=submit name=action value="|
     if ($form->{radier}) {
     print qq|
     <input class=submit type=submit name=action value="|

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 3f22e6d231b77edee129cbbd8a0d8f61fba94c4d..86328055584a07927d1a63c133413e7a38b4c8f7 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -1102,6 +1102,8 @@ if ($form->{type} eq "credit_note") {
   $closedto = $form->datetonum($form->{closedto}, \%myconfig);
 
   if ($form->{id}) {
   $closedto = $form->datetonum($form->{closedto}, \%myconfig);
 
   if ($form->{id}) {

+    my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar");
+

     print qq|
     <input class=submit type=submit accesskey="u" name=action id=update_button value="|
       . $locale->text('Update') . qq|">
     print qq|
     <input class=submit type=submit accesskey="u" name=action id=update_button value="|
       . $locale->text('Update') . qq|">


@@ -1112,7 +1114,7 @@ if ($form->{type} eq "credit_note") {
     <input class=submit type=submit name=action value="|
       . $locale->text('E-mail') . qq|"> |;
     print qq|<input class=submit type=submit name=action value="|
     <input class=submit type=submit name=action value="|
       . $locale->text('E-mail') . qq|"> |;
     print qq|<input class=submit type=submit name=action value="|

-      . $locale->text('Storno') . qq|"> | unless ($form->{storno});
+      . $locale->text('Storno') . qq|"> | if ($show_storno);

     print qq|<input class=submit type=submit name=action value="|
       . $locale->text('Post Payment') . qq|">
 |;
     print qq|<input class=submit type=submit name=action value="|
       . $locale->text('Post Payment') . qq|">
 |;