X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/a143bb853debae00c61b9666e8843cfafda6e3b7..d83928f0d622fb97ef0b00706f5edf055863f801:/SL/Controller/Order.pm diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm index a24d1d3b5..b1a90f353 100644 --- a/SL/Controller/Order.pm +++ b/SL/Controller/Order.pm @@ -4,11 +4,12 @@ use strict; use parent qw(SL::Controller::Base); use SL::Helper::Flash qw(flash_later); -use SL::Presenter; +use SL::Presenter::Tag qw(select_tag); use SL::Locale::String qw(t8); use SL::SessionFile::Random; use SL::PriceSource; use SL::Webdav; +use SL::File; use SL::DB::Order; use SL::DB::Default; @@ -23,9 +24,11 @@ use SL::Helper::PrintOptions; use SL::Controller::Helper::GetModels; use List::Util qw(first); +use List::UtilsBy qw(sort_by uniq_by); use List::MoreUtils qw(none pairwise first_index); use English qw(-no_match_vars); use File::Spec; +use Cwd; use Rose::Object::MakeMethods::Generic ( @@ -38,10 +41,10 @@ use Rose::Object::MakeMethods::Generic __PACKAGE__->run_before('_check_auth'); __PACKAGE__->run_before('_recalc', - only => [ qw(save save_and_delivery_order print create_pdf send_email) ]); + only => [ qw(save save_and_delivery_order save_and_invoice print create_pdf send_email) ]); __PACKAGE__->run_before('_get_unalterable_data', - only => [ qw(save save_and_delivery_order print create_pdf send_email) ]); + only => [ qw(save save_and_delivery_order save_and_invoice print create_pdf send_email) ]); # # actions @@ -151,6 +154,7 @@ sub action_print { my $language; $language = SL::DB::Language->new(id => $::form->{print_options}->{language_id})->load if $::form->{print_options}->{language_id}; + # create a form for generate_attachment_filename my $form = Form->new; $form->{ordnumber} = $self->order->ordnumber; $form->{type} = $self->type; @@ -209,7 +213,20 @@ sub action_print { $self->js->flash('error', t8('Storing PDF to webdav folder failed: #1', $@)); } } - + if ($self->order->ordnumber && $::instance_conf->get_doc_storage) { + eval { + SL::File->save(object_id => $self->order->id, + object_type => $self->type, + mime_type => 'application/pdf', + source => 'created', + file_type => 'document', + file_name => $pdf_filename, + file_contents => $pdf); + 1; + } or do { + $self->js->flash('error', t8('Storing PDF in storage backend failed: #1', $@)); + } + } $self->js->render; } @@ -239,10 +256,11 @@ sub action_show_email_dialog { ->render($self); } - $self->{email}->{to} = $self->order->contact->cp_email if $self->order->contact; - $self->{email}->{to} ||= $self->order->$cv_method->email; - $self->{email}->{cc} = $self->order->$cv_method->cc; - $self->{email}->{bcc} = join ', ', grep $_, $self->order->$cv_method->bcc, SL::DB::Default->get->global_bcc; + my $email_form; + $email_form->{to} = $self->order->contact->cp_email if $self->order->contact; + $email_form->{to} ||= $self->order->$cv_method->email; + $email_form->{cc} = $self->order->$cv_method->cc; + $email_form->{bcc} = join ', ', grep $_, $self->order->$cv_method->bcc, SL::DB::Default->get->global_bcc; # Todo: get addresses from shipto, if any my $form = Form->new; @@ -252,11 +270,19 @@ sub action_show_email_dialog { $form->{language} = 'de'; $form->{format} = 'pdf'; - $self->{email}->{subject} = $form->generate_email_subject(); - $self->{email}->{attachment_filename} = $form->generate_attachment_filename(); - $self->{email}->{message} = $form->create_email_signature(); + $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()'; + + my %files = $self->_get_files_for_email_dialog(); + my $dialog_html = $self->render('common/_send_email_dialog', { output => 0 }, + email_form => $email_form, + show_bcc => $::auth->assert('email_bcc', 'may fail'), + FILES => \%files, + is_customer => $self->cv eq 'customer', + ); - my $dialog_html = $self->render('order/tabs/_email_dialog', { output => 0 }); $self->js ->run('kivi.Order.show_email_dialog', $dialog_html) ->reinit_widgets @@ -269,38 +295,56 @@ sub action_show_email_dialog { sub action_send_email { my ($self) = @_; - my $mail = Mailer->new; - $mail->{from} = qq|"$::myconfig{name}" <$::myconfig{email}>|; - $mail->{$_} = $::form->{email}->{$_} for qw(to cc bcc subject message); + my $email_form = delete $::form->{email_form}; + my %field_names = (to => 'email'); - my $pdf; - my @errors = _create_pdf($self->order, \$pdf, {media => 'email'}); - if (scalar @errors) { - return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render($self); - } + $::form->{ $field_names{$_} // $_ } = $email_form->{$_} for keys %{ $email_form }; - $mail->{attachments} = [{ "content" => $pdf, - "name" => $::form->{email}->{attachment_filename} }]; + # for Form::cleanup which may be called in Form::send_email + $::form->{cwd} = getcwd(); + $::form->{tmpdir} = $::lx_office_conf{paths}->{userspath}; - if (my $err = $mail->send) { - return $self->js->flash('error', t8('Sending E-mail: ') . $err) - ->render($self); + $::form->{media} = 'email'; + + if (($::form->{attachment_policy} // '') eq 'normal') { + my $language; + $language = SL::DB::Language->new(id => $::form->{print_options}->{language_id})->load if $::form->{print_options}->{language_id}; + + my $pdf; + my @errors = _create_pdf($self->order, \$pdf, {media => $::form->{media}, + format => $::form->{print_options}->{format}, + formname => $::form->{print_options}->{formname}, + language => $language, + groupitems => $::form->{print_options}->{groupitems}}); + if (scalar @errors) { + return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render($self); + } + + my $sfile = SL::SessionFile::Random->new(mode => "w"); + $sfile->fh->print($pdf); + $sfile->fh->close; + + $::form->{tmpfile} = $sfile->file_name; + $::form->{tmpdir} = $sfile->get_path; # for Form::cleanup which may be called in Form::send_email } + $::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)') . ": " . $mail->{to} . "\n"; - $intnotes .= t8('Cc') . ": " . $mail->{cc} . "\n" if $mail->{cc}; - $intnotes .= t8('Bcc') . ": " . $mail->{bcc} . "\n" if $mail->{bcc}; - $intnotes .= t8('Subject') . ": " . $mail->{subject} . "\n\n"; - $intnotes .= t8('Message') . ": " . $mail->{message}; + $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->js ->val('#order_intnotes', $intnotes) ->run('kivi.Order.close_email_dialog') + ->flash('info', t8('The email has been sent.')) ->render($self); } @@ -326,6 +370,28 @@ sub action_save_and_delivery_order { $self->redirect_to(@redirect_params); } +# save the order and redirect to the frontend subroutine for a new +# invoice +sub action_save_and_invoice { + my ($self) = @_; + + my $errors = $self->_save(); + + if (scalar @{ $errors }) { + $self->js->flash('error', $_) foreach @{ $errors }; + return $self->js->render(); + } + flash_later('info', $::locale->text('The order has been saved')); + + my @redirect_params = ( + controller => 'oe.pl', + action => 'oe_invoice_from_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. @@ -352,6 +418,7 @@ sub action_customer_vendor_changed { $self->order->taxincluded(defined($self->order->$cv_method->taxincluded_checked) ? $self->order->$cv_method->taxincluded_checked : $::myconfig{taxincluded_checked}); + $self->js->val('#order_salesman_id', $self->order->$cv_method->salesman_id); } $self->order->payment_id($self->order->$cv_method->payment_id); @@ -387,7 +454,7 @@ sub action_unit_changed { $self->js ->run('kivi.Order.update_sellprice', $::form->{item_id}, $item->sellprice_as_number); - $self->_js_redisplay_linetotals; + $self->_js_redisplay_line_values; $self->_js_redisplay_amounts_and_taxes; $self->js->render(); } @@ -410,6 +477,7 @@ sub action_add_item { 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 ); @@ -435,6 +503,7 @@ sub action_add_item { 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 ); $self->js @@ -503,7 +572,7 @@ sub action_add_multi_items { # set discount to 100% if item isn't supposed to be charged, overwriting any customer discount $item->discount(1) unless $assortment_item->charge; - push @items, $assortment_item; + push @items, $item; } } } @@ -516,6 +585,7 @@ sub action_add_multi_items { 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 ); @@ -539,7 +609,7 @@ sub action_recalc_amounts_and_taxes { $self->_recalc(); - $self->_js_redisplay_linetotals; + $self->_js_redisplay_line_values; $self->_js_redisplay_amounts_and_taxes; $self->js->render(); } @@ -601,6 +671,8 @@ sub action_get_item_longdescription { 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]; @@ -608,6 +680,8 @@ 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->render(); } @@ -624,19 +698,36 @@ sub _js_load_second_row { $item->parse_custom_variable_values; } - my $row_as_html = $self->p->render('order/tabs/_second_row', ITEM => $item); + 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); } -sub _js_redisplay_linetotals { +sub _js_redisplay_line_values { my ($self) = @_; - my @data = map {$::form->format_amount(\%::myconfig, $_->{linetotal}, 2, 0)} @{ $self->order->items_sorted }; + my $is_sales = $self->order->is_sales; + + # sales orders with margins + my @data; + if ($is_sales) { + @data = map { + [ + $::form->format_amount(\%::myconfig, $_->{linetotal}, 2, 0), + $::form->format_amount(\%::myconfig, $_->{marge_total}, 2, 0), + $::form->format_amount(\%::myconfig, $_->{marge_percent}, 2, 0), + ]} @{ $self->order->items_sorted }; + } else { + @data = map { + [ + $::form->format_amount(\%::myconfig, $_->{linetotal}, 2, 0), + ]} @{ $self->order->items_sorted }; + } + $self->js - ->run('kivi.Order.redisplay_linetotals', \@data); + ->run('kivi.Order.redisplay_line_values', $is_sales, \@data); } sub _js_redisplay_amounts_and_taxes { @@ -736,12 +827,12 @@ sub _check_auth { sub build_contact_select { my ($self) = @_; - $self->p->select_tag('order.cp_id', [ $self->order->{$self->cv}->contacts ], - value_key => 'cp_id', - title_key => 'full_name_dep', - default => $self->order->cp_id, - with_empty => 1, - style => 'width: 300px', + select_tag('order.cp_id', [ $self->order->{$self->cv}->contacts ], + value_key => 'cp_id', + title_key => 'full_name_dep', + default => $self->order->cp_id, + with_empty => 1, + style => 'width: 300px', ); } @@ -751,12 +842,12 @@ sub build_contact_select { sub build_shipto_select { my ($self) = @_; - $self->p->select_tag('order.shipto_id', [ $self->order->{$self->cv}->shipto ], - value_key => 'shipto_id', - title_key => 'displayable_id', - default => $self->order->shipto_id, - with_empty => 1, - style => 'width: 300px', + select_tag('order.shipto_id', [ $self->order->{$self->cv}->shipto ], + value_key => 'shipto_id', + title_key => 'displayable_id', + default => $self->order->shipto_id, + with_empty => 1, + style => 'width: 300px', ); } @@ -863,16 +954,16 @@ sub _make_item { $item ||= SL::DB::OrderItem->new(custom_variables => []); $item->assign_attributes(%$attr); - $item->longdescription($item->part->notes) if $is_new && !defined $attr->{longdescription}; - # item fields that currently can't be set in in row but are needed: - $item->lastcost($item->part->lastcost) if $is_new; + $item->longdescription($item->part->notes) if $is_new && !defined $attr->{longdescription}; + $item->project_id($record->globalproject_id) if $is_new && !defined $attr->{project_id}; + $item->lastcost($item->part->lastcost) if $is_new && !defined $attr->{lastcost_as_number}; return $item; } # create a new item # -# This is used to add one (or more) items +# This is used to add one item sub _new_item { my ($record, $attr) = @_; @@ -919,8 +1010,9 @@ sub _new_item { $new_attr{discount} = $discount_src->discount; $new_attr{active_price_source} = $price_src; $new_attr{active_discount_source} = $discount_src; - - $new_attr{longdescription} = $part->notes if ! defined $attr->{longdescription}; + $new_attr{longdescription} = $part->notes if ! defined $attr->{longdescription}; + $new_attr{project_id} = $record->globalproject_id; + $new_attr{lastcost} = $part->lastcost; # 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 @@ -1025,7 +1117,9 @@ sub _pre_render { $self->{all_projects} = SL::DB::Manager::Project->get_all(where => [ or => [ id => $self->order->globalproject_id, active => 1 ] ], sort_by => 'projectnumber'); - $self->{all_payment_terms} = SL::DB::Manager::PaymentTerm->get_all_sorted(); + $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; @@ -1055,15 +1149,71 @@ sub _pre_render { type => $self->type, number => $self->order->ordnumber, ); - my $webdav_path = $webdav->webdav_path; my @all_objects = $webdav->get_all_objects; @{ $self->{template_args}->{WEBDAV} } = map { { name => $_->filename, type => t8('File'), - link => File::Spec->catdir($webdav_path, $_->filename), + link => File::Spec->catfile($_->full_filedescriptor), } } @all_objects; } - $::request->{layout}->use_javascript("${_}.js") for qw(kivi.SalesPurchase kivi.Order ckeditor/ckeditor ckeditor/adapters/jquery); + $::request->{layout}->use_javascript("${_}.js") for qw(kivi.SalesPurchase kivi.Order kivi.File ckeditor/ckeditor ckeditor/adapters/jquery); + $self->_setup_edit_action_bar; +} + +sub _setup_edit_action_bar { + my ($self, %params) = @_; + + my $deletion_allowed = (($self->cv eq 'customer') && $::instance_conf->get_sales_order_show_delete) + || (($self->cv eq 'vendor') && $::instance_conf->get_purchase_order_show_delete); + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + combobox => [ + action => [ + t8('Save'), + call => [ 'kivi.Order.save', $::instance_conf->get_order_warn_duplicate_parts ], + accesskey => 'enter', + ], + action => [ + t8('Save and Delivery Order'), + call => [ 'kivi.Order.save_and_delivery_order', $::instance_conf->get_order_warn_duplicate_parts ], + ], + action => [ + t8('Save and Invoice'), + call => [ 'kivi.Order.save_and_invoice', $::instance_conf->get_order_warn_duplicate_parts ], + ], + + ], # end of combobox "Save" + + combobox => [ + action => [ + t8('Export'), + ], + action => [ + t8('Print'), + call => [ 'kivi.Order.show_print_options' ], + ], + action => [ + t8('E-mail'), + call => [ 'kivi.Order.email' ], + ], + action => [ + t8('Download attachments of all parts'), + call => [ 'kivi.File.downloadOrderitemsFiles', $::form->{type}, $::form->{id} ], + disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef, + only_if => $::instance_conf->get_doc_storage, + ], + ], # end of combobox "Export" + + action => [ + t8('Delete'), + call => [ 'kivi.Order.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, + ], + ); + } } sub _create_pdf { @@ -1078,9 +1228,8 @@ sub _create_pdf { $print_form->{media} = $params->{media} || 'file'; $print_form->{groupitems} = $params->{groupitems}; $print_form->{media} = 'file' if $print_form->{media} eq 'screen'; - $print_form->{language} = $params->{language}->template_code if $print_form->{language}; - $print_form->{language_id} = $params->{language}->id if $print_form->{language}; + $order->language($params->{language}); $order->flatten_to_form($print_form, format_amounts => 1); # search for the template @@ -1117,6 +1266,38 @@ sub _create_pdf { return @errors; } +sub _get_files_for_email_dialog { + my ($self) = @_; + + my %files = map { ($_ => []) } qw(versions files vc_files part_files); + + return %files if !$::instance_conf->get_doc_storage; + + if ($self->order->id) { + $files{versions} = [ SL::File->get_all_versions(object_id => $self->order->id, object_type => $self->order->type, file_type => 'document') ]; + $files{files} = [ SL::File->get_all( object_id => $self->order->id, object_type => $self->order->type, file_type => 'attachment') ]; + $files{vc_files} = [ SL::File->get_all( object_id => $self->order->{$self->cv}->id, object_type => $self->cv, file_type => 'attachment') ]; + } + + my @parts = + uniq_by { $_->{id} } + map { + +{ id => $_->part->id, + partnumber => $_->part->partnumber } + } @{$self->order->items_sorted}; + + foreach my $part (@parts) { + my @pfiles = SL::File->get_all(object_id => $part->{id}, object_type => 'part'); + push @{ $files{part_files} }, map { +{ %{ $_ }, partnumber => $part->{partnumber} } } @pfiles; + } + + foreach my $key (keys %files) { + $files{$key} = [ sort_by { lc $_->{db_file}->{file_name} } @{ $files{$key} } ]; + } + + return %files; +} + sub _sales_order_type { 'sales_order'; } @@ -1234,10 +1415,6 @@ Results for the filter in the multi items dialog Dialog for selecting price and discount sources -=item * C