X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FDeliveryOrder.pm;h=97bfbca3ea97484847fff42bdfd135845c119ab2;hb=94f5cb152afa9210162295b6727801c296af0631;hp=ab4349774f295fe1e395371c36a62c48df88c004;hpb=ef351df30360376cf16a1c5ce64be8e0ff630a5a;p=kivitendo-erp.git diff --git a/SL/Controller/DeliveryOrder.pm b/SL/Controller/DeliveryOrder.pm index ab4349774..97bfbca3e 100644 --- a/SL/Controller/DeliveryOrder.pm +++ b/SL/Controller/DeliveryOrder.pm @@ -4,7 +4,7 @@ use strict; use parent qw(SL::Controller::Base); use SL::Helper::Flash qw(flash_later); -use SL::Helper::Number qw(_format_number_units _parse_number); +use SL::Helper::Number qw(_format_number _parse_number); use SL::Presenter::Tag qw(select_tag hidden_tag div_tag); use SL::Presenter::DeliveryOrder qw(delivery_order_status_line); use SL::Locale::String qw(t8); @@ -33,6 +33,7 @@ use SL::DB::TransferType; 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; @@ -58,6 +59,9 @@ use Rose::Object::MakeMethods::Generic __PACKAGE__->run_before('check_auth', except => [ qw(update_stock_information) ]); +__PACKAGE__->run_before('check_auth_for_edit', + except => [ qw(update_stock_information edit show_customer_vendor_details_dialog price_popup stock_in_out_dialog load_second_rows) ]); + __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) ]); @@ -480,18 +484,21 @@ 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'); - # 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') . ": " . $::form->{message}; - $self->order->update_attributes(intnotes => $intnotes); + $self->order->update_attributes(intnotes => $intnotes); + } $self->save_history('MAILED'); @@ -897,8 +904,8 @@ sub action_stock_in_out_dialog { my ($self) = @_; my $part = SL::DB::Part->load_cached($::form->{parts_id}) or die "need parts_id"; + my $unit = SL::DB::Unit->load_cached($::form->{unit}) or die "need unit"; my $stock = $::form->{stock}; - my $unit = $::form->{unit}; my $row = $::form->{row}; my $item_id = $::form->{item_id}; my $qty = _parse_number($::form->{qty_as_number}); @@ -908,13 +915,13 @@ sub action_stock_in_out_dialog { my @contents = DO->get_item_availability(parts_id => $part->id); my $stock_info = DO->unpack_stock_information(packed => $stock); - $self->merge_stock_data($stock_info, \@contents, $part); + $self->merge_stock_data($stock_info, \@contents, $part, $unit); $self->render("delivery_order/stock_dialog", { layout => 0 }, WHCONTENTS => $self->order->delivered ? $stock_info : \@contents, part => $part, do_qty => $qty, - do_unit => $unit, + do_unit => $unit->unit, delivered => $self->order->delivered, row => $row, item_id => $item_id, @@ -933,17 +940,17 @@ sub action_update_stock_information { stock_info => $yaml, stock_qty => $stock_qty, }; - $self->render(\ SL::JSON::to_json($response), { layout => 0, type => 'json', process => 0 }); } sub merge_stock_data { - my ($self, $stock_info, $contents, $part) = @_; + my ($self, $stock_info, $contents, $part, $unit) = @_; # TODO rewrite to mapping if (!$self->order->delivered) { for my $row (@$contents) { - $row->{available_qty} = _format_number_units($row->{qty}, $row->{unit}, $part->unit); + # row here is in parts units. stock is in item units + $row->{available_qty} = _format_number($part->unit_obj->convert_to($row->{qty}, $unit)); for my $sinfo (@{ $stock_info }) { next if $row->{bin_id} != $sinfo->{bin_id} || @@ -1223,7 +1230,13 @@ sub init_part_picker_classification_ids { sub check_auth { my ($self) = @_; - $::auth->assert($self->type_data->access || 'DOES_NOT_EXIST'); + $::auth->assert($self->type_data->access('view') || 'DOES_NOT_EXIST'); +} + +sub check_auth_for_edit { + my ($self) = @_; + + $::auth->assert($self->type_data->access('edit') || 'DOES_NOT_EXIST'); } # build the selection box for contacts @@ -1724,7 +1737,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'); @@ -1769,7 +1782,8 @@ sub pre_render { } } @all_objects; } - $self->{template_args}{in_out} = $self->type_data->transfer; + $self->{template_args}{in_out} = $self->type_data->transfer; + $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}; @@ -1782,20 +1796,25 @@ sub setup_edit_action_bar { my ($self, %params) = @_; my $deletion_allowed = $self->type_data->show_menu("delete"); + my $may_edit_create = $::auth->assert($self->type_data->access('edit') || 'DOES_NOT_EXIST', 1); for my $bar ($::request->layout->get('actionbar')) { $bar->add( combobox => [ action => [ t8('Save'), - call => [ 'kivi.DeliveryOrder.save', 'save', $::instance_conf->get_order_warn_duplicate_parts, - $::instance_conf->get_order_warn_no_deliverydate, - ], + call => [ 'kivi.DeliveryOrder.save', 'save', $::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.') : undef, ], action => [ t8('Save as new'), - 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, + call => [ 'kivi.DeliveryOrder.save', 'save_as_new', $::instance_conf->get_order_warn_duplicate_parts ], + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') + : $self->type eq 'supplier_delivery_order' ? t8('Need a workflow for Supplier Delivery Order') + : !$self->order->id ? t8('This object has not been saved yet.') + : undef, ], ], # end of combobox "Save" @@ -1807,38 +1826,45 @@ sub setup_edit_action_bar { t8('Save and Quotation'), submit => [ '#order_form', { action => "DeliveryOrder/sales_quotation" } ], only_if => $self->type_data->show_menu("save_and_quotation"), + 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 => "DeliveryOrder/request_for_quotation" } ], only_if => $self->type_data->show_menu("save_and_rfq"), + 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 => "DeliveryOrder/sales_order" } ], only_if => $self->type_data->show_menu("save_and_sales_order"), + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], action => [ t8('Save and Purchase Order'), - call => [ 'kivi.DeliveryOrder.purchase_order_check_for_direct_delivery' ], + call => [ 'kivi.DeliveryOrder.purchase_order_check_for_direct_delivery' ], only_if => $self->type_data->show_menu("save_and_purchase_order"), + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], action => [ t8('Save and Delivery Order'), - call => [ 'kivi.DeliveryOrder.save', 'save_and_delivery_order', $::instance_conf->get_order_warn_duplicate_parts, - $::instance_conf->get_order_warn_no_deliverydate, - ], + call => [ 'kivi.DeliveryOrder.save', 'save_and_delivery_order', $::instance_conf->get_order_warn_duplicate_parts, + $::instance_conf->get_order_warn_no_deliverydate, + ], only_if => $self->type_data->show_menu("save_and_delivery_order"), + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], action => [ t8('Save and Invoice'), - call => [ 'kivi.DeliveryOrder.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"), + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], action => [ t8('Save and AP Transaction'), - call => [ 'kivi.DeliveryOrder.save', 'save_and_ap_transaction', $::instance_conf->get_order_warn_duplicate_parts ], + 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"), + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, ], ], # end of combobox "Workflow" @@ -1849,28 +1875,34 @@ sub setup_edit_action_bar { ], action => [ t8('Save and preview PDF'), - call => [ 'kivi.DeliveryOrder.save', 'preview_pdf', $::instance_conf->get_order_warn_duplicate_parts, - $::instance_conf->get_order_warn_no_deliverydate, - ], + call => [ 'kivi.DeliveryOrder.save', 'preview_pdf', $::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.') : undef, ], action => [ t8('Save and print'), - call => [ 'kivi.DeliveryOrder.show_print_options', $::instance_conf->get_order_warn_duplicate_parts, - $::instance_conf->get_order_warn_no_deliverydate, - ], + call => [ 'kivi.DeliveryOrder.show_print_options', $::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.') : undef, ], action => [ t8('Save and E-mail'), - id => 'save_and_email_action', - 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, + id => 'save_and_email_action', + call => [ 'kivi.DeliveryOrder.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'), call => [ 'kivi.File.downloadOrderitemsFiles', $::form->{type}, $::form->{id} ], - 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 => $::instance_conf->get_doc_storage, ], ], # end of combobox "Export" @@ -1880,28 +1912,34 @@ sub setup_edit_action_bar { id => 'delete_action', 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.') : - $self->order->delivered ? t8('The parts for this order have already been transferred') : 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.') + : $self->order->delivered ? t8('The parts for this order have already been transferred') + : undef, only_if => $self->type_data->show_menu("delete"), ], combobox => [ action => [ t8('Transfer out'), - id => 'transfer_out_action', - call => [ 'kivi.DeliveryOrder.save', 'transfer_stock' ], - disabled => !$self->order->id ? t8('This object has not been saved yet.') : - $self->order->delivered ? t8('The parts for this order have already been transferred') : undef, - only_if => $self->type_data->properties('transfer') eq 'out', + id => 'transfer_out_action', + call => [ 'kivi.DeliveryOrder.save', 'transfer_stock' ], + 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.') + : $self->order->delivered ? t8('The parts for this order have already been transferred') + : undef, + only_if => $self->type_data->properties('transfer') eq 'out', confirm => t8('Do you really want to transfer the stock and set this order to delivered?'), ], action => [ t8('Transfer in'), - id => 'transfer_in_action', - call => [ 'kivi.DeliveryOrder.save', 'transfer_stock' ], - disabled => !$self->order->id ? t8('This object has not been saved yet.') : - $self->order->delivered ? t8('The parts for this order have already been transferred') : undef, - only_if => $self->type_data->properties('transfer') eq 'in', + id => 'transfer_in_action', + call => [ 'kivi.DeliveryOrder.save', 'transfer_stock' ], + 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.') + : $self->order->delivered ? t8('The parts for this order have already been transferred') + : undef, + only_if => $self->type_data->properties('transfer') eq 'in', confirm => t8('Do you really want to transfer the stock and set this order to delivered?'), ], ], @@ -2151,7 +2189,7 @@ sub calculate_stock_in_out_from_stock_info { $units_by_name{$_->{unit}}->convert_to($_->{qty}, $units_by_name{$unit}) } @$stock_info; - my $content = _format_number_units($sum, 2, $units_by_name{$unit}, $units_by_name{$unit}); + my $content = _format_number($sum, 2) . ' ' . $unit; return $content; } @@ -2165,7 +2203,7 @@ sub calculate_stock_in_out { $_->unit_obj->convert_to($_->qty, $item->unit_obj) } $item->delivery_order_stock_entries; - my $content = _format_number_units($sum, 2, $item->unit_obj, $item->part->unit_obj); + my $content = _format_number($sum, 2); return $content; }