Bug 603 - intnotes werden nicht übernommen wenn vom Kunden aus Auftraege/Buchungen...

[kivitendo-erp.git] / bin / mozilla / is.pl

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 9b6da27..8632805 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}) {
+    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|">
@@ -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="|
-      . $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|">
 |;
@@ -1441,13 +1443,14 @@ sub post {
   $form->{id} = 0 if $form->{postasnew};
 
   # get new invnumber in sequence if no invnumber is given or if posasnew was requested
-  if (!$form->{invnumber} || $form->{postasnew}) {
+  if ($form->{postasnew}) {
     if ($form->{type} eq "credit_note") {
-      $form->{invnumber} = $form->update_defaults(\%myconfig, "cnnumber");
+      undef($form->{cnnumber});
     } else {
-      $form->{invnumber} = $form->update_defaults(\%myconfig, "invnumber");
+      undef($form->{invnumber});
     }
   }
+
   relink_accounts();
   if ($print_post) {
     if (!(IS->post_invoice(\%myconfig, \%$form))) {
@@ -1517,6 +1520,18 @@ sub storno {
     $form->error($locale->text('Cannot storno storno invoice!'));
   }
 
+  if (IS->has_storno(\%myconfig, $form, "ar")) {
+    $form->error($locale->text("Invoice has already been storno'd!"));
+  }
+
+  map({ my $key = $_; delete($form->{$key})
+          unless (grep({ $key eq $_ } qw(path login password id type))); }
+      keys(%{ $form }));
+
+  &invoice_links;
+  &prepare_invoice;
+  relink_accounts();
+
   $form->{storno_id} = $form->{id};
   $form->{storno} = 1;
   $form->{id} = "";