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/IS.pm
68 68
  my $dbh = $form->get_standard_dbh;
69 69
  my $sth;
70 70

  
71
  my $query = qq|SELECT date | . conv_dateq($form->{duedate}) . qq| - date | . conv_dateq($form->{invdate}) . qq| AS terms|;
72
  ($form->{terms}) = selectrow_query($form, $dbh, $query);
73

  
74 71
  my (@project_ids);
75 72
  $form->{TEMPLATE_ARRAYS} = {};
76 73

  
......
354 351
          $sortorder = qq|ORDER BY a.oid|;
355 352
        }
356 353

  
357
        $query =
354
        my $query =
358 355
          qq|SELECT p.partnumber, p.description, p.unit, a.qty, pg.partsgroup
359 356
             FROM assembly a
360 357
             JOIN parts p ON (a.parts_id = p.id)
......
1170 1167
                transdate   = ?, orddate       = ?, quodate       = ?, customer_id   = ?,
1171 1168
                amount      = ?, netamount     = ?, paid          = ?,
1172 1169
                duedate     = ?, deliverydate  = ?, invoice       = ?, shippingpoint = ?,
1173
                shipvia     = ?, terms         = ?, notes         = ?, intnotes      = ?,
1170
                shipvia     = ?,                    notes         = ?, intnotes      = ?,
1174 1171
                currency_id = (SELECT id FROM currencies WHERE name = ?),
1175 1172
                department_id = ?, payment_id    = ?, taxincluded   = ?,
1176 1173
                type        = ?, language_id   = ?, taxzone_id    = ?, shipto_id     = ?,
......
1185 1182
             conv_date($form->{"invdate"}),  conv_date($form->{"orddate"}),    conv_date($form->{"quodate"}),    conv_i($form->{"customer_id"}),
1186 1183
                       $amount,                        $netamount,                       $form->{"paid"},
1187 1184
             conv_date($form->{"duedate"}),  conv_date($form->{"deliverydate"}),    '1',                                $form->{"shippingpoint"},
1188
                       $form->{"shipvia"},      conv_i($form->{"terms"}), $restricter->process($form->{"notes"}),       $form->{"intnotes"},
1185
                       $form->{"shipvia"},                                $restricter->process($form->{"notes"}),       $form->{"intnotes"},
1189 1186
                       $form->{"currency"},     conv_i($form->{"department_id"}), conv_i($form->{"payment_id"}),        $form->{"taxincluded"} ? 't' : 'f',
1190 1187
                       $form->{"type"},         conv_i($form->{"language_id"}),   conv_i($form->{"taxzone_id"}), conv_i($form->{"shipto_id"}),
1191 1188
                conv_i($form->{"employee_id"}), conv_i($form->{"salesman_id"}),   conv_i($form->{storno_id}),           $form->{"storno"} ? 't' : 'f',
......
1816 1813
           a.invnumber, a.ordnumber, a.quonumber, a.cusordnumber,
1817 1814
           a.orddate, a.quodate, a.globalproject_id,
1818 1815
           a.transdate AS invdate, a.deliverydate, a.paid, a.storno, a.gldate,
1819
           a.shippingpoint, a.shipvia, a.terms, a.notes, a.intnotes, a.taxzone_id,
1816
           a.shippingpoint, a.shipvia, a.notes, a.intnotes, a.taxzone_id,
1820 1817
           a.duedate, a.taxincluded, (SELECT cu.name FROM currencies cu WHERE cu.id=a.currency_id) AS currency, a.shipto_id, a.cp_id,
1821 1818
           a.employee_id, a.salesman_id, a.payment_id,
1822 1819
           a.language_id, a.delivery_customer_id, a.delivery_vendor_id, a.type,
......
1983 1980
  # get customer
1984 1981
  $query =
1985 1982
    qq|SELECT
1986
         c.id AS customer_id, c.name AS customer, c.discount as customer_discount, c.creditlimit, c.terms,
1983
         c.id AS customer_id, c.name AS customer, c.discount as customer_discount, c.creditlimit,
1987 1984
         c.email, c.cc, c.bcc, c.language_id, c.payment_id, c.delivery_term_id,
1988 1985
         c.street, c.zipcode, c.city, c.country,
1989 1986
         c.notes AS intnotes, c.klass as customer_klass, c.taxzone_id, c.salesman_id, cu.name AS curr,

Auch abrufbar als: Unified diff