X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FOrder.pm;h=bb34a46552178f51493b9f592f08b73402796ca8;hb=ed45862002de7481692e3044553356857f947d5f;hp=741476603c49c3cfdd064537049b82c40fec424d;hpb=b647f3f3a3357e366d2faa25069230eb1cf8e9e9;p=kivitendo-erp.git diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm index 741476603..bb34a4655 100644 --- a/SL/Controller/Order.pm +++ b/SL/Controller/Order.pm @@ -9,6 +9,7 @@ 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; @@ -209,7 +210,15 @@ sub action_print { $self->js->flash('error', t8('Storing PDF to webdav folder failed: #1', $@)); } } - + if ($self->order->ordnumber && $::instance_conf->get_doc_storage) { + SL::File->store( 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); + } $self->js->render; } @@ -387,7 +396,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(); } @@ -425,6 +434,10 @@ sub action_add_item { description => $assortment_item->part->description, }; my $item = _new_item($self->order, $attr); + + # set discount to 100% if item isn't supposed to be charged, overwriting any customer discount + $item->discount(1) unless $assortment_item->charge; + $self->order->add_items( $item ); $self->_recalc(); my $item_id = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000); @@ -486,7 +499,22 @@ sub action_add_multi_items { my @items; foreach my $attr (@form_attr) { - push @items, _new_item($self->order, $attr); + my $item = _new_item($self->order, $attr); + push @items, $item; + if ( $item->part->is_assortment ) { + foreach my $assortment_item ( @{$item->part->assortment_items} ) { + my $attr = { parts_id => $assortment_item->parts_id, + qty => $assortment_item->qty * $item->qty, # TODO $form_attr->{unit} + unit => $assortment_item->unit, + description => $assortment_item->part->description, + }; + my $item = _new_item($self->order, $attr); + + # 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; + } + } } $self->order->add_items(@items); @@ -520,7 +548,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(); } @@ -575,12 +603,70 @@ sub action_get_item_longdescription { $_[0]->render(\ $longdescription, { type => 'text' }); } -sub _js_redisplay_linetotals { +# load the second row for one or more items +# +# This action gets the html code for all items second rows by rendering a template for +# the second row and sets the html code via client js. +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]; + + $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(); +} + +sub _js_load_second_row { + my ($self, $item, $item_id, $do_parse) = @_; + + if ($do_parse) { + # Parse values from form (they are formated while rendering (template)). + # Workaround to pre-parse number-cvars (parse_custom_variable_values does not parse number values). + # This parsing is not necessary at all, if we assure that the second row/cvars are only loaded once. + foreach my $var (@{ $item->cvars_by_config }) { + $var->unparsed_value($::form->parse_amount(\%::myconfig, $var->{__unparsed_value})) if ($var->config->type eq 'number' && exists($var->{__unparsed_value})); + } + $item->parse_custom_variable_values; + } + + my $row_as_html = $self->p->render('order/tabs/_second_row', ITEM => $item); + + $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_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 { @@ -807,16 +893,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) = @_; @@ -829,7 +915,11 @@ sub _new_item { $item->unit($part->unit) if !$item->unit; my $price_src; - if ($item->sellprice) { + 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 ($item->sellprice) { $price_src = $price_source->price_from_source(""); $price_src->price($item->sellprice); } else { @@ -859,8 +949,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 @@ -965,7 +1056,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; @@ -999,11 +1092,59 @@ sub _pre_render { 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 ], + accesskey => 'enter', + ], + + ], # 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' ], + ], + ], # 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 { @@ -1202,12 +1343,12 @@ java script functions =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 @@ -1216,12 +1357,15 @@ java script functions =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 @@ -1235,16 +1379,7 @@ Customer discount is not displayed as a valid discount in price source popup =item * -No indication that double click expands second row, no exand all button - -=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 * @@ -1266,14 +1401,44 @@ should be implemented. C does not use the currently inserted string for filtering. -=item * Performance +=back -Rendering a 50 items order takes twice as long as the old code. +=head1 To discuss / Nice to have + +=over 4 + +=item * -90% of that is rendering the (hidden) second rows, and 50% of those again are -checks for is_valid and C on the cvar input template. +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 * -Suggestion: fetch second rows when asked for. +A warning when leaving the page without saveing unchanged inputs. =back