X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FDeliveryOrder.pm;h=7c4a99bfa3d65cfadb8476e1d7dacd5fa2637a2a;hb=15aab04c1710b3c8a2bf8785aef31f13a958a43e;hp=3bbd8520c52773cb814ad2aa567f44fc796fe5b8;hpb=c9b0fd1a799f6992917f1b5fb92b661ad18cb30c;p=kivitendo-erp.git diff --git a/SL/Controller/DeliveryOrder.pm b/SL/Controller/DeliveryOrder.pm index 3bbd8520c..7c4a99bfa 100644 --- a/SL/Controller/DeliveryOrder.pm +++ b/SL/Controller/DeliveryOrder.pm @@ -1,10 +1,12 @@ -package SL::Controller::Order; +package SL::Controller::DeliveryOrder; use strict; use parent qw(SL::Controller::Base); use SL::Helper::Flash qw(flash_later); +use SL::Helper::Number qw(_format_number _parse_number); use SL::Presenter::Tag qw(select_tag hidden_tag div_tag); +use SL::Presenter::DeliveryOrder qw(delivery_order_status_line); use SL::Locale::String qw(t8); use SL::SessionFile::Random; use SL::PriceSource; @@ -17,6 +19,7 @@ use SL::DB::History; use SL::DB::Order; use SL::DB::Default; use SL::DB::Unit; +use SL::DB::Order; use SL::DB::Part; use SL::DB::PartClassification; use SL::DB::PartsGroup; @@ -25,14 +28,17 @@ use SL::DB::Language; use SL::DB::RecordLink; use SL::DB::Shipto; use SL::DB::Translation; +use SL::DB::TransferType; use SL::Helper::CreatePDF qw(:all); use SL::Helper::PrintOptions; use SL::Helper::ShippedQty; +use SL::Helper::UserPreferences::DisplayPreferences; use SL::Helper::UserPreferences::PositionsScrollbar; use SL::Helper::UserPreferences::UpdatePositions; use SL::Controller::Helper::GetModels; +use SL::Controller::DeliveryOrder::TypeData qw(:types); use List::Util qw(first sum0); use List::UtilsBy qw(sort_by uniq_by); @@ -45,12 +51,16 @@ use Sort::Naturally; use Rose::Object::MakeMethods::Generic ( scalar => [ qw(item_ids_to_delete is_custom_shipto_to_delete) ], - 'scalar --get_set_init' => [ qw(order valid_types type cv p all_price_factors search_cvpartnumber show_update_button part_picker_classification_ids) ], + 'scalar --get_set_init' => [ qw(order valid_types type cv p all_price_factors search_cvpartnumber show_update_button part_picker_classification_ids type_data) ], ); # safety -__PACKAGE__->run_before('check_auth'); +__PACKAGE__->run_before('check_auth', + except => [ qw(update_stock_information) ]); + +__PACKAGE__->run_before('check_auth_for_edit', + except => [ qw(update_stock_information edit show_customer_vendor_details_dialog price_popup stock_in_out_dialog load_second_rows) ]); __PACKAGE__->run_before('get_unalterable_data', only => [ qw(save save_as_new save_and_delivery_order save_and_invoice save_and_ap_transaction @@ -65,24 +75,31 @@ sub action_add { my ($self) = @_; $self->order->transdate(DateTime->now_local()); - my $extra_days = $self->type eq sales_quotation_type() ? $::instance_conf->get_reqdate_interval : - $self->type eq sales_order_type() ? $::instance_conf->get_delivery_date_interval : 1; - - if ( ($self->type eq sales_order_type() && $::instance_conf->get_deliverydate_on) - || ($self->type eq sales_quotation_type() && $::instance_conf->get_reqdate_on) - && (!$self->order->reqdate)) { - $self->order->reqdate(DateTime->today_local->next_workday(extra_days => $extra_days)); - } + $self->type_data->set_reqdate_by_type; $self->pre_render(); $self->render( - 'order/form', + 'delivery_order/form', title => $self->get_title_for('add'), %{$self->{template_args}} ); } +sub action_add_from_order { + my ($self) = @_; + # this interfers with init_order + $self->{converted_from_oe_id} = delete $::form->{id}; + + $self->type_data->validate($::form->{type}); + + my $order = SL::DB::Order->new(id => $self->{converted_from_oe_id})->load; + + $self->order(SL::DB::DeliveryOrder->new_from($order, type => $::form->{type})); + + $self->action_add; +} + # edit an existing order sub action_edit { my ($self) = @_; @@ -105,7 +122,7 @@ sub action_edit { $self->pre_render(); $self->render( - 'order/form', + 'delivery_order/form', title => $self->get_title_for('edit'), %{$self->{template_args}} ); @@ -128,15 +145,15 @@ sub action_edit_collective { # fall back to save as new if only one id is given if (scalar @multi_ids == 1) { - $self->order(SL::DB::Order->new(id => $multi_ids[0])->load); + $self->order(SL::DB::DeliveryOrder->new(id => $multi_ids[0])->load); $self->action_save_as_new(); return; } # make new order from given orders - my @multi_orders = map { SL::DB::Order->new(id => $_)->load } @multi_ids; + my @multi_orders = map { SL::DB::DeliveryOrder->new(id => $_)->load } @multi_ids; $self->{converted_from_oe_id} = join ' ', map { $_->id } @multi_orders; - $self->order(SL::DB::Order->new_from_multi(\@multi_orders, sort_sources_by => 'transdate')); + $self->order(SL::DB::DeliveryOrder->new_from_multi(\@multi_orders, sort_sources_by => 'transdate')); $self->action_edit(); } @@ -152,12 +169,7 @@ sub action_delete { return $self->js->render(); } - my $text = $self->type eq sales_order_type() ? $::locale->text('The order has been deleted') - : $self->type eq purchase_order_type() ? $::locale->text('The order has been deleted') - : $self->type eq sales_quotation_type() ? $::locale->text('The quotation has been deleted') - : $self->type eq request_quotation_type() ? $::locale->text('The rfq has been deleted') - : ''; - flash_later('info', $text); + flash_later('info', $self->type_data->text("delete")); my @redirect_params = ( action => 'add', @@ -178,12 +190,7 @@ sub action_save { return $self->js->render(); } - my $text = $self->type eq sales_order_type() ? $::locale->text('The order has been saved') - : $self->type eq purchase_order_type() ? $::locale->text('The order has been saved') - : $self->type eq sales_quotation_type() ? $::locale->text('The quotation has been saved') - : $self->type eq request_quotation_type() ? $::locale->text('The rfq has been saved') - : ''; - flash_later('info', $text); + flash_later('info', $self->type_data->text("saved")); my @redirect_params = ( action => 'edit', @@ -206,7 +213,7 @@ sub action_save_as_new { } # load order from db to check if values changed - my $saved_order = SL::DB::Order->new(id => $order->id)->load; + my $saved_order = SL::DB::DeliveryOrder->new(id => $order->id)->load; my %new_attrs; # Lets assign a new number if the user hasn't changed the previous one. @@ -221,25 +228,13 @@ sub action_save_as_new { : $order->transdate; # Set new reqdate unless changed if it is enabled in client config - if ($order->reqdate == $saved_order->reqdate) { - my $extra_days = $self->type eq sales_quotation_type() ? $::instance_conf->get_reqdate_interval : - $self->type eq sales_order_type() ? $::instance_conf->get_delivery_date_interval : 1; - - if ( ($self->type eq sales_order_type() && !$::instance_conf->get_deliverydate_on) - || ($self->type eq sales_quotation_type() && !$::instance_conf->get_reqdate_on)) { - $new_attrs{reqdate} = ''; - } else { - $new_attrs{reqdate} = DateTime->today_local->next_workday(extra_days => $extra_days); - } - } else { - $new_attrs{reqdate} = $order->reqdate; - } + $new_attrs{reqdate} = $self->type_data->get_reqdate_by_type($order->reqdate, $saved_order->reqdate); # Update employee $new_attrs{employee} = SL::DB::Manager::Employee->current; # Create new record from current one - $self->order(SL::DB::Order->new_from($order, destination_type => $order->type, attributes => \%new_attrs)); + $self->order(SL::DB::DeliveryOrder->new_from($order, destination_type => $order->type, attributes => \%new_attrs)); # no linked records on save as new delete $::form->{$_} for qw(converted_from_oe_id converted_from_orderitems_ids); @@ -415,7 +410,7 @@ sub action_save_and_show_email_dialog { $email_form->{subject} = $form->generate_email_subject(); $email_form->{attachment_filename} = $form->generate_attachment_filename(); $email_form->{message} = $form->generate_email_body(); - $email_form->{js_send_function} = 'kivi.Order.send_email()'; + $email_form->{js_send_function} = 'kivi.DeliveryOrder.send_email()'; my %files = $self->get_files_for_email_dialog(); $self->{all_employees} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]); @@ -423,12 +418,12 @@ sub action_save_and_show_email_dialog { email_form => $email_form, show_bcc => $::auth->assert('email_bcc', 'may fail'), FILES => \%files, - is_customer => $self->cv eq 'customer', + is_customer => $self->type_data->is_customer, ALL_EMPLOYEES => $self->{all_employees}, ); $self->js - ->run('kivi.Order.show_email_dialog', $dialog_html) + ->run('kivi.DeliveryOrder.show_email_dialog', $dialog_html) ->reinit_widgets ->render($self); } @@ -442,7 +437,7 @@ sub action_send_email { my $errors = $self->save(); if (scalar @{ $errors }) { - $self->js->run('kivi.Order.close_email_dialog'); + $self->js->run('kivi.DeliveryOrder.close_email_dialog'); $self->js->flash('error', $_) foreach @{ $errors }; return $self->js->render(); } @@ -489,18 +484,21 @@ sub action_send_email { $::form->{id} = $self->order->id; # this is used in SL::Mailer to create a linked record to the mail $::form->send_email(\%::myconfig, 'pdf'); - # internal notes - my $intnotes = $self->order->intnotes; - $intnotes .= "\n\n" if $self->order->intnotes; - $intnotes .= t8('[email]') . "\n"; - $intnotes .= t8('Date') . ": " . $::locale->format_date_object(DateTime->now_local, precision => 'seconds') . "\n"; - $intnotes .= t8('To (email)') . ": " . $::form->{email} . "\n"; - $intnotes .= t8('Cc') . ": " . $::form->{cc} . "\n" if $::form->{cc}; - $intnotes .= t8('Bcc') . ": " . $::form->{bcc} . "\n" if $::form->{bcc}; - $intnotes .= t8('Subject') . ": " . $::form->{subject} . "\n\n"; - $intnotes .= t8('Message') . ": " . $::form->{message}; + # internal notes unless no email journal + unless ($::instance_conf->get_email_journal) { - $self->order->update_attributes(intnotes => $intnotes); + my $intnotes = $self->order->intnotes; + $intnotes .= "\n\n" if $self->order->intnotes; + $intnotes .= t8('[email]') . "\n"; + $intnotes .= t8('Date') . ": " . $::locale->format_date_object(DateTime->now_local, precision => 'seconds') . "\n"; + $intnotes .= t8('To (email)') . ": " . $::form->{email} . "\n"; + $intnotes .= t8('Cc') . ": " . $::form->{cc} . "\n" if $::form->{cc}; + $intnotes .= t8('Bcc') . ": " . $::form->{bcc} . "\n" if $::form->{bcc}; + $intnotes .= t8('Subject') . ": " . $::form->{subject} . "\n\n"; + $intnotes .= t8('Message') . ": " . $::form->{message}; + + $self->order->update_attributes(intnotes => $intnotes); + } $self->save_history('MAILED'); @@ -604,7 +602,7 @@ sub action_customer_vendor_changed { ->val( '#order_intnotes', $self->order->intnotes) ->val( '#order_language_id', $self->order->$cv_method->language_id) ->focus( '#order_' . $self->cv . '_id') - ->run('kivi.Order.update_exchangerate'); + ->run('kivi.DeliveryOrder.update_exchangerate'); $self->js_redisplay_cvpartnumbers; $self->js->render(); @@ -655,7 +653,7 @@ sub action_unit_changed { $item->sellprice($item->unit_obj->convert_to($item->sellprice, $old_unit_obj)); $self->js - ->run('kivi.Order.update_sellprice', $::form->{item_id}, $item->sellprice_as_number); + ->run('kivi.DeliveryOrder.update_sellprice', $::form->{item_id}, $item->sellprice_as_number); $self->js_redisplay_line_values; $self->js->render(); } @@ -677,10 +675,11 @@ sub action_add_item { $self->get_item_cvpartnumber($item); my $item_id = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000); - my $row_as_html = $self->p->render('order/tabs/_row', + my $row_as_html = $self->p->render('delivery_order/tabs/_row', ITEM => $item, ID => $item_id, SELF => $self, + in_out => $self->type_data->transfer, ); if ($::form->{insert_before_item_id}) { @@ -707,7 +706,7 @@ sub action_add_item { $self->order->add_items( $item ); $self->get_item_cvpartnumber($item); my $item_id = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000); - my $row_as_html = $self->p->render('order/tabs/_row', + my $row_as_html = $self->p->render('delivery_order/tabs/_row', ITEM => $item, ID => $item_id, SELF => $self, @@ -724,11 +723,11 @@ sub action_add_item { $self->js ->val('.add_item_input', '') - ->run('kivi.Order.init_row_handlers') - ->run('kivi.Order.renumber_positions') + ->run('kivi.DeliveryOrder.init_row_handlers') + ->run('kivi.DeliveryOrder.renumber_positions') ->focus('#add_item_parts_id_name'); - $self->js->run('kivi.Order.row_table_scroll_down') if !$::form->{insert_before_item_id}; + $self->js->run('kivi.DeliveryOrder.row_table_scroll_down') if !$::form->{insert_before_item_id}; $self->js->render(); } @@ -764,10 +763,11 @@ sub action_add_multi_items { foreach my $item (@items) { $self->get_item_cvpartnumber($item); my $item_id = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000); - my $row_as_html = $self->p->render('order/tabs/_row', + my $row_as_html = $self->p->render('delivery_order/tabs/_row', ITEM => $item, ID => $item_id, SELF => $self, + in_out => $self->type_data->transfer, ); if ($::form->{insert_before_item_id}) { @@ -781,11 +781,11 @@ sub action_add_multi_items { $self->js ->run('kivi.Part.close_picker_dialogs') - ->run('kivi.Order.init_row_handlers') - ->run('kivi.Order.renumber_positions') + ->run('kivi.DeliveryOrder.init_row_handlers') + ->run('kivi.DeliveryOrder.renumber_positions') ->focus('#add_item_parts_id_name'); - $self->js->run('kivi.Order.row_table_scroll_down') if !$::form->{insert_before_item_id}; + $self->js->run('kivi.DeliveryOrder.row_table_scroll_down') if !$::form->{insert_before_item_id}; $self->js->render(); } @@ -832,7 +832,7 @@ sub action_reorder_items { } } $self->js - ->run('kivi.Order.redisplay_items', \@to_sort) + ->run('kivi.DeliveryOrder.redisplay_items', \@to_sort) ->render; } @@ -861,11 +861,11 @@ sub action_create_part { flash_later('info', t8('You are adding a new part while you are editing another document. You will be redirected to your document when saving the new part or aborting this form.')); my @redirect_params = ( - controller => 'Part', - action => 'add', - part_type => $::form->{add_item}->{create_part_type}, - callback => $callback, - show_abort => 1, + controller => 'Part', + action => 'add', + part_type => $::form->{add_item}->{create_part_type}, + callback => $callback, + inline_create => 1, ); $self->redirect_to(@redirect_params); @@ -893,13 +893,86 @@ sub action_return_from_create_part { $_->{render_longdescription} = 1 for @{ $self->order->items_sorted }; $self->render( - 'order/form', + 'delivery_order/form', title => $self->get_title_for('edit'), %{$self->{template_args}} ); } +sub action_stock_in_out_dialog { + my ($self) = @_; + + my $part = SL::DB::Part->load_cached($::form->{parts_id}) or die "need parts_id"; + my $unit = SL::DB::Unit->load_cached($::form->{unit}) or die "need unit"; + my $stock = $::form->{stock}; + my $row = $::form->{row}; + my $item_id = $::form->{item_id}; + my $qty = _parse_number($::form->{qty_as_number}); + + my $inout = $self->type_data->transfer; + + my @contents = DO->get_item_availability(parts_id => $part->id); + my $stock_info = DO->unpack_stock_information(packed => $stock); + + $self->merge_stock_data($stock_info, \@contents, $part, $unit); + + $self->render("delivery_order/stock_dialog", { layout => 0 }, + WHCONTENTS => $self->order->delivered ? $stock_info : \@contents, + part => $part, + do_qty => $qty, + do_unit => $unit->unit, + delivered => $self->order->delivered, + row => $row, + item_id => $item_id, + ); +} + +sub action_update_stock_information { + my ($self) = @_; + + my $stock_info = $::form->{stock_info}; + my $unit = $::form->{unit}; + my $yaml = SL::YAML::Dump($stock_info); + my $stock_qty = $self->calculate_stock_in_out_from_stock_info($unit, $stock_info); + + my $response = { + stock_info => $yaml, + stock_qty => $stock_qty, + }; + $self->render(\ SL::JSON::to_json($response), { layout => 0, type => 'json', process => 0 }); +} + +sub merge_stock_data { + my ($self, $stock_info, $contents, $part, $unit) = @_; + # TODO rewrite to mapping + + if (!$self->order->delivered) { + for my $row (@$contents) { + # row here is in parts units. stock is in item units + $row->{available_qty} = _format_number($part->unit_obj->convert_to($row->{qty}, $unit)); + + for my $sinfo (@{ $stock_info }) { + next if $row->{bin_id} != $sinfo->{bin_id} || + $row->{warehouse_id} != $sinfo->{warehouse_id} || + $row->{chargenumber} ne $sinfo->{chargenumber} || + $row->{bestbefore} ne $sinfo->{bestbefore}; + + $row->{"stock_$_"} = $sinfo->{$_} + for qw(qty unit error delivery_order_items_stock_id); + } + } + + } else { + for my $sinfo (@{ $stock_info }) { + my $bin = SL::DB::Bin->load_cached($sinfo->{bin_id}); + $sinfo->{warehousedescription} = $bin->warehouse->description; + $sinfo->{bindescription} = $bin->description; + map { $sinfo->{"stock_$_"} = $sinfo->{$_} } qw(qty unit); + } + } +} + # load the second row for one or more items # # This action gets the html code for all items second rows by rendering a template for @@ -914,7 +987,7 @@ sub action_load_second_rows { $self->js_load_second_row($item, $item_id, 0); } - $self->js->run('kivi.Order.init_row_handlers') if $self->order->is_sales; # for lastcosts change-callback + $self->js->run('kivi.DeliveryOrder.init_row_handlers') if $self->order->is_sales; # for lastcosts change-callback $self->js->render(); } @@ -951,7 +1024,7 @@ sub action_update_row_from_master_data { $item->active_price_source($price_src); $self->js - ->run('kivi.Order.update_sellprice', $item_id, $item->sellprice_as_number) + ->run('kivi.DeliveryOrder.update_sellprice', $item_id, $item->sellprice_as_number) ->html('.row_entry:has(#item_' . $item_id . ') [name = "partnumber"] a', $item->part->partnumber) ->val ('.row_entry:has(#item_' . $item_id . ') [name = "order.orderitems[].description"]', $item->description) ->val ('.row_entry:has(#item_' . $item_id . ') [name = "order.orderitems[].longdescription"]', $item->longdescription); @@ -967,6 +1040,60 @@ sub action_update_row_from_master_data { $self->js->render(); } +sub action_transfer_stock { + my ($self) = @_; + + if ($self->order->delivered) { + return $self->js->flash("error", t8('The parts for this order have already been transferred'))->render; + } + + my $inout = $self->type_data->properties('transfer'); + + my $errors = $self->save; + + if (@$errors) { + $self->js->flash('error', $_) for @$errors; + return $self->js->render; + } + + my $order = $self->order; + + # TODO move to type data + my $trans_type = $inout eq 'in' + ? SL::DB::Manager::TransferType->find_by(direction => "id", description => "stock") + : SL::DB::Manager::TransferType->find_by(direction => "out", description => "shipped"); + + my @transfer_requests; + + for my $item (@{ $order->items_sorted }) { + for my $stock (@{ $item->delivery_order_stock_entries }) { + my $transfer = SL::DB::Inventory->new_from($stock); + $transfer->trans_type($trans_type); + $transfer->qty($transfer->qty * -1) if $inout eq 'out'; + + push @transfer_requests, $transfer if defined $transfer->qty && $transfer->qty != 0; + }; + } + + if (!@transfer_requests) { + return $self->js->flash("error", t8("No stock to transfer"))->render; + } + + SL::DB->client->with_transaction(sub { + $_->save for @transfer_requests; + $self->order->update_attributes(delivered => 1); + }); + + $self->js + ->flash("info", t8("Stock transfered")) + ->run('kivi.ActionBar.setDisabled', '#transfer_out_action', t8('The parts for this order have already been transferred')) + ->run('kivi.ActionBar.setDisabled', '#transfer_in_action', t8('The parts for this order have already been transferred')) + ->run('kivi.ActionBar.setDisabled', '#delete_action', t8('The parts for this order have already been transferred')) + ->replaceWith('#data-status-line', delivery_order_status_line($self->order)) + ->render; + +} + sub js_load_second_row { my ($self, $item, $item_id, $do_parse) = @_; @@ -980,7 +1107,7 @@ sub js_load_second_row { $item->parse_custom_variable_values; } - my $row_as_html = $self->p->render('order/tabs/_second_row', ITEM => $item, TYPE => $self->type); + my $row_as_html = $self->p->render('delivery_order/tabs/_second_row', ITEM => $item, TYPE => $self->type); $self->js ->html('#second_row_' . $item_id, $row_as_html) @@ -1009,7 +1136,7 @@ sub js_redisplay_line_values { } $self->js - ->run('kivi.Order.redisplay_line_values', $is_sales, \@data); + ->run('kivi.DeliveryOrder.redisplay_line_values', $is_sales, \@data); } sub js_redisplay_cvpartnumbers { @@ -1020,7 +1147,7 @@ sub js_redisplay_cvpartnumbers { my @data = map {[$_->{cvpartnumber}]} @{ $self->order->items_sorted }; $self->js - ->run('kivi.Order.redisplay_cvpartnumbers', \@data); + ->run('kivi.DeliveryOrder.redisplay_cvpartnumbers', \@data); } sub js_reset_order_and_item_ids_after_save { @@ -1049,15 +1176,11 @@ sub js_reset_order_and_item_ids_after_save { # helpers # -sub init_valid_types { - [ sales_order_type(), purchase_order_type(), sales_quotation_type(), request_quotation_type() ]; -} - sub init_type { my ($self) = @_; if (none { $::form->{type} eq $_ } @{$self->valid_types}) { - die "Not a valid type for order"; + die "Not a valid type for delivery order"; } $self->type($::form->{type}); @@ -1066,11 +1189,7 @@ sub init_type { sub init_cv { my ($self) = @_; - my $cv = (any { $self->type eq $_ } (sales_order_type(), sales_quotation_type())) ? 'customer' - : (any { $self->type eq $_ } (purchase_order_type(), request_quotation_type())) ? 'vendor' - : die "Not a valid type for order"; - - return $cv; + return $self->type_data->customervendor; } sub init_search_cvpartnumber { @@ -1104,20 +1223,20 @@ sub init_all_price_factors { sub init_part_picker_classification_ids { my ($self) = @_; - my $attribute = 'used_for_' . ($self->type =~ m{sales} ? 'sale' : 'purchase'); - return [ map { $_->id } @{ SL::DB::Manager::PartClassification->get_all(where => [ $attribute => 1 ]) } ]; + return [ map { $_->id } @{ SL::DB::Manager::PartClassification->get_all(where => $self->type_data->part_classification_query) } ]; } sub check_auth { my ($self) = @_; - my $right_for = { map { $_ => $_.'_edit' } @{$self->valid_types} }; + $::auth->assert($self->type_data->access('view') || 'DOES_NOT_EXIST'); +} - my $right = $right_for->{ $self->type }; - $right ||= 'DOES_NOT_EXIST'; +sub check_auth_for_edit { + my ($self) = @_; - $::auth->assert($right); + $::auth->assert($self->type_data->access('edit') || 'DOES_NOT_EXIST'); } # build the selection box for contacts @@ -1171,42 +1290,23 @@ sub build_shipto_inputs { # Needed, if customer/vendor changed. sub build_business_info_row { - $_[0]->p->render('order/tabs/_business_info_row', SELF => $_[0]); + $_[0]->p->render('delivery_order/tabs/_business_info_row', SELF => $_[0]); } -sub render_price_dialog { - my ($self, $record_item) = @_; - - my $price_source = SL::PriceSource->new(record_item => $record_item, record => $self->order); - - $self->js - ->run( - 'kivi.io.price_chooser_dialog', - t8('Available Prices'), - $self->render('order/tabs/_price_sources_dialog', { output => 0 }, price_source => $price_source) - ) - ->reinit_widgets; - -# if (@errors) { -# $self->js->text('#dialog_flash_error_content', join ' ', @errors); -# $self->js->show('#dialog_flash_error'); -# } - - $self->js->render; -} - sub load_order { my ($self) = @_; return if !$::form->{id}; - $self->order(SL::DB::Order->new(id => $::form->{id})->load); + $self->order(SL::DB::DeliveryOrder->new(id => $::form->{id})->load); # Add an empty custom shipto to the order, so that the dialog can render the cvar inputs. # You need a custom shipto object to call cvars_by_config to get the cvars. $self->order->custom_shipto(SL::DB::Shipto->new(module => 'OE', custom_variables => [])) if !$self->order->custom_shipto; + $self->prepare_stock_info($_) for $self->order->items; + return $self->order; } @@ -1223,10 +1323,8 @@ sub make_order { # be retrieved via items until the order is saved. Adding empty items to new # order here solves this problem. my $order; - $order = SL::DB::Order->new(id => $::form->{id})->load(with => [ 'orderitems', 'orderitems.part' ]) if $::form->{id}; - $order ||= SL::DB::Order->new(orderitems => [], - quotation => (any { $self->type eq $_ } (sales_quotation_type(), request_quotation_type())), - currency_id => $::instance_conf->get_currency_id(),); + $order = SL::DB::DeliveryOrder->new(id => $::form->{id})->load(with => [ 'orderitems', 'orderitems.part' ]) if $::form->{id}; + $order ||= SL::DB::DeliveryOrder->new(orderitems => [], currency_id => $::instance_conf->get_currency_id(), order_type => $self->type_data->validate($::form->{type})); my $cv_id_method = $self->cv . '_id'; if (!$::form->{id} && $::form->{$cv_id_method}) { @@ -1258,6 +1356,9 @@ sub make_order { push @items, $item; $pos++; } + + $self->prepare_stock_info($_) for $order->items, @items; + $order->add_items(grep {!$_->id} @items); return $order; @@ -1278,7 +1379,27 @@ sub make_item { # add_custom_variables adds cvars to an orderitem with no cvars for saving, but # they cannot be retrieved via custom_variables until the order/orderitem is # saved. Adding empty custom_variables to new orderitem here solves this problem. - $item ||= SL::DB::OrderItem->new(custom_variables => []); + $item ||= SL::DB::DeliveryOrderItem->new(custom_variables => []); + + # handle stock info + if (my $stock_info = delete $attr->{stock_info}) { + my %existing = map { $_->id => $_ } $item->delivery_order_stock_entries; + my @save; + + for my $line (@{ DO->unpack_stock_information(packed => $stock_info) }) { + # lookup existing or make new + my $obj = delete $existing{$line->{delivery_order_items_stock_id}} + // SL::DB::DeliveryOrderItemsStock->new; + + # assign attributes + $obj->$_($line->{$_}) for qw(bin_id warehouse_id chargenumber qty unit); + $obj->bestbefore_as_date($line->{bestfbefore}) + if $line->{bestbefore} && $::instance_conf->get_show_bestbefore; + push @save, $obj if $obj->qty; + } + + $item->delivery_order_stock_entries(@save); + } $item->assign_attributes(%$attr); @@ -1298,7 +1419,7 @@ sub make_item { sub new_item { my ($record, $attr) = @_; - my $item = SL::DB::OrderItem->new; + my $item = SL::DB::DeliveryOrderItem->new; # Remove attributes where the user left or set the inputs empty. # So these attributes will be undefined and we can distinguish them @@ -1365,6 +1486,21 @@ sub new_item { return $item; } +sub prepare_stock_info { + my ($self, $item) = @_; + + $item->{stock_info} = SL::YAML::Dump([ + map +{ + delivery_order_items_stock_id => $_->id, + qty => $_->qty, + warehouse_id => $_->warehouse_id, + bin_id => $_->bin_id, + chargenumber => $_->chargenumber, + unit => $_->unit, + }, $item->delivery_order_stock_entries + ]); +} + sub setup_order_from_cv { my ($order) = @_; @@ -1461,7 +1597,7 @@ sub save { $self->order->custom_shipto(undef); } - SL::DB::OrderItem->new(id => $_)->delete for @{$self->item_ids_to_delete || []}; + SL::DB::DeliveryOrderItem->new(id => $_)->delete for @{$self->item_ids_to_delete || []}; $self->order->save(cascade => 1); # link records @@ -1469,7 +1605,7 @@ sub save { my @converted_from_oe_ids = split ' ', $::form->{converted_from_oe_id}; foreach my $converted_from_oe_id (@converted_from_oe_ids) { my $src = SL::DB::Order->new(id => $converted_from_oe_id)->load; - $src->update_attributes(closed => 1) if $src->type =~ /_quotation$/; + $src->update_attributes(closed => 1) if $src->type =~ /_quotation$/ && $self->order->is_type(PURCHASE_DELIVERY_ORDER_TYPE); $src->link_to_record($self->order); } if (scalar @{ $::form->{converted_from_orderitems_ids} || [] }) { @@ -1506,9 +1642,9 @@ sub workflow_sales_or_request_for_quotation { return $self->js->render(); } - my $destination_type = $::form->{type} eq sales_order_type() ? sales_quotation_type() : request_quotation_type(); + my $destination_type = $self->type_data->workflow("to_quotation_type"); - $self->order(SL::DB::Order->new_from($self->order, destination_type => $destination_type)); + $self->order(SL::DB::DeliveryOrder->new_from($self->order, destination_type => $destination_type)); $self->{converted_from_oe_id} = delete $::form->{id}; # set item ids to new fake id, to identify them as new items @@ -1531,7 +1667,7 @@ sub workflow_sales_or_request_for_quotation { $_->{render_second_row} = 1 for @{ $self->order->items_sorted }; $self->render( - 'order/form', + 'delivery_order/form', title => $self->get_title_for('edit'), %{$self->{template_args}} ); @@ -1548,21 +1684,16 @@ sub workflow_sales_or_purchase_order { return $self->js->render(); } - my $destination_type = $::form->{type} eq sales_quotation_type() ? sales_order_type() - : $::form->{type} eq request_quotation_type() ? purchase_order_type() - : $::form->{type} eq purchase_order_type() ? sales_order_type() - : $::form->{type} eq sales_order_type() ? purchase_order_type() - : ''; + my $destination_type = $self->type_data->workflow("to_order_type"); # check for direct delivery # copy shipto in custom shipto (custom shipto will be copied by new_from() in case) my $custom_shipto; - if ( $::form->{type} eq sales_order_type() && $destination_type eq purchase_order_type() - && $::form->{use_shipto} && $self->order->shipto) { - $custom_shipto = $self->order->shipto->clone('SL::DB::Order'); + if ($self->type_data->workflow("to_order_copy_shipto") && $::form->{use_shipto} && $self->order->shipto) { + $custom_shipto = $self->order->shipto->clone('SL::DB::DeliveryOrder'); } - $self->order(SL::DB::Order->new_from($self->order, destination_type => $destination_type)); + $self->order(SL::DB::DeliveryOrder->new_from($self->order, destination_type => $destination_type)); $self->{converted_from_oe_id} = delete $::form->{id}; # set item ids to new fake id, to identify them as new items @@ -1570,7 +1701,7 @@ sub workflow_sales_or_purchase_order { $item->{new_fake_id} = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000); } - if ($::form->{type} eq sales_order_type() && $destination_type eq purchase_order_type()) { + if ($self->type_data->workflow("to_order_copy_shipto")) { if ($::form->{use_shipto}) { $self->order->custom_shipto($custom_shipto) if $custom_shipto; } else { @@ -1594,20 +1725,19 @@ sub workflow_sales_or_purchase_order { $_->{render_second_row} = 1 for @{ $self->order->items_sorted }; $self->render( - 'order/form', + 'delivery_order/form', title => $self->get_title_for('edit'), %{$self->{template_args}} ); } - sub pre_render { my ($self) = @_; $self->{all_taxzones} = SL::DB::Manager::TaxZone->get_all_sorted(); $self->{all_currencies} = SL::DB::Manager::Currency->get_all_sorted(); $self->{all_departments} = SL::DB::Manager::Department->get_all_sorted(); - $self->{all_languages} = SL::DB::Manager::Language->get_all_sorted(); + $self->{all_languages} = SL::DB::Manager::Language->get_all_sorted( query => [ or => [ obsolete => 0, id => $self->order->language_id ] ] ); $self->{all_employees} = SL::DB::Manager::Employee->get_all(where => [ or => [ id => $self->order->employee_id, deleted => 0 ] ], sort_by => 'name'); @@ -1640,14 +1770,7 @@ sub pre_render { $item->active_discount_source($price_source->discount_from_source($item->active_discount_source)); } - if (any { $self->type eq $_ } (sales_order_type(), purchase_order_type())) { - # Calculate shipped qtys here to prevent calling calculate for every item via the items method. - # Do not use write_to_objects to prevent order->delivered to be set, because this should be - # the value from db, which can be set manually or is set when linked delivery orders are saved. - SL::Helper::ShippedQty->new->calculate($self->order)->write_to(\@{$self->order->items}); - } - - if ($self->order->number && $::instance_conf->get_webdav) { + if ($self->order->${\ $self->type_data->nr_key } && $::instance_conf->get_webdav) { my $webdav = SL::Webdav->new( type => $self->type, number => $self->order->number, @@ -1659,9 +1782,12 @@ sub pre_render { } } @all_objects; } + $self->{template_args}{in_out} = $self->type_data->transfer; + $self->{template_args}{longdescription_dialog_size_percentage} = SL::Helper::UserPreferences::DisplayPreferences->new()->get_longdescription_dialog_size_percentage(); + $self->get_item_cvpartnumber($_) for @{$self->order->items_sorted}; - $::request->{layout}->use_javascript("${_}.js") for qw(kivi.SalesPurchase kivi.Order kivi.File ckeditor/ckeditor ckeditor/adapters/jquery + $::request->{layout}->use_javascript("${_}.js") for qw(kivi.SalesPurchase kivi.DeliveryOrder kivi.File ckeditor/ckeditor ckeditor/adapters/jquery calculate_qty kivi.Validator follow_up show_history); $self->setup_edit_action_bar; } @@ -1669,23 +1795,26 @@ sub pre_render { sub setup_edit_action_bar { my ($self, %params) = @_; - my $deletion_allowed = (any { $self->type eq $_ } (sales_quotation_type(), request_quotation_type())) - || (($self->type eq sales_order_type()) && $::instance_conf->get_sales_order_show_delete) - || (($self->type eq purchase_order_type()) && $::instance_conf->get_purchase_order_show_delete); + my $deletion_allowed = $self->type_data->show_menu("delete"); + my $may_edit_create = $::auth->assert($self->type_data->access('edit') || 'DOES_NOT_EXIST', 1); for my $bar ($::request->layout->get('actionbar')) { $bar->add( combobox => [ action => [ t8('Save'), - call => [ 'kivi.Order.save', 'save', $::instance_conf->get_order_warn_duplicate_parts, - $::instance_conf->get_order_warn_no_deliverydate, - ], + call => [ 'kivi.DeliveryOrder.save', 'save', $::instance_conf->get_order_warn_duplicate_parts, + $::instance_conf->get_order_warn_no_deliverydate, + ], + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], action => [ t8('Save as new'), - call => [ 'kivi.Order.save', 'save_as_new', $::instance_conf->get_order_warn_duplicate_parts ], - disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef, + call => [ 'kivi.DeliveryOrder.save', 'save_as_new', $::instance_conf->get_order_warn_duplicate_parts ], + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') + : $self->type eq 'supplier_delivery_order' ? t8('Need a workflow for Supplier Delivery Order') + : !$self->order->id ? t8('This object has not been saved yet.') + : undef, ], ], # end of combobox "Save" @@ -1695,39 +1824,47 @@ sub setup_edit_action_bar { ], action => [ t8('Save and Quotation'), - submit => [ '#order_form', { action => "Order/sales_quotation" } ], - only_if => (any { $self->type eq $_ } (sales_order_type())), + submit => [ '#order_form', { action => "DeliveryOrder/sales_quotation" } ], + only_if => $self->type_data->show_menu("save_and_quotation"), + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], action => [ t8('Save and RFQ'), - submit => [ '#order_form', { action => "Order/request_for_quotation" } ], - only_if => (any { $self->type eq $_ } (purchase_order_type())), + submit => [ '#order_form', { action => "DeliveryOrder/request_for_quotation" } ], + only_if => $self->type_data->show_menu("save_and_rfq"), + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], action => [ t8('Save and Sales Order'), - submit => [ '#order_form', { action => "Order/sales_order" } ], - only_if => (any { $self->type eq $_ } (sales_quotation_type(), purchase_order_type())), + submit => [ '#order_form', { action => "DeliveryOrder/sales_order" } ], + only_if => $self->type_data->show_menu("save_and_sales_order"), + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], action => [ t8('Save and Purchase Order'), - call => [ 'kivi.Order.purchase_order_check_for_direct_delivery' ], - only_if => (any { $self->type eq $_ } (sales_order_type(), request_quotation_type())), + call => [ 'kivi.DeliveryOrder.purchase_order_check_for_direct_delivery' ], + only_if => $self->type_data->show_menu("save_and_purchase_order"), + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], action => [ t8('Save and Delivery Order'), - call => [ 'kivi.Order.save', 'save_and_delivery_order', $::instance_conf->get_order_warn_duplicate_parts, - $::instance_conf->get_order_warn_no_deliverydate, - ], - only_if => (any { $self->type eq $_ } (sales_order_type(), purchase_order_type())) + call => [ 'kivi.DeliveryOrder.save', 'save_and_delivery_order', $::instance_conf->get_order_warn_duplicate_parts, + $::instance_conf->get_order_warn_no_deliverydate, + ], + only_if => $self->type_data->show_menu("save_and_delivery_order"), + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], action => [ t8('Save and Invoice'), - call => [ 'kivi.Order.save', 'save_and_invoice', $::instance_conf->get_order_warn_duplicate_parts ], + call => [ 'kivi.DeliveryOrder.save', 'save_and_invoice', $::instance_conf->get_order_warn_duplicate_parts ], + only_if => $self->type_data->show_menu("save_and_invoice"), + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], action => [ t8('Save and AP Transaction'), - call => [ 'kivi.Order.save', 'save_and_ap_transaction', $::instance_conf->get_order_warn_duplicate_parts ], - only_if => (any { $self->type eq $_ } (purchase_order_type())) + call => [ 'kivi.DeliveryOrder.save', 'save_and_ap_transaction', $::instance_conf->get_order_warn_duplicate_parts ], + only_if => $self->type_data->show_menu("save_and_ap_transaction"), + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], ], # end of combobox "Workflow" @@ -1738,38 +1875,73 @@ sub setup_edit_action_bar { ], action => [ t8('Save and preview PDF'), - call => [ 'kivi.Order.save', 'preview_pdf', $::instance_conf->get_order_warn_duplicate_parts, - $::instance_conf->get_order_warn_no_deliverydate, - ], + call => [ 'kivi.DeliveryOrder.save', 'preview_pdf', $::instance_conf->get_order_warn_duplicate_parts, + $::instance_conf->get_order_warn_no_deliverydate, + ], + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], action => [ t8('Save and print'), - call => [ 'kivi.Order.show_print_options', $::instance_conf->get_order_warn_duplicate_parts, - $::instance_conf->get_order_warn_no_deliverydate, - ], + call => [ 'kivi.DeliveryOrder.show_print_options', $::instance_conf->get_order_warn_duplicate_parts, + $::instance_conf->get_order_warn_no_deliverydate, + ], + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], action => [ t8('Save and E-mail'), - id => 'save_and_email_action', - call => [ 'kivi.Order.save', 'save_and_show_email_dialog', $::instance_conf->get_order_warn_duplicate_parts, - $::instance_conf->get_order_warn_no_deliverydate, - ], - disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef, + id => 'save_and_email_action', + call => [ 'kivi.DeliveryOrder.save', 'save_and_show_email_dialog', $::instance_conf->get_order_warn_duplicate_parts, + $::instance_conf->get_order_warn_no_deliverydate, + ], + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') + : !$self->order->id ? t8('This object has not been saved yet.') + : undef, ], action => [ t8('Download attachments of all parts'), call => [ 'kivi.File.downloadOrderitemsFiles', $::form->{type}, $::form->{id} ], - disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef, + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') + : !$self->order->id ? t8('This object has not been saved yet.') + : undef, only_if => $::instance_conf->get_doc_storage, ], ], # end of combobox "Export" action => [ t8('Delete'), - call => [ 'kivi.Order.delete_order' ], + id => 'delete_action', + call => [ 'kivi.DeliveryOrder.delete_order' ], confirm => $::locale->text('Do you really want to delete this object?'), - disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef, - only_if => $deletion_allowed, + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') + : !$self->order->id ? t8('This object has not been saved yet.') + : $self->order->delivered ? t8('The parts for this order have already been transferred') + : undef, + only_if => $self->type_data->show_menu("delete"), + ], + + combobox => [ + action => [ + t8('Transfer out'), + id => 'transfer_out_action', + call => [ 'kivi.DeliveryOrder.save', 'transfer_stock' ], + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') + : !$self->order->id ? t8('This object has not been saved yet.') + : $self->order->delivered ? t8('The parts for this order have already been transferred') + : undef, + only_if => $self->type_data->properties('transfer') eq 'out', + confirm => t8('Do you really want to transfer the stock and set this order to delivered?'), + ], + action => [ + t8('Transfer in'), + id => 'transfer_in_action', + call => [ 'kivi.DeliveryOrder.save', 'transfer_stock' ], + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') + : !$self->order->id ? t8('This object has not been saved yet.') + : $self->order->delivered ? t8('The parts for this order have already been transferred') + : undef, + only_if => $self->type_data->properties('transfer') eq 'in', + confirm => t8('Do you really want to transfer the stock and set this order to delivered?'), + ], ], combobox => [ @@ -1778,7 +1950,7 @@ sub setup_edit_action_bar { ], action => [ t8('Follow-Up'), - call => [ 'kivi.Order.follow_up_window' ], + call => [ 'kivi.DeliveryOrder.follow_up_window' ], disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef, only_if => $::auth->assert('productivity', 1), ], @@ -1890,23 +2062,7 @@ sub get_title_for { my ($self, $action) = @_; return '' if none { lc($action)} qw(add edit); - - # for locales: - # $::locale->text("Add Sales Order"); - # $::locale->text("Add Purchase Order"); - # $::locale->text("Add Quotation"); - # $::locale->text("Add Request for Quotation"); - # $::locale->text("Edit Sales Order"); - # $::locale->text("Edit Purchase Order"); - # $::locale->text("Edit Quotation"); - # $::locale->text("Edit Request for Quotation"); - - $action = ucfirst(lc($action)); - return $self->type eq sales_order_type() ? $::locale->text("$action Sales Order") - : $self->type eq purchase_order_type() ? $::locale->text("$action Purchase Order") - : $self->type eq sales_quotation_type() ? $::locale->text("$action Quotation") - : $self->type eq request_quotation_type() ? $::locale->text("$action Request for Quotation") - : ''; + return $self->type_data->text($action); } sub get_item_cvpartnumber { @@ -1948,28 +2104,8 @@ sub get_part_texts { return $texts; } -sub sales_order_type { - 'sales_order'; -} - -sub purchase_order_type { - 'purchase_order'; -} - -sub sales_quotation_type { - 'sales_quotation'; -} - -sub request_quotation_type { - 'request_quotation'; -} - sub nr_key { - return $_[0]->type eq sales_order_type() ? 'ordnumber' - : $_[0]->type eq purchase_order_type() ? 'ordnumber' - : $_[0]->type eq sales_quotation_type() ? 'quonumber' - : $_[0]->type eq request_quotation_type() ? 'quonumber' - : ''; + return $_[0]->type_data->nr_key; } sub save_and_redirect_to { @@ -1982,12 +2118,7 @@ sub save_and_redirect_to { return $self->js->render(); } - my $text = $self->type eq sales_order_type() ? $::locale->text('The order has been saved') - : $self->type eq purchase_order_type() ? $::locale->text('The order has been saved') - : $self->type eq sales_quotation_type() ? $::locale->text('The quotation has been saved') - : $self->type eq request_quotation_type() ? $::locale->text('The rfq has been saved') - : ''; - flash_later('info', $text); + flash_later('info', $self->type_data->text("saved")); $self->redirect_to(%params, id => $self->order->id); } @@ -1995,7 +2126,7 @@ sub save_and_redirect_to { sub save_history { my ($self, $addition) = @_; - my $number_type = $self->order->type =~ m{order} ? 'ordnumber' : 'quonumber'; + my $number_type = $self->nr_key; my $snumbers = $number_type . '_' . $self->order->$number_type; SL::DB::History->new( @@ -2047,6 +2178,44 @@ sub store_pdf_to_webdav_and_filemanagement { return @errors; } +sub calculate_stock_in_out_from_stock_info { + my ($self, $unit, $stock_info) = @_; + + return "" if !$unit; + + my %units_by_name = map { $_->name => $_ } @{ SL::DB::Manager::Unit->get_all }; + + my $sum = sum0 map { + $units_by_name{$_->{unit}}->convert_to($_->{qty}, $units_by_name{$unit}) + } @$stock_info; + + my $content = _format_number($sum, 2) . ' ' . $unit; + + return $content; +} + +sub calculate_stock_in_out { + my ($self, $item, $stock_info) = @_; + + return "" if !$item->part || !$item->part->unit || !$item->unit; + + my $sum = sum0 map { + $_->unit_obj->convert_to($_->qty, $item->unit_obj) + } $item->delivery_order_stock_entries; + + my $content = _format_number($sum, 2); + + return $content; +} + +sub init_type_data { + SL::Controller::DeliveryOrder::TypeData->new($_[0]); +} + +sub init_valid_types { + $_[0]->type_data->valid_types; +} + 1; __END__ @@ -2113,11 +2282,11 @@ and ajax. the controller -=item * C