X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FOrder.pm;h=89d2af016942e505631b55378d28341d9736d854;hb=73f7989fcf23410ebd879d5150f6a13913ca2b90;hp=37ba87cfa13fce29353403741b005aac6abf0f75;hpb=844a541e0d8f59644540413f675e8f07cd154cf6;p=kivitendo-erp.git diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm index 37ba87cfa..89d2af016 100644 --- a/SL/Controller/Order.pm +++ b/SL/Controller/Order.pm @@ -4,6 +4,7 @@ use strict; use parent qw(SL::Controller::Base); use SL::Helper::Flash qw(flash_later); +use SL::HTML::Util; use SL::Presenter::Tag qw(select_tag hidden_tag div_tag); use SL::Locale::String qw(t8); use SL::SessionFile::Random; @@ -14,6 +15,7 @@ use SL::MIME; use SL::Util qw(trim); use SL::YAML; use SL::DB::AdditionalBillingAddress; +use SL::DB::AuthUser; use SL::DB::History; use SL::DB::Order; use SL::DB::Default; @@ -31,6 +33,7 @@ use SL::DB::Translation; use SL::Helper::CreatePDF qw(:all); use SL::Helper::PrintOptions; use SL::Helper::ShippedQty; +use SL::Helper::UserPreferences::DisplayPreferences; use SL::Helper::UserPreferences::PositionsScrollbar; use SL::Helper::UserPreferences::UpdatePositions; @@ -54,12 +57,15 @@ use Rose::Object::MakeMethods::Generic # safety __PACKAGE__->run_before('check_auth'); +__PACKAGE__->run_before('check_auth_for_edit', + except => [ qw(edit show_customer_vendor_details_dialog price_popup load_second_rows) ]); + __PACKAGE__->run_before('recalc', - only => [ qw(save save_as_new save_and_delivery_order save_and_invoice save_and_ap_transaction + only => [ qw(save save_as_new save_and_delivery_order save_and_invoice save_and_invoice_for_advance_payment save_and_final_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 + only => [ qw(save save_as_new save_and_delivery_order save_and_invoice save_and_invoice_for_advance_payment save_and_final_invoice save_and_ap_transaction print send_email) ]); # @@ -192,11 +198,19 @@ sub action_save { : ''; flash_later('info', $text); - my @redirect_params = ( - action => 'edit', - type => $self->type, - id => $self->order->id, - ); + my @redirect_params; + if ($::form->{back_to_caller}) { + @redirect_params = $::form->{callback} ? ($::form->{callback}) + : (controller => 'LoginScreen', action => 'user_login'); + + } else { + @redirect_params = ( + action => 'edit', + type => $self->type, + id => $self->order->id, + callback => $::form->{callback}, + ); + } $self->redirect_to(@redirect_params); } @@ -245,6 +259,10 @@ sub action_save_as_new { # Update employee $new_attrs{employee} = SL::DB::Manager::Employee->current; + # Warn on obsolete items + my @obsolete_positions = map { $_->position } grep { $_->part->obsolete } @{ $order->items_sorted }; + flash_later('warning', t8('This record containts obsolete items at position #1', join ', ', @obsolete_positions)) if @obsolete_positions; + # Create new record from current one $self->order(SL::DB::Order->new_from($order, destination_type => $order->type, attributes => \%new_attrs)); @@ -279,8 +297,8 @@ sub action_print { my $groupitems = $::form->{print_options}->{groupitems}; my $printer_id = $::form->{print_options}->{printer_id}; - # only pdf and opendocument by now - if (none { $format eq $_ } qw(pdf opendocument opendocument_pdf)) { + # only PDF, OpenDocument & HTML for now + if (none { $format eq $_ } qw(pdf opendocument opendocument_pdf html)) { return $self->js->flash('error', t8('Format \'#1\' is not supported yet/anymore.', $format))->render; } @@ -296,25 +314,26 @@ sub action_print { $form->{format} = $format; $form->{formname} = $formname; $form->{language} = '_' . $self->order->language->template_code if $self->order->language; - my $pdf_filename = $form->generate_attachment_filename(); - - my $pdf; - my @errors = generate_pdf($self->order, \$pdf, { format => $format, - formname => $formname, - language => $self->order->language, - printer_id => $printer_id, - groupitems => $groupitems }); + my $doc_filename = $form->generate_attachment_filename(); + + my $doc; + my @errors = $self->generate_doc(\$doc, { media => $media, + format => $format, + formname => $formname, + language => $self->order->language, + printer_id => $printer_id, + groupitems => $groupitems }); if (scalar @errors) { - return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render; + return $self->js->flash('error', t8('Generating the document failed: #1', $errors[0]))->render; } if ($media eq 'screen') { # screen/download - $self->js->flash('info', t8('The PDF has been created')); + $self->js->flash('info', t8('The document has been created.')); $self->send_file( - \$pdf, - type => SL::MIME->mime_type_from_ext($pdf_filename), - name => $pdf_filename, + \$doc, + type => SL::MIME->mime_type_from_ext($doc_filename), + name => $doc_filename, js_no_render => 1, ); @@ -323,13 +342,13 @@ sub action_print { my $printer_id = $::form->{print_options}->{printer_id}; SL::DB::Printer->new(id => $printer_id)->load->print_document( copies => $copies, - content => $pdf, + content => $doc, ); - $self->js->flash('info', t8('The PDF has been printed')); + $self->js->flash('info', t8('The document has been printed.')); } - my @warnings = store_pdf_to_webdav_and_filemanagement($self->order, $pdf, $pdf_filename); + my @warnings = $self->store_doc_to_webdav_and_filemanagement($doc, $doc_filename, $formname); if (scalar @warnings) { $self->js->flash('warning', $_) for @warnings; } @@ -366,10 +385,11 @@ sub action_preview_pdf { my $pdf_filename = $form->generate_attachment_filename(); my $pdf; - my @errors = generate_pdf($self->order, \$pdf, { format => $format, - formname => $formname, - language => $self->order->language, - }); + my @errors = $self->generate_doc(\$pdf, { media => $media, + format => $format, + formname => $formname, + language => $self->order->language, + }); if (scalar @errors) { return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render; } @@ -425,13 +445,22 @@ sub action_save_and_show_email_dialog { $email_form->{js_send_function} = 'kivi.Order.send_email()'; my %files = $self->get_files_for_email_dialog(); - $self->{all_employees} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]); + + my @employees_with_email = grep { + my $user = SL::DB::Manager::AuthUser->find_by(login => $_->login); + $user && !!trim($user->get_config_value('email')); + } @{ SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]) }; + + + my $all_partner_email_addresses = $self->order->customervendor->get_all_email_addresses(); + 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', - ALL_EMPLOYEES => $self->{all_employees}, + email_form => $email_form, + show_bcc => $::auth->assert('email_bcc', 'may fail'), + FILES => \%files, + is_customer => $self->cv eq 'customer', + ALL_EMPLOYEES => \@employees_with_email, + ALL_PARTNER_EMAIL_ADDRESSES => $all_partner_email_addresses, ); $self->js @@ -457,6 +486,12 @@ sub action_send_email { $self->js_reset_order_and_item_ids_after_save; my $email_form = delete $::form->{email_form}; + + if ($email_form->{additional_to}) { + $email_form->{to} = join ', ', grep { $_ } $email_form->{to}, @{$email_form->{additional_to}}; + delete $email_form->{additional_to}; + } + my %field_names = (to => 'email'); $::form->{ $field_names{$_} // $_ } = $email_form->{$_} for keys %{ $email_form }; @@ -468,25 +503,36 @@ sub action_send_email { $::form->{$_} = $::form->{print_options}->{$_} for keys %{ $::form->{print_options} }; $::form->{media} = 'email'; - if (($::form->{attachment_policy} // '') !~ m{^(?:old_file|no_file)$}) { - my $pdf; - my @errors = generate_pdf($self->order, \$pdf, {media => $::form->{media}, - format => $::form->{print_options}->{format}, - formname => $::form->{print_options}->{formname}, - language => $self->order->language, - printer_id => $::form->{print_options}->{printer_id}, - groupitems => $::form->{print_options}->{groupitems}}); + $::form->{attachment_policy} //= ''; + + # Is an old file version available? + my $attfile; + if ($::form->{attachment_policy} eq 'old_file') { + $attfile = SL::File->get_all(object_id => $self->order->id, + object_type => $self->type, + file_type => 'document', + print_variant => $::form->{formname}); + } + + if ($::form->{attachment_policy} ne 'no_file' && !($::form->{attachment_policy} eq 'old_file' && $attfile)) { + my $doc; + my @errors = $self->generate_doc(\$doc, {media => $::form->{media}, + format => $::form->{print_options}->{format}, + formname => $::form->{print_options}->{formname}, + language => $self->order->language, + printer_id => $::form->{print_options}->{printer_id}, + groupitems => $::form->{print_options}->{groupitems}}); if (scalar @errors) { - return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render($self); + return $self->js->flash('error', t8('Generating the document failed: #1', $errors[0]))->render($self); } - my @warnings = store_pdf_to_webdav_and_filemanagement($self->order, $pdf, $::form->{attachment_filename}); + my @warnings = $self->store_doc_to_webdav_and_filemanagement($doc, $::form->{attachment_filename}, $::form->{formname}); if (scalar @warnings) { flash_later('warning', $_) for @warnings; } my $sfile = SL::SessionFile::Random->new(mode => "w"); - $sfile->fh->print($pdf); + $sfile->fh->print($doc); $sfile->fh->close; $::form->{tmpfile} = $sfile->file_name; @@ -494,20 +540,22 @@ sub action_send_email { } $::form->{id} = $self->order->id; # this is used in SL::Mailer to create a linked record to the mail - $::form->send_email(\%::myconfig, 'pdf'); + $::form->send_email(\%::myconfig, $::form->{print_options}->{format}); - # internal notes - my $intnotes = $self->order->intnotes; - $intnotes .= "\n\n" if $self->order->intnotes; - $intnotes .= t8('[email]') . "\n"; - $intnotes .= t8('Date') . ": " . $::locale->format_date_object(DateTime->now_local, precision => 'seconds') . "\n"; - $intnotes .= t8('To (email)') . ": " . $::form->{email} . "\n"; - $intnotes .= t8('Cc') . ": " . $::form->{cc} . "\n" if $::form->{cc}; - $intnotes .= t8('Bcc') . ": " . $::form->{bcc} . "\n" if $::form->{bcc}; - $intnotes .= t8('Subject') . ": " . $::form->{subject} . "\n\n"; - $intnotes .= t8('Message') . ": " . $::form->{message}; + # internal notes unless no email journal + unless ($::instance_conf->get_email_journal) { + my $intnotes = $self->order->intnotes; + $intnotes .= "\n\n" if $self->order->intnotes; + $intnotes .= t8('[email]') . "\n"; + $intnotes .= t8('Date') . ": " . $::locale->format_date_object(DateTime->now_local, precision => 'seconds') . "\n"; + $intnotes .= t8('To (email)') . ": " . $::form->{email} . "\n"; + $intnotes .= t8('Cc') . ": " . $::form->{cc} . "\n" if $::form->{cc}; + $intnotes .= t8('Bcc') . ": " . $::form->{bcc} . "\n" if $::form->{bcc}; + $intnotes .= t8('Subject') . ": " . $::form->{subject} . "\n\n"; + $intnotes .= t8('Message') . ": " . SL::HTML::Util->strip($::form->{message}); - $self->order->update_attributes(intnotes => $intnotes); + $self->order->update_attributes(intnotes => $intnotes); + } $self->save_history('MAILED'); @@ -540,9 +588,32 @@ sub action_show_periodic_invoices_config_dialog { language_id => $::form->{language_id}, translation_type =>"preset_text_periodic_invoices_email_subject"), email_body => GenericTranslations->get( + language_id => $::form->{language_id}, + translation_type => "salutation_general") + . GenericTranslations->get( + language_id => $::form->{language_id}, + translation_type => "salutation_punctuation_mark") . "\n\n" + . GenericTranslations->get( language_id => $::form->{language_id}, translation_type =>"preset_text_periodic_invoices_email_body"), ); + # for older configs, replace email preset text if not yet set. + $config->email_subject(GenericTranslations->get( + language_id => $::form->{language_id}, + translation_type =>"preset_text_periodic_invoices_email_subject") + ) unless $config->email_subject; + + $config->email_body(GenericTranslations->get( + language_id => $::form->{language_id}, + translation_type => "salutation_general") + . GenericTranslations->get( + language_id => $::form->{language_id}, + translation_type => "salutation_punctuation_mark") . "\n\n" + . GenericTranslations->get( + language_id => $::form->{language_id}, + translation_type =>"preset_text_periodic_invoices_email_body") + ) unless $config->email_body; + $config->periodicity('m') if none { $_ eq $config->periodicity } @SL::DB::PeriodicInvoicesConfig::PERIODICITIES; $config->order_value_periodicity('p') if none { $_ eq $config->order_value_periodicity } ('p', @SL::DB::PeriodicInvoicesConfig::ORDER_VALUE_PERIODICITIES); @@ -636,6 +707,16 @@ sub action_save_and_delivery_order { ); } +sub action_save_and_supplier_delivery_order { + my ($self) = @_; + + $self->save_and_redirect_to( + controller => 'controller.pl', + action => 'DeliveryOrder/add_from_order', + type => 'supplier_delivery_order', + ); +} + # save the order and redirect to the frontend subroutine for a new # invoice sub action_save_and_invoice { @@ -647,6 +728,26 @@ sub action_save_and_invoice { ); } +sub action_save_and_invoice_for_advance_payment { + my ($self) = @_; + + $self->save_and_redirect_to( + controller => 'oe.pl', + action => 'oe_invoice_from_order', + new_invoice_type => 'invoice_for_advance_payment', + ); +} + +sub action_save_and_final_invoice { + my ($self) = @_; + + $self->save_and_redirect_to( + controller => 'oe.pl', + action => 'oe_invoice_from_order', + new_invoice_type => 'final_invoice', + ); +} + # workflow from sales order to sales quotation sub action_sales_quotation { $_[0]->workflow_sales_or_request_for_quotation(); @@ -749,8 +850,10 @@ sub action_show_customer_vendor_details_dialog { $details{payment_terms} = $cv->payment->description if $cv->payment; $details{pricegroup} = $cv->pricegroup->pricegroup if $is_customer && $cv->pricegroup; - foreach my $entry (@{ $cv->additional_billing_addresses }) { - push @{ $details{ADDITIONAL_BILLING_ADDRESSES} }, { map { $_ => $entry->$_ } @{$entry->meta->columns} }; + if ($is_customer) { + foreach my $entry (@{ $cv->additional_billing_addresses }) { + push @{ $details{ADDITIONAL_BILLING_ADDRESSES} }, { map { $_ => $entry->$_ } @{$entry->meta->columns} }; + } } foreach my $entry (@{ $cv->shipto }) { push @{ $details{SHIPTO} }, { map { $_ => $entry->$_ } @{$entry->meta->columns} }; @@ -784,6 +887,34 @@ sub action_unit_changed { $self->js->render(); } +# update item input row when a part ist picked +sub action_update_item_input_row { + my ($self) = @_; + + delete $::form->{add_item}->{$_} for qw(create_part_type sellprice_as_number discount_as_percent); + + my $form_attr = $::form->{add_item}; + + return unless $form_attr->{parts_id}; + + my $record = $self->order; + my $item = SL::DB::OrderItem->new(%$form_attr); + $item->unit($item->part->unit); + + my ($price_src, $discount_src) = get_best_price_and_discount_source($record, $item, 0); + + $self->js + ->val ('#add_item_unit', $item->unit) + ->val ('#add_item_description', $item->part->description) + ->val ('#add_item_sellprice_as_number', '') + ->attr ('#add_item_sellprice_as_number', 'placeholder', $price_src->price_as_number) + ->attr ('#add_item_sellprice_as_number', 'title', $price_src->source_description) + ->val ('#add_item_discount_as_percent', '') + ->attr ('#add_item_discount_as_percent', 'placeholder', $discount_src->discount_as_percent) + ->attr ('#add_item_discount_as_percent', 'title', $discount_src->source_description) + ->render; +} + # add an item row for a new item entered in the input row sub action_add_item { my ($self) = @_; @@ -851,6 +982,8 @@ sub action_add_item { $self->js ->val('.add_item_input', '') + ->attr('.add_item_input', 'placeholder', '') + ->attr('.add_item_input', 'title', '') ->run('kivi.Order.init_row_handlers') ->run('kivi.Order.renumber_positions') ->focus('#add_item_parts_id_name'); @@ -1004,11 +1137,11 @@ sub action_create_part { flash_later('info', t8('You are adding a new part while you are editing another document. You will be redirected to your document when saving the new part or aborting this form.')); my @redirect_params = ( - controller => 'Part', - action => 'add', - part_type => $::form->{add_item}->{create_part_type}, - callback => $callback, - show_abort => 1, + controller => 'Part', + action => 'add', + part_type => $::form->{add_item}->{create_part_type}, + callback => $callback, + inline_create => 1, ); $self->redirect_to(@redirect_params); @@ -1077,27 +1210,18 @@ sub action_update_row_from_master_data { $item->description($texts->{description}); $item->longdescription($texts->{longdescription}); - 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($::form->round_amount($price_src->price / $self->order->exchangerate, 5)) if $self->order->exchangerate; - $price_src->price(0) if !$price_source->best_price; - } - + my ($price_src, $discount_src) = get_best_price_and_discount_source($self->order, $item, 1); $item->sellprice($price_src->price); $item->active_price_source($price_src); + $item->discount($discount_src->discount); + $item->active_discount_source($discount_src); + + my $price_editable = $self->order->is_sales ? $::auth->assert('sales_edit_prices', 1) : $::auth->assert('purchase_edit_prices', 1); $self->js - ->run('kivi.Order.update_sellprice', $item_id, $item->sellprice_as_number) + ->run('kivi.Order.set_price_and_source_text', $item_id, $price_src ->source, $price_src ->source_description, $item->sellprice_as_number, $price_editable) + ->run('kivi.Order.set_discount_and_source_text', $item_id, $discount_src->source, $discount_src->source_description, $item->discount_as_percent, $price_editable) ->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); @@ -1295,6 +1419,17 @@ sub init_part_picker_classification_ids { sub check_auth { my ($self) = @_; + my $right_for = { map { $_ => $_.'_edit' . ' | ' . $_.'_view' } @{$self->valid_types} }; + + my $right = $right_for->{ $self->type }; + $right ||= 'DOES_NOT_EXIST'; + + $::auth->assert($right); +} + +sub check_auth_for_edit { + my ($self) = @_; + my $right_for = { map { $_ => $_.'_edit' } @{$self->valid_types} }; my $right = $right_for->{ $self->type }; @@ -1324,6 +1459,8 @@ sub build_contact_select { sub build_billing_address_select { my ($self) = @_; + return '' if $self->cv ne 'customer'; + select_tag('order.billing_address_id', [ {displayable_id => '', id => ''}, $self->order->{$self->cv}->additional_billing_addresses ], value_key => 'id', @@ -1526,58 +1663,29 @@ sub new_item { } $item->assign_attributes(%$attr); + $item->qty(1.0) if !$item->qty; + $item->unit($item->part->unit) if !$item->unit; - my $part = SL::DB::Part->new(id => $attr->{parts_id})->load; - my $price_source = SL::PriceSource->new(record_item => $item, record => $record); - - $item->unit($part->unit) if !$item->unit; - - my $price_src; - if ( $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); - } elsif (defined $item->sellprice) { - $price_src = $price_source->price_from_source(""); - $price_src->price($item->sellprice); - } else { - $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; - } - - my $discount_src; - if (defined $item->discount) { - $discount_src = $price_source->discount_from_source(""); - $discount_src->discount($item->discount); - } else { - $discount_src = $price_source->best_discount - ? $price_source->best_discount - : $price_source->discount_from_source(""); - $discount_src->discount(0) if !$price_source->best_discount; - } + my ($price_src, $discount_src) = get_best_price_and_discount_source($record, $item, 0); my %new_attr; - $new_attr{part} = $part; - $new_attr{description} = $part->description if ! $item->description; - $new_attr{qty} = 1.0 if ! $item->qty; - $new_attr{price_factor_id} = $part->price_factor_id if ! $item->price_factor_id; + $new_attr{description} = $item->part->description if ! $item->description; + $new_attr{qty} = 1.0 if ! $item->qty; + $new_attr{price_factor_id} = $item->part->price_factor_id if ! $item->price_factor_id; $new_attr{sellprice} = $price_src->price; $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} = $item->part->notes if ! defined $attr->{longdescription}; $new_attr{project_id} = $record->globalproject_id; - $new_attr{lastcost} = $record->is_sales ? $part->lastcost : 0; + $new_attr{lastcost} = $record->is_sales ? $item->part->lastcost : 0; # 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. $new_attr{custom_variables} = []; - my $texts = get_part_texts($part, $record->language_id, description => $new_attr{description}, longdescription => $new_attr{longdescription}); + my $texts = get_part_texts($item->part, $record->language_id, description => $new_attr{description}, longdescription => $new_attr{longdescription}); $item->assign_attributes(%new_attr, %{ $texts }); @@ -1587,7 +1695,7 @@ sub new_item { sub setup_order_from_cv { my ($order) = @_; - $order->$_($order->customervendor->$_) for (qw(taxzone_id payment_id delivery_term_id currency_id)); + $order->$_($order->customervendor->$_) for (qw(taxzone_id payment_id delivery_term_id currency_id language_id)); $order->intnotes($order->customervendor->notes); @@ -1754,7 +1862,10 @@ sub workflow_sales_or_request_for_quotation { my $destination_type = $::form->{type} eq sales_order_type() ? sales_quotation_type() : request_quotation_type(); $self->order(SL::DB::Order->new_from($self->order, destination_type => $destination_type)); - $self->{converted_from_oe_id} = delete $::form->{id}; + delete $::form->{id}; + + # no linked records from order to quotations + delete $::form->{$_} for qw(converted_from_oe_id converted_from_orderitems_ids); # set item ids to new fake id, to identify them as new items foreach my $item (@{$self->order->items_sorted}) { @@ -1854,7 +1965,7 @@ sub pre_render { $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_languages} = SL::DB::Manager::Language->get_all_sorted(); + $self->{all_languages} = SL::DB::Manager::Language->get_all_sorted( query => [ or => [ obsolete => 0, id => $self->order->language_id ] ] ); $self->{all_employees} = SL::DB::Manager::Employee->get_all(where => [ or => [ id => $self->order->employee_id, deleted => 0 ] ], sort_by => 'name'); @@ -1879,7 +1990,7 @@ sub pre_render { no_queue => 1, no_postscript => 1, no_opendocument => 0, - no_html => 1}, + no_html => 0}, ); foreach my $item (@{$self->order->orderitems}) { @@ -1911,11 +2022,12 @@ sub pre_render { && $::instance_conf->get_transport_cost_reminder_article_number_id ) { $self->{template_args}->{transport_cost_reminder_article} = SL::DB::Part->new(id => $::instance_conf->get_transport_cost_reminder_article_number_id)->load; } + $self->{template_args}->{longdescription_dialog_size_percentage} = SL::Helper::UserPreferences::DisplayPreferences->new()->get_longdescription_dialog_size_percentage(); $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 kivi.Validator follow_up show_history); + $::request->{layout}->use_javascript("${_}.js") for qw(kivi.Validator kivi.SalesPurchase kivi.Order kivi.File ckeditor/ckeditor ckeditor/adapters/jquery + edit_periodic_invoices_config calculate_qty follow_up show_history); $self->setup_edit_action_bar; } @@ -1929,6 +2041,23 @@ sub setup_edit_action_bar { my @req_trans_cost_art = qw(kivi.Order.check_transport_cost_article_presence) x!!$::instance_conf->get_transport_cost_reminder_article_number_id; my @req_cusordnumber = qw(kivi.Order.check_cusordnumber_presence) x($self->type eq sales_order_type() && $::instance_conf->get_order_warn_no_cusordnumber); + my $has_invoice_for_advance_payment; + if ($self->order->id && $self->type eq sales_order_type()) { + my $lr = $self->order->linked_records(direction => 'to', to => ['Invoice']); + $has_invoice_for_advance_payment = any {'SL::DB::Invoice' eq ref $_ && "invoice_for_advance_payment" eq $_->type} @$lr; + } + + my $has_final_invoice; + if ($self->order->id && $self->type eq sales_order_type()) { + my $lr = $self->order->linked_records(direction => 'to', to => ['Invoice']); + $has_final_invoice = any {'SL::DB::Invoice' eq ref $_ && "final_invoice" eq $_->type} @$lr; + } + + my $right_for = { map { $_ => $_.'_edit' } @{$self->valid_types} }; + my $right = $right_for->{ $self->type }; + $right ||= 'DOES_NOT_EXIST'; + my $may_edit_create = $::auth->assert($right, 'may fail'); + for my $bar ($::request->layout->get('actionbar')) { $bar->add( combobox => [ @@ -1940,6 +2069,18 @@ sub setup_edit_action_bar { checks => [ 'kivi.Order.check_save_active_periodic_invoices', ['kivi.validate_form','#order_form'], @req_trans_cost_art, @req_cusordnumber, ], + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, + ], + action => [ + t8('Save and Close'), + call => [ 'kivi.Order.save', 'save', $::instance_conf->get_order_warn_duplicate_parts, + $::instance_conf->get_order_warn_no_deliverydate, + 1 + ], + checks => [ 'kivi.Order.check_save_active_periodic_invoices', ['kivi.validate_form','#order_form'], + @req_trans_cost_art, @req_cusordnumber, + ], + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], action => [ t8('Save as new'), @@ -1947,7 +2088,9 @@ sub setup_edit_action_bar { checks => [ 'kivi.Order.check_save_active_periodic_invoices', @req_trans_cost_art, @req_cusordnumber, ], - disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef, + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') + : !$self->order->id ? t8('This object has not been saved yet.') + : undef, ], ], # end of combobox "Save" @@ -1960,23 +2103,27 @@ sub setup_edit_action_bar { submit => [ '#order_form', { action => "Order/sales_quotation" } ], checks => [ @req_trans_cost_art, @req_cusordnumber ], only_if => (any { $self->type eq $_ } (sales_order_type())), + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], action => [ t8('Save and RFQ'), submit => [ '#order_form', { action => "Order/request_for_quotation" } ], only_if => (any { $self->type eq $_ } (purchase_order_type())), + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], action => [ t8('Save and Sales Order'), submit => [ '#order_form', { action => "Order/sales_order" } ], checks => [ @req_trans_cost_art ], only_if => (any { $self->type eq $_ } (sales_quotation_type(), purchase_order_type())), + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], action => [ t8('Save and Purchase Order'), call => [ 'kivi.Order.purchase_order_check_for_direct_delivery' ], checks => [ @req_trans_cost_art, @req_cusordnumber ], only_if => (any { $self->type eq $_ } (sales_order_type(), request_quotation_type())), + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], action => [ t8('Save and Delivery Order'), @@ -1986,7 +2133,19 @@ sub setup_edit_action_bar { checks => [ 'kivi.Order.check_save_active_periodic_invoices', @req_trans_cost_art, @req_cusordnumber, ], - only_if => (any { $self->type eq $_ } (sales_order_type(), purchase_order_type())) + only_if => (any { $self->type eq $_ } (sales_order_type(), purchase_order_type())), + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, + ], + action => [ + t8('Save and Supplier Delivery Order'), + call => [ 'kivi.Order.save', 'save_and_supplier_delivery_order', $::instance_conf->get_order_warn_duplicate_parts, + $::instance_conf->get_order_warn_no_deliverydate, + ], + checks => [ 'kivi.Order.check_save_active_periodic_invoices', + @req_trans_cost_art, @req_cusordnumber, + ], + only_if => (any { $self->type eq $_ } (purchase_order_type())), + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], action => [ t8('Save and Invoice'), @@ -1994,11 +2153,35 @@ sub setup_edit_action_bar { checks => [ 'kivi.Order.check_save_active_periodic_invoices', @req_trans_cost_art, @req_cusordnumber, ], + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, + ], + action => [ + ($has_invoice_for_advance_payment ? t8('Save and Further Invoice for Advance Payment') : t8('Save and Invoice for Advance Payment')), + call => [ 'kivi.Order.save', 'save_and_invoice_for_advance_payment', $::instance_conf->get_order_warn_duplicate_parts ], + checks => [ 'kivi.Order.check_save_active_periodic_invoices', + @req_trans_cost_art, @req_cusordnumber, + ], + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') + : $has_final_invoice ? t8('This order has already a final invoice.') + : undef, + only_if => (any { $self->type eq $_ } (sales_order_type())), + ], + action => [ + t8('Save and Final Invoice'), + call => [ 'kivi.Order.save', 'save_and_final_invoice', $::instance_conf->get_order_warn_duplicate_parts ], + checks => [ 'kivi.Order.check_save_active_periodic_invoices', + @req_trans_cost_art, @req_cusordnumber, + ], + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') + : $has_final_invoice ? t8('This order has already a final invoice.') + : undef, + only_if => (any { $self->type eq $_ } (sales_order_type())) && $has_invoice_for_advance_payment, ], 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())) + only_if => (any { $self->type eq $_ } (purchase_order_type())), + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], ], # end of combobox "Workflow" @@ -2009,25 +2192,29 @@ sub setup_edit_action_bar { ], action => [ t8('Save and preview PDF'), - call => [ 'kivi.Order.save', 'preview_pdf', $::instance_conf->get_order_warn_duplicate_parts, - $::instance_conf->get_order_warn_no_deliverydate, - ], - checks => [ @req_trans_cost_art, @req_cusordnumber ], + call => [ 'kivi.Order.save', 'preview_pdf', $::instance_conf->get_order_warn_duplicate_parts, + $::instance_conf->get_order_warn_no_deliverydate, + ], + checks => [ @req_trans_cost_art, @req_cusordnumber ], + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], action => [ t8('Save and print'), - call => [ 'kivi.Order.show_print_options', $::instance_conf->get_order_warn_duplicate_parts, - $::instance_conf->get_order_warn_no_deliverydate, - ], - checks => [ @req_trans_cost_art, @req_cusordnumber ], + call => [ 'kivi.Order.show_print_options', $::instance_conf->get_order_warn_duplicate_parts, + $::instance_conf->get_order_warn_no_deliverydate, + ], + checks => [ @req_trans_cost_art, @req_cusordnumber ], + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], 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, - $::instance_conf->get_order_warn_no_deliverydate, - ], - disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef, + id => 'save_and_email_action', + call => [ 'kivi.Order.save', 'save_and_show_email_dialog', $::instance_conf->get_order_warn_duplicate_parts, + $::instance_conf->get_order_warn_no_deliverydate, + ], + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') + : !$self->order->id ? t8('This object has not been saved yet.') + : undef, ], action => [ t8('Download attachments of all parts'), @@ -2041,7 +2228,9 @@ sub setup_edit_action_bar { 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, + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') + : !$self->order->id ? t8('This object has not been saved yet.') + : undef, only_if => $deletion_allowed, ], @@ -2065,9 +2254,10 @@ sub setup_edit_action_bar { } } -sub generate_pdf { - my ($order, $pdf_ref, $params) = @_; +sub generate_doc { + my ($self, $doc_ref, $params) = @_; + my $order = $self->order; my @errors = (); my $print_form = Form->new(''); @@ -2087,6 +2277,9 @@ sub generate_pdf { if ($print_form->{format} =~ /(opendocument|oasis)/i) { $template_ext = 'odt'; $template_type = 'OpenDocument'; + } elsif ($print_form->{format} =~ m{html}i) { + $template_ext = 'html'; + $template_type = 'HTML'; } # search for the template @@ -2108,7 +2301,7 @@ sub generate_pdf { eval { $print_form->prepare_for_printing; - $$pdf_ref = SL::Helper::CreatePDF->create_pdf( + $$doc_ref = SL::Helper::CreatePDF->create_pdf( format => $print_form->{format}, template_type => $template_type, template => $template_file, @@ -2117,6 +2310,7 @@ sub generate_pdf { longdescription => 'html', partnotes => 'html', notes => 'html', + $::form->get_variable_content_types_for_cvars, }, ); 1; @@ -2244,6 +2438,41 @@ sub get_part_texts { return $texts; } +sub get_best_price_and_discount_source { + my ($record, $item, $ignore_given) = @_; + + my $price_source = SL::PriceSource->new(record_item => $item, record => $record); + + 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); + } elsif (!$ignore_given && defined $item->sellprice) { + $price_src = $price_source->price_from_source(""); + $price_src->price($item->sellprice); + } else { + $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; + } + + my $discount_src; + if (!$ignore_given && defined $item->discount) { + $discount_src = $price_source->discount_from_source(""); + $discount_src->discount($item->discount); + } else { + $discount_src = $price_source->best_discount + ? $price_source->best_discount + : $price_source->discount_from_source(""); + $discount_src->discount(0) if !$price_source->best_discount; + } + + return ($price_src, $discount_src); +} + sub sales_order_type { 'sales_order'; } @@ -2303,9 +2532,10 @@ sub save_history { )->save; } -sub store_pdf_to_webdav_and_filemanagement { - my($order, $content, $filename) = @_; +sub store_doc_to_webdav_and_filemanagement { + my ($self, $content, $filename, $variant) = @_; + my $order = $self->order; my @errors; # copy file to webdav folder @@ -2322,21 +2552,22 @@ sub store_pdf_to_webdav_and_filemanagement { $webdav_file->store(data => \$content); 1; } or do { - push @errors, t8('Storing PDF to webdav folder failed: #1', $@); + push @errors, t8('Storing the document to the WebDAV folder failed: #1', $@); }; } if ($order->id && $::instance_conf->get_doc_storage) { eval { SL::File->save(object_id => $order->id, object_type => $order->type, - mime_type => 'application/pdf', + mime_type => SL::MIME->mime_type_from_ext($filename), source => 'created', file_type => 'document', file_name => $filename, - file_contents => $content); + file_contents => $content, + print_variant => $variant); 1; } or do { - push @errors, t8('Storing PDF in storage backend failed: #1', $@); + push @errors, t8('Storing the document in the storage backend failed: #1', $@); }; } @@ -2507,21 +2738,10 @@ java script functions =item * -Customer discount is not displayed as a valid discount in price source popup -(this might be a bug in price sources) - -(I cannot reproduce this (Bernd)) - -=item * - No indication that -up/down expands/collapses second row. =item * -Inline creation of parts is not currently supported - -=item * - Table header is not sticky in the scrolling area. =item * @@ -2544,10 +2764,6 @@ How to expand/collapse second row. Now it can be done clicking the icon or =item * -Possibility to select PriceSources in input row? - -=item * - This controller uses a (changed) copy of the template for the PriceSource dialog. Maybe there could be used one code source.