Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 464f44ac

Von Moritz Bunkus vor mehr als 9 Jahren hinzugefügt

  • ID 464f44accd46ed0b2e1f7e2459f53337a6720a7f
  • Vorgänger 5357aec0
  • Nachfolger 8809a4d1

Zahlungsbedingungen bei Lieferscheinen; veraltete Spalte »terms« entfernt

Unterschiede anzeigen:

SL/DO.pm
460 460
         shippingpoint = ?, shipvia = ?, notes = ?, intnotes = ?, closed = ?,
461 461
         delivered = ?, department_id = ?, language_id = ?, shipto_id = ?,
462 462
         globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ?, transaction_description = ?,
463
         is_sales = ?, taxzone_id = ?, taxincluded = ?, terms = ?, currency_id = (SELECT id FROM currencies WHERE name = ?),
463
         is_sales = ?, taxzone_id = ?, taxincluded = ?, payment_id = ?, currency_id = (SELECT id FROM currencies WHERE name = ?),
464 464
         delivery_term_id = ?
465 465
       WHERE id = ?|;
466 466

  
......
475 475
             conv_i($form->{salesman_id}), conv_i($form->{cp_id}),
476 476
             $form->{transaction_description},
477 477
             $form->{type} =~ /^sales/ ? 't' : 'f',
478
             conv_i($form->{taxzone_id}), $form->{taxincluded} ? 't' : 'f', conv_i($form->{terms}), $form->{currency},
478
             conv_i($form->{taxzone_id}), $form->{taxincluded} ? 't' : 'f', conv_i($form->{payment_id}), $form->{currency},
479 479
             conv_i($form->{delivery_term_id}),
480 480
             conv_i($form->{id}));
481 481
  do_query($form, $dbh, $query, @values);
......
689 689
         d.description AS department, dord.language_id,
690 690
         dord.shipto_id,
691 691
         dord.globalproject_id, dord.delivered, dord.transaction_description,
692
         dord.taxzone_id, dord.taxincluded, dord.terms, (SELECT cu.name FROM currencies cu WHERE cu.id=dord.currency_id) AS currency,
692
         dord.taxzone_id, dord.taxincluded, dord.payment_id, (SELECT cu.name FROM currencies cu WHERE cu.id=dord.currency_id) AS currency,
693 693
         dord.delivery_term_id, dord.itime::DATE AS insertdate
694 694
       FROM delivery_orders dord
695 695
       JOIN ${vc} cv ON (dord.${vc}_id = cv.id)

Auch abrufbar als: Unified diff