X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FDeliveryPlan.pm;h=33bede6a0f27af2a7bfb26cf9567f70c1925749f;hb=172936e967f916e736a61a9177cbe1d53d42907e;hp=ff17464cc316837d7e6fc2cc65ca80427460025d;hpb=3ce13f69f98665e51f3e9d49df4a6255705d59ac;p=kivitendo-erp.git diff --git a/SL/Controller/DeliveryPlan.pm b/SL/Controller/DeliveryPlan.pm index ff17464cc..33bede6a0 100644 --- a/SL/Controller/DeliveryPlan.pm +++ b/SL/Controller/DeliveryPlan.pm @@ -10,6 +10,7 @@ use SL::Controller::Helper::Paginated; use SL::Controller::Helper::Sorted; use SL::Controller::Helper::ParseFilter; use SL::Controller::Helper::ReportGenerator; +use SL::Locale::String; use Rose::Object::MakeMethods::Generic ( scalar => [ qw(db_args flat_filter) ], @@ -25,47 +26,34 @@ __PACKAGE__->make_paginated( ); __PACKAGE__->make_sorted( - MODEL => 'OrderItem', - ONLY => [ qw(list) ], - - DEFAULT_BY => 'reqdate', - DEFAULT_DIR => 1, - - reqdate => 'Reqdate', - description => 'Description', - partnumber => 'Part Number', - qty => 'Qty', - missing => 'Missing qty', - shipped_qty => 'shipped', - ordnumber => 'Order', - customer => 'Customer', + MODEL => 'OrderItem', + ONLY => [ qw(list) ], + + DEFAULT_BY => 'reqdate', + DEFAULT_DIR => 1, + + reqdate => t8('Reqdate'), + description => t8('Description'), + partnumber => t8('Part Number'), + qty => t8('Qty'), + shipped_qty => t8('shipped'), + not_shipped_qty => t8('not shipped'), + ordnumber => t8('Order'), + customer => t8('Customer'), ); sub action_list { my ($self) = @_; - my %list_params = ( - filter => $::form->{filter}, - ); - $self->db_args($self->setup_for_list(%list_params)); + $self->db_args($self->setup_for_list(filter => $::form->{filter})); $self->flat_filter({ map { $_->{key} => $_->{value} } $::form->flatten_variables('filter') }); $self->make_filter_summary; - my $top = $::form->parse_html_template('delivery_plan/report_top', { FORM => $::form, SELF => $self }); - my $bottom = $::form->parse_html_template('delivery_plan/report_bottom', { SELF => $self }); - - $self->prepare_report( - report_generator_options => { - raw_top_info_text => $top, - raw_bottom_info_text => $bottom, - controller_class => 'DeliveryPlan', - }, - report_generator_export_options => [ qw(list filter sort_by sort_dir) ], - ); + $self->prepare_report; - $self->{orderitems} = $self->get_models(%{ $self->db_args }); + my $orderitems = $self->get_models(%{ $self->db_args }); - $self->list_objects; + $self->report_generator_list_objects(report => $self->{report}, objects => $orderitems); } # private functions @@ -131,6 +119,26 @@ sub setup_for_list { rl.from_table ='oe' AND rl.to_table = 'delivery_orders' ) + + UNION ALL + + -- 5. In case someone deleted a line of the delivery_order there will be a record_link (4 fails) + -- but there won't be a delivery_order_items to find (3 fails too). Search for orphaned orderitems this way + SELECT oi.id FROM orderitems AS oi, oe, record_links AS rl + WHERE + rl.from_table = 'oe' AND + rl.to_table = 'delivery_orders' AND + + oi.trans_id = rl.from_id AND + oi.parts_id NOT IN ( + SELECT doi.parts_id FROM delivery_order_items AS doi WHERE doi.delivery_order_id = rl.to_id + ) AND + + oe.id = oi.trans_id AND + + oe.customer_id IS NOT NULL AND + (oe.quotation = 'f' OR oe.quotation IS NULL) AND + NOT oe.closed " ], ) ]; @@ -139,85 +147,49 @@ sub setup_for_list { } sub prepare_report { - my ($self, %params) = @_; + my ($self) = @_; - my $objects = $params{objects} || []; - my $report = SL::ReportGenerator->new(\%::myconfig, $::form); + my $report = SL::ReportGenerator->new(\%::myconfig, $::form); $self->{report} = $report; - my @columns = qw(reqdate customer ordnumber partnumber description qty shipped_qty); - my @visible = qw(reqdate partnumber description qty shipped_qty ordnumber customer); - my @sortable = qw(reqdate partnumber description ordnumber customer); + my @columns = qw(reqdate customer ordnumber partnumber description qty shipped_qty not_shipped_qty); + my @sortable = qw(reqdate customer ordnumber partnumber description); my %column_defs = ( - reqdate => { sub => sub { $_[0]->reqdate_as_date || $_[0]->order->reqdate_as_date }}, - description => { sub => sub { $_[0]->description }, - 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 . ' ' . $_[0]->unit }}, - missing => { sub => sub { $::form->format_amount(\%::myconfig, $_[0]->qty - $_[0]->shipped_qty, 2) . ' ' . $_[0]->unit }}, - shipped_qty => { sub => sub { $::form->format_amount(\%::myconfig, $_[0]->shipped_qty, 2) . ' ' . $_[0]->unit }}, - ordnumber => { sub => sub { $_[0]->order->ordnumber }, - obj_link => sub { $self->link_to($_[0]->order) }}, - customer => { sub => sub { $_[0]->order->customer->name }, - obj_link => sub { $self->link_to($_[0]->order->customer) }}, + reqdate => { sub => sub { $_[0]->reqdate_as_date || $_[0]->order->reqdate_as_date } }, + description => { sub => sub { $_[0]->description }, + 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 . ' ' . $_[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 } }, + ordnumber => { sub => sub { $_[0]->order->ordnumber }, + obj_link => sub { $self->link_to($_[0]->order) } }, + customer => { sub => sub { $_[0]->order->customer->name }, + obj_link => sub { $self->link_to($_[0]->order->customer) } }, ); map { $column_defs{$_}->{text} = $::locale->text( $self->get_sort_spec->{$_}->{title} ) } keys %column_defs; - my %current_sort_params = $self->get_current_sort_params; - - for my $col (@sortable) { - $column_defs{$col}{link} = $self->get_callback( - # TODO: column header links from helper - sort_by => $col, - sort_dir => ($current_sort_params{by} eq $col ? 1 - $current_sort_params{dir} : $current_sort_params{dir}), - ); - } - - map { $column_defs{$_}->{visible} = 1 } @visible; - - $report->set_columns(%column_defs); - $report->set_column_order(@columns); - $report->set_options(allow_pdf_export => 1, allow_csv_export => 1); - $report->set_sort_indicator($current_sort_params{by}, $current_sort_params{dir}); - $report->set_export_options(@{ $params{report_generator_export_options} || [] }); $report->set_options( - %{ $params{report_generator_options} || {} }, - output_format => 'HTML', - top_info_text => $::locale->text('Delivery Plan for currently outstanding sales orders'), - title => $::locale->text('Delivery Plan'), + std_column_visibility => 1, + controller_class => 'DeliveryPlan', + output_format => 'HTML', + top_info_text => $::locale->text('Delivery Plan for currently outstanding sales orders'), + raw_top_info_text => $self->render('delivery_plan/report_top', { output => 0 }), + raw_bottom_info_text => $self->render('delivery_plan/report_bottom', { output => 0 }), + 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)); $report->set_options_from_form; + $self->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable); $self->disable_pagination if $report->{options}{output_format} =~ /^(pdf|csv)$/i; - - $self->{report_data} = { - column_defs => \%column_defs, - columns => \@columns, - visible => \@visible, - sortable => \@sortable, - }; -} - -sub list_objects { - my ($self) = @_; - my $column_defs = $self->{report_data}{column_defs}; - for my $obj (@{ $self->{orderitems} || [] }) { - $self->{report}->add_data({ - map { - $_ => { - data => $column_defs->{$_}{sub} ? $column_defs->{$_}{sub}->($obj) - : $obj->can($_) ? $obj->$_ - : $obj->{$_}, - link => $column_defs->{$_}{obj_link} ? $column_defs->{$_}{obj_link}->($obj) : '', - }, - } @{ $self->{report_data}{columns} || {} } - }); - } - - return $self->{report}->generate_with_headers; } sub make_filter_summary { @@ -227,19 +199,19 @@ sub make_filter_summary { my @filter_strings; my @filters = ( - [ $filter->{order}{"ordnumber:substr::ilike"}, $::locale->text('Number') ], - [ $filter->{part}{"partnumber:substr::ilike"}, $::locale->text('Part Number') ], - [ $filter->{"description:substr::ilike"}, $::locale->text('Part Description') ], - [ $filter->{"reqdate:date::ge"}, $::locale->text('Delivery Date') . " " . $::locale->text('From Date') ], - [ $filter->{"reqdate:date::le"}, $::locale->text('Delivery Date') . " " . $::locale->text('To Date') ], - [ $filter->{"qty:number"}, $::locale->text('Quantity') ], - [ $filter->{order}{customer}{"name:substr::ilike"}, $::locale->text('Customer') ], - [ $filter->{order}{customer}{"customernumber:substr::ilike"}, $::locale->text('Customer Number') ], + [ $filter->{order}{"ordnumber:substr::ilike"}, $::locale->text('Number') ], + [ $filter->{part}{"partnumber:substr::ilike"}, $::locale->text('Part Number') ], + [ $filter->{"description:substr::ilike"}, $::locale->text('Part Description') ], + [ $filter->{"reqdate:date::ge"}, $::locale->text('Delivery Date') . " " . $::locale->text('From Date') ], + [ $filter->{"reqdate:date::le"}, $::locale->text('Delivery Date') . " " . $::locale->text('To Date') ], + [ $filter->{"qty:number"}, $::locale->text('Quantity') ], + [ $filter->{order}{customer}{"name:substr::ilike"}, $::locale->text('Customer') ], + [ $filter->{order}{customer}{"customernumber:substr::ilike"}, $::locale->text('Customer Number') ], ); my @flags = ( - [ $filter->{part}{type}{part}, $::locale->text('Parts') ], - [ $filter->{part}{type}{service}, $::locale->text('Services') ], + [ $filter->{part}{type}{part}, $::locale->text('Parts') ], + [ $filter->{part}{type}{service}, $::locale->text('Services') ], [ $filter->{part}{type}{assembly}, $::locale->text('Assemblies') ], );