X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/575baa0abd4cbd84f2f1aab53d858d1003a475cd..a32fcad2cf3fabf15c9dd10ddc83ce703db66ad8:/SL/Controller/DeliveryOrder.pm diff --git a/SL/Controller/DeliveryOrder.pm b/SL/Controller/DeliveryOrder.pm index 91af197da..8f3d838c8 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); +use SL::Helper::Number qw(_format_number_units _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); @@ -53,7 +55,8 @@ use Rose::Object::MakeMethods::Generic # safety -__PACKAGE__->run_before('check_auth'); +__PACKAGE__->run_before('check_auth', + 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 @@ -84,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; } @@ -886,6 +893,79 @@ sub action_return_from_create_part { } +sub action_stock_in_out_dialog { + my ($self) = @_; + + my $part = SL::DB::Part->load_cached($::form->{parts_id}) or die "need parts_id"; + 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}); + + 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); + + $self->render("delivery_order/stock_dialog", { layout => 0 }, + WHCONTENTS => $self->order->delivered ? $stock_info : \@contents, + part => $part, + do_qty => $qty, + do_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) = @_; + # TODO rewrite to mapping + + if (!$self->order->delivered) { + for my $row (@$contents) { + $row->{available_qty} = _format_number_units($row->{qty}, $row->{unit}, $part->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 @@ -960,6 +1040,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) { @@ -970,9 +1052,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; @@ -980,8 +1062,9 @@ 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; }; } @@ -989,12 +1072,18 @@ sub action_transfer_stock { $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')) + ->replaceWith('#data-status-line', delivery_order_status_line($self->order)) + ->render; + } sub js_load_second_row { @@ -1202,6 +1291,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; } @@ -1251,6 +1342,9 @@ sub make_order { push @items, $item; $pos++; } + + $self->prepare_stock_info($_) for $order->items, @items; + $order->add_items(grep {!$_->id} @items); return $order; @@ -1273,6 +1367,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) { @@ -1358,6 +1472,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,8 +1590,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} || [] }) { @@ -1749,22 +1878,27 @@ sub setup_edit_action_bar { t8('Delete'), 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?'), ], @@ -2004,19 +2138,31 @@ 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_units($sum, 2, $units_by_name{$unit}, $units_by_name{$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); return $content;