X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCustomerVendor.pm;h=4812f1b4002c3bdf5ff6ae9e9161c2d6b890cf93;hb=12b522fa1375e36d6985663f5679abd05303ee45;hp=373f713607ab1766e5d3e58ce18ea97991f06830;hpb=9508e215c78bc172721e14d41d21858abb23672e;p=kivitendo-erp.git diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm index 373f71360..4812f1b40 100644 --- a/SL/Controller/CustomerVendor.pm +++ b/SL/Controller/CustomerVendor.pm @@ -28,6 +28,8 @@ use SL::DB::FollowUpLink; use SL::DB::History; use SL::DB::Currency; use SL::DB::Invoice; +use SL::DB::PurchaseInvoice; +use SL::DB::Order; use Data::Dumper; @@ -279,7 +281,7 @@ sub _transaction { my $db = $self->is_vendor() ? 'vendor' : 'customer'; my $action = 'add'; - if ($::instance_conf->get_feature_experimental && 'oe.pl' eq $script) { + if ($::instance_conf->get_feature_experimental_order && 'oe.pl' eq $script) { $script = 'controller.pl'; $action = 'Order/' . $action; } @@ -945,18 +947,43 @@ sub _pre_render { ], with_objects => ['follow_up'], ); - - $self->{open_items} = SL::DB::Manager::Invoice->get_all_count( - query => [ - customer_id => $self->{cv}->id, - paid => {lt_sql => 'amount'}, - ], - ); - + + if ( $self->is_vendor()) { + $self->{open_items} = SL::DB::Manager::PurchaseInvoice->get_all_count( + query => [ + vendor_id => $self->{cv}->id, + paid => {lt_sql => 'amount'}, + ], + ); + } else { + $self->{open_items} = SL::DB::Manager::Invoice->get_all_count( + query => [ + customer_id => $self->{cv}->id, + paid => {lt_sql => 'amount'}, + ], + ); + } + + if ( $self->is_vendor() ) { + $self->{open_orders} = SL::DB::Manager::Order->get_all_count( + query => [ + vendor_id => $self->{cv}->id, + closed => 'F', + ], + ); + } else { + $self->{open_orders} = SL::DB::Manager::Order->get_all_count( + query => [ + customer_id => $self->{cv}->id, + closed => 'F', + ], + ); + } $self->{template_args} ||= {}; $::request->{layout}->add_javascripts('kivi.CustomerVendor.js'); $::request->{layout}->add_javascripts('kivi.File.js'); + $::request->{layout}->add_javascripts('kivi.CustomerVendorTurnover.js'); $self->_setup_form_action_bar; }