Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision c04bc3bf

Von Bernd Bleßmann vor 12 Monaten hinzugefügt

  • ID c04bc3bfa0e625f56f9f62b789781e851212df12
  • Vorgänger 4a6557b7
  • Nachfolger 4425d550

Lieferantenauftragsbestätigung: Controller/Maske

Unterschiede anzeigen:

SL/Controller/Order.pm
246 246
  my $text = $self->type eq SALES_ORDER_INTAKE_TYPE()        ? $::locale->text('The order intake has been deleted')
247 247
           : $self->type eq SALES_ORDER_TYPE()               ? $::locale->text('The order confirmation has been deleted')
248 248
           : $self->type eq PURCHASE_ORDER_TYPE()            ? $::locale->text('The order has been deleted')
249
           : $self->type eq PURCHASE_ORDER_CONFIRMATION_TYPE() ? $::locale->text('The order confirmation has been deleted')
249 250
           : $self->type eq SALES_QUOTATION_TYPE()           ? $::locale->text('The quotation has been deleted')
250 251
           : $self->type eq REQUEST_QUOTATION_TYPE()         ? $::locale->text('The rfq has been deleted')
251 252
           : $self->type eq PURCHASE_QUOTATION_INTAKE_TYPE() ? $::locale->text('The quotation intake has been deleted')
......
2109 2110
                           id => \@converted_from_oe_ids,
2110 2111
                           or => [  record_type => SALES_QUOTATION_TYPE(),
2111 2112
                                    record_type => REQUEST_QUOTATION_TYPE(),
2112
                                   (record_type => PURCHASE_QUOTATION_INTAKE_TYPE()) x $self->order->is_type(PURCHASE_ORDER_TYPE())  ]
2113
                                   (record_type => PURCHASE_QUOTATION_INTAKE_TYPE()) x $self->order->is_type(PURCHASE_ORDER_TYPE()),
2114
                                   (record_type => PURCHASE_ORDER_TYPE())            x $self->order->is_type(PURCHASE_ORDER_CONFIRMATION_TYPE())  ]
2113 2115
                           ])
2114 2116
                       : undef;
2115 2117

  
......
2178 2180
    $item->active_discount_source($price_source->discount_from_source($item->active_discount_source));
2179 2181
  }
2180 2182

  
2181
  if (any { $self->type eq $_ } (SALES_ORDER_INTAKE_TYPE(), SALES_ORDER_TYPE(), PURCHASE_ORDER_TYPE())) {
2183
  if (any { $self->type eq $_ } (SALES_ORDER_INTAKE_TYPE(), SALES_ORDER_TYPE(), PURCHASE_ORDER_TYPE(), PURCHASE_ORDER_CONFIRMATION_TYPE())) {
2182 2184
    # Calculate shipped qtys here to prevent calling calculate for every item via the items method.
2183 2185
    # Do not use write_to_objects to prevent order->delivered to be set, because this should be
2184 2186
    # the value from db, which can be set manually or is set when linked delivery orders are saved.
......
2340 2342
          only_if   => $self->type_data->show_menu('save_and_purchase_order'),
2341 2343
          disabled  => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
2342 2344
        ],
2345
        action => [
2346
          t8('Save and Purchase Order Confirmation'),
2347
          call      => [ 'kivi.Order.purchase_check_for_direct_delivery', { to_type => PURCHASE_ORDER_CONFIRMATION_TYPE() } ],
2348
          checks    => [ @valid, @req_trans_cost_art, @req_cusordnumber ],
2349
          only_if   => $self->type_data->show_menu('save_and_purchase_order_confirmation'),
2350
          disabled  => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
2351
        ],
2343 2352
        action => [
2344 2353
          t8('Save and Sales Delivery Order'),
2345 2354
          call      => [ 'kivi.Order.save', {

Auch abrufbar als: Unified diff