X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdo.pl;h=e0a40f350c18b54e4ff0e092adf6cbe683f1344c;hb=14d71a6d1215e4fc67136c060fd21cd6c59602af;hp=7e8eabb88b9aa3f81e4735f0cd06eca1d68365ed;hpb=97908d779dfe277a4482c1be2c7e919dfd28026b;p=kivitendo-erp.git diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index 7e8eabb88..e0a40f350 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -30,6 +30,7 @@ # Delivery orders #====================================================================== +use Carp; use List::MoreUtils qw(uniq); use List::Util qw(max sum); use POSIX qw(strftime); @@ -42,9 +43,9 @@ use SL::IS; use SL::MoreCommon qw(ary_diff); use SL::ReportGenerator; use SL::WH; +use Sort::Naturally (); require "bin/mozilla/arap.pl"; require "bin/mozilla/common.pl"; -require "bin/mozilla/invoice_io.pl"; require "bin/mozilla/io.pl"; require "bin/mozilla/reportgenerator.pl"; @@ -171,8 +172,6 @@ sub order_links { $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP"); # retrieve order/quotation - $form->{webdav} = $::instance_conf->get_webdav; - my $editing = $form->{id}; DO->retrieve('vc' => $form->{vc}, @@ -492,10 +491,11 @@ sub search { $form->{vc} = $form->{type} eq 'purchase_delivery_order' ? 'vendor' : 'customer'; - $form->get_lists("projects" => { "key" => "ALL_PROJECTS", - "all" => 1 }, - "departments" => "ALL_DEPARTMENTS", - "$form->{vc}s" => "ALL_VC"); + $form->get_lists("projects" => { "key" => "ALL_PROJECTS", + "all" => 1 }, + "departments" => "ALL_DEPARTMENTS", + "$form->{vc}s" => "ALL_VC", + "business_types" => "ALL_BUSINESS_TYPES"); $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]); $form->{SHOW_VC_DROP_DOWN} = $myconfig{vclimit} > scalar @{ $form->{ALL_VC} }; @@ -551,7 +551,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 - insertdatefrom insertdateto); + insertdatefrom insertdateto business_id); my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables); @@ -614,6 +614,10 @@ sub orders { push @options, $locale->text('Order Number') . " : $form->{ordnumber}"; } push @options, $locale->text('Serial Number') . " : $form->{serialnumber}" if $form->{serialnumber}; + if ($form->{business_id}) { + my $vc_type_label = $form->{vc} eq 'customer' ? $locale->text('Customer type') : $locale->text('Vendor type'); + push @options, $vc_type_label . " : " . SL::DB::Business->new(id => $form->{business_id})->load->description; + } if ($form->{transaction_description}) { push @options, $locale->text('Transaction description') . " : $form->{transaction_description}"; } @@ -702,6 +706,8 @@ sub save { my %myconfig = %main::myconfig; my $locale = $main::locale; + $form->mtime_ischanged('delivery_orders'); + $form->{defaultcurrency} = $form->get_default_currency(\%myconfig); $form->isblank("transdate", $locale->text('Delivery Order Date missing!')); @@ -779,6 +785,8 @@ sub invoice { my $locale = $main::locale; check_do_access(); + $form->mtime_ischanged('delivery_orders'); + $main::auth->assert($form->{type} eq 'purchase_delivery_order' ? 'vendor_invoice_edit' : 'invoice_edit'); $form->{convert_from_do_ids} = $form->{id}; @@ -815,7 +823,7 @@ sub invoice { } } } - map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"} } qw(ship qty sellprice listprice lastcost basefactor); + map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"} } qw(ship qty sellprice lastcost basefactor); $form->{"donumber_$i"} = $form->{donumber}; $form->{"converted_from_delivery_order_items_id_$i"} = delete $form->{"delivery_order_items_id_$i"}; } @@ -823,7 +831,7 @@ sub invoice { $form->{type} = "invoice"; # locale messages - $main::locale = new Locale "$myconfig{countrycode}", "$script"; + $main::locale = Locale->new("$myconfig{countrycode}", "$script"); $locale = $main::locale; require "bin/mozilla/$form->{script}"; @@ -970,7 +978,7 @@ sub invoice_multi { } delete $form->{form_details}; - $locale = new Locale "$myconfig{countrycode}", "$script"; + $locale = Locale->new("$myconfig{countrycode}", "$script"); require "bin/mozilla/$form->{script}"; @@ -1013,9 +1021,9 @@ sub e_mail { check_do_access(); - my $form = $main::form; + $::form->mtime_ischanged('delivery_orders','mail'); - $form->{print_and_save} = 1; + $::form->{print_and_save} = 1; my $saved_form = save_form(); @@ -1529,6 +1537,27 @@ sub mark_closed { $main::lxdebug->leave_sub(); } +sub display_form { + $::lxdebug->enter_sub; + + $::auth->assert('purchase_delivery_order_edit | sales_delivery_order_edit'); + + relink_accounts(); + retrieve_partunits(); + + my $new_rowcount = $::form->{"rowcount"} * 1 + 1; + $::form->{"project_id_${new_rowcount}"} = $::form->{"globalproject_id"}; + + $::form->language_payment(\%::myconfig); + + Common::webdav_folder($::form); + + form_header(); + display_row(++$::form->{rowcount}); + form_footer(); + + $::lxdebug->leave_sub; +} sub yes { call_sub($main::form->{yes_nextsub}); @@ -1546,7 +1575,7 @@ sub dispatcher { my $form = $main::form; my $locale = $main::locale; - foreach my $action (qw(update ship_to print e_mail save transfer_out transfer_out_default + foreach my $action (qw(update ship_to print e_mail save transfer_out transfer_out_default sort transfer_in transfer_in_default mark_closed save_as_new invoice delete)) { if ($form->{"action_${action}"}) { call_sub($action); @@ -1709,6 +1738,9 @@ sub transfer_in_out_default { # dieser array_ref ist für DO->save da: # einmal die all_requests in YAML verwandeln, damit delivery_order_items_stock # gefüllt werden kann. + # could be dumped to the form in the first loop, + # but maybe bin_id and warehouse_id has changed to the "korrekturlager" with + # allowed negative qty ($::instance_conf->get_warehouse_id_ignore_onhand) ... my $i = 0; foreach (@all_requests){ $i++; @@ -1718,6 +1750,13 @@ sub transfer_in_out_default { save(no_redirect => 1); # Wir können auslagern, deshalb beleg speichern # und in delivery_order_items_stock speichern + + # ... and fill back the persistent dois_id for inventory fk + undef (@all_requests); + foreach my $i (1 .. $form->{rowcount}) { + next unless ($form->{"id_$i"} && $form->{"stock_${prefix}_$i"}); + push @all_requests, @{ DO->unpack_stock_information('packed' => $form->{"stock_${prefix}_$i"}) }; + } DO->transfer_in_out('direction' => $prefix, 'requests' => \@all_requests); @@ -1728,3 +1767,59 @@ sub transfer_in_out_default { $form->redirect; } + +sub sort { + $main::lxdebug->enter_sub(); + + check_do_access(); + + my $form = $main::form; + my %temp_hash; + + croak ("Delivery Order needs to be saved") unless $form->{id}; + + # hashify partnumbers, positions. key is delivery_order_items_id + for my $i (1 .. ($form->{rowcount}) ) { + $temp_hash{$form->{"delivery_order_items_id_$i"}} = { runningnumber => $form->{"runningnumber_$i"}, partnumber => $form->{"partnumber_$i"} }; + } + # naturally sort partnumbers and get a sorted array of doi_ids + my @sorted_doi_ids = sort { Sort::Naturally::ncmp($temp_hash{$a}->{"partnumber"}, $temp_hash{$b}->{"partnumber"}) } keys %temp_hash; + + + my $new_number = 1; + + for (@sorted_doi_ids) { + $form->{"runningnumber_$temp_hash{$_}->{runningnumber}"} = $new_number; + $new_number++; + } + $main::lxdebug->leave_sub(); + save(); +} + +__END__ + +=pod + +=encoding utf8 + +=head1 NAME + +do.pl - Script for all calls to delivery order + + +=head1 FUNCTIONS + +=over 2 + +=item C + +Sorts all position with Natural Sort. Can be activated in form_footer.html like this +Cinput class="submit" type="submit" name="action_sort" id="sort_button" value="[% 'Sort and Save' | $T8 %]"E> + +=back + +=head1 TODO + +Sort and Save can be implemented as an optional button if configuration ca be set by client config. +Example coding for database scripts and templates in (git show af2f24b8), check also +autogeneration for rose (scripts/rose_auto_create_model.pl --h)