Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 8cd05ad6

Von Moritz Bunkus vor mehr als 13 Jahren hinzugefügt

  • ID 8cd05ad64866ce200f888a35723ae4b7e24a2012
  • Vorgänger bd74780c
  • Nachfolger 61352a49

Globale Variablen $::userspath, $::templates, $::membersfile nach %::lx_office_conf verschoben

Unterschiede anzeigen:

SL/IS.pm
1362 1362
sub delete_invoice {
1363 1363
  $main::lxdebug->enter_sub();
1364 1364

  
1365
  my ($self, $myconfig, $form, $spool) = @_;
1365
  my ($self, $myconfig, $form) = @_;
1366 1366

  
1367 1367
  # connect to database
1368 1368
  my $dbh = $form->dbconnect_noauto($myconfig);
......
1398 1398
  $dbh->disconnect;
1399 1399

  
1400 1400
  if ($rc) {
1401
    my $spool = $::lx_office_conf{paths}->{spool};
1401 1402
    map { unlink "$spool/$_" if -f "$spool/$_"; } @spoolfiles;
1402 1403
  }
1403 1404

  
......
2080 2081
        # to distinguish case A and B the variable pricegroup_id_$i is used
2081 2082
        # for new articles this variable isn't defined, for loaded articles it is
2082 2083
        # sellprice can't be used, as it already has 0,00 set
2083
        
2084

  
2084 2085
        if ($pkr->{pricegroup_id} eq $form->{"pricegroup_id_$i"} and defined $form->{"pricegroup_id_$i"}) {
2085 2086
          # Case A
2086 2087
          $pkr->{selected}  = ' selected';
2087 2088

  
2088
        } elsif ($pkr->{pricegroup_id} eq $form->{customer_klass} 
2089
                 and not defined $form->{"pricegroup_id_$i"} 
2089
        } elsif ($pkr->{pricegroup_id} eq $form->{customer_klass}
2090
                 and not defined $form->{"pricegroup_id_$i"}
2090 2091
                 and $pkr->{price} != 0    # only use customer pricegroup price if it has a value, else use default_sellprice
2091 2092
                                           # for the case where pricegroup prices haven't been set
2092 2093
                ) {

Auch abrufbar als: Unified diff