X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=a0f9288965d1768837ef5008183f497f4135c8ce;hb=787248feb4b2ea860d35574f35c2c020070bd407;hp=f5e3fdc81e2d03102128e0b6a72a22dd5f9935a2;hpb=480d9a56bed666562d3c115fa2da4c09ba66ac8d;p=kivitendo-erp.git

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index f5e3fdc81..a0f928896 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -235,9 +235,8 @@ sub display_row {
     $decimalplaces = max 2, length $1;
 
     $price_factor   = $price_factors{$form->{"price_factor_id_$i"}} || 1;
-    $discount       = $form->round_amount($form->{"sellprice_$i"} * $form->{"discount_$i"} / 100, $decimalplaces);
-    $linetotal      = $form->round_amount(($form->{"sellprice_$i"} - $discount) / $price_factor, $decimalplaces);
-    $linetotal      = $form->round_amount($linetotal * $form->{"qty_$i"}, 2);
+    $discount       = $form->round_amount($form->{"qty_$i"} * $form->{"sellprice_$i"} *        $form->{"discount_$i"}  / 100 / $price_factor, 2);
+    $linetotal      = $form->round_amount($form->{"qty_$i"} * $form->{"sellprice_$i"} * (100 - $form->{"discount_$i"}) / 100 / $price_factor, 2);
 
     $column_data{runningnumber} = $cgi->textfield(-name => "runningnumber_$i", -size => 5,  -value => $i);    # HuT
     $column_data{partnumber}    = $cgi->textfield(-name => "partnumber_$i",    -size => 12, -value => $form->{"partnumber_$i"});
@@ -253,9 +252,15 @@ sub display_row {
     $column_data{qty} .= $cgi->button(-onclick => "calculate_qty_selection_window('qty_$i','alu_$i', 'formel_$i', $i)", -value => $locale->text('*/'))
                        . $cgi->hidden(-name => "formel_$i", -value => $form->{"formel_$i"}) . $cgi->hidden("-name" => "alu_$i", "-value" => $form->{"alu_$i"})
       if $form->{"formel_$i"};
-    $column_data{ship} = !$form->{"id_$i"} ? '' : $form->format_amount_units('amount'     => $form->{"ship_$i"} * 1,
-                                                                             'part_unit'  => $form->{"partunit_$i"},
-                                                                             'max_places' => 2,);
+
+    $column_data{ship} = '';
+    if ($form->{"id_$i"}) {
+      my $ship_qty        = $form->{"ship_$i"} * 1;
+      $ship_qty          *= $all_units->{$form->{"partunit_$i"}}->{factor};
+      $ship_qty          /= $all_units->{$form->{"unit_$i"}}->{factor};
+
+      $column_data{ship}  = $form->format_amount(\%myconfig, $form->round_amount($ship_qty, 2) * 1) . ' ' . $form->{"unit_$i"};
+    }
 
     # build in drop down list for pricesgroups
     if ($form->{"prices_$i"}) {
@@ -967,12 +972,12 @@ sub edit_e_mail {
   @hidden_keys = sort grep { !$dont_hide_key{$_} } grep { !ref $form->{$_} } keys %$form;
 
   print $form->parse_html_template('generic/edit_email',
-                                   { title           => $title,
-                                     a_filename      => $attachment_filename,
-                                     subject         => $subject,
-                                     _print_options_ => print_options('inline' => 1),
-                                     HIDDEN          => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ],
-                                     SHOW_BCC        => $myconfig{role} eq 'admin' });
+                                   { title         => $title,
+                                     a_filename    => $attachment_filename,
+                                     subject       => $subject,
+                                     print_options => print_options('inline' => 1),
+                                     HIDDEN        => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ],
+                                     SHOW_BCC      => $myconfig{role} eq 'admin' });
 
   $lxdebug->leave_sub();
 }
@@ -1054,7 +1059,7 @@ sub print_options {
     ($form->{type} =~ /_delivery_order$/) ? (
       opthash($form->{type},         $form->{PD}{$form->{type}},       $locale->text('Delivery Order')),
       opthash('pick_list',           $form->{PD}{pick_list},           $locale->text('Pick List')),
-    ) : undef;
+    ) : undef,
     ($form->{type} eq 'credit_note') ?
       opthash("credit_note",         $form->{PD}{credit_note},         $locale->text('Credit Note')) : undef;
 
@@ -1361,7 +1366,8 @@ sub print_form {
     IS->invoice_details(\%myconfig, \%$form, $locale);
   }
 
-  $form->get_salesman(\%myconfig, $salesman_id_saved);
+  $form->get_employee_data('prefix' => 'employee', 'id' => $form->{employee_id});
+  $form->get_employee_data('prefix' => 'salesman', 'id' => $salesman_id_saved);
 
   if ($form->{shipto_id}) {
     $form->get_shipto(\%myconfig);
@@ -1459,25 +1465,30 @@ sub print_form {
     reformat_numbers($output_numberformat, $precision, @{ $field_list });
   }
 
-  $form->{IN} = "$form->{formname}$form->{language}${printer_code}.html";
+  my $extension = '';
   if ($form->{format} eq 'postscript') {
-    $form->{postscript} = 1;
-    $form->{IN} =~ s/html$/tex/;
+    $form->{postscript}   = 1;
+    $extension            = 'tex';
+
   } elsif ($form->{"format"} =~ /pdf/) {
-    $form->{pdf} = 1;
-    if ($form->{"format"} =~ /opendocument/) {
-      $form->{IN} =~ s/html$/odt/;
-    } else {
-      $form->{IN} =~ s/html$/tex/;
-    }
+    $form->{pdf}          = 1;
+    $extension            = $form->{'format'} =~ m/opendocument/i ? 'odt' : 'tex';
+
   } elsif ($form->{"format"} =~ /opendocument/) {
-    $form->{"opendocument"} = 1;
-    $form->{"IN"} =~ s/html$/odt/;
+    $form->{opendocument} = 1;
+    $extension            = 'odt';
   }
 
+  my $email_extension = '_email' if (($form->{media} eq 'email') && (-f "$myconfig{templates}/$form->{formname}_email$form->{language}${printer_code}.${extension}"));
+
+  $form->{IN}         = "$form->{formname}${email_extension}$form->{language}${printer_code}.${extension}";
+
   delete $form->{OUT};
 
   if ($form->{media} eq 'printer') {
+    print (STDERR "io--------------------------------------");
+    print (STDERR  $form->{printer_command});
+    #$form->{OUT} = "| $form->{printer_command} ";
     $form->{OUT} = "| $form->{printer_command} &>/dev/null";
     $form->{printed} .= " $form->{formname}";
     $form->{printed} =~ s/^ //;
@@ -1844,7 +1855,7 @@ sub set_duedate {
 
   $form->get_duedate(\%myconfig);
 
-  print $cgi->header() . $form->{duedate};
+  print $form->ajax_response_header() . $form->{duedate};
 
   $lxdebug->leave_sub();
 }
@@ -1870,7 +1881,7 @@ sub _update_part_information {
 sub _update_ship {
   $lxdebug->enter_sub();
 
-  if (!$form->{ordnumber}) {
+  if (!$form->{ordnumber} || !$form->{id}) {
     map { $form->{"ship_$_"} = 0 } (1..$form->{rowcount});
     $lxdebug->leave_sub();
     return;
@@ -1878,8 +1889,8 @@ sub _update_ship {
 
   AM->retrieve_all_units();
 
-  my %ship = DO->get_shipped_qty('type'      => ($form->{type} eq 'purchase_order') ? 'purchase' : 'sales',
-                                 'ordnumber' => $form->{ordnumber},);
+  my %ship = DO->get_shipped_qty('type'  => ($form->{type} eq 'purchase_order') ? 'purchase' : 'sales',
+                                 'oe_id' => $form->{id},);
 
   foreach my $i (1..$form->{rowcount}) {
     next unless ($form->{"id_${i}"});
@@ -1891,7 +1902,7 @@ sub _update_ship {
     next if (!$ship_entry || ($ship_entry->{qty} <= 0));
 
     my $rowqty =
-      $form->parse_amount(\%myconfig, $form->{"qty_$i"})
+      ($form->{simple_save} ? $form->{"qty_$i"} : $form->parse_amount(\%myconfig, $form->{"qty_$i"}))
       * $all_units->{$form->{"unit_$i"}}->{factor}
       / $all_units->{$form->{"partunit_$i"}}->{factor};