X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=f783c19c00252e19cfe80296f3e4c1869ba294f2;hb=44e1ec6fcc2422cb75d36578245e16a33acef2d8;hp=2c44d60c1fbffcc9775bd4a1a0029bd4f4522a78;hpb=82a9544a39aba6a691653c379c92b390c0733edb;p=kivitendo-erp.git

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 2c44d60c1..f783c19c0 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -33,6 +33,7 @@
 #
 #######################################################################
 
+use SL::Common;
 use SL::CT;
 use SL::IC;
 use CGI::Ajax;
@@ -367,9 +368,10 @@ sub display_row {
         qq|<td align="right"><input name="qty_$i" size="5" value="|
       . $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec) .qq|">|;
     if ($form->{"formel_$i"}) {
-    $column_data{qty} .= qq|<button type="button" onclick="calculate_qty_selection_window('qty_$i','alu_$i', 'formel_$i', $i)">| . $locale->text('*/') . qq|</button>| .
-          $cgi->hidden("-name" => "formel_$i", "-value" => $form->{"formel_$i"}) . $cgi->hidden("-name" => "alu_$i", "-value" => $form->{"alu_$i"}). qq|</td>|;
+      $column_data{qty} .= qq|<button type="button" onclick="calculate_qty_selection_window('qty_$i','alu_$i', 'formel_$i', $i)">| . $locale->text('*/') . qq|</button>|
+        . $cgi->hidden("-name" => "formel_$i", "-value" => $form->{"formel_$i"}) . $cgi->hidden("-name" => "alu_$i", "-value" => $form->{"alu_$i"});
     }
+    $column_data{qty} .= qq|</td>|;
     $column_data{ship} =
         qq|<td align="right"><input name="ship_$i" size=5 value="|
       . $form->format_amount(\%myconfig, $form->{"ship_$i"})
@@ -1067,6 +1069,9 @@ sub check_form {
     $form->redo_rows(\@flds, \@a, $count, $form->{makemodel_rows});
     $form->{makemodel_rows} = $count;
 
+  } elsif ($form->{item} eq 'service') {
+    map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(listprice sellprice lastcost);
+
   } else {
 
     # this section applies to invoices and orders
@@ -1316,8 +1321,7 @@ sub edit_e_mail {
     $form->{"email"} = $form->{"cp_email"};
   }
 
-  $form->{ $form->{vc} } =~ /--/;
-  $title = $locale->text('E-mail') . " $`";
+  $title = $locale->text('E-mail') . " " . $form->get_formname_translation();
 
   $form->{oldmedia} = $form->{media};
   $form->{media}    = "email";
@@ -1351,6 +1355,8 @@ sub send_email {
 
   print_form("return");
 
+  Common->save_email_status(\%myconfig, $form);
+
   $form->{callback} = $callback;
   $form->redirect();
 
@@ -1535,7 +1541,7 @@ sub print_form {
     $inv                  = "ord";
     $due                  = "req";
     $form->{"${inv}date"} = $form->{transdate};
-    $form->{label}        = $locale->text('Sales Order');
+    $form->{label}        = $locale->text('Confirmation');
     $numberfld            = "sonumber";
     $order                = 1;
   }
@@ -1617,7 +1623,7 @@ sub print_form {
     $inv                  = "quo";
     $due                  = "req";
     $form->{"${inv}date"} = $form->{transdate};
-    $form->{label}        = $locale->text('Quotation');
+    $form->{label}        = $locale->text('RFQ');
     $numberfld            = "rfqnumber";
     $order                = 1;
   }