X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FRecordLinks.pm;h=660909b041cedc3d2fa9dfc5ab225cb67e36d92d;hb=254ef1b288fe55a17d10468ba776b43661594269;hp=03d7b81c76e4d9728099dbf6b3c02ec241600956;hpb=cdab9f5d03b9c1d529155cf3b95d227d473bfb6d;p=kivitendo-erp.git diff --git a/SL/Controller/RecordLinks.pm b/SL/Controller/RecordLinks.pm index 03d7b81c7..660909b04 100644 --- a/SL/Controller/RecordLinks.pm +++ b/SL/Controller/RecordLinks.pm @@ -15,6 +15,7 @@ use SL::DB::PurchaseInvoice; use SL::DB::RecordLink; use SL::DB::RequirementSpec; use SL::DBUtils qw(like); +use SL::DB::ShopOrder; use SL::JSON; use SL::Locale::String; @@ -36,7 +37,8 @@ my %link_type_defaults = ( ); my @link_type_specifics = ( - { title => t8('Requirement spec'), type => 'requirement_spec', model => 'RequirementSpec', number => 'id', description => 'title', description_title => t8('Title'), date => undef, project => 'project', filter => 'working_copy_filter', }, + { title => t8('Requirement spec'), type => 'requirement_spec', model => 'RequirementSpec', number => 'id', project => 'project', description => 'title', date => undef, filter => 'working_copy_filter', }, + { title => t8('Shop Order'), type => 'shop_order', model => 'ShopOrder', number => 'shop_ordernumber', date => 'order_date', project => undef, }, { title => t8('Sales quotation'), type => 'sales_quotation', model => 'Order', number => 'quonumber', }, { title => t8('Sales Order'), type => 'sales_order', model => 'Order', number => 'ordnumber', }, { title => t8('Sales delivery order'), type => 'sales_delivery_order', model => 'DeliveryOrder', number => 'donumber', }, @@ -60,6 +62,7 @@ sub action_ajax_list { eval { my $linked_records = $self->object->linked_records(direction => 'both', recursive => 1, save_path => 1); push @{ $linked_records }, $self->object->sepa_export_items if $self->object->can('sepa_export_items'); + my $output = SL::Presenter->get->grouped_record_list( $linked_records, with_columns => [ qw(record_link_direction) ], @@ -119,7 +122,7 @@ sub action_ajax_add_list { my ($self) = @_; my $manager = 'SL::DB::Manager::' . $self->link_type_desc->{model}; - my $vc = $self->link_type =~ m/sales_|^invoice|requirement_spec|letter/ ? 'customer' : 'vendor'; + my $vc = $self->link_type =~ m/shop|sales_|^invoice|requirement_spec|letter/ ? 'customer' : 'vendor'; my $project = $self->link_type_desc->{project}; my $project_id = "${project}_id"; my $description = $self->link_type_desc->{description}; @@ -134,7 +137,8 @@ sub action_ajax_add_list { my @with_objects = ($vc); push @with_objects, $project if $manager->can($project_id); - my $objects = $manager->get_all_sorted(where => \@where, with_objects => \@with_objects); + # show the newest records first (should be better for 80% of the cases TODO sortable click + my $objects = $manager->get_all_sorted(where => \@where, with_objects => \@with_objects, sort_by => 'itime', sort_dir => 'ASC'); my $output = $self->render( 'record_links/add_list', { output => 0 },