Bug #780 behoben, generell eine Ueberpruefung eingefuehrt, ob bereits Zahlungen exist...

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 342928a17e0b74a6a0f0b4e0e6c913159385c150..f44805e2b95fa6f4d08aba1cbe732b9a8e0325c6 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -800,10 +800,10 @@ $follow_ups_block
                 <input class=submit type=submit name=action value="| . $locale->text('Delete') . qq|">
 |;
     }
                 <input class=submit type=submit name=action value="| . $locale->text('Delete') . qq|">
 |;
     }

-
+    print(STDERR "TOTALPAID $total_paid\n");

     # ToDO: - insert a global check for stornos, so that a storno is only possible a limited time after saving it
     print qq| <input class=submit type=submit name=action value="| . $locale->text('Storno') . qq|"> |
     # ToDO: - insert a global check for stornos, so that a storno is only possible a limited time after saving it
     print qq| <input class=submit type=submit name=action value="| . $locale->text('Storno') . qq|"> |

-      if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ap') && !IS->is_storno(\%myconfig, $form, 'ap', $form->{id}));
+      if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ap') && !IS->is_storno(\%myconfig, $form, 'ap', $form->{id}) && (($total_paid == 0) || ($total_paid eq "")));

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

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 3e6e9069883a958dbdbe0ecd7a0a16e9c023c74d..c0052bd5e060e21eb91096228f3357980437a8a5 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -843,7 +843,7 @@ $follow_ups_block
 
   # ToDO: - insert a global check for stornos, so that a storno is only possible a limited time after saving it
   print qq| <input class=submit type=submit name=action value="| . $locale->text('Storno') . qq|"> |
 
   # ToDO: - insert a global check for stornos, so that a storno is only possible a limited time after saving it
   print qq| <input class=submit type=submit name=action value="| . $locale->text('Storno') . qq|"> |

-    if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ar') && !IS->is_storno(\%myconfig, $form, 'ar'));
+    if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ar') && !IS->is_storno(\%myconfig, $form, 'ar') && (($total_paid == 0) || ($total_paid eq "")));

 
   if ($form->{id}) {
     if ($form->{radier}) {
 
   if ($form->{id}) {
     if ($form->{radier}) {

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 6c9c8a87eb67e70ee1470326b3dc6fdbada67df1..61c87cffc2614796033788f4afc846b2d7132938 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -826,7 +826,7 @@ sub form_footer {
 |;
 
   if ($form->{id}) {
 |;
 
   if ($form->{id}) {

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

 
     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|">

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 877b1668323fe5ade29501026154421695e5f4ce..f9fbca6a45583c76c87f2ac218505086dc079195 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -1113,7 +1113,7 @@ 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");
+    my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar") && (($totalpaid == 0) || ($totalpaid eq ""));

 
     print qq|
     <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="|
 
     print qq|
     <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="|