Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 48508b25

Von Tamino Steinert vor 6 Monaten hinzugefügt

  • ID 48508b25dc9bfec9aac34bf8b0be3d783e51d596
  • Vorgänger d714c183
  • Nachfolger e68a2521

Speichern/Buchen und schließen zu Belegen hinzufügt

Versucht Callback aufzurufen oder geht zu Loginseite.

Unterschiede anzeigen:

SL/Controller/DeliveryOrder.pm
220 220

  
221 221
  flash_later('info', $self->type_data->text("saved"));
222 222

  
223
  my @redirect_params = (
224
    action => 'edit',
225
    type   => $self->type,
226
    id     => $self->order->id,
227
  );
223
  my @redirect_params;
224
  if ($::form->{back_to_caller}) {
225
    @redirect_params = $::form->{callback} ? ($::form->{callback})
226
                                           : (controller => 'LoginScreen', action => 'user_login');
227

  
228
  } else {
229
    @redirect_params = (
230
      action   => 'edit',
231
      type     => $self->type,
232
      id       => $self->order->id,
233
      callback => $::form->{callback},
234
    );
235
  }
228 236

  
229 237
  $self->redirect_to(@redirect_params);
230 238
}
......
1143 1151
    ->flash("info", t8("Stock transfered"))
1144 1152
    ->run('kivi.ActionBar.setDisabled', '#save_action',
1145 1153
          t8('This record has already been delivered.'))
1154
    ->run('kivi.ActionBar.setDisabled', '#save_and_close',
1155
          t8('This record has already been delivered.'))
1146 1156
    ->run('kivi.ActionBar.setDisabled', '#transfer_out_action',
1147 1157
          t8('The parts for this order have already been transferred'))
1148 1158
    ->run('kivi.ActionBar.setDisabled', '#transfer_out_default_action',
......
1955 1965
                    : $self->order->delivered ? t8('This record has already been delivered.')
1956 1966
                    :                        undef,
1957 1967
        ],
1968
        action => [
1969
          t8('Save and Close'),
1970
          id       => 'save_and_close',
1971
          call     => [ 'kivi.DeliveryOrder.save', {
1972
              action             => 'save',
1973
              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
1974
              warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate,
1975
              form_params        => [
1976
                { name => 'back_to_caller', value => 1 },
1977
              ],
1978
            }],
1979
          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
1980
                    : $self->order->delivered ? t8('This record has already been delivered.')
1981
                    :                        undef,
1982
        ],
1958 1983
        action => [
1959 1984
          t8('Save as new'),
1960 1985
          call     => [ 'kivi.DeliveryOrder.save', {

Auch abrufbar als: Unified diff