X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/f1dd4b47874f1c231e539ad5a6e918fdffbb539c..1d99e3e9537f75342a9f20f1e89a3e8cb4bb5444:/SL/Controller/RecordLinks.pm diff --git a/SL/Controller/RecordLinks.pm b/SL/Controller/RecordLinks.pm index aceb57f1e..49661cbe0 100644 --- a/SL/Controller/RecordLinks.pm +++ b/SL/Controller/RecordLinks.pm @@ -43,16 +43,19 @@ my @link_type_specifics = ( { 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', }, + { title => t8('RMA delivery order'), type => 'rma_delivery_order', model => 'DeliveryOrder', number => 'rdonumber', }, { title => t8('Sales Invoice'), type => 'invoice', model => 'Invoice', number => 'invnumber', }, { title => t8('Request for Quotation'), type => 'request_quotation', model => 'Order', number => 'quonumber', }, { title => t8('Purchase Order'), type => 'purchase_order', model => 'Order', number => 'ordnumber', }, { title => t8('Purchase delivery order'), type => 'purchase_delivery_order', model => 'DeliveryOrder', number => 'donumber', }, + { title => t8('Supplier delivery order'), type => 'supplier_delivery_order', model => 'DeliveryOrder', number => 'sdonumber', }, { 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', }, { title => t8('Dunning'), type => 'dunning', model => 'Dunning', number => 'dunning_id', }, + { title => t8('GL Transaction'), type => 'gl_transaction', model => 'GLTransaction', number => 'reference', }, ); my @link_types = map { +{ %link_type_defaults, %{ $_ } } } @link_type_specifics; @@ -252,6 +255,13 @@ sub get_order_centric_linked_records { my $all_linked_records = $self->object->linked_records(direction => 'from', recursive => 1); my $filtered_orders = [ grep { 'SL::DB::Order' eq ref $_ && $_->is_type('sales_order') } @$all_linked_records ]; + + # no orders no call to linked_records via batch mode + # but instead return default list + return $self->object->linked_records(direction => 'both', recursive => 1, save_path => 1) + unless scalar @$filtered_orders; + + # we have a order, therefore get the tree view from the top (order) my $id_ref = [ map { $_->id } @$filtered_orders ]; my $linked_records = SL::DB::Order->new->linked_records(direction => 'to', recursive => 1, batch => $id_ref); push @{ $linked_records }, @$filtered_orders;