use SL::Controller::Helper::GetModels;
use SL::Controller::Helper::ReportGenerator;
use SL::Locale::String;
+use SL::Helper::ShippedQty;
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 use_linked_items all_employees all_businesses) ],
);
__PACKAGE__->run_before(sub { $::auth->assert('delivery_plan'); });
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'),
);
my $orderitems = $self->models->get;
$self->calc_qtys($orderitems);
+ $self->setup_list_action_bar;
$self->report_generator_list_objects(report => $self->{report}, objects => $orderitems);
}
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);
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 } },
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 } },
ordnumber => { sub => sub { $_[0]->order->ordnumber },
obj_link => sub { $self->link_to($_[0]->order) } },
vendor => { sub => sub { $_[0]->order->vendor->name },
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 => $mode eq 'delivery_value_report' },
);
$column_defs{$_}->{text} = $sort_columns{$_} for keys %column_defs;
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 use_linked_items));
$report->set_options_from_form;
$self->models->disable_plugin('paginated') if $report->{options}{output_format} =~ /^(pdf|csv)$/i;
$self->models->finalize; # for filter laundering
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 = <<SQL;
- SELECT oi.id, doi.qty, doi.unit, doe.delivered
- FROM record_links rl
- INNER JOIN delivery_order_items doi ON (doi.delivery_order_id = rl.to_id)
- INNER JOIN delivery_orders doe ON (doe.id = rl.to_id)
- INNER JOIN orderitems oi ON (oi.trans_id = rl.from_id)
- WHERE rl.from_table = 'oe'
- AND rl.to_table = 'delivery_orders'
- AND oi.parts_id = doi.parts_id
- AND oi.id IN (@{[ join ', ', ("?")x @$orderitems ]})
-SQL
-
- my $result = SL::DBUtils::selectall_hashref_query($::form, $::form->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};
- }
+ SL::Helper::ShippedQty
+ ->new(fill_up => !$self->use_linked_items)
+ ->calculate($orderitems)
+ ->write_to_objects;
}
sub make_filter_summary {
my ($self) = @_;
my $vc = $self->vc;
- my $mode = $self->mode;
my ($business, $employee);
my $filter = $::form->{filter} || {};
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' ) ? "-- " : "";
+
[
"order.${vc}_id" => { gt => 0 },
'order.closed' => 0,
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
(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
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
- " ],
+ " ], # make emacs happy again: '
+ ]
+}
+
+sub delivery_plan_query_linked_items {
+ my ($self) = @_;
+ my $vc = $self->vc;
+ my $employee_id = SL::DB::Manager::Employee->current->id;
+ my $oe_owner = $_[0]->all_edit_right ? '' : " oe.employee_id = $employee_id AND";
+
+ [
+ "order.${vc}_id" => { gt => 0 },
+ 'order.closed' => 0,
+ or => [ 'order.quotation' => 0, 'order.quotation' => undef ],
+
+ # filter by shipped_qty < qty, read from innermost to outermost
+ 'id' => [ \"
+ SELECT id FROM (
+ SELECT oi.qty, oi.id, SUM(doi.qty) AS doi_qty
+ FROM orderitems oi, oe, record_links rl, delivery_order_items doi
+ WHERE
+ oe.id = oi.trans_id AND
+ oe.${vc}_id IS NOT NULL AND
+ (oe.quotation = 'f' OR oe.quotation IS NULL) AND
+ NOT oe.closed AND
+ $oe_owner
+ doi.id = rl.to_id AND
+ rl.from_table = 'orderitems'AND
+ rl.to_table = 'delivery_order_items' AND
+ rl.from_id = oi.id
+ GROUP BY oi.id
+ ) linked
+ WHERE qty > doi_qty
+
+ UNION ALL
+
+ -- 2. since the join over record_links fails for items not in 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.${vc}_id IS NOT NULL AND
+ (oe.quotation = 'f' OR oe.quotation IS NULL) AND
+ NOT oe.closed AND
+ $oe_owner
+ oi.id NOT IN (
+ SELECT from_id
+ FROM record_links rl
+ WHERE
+ rl.from_table ='orderitems' AND
+ rl.to_table = 'delivery_order_items'
+ )
+
+ " ], # make emacs happy again: " ]
]
}
sub init_models {
my ($self) = @_;
my $vc = $self->vc;
- my $mode = $self->mode;
+
+ my $query = $self->use_linked_items ? $self->delivery_plan_query_linked_items
+ : $self->delivery_plan_query;
+
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 => $query,
+ with_objects => [ 'order', "order.$vc", 'part' ],
+ additional_url_params => { vc => $vc, use_linked_items => $self->use_linked_items },
);
}
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_use_linked_items {
+ !!$::form->{use_linked_items};
}
sub init_all_employees {
}
if ($object->isa('SL::DB::Part')) {
my $id = $object->id;
- return "ic.pl?action=$action&id=$id";
+ return "controller.pl?action=Part/$action&part.id=$id";
}
if ($object->isa('SL::DB::Customer')) {
my $id = $object->id;
}
}
+sub setup_list_action_bar {
+ my ($self, %params) = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Update'),
+ submit => [ '#filter_form', { action => 'DeliveryPlan/list' } ],
+ accesskey => 'enter',
+ ],
+ );
+ }
+}
+
1;
projects / kivitendo-erp.git / blobdiff