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/IR.pm
686 686 
                netamount    = ?, paid        = ?, duedate       = ?,
687 687 
                invoice      = ?, taxzone_id  = ?, notes         = ?, taxincluded = ?,
688 688 
                intnotes     = ?, storno_id   = ?, storno        = ?,
689 
                cp_id        = ?, employee_id = ?, department_id = ?,
689 
                cp_id        = ?, employee_id = ?, department_id = ?, delivery_term_id = ?,
690 690 
                globalproject_id = ?, direct_debit = ?
691 691 
              WHERE id = ?|;
692 692 
  @values = (
......
695 695 
                $netamount,                  $form->{paid},      conv_date($form->{duedate}),
696 696 
            '1',                             $taxzone_id,                  $form->{notes},          $form->{taxincluded} ? 't' : 'f',
697 697 
                $form->{intnotes},           conv_i($form->{storno_id}),     $form->{storno}      ? 't' : 'f',
698 
         conv_i($form->{cp_id}),      conv_i($form->{employee_id}), conv_i($form->{department_id}),
698 
         conv_i($form->{cp_id}),      conv_i($form->{employee_id}), conv_i($form->{department_id}), conv_i($form->{delivery_term_id}),
699 699 
         conv_i($form->{globalproject_id}),
700 700 
                $form->{direct_debit} ? 't' : 'f',
701 701 
         conv_i($form->{id})
......
941 941 
  $query = qq|SELECT cp_id, invnumber, transdate AS invdate, duedate,
942 942 
                orddate, quodate, globalproject_id,
943 943 
                ordnumber, quonumber, paid, taxincluded, notes, taxzone_id, storno, gldate,
944 
                intnotes, (SELECT cu.name FROM currencies cu WHERE cu.id=ap.currency_id) AS currency, direct_debit
944 
                intnotes, (SELECT cu.name FROM currencies cu WHERE cu.id=ap.currency_id) AS currency, direct_debit,
945 
                delivery_term_id
945 946 
              FROM ap
946 947 
              WHERE id = ?|;
947 948 
  $ref = selectfirst_hashref_query($form, $dbh, $query, conv_i($form->{id}));
......
1087 1088 
    qq|SELECT
1088 1089 
         v.id AS vendor_id, v.name AS vendor, v.discount as vendor_discount,
1089 1090 
         v.creditlimit, v.terms, v.notes AS intnotes,
1090 
         v.email, v.cc, v.bcc, v.language_id, v.payment_id,
1091 
         v.email, v.cc, v.bcc, v.language_id, v.payment_id, v.delivery_term_id,
1091 1092 
         v.street, v.zipcode, v.city, v.country, v.taxzone_id, cu.name AS curr, v.direct_debit,
1092 1093 
         $duedate + COALESCE(pt.terms_netto, 0) AS duedate,
1093 1094 
         b.description AS business

Auch abrufbar als: Unified diff