Speichern von Verkäufern bei Kundenstammdaten.

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

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index d50d6d0..c2bfd97 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -856,7 +856,8 @@ sub form_footer {
 
         $tax .= qq|
              <tr>
-               <th align=right>$form->{"${item}_description"}</th>
+                <th align=right>$form->{"${item}_description"}&nbsp;|
+                                    . $form->{"${item}_rate"} * 100 .qq|%</th>
                <td align=right>$form->{"${item}_total"}</td>
              </tr>
 |;
@@ -895,7 +896,8 @@ sub form_footer {
 
         $tax .= qq|
              <tr>
-               <th align=right>Enthaltene $form->{"${item}_description"}</th>
+               <th align=right>Enthaltene $form->{"${item}_description"}&nbsp;|
+                                   . $form->{"${item}_rate"} * 100 .qq|%</th>
                <td align=right>$form->{"${item}_total"}</td>
              </tr>
              <tr>
@@ -1100,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|">
@@ -1110,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|">
 |;
@@ -1439,46 +1443,28 @@ 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))) {
-      $form->error($locale->text('Cannot post invoice!'));
-    }
-    remove_draft();
-    # saving the history
-       if(!exists $form->{addition}) {
-         $form->{addition} = "PRINTED AND POSTED";
-         $form->save_history($form->dbconnect(\%myconfig));
-    }
-    # /saving the history
-    
-  } else {
-    if (IS->post_invoice(\%myconfig, \%$form)){
-      remove_draft();
-       # saving the history
-        if(!exists $form->{addition}) {
-                       if($form->{storno}) {
-                               $form->{addition} = "STORNO";
-                       }
-                       else {
-                               $form->{addition} = "POSTED";
-                       }
-                       $form->save_history($form->dbconnect(\%myconfig));
-       }
-       # /saving the history
-    
-       $form->redirect(
-            $form->{label} . " $form->{invnumber} " . $locale->text('posted!'));
-       }
-    $form->error($locale->text('Cannot post invoice!'));
+  $form->error($locale->text('Cannot post invoice!'))
+    unless IS->post_invoice(\%myconfig, \%$form);
+  remove_draft() if $form->{remove_draft};
+
+  if(!exists $form->{addition}) {
+    $form->{addition} = $print_post     ? "PRINTED AND POSTED" :
+                        $form->{storno} ? "STORNO"             :
+                                          "POSTED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
+  
+  $form->redirect( $form->{label} . " $form->{invnumber} " . $locale->text('posted!'))
+    unless $print_post;
 
   $lxdebug->leave_sub();
 }
@@ -1515,6 +1501,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} = "";
@@ -1645,3 +1643,18 @@ sub yes {
 
   $lxdebug->leave_sub();
 }
+
+sub e_mail {
+  $lxdebug->enter_sub();
+
+  $form->{postasnew} = 1;
+  $print_post        = 1;
+
+  map { delete $form->{$_} } qw(printed emailed queued);
+
+  &post;
+
+  &edit_e_mail;
+
+  $lxdebug->leave_sub();
+}