Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision df18abbe

Von Tamino Steinert vor etwa 1 Jahr hinzugefügt

  • ID df18abbe233f29efd6c701752b59b2030102845e
  • Vorgänger a6d80bcd
  • Nachfolger fabe9e57

DB::DeliveryOrder: FIX: record_type

Unterschiede anzeigen:

SL/DO.pm
81 81
         dord.transaction_description, dord.itime::DATE AS insertdate,
82 82
         pr.projectnumber AS globalprojectnumber,
83 83
         dep.description AS department,
84
         dord.order_type,
84
         dord.record_type,
85 85
         e.name AS employee,
86 86
         sm.name AS salesman
87 87
       FROM delivery_orders dord
......
94 94
|;
95 95

  
96 96
  if ($form->{type} && is_valid_type($form->{type})) {
97
    push @where, 'dord.order_type = ?';
97
    push @where, 'dord.record_type = ?';
98 98
    push @values, $form->{type};
99 99
  }
100 100

  
......
406 406
    $query = qq|SELECT nextval('id')|;
407 407
    ($form->{id}) = selectrow_query($form, $dbh, $query);
408 408

  
409
    $query = qq|INSERT INTO delivery_orders (id, donumber, employee_id, currency_id, taxzone_id, order_type) VALUES (?, '', ?, (SELECT currency_id FROM defaults LIMIT 1), ?, ?)|;
409
    $query = qq|INSERT INTO delivery_orders (id, donumber, employee_id, currency_id, taxzone_id, record_type) VALUES (?, '', ?, (SELECT currency_id FROM defaults LIMIT 1), ?, ?)|;
410 410
    do_query($form, $dbh, $query, $form->{id}, conv_i($form->{employee_id}), $form->{taxzone_id}, SALES_DELIVERY_ORDER_TYPE);
411 411
  }
412 412

  
......
593 593
         shippingpoint = ?, shipvia = ?, notes = ?, intnotes = ?, closed = ?,
594 594
         delivered = ?, department_id = ?, language_id = ?, shipto_id = ?, billing_address_id = ?,
595 595
         globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ?, transaction_description = ?,
596
         order_type = ?, taxzone_id = ?, taxincluded = ?, payment_id = ?, currency_id = (SELECT id FROM currencies WHERE name = ?),
596
         record_type = ?, taxzone_id = ?, taxincluded = ?, payment_id = ?, currency_id = (SELECT id FROM currencies WHERE name = ?),
597 597
         delivery_term_id = ?
598 598
       WHERE id = ?|;
599 599

  

Auch abrufbar als: Unified diff