use SL::Controller::Helper::GetModels;
use SL::Controller::Helper::ReportGenerator;
use SL::Locale::String;
+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) ],
);
__PACKAGE__->run_before(sub { $::auth->assert('delivery_plan'); });
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;
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 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 %column_defs = (
reqdate => { sub => sub { $_[0]->reqdate_as_date || $_[0]->order->reqdate_as_date } },
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) } },
- $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) && $::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(
);
$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
sub make_filter_summary {
my ($self) = @_;
+ my $vc = $self->vc;
my $filter = $::form->{filter} || {};
my @filter_strings;
[ $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}{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') ],
);
my %flags = (
}
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.employee_id = $employee_id AND";
# check delivered state for delivery_orders (transferred out) if enabled
sub init_models {
my ($self) = @_;
+ my $vc = $self->vc;
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 },
);
}
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 link_to {
my ($self, $object, %params) = @_;
projects / kivitendo-erp.git / blobdiff