X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdo.pl;h=fd4dd2c8e8489f6f867dd82469440584b84981f1;hb=141a56b066b84c9433f007409de8431ed160825c;hp=1ce19d6bd2d66a54028d5e6542fa02eaf6718c5e;hpb=984f6322b98c8d0cd3ceb9f659ed6621d180e617;p=kivitendo-erp.git diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index 1ce19d6bd..fd4dd2c8e 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -35,7 +35,6 @@ use Carp; use List::MoreUtils qw(uniq); use List::Util qw(max sum); use POSIX qw(strftime); -use YAML; use SL::DB::DeliveryOrder; use SL::DO; @@ -44,6 +43,7 @@ use SL::IS; use SL::MoreCommon qw(ary_diff restore_form save_form); use SL::ReportGenerator; use SL::WH; +use SL::YAML; use Sort::Naturally (); require "bin/mozilla/common.pl"; require "bin/mozilla/io.pl"; @@ -247,7 +247,6 @@ sub setup_do_action_bar { [ t8('Update'), submit => [ '#form', { action => "update" } ], id => 'update_button', - checks => [ 'kivi.validate_form' ], accesskey => 'enter', ], @@ -706,7 +705,7 @@ sub orders { push @hidden_variables, $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered donumber ordnumber serialnumber cusordnumber transaction_description transdatefrom transdateto reqdatefrom reqdateto type vc employee_id salesman_id project_id parts_partnumber parts_description - insertdatefrom insertdateto business_id); + insertdatefrom insertdateto business_id all department_id); my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables); @@ -808,6 +807,7 @@ sub orders { if ($form->{notdelivered}) { push @options, $locale->text('Not delivered'); } + push @options, $locale->text('Quick Search') . " : $form->{all}" if $form->{all}; my $pr = SL::DB::Manager::Printer->find_by( printer_description => $::locale->text("sales_delivery_order_printer")); @@ -1389,7 +1389,7 @@ sub set_stock_in { push @{ $stock_info }, { map { $_ => $form->{"${_}_${i}"} } qw(delivery_order_items_stock_id warehouse_id bin_id chargenumber bestbefore qty unit) }; } - $form->{stock} = YAML::Dump($stock_info); + $form->{stock} = SL::YAML::Dump($stock_info); _stock_in_out_set_qty_display($stock_info); @@ -1484,7 +1484,7 @@ sub set_stock_out { my @errors = DO->check_stock_availability('requests' => $stock_info, 'parts_id' => $form->{parts_id}); - $form->{stock} = YAML::Dump($stock_info); + $form->{stock} = SL::YAML::Dump($stock_info); if (@errors) { $form->{ERRORS} = []; @@ -1916,7 +1916,7 @@ sub transfer_in_out_default { foreach (@all_requests){ $i++; next unless scalar(%{ $_ }); - $form->{"stock_${prefix}_$i"} = YAML::Dump([$_]); + $form->{"stock_${prefix}_$i"} = SL::YAML::Dump([$_]); } save(no_redirect => 1); # Wir können auslagern, deshalb beleg speichern