Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision a0ea00e5

Von Werner Hahn vor fast 2 Jahren hinzugefügt

  • ID a0ea00e5968450ad8bd96e11e2ad7eac3623a4f2
  • Vorgänger 26e26d83
  • Nachfolger f8e5dc24

Fix für #531 Link im Lagerbuchungbericht für RMA (Retouren) Lieferscheine und Beistelllieferscheine

Unterschiede anzeigen:

SL/Controller/DeliveryOrder.pm
1113 1113
    for my $stock (@{ $item->delivery_order_stock_entries }) {
1114 1114
      my $transfer = SL::DB::Inventory->new_from($stock);
1115 1115
      $transfer->trans_type($trans_type);
1116
      $transfer->oe_id($order->id);
1116 1117
      $transfer->qty($transfer->qty * -1) if $inout eq 'out';
1117 1118
      $transfer->qty($transfer->qty * 1) if $inout eq 'in';
1118 1119

  
SL/WH.pm
427 427
  if ($form->{l_oe_id}) {
428 428
    $q_oe_id = <<SQL;
429 429
      SELECT dord.id AS id, dord.donumber AS number,
430
        CASE
431
          WHEN dord.customer_id IS NULL THEN 'purchase_delivery_order'
432
          ELSE                               'sales_delivery_order'
433
        END AS type
430
      dord.order_type AS type
434 431
      FROM delivery_orders dord
435 432
      WHERE dord.id = ?
436 433

  
bin/mozilla/wh.pl
728 728
                                       'data'           => \@contents);
729 729

  
730 730

  
731
  my %doc_types = ( 'sales_quotation'         => { script => 'oe', title => $locale->text('Sales quotation') },
732
                    'sales_order'             => { script => 'oe', title => $locale->text('Sales Order') },
733
                    'request_quotation'       => { script => 'oe', title => $locale->text('Request quotation') },
734
                    'purchase_order'          => { script => 'oe', title => $locale->text('Purchase Order') },
735
                    'sales_delivery_order'    => { script => 'do', title => $locale->text('Sales delivery order') },
736
                    'purchase_delivery_order' => { script => 'do', title => $locale->text('Purchase delivery order') },
737
                    'sales_invoice'           => { script => 'is', title => $locale->text('Sales Invoice') },
738
                    'purchase_invoice'        => { script => 'ir', title => $locale->text('Purchase Invoice') },
731
  my %doc_types = ( 'sales_quotation'         => { action => 'edit', script => 'oe', title => $locale->text('Sales quotation') },
732
                    'sales_order'             => { action => 'edit', script => 'oe', title => $locale->text('Sales Order') },
733
                    'request_quotation'       => { action => 'edit', script => 'oe', title => $locale->text('Request quotation') },
734
                    'purchase_order'          => { action => 'edit', script => 'oe', title => $locale->text('Purchase Order') },
735
                    'sales_delivery_order'    => { action => 'edit', script => 'do', title => $locale->text('Sales delivery order') },
736
                    'purchase_delivery_order' => { action => 'edit', script => 'do', title => $locale->text('Purchase delivery order') },
737
                    'supplier_delivery_order' => { action => 'DeliveryOrder/edit', script => 'controller', title => $locale->text('Supplier delivery order') },
738
                    'rma_delivery_order'      => { action => 'DeliveryOrder/edit', script => 'controller', title => $locale->text('RMA delivery order') },
739
                    'sales_invoice'           => { action => 'edit', script => 'is', title => $locale->text('Sales Invoice') },
740
                    'purchase_invoice'        => { action => 'edit', script => 'ir', title => $locale->text('Purchase Invoice') },
739 741
                  );
740 742

  
741 743
  my $idx       = 0;
......
768 770

  
769 771
      if ($info && $info->{id} && $info->{type} && $doc_types{$info->{type}}) {
770 772
        $row->{oe_id} = { data => $doc_types{ $info->{type} }->{title} . ' ' . $info->{number},
771
                          link => build_std_url('script=' . $doc_types{ $info->{type} }->{script} . '.pl', 'action=edit', 'id=' . $info->{id}, 'type=' . $info->{type}) };
773
                          link => build_std_url('script=' . $doc_types{ $info->{type} }->{script} . '.pl', 'action=' . $doc_types{ $info->{type} }->{action}, 'id=' . $info->{id}, 'type=' . $info->{type}) };
772 774
      }
773 775
    }
774 776

  

Auch abrufbar als: Unified diff