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/IS.pm
429 429

  
430 430
  $form->set_payment_options($myconfig, $form->{invdate});
431 431

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

  
432 434
  $form->{username} = $myconfig->{name};
433 435

  
434 436
  $main::lxdebug->leave_sub();
......
1104 1106
                cp_id       = ?, marge_total   = ?, marge_percent = ?,
1105 1107
                globalproject_id               = ?, delivery_customer_id             = ?,
1106 1108
                transaction_description        = ?, delivery_vendor_id               = ?,
1107
                donumber    = ?, invnumber_for_credit_note = ?,        direct_debit  = ?
1109
                donumber    = ?, invnumber_for_credit_note = ?,        direct_debit  = ?,
1110
                delivery_term_id = ?
1108 1111
              WHERE id = ?|;
1109 1112
  @values = (          $form->{"invnumber"},           $form->{"ordnumber"},             $form->{"quonumber"},          $form->{"cusordnumber"},
1110 1113
             conv_date($form->{"invdate"}),  conv_date($form->{"orddate"}),    conv_date($form->{"quodate"}),    conv_i($form->{"customer_id"}),
......
1118 1121
                conv_i($form->{"globalproject_id"}),                              conv_i($form->{"delivery_customer_id"}),
1119 1122
                       $form->{transaction_description},                          conv_i($form->{"delivery_vendor_id"}),
1120 1123
                       $form->{"donumber"}, $form->{"invnumber_for_credit_note"},        $form->{direct_debit} ? 't' : 'f',
1124
                conv_i($form->{delivery_term_id}),
1121 1125
                conv_i($form->{"id"}));
1122 1126
  do_query($form, $dbh, $query, @values);
1123 1127

  
......
1593 1597
           a.employee_id, a.salesman_id, a.payment_id,
1594 1598
           a.language_id, a.delivery_customer_id, a.delivery_vendor_id, a.type,
1595 1599
           a.transaction_description, a.donumber, a.invnumber_for_credit_note,
1596
           a.marge_total, a.marge_percent, a.direct_debit,
1600
           a.marge_total, a.marge_percent, a.direct_debit, a.delivery_term_id,
1597 1601
           e.name AS employee
1598 1602
         FROM ar a
1599 1603
         LEFT JOIN employee e ON (e.id = a.employee_id)
......
1763 1767
  $query =
1764 1768
    qq|SELECT
1765 1769
         c.id AS customer_id, c.name AS customer, c.discount as customer_discount, c.creditlimit, c.terms,
1766
         c.email, c.cc, c.bcc, c.language_id, c.payment_id,
1770
         c.email, c.cc, c.bcc, c.language_id, c.payment_id, c.delivery_term_id,
1767 1771
         c.street, c.zipcode, c.city, c.country,
1768 1772
         c.notes AS intnotes, c.klass as customer_klass, c.taxzone_id, c.salesman_id, cu.name AS curr,
1769 1773
         c.taxincluded_checked, c.direct_debit,

Auch abrufbar als: Unified diff