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 mode vc 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 goods'),
+ value_of_goods => t8('Value of transferred goods'),
);
-my $vc;
sub action_list {
my ($self) = @_;
-
- $vc = "customer";
- $self->make_filter_summary;
- $self->prepare_report;
-
- my $orderitems = $self->models->get;
-
- $self->report_generator_list_objects(report => $self->{report}, objects => $orderitems);
-}
-
-sub action_list_ap {
- my ($self) = @_;
-
- $vc = "vendor";
$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);
}
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 ordnumber partnumber description qty shipped_qty not_shipped_qty delivered_qty value_of_goods);
- 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 value_of_goods);
+
+ 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 . ' ' . $_[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 } },
+ 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) } },
ordnumber => { sub => sub { $_[0]->order->ordnumber },
obj_link => sub { $self->link_to($_[0]->order) } },
- $vc => { sub => sub { $_[0]->order->$vc->name },
- obj_link => sub { $self->link_to($_[0]->order->$vc) } },
+ 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) } },
+ 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, },
);
- # add value of goods in report
- if ($main::auth->assert('sales_order_edit') && $::instance_conf->get_delivery_plan_show_value_of_goods) {
- $column_defs{value_of_goods} = { sub => sub { $::form->format_amount(\%::myconfig, $_[0]->value_of_goods, 2) . ' ' . $_[0]->taxincluded } };
- }
$column_defs{$_}->{text} = $sort_columns{$_} for keys %column_defs;
$report->set_options(
std_column_visibility => 1,
controller_class => 'DeliveryPlan',
output_format => 'HTML',
- top_info_text => ($vc eq 'customer') ? $::locale->text('Delivery Plan for currently outstanding sales orders') :
+ 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') :
$::locale->text('Delivery Plan for currently outstanding purchase orders'),
- title => $::locale->text('Delivery Plan'),
+ title => ($mode eq 'delivery_plan') ? $::locale->text('Delivery Plan') : $::locale->text('Delivery Value Report'),
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 mode));
$report->set_options_from_form;
$self->models->disable_plugin('paginated') if $report->{options}{output_format} =~ /^(pdf|csv)$/i;
$self->models->finalize; # for filter laundering
$self->models->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable);
$report->set_options(
- raw_top_info_text => $self->render('delivery_plan/report_top', { output => 0 }, vc => $vc),
+ raw_top_info_text => $self->render('delivery_plan/report_top', { output => 0 }),
raw_bottom_info_text => $self->render('delivery_plan/report_bottom', { output => 0 }, models => $self->models),
);
}
+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.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};
+ }
+}
+
sub make_filter_summary {
my ($self) = @_;
+ my $vc = $self->vc;
+ my $mode = $self->mode;
+ 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}{$vc}{"name:substr::ilike"}, ($vc eq 'customer') ? $::locale->text('Customer') : $::locale->text('Vendor') ],
- [ $filter->{order}{$vc}{"${vc}number:substr::ilike"}, ($vc eq 'customer') ? $::locale->text('Customer Number') : $::locale->text('Vendor 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 = (
}
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
- my $filter_delivered = $::instance_conf->get_delivery_plan_calculate_transferred_do ?
- "AND (SELECT delivered from delivery_orders where id = doi.delivery_order_id)" : '';
+ # 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,
FROM record_links rl
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
+ $comment_show_all_open_orders 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
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' ],
+ query => $self->delivery_plan_query,
+ with_objects => [ 'order', "order.$vc", 'part' ],
+ additional_url_params => { vc => $vc, mode => $mode},
);
}
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_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;
+}
+sub init_all_businesses {
+ return SL::DB::Manager::Business->get_all_sorted;
+}
sub link_to {
my ($self, $object, %params) = @_;
projects / kivitendo-erp.git / blobdiff