X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FPresenter%2FRecord.pm;h=b46896d471805202ef9ad3d221cae95a15a1714f;hb=40ebe601936458cebc78a48a20b2cc5e67f6c1da;hp=4f9a5183074cecb826088d8b8289b14c8d2c7202;hpb=a73466259ba0ccd242f74305ea42a7c826c988d7;p=kivitendo-erp.git diff --git a/SL/Presenter/Record.pm b/SL/Presenter/Record.pm index 4f9a51830..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) = @_; @@ -27,6 +42,7 @@ sub grouped_record_list { my %groups = _sort_grouped_lists(_group_records($list)); my $output = ''; + $output .= _requirement_spec_list( $self, $groups{requirement_specs}, %params) if $groups{requirement_specs}; $output .= _sales_quotation_list( $self, $groups{sales_quotations}, %params) if $groups{sales_quotations}; $output .= _sales_order_list( $self, $groups{sales_orders}, %params) if $groups{sales_orders}; $output .= _sales_delivery_order_list( $self, $groups{sales_delivery_orders}, %params) if $groups{sales_delivery_orders}; @@ -74,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') }, }; } @@ -142,6 +163,7 @@ sub _group_records { my ($list) = @_; my %matchers = ( + requirement_specs => sub { (ref($_[0]) eq 'SL::DB::RequirementSpec') }, sales_quotations => sub { (ref($_[0]) eq 'SL::DB::Order') && $_[0]->is_type('sales_quotation') }, sales_orders => sub { (ref($_[0]) eq 'SL::DB::Order') && $_[0]->is_type('sales_order') }, sales_delivery_orders => sub { (ref($_[0]) eq 'SL::DB::DeliveryOrder') && $_[0]->is_sales }, @@ -154,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; @@ -182,6 +205,24 @@ sub _sort_grouped_lists { return %groups; } +sub _requirement_spec_list { + my ($self, $list, %params) = @_; + + return $self->record_list( + $list, + title => $::locale->text('Requirement specs'), + type => 'requirement_spec', + columns => [ + [ $::locale->text('Requirement spec number'), sub { $self->requirement_spec($_[0], display => 'table-cell') } ], + [ $::locale->text('Customer'), 'customer' ], + [ $::locale->text('Title'), 'title' ], + [ $::locale->text('Project'), 'project', ], + [ $::locale->text('Status'), sub { $_[0]->status->description } ], + ], + %params, + ); +} + sub _sales_quotation_list { my ($self, $list, %params) = @_; @@ -315,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' ], @@ -357,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' ], @@ -451,6 +494,18 @@ TODO =over 4 +=item C + +Returns a rendered version (actually an instance of +L) 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 + =item C Returns a rendered version (actually an instance of @@ -545,13 +600,13 @@ C. =item C Can be set by the caller to indicate additional columns to -list. Currently supported: +be listed. Currently supported: =over 2 =item C -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 helper. =back @@ -559,7 +614,7 @@ been retrieved via the L helper. =item C 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 helper. =back