Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 58ae7e4d

Von Werner Hahn vor mehr als 2 Jahren hinzugefügt

  • ID 58ae7e4dea18b112b66066d3ca3aa49d1fc697d3
  • Vorgänger 13b8f24a
  • Nachfolger a24773da

fix #506 - Beistelllieferschein/DeliveryOrderController speichern deaktiviert wenn schon geliefert und ausgelagert

Unterschiede anzeigen:

SL/Controller/DeliveryOrder.pm
sub action_print {
my ($self) = @_;
my $errors = $self->save();
if ( !$self->order->delivered ) {
my $errors = $self->save();
if (scalar @{ $errors }) {
$self->js->flash('error', $_) foreach @{ $errors };
return $self->js->render();
}
if (scalar @{ $errors }) {
$self->js->flash('error', $_) foreach @{ $errors };
return $self->js->render();
}
$self->js_reset_order_and_item_ids_after_save;
$self->js_reset_order_and_item_ids_after_save;
}
my $format = $::form->{print_options}->{format};
my $media = $::form->{print_options}->{media};
......
sub action_preview_pdf {
my ($self) = @_;
my $errors = $self->save();
if (scalar @{ $errors }) {
$self->js->flash('error', $_) foreach @{ $errors };
return $self->js->render();
}
if ( !$self->order->delivered ) {
my $errors = $self->save();
if (scalar @{ $errors }) {
$self->js->flash('error', $_) foreach @{ $errors };
return $self->js->render();
}
$self->js_reset_order_and_item_ids_after_save;
$self->js_reset_order_and_item_ids_after_save;
}
my $format = 'pdf';
my $media = 'screen';
......
sub action_save_and_show_email_dialog {
my ($self) = @_;
my $errors = $self->save();
if ( !$self->order->delivered ) {
my $errors = $self->save();
if (scalar @{ $errors }) {
$self->js->flash('error', $_) foreach @{ $errors };
return $self->js->render();
if (scalar @{ $errors }) {
$self->js->flash('error', $_) foreach @{ $errors };
return $self->js->render();
}
}
my $cv_method = $self->cv;
......
sub action_send_email {
my ($self) = @_;
my $errors = $self->save();
if ( !$self->order->delivered ) {
my $errors = $self->save();
if (scalar @{ $errors }) {
$self->js->run('kivi.DeliveryOrder.close_email_dialog');
$self->js->flash('error', $_) foreach @{ $errors };
return $self->js->render();
if (scalar @{ $errors }) {
$self->js->run('kivi.DeliveryOrder.close_email_dialog');
$self->js->flash('error', $_) foreach @{ $errors };
return $self->js->render();
}
$self->js_reset_order_and_item_ids_after_save;
}
$self->js_reset_order_and_item_ids_after_save;
my $email_form = delete $::form->{email_form};
my %field_names = (to => 'email');
......
warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
warn_on_reqdate => $::instance_conf->get_order_warn_no_deliverydate },
],
disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
: $self->order->delivered ? t8('This record has already been delivered.')
: undef,
],
action => [
t8('Save as new'),

Auch abrufbar als: Unified diff