X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FOrder.pm;h=5d3049267a621b75325addffe2a4c24b91f0f924;hb=598383b3b6b63428fcabc5fb6e5595ec59de28e3;hp=894f119ed95162d9d83ec62c400fba96294df929;hpb=d19171d1dec83cdf8b5256223495efde4d0dda8c;p=kivitendo-erp.git diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm index 894f119ed..5d3049267 100644 --- a/SL/Controller/Order.pm +++ b/SL/Controller/Order.pm @@ -10,7 +10,9 @@ use SL::SessionFile::Random; use SL::PriceSource; use SL::Webdav; use SL::File; +use SL::MIME; use SL::Util qw(trim); +use SL::YAML; use SL::DB::Order; use SL::DB::Default; use SL::DB::Unit; @@ -23,20 +25,23 @@ use SL::DB::RecordLink; use SL::Helper::CreatePDF qw(:all); use SL::Helper::PrintOptions; use SL::Helper::ShippedQty; +use SL::Helper::UserPreferences::PositionsScrollbar; +use SL::Helper::UserPreferences::UpdatePositions; use SL::Controller::Helper::GetModels; -use List::Util qw(first); +use List::Util qw(first sum0); use List::UtilsBy qw(sort_by uniq_by); use List::MoreUtils qw(any none pairwise first_index); use English qw(-no_match_vars); use File::Spec; use Cwd; +use Sort::Naturally; use Rose::Object::MakeMethods::Generic ( scalar => [ qw(item_ids_to_delete) ], - 'scalar --get_set_init' => [ qw(order valid_types type cv p multi_items_models all_price_factors) ], + 'scalar --get_set_init' => [ qw(order valid_types type cv p multi_items_models all_price_factors search_cvpartnumber show_update_button) ], ); @@ -44,10 +49,12 @@ use Rose::Object::MakeMethods::Generic __PACKAGE__->run_before('check_auth'); __PACKAGE__->run_before('recalc', - only => [ qw(save save_as_new save_and_delivery_order save_and_invoice print send_email) ]); + 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 print send_email) ]); + only => [ qw(save save_as_new save_and_delivery_order save_and_invoice save_and_ap_transaction + print send_email) ]); # # actions @@ -58,9 +65,11 @@ 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 : 1; + my $extra_days = $self->{type} eq 'sales_quotation' ? $::instance_conf->get_reqdate_interval : + $self->{type} eq 'sales_order' ? $::instance_conf->get_delivery_date_interval : 1; $self->order->reqdate(DateTime->today_local->next_workday(extra_days => $extra_days)) if !$self->order->reqdate; + $self->pre_render(); $self->render( 'order/form', @@ -99,6 +108,36 @@ sub action_edit { ); } +# edit a collective order (consisting of one or more existing orders) +sub action_edit_collective { + my ($self) = @_; + + # collect order ids + my @multi_ids = map { + $_ =~ m{^multi_id_(\d+)$} && $::form->{'multi_id_' . $1} && $::form->{'trans_id_' . $1} && $::form->{'trans_id_' . $1} + } grep { $_ =~ m{^multi_id_\d+$} } keys %$::form; + + # fall back to add if no ids are given + if (scalar @multi_ids == 0) { + $self->action_add(); + return; + } + + # 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->action_save_as_new(); + return; + } + + # make new order from given orders + my @multi_orders = map { SL::DB::Order->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->action_edit(); +} + # delete the order sub action_delete { my ($self) = @_; @@ -180,7 +219,8 @@ sub action_save_as_new { # Set new reqdate unless changed if ($order->reqdate == $saved_order->reqdate) { - my $extra_days = $self->type eq sales_quotation_type() ? $::instance_conf->get_reqdate_interval : 1; + my $extra_days = $self->{type} eq 'sales_quotation' ? $::instance_conf->get_reqdate_interval : + $self->{type} eq 'sales_order' ? $::instance_conf->get_delivery_date_interval : 1; $new_attrs{reqdate} = DateTime->today_local->next_workday(extra_days => $extra_days); } else { $new_attrs{reqdate} = $order->reqdate; @@ -202,11 +242,8 @@ sub action_save_as_new { # print the order # # This is called if "print" is pressed in the print dialog. -# If PDF creation was requested and succeeded, the pdf is stored in a session -# file and the filename is stored as session value with an unique key. A -# javascript function with this key is then called. This function calls the -# download action below (action_download_pdf), which offers the file for -# download. +# If PDF creation was requested and succeeded, the pdf is offered for download +# via send_file (which uses ajax in this case). sub action_print { my ($self) = @_; @@ -217,8 +254,7 @@ sub action_print { return $self->js->render(); } - $self->js->val('#id', $self->order->id) - ->val('#order_' . $self->nr_key(), $self->order->number); + $self->js_reset_order_and_item_ids_after_save; my $format = $::form->{print_options}->{format}; my $media = $::form->{print_options}->{media}; @@ -259,16 +295,13 @@ sub action_print { if ($media eq 'screen') { # screen/download - my $sfile = SL::SessionFile::Random->new(mode => "w"); - $sfile->fh->print($pdf); - $sfile->fh->close; - - my $key = join('_', Time::HiRes::gettimeofday(), int rand 1000000000000); - $::auth->set_session_value("Order::print-${key}" => $sfile->file_name); - - $self->js - ->run('kivi.Order.download_pdf', $pdf_filename, $key) - ->flash('info', t8('The PDF has been created')); + $self->js->flash('info', t8('The PDF has been created')); + $self->send_file( + \$pdf, + type => SL::MIME->mime_type_from_ext($pdf_filename), + name => $pdf_filename, + js_no_render => 1, + ); } elsif ($media eq 'printer') { # printer @@ -315,21 +348,6 @@ sub action_print { $self->js->render; } -# offer pdf for download -# -# It needs to get the key for the session value to get the pdf file. -sub action_download_pdf { - my ($self) = @_; - - my $key = $::form->{key}; - my $tmp_filename = $::auth->get_session_value("Order::print-${key}"); - return $self->send_file( - $tmp_filename, - type => 'application/pdf', - name => $::form->{pdf_filename}, - ); -} - # open the email dialog sub action_show_email_dialog { my ($self) = @_; @@ -352,7 +370,8 @@ sub action_show_email_dialog { $form->{$self->nr_key()} = $self->order->number; $form->{formname} = $self->type; $form->{type} = $self->type; - $form->{language} = 'de'; + $form->{language} = '_' . $self->order->language->template_code if $self->order->language; + $form->{language_id} = $self->order->language->id if $self->order->language; $form->{format} = 'pdf'; $email_form->{subject} = $form->generate_email_subject(); @@ -388,8 +407,7 @@ sub action_send_email { return $self->js->render(); } - $self->js->val('#id', $self->order->id) - ->val('#order_' . $self->nr_key(), $self->order->number); + $self->js_reset_order_and_item_ids_after_save; my $email_form = delete $::form->{email_form}; my %field_names = (to => 'email'); @@ -458,7 +476,7 @@ sub action_show_periodic_invoices_config_dialog { $config ||= SL::DB::Manager::PeriodicInvoicesConfig->find_by(oe_id => $::form->{id}) if $::form->{id}; $config ||= SL::DB::PeriodicInvoicesConfig->new(periodicity => 'm', order_value_periodicity => 'p', # = same as periodicity - start_date_as_date => $::form->{transdate} || $::form->current_date, + start_date_as_date => $::form->{transdate_as_date} || $::form->current_date, extend_automatically_by => 12, active => 1, email_subject => GenericTranslations->get( @@ -479,6 +497,7 @@ sub action_show_periodic_invoices_config_dialog { if ($::form->{customer_id}) { $::form->{ALL_CONTACTS} = SL::DB::Manager::Contact->get_all_sorted(where => [ cp_cv_id => $::form->{customer_id} ]); + $::form->{email_recipient_invoice_address} = SL::DB::Manager::Customer->find_by(id => $::form->{customer_id})->invoice_mail; } $self->render('oe/edit_periodic_invoices_config', { layout => 0 }, @@ -517,7 +536,7 @@ sub action_assign_periodic_invoices_config { email_body => $::form->{email_body}, }; - my $periodic_invoices_config = YAML::Dump($config); + my $periodic_invoices_config = SL::YAML::Dump($config); my $status = $self->get_periodic_invoices_status($config); @@ -612,6 +631,33 @@ sub action_purchase_order { $_[0]->workflow_sales_or_purchase_order(); } +# workflow from purchase order to ap transaction +sub action_save_and_ap_transaction { + my ($self) = @_; + + my $errors = $self->save(); + + if (scalar @{ $errors }) { + $self->js->flash('error', $_) foreach @{ $errors }; + 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); + + my @redirect_params = ( + controller => 'ap.pl', + action => 'add_from_purchase_order', + id => $self->order->id, + ); + + $self->redirect_to(@redirect_params); +} + # set form elements in respect to a changed customer or vendor # # This action is called on an change of the customer/vendor picker. @@ -643,13 +689,16 @@ sub action_customer_vendor_changed { ->replaceWith('#business_info_row', $self->build_business_info_row) ->val( '#order_taxzone_id', $self->order->taxzone_id) ->val( '#order_taxincluded', $self->order->taxincluded) + ->val( '#order_currency_id', $self->order->currency_id) ->val( '#order_payment_id', $self->order->payment_id) ->val( '#order_delivery_term_id', $self->order->delivery_term_id) ->val( '#order_intnotes', $self->order->intnotes) ->val( '#language_id', $self->order->$cv_method->language_id) - ->focus( '#order_' . $self->cv . '_id'); + ->focus( '#order_' . $self->cv . '_id') + ->run('kivi.Order.update_exchangerate'); $self->js_redisplay_amounts_and_taxes; + $self->js_redisplay_cvpartnumbers; $self->js->render(); } @@ -720,16 +769,22 @@ sub action_add_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', - ITEM => $item, - ID => $item_id, - TYPE => $self->type, - ALL_PRICE_FACTORS => $self->all_price_factors + ITEM => $item, + ID => $item_id, + SELF => $self, ); - $self->js - ->append('#row_table_id', $row_as_html); + if ($::form->{insert_before_item_id}) { + $self->js + ->before ('.row_entry:has(#item_' . $::form->{insert_before_item_id} . ')', $row_as_html); + } else { + $self->js + ->append('#row_table_id', $row_as_html); + } if ( $item->part->is_assortment ) { $form_attr->{qty_as_number} = 1 unless $form_attr->{qty_as_number}; @@ -746,25 +801,31 @@ 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', - ITEM => $item, - ID => $item_id, - TYPE => $self->type, - ALL_PRICE_FACTORS => $self->all_price_factors + ITEM => $item, + ID => $item_id, + SELF => $self, ); - $self->js - ->append('#row_table_id', $row_as_html); + if ($::form->{insert_before_item_id}) { + $self->js + ->before ('.row_entry:has(#item_' . $::form->{insert_before_item_id} . ')', $row_as_html); + } else { + $self->js + ->append('#row_table_id', $row_as_html); + } }; }; $self->js ->val('.add_item_input', '') ->run('kivi.Order.init_row_handlers') - ->run('kivi.Order.row_table_scroll_down') ->run('kivi.Order.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_redisplay_amounts_and_taxes; $self->js->render(); } @@ -827,24 +888,31 @@ sub action_add_multi_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', - ITEM => $item, - ID => $item_id, - TYPE => $self->type, - ALL_PRICE_FACTORS => $self->all_price_factors + ITEM => $item, + ID => $item_id, + SELF => $self, ); - $self->js->append('#row_table_id', $row_as_html); + if ($::form->{insert_before_item_id}) { + $self->js + ->before ('.row_entry:has(#item_' . $::form->{insert_before_item_id} . ')', $row_as_html); + } else { + $self->js + ->append('#row_table_id', $row_as_html); + } } $self->js ->run('kivi.Order.close_multi_items_dialog') ->run('kivi.Order.init_row_handlers') - ->run('kivi.Order.row_table_scroll_down') ->run('kivi.Order.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_redisplay_amounts_and_taxes; $self->js->render(); } @@ -860,24 +928,47 @@ sub action_recalc_amounts_and_taxes { $self->js->render(); } +sub action_update_exchangerate { + my ($self) = @_; + + 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 }); +} + # redisplay item rows if they are sorted by an attribute sub action_reorder_items { my ($self) = @_; my %sort_keys = ( - partnumber => sub { $_[0]->part->partnumber }, - description => sub { $_[0]->description }, - qty => sub { $_[0]->qty }, - sellprice => sub { $_[0]->sellprice }, - discount => sub { $_[0]->discount }, + partnumber => sub { $_[0]->part->partnumber }, + description => sub { $_[0]->description }, + qty => sub { $_[0]->qty }, + sellprice => sub { $_[0]->sellprice }, + discount => sub { $_[0]->discount }, + cvpartnumber => sub { $_[0]->{cvpartnumber} }, ); + $self->get_item_cvpartnumber($_) for @{$self->order->items_sorted}; + my $method = $sort_keys{$::form->{order_by}}; my @to_sort = map { { old_pos => $_->position, order_by => $method->($_) } } @{ $self->order->items_sorted }; if ($::form->{sort_dir}) { - @to_sort = sort { $a->{order_by} cmp $b->{order_by} } @to_sort; + if ( $::form->{order_by} =~ m/qty|sellprice|discount/ ){ + @to_sort = sort { $a->{order_by} <=> $b->{order_by} } @to_sort; + } else { + @to_sort = sort { $a->{order_by} cmp $b->{order_by} } @to_sort; + } } else { - @to_sort = sort { $b->{order_by} cmp $a->{order_by} } @to_sort; + if ( $::form->{order_by} =~ m/qty|sellprice|discount/ ){ + @to_sort = sort { $b->{order_by} <=> $a->{order_by} } @to_sort; + } else { + @to_sort = sort { $b->{order_by} cmp $a->{order_by} } @to_sort; + } } $self->js ->run('kivi.Order.redisplay_items', \@to_sort) @@ -931,6 +1022,53 @@ sub action_load_second_rows { $self->js->render(); } +# update description, notes and sellprice from master data +sub action_update_row_from_master_data { + my ($self) = @_; + + foreach my $item_id (@{ $::form->{item_ids} }) { + my $idx = first_index { $_ eq $item_id } @{ $::form->{orderitem_ids} }; + my $item = $self->order->items_sorted->[$idx]; + + $item->description($item->part->description); + $item->longdescription($item->part->notes); + + my $price_source = SL::PriceSource->new(record_item => $item, record => $self->order); + + my $price_src; + if ($item->part->is_assortment) { + # add assortment items with price 0, as the components carry the price + $price_src = $price_source->price_from_source(""); + $price_src->price(0); + } else { + $price_src = $price_source->best_price + ? $price_source->best_price + : $price_source->price_from_source(""); + $price_src->price(0) if !$price_source->best_price; + } + + $item->sellprice($price_src->price); + $item->active_price_source($price_src); + + $self->js + ->run('kivi.Order.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); + + if ($self->search_cvpartnumber) { + $self->get_item_cvpartnumber($item); + $self->js->html('.row_entry:has(#item_' . $item_id . ') [name = "cvpartnumber"]', $item->{cvpartnumber}); + } + } + + $self->recalc(); + $self->js_redisplay_line_values; + $self->js_redisplay_amounts_and_taxes; + + $self->js->render(); +} + sub js_load_second_row { my ($self, $item, $item_id, $do_parse) = @_; @@ -947,8 +1085,8 @@ sub js_load_second_row { my $row_as_html = $self->p->render('order/tabs/_second_row', ITEM => $item, TYPE => $self->type); $self->js - ->html('.row_entry:has(#item_' . $item_id . ') [name = "second_row"]', $row_as_html) - ->data('.row_entry:has(#item_' . $item_id . ') [name = "second_row"]', 'loaded', 1); + ->html('#second_row_' . $item_id, $row_as_html) + ->data('#second_row_' . $item_id, 'loaded', 1); } sub js_redisplay_line_values { @@ -1011,6 +1149,39 @@ sub js_redisplay_amounts_and_taxes { ->insertBefore($self->build_tax_rows, '#amount_row_id'); } +sub js_redisplay_cvpartnumbers { + my ($self) = @_; + + $self->get_item_cvpartnumber($_) for @{$self->order->items_sorted}; + + my @data = map {[$_->{cvpartnumber}]} @{ $self->order->items_sorted }; + + $self->js + ->run('kivi.Order.redisplay_cvpartnumbers', \@data); +} + +sub js_reset_order_and_item_ids_after_save { + my ($self) = @_; + + $self->js + ->val('#id', $self->order->id) + ->val('#converted_from_oe_id', '') + ->val('#order_' . $self->nr_key(), $self->order->number); + + my $idx = 0; + foreach my $form_item_id (@{ $::form->{orderitem_ids} }) { + next if !$self->order->items_sorted->[$idx]->id; + next if $form_item_id !~ m{^new}; + $self->js + ->val ('[name="orderitem_ids[+]"][value="' . $form_item_id . '"]', $self->order->items_sorted->[$idx]->id) + ->val ('#item_' . $form_item_id, $self->order->items_sorted->[$idx]->id) + ->attr('#item_' . $form_item_id, "id", 'item_' . $self->order->items_sorted->[$idx]->id); + } continue { + $idx++; + } + $self->js->val('[name="converted_from_orderitems_ids[+]"]', ''); +} + # # helpers # @@ -1039,6 +1210,23 @@ sub init_cv { return $cv; } +sub init_search_cvpartnumber { + my ($self) = @_; + + my $user_prefs = SL::Helper::UserPreferences::PartPickerSearch->new(); + my $search_cvpartnumber; + $search_cvpartnumber = !!$user_prefs->get_sales_search_customer_partnumber() if $self->cv eq 'customer'; + $search_cvpartnumber = !!$user_prefs->get_purchase_search_makemodel() if $self->cv eq 'vendor'; + + return $search_cvpartnumber; +} + +sub init_show_update_button { + my ($self) = @_; + + !!SL::Helper::UserPreferences::UpdatePositions->new()->get_show_update_button(); +} + sub init_p { SL::Presenter->get; } @@ -1174,9 +1362,10 @@ 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::Manager::Order->find_by(id => $::form->{id}) if $::form->{id}; - $order ||= SL::DB::Order->new(orderitems => [], - quotation => (any { $self->type eq $_ } (sales_quotation_type(), request_quotation_type()))); + $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()); my $cv_id_method = $self->cv . '_id'; if (!$::form->{id} && $::form->{$cv_id_method}) { @@ -1184,12 +1373,12 @@ sub make_order { setup_order_from_cv($order); } - my $form_orderitems = delete $::form->{order}->{orderitems}; - my $form_periodic_invoices_config = delete $::form->{order}->{periodic_invoices_config}; + my $form_orderitems = delete $::form->{order}->{orderitems}; + my $form_periodic_invoices_config = delete $::form->{order}->{periodic_invoices_config}; $order->assign_attributes(%{$::form->{order}}); - if (my $periodic_invoices_config_attrs = $form_periodic_invoices_config ? YAML::Load($form_periodic_invoices_config) : undef) { + if (my $periodic_invoices_config_attrs = $form_periodic_invoices_config ? SL::YAML::Load($form_periodic_invoices_config) : undef) { my $periodic_invoices_config = $order->periodic_invoices_config || $order->periodic_invoices_config(SL::DB::PeriodicInvoicesConfig->new); $periodic_invoices_config->assign_attributes(%$periodic_invoices_config_attrs); } @@ -1316,7 +1505,7 @@ sub new_item { sub setup_order_from_cv { my ($order) = @_; - $order->$_($order->customervendor->$_) for (qw(taxzone_id payment_id delivery_term_id)); + $order->$_($order->customervendor->$_) for (qw(taxzone_id payment_id delivery_term_id currency_id)); $order->intnotes($order->customervendor->notes); @@ -1335,21 +1524,17 @@ sub setup_order_from_cv { sub recalc { my ($self) = @_; - # bb: todo: currency later - $self->order->currency_id($::instance_conf->get_currency_id()); - my %pat = $self->order->calculate_prices_and_taxes(); + $self->{taxes} = []; - foreach my $tax_chart_id (keys %{ $pat{taxes} }) { - my $tax = SL::DB::Manager::Tax->find_by(chart_id => $tax_chart_id); + 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} }; - my @amount_keys = grep { $pat{amounts}->{$_}->{tax_id} == $tax->id } keys %{ $pat{amounts} }; - push(@{ $self->{taxes} }, { amount => $pat{taxes}->{$tax_chart_id}, - netamount => $pat{amounts}->{$amount_keys[0]}->{amount}, - tax => $tax }); + 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}, @{$pat{items}}; + pairwise { $a->{linetotal} = $b->{linetotal} } @{$self->order->items_sorted}, @{$pat{items}}; } # get data for saving, printing, ..., that is not changed in the form @@ -1400,17 +1585,17 @@ sub save { my $db = $self->order->db; $db->with_transaction(sub { - SL::DB::OrderItem->new(id => $_)->delete for @{$self->item_ids_to_delete}; + SL::DB::OrderItem->new(id => $_)->delete for @{$self->item_ids_to_delete || []}; $self->order->save(cascade => 1); # link records if ($::form->{converted_from_oe_id}) { - my $quo = SL::DB::Order->new(id => $::form->{converted_from_oe_id})->load; - # implement OE::_close_quotations_rfqs - this a 1 : 1 connection - # close only if workflow: quotation -> order. TODO test case - $quo->update_attributes(closed => 1) if $quo->type =~ /_quotation$/; - $quo->link_to_record($self->order); - + 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->link_to_record($self->order); + } if (scalar @{ $::form->{converted_from_orderitems_ids} || [] }) { my $idx = 0; foreach (@{ $self->order->items_sorted }) { @@ -1434,6 +1619,14 @@ sub save { sub workflow_sales_or_purchase_order { my ($self) = @_; + # always save + my $errors = $self->save(); + + if (scalar @{ $errors }) { + $self->js->flash('error', $_) foreach @{ $errors }; + 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() @@ -1475,26 +1668,29 @@ sub workflow_sales_or_purchase_order { sub pre_render { my ($self) = @_; - $self->{all_taxzones} = SL::DB::Manager::TaxZone->get_all_sorted(); - $self->{all_departments} = SL::DB::Manager::Department->get_all_sorted(); - $self->{all_employees} = SL::DB::Manager::Employee->get_all(where => [ or => [ id => $self->order->employee_id, - deleted => 0 ] ], - sort_by => 'name'); - $self->{all_salesmen} = SL::DB::Manager::Employee->get_all(where => [ or => [ id => $self->order->salesman_id, - deleted => 0 ] ], - sort_by => 'name'); - $self->{all_payment_terms} = SL::DB::Manager::PaymentTerm->get_all_sorted(where => [ or => [ id => $self->order->payment_id, - obsolete => 0 ] ]); - $self->{all_delivery_terms} = SL::DB::Manager::DeliveryTerm->get_all_sorted(); - $self->{current_employee_id} = SL::DB::Manager::Employee->current->id; - $self->{periodic_invoices_status} = $self->get_periodic_invoices_status($self->order->periodic_invoices_config); - $self->{order_probabilities} = [ map { { title => ($_ * 10) . '%', id => $_ * 10 } } (0..10) ]; + $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_employees} = SL::DB::Manager::Employee->get_all(where => [ or => [ id => $self->order->employee_id, + deleted => 0 ] ], + sort_by => 'name'); + $self->{all_salesmen} = SL::DB::Manager::Employee->get_all(where => [ or => [ id => $self->order->salesman_id, + deleted => 0 ] ], + sort_by => 'name'); + $self->{all_payment_terms} = SL::DB::Manager::PaymentTerm->get_all_sorted(where => [ or => [ id => $self->order->payment_id, + obsolete => 0 ] ]); + $self->{all_delivery_terms} = SL::DB::Manager::DeliveryTerm->get_all_sorted(); + $self->{current_employee_id} = SL::DB::Manager::Employee->current->id; + $self->{periodic_invoices_status} = $self->get_periodic_invoices_status($self->order->periodic_invoices_config); + $self->{order_probabilities} = [ map { { title => ($_ * 10) . '%', id => $_ * 10 } } (0..10) ]; + $self->{positions_scrollbar_height} = SL::Helper::UserPreferences::PositionsScrollbar->new()->get_height(); my $print_form = Form->new(''); - $print_form->{type} = $self->type; - $print_form->{printers} = SL::DB::Manager::Printer->get_all_sorted; - $print_form->{languages} = SL::DB::Manager::Language->get_all_sorted; - $self->{print_options} = SL::Helper::PrintOptions->get_print_options( + $print_form->{type} = $self->type; + $print_form->{printers} = SL::DB::Manager::Printer->get_all_sorted; + $print_form->{languages} = SL::DB::Manager::Language->get_all_sorted; + $print_form->{language_id} = $self->order->language_id; + $self->{print_options} = SL::Helper::PrintOptions->get_print_options( form => $print_form, options => {dialog_name_prefix => 'print_options.', show_headers => 1, @@ -1527,6 +1723,8 @@ sub pre_render { } } @all_objects; } + $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 edit_periodic_invoices_config calculate_qty); $self->setup_edit_action_bar; } @@ -1561,13 +1759,13 @@ sub setup_edit_action_bar { t8('Workflow'), ], action => [ - t8('Sales Order'), + t8('Save and Sales Order'), submit => [ '#order_form', { action => "Order/sales_order" } ], only_if => (any { $self->type eq $_ } (sales_quotation_type(), purchase_order_type())), disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef, ], action => [ - t8('Purchase Order'), + t8('Save and Purchase Order'), submit => [ '#order_form', { action => "Order/purchase_order" } ], only_if => (any { $self->type eq $_ } (sales_order_type(), request_quotation_type())), disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef, @@ -1585,6 +1783,12 @@ sub setup_edit_action_bar { call => [ 'kivi.Order.save', 'save_and_invoice', $::instance_conf->get_order_warn_duplicate_parts ], checks => [ 'kivi.Order.check_save_active_periodic_invoices' ], ], + 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())) + ], + ], # end of combobox "Workflow" combobox => [ @@ -1672,7 +1876,7 @@ sub generate_pdf { }, ); 1; - } || push @errors, ref($EVAL_ERROR) eq 'SL::X::FormError' ? $EVAL_ERROR->getMessage : $EVAL_ERROR; + } || push @errors, ref($EVAL_ERROR) eq 'SL::X::FormError' ? $EVAL_ERROR->error : $EVAL_ERROR; }); return @errors; @@ -1714,7 +1918,7 @@ sub make_periodic_invoices_config_from_yaml { my ($yaml_config) = @_; return if !$yaml_config; - my $attr = YAML::Load($yaml_config); + my $attr = SL::YAML::Load($yaml_config); return if 'HASH' ne ref $attr; return SL::DB::PeriodicInvoicesConfig->new(%$attr); } @@ -1756,6 +1960,21 @@ sub get_title_for { : ''; } +sub get_item_cvpartnumber { + my ($self, $item) = @_; + + return if !$self->search_cvpartnumber; + return if !$self->order->customervendor; + + if ($self->cv eq 'vendor') { + my @mms = grep { $_->make eq $self->order->customervendor->id } @{$item->part->makemodels}; + $item->{cvpartnumber} = $mms[0]->model if scalar @mms; + } elsif ($self->cv eq 'customer') { + my @cps = grep { $_->customer_id eq $self->order->customervendor->id } @{$item->part->customerprices}; + $item->{cvpartnumber} = $cps[0]->customer_partnumber if scalar @cps; + } +} + sub sales_order_type { 'sales_order'; } @@ -1795,9 +2014,8 @@ SL::Controller::Order - controller for orders This is a new form to enter orders, completely rewritten with the use of controller and java script techniques. -The aim is to provide the user a better expirience and a faster flow -of work. Also the code should be more readable, more reliable and -better to maintain. +The aim is to provide the user a better experience and a faster workflow. Also +the code should be more readable, more reliable and better to maintain. =head2 Key Features @@ -1828,7 +2046,7 @@ possible (by partnumber, description, qty, sellprice and discount for now). =item * No C is necessary. All entries and calculations are managed -with ajax-calls and the page does only reload on C. +with ajax-calls and the page only reloads on C. =item * @@ -1902,8 +2120,6 @@ java script functions =item * testing -=item * currency - =item * credit limit =item * more workflows (quotation, rfq) @@ -1968,10 +2184,6 @@ should be implemented. C does not use the currently inserted string for filtering. -=item * - -The language selected in print or email dialog is not saved when the order is saved. - =back =head1 To discuss / Nice to have