Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 4a89a420

Von Moritz Bunkus vor etwa 4 Jahren hinzugefügt

  • ID 4a89a4204d58f6c3f1f2e921b90f9c8927a26020
  • Vorgänger 4874214f
  • Nachfolger d512cb5d

Leistungsdatum: Lieferscheine (nur als Hidden)

Unterschiede anzeigen:

SL/DB/MetaSetup/DeliveryOrder.pm
35 35
  shippingpoint           => { type => 'text' },
36 36
  shipto_id               => { type => 'integer' },
37 37
  shipvia                 => { type => 'text' },
38
  tax_point               => { type => 'date' },
38 39
  taxincluded             => { type => 'boolean' },
39 40
  taxzone_id              => { type => 'integer', not_null => 1 },
40 41
  transaction_description => { type => 'text' },
SL/DO.pm
511 511
  $query =
512 512
    qq|UPDATE delivery_orders SET
513 513
         donumber = ?, ordnumber = ?, cusordnumber = ?, transdate = ?, vendor_id = ?,
514
         customer_id = ?, reqdate = ?,
514
         customer_id = ?, reqdate = ?, tax_point = ?,
515 515
         shippingpoint = ?, shipvia = ?, notes = ?, intnotes = ?, closed = ?,
516 516
         delivered = ?, department_id = ?, language_id = ?, shipto_id = ?,
517 517
         globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ?, transaction_description = ?,
......
522 522
  @values = ($form->{donumber}, $form->{ordnumber},
523 523
             $form->{cusordnumber}, conv_date($form->{transdate}),
524 524
             conv_i($form->{vendor_id}), conv_i($form->{customer_id}),
525
             conv_date($form->{reqdate}), $form->{shippingpoint}, $form->{shipvia},
525
             conv_date($form->{reqdate}), conv_date($form->{tax_point}), $form->{shippingpoint}, $form->{shipvia},
526 526
             $restricter->process($form->{notes}), $form->{intnotes},
527 527
             $form->{closed} ? 't' : 'f', $form->{delivered} ? "t" : "f",
528 528
             conv_i($form->{department_id}), conv_i($form->{language_id}), conv_i($form->{shipto_id}),
......
693 693
  # so if any of these infos is important (or even different) for any item,
694 694
  # it will be killed out and then has to be fetched from the item scope query further down
695 695
  $query =
696
    qq|SELECT dord.cp_id, dord.donumber, dord.ordnumber, dord.transdate, dord.reqdate,
696
    qq|SELECT dord.cp_id, dord.donumber, dord.ordnumber, dord.transdate, dord.reqdate, dord.tax_point,
697 697
         dord.shippingpoint, dord.shipvia, dord.notes, dord.intnotes,
698 698
         e.name AS employee, dord.employee_id, dord.salesman_id,
699 699
         dord.${vc}_id, cv.name AS ${vc},
sql/Pg-upgrade2/tax_point2.sql
1
-- @tag: tax_point2
2
-- @description: Feld Leistungsdatum in Lieferscheinen
3
-- @depends: tax_point
4
ALTER TABLE delivery_orders ADD COLUMN tax_point DATE;
templates/webpages/do/form_header.html
120 120
  <input type="hidden" name="type" id="type" value="[% HTML.escape(type) %]">
121 121
  <input type="hidden" name="vc" id="vc" value="[% HTML.escape(vc) %]">
122 122
  <input type="hidden" name="lastmtime" id="lastmtime" value="[% HTML.escape(lastmtime) %]">
123
  <input type="hidden" name="tax_point" id="tax_point" value="[% HTML.escape(tax_point) %]">
123 124

  
124 125
  <p>
125 126
   <table width="100%">

Auch abrufbar als: Unified diff