X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCustomerVendorTurnover.pm;h=5a59f1fbdb6bb63e3859fdd7eee636acb130df87;hb=fc9829b3ee7076be97b2b9511994d18b0c6d4b84;hp=b0a7c655235d8a7d190bb7040b49bec3bb9e77c0;hpb=e19609317e221f6b10cbe18a70b215d744736388;p=kivitendo-erp.git diff --git a/SL/Controller/CustomerVendorTurnover.pm b/SL/Controller/CustomerVendorTurnover.pm index b0a7c6552..5a59f1fbd 100644 --- a/SL/Controller/CustomerVendorTurnover.pm +++ b/SL/Controller/CustomerVendorTurnover.pm @@ -16,42 +16,51 @@ sub action_list_turnover { return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id}; - my $cv = $::form->{id} || {}; + my $cv = $::form->{id}; my $open_invoices; if ( $::form->{db} eq 'customer' ) { - $open_invoices = SL::DB::Manager::Invoice->get_all( - query => [customer_id => $cv, - or => [ - amount => { gt => \'paid'}, - amount => { lt => \'paid'}, - ], - ], - with_objects => ['dunnings'], - ); + $open_invoices = SL::DB::Manager::Invoice->get_all( + query => [ + customer_id => $cv, + or => [ + amount => { gt => \'paid'}, + amount => { lt => \'paid'}, + ], + ], + sort_by => 'transdate DESC', + with_objects => [ 'dunnings' ], + ); } else { $open_invoices = SL::DB::Manager::PurchaseInvoice->get_all( - query => [ vendor_id => $cv, - or => [ - amount => { gt => \'paid'}, - amount => { lt => \'paid'}, - ], - ], - sort_by => 'invnumber DESC', + query => [ + vendor_id => $cv, + or => [ + amount => { gt => \'paid'}, + amount => { lt => \'paid'}, + ], + ], + sort_by => 'transdate DESC', ); } my $open_items; if (@{$open_invoices}) { - return $self->render(\'', { type => 'json' }) unless scalar @{$open_invoices}; $open_items = $self->_list_open_items($open_invoices); } - my $open_orders = $self->_get_open_orders(); - return $self->render('customer_vendor_turnover/turnover', { header => 0 }, open_orders => $open_orders, open_items => $open_items, id => $cv); + my $open_orders = $self->_get_open_orders; + return $self->render('customer_vendor_turnover/turnover', { header => 0 }, + open_orders => $open_orders, + open_items => $open_items, + id => $cv, + ); } sub _list_open_items { my ($self, $open_items) = @_; - return $self->render('customer_vendor_turnover/_list_open_items', { output => 0 }, OPEN_ITEMS => $open_items, title => $::locale->text('Open Items') ); + return $self->render('customer_vendor_turnover/_list_open_items', { output => 0 }, + OPEN_ITEMS => $open_items, + title => $::locale->text('Open Items'), + ); } sub action_count_open_items_by_year { @@ -60,22 +69,22 @@ sub action_count_open_items_by_year { return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id}; my $dbh = SL::DB->client->dbh; - my $cv = $::form->{id} || {}; - - my $query = "SELECT EXTRACT (YEAR FROM d.transdate), - count(d.id), - max(d.dunning_level) - FROM dunning d - LEFT JOIN ar a - ON a.id = d.trans_id - LEFT JOIN customer c - ON a.customer_id = c.id - WHERE c.id = $cv - GROUP BY EXTRACT (YEAR FROM d.transdate), c.id - ORDER BY date_part DESC"; - - $self->{dun_statistic} = selectall_hashref_query($::form, $dbh, $query); - $self->render('customer_vendor_turnover/count_open_items_by_year', { layout => 0 }); + my $cv = $::form->{id}; + + my $query = <{dun_statistic} = selectall_hashref_query($::form, $dbh, $query, $cv); + $self->render('customer_vendor_turnover/count_open_items_by_year', { layout => 0 }); } sub action_count_open_items_by_month { @@ -85,21 +94,21 @@ sub action_count_open_items_by_month { return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id}; my $dbh = SL::DB->client->dbh; - my $cv = $::form->{id} || {}; - - my $query = "SELECT CONCAT(EXTRACT (MONTH FROM d.transdate),'/',EXTRACT (YEAR FROM d.transdate)) AS date_part, - count(d.id), - max(d.dunning_level) - FROM dunning d - LEFT JOIN ar a - ON a.id = d.trans_id - LEFT JOIN customer c - ON a.customer_id = c.id - WHERE c.id = $cv - GROUP BY EXTRACT (YEAR FROM d.transdate), EXTRACT (MONTH FROM d.transdate), c.id - ORDER BY EXTRACT (YEAR FROM d.transdate) DESC"; - - $self->{dun_statistic} = selectall_hashref_query($::form, $dbh, $query); + my $cv = $::form->{id}; + + my $query = <{dun_statistic} = selectall_hashref_query($::form, $dbh, $query, $cv); $self->render('customer_vendor_turnover/count_open_items_by_year', { layout => 0 }); } @@ -110,7 +119,7 @@ sub action_turnover_by_month { return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id}; my $dbh = SL::DB->client->dbh; - my $cv = $::form->{id} || {}; + my $cv = $::form->{id}; my ($db, $cv_type); if ($::form->{db} eq 'customer') { $db = "ar"; @@ -120,16 +129,16 @@ sub action_turnover_by_month { $cv_type = "vendor_id"; } my $query = <{turnover_statistic} = selectall_hashref_query($::form, $dbh, $query); + $self->{turnover_statistic} = selectall_hashref_query($::form, $dbh, $query, $cv); $self->render('customer_vendor_turnover/count_turnover', { layout => 0 }); } @@ -139,7 +148,7 @@ sub action_turnover_by_year { return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id}; my $dbh = SL::DB->client->dbh; - my $cv = $::form->{id} || {}; + my $cv = $::form->{id}; my ($db, $cv_type); if ($::form->{db} eq 'customer') { $db = "ar"; @@ -149,16 +158,16 @@ sub action_turnover_by_year { $cv_type = "vendor_id"; } my $query = <{turnover_statistic} = selectall_hashref_query($::form, $dbh, $query); + $self->{turnover_statistic} = selectall_hashref_query($::form, $dbh, $query, $cv); $self->render('customer_vendor_turnover/count_turnover', { layout => 0 }); } @@ -167,17 +176,17 @@ sub action_get_invoices { return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id}; - my $cv = $::form->{id} || {}; + my $cv = $::form->{id}; my $invoices; if ( $::form->{db} eq 'customer' ) { $invoices = SL::DB::Manager::Invoice->get_all( - query => [ customer_id => $cv, ], - sort_by => 'invnumber DESC', + query => [ customer_id => $cv, ], + sort_by => 'transdate DESC', ); } else { $invoices = SL::DB::Manager::PurchaseInvoice->get_all( - query => [ vendor_id => $cv, ], - sort_by => 'invnumber DESC', + query => [ vendor_id => $cv, ], + sort_by => 'transdate DESC', ); } $self->render('customer_vendor_turnover/invoices_statistic', { layout => 0 }, invoices => $invoices); @@ -188,20 +197,24 @@ sub action_get_orders { return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id}; - my $cv = $::form->{id} || {}; + my $cv = $::form->{id}; my $orders; my $type = $::form->{type}; if ( $::form->{db} eq 'customer' ) { $orders = SL::DB::Manager::Order->get_all( - query => [ customer_id => $cv, - quotation => ($type eq 'quotation' ? 'T' : 'F') ], - sort_by => ( $type eq 'order' ? 'ordnumber DESC' : 'quonumber DESC'), + query => [ + customer_id => $cv, + quotation => ($type eq 'quotation' ? 'T' : 'F') + ], + sort_by => 'transdate DESC', ); } else { $orders = SL::DB::Manager::Order->get_all( - query => [ vendor_id => $cv, - quotation => ($type eq 'quotation' ? 'T' : 'F') ], - sort_by => ( $type eq 'order' ? 'ordnumber DESC' : 'quonumber DESC'), + query => [ + vendor_id => $cv, + quotation => ($type eq 'quotation' ? 'T' : 'F') + ], + sort_by => 'transdate DESC', ); } if ( $type eq 'order') { @@ -216,154 +229,190 @@ sub _get_open_orders { return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id}; my $open_orders; - my $cv = $::form->{id} || {}; + my $cv = $::form->{id}; if ( $::form->{db} eq 'customer' ) { $open_orders = SL::DB::Manager::Order->get_all( - query => [ customer_id => $cv, - closed => 'F', - ], - sort_by => 'ordnumber DESC', - ); + query => [ + customer_id => $cv, + closed => 'F', + ], + sort_by => 'transdate DESC', + ); } else { $open_orders = SL::DB::Manager::Order->get_all( - query => [ vendor_id => $cv, - closed => 'F', - ], - sort_by => 'ordnumber DESC', - ); + query => [ + vendor_id => $cv, + closed => 'F', + ], + sort_by => 'transdate DESC', + ); } return 0 unless scalar @{$open_orders}; - return $self->render('customer_vendor_turnover/_list_open_orders', { output => 0 }, orders => $open_orders, title => $::locale->text('Open Orders') ); + return $self->render('customer_vendor_turnover/_list_open_orders', { output => 0 }, + orders => $open_orders, + title => $::locale->text('Open Orders'), + ); } sub action_get_mails { my ( $self ) = @_; + return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id}; my $dbh = SL::DB->client->dbh; my $query; my $cv = $::form->{id}; if ( $::form->{db} eq 'customer') { $query = <render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id}; - my $cv = $::form->{id} || {}; + my $cv = $::form->{id}; my $letters; my $type = $::form->{type}; if ( $::form->{db} eq 'customer' ) { $letters = SL::DB::Manager::Letter->get_all( - query => [ customer_id => $cv, ], + query => [ customer_id => $cv, ], sort_by => 'date DESC', ); } else { $letters = SL::DB::Manager::Letter->get_all( - query => [ vendor_id => $cv, ], + query => [ vendor_id => $cv, ], sort_by => 'date DESC', ); } $self->render('customer_vendor_turnover/letter_statistic', { layout => 0 }, letters => $letters); } -sub _list_articles_by_invoice { -} -sub _list_count_articles_by_year { -} sub check_auth { - $::auth->assert('general_ledger'); + $::auth->assert('show_extra_record_tab_customer | show_extra_record_tab_vendor'); } + 1; __END__ @@ -415,8 +461,6 @@ Gets all kinds of records like orders, request orders, quotations, invoices, ema wich belong to customer/vendor and displays them in an extra tab "Records". -=back - =head1 URL ACTIONS =over 4 @@ -481,4 +525,4 @@ None yet. :) W. Hahn Ewh@futureworldsearch.netE -=back +=cut