X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=2bf8e0786c0f215d1c762a031406c398835c6ef1;hb=24b6b41bbc19de53e40315124350df14314c6fd6;hp=ce7ce78484a01584d2f10e2df74dcaf4166d5703;hpb=da804bf2a76bec9da604c00208f789a9a312686b;p=kivitendo-erp.git

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index ce7ce7848..2bf8e0786 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -675,7 +675,7 @@ sub item_selected {
   map {
     $form->{"${_}_$i"} =
       $form->format_amount(\%myconfig, $form->{"${_}_$i"}, $decimalplaces)
-  } qw(sellprice listprice) if $form->{item} ne 'assembly';
+  } qw(sellprice listprice lastcost) if $form->{item} ne 'assembly';
 
   # get pricegroups for parts
   IS->get_pricegroups_for_parts(\%myconfig, \%$form);
@@ -882,7 +882,7 @@ sub validate_items {
   # check if items are valid
   if ($form->{rowcount} == 1) {
     &update;
-    exit;
+    ::end_of_request();
   }
 
   for my $i (1 .. $form->{rowcount} - 1) {
@@ -1184,7 +1184,9 @@ sub print_options {
     (!$options{no_html}) ?
       opthash("html", $form->{DF}{html}, "HTML") : undef,
     ($main::opendocument_templates && !$options{no_opendocument}) ?
-      opthash("opendocument",        $form->{DF}{opendocument},        $locale->text("OpenDocument/OASIS")) : undef;
+      opthash("opendocument",        $form->{DF}{opendocument},        $locale->text("OpenDocument/OASIS")) : undef,
+    ($main::excel_templates && !$options{no_excel}) ?
+      opthash("excel",               $form->{DF}{excel},               $locale->text("Excel")) : undef;
 
   push @LANGUAGE_ID,
     map { opthash($_->{id}, ($_->{id} eq $form->{language_id} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{languages} }
@@ -1263,7 +1265,7 @@ sub print {
     &save();
     $form->{formname} = $formname;
     &edit();
-    exit;
+    ::end_of_request();
   }
 
   &print_form($old_form);
@@ -1430,7 +1432,7 @@ sub print_form {
         $form->save_history($form->dbconnect(\%myconfig));
       }
       # /saving the history
-      exit;
+      ::end_of_request();
     }
   }
 
@@ -1592,6 +1594,9 @@ sub print_form {
   } elsif ($form->{"format"} =~ /opendocument/) {
     $form->{opendocument} = 1;
     $extension            = 'odt';
+  } elsif ($form->{"format"} =~ /excel/) {
+    $form->{excel} = 1;
+    $extension            = 'xls';
   }
 
   my $email_extension = '_email' if (($form->{media} eq 'email') && (-f "$myconfig{templates}/$form->{formname}_email$form->{language}${printer_code}.${extension}"));
@@ -1700,7 +1705,7 @@ sub print_form {
       }
 
       call_sub($display_form);
-      exit;
+      ::end_of_request();
     }
 
     my $msg =
@@ -1711,7 +1716,7 @@ sub print_form {
   }
   if ($form->{printing}) {
    call_sub($display_form);
-   exit;
+   ::end_of_request();
   }
 
   $main::lxdebug->leave_sub();
@@ -1947,13 +1952,11 @@ sub new_license {
 
   $form->{script} = "licenses.pl";
 
-  our $name;
-
   map { $form->{$_} = $form->{"old_$_"} } qw(partnumber description);
   map { $form->{$_} = $form->escape($form->{$_}, 1) }
     qw(partnumber description);
   $form->{callback} =
-    qq|$form->{script}?action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&customer=$customer&partnumber=$form->{partnumber}&description=$form->{description}&previousform="$previousform"&initial=1|;
+    qq|$form->{script}?action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$form->{name}&type=$form->{type}&customer=$customer&partnumber=$form->{partnumber}&description=$form->{description}&previousform="$previousform"&initial=1|;
   $form->redirect;
 
   $main::lxdebug->leave_sub();