X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=b6eaf9ca12047fcb476b3ff2b32e369c3bc19375;hb=c184bce36ecd18049541dccaaa38d212fb6170cf;hp=99db6ed5277e60fb690e72f6ecdbfb237b1a38e1;hpb=f75b552e93cc451f08caa845e7e0e5f34aaf44cf;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index 99db6ed52..b6eaf9ca1 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -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;