Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 97eaf9e0

Von Tamino Steinert vor mehr als 1 Jahr hinzugefügt

  • ID 97eaf9e0169d4dd2e404ce047109cad4e229b862
  • Vorgänger 157648ca
  • Nachfolger 0ff3f593

Angebotsflag aus Datenbankzugriffen entfernt

Unterschiede anzeigen:

SL/Controller/Order.pm
1428 1428

  
1429 1429
  my $sales_quotations   = SL::DB::Manager::Order->get_all(where => [id            => $::form->{ids},
1430 1430
                                                                     or             => [closed => 0, closed => undef],
1431
                                                                     quotation      => 1,
1432
                                                                     '!customer_id' => undef]);
1431
                                                                     record_type    => SALES_QUOTATION_TYPE()]);
1433 1432

  
1434 1433
  my $request_quotations = SL::DB::Manager::Order->get_all(where => [id            => $::form->{ids},
1435 1434
                                                                     or             => [closed => 0, closed => undef],
1436
                                                                     quotation      => 1,
1437
                                                                     '!vendor_id'   => undef]);
1435
                                                                     record_type    => REQUEST_QUOTATION_TYPE()]);
1438 1436

  
1439 1437
  $::auth->assert('sales_quotation_edit')   if scalar @$sales_quotations;
1440 1438
  $::auth->assert('request_quotation_edit') if scalar @$request_quotations;
......
1821 1819
  $order   = SL::DB::Order->new(id => $::form->{id})->load(with => [ 'orderitems', 'orderitems.part' ]) if $::form->{id};
1822 1820
  $order ||= SL::DB::Order->new(orderitems  => [],
1823 1821
                                record_type => $self->type,
1824
                                quotation   => (any { $self->type eq $_ } (SALES_QUOTATION_TYPE(), REQUEST_QUOTATION_TYPE())),
1825 1822
                                currency_id => $::instance_conf->get_currency_id(),);
1826 1823

  
1827 1824
  my $cv_id_method = $self->cv . '_id';
......
2074 2071
  }
2075 2072

  
2076 2073
  my $objects_to_close = scalar @converted_from_oe_ids
2077
                       ? SL::DB::Manager::Order->get_all(where => [id => \@converted_from_oe_ids, quotation => 1])
2074
                       ? SL::DB::Manager::Order->get_all(where => [
2075
                           id => \@converted_from_oe_ids,
2076
                           or => [ record_type => SALES_QUOTATION_TYPE(),
2077
                                   record_type => REQUEST_QUOTATION_TYPE()]
2078
                           ])
2078 2079
                       : undef;
2079 2080

  
2080 2081
  my $items_to_delete  = scalar @{ $self->item_ids_to_delete || [] }

Auch abrufbar als: Unified diff