X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FOrder.pm;h=631ab16dd6f4d071caeb470ebc2737eed4a912fb;hb=00b6dc2240564add9114864655e96eb7cc6dde4f;hp=33185509888b6c9e2c7cffc0a14b86bf4354d9d9;hpb=9a128e8bfd4f08c24e12b4ab7387efb3001d629f;p=kivitendo-erp.git diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm index 331855098..631ab16dd 100644 --- a/SL/Controller/Order.pm +++ b/SL/Controller/Order.pm @@ -93,7 +93,7 @@ sub action_delete { flash_later('info', $::locale->text('The order has been deleted')); my @redirect_params = ( - action => 'edit', + action => 'add', type => $self->type, ); @@ -783,6 +783,8 @@ sub _make_item { $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; return $item; } @@ -891,9 +893,9 @@ sub _delete { my ($self) = @_; my $errors = []; - my $db = $self->order->db; + my $db = $self->order->db; - $db->do_transaction( + $db->with_transaction( sub { my @spoolfiles = grep { $_ } map { $_->spoolfile } @{ SL::DB::Manager::Status->get_all(where => [ trans_id => $self->order->id ]) }; $self->order->delete; @@ -913,12 +915,11 @@ sub _save { my ($self) = @_; my $errors = []; - my $db = $self->order->db; + my $db = $self->order->db; - $db->do_transaction( - sub { - SL::DB::OrderItem->new(id => $_)->delete for @{$self->item_ids_to_delete}; - $self->order->save(cascade => 1); + $db->with_transaction(sub { + SL::DB::OrderItem->new(id => $_)->delete for @{$self->item_ids_to_delete}; + $self->order->save(cascade => 1); }) || push(@{$errors}, $db->error); return $errors; @@ -1154,9 +1155,9 @@ Email dialog =back -=item * +=item * C -js/kivi.Order.js: java script functions +java script functions =back @@ -1192,6 +1193,10 @@ js/kivi.Order.js: java script functions =item * force project if enabled in client config +=item * history + +=item * mtime check + =back =head1 KNOWN BUGS AND CAVEATS @@ -1200,10 +1205,6 @@ js/kivi.Order.js: java script functions =item * -C is not displayed until an order is saved - -=item * - Customer discount is not displayed as a valid discount in price source popup (this might be a bug in price sources) @@ -1232,9 +1233,22 @@ Table header is not sticky in the scrolling area. Sorting does not include C, neither does reordering. +This behavior was implemented intentionally. But we can discuss, which behavior +should be implemented. + =item * -C does not use the currently inserted string for filtering. +C does not use the currently inserted string for +filtering. + +=item * Performance + +Rendering a 50 items order takes twice as long as the old code. + +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. + +Suggestion: fetch second rows when asked for. =back