Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision cd32c5e9

Von Stephan Köhler vor fast 19 Jahren hinzugefügt

  • ID cd32c5e983a98a515c0049422db858f2c13c4d7a
  • Vorgänger d527be3a
  • Nachfolger f575aa99

Merge von 703 aus unstable: Bugfix 224
Fix fuer Bug 224 (Rechnung -> Auftrag)
Bugfix Verkauf -> Berichte -> Angebote -> Workflow Angebot -> Auftrag (fuer mehr als ein item)
Bugfix Verkauf -> Berichte -> Angebote -> Workflow Angebot -> Auftrag" (fuer genau ein item)

Unterschiede anzeigen:

SL/OE.pm
581 581
  my $query, @ids;
582 582

  
583 583
  # translate the ids (given by id_# and trans_id_#) into one array of ids, so we can join them later
584
  map { push @ids, $form->{"trans_id_$_"} if ($form->{"id_$_"}) } (1 .. $form->{"rowcount"});
584
  map { push @ids, $form->{"trans_id_$_"} if ($form->{"id_$_"} and $form->{"trans_id_$_"}) } (1 .. $form->{"rowcount"});
585 585

  
586 586
  # if called in multi id mode, and still only got one id, switch back to single id 
587 587
  if ($form->{"rowcount"} and $#ids == 0) {
......
657 657
    $ref = $sth->fetchrow_hashref(NAME_lc);
658 658
    map { $form->{$_} = $ref->{$_} } keys %$ref;
659 659

  
660
    # destroy all entries for multiple ids that yield different information
660
    # set all entries for multiple ids blank that yield different information
661 661
    while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
662
      map { undef $form->{$_} if ($ref->{$_} ne $form->{$_}) } keys %$ref;
662
      map { $form->{$_} = '' if ($ref->{$_} ne $form->{$_}) } keys %$ref;
663 663
    }
664 664

  
665 665
    # if not given, fill transdate with current_date
bin/mozilla/oe.pl
140 140
  # if multiple rowcounts (== collective order) then check if the
141 141
  # there were more than one customer (in that case OE::retrieve removes 
142 142
  # the content from the field)
143
  if ($form->{rowcount} && $form->{type} eq 'sales_order' && $form->{customer} eq '') {
143
  if ($form->{rowcount} && $form->{type} eq 'sales_order' && defined $form->{customer} && $form->{customer} eq '') {
144 144
#    $main::lxdebug->message(0, "Detected Edit order with concurrent customers");
145 145
    $form->error($locale->text('Collective Orders only work for orders from one customer!'));
146 146
  }

Auch abrufbar als: Unified diff