X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FDeliveryPlan.pm;h=98f168b1ec5e5e424bb55aa75dc10c9e4f0936ad;hb=870dd5ecdac46144203fe84249981d12b63b741d;hp=fc402fcc6fd75682a87b4c8d64edbe66ab018eca;hpb=86f5b962b5a46ad83fe8d376c82b097f85b97d51;p=kivitendo-erp.git diff --git a/SL/Controller/DeliveryPlan.pm b/SL/Controller/DeliveryPlan.pm index fc402fcc6..98f168b1e 100644 --- a/SL/Controller/DeliveryPlan.pm +++ b/SL/Controller/DeliveryPlan.pm @@ -5,13 +5,17 @@ use parent qw(SL::Controller::Base); use Clone qw(clone); use SL::DB::OrderItem; +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) ], + 'scalar --get_set_init' => [ qw(models all_edit_right vc all_employees all_businesses) ], ); __PACKAGE__->run_before(sub { $::auth->assert('delivery_plan'); }); @@ -22,19 +26,21 @@ my %sort_columns = ( partnumber => t8('Part Number'), qty => t8('Qty'), 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'), ); + sub action_list { my ($self) = @_; - $self->make_filter_summary; $self->prepare_report; my $orderitems = $self->models->get; - + $self->calc_qtys($orderitems); $self->report_generator_list_objects(report => $self->{report}, objects => $orderitems); } @@ -43,11 +49,13 @@ sub action_list { sub prepare_report { my ($self) = @_; + my $vc = $self->vc; my $report = SL::ReportGenerator->new(\%::myconfig, $::form); $self->{report} = $report; - my @columns = qw(reqdate customer ordnumber partnumber description qty shipped_qty not_shipped_qty); - my @sortable = qw(reqdate customer ordnumber partnumber description); + 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 %column_defs = ( reqdate => { sub => sub { $_[0]->reqdate_as_date || $_[0]->order->reqdate_as_date } }, @@ -56,11 +64,16 @@ sub prepare_report { 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 } }, + 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 }, + visible => $vc eq 'vendor', + obj_link => sub { $self->link_to($_[0]->order->vendor) } }, customer => { sub => sub { $_[0]->order->customer->name }, + visible => $vc eq 'customer', obj_link => sub { $self->link_to($_[0]->order->customer) } }, ); @@ -70,14 +83,15 @@ sub prepare_report { std_column_visibility => 1, controller_class => 'DeliveryPlan', output_format => 'HTML', - top_info_text => $::locale->text('Delivery Plan for currently outstanding sales 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 => $::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_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 @@ -88,21 +102,63 @@ 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 ($business, $employee); my $filter = $::form->{filter} || {}; my @filter_strings; + $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') ], - [ $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->{order}{globalproject}{"projectnumber:substr::ilike"}, $::locale->text('Document Project 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}{vendor}{"name:substr::ilike"}, $::locale->text('Vendor') ], + [ $filter->{order}{vendor}{"vendornumber:substr::ilike"}, $::locale->text('Vendor Number') ], + [ $filter->{order}{customer}{"name:substr::ilike"}, $::locale->text('Customer') ], + [ $filter->{order}{customer}{"customernumber:substr::ilike"}, $::locale->text('Customer Number') ], + [ $business, $::locale->text('Customer type') ], + [ $employee, $::locale->text('Employee') ], ); my %flags = ( @@ -123,10 +179,15 @@ sub make_filter_summary { } sub delivery_plan_query { + my ($self) = @_; + my $vc = $self->vc; my $employee_id = SL::DB::Manager::Employee->current->id; - my $oe_owner = $_[0]->all_edit_right ? '' : " oe.eployee_id = $employee_id AND"; + my $oe_owner = $_[0]->all_edit_right ? '' : " oe.employee_id = $employee_id AND"; + # check delivered state for delivery_orders (transferred out) if enabled + my $filter_delivered = ($::instance_conf->get_delivery_plan_calculate_transferred_do) ? + "AND (SELECT delivered from delivery_orders where id = doi.delivery_order_id)" : ''; [ - 'order.customer_id' => { gt => 0 }, + "order.${vc}_id" => { gt => 0 }, 'order.closed' => 0, or => [ 'order.quotation' => 0, 'order.quotation' => undef ], @@ -142,7 +203,7 @@ sub delivery_plan_query { FROM orderitems oi, oe, record_links rl, delivery_order_items doi WHERE oe.id = oi.trans_id AND - oe.customer_id IS NOT NULL AND + oe.${vc}_id IS NOT NULL AND (oe.quotation = 'f' OR oe.quotation IS NULL) AND NOT oe.closed AND $oe_owner @@ -153,6 +214,7 @@ sub delivery_plan_query { rl.to_table = 'delivery_orders' AND rl.to_id = doi.delivery_order_id AND oi.parts_id = doi.parts_id + $filter_delivered ) tuples GROUP BY parts_id, trans_id, qty ) partials LEFT JOIN orderitems oi ON partials.parts_id = oi.parts_id AND partials.trans_id = oi.trans_id @@ -160,12 +222,12 @@ sub delivery_plan_query { UNION ALL - -- 4. since the join over record_links fails for sales_orders wihtout any delivery order + -- 4. since the join over record_links fails for sales_orders without any delivery order -- retrieve those without record_links at all SELECT oi.id FROM orderitems oi, oe WHERE oe.id = oi.trans_id AND - oe.customer_id IS NOT NULL AND + oe.${vc}_id IS NOT NULL AND (oe.quotation = 'f' OR oe.quotation IS NULL) AND NOT oe.closed AND $oe_owner @@ -200,11 +262,13 @@ sub delivery_plan_query { rl.from_table = 'oe' AND rl.to_table = 'delivery_orders' AND - oe.customer_id IS NOT NULL AND + oe.${vc}_id IS NOT NULL AND $oe_owner (oe.quotation = 'f' OR oe.quotation IS NULL) AND NOT oe.closed ) rl LEFT JOIN delivery_order_items doi ON (rl.to_id = doi.delivery_order_id) + WHERE 1 = 1 + $filter_delivered GROUP BY rl.from_id, doi.parts_id ) agg ON (agg.oid = oi.trans_id AND agg.parts_id = oi.parts_id) LEFT JOIN oe ON oe.id = oi.trans_id @@ -215,7 +279,7 @@ sub delivery_plan_query { WHERE oi.trans_id = rl.from_id AND rl.from_table = 'oe' AND rl.to_table = 'delivery_orders' ) AND coalesce(sum, 0) < oi.qty AND - oe.customer_id IS NOT NULL AND + oe.${vc}_id IS NOT NULL AND $oe_owner (oe.quotation = 'f' OR oe.quotation IS NULL) AND NOT oe.closed " ], @@ -224,6 +288,7 @@ sub delivery_plan_query { sub init_models { my ($self) = @_; + my $vc = $self->vc; SL::Controller::Helper::GetModels->new( controller => $self, @@ -236,14 +301,24 @@ sub init_models { %sort_columns, }, query => $self->delivery_plan_query, - with_objects => [ 'order', 'order.customer', 'part' ], + with_objects => [ 'order', "order.$vc", 'part' ], + additional_url_params => { vc => $vc}, ); } sub init_all_edit_right { $::auth->assert('sales_all_edit', 1) } +sub init_vc { + return $::form->{vc} if ($::form->{vc} eq 'customer' || $::form->{vc} eq 'vendor') || croak "self (DeliveryPlan) has no vc defined"; +} +sub init_all_employees { + return SL::DB::Manager::Employee->get_all_sorted; +} +sub init_all_businesses { + return SL::DB::Manager::Business->get_all_sorted; +} sub link_to { my ($self, $object, %params) = @_;