X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FPresenter%2FRecord.pm;h=b46896d471805202ef9ad3d221cae95a15a1714f;hb=40ebe601936458cebc78a48a20b2cc5e67f6c1da;hp=2bbaaf61132fb6078aa85f49dc0b4587aad5b824;hpb=89ade8da54d47af2cbf100fac07bf88ed9f23c43;p=kivitendo-erp.git

diff --git a/SL/Presenter/Record.pm b/SL/Presenter/Record.pm
index 2bbaaf611..b46896d47 100644
--- a/SL/Presenter/Record.pm
+++ b/SL/Presenter/Record.pm
@@ -5,7 +5,7 @@ use strict;
 use parent qw(Exporter);
 
 use Exporter qw(import);
-our @EXPORT = qw(grouped_record_list empty_record_list record_list);
+our @EXPORT = qw(grouped_record_list empty_record_list record_list record);
 
 use SL::Util;
 
@@ -19,6 +19,21 @@ sub _arrayify {
   return [ $array ];
 }
 
+sub record {
+  my ($self, $record, %params) = @_;
+
+  my %grouped = _group_records( [ $record ] ); # pass $record as arrayref
+  my $type    = (keys %grouped)[0];
+
+  return $self->sales_invoice(   $record, %params) if $type eq 'sales_invoices';
+  return $self->purchase_invoice($record, %params) if $type eq 'purchase_invoices';
+  return $self->ar_transaction(  $record, %params) if $type eq 'ar_transactions';
+  return $self->ap_transaction(  $record, %params) if $type eq 'ap_transactions';
+  return $self->gl_transaction(  $record, %params) if $type eq 'gl_transactions';
+
+  return '';
+}
+
 sub grouped_record_list {
   my ($self, $list, %params) = @_;
 
@@ -75,7 +90,12 @@ sub record_list {
   if ($with_columns{record_link_direction}) {
     push @columns, {
       title => $::locale->text('Link direction'),
-      data  => sub { $_[0]->{_record_link_direction} eq 'from' ? $::locale->text('Row was source for current record') : $::locale->text('Row was created from current record') },
+      data  => sub {
+          $_[0]->{_record_link_depth} > 1
+        ? $::locale->text('Row was linked to another record')
+        : $_[0]->{_record_link_direction} eq 'from'
+        ? $::locale->text('Row was source for current record')
+        : $::locale->text('Row was created from current record') },
     };
   }
 
@@ -156,6 +176,7 @@ sub _group_records {
     ap_transactions          => sub { (ref($_[0]) eq 'SL::DB::PurchaseInvoice') && !$_[0]->invoice                      },
     sepa_collections         => sub { (ref($_[0]) eq 'SL::DB::SepaExportItem')  &&  $_[0]->ar_id                        },
     sepa_transfers           => sub { (ref($_[0]) eq 'SL::DB::SepaExportItem')  &&  $_[0]->ap_id                        },
+    gl_transactions          => sub { (ref($_[0]) eq 'SL::DB::GLTransaction')                                           },
   );
 
   my %groups;
@@ -335,6 +356,7 @@ sub _sales_invoice_list {
     type    => 'sales_invoice',
     columns => [
       [ $::locale->text('Invoice Date'),            'transdate'               ],
+      [ $::locale->text('Type'),                    sub { $_[0]->displayable_type } ],
       [ $::locale->text('Invoice Number'),          sub { $self->sales_invoice($_[0], display => 'table-cell') } ],
       [ $::locale->text('Quotation Number'),        'quonumber' ],
       [ $::locale->text('Order Number'),            'ordnumber' ],
@@ -377,6 +399,7 @@ sub _ar_transaction_list {
     type    => 'ar_transaction',
     columns => [
       [ $::locale->text('Invoice Date'),            'transdate'               ],
+      [ $::locale->text('Type'),                    sub { $_[0]->displayable_type } ],
       [ $::locale->text('Invoice Number'),          sub { $self->ar_transaction($_[0], display => 'table-cell') } ],
       [ $::locale->text('Customer'),                'customer'                ],
       [ $::locale->text('Net amount'),              'netamount'               ],
@@ -471,6 +494,18 @@ TODO
 
 =over 4
 
+=item C<record>
+
+Returns a rendered version (actually an instance of
+L<SL::Presenter::EscapedText>) of a single ar, ap or gl object.
+
+Example:
+  # fetch the record from a random acc_trans object and print its link (could be ar, ap or gl)
+  my $record = SL::DB::Manager::AccTransaction->get_first()->record;
+  my $html   = SL::Presenter->get->record($record, display => 'inline');
+
+=item C<grouped_record_list $list, %params>
+
 =item C<empty_record_list>
 
 Returns a rendered version (actually an instance of
@@ -565,13 +600,13 @@ C<link>.
 =item C<with_columns>
 
 Can be set by the caller to indicate additional columns to
-list. Currently supported:
+be listed. Currently supported:
 
 =over 2
 
 =item C<record_link_destination>
 
-The record link destination. Requires that the records to list have
+The record link destination. Requires that the records to be listed have
 been retrieved via the L<SL::DB::Helper::LinkedRecords> helper.
 
 =back
@@ -579,7 +614,7 @@ been retrieved via the L<SL::DB::Helper::LinkedRecords> helper.
 =item C<edit_record_links>
 
 If trueish additional controls will be rendered that allow the user to
-remove and add record links. Requires that the records to list have
+remove and add record links. Requires that the records to be listed have
 been retrieved via the L<SL::DB::Helper::LinkedRecords> helper.
 
 =back