X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/803916465d8a60d75ade24e06cffee6cc40c528c..7a9df994dcf984598e3602591d93e7d3cc09c378:/SL/Controller/DeliveryOrder.pm diff --git a/SL/Controller/DeliveryOrder.pm b/SL/Controller/DeliveryOrder.pm index bb88a0d28..653342549 100644 --- a/SL/Controller/DeliveryOrder.pm +++ b/SL/Controller/DeliveryOrder.pm @@ -1,9 +1,10 @@ -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_units); use SL::Presenter::Tag qw(select_tag hidden_tag div_tag); use SL::Locale::String qw(t8); use SL::SessionFile::Random; @@ -33,6 +34,7 @@ use SL::Helper::UserPreferences::PositionsScrollbar; use SL::Helper::UserPreferences::UpdatePositions; use SL::Controller::Helper::GetModels; +use SL::Controller::DeliveryOrder::TypeData; use List::Util qw(first sum0); use List::UtilsBy qw(sort_by uniq_by); @@ -45,17 +47,13 @@ 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('recalc', - only => [ qw(save save_as_new save_and_delivery_order save_and_invoice save_and_ap_transaction - print send_email) ]); - __PACKAGE__->run_before('get_unalterable_data', only => [ qw(save save_as_new save_and_delivery_order save_and_invoice save_and_ap_transaction print send_email) ]); @@ -69,19 +67,12 @@ 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}} ); @@ -107,10 +98,9 @@ sub action_edit { $_->{render_second_row} = 1 for @{ $self->order->items_sorted }; } - $self->recalc(); $self->pre_render(); $self->render( - 'order/form', + 'delivery_order/form', title => $self->get_title_for('edit'), %{$self->{template_args}} ); @@ -133,15 +123,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(); } @@ -157,12 +147,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', @@ -183,12 +168,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', @@ -211,7 +191,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. @@ -226,25 +206,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); @@ -579,7 +547,6 @@ sub action_customer_vendor_changed { my ($self) = @_; setup_order_from_cv($self->order); - $self->recalc(); my $cv_method = $self->cv; @@ -612,7 +579,6 @@ sub action_customer_vendor_changed { ->focus( '#order_' . $self->cv . '_id') ->run('kivi.Order.update_exchangerate'); - $self->js_redisplay_amounts_and_taxes; $self->js_redisplay_cvpartnumbers; $self->js->render(); } @@ -661,12 +627,9 @@ sub action_unit_changed { my $old_unit_obj = SL::DB::Unit->new(name => $::form->{old_unit})->load; $item->sellprice($item->unit_obj->convert_to($item->sellprice, $old_unit_obj)); - $self->recalc(); - $self->js ->run('kivi.Order.update_sellprice', $::form->{item_id}, $item->sellprice_as_number); $self->js_redisplay_line_values; - $self->js_redisplay_amounts_and_taxes; $self->js->render(); } @@ -684,12 +647,10 @@ sub action_add_item { $self->order->add_items($item); - $self->recalc(); - $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, @@ -717,10 +678,9 @@ sub action_add_item { $item->discount(1) unless $assortment_item->charge; $self->order->add_items( $item ); - $self->recalc(); $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, @@ -743,7 +703,6 @@ sub action_add_item { $self->js->run('kivi.Order.row_table_scroll_down') if !$::form->{insert_before_item_id}; - $self->js_redisplay_amounts_and_taxes; $self->js->render(); } @@ -775,12 +734,10 @@ sub action_add_multi_items { } $self->order->add_items(@items); - $self->recalc(); - 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, @@ -803,18 +760,6 @@ sub action_add_multi_items { $self->js->run('kivi.Order.row_table_scroll_down') if !$::form->{insert_before_item_id}; - $self->js_redisplay_amounts_and_taxes; - $self->js->render(); -} - -# recalculate all linetotals, amounts and taxes and redisplay them -sub action_recalc_amounts_and_taxes { - my ($self) = @_; - - $self->recalc(); - - $self->js_redisplay_line_values; - $self->js_redisplay_amounts_and_taxes; $self->js->render(); } @@ -824,7 +769,6 @@ sub action_update_exchangerate { my $data = { is_standard => $self->order->currency_id == $::instance_conf->get_currency_id, currency_name => $self->order->currency->name, - exchangerate => $self->order->daily_exchangerate_as_null_number, }; $self->render(\SL::JSON::to_json($data), { type => 'json', process => 0 }); @@ -912,7 +856,6 @@ sub action_return_from_create_part { $item->{new_fake_id} = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000); } - $self->recalc(); $self->get_unalterable_data(); $self->pre_render(); @@ -923,7 +866,7 @@ 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}} ); @@ -937,8 +880,6 @@ sub action_return_from_create_part { sub action_load_second_rows { my ($self) = @_; - $self->recalc() if $self->order->is_sales; # for margin calculation - foreach my $item_id (@{ $::form->{item_ids} }) { my $idx = first_index { $_ eq $item_id } @{ $::form->{orderitem_ids} }; my $item = $self->order->items_sorted->[$idx]; @@ -994,9 +935,7 @@ sub action_update_row_from_master_data { } } - $self->recalc(); $self->js_redisplay_line_values; - $self->js_redisplay_amounts_and_taxes; $self->js->render(); } @@ -1014,7 +953,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) @@ -1046,41 +985,6 @@ sub js_redisplay_line_values { ->run('kivi.Order.redisplay_line_values', $is_sales, \@data); } -sub js_redisplay_amounts_and_taxes { - my ($self) = @_; - - if (scalar @{ $self->{taxes} }) { - $self->js->show('#taxincluded_row_id'); - } else { - $self->js->hide('#taxincluded_row_id'); - } - - if ($self->order->taxincluded) { - $self->js->hide('#subtotal_row_id'); - } else { - $self->js->show('#subtotal_row_id'); - } - - if ($self->order->is_sales) { - my $is_neg = $self->order->marge_total < 0; - $self->js - ->html('#marge_total_id', $::form->format_amount(\%::myconfig, $self->order->marge_total, 2)) - ->html('#marge_percent_id', $::form->format_amount(\%::myconfig, $self->order->marge_percent, 2)) - ->action_if( $is_neg, 'addClass', '#marge_total_id', 'plus0') - ->action_if( $is_neg, 'addClass', '#marge_percent_id', 'plus0') - ->action_if( $is_neg, 'addClass', '#marge_percent_sign_id', 'plus0') - ->action_if(!$is_neg, 'removeClass', '#marge_total_id', 'plus0') - ->action_if(!$is_neg, 'removeClass', '#marge_percent_id', 'plus0') - ->action_if(!$is_neg, 'removeClass', '#marge_percent_sign_id', 'plus0'); - } - - $self->js - ->html('#netamount_id', $::form->format_amount(\%::myconfig, $self->order->netamount, -2)) - ->html('#amount_id', $::form->format_amount(\%::myconfig, $self->order->amount, -2)) - ->remove('.tax_row') - ->insertBefore($self->build_tax_rows, '#amount_row_id'); -} - sub js_redisplay_cvpartnumbers { my ($self) = @_; @@ -1118,15 +1022,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}); @@ -1135,11 +1035,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 { @@ -1173,20 +1069,14 @@ 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} }; - - my $right = $right_for->{ $self->type }; - $right ||= 'DOES_NOT_EXIST'; - - $::auth->assert($right); + $::auth->assert($self->type_data->access || 'DOES_NOT_EXIST'); } # build the selection box for contacts @@ -1240,50 +1130,16 @@ sub build_shipto_inputs { # Needed, if customer/vendor changed. sub build_business_info_row { - $_[0]->p->render('order/tabs/_business_info_row', SELF => $_[0]); -} - -# build the rows for displaying taxes -# -# Called if amounts where recalculated and redisplayed. -sub build_tax_rows { - my ($self) = @_; - - my $rows_as_html; - foreach my $tax (sort { $a->{tax}->rate cmp $b->{tax}->rate } @{ $self->{taxes} }) { - $rows_as_html .= $self->p->render('order/tabs/_tax_row', TAX => $tax, TAXINCLUDED => $self->order->taxincluded); - } - return $rows_as_html; + $_[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. @@ -1305,10 +1161,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}) { @@ -1360,7 +1214,7 @@ 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 => []); $item->assign_attributes(%$attr); @@ -1380,7 +1234,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 @@ -1408,7 +1262,6 @@ sub new_item { $price_src = $price_source->best_price ? $price_source->best_price : $price_source->price_from_source(""); - $price_src->price($::form->round_amount($price_src->price / $record->exchangerate, 5)) if $record->exchangerate; $price_src->price(0) if !$price_source->best_price; } @@ -1488,25 +1341,6 @@ sub setup_custom_shipto_from_form { } } -# recalculate prices and taxes -# -# Using the PriceTaxCalculator. Store linetotals in the item objects. -sub recalc { - my ($self) = @_; - - my %pat = $self->order->calculate_prices_and_taxes(); - - $self->{taxes} = []; - foreach my $tax_id (keys %{ $pat{taxes_by_tax_id} }) { - my $netamount = sum0 map { $pat{amounts}->{$_}->{amount} } grep { $pat{amounts}->{$_}->{tax_id} == $tax_id } keys %{ $pat{amounts} }; - - push(@{ $self->{taxes} }, { amount => $pat{taxes_by_tax_id}->{$tax_id}, - netamount => $netamount, - tax => SL::DB::Tax->new(id => $tax_id)->load }); - } - pairwise { $a->{linetotal} = $b->{linetotal} } @{$self->order->items_sorted}, @{$pat{items}}; -} - # get data for saving, printing, ..., that is not changed in the form # # Only cvars for now. @@ -1563,14 +1397,14 @@ 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 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::Order->new(id => $converted_from_oe_id)->load; + my $src = SL::DB::DeliveryOrder->new(id => $converted_from_oe_id)->load; $src->update_attributes(closed => 1) if $src->type =~ /_quotation$/; $src->link_to_record($self->order); } @@ -1608,9 +1442,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 @@ -1624,7 +1458,6 @@ sub workflow_sales_or_request_for_quotation { $self->cv ($self->init_cv); $self->check_auth; - $self->recalc(); $self->get_unalterable_data(); $self->pre_render(); @@ -1634,7 +1467,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}} ); @@ -1651,21 +1484,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 @@ -1673,7 +1501,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 { @@ -1688,7 +1516,6 @@ sub workflow_sales_or_purchase_order { $self->cv ($self->init_cv); $self->check_auth; - $self->recalc(); $self->get_unalterable_data(); $self->pre_render(); @@ -1698,7 +1525,7 @@ 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}} ); @@ -1744,14 +1571,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, @@ -1763,9 +1583,11 @@ sub pre_render { } } @all_objects; } + $self->{template_args}{inout} = $self->type_data->properties('transfer'); + $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; } @@ -1773,22 +1595,20 @@ 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"); 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, + call => [ 'kivi.DeliveryOrder.save', 'save', $::instance_conf->get_order_warn_duplicate_parts, $::instance_conf->get_order_warn_no_deliverydate, ], ], action => [ t8('Save as new'), - call => [ 'kivi.Order.save', 'save_as_new', $::instance_conf->get_order_warn_duplicate_parts ], + 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, ], ], # end of combobox "Save" @@ -1799,39 +1619,40 @@ 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"), ], 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"), ], 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"), ], 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"), ], action => [ t8('Save and Delivery Order'), - call => [ 'kivi.Order.save', 'save_and_delivery_order', $::instance_conf->get_order_warn_duplicate_parts, + call => [ 'kivi.DeliveryOrder.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())) + only_if => $self->type_data->show_menu("save_and_delivery_order"), ], 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"), ], 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"), ], ], # end of combobox "Workflow" @@ -1842,20 +1663,20 @@ sub setup_edit_action_bar { ], action => [ t8('Save and preview PDF'), - call => [ 'kivi.Order.save', 'preview_pdf', $::instance_conf->get_order_warn_duplicate_parts, + call => [ 'kivi.DeliveryOrder.save', 'preview_pdf', $::instance_conf->get_order_warn_duplicate_parts, $::instance_conf->get_order_warn_no_deliverydate, ], ], action => [ t8('Save and print'), - call => [ 'kivi.Order.show_print_options', $::instance_conf->get_order_warn_duplicate_parts, + call => [ 'kivi.DeliveryOrder.show_print_options', $::instance_conf->get_order_warn_duplicate_parts, $::instance_conf->get_order_warn_no_deliverydate, ], ], 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, + call => [ 'kivi.DeliveryOrder.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, @@ -1870,10 +1691,10 @@ sub setup_edit_action_bar { action => [ t8('Delete'), - call => [ 'kivi.Order.delete_order' ], + 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, + only_if => $self->type_data->show_menu("delete"), ], combobox => [ @@ -1882,7 +1703,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), ], @@ -1994,23 +1815,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 { @@ -2052,28 +1857,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 { @@ -2086,12 +1871,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); } @@ -2099,7 +1879,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( @@ -2151,6 +1931,30 @@ sub store_pdf_to_webdav_and_filemanagement { return @errors; } +sub calculate_stock_in_out { + my ($self, $item) = @_; + + return "" if !$item->part || !$item->part->unit; + + my $in_out = $self->type_data->properties("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; +} + +sub init_type_data { + SL::Controller::DeliveryOrder::TypeData->new($_[0]); +} + +sub init_valid_types { + $_[0]->type_data->valid_types; +} + 1; __END__ @@ -2217,11 +2021,11 @@ and ajax. the controller -=item * C