Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 2879330b

Von Bernd Blessmann vor mehr als 12 Jahren hinzugefügt

  • ID 2879330bd173831981bdd8b25fc1900292efaeac
  • Vorgänger 2f2bdb8c
  • Nachfolger fc1ff1a0

Fix für Bug 1770 - Währung / currency überlebt Workflow über Lieferschein nicht

Unterschiede anzeigen:

SL/DO.pm
350 350
             conv_i($form->{salesman_id}), conv_i($form->{cp_id}),
351 351
             $form->{transaction_description},
352 352
             $form->{type} =~ /^sales/ ? 't' : 'f',
353
             conv_i($form->{taxzone_id}), $form->{taxincluded} ? 't' : 'f', conv_i($form->{terms}), $form->{curr},
353
             conv_i($form->{taxzone_id}), $form->{taxincluded} ? 't' : 'f', conv_i($form->{terms}), substr($form->{currency}, 0, 3),
354 354
             conv_i($form->{id}));
355 355
  do_query($form, $dbh, $query, @values);
356 356

  
......
601 601
         d.description AS department, dord.language_id,
602 602
         dord.shipto_id,
603 603
         dord.globalproject_id, dord.delivered, dord.transaction_description,
604
         dord.taxzone_id, dord.taxincluded, dord.terms, dord.curr
604
         dord.taxzone_id, dord.taxincluded, dord.terms, dord.curr AS currency
605 605
       FROM delivery_orders dord
606 606
       JOIN ${vc} cv ON (dord.${vc}_id = cv.id)
607 607
       LEFT JOIN employee e ON (dord.employee_id = e.id)
......
623 623
  }
624 624
  $sth->finish();
625 625

  
626
  # remove any trailing whitespace
627
  $form->{currency} =~ s/\s*$//;
628

  
626 629
  $form->{donumber_array} =~ s/\s*$//g;
627 630

  
628 631
  $form->{saved_donumber} = $form->{donumber};

Auch abrufbar als: Unified diff