Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 7d2455cf

Von Stephan Köhler vor mehr als 18 Jahren hinzugefügt

  • ID 7d2455cfca23b7b55fe8a23fb5ea353b23750e60
  • Vorgänger 6dce043f
  • Nachfolger bf541adb

Merge von 800 aus unstable: Bugfix 245
Bugfix 245: IS::customer_details und IR::vendor_details ueberschreiben $form->{id}, was den Workflowstatus verfaelscht.
Backup von taxincluded ersetzt durch ein Cleanup der SQL Rueckgabe.

Unterschiede anzeigen:

SL/IR.pm
1135 1135
    $contact = "and cp.cp_id = $form->{cp_id}";
1136 1136
  }
1137 1137

  
1138
  $taxincluded = $form->{taxincluded};
1139

  
1140 1138
  # get rest for the vendor
1141 1139
  # fax and phone and email as vendor*
1142 1140
  my $query =
......
1148 1146
  $sth->execute || $form->dberror($query);
1149 1147

  
1150 1148
  $ref = $sth->fetchrow_hashref(NAME_lc);
1151
  map { $form->{$_} = $ref->{$_} } keys %$ref;
1152 1149

  
1153
  $form->{taxincluded} = $taxincluded;
1150
  # remove id and taxincluded before copy back
1151
  delete @$ref{qw(id taxincluded)};
1152
  map { $form->{$_} = $ref->{$_} } keys %$ref;
1154 1153

  
1155 1154
  $sth->finish;
1156 1155
  $dbh->disconnect;
SL/IS.pm
348 348
    $contact = "and cp.cp_id = $form->{cp_id}";
349 349
  }
350 350

  
351
  $taxincluded = $form->{taxincluded};
352

  
353 351
  # get rest for the customer
354 352
  my $query = qq|SELECT ct.*, cp.*, ct.notes as customernotes
355 353
                 FROM customer ct
......
359 357
  $sth->execute || $form->dberror($query);
360 358

  
361 359
  $ref = $sth->fetchrow_hashref(NAME_lc);
362
  map { $form->{$_} = $ref->{$_} } keys %$ref;
363 360

  
364
  $form->{taxincluded} = $taxincluded;
361
  # remove id and taxincluded before copy back
362
  delete @$ref{qw(id taxincluded)};
363
  map { $form->{$_} = $ref->{$_} } keys %$ref;
365 364

  
366 365
  $sth->finish;
367 366
  $dbh->disconnect;

Auch abrufbar als: Unified diff