Beim Stornieren von Einkaufs- und Verkaufsrechnungen dürfen die bisherigen Zahlungsau...

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 39b4b88a14edb0517cd58119f4714d4a8501076d..9dd0076c526d1178e98fecbc3394e4bf9b34dbfd 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -1017,6 +1017,10 @@ sub storno {
   invoice_links();
   prepare_invoice();
   relink_accounts();
   invoice_links();
   prepare_invoice();
   relink_accounts();

+
+  # Payments must not be recorded for the new storno invoice.
+  $form->{paidaccounts} = 0;
+  map { my $key = $_; delete $form->{$key} if grep { $key =~ /^$_/ } qw(datepaid_ source_ memo_ paid_ exchangerate_ AR_paid_) } keys %{ $form };

   
   # saving the history
   if(!exists $form->{addition} && $form->{id} ne "") {
   
   # saving the history
   if(!exists $form->{addition} && $form->{id} ne "") {

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index e94bb386e11dc1f8fd65baf04aeb870b6910a8ab..7eb339804da84c31ca454300aca6b3b8798c3f60 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -1522,21 +1522,25 @@ sub storno {
   }
 
   map({ my $key = $_; delete($form->{$key})
   }
 
   map({ my $key = $_; delete($form->{$key})

-          unless (grep({ $key eq $_ } qw(login password id type))); }
+          unless (grep({ $key eq $_ } qw(login password id stylesheet type))); }

       keys(%{ $form }));
 
       keys(%{ $form }));
 

-  &invoice_links;
-  &prepare_invoice;
+  invoice_links();
+  prepare_invoice();

   relink_accounts();
 
   relink_accounts();
 

+  # Payments must not be recorded for the new storno invoice.
+  $form->{paidaccounts} = 0;
+  map { my $key = $_; delete $form->{$key} if grep { $key =~ /^$_/ } qw(datepaid_ source_ memo_ paid_ exchangerate_ AR_paid_) } keys %{ $form };
+

   $form->{storno_id} = $form->{id};
   $form->{storno} = 1;
   $form->{id} = "";
   $form->{invnumber} = "Storno zu " . $form->{invnumber};
   $form->{storno_id} = $form->{id};
   $form->{storno} = 1;
   $form->{id} = "";
   $form->{invnumber} = "Storno zu " . $form->{invnumber};

+  $form->{rowcount}++;

 
 

-  &post();
+  post();

   $lxdebug->leave_sub();
   $lxdebug->leave_sub();

-

 }
 
 sub preview {
 }
 
 sub preview {