X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/a9866c42a27df61e776ea65322bfb095e5f6fa1b..18c72e9a3a8bc677491a244f15639a9bf316c67d:/bin/mozilla/io.pl diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index 778c718f4..dfd65c50c 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -317,7 +317,7 @@ sub display_row { my $qty_dec = ($form->{"qty_$i"} =~ /\.(\d+)/) ? length $1 : 2; - $column_data{qty} = $cgi->textfield(-name => "qty_$i", -size => 5, -value => $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec)); + $column_data{qty} = $cgi->textfield(-name => "qty_$i", -size => 5, -class => "numeric", -value => $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec)); $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"}; @@ -377,10 +377,10 @@ sub display_row { my $edit_discounts = $main::auth->assert('edit_prices', 1) && !$::form->{"active_discount_source_$i"}; $column_data{sellprice} = (!$edit_prices) ? $cgi->hidden( -name => "sellprice_$i", -id => "sellprice_$i", -value => $sellprice_value) . $sellprice_value - : $cgi->textfield(-name => "sellprice_$i", -id => "sellprice_$i", -size => 10, -onBlur => "check_right_number_format(this)", -value => $sellprice_value); + : $cgi->textfield(-name => "sellprice_$i", -id => "sellprice_$i", -size => 10, -class => "numeric", -value => $sellprice_value); $column_data{discount} = (!$edit_discounts) ? $cgi->hidden( -name => "discount_$i", -id => "discount_$i", -value => $discount_value) . $discount_value . ' %' - : $cgi->textfield(-name => "discount_$i", -id => "discount_$i", -size => 3, -value => $discount_value); + : $cgi->textfield(-name => "discount_$i", -id => "discount_$i", -size => 3, -"data-validate" => "number", -class => "numeric", -value => $discount_value); if ($is_delivery_order) { $column_data{stock_in_out} = calculate_stock_in_out($i); @@ -393,7 +393,7 @@ sub display_row { '-labels' => \%projectnumber_labels, '-default' => $form->{"project_id_$i"} )); - $column_data{reqdate} = qq||; + $column_data{reqdate} = qq||; $column_data{subtotal} = sprintf qq||, $form->{"subtotal_$i"} ? 'checked' : ''; # begin marge calculations @@ -479,7 +479,7 @@ sub display_row { $cgi->hidden("-name" => "price_new_$i", "-value" => $form->format_amount(\%myconfig, $form->{"price_new_$i"})), map { ($cgi->hidden("-name" => $_, "-id" => $_, "-value" => $form->{$_})); } map { $_."_$i" } (qw(bo price_old id inventory_accno bin partsgroup partnotes active_price_source active_discount_source - income_accno expense_accno listprice assembly taxaccounts ordnumber donumber transdate cusordnumber + income_accno expense_accno listprice part_type taxaccounts ordnumber donumber transdate cusordnumber longdescription basefactor marge_absolut marge_percent marge_price_factor weight), @hidden_vars) ); @@ -507,6 +507,20 @@ sub display_row { $main::lxdebug->leave_sub(); } +sub setup_io_select_item_action_bar { + my %params = @_; + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => [ + t8('Continue'), + submit => [ '#form' ], + accesskey => 'enter', + ], + ); + } +} + sub select_item { $main::lxdebug->enter_sub(); @@ -515,6 +529,8 @@ sub select_item { my $pre_entered_qty = $params{pre_entered_qty} || 1; _check_io_auth(); + setup_io_select_item_action_bar(); + my $previous_form = $::auth->save_form_in_session(form => $::form); $::form->{title} = $::myconfig{item_multiselect} ? $::locale->text('Set count for one or more of the items to select them'):