Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision c364e43e

Von Peter Schulgin vor mehr als 7 Jahren hinzugefügt

  • ID c364e43efab3ac6f0f0c20cd6f8f89a85ab45280
  • Vorgänger b36f0864
  • Nachfolger 96593e93

Revert "Artikel-Klassifizierung"

This reverts commit 5067d7bd31514962af9730b33323b831d87164f8.

Unterschiede anzeigen:

SL/WH.pm
368 368
    push @filter_vars, like($filter{description});
369 369
  }
370 370

  
371
  if ($filter{classification_id}) {
372
    push @filter_ary, "p.classification_id = ?";
373
    push @filter_vars, $filter{classification_id};
374
  }
375

  
376 371
  if ($filter{chargenumber}) {
377 372
    push @filter_ary, "i1.chargenumber ILIKE ?";
378 373
    push @filter_vars, like($filter{chargenumber});
......
431 426
     "qty"                  => "ABS(SUM(i1.qty))",
432 427
     "partnumber"           => "p.partnumber",
433 428
     "partdescription"      => "p.description",
434
     "classification_id"    => "p.classification_id",
435
     "assembly"             => "p.assembly",
436
     "inventory_accno_id"   => "p.inventory_accno_id",
437 429
     "bindescription"       => "b.description",
438 430
     "chargenumber"         => "i1.chargenumber",
439 431
     "bestbefore"           => "i1.bestbefore",
......
465 457
     "warehouse_from"       => "'$filter{na}'",
466 458
     };
467 459

  
468
  $form->{l_classification_id}  = 'Y';
469
  $form->{l_assembly}           = 'Y';
470
  $form->{l_inventory_accno_id} = 'Y';
471 460
  $form->{l_invoice_id} = $form->{l_oe_id} if $form->{l_oe_id};
472 461

  
473 462
  # build the select clauses.
......
625 614
#  - warehouse_id - will return matches with this warehouse_id only
626 615
#  - partnumber   - will return only matches where the given string is a substring of the partnumber
627 616
#  - partsid      - will return matches with this parts_id only
628
#  - classification_id - will return matches with this parts with this classification only
629 617
#  - description  - will return only matches where the given string is a substring of the description
630 618
#  - chargenumber - will return only matches where the given string is a substring of the chargenumber
631 619
#  - bestbefore   - will return only matches with this bestbefore date
......
677 665
    push @filter_vars, like($filter{partnumber});
678 666
  }
679 667

  
680
  if ($filter{classification_id}) {
681
    push @filter_ary, "p.classification_id = ?";
682
    push @filter_vars, $filter{classification_id};
683
  }
684

  
685 668
  if ($filter{description}) {
686 669
    push @filter_ary,  "p.description ILIKE ?";
687 670
    push @filter_vars, like($filter{description});
......
754 737
     "warehouseid"          => "i.warehouse_id",
755 738
     "partnumber"           => "p.partnumber",
756 739
     "partdescription"      => "p.description",
757
     "classification_id"    => "p.classification_id",
758
     "assembly"             => "p.assembly",
759
     "inventory_accno_id"   => "p.inventory_accno_id",
760 740
     "bindescription"       => "b.description",
761 741
     "binid"                => "b.id",
762 742
     "chargenumber"         => "i.chargenumber",
......
767 747
     "partunit"             => "p.unit",
768 748
     "stock_value"          => "p.lastcost / COALESCE(pfac.factor, 1)",
769 749
  );
770
  $form->{l_classification_id}  = 'Y';
771
  $form->{l_assembly}           = 'Y';
772
  $form->{l_inventory_accno_id} = 'Y';
773 750
  my $select_clause = join ', ', map { +/^l_/; "$select_tokens{$'} AS $'" }
774 751
        ( grep( { !/qty/ and /^l_/ and $form->{$_} eq 'Y' } keys %$form),
775 752
          qw(l_parts_id l_qty l_partunit) );

Auch abrufbar als: Unified diff