X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FDeliveryOrder.pm;h=a4b346214c730e6c5c5fbfcfeb88c10bdfa13d2c;hb=4e5b5b9af6890d18732f658eb5875aabf8c4d760;hp=61e614e664f01fbb62b7b973a4833d7c5618aeba;hpb=8ee7fcb0ed6575b116050ccbe711a26f7d1a86fc;p=kivitendo-erp.git diff --git a/SL/Controller/DeliveryOrder.pm b/SL/Controller/DeliveryOrder.pm index 61e614e66..a4b346214 100644 --- a/SL/Controller/DeliveryOrder.pm +++ b/SL/Controller/DeliveryOrder.pm @@ -4,8 +4,9 @@ use strict; use parent qw(SL::Controller::Base); use SL::Helper::Flash qw(flash_later); -use SL::Helper::Number qw(_format_number_units _parse_number); +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; @@ -18,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; @@ -35,7 +37,7 @@ use SL::Helper::UserPreferences::PositionsScrollbar; use SL::Helper::UserPreferences::UpdatePositions; use SL::Controller::Helper::GetModels; -use SL::Controller::DeliveryOrder::TypeData; +use SL::Controller::DeliveryOrder::TypeData qw(:types); use List::Util qw(first sum0); use List::UtilsBy qw(sort_by uniq_by); @@ -54,7 +56,7 @@ use Rose::Object::MakeMethods::Generic # safety __PACKAGE__->run_before('check_auth', - except => [ qw(pack_stock_information) ]); + except => [ qw(update_stock_information) ]); __PACKAGE__->run_before('get_unalterable_data', only => [ qw(save save_as_new save_and_delivery_order save_and_invoice save_and_ap_transaction @@ -85,7 +87,11 @@ sub action_add_from_order { # this interfers with init_order $self->{converted_from_oe_id} = delete $::form->{id}; - # TODO copy data and remember to link them on save + $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; } @@ -400,7 +406,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 ]); @@ -413,7 +419,7 @@ sub action_save_and_show_email_dialog { ); $self->js - ->run('kivi.Order.show_email_dialog', $dialog_html) + ->run('kivi.DeliveryOrder.show_email_dialog', $dialog_html) ->reinit_widgets ->render($self); } @@ -427,7 +433,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(); } @@ -474,18 +480,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) { + + 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->order->update_attributes(intnotes => $intnotes); + } $self->save_history('MAILED'); @@ -589,7 +598,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(); @@ -640,7 +649,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(); } @@ -710,11 +719,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(); } @@ -768,11 +777,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(); } @@ -819,7 +828,7 @@ sub action_reorder_items { } } $self->js - ->run('kivi.Order.redisplay_items', \@to_sort) + ->run('kivi.DeliveryOrder.redisplay_items', \@to_sort) ->render; } @@ -891,8 +900,8 @@ 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 $unit = $::form->{unit}; my $row = $::form->{row}; my $item_id = $::form->{item_id}; my $qty = _parse_number($::form->{qty_as_number}); @@ -902,38 +911,42 @@ sub action_stock_in_out_dialog { 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); + $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, + do_unit => $unit->unit, delivered => $self->order->delivered, row => $row, - itme_id => $item_id, + item_id => $item_id, ); } -# we're using the old YAML based stock packing, but don't want to do this in -# the frontend so we're doing a tiny roundtrip to the backend, back the info in -# perl, serve it back to the frontend and store it in the DOM there -sub action_pack_stock_information { +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); - $self->render(\$yaml, { layout => 0, process => 0 }); + 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) = @_; + my ($self, $stock_info, $contents, $part, $unit) = @_; # TODO rewrite to mapping if (!$self->order->delivered) { for my $row (@$contents) { - $row->{available_qty} = _format_number_units($row->{qty}, $row->{unit}, $part->unit); + # 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} || @@ -949,8 +962,8 @@ sub merge_stock_data { } else { for my $sinfo (@{ $stock_info }) { my $bin = SL::DB::Bin->load_cached($sinfo->{bin_id}); - $sinfo->{warehouse_description} = $bin->warehouse->description; - $sinfo->{bin_description} = $bin->escription; + $sinfo->{warehousedescription} = $bin->warehouse->description; + $sinfo->{bindescription} = $bin->description; map { $sinfo->{"stock_$_"} = $sinfo->{$_} } qw(qty unit); } } @@ -970,7 +983,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(); } @@ -1007,7 +1020,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); @@ -1030,6 +1043,8 @@ sub action_transfer_stock { 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) { @@ -1040,9 +1055,9 @@ sub action_transfer_stock { my $order = $self->order; # TODO move to type data - my $trans_type = $self->type_data->properties('transfer') eq 'in' + my $trans_type = $inout eq 'in' ? SL::DB::Manager::TransferType->find_by(direction => "id", description => "stock") - : SL::DB::Manager::TransferType->find_by(direction => "out", deescription => "shipped"); + : SL::DB::Manager::TransferType->find_by(direction => "out", description => "shipped"); my @transfer_requests; @@ -1050,21 +1065,29 @@ sub action_transfer_stock { 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; + push @transfer_requests, $transfer if defined $transfer->qty && $transfer->qty != 0; }; } if (!@transfer_requests) { - $self->js->flash("error", t8("No stock to transfer"))->render; + return $self->js->flash("error", t8("No stock to transfer"))->render; } - SL::DB->with_transaction(sub { + SL::DB->client->with_transaction(sub { $_->save for @transfer_requests; - $self->order->update_attributes(deliverd => 1); + $self->order->update_attributes(delivered => 1); }); - $self->js->flash("info", t8("Stock transfered"))->render; + $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 { @@ -1109,7 +1132,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 { @@ -1120,7 +1143,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 { @@ -1272,6 +1295,8 @@ sub load_order { # 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; } @@ -1321,6 +1346,9 @@ sub make_order { push @items, $item; $pos++; } + + $self->prepare_stock_info($_) for $order->items, @items; + $order->add_items(grep {!$_->id} @items); return $order; @@ -1343,6 +1371,26 @@ sub make_item { # saved. Adding empty custom_variables to new orderitem here solves this problem. $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); if ($is_new) { @@ -1428,6 +1476,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) = @_; @@ -1531,8 +1594,8 @@ sub save { if ($::form->{converted_from_oe_id}) { 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::DeliveryOrder->new(id => $converted_from_oe_id)->load; - $src->update_attributes(closed => 1) if $src->type =~ /_quotation$/; + my $src = SL::DB::Order->new(id => $converted_from_oe_id)->load; + $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} || [] }) { @@ -1735,7 +1798,9 @@ sub setup_edit_action_bar { action => [ t8('Save as new'), call => [ 'kivi.DeliveryOrder.save', 'save_as_new', $::instance_conf->get_order_warn_duplicate_parts ], - disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef, + disabled => $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" @@ -1817,24 +1882,30 @@ sub setup_edit_action_bar { action => [ t8('Delete'), + 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, + disabled => !$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'), - submit => [ '#order_form', { action => "DeliveryOrder/transfer_stock" } ], - disabled => $self->order->delivered ? t8('The parts for this order have already been transferred') : undef, + id => 'transfer_out_action', + call => [ 'kivi.DeliveryOrder.save', 'transfer_stock' ], + disabled => !$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'), - submit => [ '#order_form', { action => "DeliveryOrder/transfer_stock" } ], - disabled => $self->order->delivered ? t8('The parts for this order have already been transferred') : undef, + id => 'transfer_in_action', + call => [ 'kivi.DeliveryOrder.save', 'transfer_stock' ], + disabled => !$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?'), ], @@ -2074,20 +2145,32 @@ 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) = @_; + my ($self, $item, $stock_info) = @_; return "" if !$item->part || !$item->part->unit || !$item->unit; - my $in_out = $self->type_data->transfer; - - my $do_qty = $item->qty; my $sum = sum0 map { $_->unit_obj->convert_to($_->qty, $item->unit_obj) } $item->delivery_order_stock_entries; - my $matches = $do_qty == $sum; - my $content = _format_number_units($sum, 2, $item->unit_obj, $item->part->unit_obj); + my $content = _format_number($sum, 2); return $content; }