Revision bee7d33f
Von Jan Büren vor mehr als 4 Jahren hinzugefügt
| SL/Controller/Order.pm | ||
|---|---|---|
|
$self->order->transdate(DateTime->now_local());
|
||
|
my $extra_days = $self->{type} eq 'sales_quotation' ? $::instance_conf->get_reqdate_interval :
|
||
|
$self->{type} eq 'sales_order' ? $::instance_conf->get_delivery_date_interval : 1;
|
||
|
$self->order->reqdate(DateTime->today_local->next_workday(extra_days => $extra_days)) if !$self->order->reqdate;
|
||
|
|
||
|
if ( ($self->{type} eq 'sales_order' && $::instance_conf->get_deliverydate_on)
|
||
|
|| ($self->{type} eq 'sales_quotation' && $::instance_conf->get_reqdate_on)
|
||
|
&& (!$self->order->reqdate)) {
|
||
|
$self->order->reqdate(DateTime->today_local->next_workday(extra_days => $extra_days));
|
||
|
}
|
||
|
|
||
|
|
||
|
$self->pre_render();
|
||
| ... | ... | |
|
? DateTime->today_local
|
||
|
: $order->transdate;
|
||
|
|
||
|
# Set new reqdate unless changed
|
||
|
# Set new reqdate unless changed if it is enabled in client config
|
||
|
if ($order->reqdate == $saved_order->reqdate) {
|
||
|
my $extra_days = $self->{type} eq 'sales_quotation' ? $::instance_conf->get_reqdate_interval :
|
||
|
$self->{type} eq 'sales_order' ? $::instance_conf->get_delivery_date_interval : 1;
|
||
|
$new_attrs{reqdate} = DateTime->today_local->next_workday(extra_days => $extra_days);
|
||
|
|
||
|
if ( ($self->{type} eq 'sales_order' && !$::instance_conf->get_deliverydate_on)
|
||
|
|| ($self->{type} eq 'sales_quotation' && !$::instance_conf->get_reqdate_on)) {
|
||
|
$new_attrs{reqdate} = '';
|
||
|
} else {
|
||
|
$new_attrs{reqdate} = DateTime->today_local->next_workday(extra_days => $extra_days);
|
||
|
}
|
||
|
} else {
|
||
|
$new_attrs{reqdate} = $order->reqdate;
|
||
|
}
|
||
Auch abrufbar als: Unified diff
Mandantenkonfig: Lieferdatum bei VK-Auftrag und Gültigsdatum bei VK-Angebot
Anstatt diese beiden Werte zu berechnen, gibt es die Möglichkeit
diese konfigurativ gar nicht zu setzen. Hoffentlich letzmalig auch
für die OE.pm implementiert.