X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FDeliveryPlan.pm;h=98f168b1ec5e5e424bb55aa75dc10c9e4f0936ad;hb=41229db38e57ad893178df32d7a30045ef77f5fd;hp=a69702f1bf82d3025695c31c0c9ebbde1f792040;hpb=e7c07dfd71ff0a74de729351627ca5b3a3833ec9;p=kivitendo-erp.git diff --git a/SL/Controller/DeliveryPlan.pm b/SL/Controller/DeliveryPlan.pm index a69702f1b..98f168b1e 100644 --- a/SL/Controller/DeliveryPlan.pm +++ b/SL/Controller/DeliveryPlan.pm @@ -9,11 +9,13 @@ use SL::DB::Business; use SL::Controller::Helper::GetModels; use SL::Controller::Helper::ReportGenerator; use SL::Locale::String; +use SL::AM; +use SL::DBUtils (); use Carp; use Rose::Object::MakeMethods::Generic ( scalar => [ qw(db_args flat_filter) ], - 'scalar --get_set_init' => [ qw(models all_edit_right mode vc all_employees all_businesses) ], + 'scalar --get_set_init' => [ qw(models all_edit_right vc all_employees all_businesses) ], ); __PACKAGE__->run_before(sub { $::auth->assert('delivery_plan'); }); @@ -23,14 +25,12 @@ my %sort_columns = ( description => t8('Description'), partnumber => t8('Part Number'), qty => t8('Qty'), - unit => t8('Unit'), shipped_qty => t8('shipped'), delivered_qty => t8('transferred in / out'), not_shipped_qty => t8('not shipped'), ordnumber => t8('Order'), customer => t8('Customer'), vendor => t8('Vendor'), - value_of_goods => t8('Value of transferred goods'), ); @@ -40,7 +40,7 @@ sub action_list { $self->prepare_report; my $orderitems = $self->models->get; - + $self->calc_qtys($orderitems); $self->report_generator_list_objects(report => $self->{report}, objects => $orderitems); } @@ -50,15 +50,12 @@ sub prepare_report { my ($self) = @_; my $vc = $self->vc; - my $mode = $self->mode; my $report = SL::ReportGenerator->new(\%::myconfig, $::form); - my $csv_option = $::form->{report_generator_output_format}; $self->{report} = $report; - my @columns = qw(reqdate customer vendor ordnumber partnumber description qty shipped_qty not_shipped_qty delivered_qty value_of_goods); + my @columns = qw(reqdate customer vendor ordnumber partnumber description qty shipped_qty not_shipped_qty delivered_qty); my @sortable = qw(reqdate customer vendor ordnumber partnumber description); - my $rp_csv_mod = ($csv_option eq 'CSV' && $mode eq 'delivery_value_report') ? 1 : ''; my %column_defs = ( reqdate => { sub => sub { $_[0]->reqdate_as_date || $_[0]->order->reqdate_as_date } }, @@ -66,16 +63,10 @@ sub prepare_report { obj_link => sub { $self->link_to($_[0]->part) } }, partnumber => { sub => sub { $_[0]->part->partnumber }, obj_link => sub { $self->link_to($_[0]->part) } }, - qty => { sub => sub { $_[0]->qty_as_number . - ($rp_csv_mod ? '' : ' ' . $_[0]->unit) } }, - unit => { sub => sub { $_[0]->unit }, - visible => $rp_csv_mod }, - shipped_qty => { sub => sub { $::form->format_amount(\%::myconfig, $_[0]->shipped_qty, 2) . - ($rp_csv_mod ? '' : ' ' . $_[0]->unit) } }, - not_shipped_qty => { sub => sub { $::form->format_amount(\%::myconfig, $_[0]->qty - $_[0]->shipped_qty, 2) . - ($rp_csv_mod ? '' : ' ' . $_[0]->unit) } }, - delivered_qty => { sub => sub { $::form->format_amount(\%::myconfig, $_[0]->delivered_qty, 2) . - ($rp_csv_mod ? '' : ' ' . $_[0]->unit) } }, + qty => { sub => sub { $_[0]->qty_as_number . ' ' . $_[0]->unit } }, + shipped_qty => { sub => sub { $::form->format_amount(\%::myconfig, $_[0]{shipped_qty}, 2) . ' ' . $_[0]->unit } }, + not_shipped_qty => { sub => sub { $::form->format_amount(\%::myconfig, $_[0]->qty - $_[0]{shipped_qty}, 2) . ' ' . $_[0]->unit } }, + delivered_qty => { sub => sub { $::form->format_amount(\%::myconfig, $_[0]{delivered_qty}, 2) .' ' . $_[0]->unit } }, ordnumber => { sub => sub { $_[0]->order->ordnumber }, obj_link => sub { $self->link_to($_[0]->order) } }, vendor => { sub => sub { $_[0]->order->vendor->name }, @@ -84,8 +75,6 @@ sub prepare_report { customer => { sub => sub { $_[0]->order->customer->name }, visible => $vc eq 'customer', obj_link => sub { $self->link_to($_[0]->order->customer) } }, - value_of_goods => { sub => sub { $::form->format_amount(\%::myconfig, $_[0]->value_of_goods, 2) . ' ' . $_[0]->taxincluded }, - visible => $::auth->assert('sales_order_edit', 1) && $mode eq 'delivery_value_report' && $::instance_conf->get_delivery_plan_show_value_of_goods, }, ); $column_defs{$_}->{text} = $sort_columns{$_} for keys %column_defs; @@ -94,17 +83,15 @@ sub prepare_report { std_column_visibility => 1, controller_class => 'DeliveryPlan', output_format => 'HTML', - top_info_text => ($vc eq 'customer') ? (($mode eq 'delivery_plan') ? $::locale->text('Delivery Plan for currently outstanding sales orders') : - $::locale->text('Delivery Value Report for currently open sales orders')) : - ($mode eq 'delivery_value_report') ? $::locale->text('Delivery Value Report for currently outstanding purchase orders') : + top_info_text => ($vc eq 'customer') ? $::locale->text('Delivery Plan for currently outstanding sales orders') : $::locale->text('Delivery Plan for currently outstanding purchase orders'), - title => ($mode eq 'delivery_plan') ? $::locale->text('Delivery Plan') : $::locale->text('Delivery Value Report'), + title => $::locale->text('Delivery Plan'), allow_pdf_export => 1, allow_csv_export => 1, ); $report->set_columns(%column_defs); $report->set_column_order(@columns); - $report->set_export_options(qw(list filter vc mode)); + $report->set_export_options(qw(list filter vc)); $report->set_options_from_form; $self->models->disable_plugin('paginated') if $report->{options}{output_format} =~ /^(pdf|csv)$/i; $self->models->finalize; # for filter laundering @@ -115,16 +102,48 @@ sub prepare_report { ); } +sub calc_qtys { + my ($self, $orderitems) = @_; + # using $orderitem->shipped_qty 40 times is far too slow. need to do it manually + # + + return unless scalar @$orderitems; + + my %orderitems_by_id = map { $_->id => $_ } @$orderitems; + + my $query = <get_standard_dbh, $query, map { $_->id } @$orderitems); + + for my $row (@$result) { + my $item = $orderitems_by_id{ $row->{id} }; + $item->{shipped_qty} ||= 0; + $item->{delivered_qty} ||= 0; + $item->{shipped_qty} += AM->convert_unit($row->{unit} => $item->unit) * $row->{qty}; + $item->{delivered_qty} += AM->convert_unit($row->{unit} => $item->unit) * $row->{qty} if $row->{delivered}; + } +} + sub make_filter_summary { my ($self) = @_; my $vc = $self->vc; - my $mode = $self->mode; + my ($business, $employee); my $filter = $::form->{filter} || {}; my @filter_strings; - my $business = SL::DB::Business->new(id => $filter->{order}{customer}{"business_id"})->load->description if $filter->{order}{customer}{"business_id"}; - my $employee = SL::DB::Employee->new(id => $filter->{order}{employee_id})->load->name if $filter->{order}{employee_id}; + $business = SL::DB::Business->new(id => $filter->{order}{customer}{"business_id"})->load->description if $filter->{order}{customer}{"business_id"}; + $employee = SL::DB::Employee->new(id => $filter->{order}{employee_id})->load->name if $filter->{order}{employee_id}; my @filters = ( [ $filter->{order}{"ordnumber:substr::ilike"}, $::locale->text('Number') ], @@ -162,16 +181,11 @@ sub make_filter_summary { sub delivery_plan_query { my ($self) = @_; my $vc = $self->vc; - my $mode = $self->mode; my $employee_id = SL::DB::Manager::Employee->current->id; my $oe_owner = $_[0]->all_edit_right ? '' : " oe.employee_id = $employee_id AND"; # check delivered state for delivery_orders (transferred out) if enabled - # OR if we are delivery_value_report mode - my $filter_delivered = ($::instance_conf->get_delivery_plan_calculate_transferred_do || - $mode eq 'delivery_value_report' ) ? - "AND (SELECT delivered from delivery_orders where id = doi.delivery_order_id)" : ''; - # Show ALL open orders in delivery_value_report mode - my $comment_show_all_open_orders = ($mode eq 'delivery_value_report' ) ? "-- " : ""; + my $filter_delivered = ($::instance_conf->get_delivery_plan_calculate_transferred_do) ? + "AND (SELECT delivered from delivery_orders where id = doi.delivery_order_id)" : ''; [ "order.${vc}_id" => { gt => 0 }, 'order.closed' => 0, @@ -264,7 +278,7 @@ sub delivery_plan_query { FROM record_links rl WHERE oi.trans_id = rl.from_id AND rl.from_table = 'oe' AND rl.to_table = 'delivery_orders' ) AND - $comment_show_all_open_orders coalesce(sum, 0) < oi.qty AND + coalesce(sum, 0) < oi.qty AND oe.${vc}_id IS NOT NULL AND $oe_owner (oe.quotation = 'f' OR oe.quotation IS NULL) AND NOT oe.closed @@ -275,20 +289,20 @@ sub delivery_plan_query { sub init_models { my ($self) = @_; my $vc = $self->vc; - my $mode = $self->mode; + SL::Controller::Helper::GetModels->new( - controller => $self, - model => 'OrderItem', - sorted => { - _default => { - by => 'reqdate', - dir => 1, + controller => $self, + model => 'OrderItem', + sorted => { + _default => { + by => 'reqdate', + dir => 1, }, %sort_columns, }, - query => $self->delivery_plan_query, - with_objects => [ 'order', "order.$vc", 'part' ], - additional_url_params => { vc => $vc, mode => $mode}, + query => $self->delivery_plan_query, + with_objects => [ 'order', "order.$vc", 'part' ], + additional_url_params => { vc => $vc}, ); } @@ -298,9 +312,6 @@ sub init_all_edit_right { sub init_vc { return $::form->{vc} if ($::form->{vc} eq 'customer' || $::form->{vc} eq 'vendor') || croak "self (DeliveryPlan) has no vc defined"; } -sub init_mode { - return $::form->{mode} if ($::form->{mode} eq 'delivery_value_report' || $::form->{mode} eq 'delivery_plan') || croak "self (DeliveryPlan) has no mode defined"; -} sub init_all_employees { return SL::DB::Manager::Employee->get_all_sorted;