use List::MoreUtils qw(uniq);
use List::Util qw(first);
-use SL::ClientJS;
use SL::DB::Customer;
use SL::DB::Order;
use SL::DB::Part;
use Rose::Object::MakeMethods::Generic
(
scalar => [ qw(parts) ],
- 'scalar --get_set_init' => [ qw(requirement_spec rs_order js h_unit_name all_customers all_parts_time_unit section_order_part) ],
+ 'scalar --get_set_init' => [ qw(requirement_spec rs_order h_unit_name all_customers all_parts_time_unit section_order_part) ],
);
__PACKAGE__->run_before('setup');
my ($self) = @_;
if (!@{ $self->all_parts_time_unit }) {
- return $self->js->flash('error', t8('This function requires the presence of articles with a time-based unit such as "h" or "min".'))->render($self);
+ return $self->js->flash('error', t8('This function requires the presence of articles with a time-based unit such as "h" or "min".'))->render;
}
my $html = $self->render('requirement_spec_order/new', { output => 0 }, make_part_title => sub { $_[0]->partnumber . ' ' . $_[0]->description });
$self->js->hide(LIST_SELECTOR())
->after(LIST_SELECTOR(), $html)
- ->render($self);
+ ->render;
}
sub action_create {
my ($self) = @_;
if (!$::auth->assert($::form->{quotation} ? 'sales_quotation_edit' : 'sales_order_edit', 1)) {
- return $self->js->flash('error', t8("You do not have the permissions to access this function."))->render($self);
+ return $self->js->flash('error', t8("You do not have the permissions to access this function."))->render;
}
# 1. Update sections with selected part IDs.
$self->js->replaceWith(LIST_SELECTOR(), $html)
->remove(FORMS_SELECTOR())
->flash('info', $::form->{quotation} ? t8('Sales quotation #1 has been created.', $order->quonumber) : t8('Sales order #1 has been created.', $order->ordnumber))
- ->render($self);
+ ->render;
}
sub action_update {
my $sections = $self->requirement_spec->sections_sorted;
if (!$::auth->assert($order->quotation ? 'sales_quotation_edit' : 'sales_order_edit', 1)) {
- return $self->js->flash('error', t8("You do not have the permissions to access this function."))->render($self);
+ return $self->js->flash('error', t8("You do not have the permissions to access this function."))->render;
}
my (@orderitems, %sections_seen);
$self->js->hide(LIST_SELECTOR())
->after(LIST_SELECTOR(), $html)
- ->render($self);
+ ->render;
}
sub action_do_update {
$self->js->replaceWith(LIST_SELECTOR(), $html)
->remove(FORMS_SELECTOR())
->flash('info', $::form->{quotation} ? t8('Sales quotation #1 has been updated.', $order->quonumber) : t8('Sales order #1 has been updated.', $order->ordnumber))
- ->render($self);
+ ->render;
}
sub action_edit_assignment {
my ($self) = @_;
if (!@{ $self->all_parts_time_unit }) {
- return $self->js->flash('error', t8('This function requires the presence of articles with a time-based unit such as "h" or "min".'))->render($self);
+ return $self->js->flash('error', t8('This function requires the presence of articles with a time-based unit such as "h" or "min".'))->render;
}
my $html = $self->render('requirement_spec_order/edit_assignment', { output => 0 }, make_part_title => sub { $_[0]->partnumber . ' ' . $_[0]->description });
$self->js->hide(LIST_SELECTOR())
->after(LIST_SELECTOR(), $html)
->reinit_widgets
- ->render($self);
+ ->render;
}
sub action_save_assignment {
my $html = $self->render('requirement_spec_order/list', { output => 0 });
$self->js->replaceWith(LIST_SELECTOR(), $html)
->remove(FORMS_SELECTOR())
- ->render($self);
+ ->render;
}
sub action_delete {
my $html = $self->render('requirement_spec_order/list', { output => 0 });
$self->js->replaceWith(LIST_SELECTOR(), $html)
->flash('info', $order->quotation ? t8('Sales quotation #1 has been deleted.', $order->quonumber) : t8('Sales order #1 has been deleted.', $order->ordnumber))
- ->render($self);
+ ->render;
}
#
my ($self) = @_;
$::auth->assert('requirement_spec_edit');
- $::request->{layout}->use_stylesheet("${_}.css") for qw(jquery.contextMenu requirement_spec autocomplete_part);
+ $::request->{layout}->use_stylesheet("${_}.css") for qw(jquery.contextMenu requirement_spec);
$::request->{layout}->use_javascript("${_}.js") for qw(jquery.jstree jquery/jquery.contextMenu client_js requirement_spec);
return 1;
$self->requirement_spec(SL::DB::RequirementSpec->new(id => $::form->{requirement_spec_id})->load) if $::form->{requirement_spec_id};
}
-sub init_js {
- my ($self) = @_;
- $self->js(SL::ClientJS->new);
-}
-
sub init_all_customers { SL::DB::Manager::Customer->get_all_sorted }
sub init_h_unit_name { SL::DB::Manager::Unit->find_h_unit->name };
sub init_rs_order { SL::DB::RequirementSpecOrder->new(id => $::form->{rs_order_id})->load };
longdescription => $longdescription,
qty => $is_time_based ? $section->time_estimation * 1 : 1,
unit => $is_time_based ? $self->h_unit_name : $part->unit,
- sellprice => $::form->round_amount($self->requirement_spec->hourly_rate * ($is_time_based ? 1 : $section->time_estimation), 2),
- lastcost => $part->lastcost,
+ sellprice => $::form->round_amount($self->requirement_spec->hourly_rate * ($is_time_based ? 1 : $section->time_estimation * $section->sellprice_factor), 2),
+ lastcost => $part->lastcost * $section->sellprice_factor,
discount => 0,
project_id => $self->requirement_spec->project_id,
);
my @orderitems = map { $self->create_order_item( section => $_, language_id => $customer->language_id) } @{ $params{sections} };
my @add_items = map { $self->create_additional_part_order_item(additional_part => $_, language_id => $customer->language_id) } @{ $params{additional_parts} };
my $employee = SL::DB::Manager::Employee->current;
+ my $reqdate = !$::form->{quotation} ? undef
+ : $customer->payment_id ? $customer->payment->calc_date
+ : DateTime->today_local->next_workday(extra_days => $::instance_conf->get_reqdate_interval)->to_kivitendo;
my $order = SL::DB::Order->new(
globalproject_id => $self->requirement_spec->project_id,
transdate => DateTime->today_local,
- reqdate => $::form->{quotation} && $customer->payment_id ? $customer->payment->calc_date : undef,
+ reqdate => $reqdate,
quotation => !!$::form->{quotation},
orderitems => [ @orderitems, @add_items ],
customer_id => $customer->id,
projects / kivitendo-erp.git / blobdiff