X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FRecordLinks.pm;h=152fe95f5e5512e5302faae1a3ae199a6c7f78dd;hb=792c623f24a4c5985f9c67395f75444d34679f0d;hp=b71467752a9c2bb8baa5c8d170d9f4d6325d9072;hpb=e40c9d4da8cedc8f5151661887f6c9a2da8237c7;p=kivitendo-erp.git diff --git a/SL/Controller/RecordLinks.pm b/SL/Controller/RecordLinks.pm index b71467752..152fe95f5 100644 --- a/SL/Controller/RecordLinks.pm +++ b/SL/Controller/RecordLinks.pm @@ -15,8 +15,10 @@ 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; +use SL::Presenter::Record qw(grouped_record_list); use Rose::Object::MakeMethods::Generic ( @@ -36,7 +38,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', }, @@ -46,6 +49,9 @@ my @link_type_specifics = ( { title => t8('Purchase delivery order'), type => 'purchase_delivery_order', model => 'DeliveryOrder', number => 'donumber', }, { title => t8('Purchase Invoice'), type => 'purchase_invoice', model => 'PurchaseInvoice', number => 'invnumber', }, { title => t8('Letter'), type => 'letter', model => 'Letter', number => 'letternumber', description => 'subject', description_title => t8('Subject'), date => 'date', project => undef }, + { title => t8('Email'), type => 'email_journal', model => 'EmailJournal', number => 'id', description => 'subject', description_title => t8('Subject'), }, + { title => t8('AR Transaction'), type => 'ar_transaction', model => 'Invoice', number => 'invnumber', }, + { title => t8('AP Transaction'), type => 'ap_transaction', model => 'PurchaseInvoice', number => 'invnumber', }, ); my @link_types = map { +{ %link_type_defaults, %{ $_ } } } @link_type_specifics; @@ -60,7 +66,8 @@ 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( + + my $output = grouped_record_list( $linked_records, with_columns => [ qw(record_link_direction) ], edit_record_links => 1, @@ -102,7 +109,7 @@ sub action_ajax_add_filter { my $presenter = $self->presenter; my @link_type_select = map { [ $_->{type}, $_->{title} ] } @link_types; - my @projects = map { [ $_->id, $presenter->project($_, display => 'inline', style => 'both', no_link => 1) ] } @{ SL::DB::Manager::Project->get_all_sorted }; + my @projects = map { [ $_->id, $_->presenter->project(display => 'inline', style => 'both', no_link => 1) ] } @{ SL::DB::Manager::Project->get_all_sorted }; my $is_sales = $self->object->can('customer_id') && $self->object->customer_id; $self->render( @@ -119,7 +126,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|^ar_/ ? 'customer' : 'vendor'; my $project = $self->link_type_desc->{project}; my $project_id = "${project}_id"; my $description = $self->link_type_desc->{description};