X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=f890cee12f8a02f1a130f91d467d7054fc8eca84;hb=4d2cf39d6f0dcf99c92953bf02f8640226180564;hp=71bc1f75f4d5774b19a14c2d9d50ff44ce00d153;hpb=ca48cabb1cda087e3a27fa04dc64e4352e150446;p=kivitendo-erp.git

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 71bc1f75f..f890cee12 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -144,7 +144,7 @@ sub display_row {
     {  id => 'serialnr',      width => 10,    value => $locale->text('Serial No.'),           display => 0, },
     {  id => 'projectnr',     width => 10,    value => $locale->text('Project'),              display => 0, },
     {  id => 'sellprice',     width => 15,    value => $locale->text('Price'),                display => !$is_delivery_order, },
-    {  id => 'sellprice_pg',  width => 8,    value => $locale->text('Pricegroup'),           display => ($form->{type} =~ /^sales_/) && !$is_delivery_order,  },
+    {  id => 'sellprice_pg',  width => 8,     value => $locale->text('Pricegroup'),           display => ($form->{type} =~ /^sales_/) && !$is_delivery_order,  },
     {  id => 'discount',      width => 5,     value => $locale->text('Discount'),             display => !$is_delivery_order, },
     {  id => 'linetotal',     width => 10,    value => $locale->text('Extended'),             display => !$is_delivery_order, },
     {  id => 'bin',           width => 10,    value => $locale->text('Bin'),                  display => 0, },
@@ -693,7 +693,7 @@ sub check_form {
     #$form->{sellprice} = 0;
     $form->{weight}    = 0;
     map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
-      qw(listprice rop stock);
+      qw(listprice sellprice rop stock);
 
     @flds =
       qw(id qty unit bom partnumber description sellprice weight runningnumber partsgroup lastcost);
@@ -885,7 +885,7 @@ sub order {
   for $i (1 .. $form->{rowcount}) {
     map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"})
             if ($form->{"${_}_${i}"}) }
-        qw(ship qty sellprice listprice basefactor));
+        qw(ship qty sellprice listprice basefactor discount));
   }
 
   &prepare_order;
@@ -941,7 +941,7 @@ sub quotation {
     map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig,
                                                      $form->{"${_}_${i}"})
             if ($form->{"${_}_${i}"}) }
-        qw(ship qty sellprice listprice basefactor));
+        qw(ship qty sellprice listprice basefactor discount));
   }
 
   &prepare_order;
@@ -1075,9 +1075,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,
-    ($form->{type} eq 'credit_note') ?
-      opthash("credit_note",         $form->{PD}{credit_note},         $locale->text('Credit Note')) : undef;
+    ) : undef;
 
   push @SENDMODE,
     opthash("attachment",            $form->{SM}{attachment},          $locale->text('Attachment')),
@@ -1389,7 +1387,7 @@ sub print_form {
     $form->get_shipto(\%myconfig);
   }
 
-  @a = qw(name street zipcode city country);
+  @a = qw(name street zipcode city country contact);
 
   $shipto = 1;
 
@@ -1481,7 +1479,7 @@ sub print_form {
     reformat_numbers($output_numberformat, $precision, @{ $field_list });
   }
 
-  my $extension = '';
+  my $extension = 'html';
   if ($form->{format} eq 'postscript') {
     $form->{postscript}   = 1;
     $extension            = 'tex';