Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 03d3d025

Von Bernd Bleßmann vor fast 11 Jahren hinzugefügt

  • ID 03d3d025ea4c8bea085fc7cdf1fe7be0b513eb63
  • Vorgänger 228dfbdc
  • Nachfolger 002517b4

Lieferbedingungen analog zu Zahlungsbedingungen eingeführt.

Sie können angelegt werden, beim Benutzer voreingestellt werden
und in allen Ein- und Verkaufsmasken gesetzt werden.

Unterschiede anzeigen:

SL/DO.pm
367 367
         shippingpoint = ?, shipvia = ?, notes = ?, intnotes = ?, closed = ?,
368 368
         delivered = ?, department_id = ?, language_id = ?, shipto_id = ?,
369 369
         globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ?, transaction_description = ?,
370
         is_sales = ?, taxzone_id = ?, taxincluded = ?, terms = ?, currency_id = (SELECT id FROM currencies WHERE name = ?)
370
         is_sales = ?, taxzone_id = ?, taxincluded = ?, terms = ?, currency_id = (SELECT id FROM currencies WHERE name = ?),
371
         delivery_term_id = ?
371 372
       WHERE id = ?|;
372 373

  
373 374
  @values = ($form->{donumber}, $form->{ordnumber},
......
382 383
             $form->{transaction_description},
383 384
             $form->{type} =~ /^sales/ ? 't' : 'f',
384 385
             conv_i($form->{taxzone_id}), $form->{taxincluded} ? 't' : 'f', conv_i($form->{terms}), $form->{currency},
386
             conv_i($form->{delivery_term_id}),
385 387
             conv_i($form->{id}));
386 388
  do_query($form, $dbh, $query, @values);
387 389

  
......
592 594
         d.description AS department, dord.language_id,
593 595
         dord.shipto_id,
594 596
         dord.globalproject_id, dord.delivered, dord.transaction_description,
595
         dord.taxzone_id, dord.taxincluded, dord.terms, (SELECT cu.name FROM currencies cu WHERE cu.id=dord.currency_id) AS currency
597
         dord.taxzone_id, dord.taxincluded, dord.terms, (SELECT cu.name FROM currencies cu WHERE cu.id=dord.currency_id) AS currency,
598
         dord.delivery_term_id
596 599
       FROM delivery_orders dord
597 600
       JOIN ${vc} cv ON (dord.${vc}_id = cv.id)
598 601
       LEFT JOIN employee e ON (dord.employee_id = e.id)
......
891 894
  $h_pg->finish();
892 895
  $h_bin_wh->finish();
893 896

  
897
  $form->{delivery_term} = SL::DB::Manager::DeliveryTerm->find_by(id => $form->{delivery_term_id} || undef);
898

  
894 899
  $form->{username} = $myconfig->{name};
895 900

  
896 901
  $main::lxdebug->leave_sub();

Auch abrufbar als: Unified diff