X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FPresenter%2FRecord.pm;h=db68fa6518334764cfaba3e840bedb648ad63635;hb=37d14c11afd10049be58467770499b25268c1364;hp=18c719092ddcd6e7a7d9883e8d35e1340f89bbcc;hpb=56f7991d4910ae12c7d16aab025a2ab242ca5eeb;p=kivitendo-erp.git diff --git a/SL/Presenter/Record.pm b/SL/Presenter/Record.pm index 18c719092..db68fa651 100644 --- a/SL/Presenter/Record.pm +++ b/SL/Presenter/Record.pm @@ -2,10 +2,13 @@ package SL::Presenter::Record; use strict; -use parent qw(Exporter); +use SL::Presenter; +use SL::Presenter::EscapedText qw(escape is_escaped); use Exporter qw(import); -our @EXPORT = qw(grouped_record_list empty_record_list record_list); +our @EXPORT_OK = qw(grouped_record_list empty_record_list record_list record); + +use SL::Util; use Carp; use List::Util qw(first); @@ -17,38 +20,71 @@ sub _arrayify { return [ $array ]; } +sub record { + my ($record, %params) = @_; + + my %grouped = _group_records( [ $record ] ); # pass $record as arrayref + my $type = (keys %grouped)[0]; + + $record->presenter->sales_invoice( $record, %params) if $type eq 'sales_invoices'; + $record->presenter->purchase_invoice($record, %params) if $type eq 'purchase_invoices'; + $record->presenter->ar_transaction( $record, %params) if $type eq 'ar_transactions'; + $record->presenter->ap_transaction( $record, %params) if $type eq 'ap_transactions'; + $record->presenter->gl_transaction( $record, %params) if $type eq 'gl_transactions'; + + return ''; +} + sub grouped_record_list { - my ($self, $list, %params) = @_; + my ($list, %params) = @_; %params = map { exists $params{$_} ? ($_ => $params{$_}) : () } qw(edit_record_links with_columns object_id object_model); - my %groups = _group_records($list); + my %groups = _sort_grouped_lists(_group_records($list)); my $output = ''; - $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}; - $output .= _sales_invoice_list( $self, $groups{sales_invoices}, %params) if $groups{sales_invoices}; - $output .= _ar_transaction_list( $self, $groups{ar_transactions}, %params) if $groups{ar_transactions}; + $output .= _requirement_spec_list( $groups{requirement_specs}, %params) if $groups{requirement_specs}; + $output .= _shop_order_list( $groups{shop_orders}, %params) if $groups{shop_orders}; + $output .= _sales_quotation_list( $groups{sales_quotations}, %params) if $groups{sales_quotations}; + $output .= _sales_order_list( $groups{sales_orders}, %params) if $groups{sales_orders}; + $output .= _sales_delivery_order_list( $groups{sales_delivery_orders}, %params) if $groups{sales_delivery_orders}; + $output .= _sales_invoice_list( $groups{sales_invoices}, %params) if $groups{sales_invoices}; + $output .= _ar_transaction_list( $groups{ar_transactions}, %params) if $groups{ar_transactions}; + + $output .= _request_quotation_list( $groups{purchase_quotations}, %params) if $groups{purchase_quotations}; + $output .= _purchase_order_list( $groups{purchase_orders}, %params) if $groups{purchase_orders}; + $output .= _purchase_delivery_order_list($groups{purchase_delivery_orders}, %params) if $groups{purchase_delivery_orders}; + $output .= _purchase_invoice_list( $groups{purchase_invoices}, %params) if $groups{purchase_invoices}; + $output .= _ap_transaction_list( $groups{ap_transactions}, %params) if $groups{ap_transactions}; - $output .= _request_quotation_list( $self, $groups{purchase_quotations}, %params) if $groups{purchase_quotations}; - $output .= _purchase_order_list( $self, $groups{purchase_orders}, %params) if $groups{purchase_orders}; - $output .= _purchase_delivery_order_list($self, $groups{purchase_delivery_orders}, %params) if $groups{purchase_delivery_orders}; - $output .= _purchase_invoice_list( $self, $groups{purchase_invoices}, %params) if $groups{purchase_invoices}; - $output .= _ar_transaction_list( $self, $groups{ar_transactions}, %params) if $groups{ar_transactions}; + $output .= _gl_transaction_list( $groups{gl_transactions}, %params) if $groups{gl_transactions}; - $output = $self->render('presenter/record/grouped_record_list', %params, output => $output); + $output .= _bank_transactions( $groups{bank_transactions}, %params) if $groups{bank_transactions}; + + $output .= _sepa_collection_list( $groups{sepa_collections}, %params) if $groups{sepa_collections}; + $output .= _sepa_transfer_list( $groups{sepa_transfers}, %params) if $groups{sepa_transfers}; + + $output .= _letter_list( $groups{letters}, %params) if $groups{letters}; + $output .= _email_journal_list( $groups{email_journals}, %params) if $groups{email_journals}; + + $output .= _dunning_list( $groups{dunnings}, %params) if $groups{dunnings}; + + $output = SL::Presenter->get->render('presenter/record/grouped_record_list', %params, output => $output); return $output; } +sub grouped_list { goto &grouped_record_list } + sub empty_record_list { - my ($self, %params) = @_; - return $self->grouped_record_list([], %params); + my (%params) = @_; + return grouped_record_list([], %params); } +sub empty_list { goto &empty_record_list } + sub record_list { - my ($self, $list, %params) = @_; + my ($list, %params) = @_; my @columns; @@ -69,7 +105,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') }, }; } @@ -92,14 +133,15 @@ sub record_list { my $meta = $column_meta{ $spec->{data} }; my $type = ref $meta; my $relationship = $relationships{ $spec->{data} }; - my $rel_type = !$relationship ? '' : lc $relationship->class; - $rel_type =~ s/^sl::db:://; + my $rel_type = !$relationship ? '' : $relationship->class; + $rel_type =~ s/^SL::DB:://; + $rel_type = SL::Util::snakify($rel_type); if (ref($spec->{data}) eq 'CODE') { $cell{value} = $spec->{data}->($obj); } else { - $cell{value} = $rel_type && $self->can($rel_type) ? $self->$rel_type($obj->$method, display => 'table-cell') + $cell{value} = ref $obj->$method && $obj->$method->isa('SL::DB::Object') && $obj->$method->presenter->can($rel_type) ? $obj->$method->presenter->$rel_type(display => 'table-cell') : $type eq 'Rose::DB::Object::Metadata::Column::Date' ? $call->($obj, $method . '_as_date') : $type =~ m/^Rose::DB::Object::Metadata::Column::(?:Float|Numeric|Real)$/ ? $::form->format_amount(\%::myconfig, $call->($obj, $method), 2) : $type eq 'Rose::DB::Object::Metadata::Column::Boolean' ? $call->($obj, $method . '_as_bool_yn') @@ -120,7 +162,7 @@ sub record_list { alignment => $data[0]->{columns}->[$_]->{alignment}, }, (0..scalar(@columns) - 1); - return $self->render( + return SL::Presenter->get->render( 'presenter/record/record_list', %params, TABLE_HEADER => \@header, @@ -128,14 +170,17 @@ sub record_list { ); } +sub list { goto &record_list } + # # private methods # sub _group_records { my ($list) = @_; - my %matchers = ( + requirement_specs => sub { (ref($_[0]) eq 'SL::DB::RequirementSpec') }, + shop_orders => sub { (ref($_[0]) eq 'SL::DB::ShopOrder') && $_[0]->id }, 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 }, @@ -146,6 +191,13 @@ sub _group_records { purchase_delivery_orders => sub { (ref($_[0]) eq 'SL::DB::DeliveryOrder') && !$_[0]->is_sales }, purchase_invoices => sub { (ref($_[0]) eq 'SL::DB::PurchaseInvoice') && $_[0]->invoice }, 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') }, + bank_transactions => sub { (ref($_[0]) eq 'SL::DB::BankTransaction') && $_[0]->id }, + letters => sub { (ref($_[0]) eq 'SL::DB::Letter') && $_[0]->id }, + email_journals => sub { (ref($_[0]) eq 'SL::DB::EmailJournal') && $_[0]->id }, + dunnings => sub { (ref($_[0]) eq 'SL::DB::Dunning') }, ); my %groups; @@ -159,16 +211,66 @@ sub _group_records { return %groups; } +sub _sort_grouped_lists { + my (%groups) = @_; + + foreach my $group (keys %groups) { + next unless @{ $groups{$group} }; + if ($groups{$group}->[0]->can('compare_to')) { + $groups{$group} = [ sort { $a->compare_to($b) } @{ $groups{$group} } ]; + } else { + $groups{$group} = [ sort { $a->date <=> $b->date } @{ $groups{$group} } ]; + } + } + + return %groups; +} + +sub _requirement_spec_list { + my ($list, %params) = @_; + + return record_list( + $list, + title => $::locale->text('Requirement specs'), + type => 'requirement_spec', + columns => [ + [ $::locale->text('Requirement spec number'), sub { $_[0]->presenter->requirement_spec(display => 'table-cell') } ], + [ $::locale->text('Customer'), 'customer' ], + [ $::locale->text('Title'), 'title' ], + [ $::locale->text('Project'), 'project', ], + [ $::locale->text('Status'), sub { $_[0]->status->description } ], + ], + %params, + ); +} + +sub _shop_order_list { + my ($list, %params) = @_; + + return record_list( + $list, + title => $::locale->text('Shop Orders'), + type => 'shop_order', + columns => [ + [ $::locale->text('Shop Order Date'), sub { $_[0]->order_date->to_kivitendo } ], + [ $::locale->text('Shop Order Number'), sub { $_[0]->presenter->shop_order(display => 'table-cell') } ], + [ $::locale->text('Transfer Date'), 'transfer_date' ], + [ $::locale->text('Amount'), 'amount' ], + ], + %params, + ); +} + sub _sales_quotation_list { - my ($self, $list, %params) = @_; + my ($list, %params) = @_; - return $self->record_list( + return record_list( $list, title => $::locale->text('Sales Quotations'), type => 'sales_quotation', columns => [ [ $::locale->text('Quotation Date'), 'transdate' ], - [ $::locale->text('Quotation Number'), sub { $self->sales_quotation($_[0], display => 'table-cell') } ], + [ $::locale->text('Quotation Number'), sub { $_[0]->presenter->sales_quotation(display => 'table-cell') } ], [ $::locale->text('Customer'), 'customer' ], [ $::locale->text('Net amount'), 'netamount' ], [ $::locale->text('Transaction description'), 'transaction_description' ], @@ -180,15 +282,15 @@ sub _sales_quotation_list { } sub _request_quotation_list { - my ($self, $list, %params) = @_; + my ($list, %params) = @_; - return $self->record_list( + return record_list( $list, title => $::locale->text('Request Quotations'), type => 'request_quotation', columns => [ [ $::locale->text('Quotation Date'), 'transdate' ], - [ $::locale->text('Quotation Number'), sub { $self->request_quotation($_[0], display => 'table-cell') } ], + [ $::locale->text('Quotation Number'), sub { $_[0]->presenter->request_quotation(display => 'table-cell') } ], [ $::locale->text('Vendor'), 'vendor' ], [ $::locale->text('Net amount'), 'netamount' ], [ $::locale->text('Transaction description'), 'transaction_description' ], @@ -200,15 +302,15 @@ sub _request_quotation_list { } sub _sales_order_list { - my ($self, $list, %params) = @_; + my ($list, %params) = @_; - return $self->record_list( + return record_list( $list, title => $::locale->text('Sales Orders'), type => 'sales_order', columns => [ [ $::locale->text('Order Date'), 'transdate' ], - [ $::locale->text('Order Number'), sub { $self->sales_order($_[0], display => 'table-cell') } ], + [ $::locale->text('Order Number'), sub { $_[0]->presenter->sales_order(display => 'table-cell') } ], [ $::locale->text('Quotation'), 'quonumber' ], [ $::locale->text('Customer'), 'customer' ], [ $::locale->text('Net amount'), 'netamount' ], @@ -221,15 +323,15 @@ sub _sales_order_list { } sub _purchase_order_list { - my ($self, $list, %params) = @_; + my ($list, %params) = @_; - return $self->record_list( + return record_list( $list, title => $::locale->text('Purchase Orders'), type => 'purchase_order', columns => [ [ $::locale->text('Order Date'), 'transdate' ], - [ $::locale->text('Order Number'), sub { $self->purchase_order($_[0], display => 'table-cell') } ], + [ $::locale->text('Order Number'), sub { $_[0]->presenter->purchase_order(display => 'table-cell') } ], [ $::locale->text('Request for Quotation'), 'quonumber' ], [ $::locale->text('Vendor'), 'vendor' ], [ $::locale->text('Net amount'), 'netamount' ], @@ -242,15 +344,15 @@ sub _purchase_order_list { } sub _sales_delivery_order_list { - my ($self, $list, %params) = @_; + my ($list, %params) = @_; - return $self->record_list( + return record_list( $list, title => $::locale->text('Sales Delivery Orders'), type => 'sales_delivery_order', columns => [ [ $::locale->text('Delivery Order Date'), 'transdate' ], - [ $::locale->text('Delivery Order Number'), sub { $self->sales_delivery_order($_[0], display => 'table-cell') } ], + [ $::locale->text('Delivery Order Number'), sub { $_[0]->presenter->sales_delivery_order(display => 'table-cell') } ], [ $::locale->text('Order Number'), 'ordnumber' ], [ $::locale->text('Customer'), 'customer' ], [ $::locale->text('Transaction description'), 'transaction_description' ], @@ -263,15 +365,15 @@ sub _sales_delivery_order_list { } sub _purchase_delivery_order_list { - my ($self, $list, %params) = @_; + my ($list, %params) = @_; - return $self->record_list( + return record_list( $list, title => $::locale->text('Purchase Delivery Orders'), type => 'purchase_delivery_order', columns => [ [ $::locale->text('Delivery Order Date'), 'transdate' ], - [ $::locale->text('Delivery Order Number'), sub { $self->purchase_delivery_order($_[0], display => 'table-cell') } ], + [ $::locale->text('Delivery Order Number'), sub { $_[0]->presenter->purchase_delivery_order(display => 'table-cell') } ], [ $::locale->text('Order Number'), 'ordnumber' ], [ $::locale->text('Vendor'), 'vendor' ], [ $::locale->text('Transaction description'), 'transaction_description' ], @@ -284,15 +386,16 @@ sub _purchase_delivery_order_list { } sub _sales_invoice_list { - my ($self, $list, %params) = @_; + my ($list, %params) = @_; - return $self->record_list( + return record_list( $list, title => $::locale->text('Sales Invoices'), type => 'sales_invoice', columns => [ [ $::locale->text('Invoice Date'), 'transdate' ], - [ $::locale->text('Invoice Number'), sub { $self->sales_invoice($_[0], display => 'table-cell') } ], + [ $::locale->text('Type'), sub { $_[0]->displayable_type } ], + [ $::locale->text('Invoice Number'), sub { $_[0]->presenter->sales_invoice(display => 'table-cell') } ], [ $::locale->text('Quotation Number'), 'quonumber' ], [ $::locale->text('Order Number'), 'ordnumber' ], [ $::locale->text('Customer'), 'customer' ], @@ -305,15 +408,15 @@ sub _sales_invoice_list { } sub _purchase_invoice_list { - my ($self, $list, %params) = @_; + my ($list, %params) = @_; - return $self->record_list( + return record_list( $list, title => $::locale->text('Purchase Invoices'), type => 'purchase_invoice', columns => [ [ $::locale->text('Invoice Date'), 'transdate' ], - [ $::locale->text('Invoice Number'), sub { $self->purchase_invoice($_[0], display => 'table-cell') } ], + [ $::locale->text('Invoice Number'), sub { $_[0]->presenter->purchase_invoice(display => 'table-cell') } ], [ $::locale->text('Request for Quotation Number'), 'quonumber' ], [ $::locale->text('Order Number'), 'ordnumber' ], [ $::locale->text('Vendor'), 'vendor' ], @@ -326,15 +429,16 @@ sub _purchase_invoice_list { } sub _ar_transaction_list { - my ($self, $list, %params) = @_; + my ($list, %params) = @_; - return $self->record_list( + return record_list( $list, title => $::locale->text('AR Transactions'), type => 'ar_transaction', columns => [ [ $::locale->text('Invoice Date'), 'transdate' ], - [ $::locale->text('Invoice Number'), sub { $self->ar_transaction($_[0], display => 'table-cell') } ], + [ $::locale->text('Type'), sub { $_[0]->displayable_type } ], + [ $::locale->text('Invoice Number'), sub { $_[0]->presenter->ar_transaction(display => 'table-cell') } ], [ $::locale->text('Customer'), 'customer' ], [ $::locale->text('Net amount'), 'netamount' ], [ $::locale->text('Paid'), 'paid' ], @@ -345,15 +449,15 @@ sub _ar_transaction_list { } sub _ap_transaction_list { - my ($self, $list, %params) = @_; + my ($list, %params) = @_; - return $self->record_list( + return record_list( $list, title => $::locale->text('AP Transactions'), type => 'ap_transaction', columns => [ [ $::locale->text('Invoice Date'), 'transdate' ], - [ $::locale->text('Invoice Number'), sub { $self->ap_transaction($_[0 ], display => 'table-cell') } ], + [ $::locale->text('Invoice Number'), sub { $_[0]->presenter->ap_transaction(display => 'table-cell') } ], [ $::locale->text('Vendor'), 'vendor' ], [ $::locale->text('Net amount'), 'netamount' ], [ $::locale->text('Paid'), 'paid' ], @@ -363,6 +467,133 @@ sub _ap_transaction_list { ); } +sub _gl_transaction_list { + my ($list, %params) = @_; + + return record_list( + $list, + title => $::locale->text('GL Transactions'), + type => 'gl_transaction', + columns => [ + [ $::locale->text('Transdate'), 'transdate' ], + [ $::locale->text('Reference'), 'reference' ], + [ $::locale->text('Description'), sub { $_[0]->presenter->gl_transaction(display => 'table-cell') } ], + ], + %params, + ); +} + +sub _bank_transactions { + my ($list, %params) = @_; + + return record_list( + $list, + title => $::locale->text('Bank transactions'), + type => 'bank_transactions', + columns => [ + [ $::locale->text('Transdate'), 'transdate' ], + [ $::locale->text('Local Bank Code'), sub { $_[0]->local_bank_account->presenter->bank_code } ], + [ $::locale->text('Local account number'), sub { $_[0]->local_bank_account->presenter->account_number } ], + [ $::locale->text('Remote Bank Code'), 'remote_bank_code' ], + [ $::locale->text('Remote account number'),'remote_account_number' ], + [ $::locale->text('Valutadate'), 'valutadate' ], + [ $::locale->text('Amount'), 'amount' ], + [ $::locale->text('Currency'), sub { $_[0]->currency->name } ], + [ $::locale->text('Remote name'), 'remote_name' ], + [ $::locale->text('Purpose'), 'purpose' ], + ], + %params, + ); +} + +sub _sepa_export_list { + my ($list, %params) = @_; + + my ($source, $destination) = $params{type} eq 'sepa_transfer' ? qw(our vc) : qw(vc our); + $params{title} = $params{type} eq 'sepa_transfer' ? $::locale->text('Bank transfers via SEPA') : $::locale->text('Bank collections via SEPA'); + $params{with_columns} = [ grep { $_ ne 'record_link_direction' } @{ $params{with_columns} || [] } ]; + + delete $params{edit_record_links}; + + return record_list( + $list, + columns => [ + [ $::locale->text('Export Number'), 'sepa_export', ], + [ $::locale->text('Execution date'), 'execution_date' ], + [ $::locale->text('Export date'), sub { $_[0]->sepa_export->itime->to_kivitendo } ], + [ $::locale->text('Source BIC'), "${source}_bic" ], + [ $::locale->text('Source IBAN'), "${source}_iban" ], + [ $::locale->text('Destination BIC'), "${destination}_bic" ], + [ $::locale->text('Destination IBAN'), "${destination}_iban" ], + [ $::locale->text('Amount'), 'amount' ], + ], + %params, + ); +} + +sub _sepa_transfer_list { + my ($list, %params) = @_; + _sepa_export_list($list, %params, type => 'sepa_transfer'); +} + +sub _sepa_collection_list { + my ($list, %params) = @_; + _sepa_export_list($list, %params, type => 'sepa_collection'); +} + +sub _letter_list { + my ($list, %params) = @_; + + return record_list( + $list, + title => $::locale->text('Letters'), + type => 'letter', + columns => [ + [ $::locale->text('Date'), 'date' ], + [ $::locale->text('Letternumber'), sub { $_[0]->presenter->letter(display => 'table-cell') } ], + [ $::locale->text('Customer'), 'customer' ], + [ $::locale->text('Reference'), 'reference' ], + [ $::locale->text('Subject'), 'subject' ], + ], + %params, + ); +} + +sub _email_journal_list { + my ($list, %params) = @_; + + return record_list( + $list, + title => $::locale->text('Email'), + type => 'email_journal', + columns => [ + [ $::locale->text('Sent on'), sub { $_[0]->sent_on->to_kivitendo(precision => 'seconds') } ], + [ $::locale->text('Subject'), sub { $_[0]->presenter->email_journal(display => 'table-cell') } ], + [ $::locale->text('Status'), 'status' ], + [ $::locale->text('From'), 'from' ], + [ $::locale->text('To'), 'recipients' ], + ], + %params, + ); +} +sub _dunning_list { + my ($list, %params) = @_; + + return record_list( + $list, + title => $::locale->text('Dunnings'), + type => 'dunning', + columns => [ + [ $::locale->text('Dunning Level'), sub { $_[0]->presenter->dunning(display => 'table-cell') } ], + [ $::locale->text('Dunning Date'), 'transdate' ], + [ $::locale->text('Dunning Duedate'), 'duedate' ], + [ $::locale->text('Total Fees'), 'fee' ], + [ $::locale->text('Interest'), 'interest' ], + ], + %params, + ); +} + 1; __END__ @@ -393,6 +624,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 @@ -433,6 +676,12 @@ The order in which the records are grouped is: =item * AP transactions +=item * GL transactions + +=item * SEPA collections + +=item * SEPA transfers + =back Objects of unknown types are skipped. @@ -483,13 +732,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 @@ -497,7 +746,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