X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FOrder.pm;h=04319e04aa372b2de7492db2050fd8e7e88b0ce6;hb=07dd84c04c1208d618ff007afaa24ad0074add31;hp=34f7b472678b713c57fbc6b188ad44c6e0d8f16b;hpb=e0a47f33b02b4cd8760fbe3c3f8c9ffa722db4e4;p=kivitendo-erp.git diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm index 34f7b4726..04319e04a 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; @@ -38,10 +39,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 @@ -209,7 +210,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; } @@ -326,6 +340,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 +388,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 +424,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(); } @@ -503,7 +540,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; } } } @@ -539,7 +576,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 +638,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 +647,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(); } @@ -631,12 +672,29 @@ sub _js_load_second_row { ->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 +794,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 +809,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', ); } @@ -865,8 +923,7 @@ sub _make_item { $item->assign_attributes(%$attr); $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 fields that currently can't be set in row but are needed: - $item->lastcost($item->part->lastcost) if $is_new; + $item->lastcost($item->part->lastcost) if $is_new && !defined $attr->{lastcost_as_number}; return $item; } @@ -922,6 +979,7 @@ sub _new_item { $new_attr{active_discount_source} = $discount_src; $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 @@ -1026,7 +1084,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; @@ -1056,15 +1116,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 { @@ -1259,30 +1375,31 @@ java script functions =item * credit limit -=item * more workflows (save as new / invoice) +=item * more workflows (save as new, quotation, purchase order) =item * price sources: little symbols showing better price / better discount +=item * select units in input row? + =item * custom shipto address =item * periodic invoices -=item * more details on second row (marge, ...) - =item * language / part translations =item * access rights -=item * preset salesman from customer - =item * display weights -=item * force project if enabled in client config - =item * history =item * mtime check +=item * optional client/user behaviour + +(transactions has to be set - department has to be set - + force project if enabled in client config - transport cost reminder) + =back =head1 KNOWN BUGS AND CAVEATS @@ -1294,18 +1411,11 @@ java script functions Customer discount is not displayed as a valid discount in price source popup (this might be a bug in price sources) -=item * - -No indication that double click expands second row, no exand all button +(I cannot reproduce this (Bernd)) =item * -Implementation of second row with a tbody for every item is not supported by -our css. - -=item * - -As a consequence row striping does not currently work +No indication that -up/down expands/collapses second row. =item * @@ -1327,6 +1437,52 @@ should be implemented. C does not use the currently inserted string for filtering. +=back + +=head1 To discuss / Nice to have + +=over 4 + +=item * + +How to expand/collapse second row. Now it can be done clicking the icon or +-up/down. + +=item * + +Possibility to change longdescription in input row? + +=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. + +=item * + +Rounding-differences between this controller (PriceTaxCalculator) and the old +form. This is not only a problem here, but also in all parts using the PTC. +There exists a ticket and a patch. This patch should be testet. + +=item * + +An indicator, if the actual inputs are saved (like in an +editor or on text processing application). + +=item * + +A warning when leaving the page without saveing unchanged inputs. + +=item * + +Workflows for delivery order and invoice are in the menu "Save", because the +order is saved before opening the new document form. Nevertheless perhaps these +workflow buttons should be put under "Workflows". + + =back =head1 AUTHOR