Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 36666afc

Von Bernd Bleßmann vor mehr als 4 Jahren hinzugefügt

  • ID 36666afc8fe77a7c4922932101761facefffebc1
  • Vorgänger 28f63405
  • Nachfolger 3a368351

Lieferdatum in Dialogbuchung: Speichern und Laden in Belegmaske

Unterschiede anzeigen:

SL/GL.pm
123 123
  $query =
124 124
    qq|UPDATE gl SET
125 125
         reference = ?, description = ?, notes = ?,
126
         transdate = ?, department_id = ?, taxincluded = ?,
126
         transdate = ?, deliverydate = ?, department_id = ?, taxincluded = ?,
127 127
         storno = ?, storno_id = ?, ob_transaction = ?, cb_transaction = ?
128 128
       WHERE id = ?|;
129 129

  
130 130
  @values = ($form->{reference}, $form->{description}, $form->{notes},
131
             conv_date($form->{transdate}), conv_i($form->{department_id}), $form->{taxincluded} ? 't' : 'f',
131
             conv_date($form->{transdate}), conv_date($form->{deliverydate}), conv_i($form->{department_id}), $form->{taxincluded} ? 't' : 'f',
132 132
             $form->{storno} ? 't' : 'f', conv_i($form->{storno_id}), $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f',
133 133
             conv_i($form->{id}));
134 134
  do_query($form, $dbh, $query, @values);
......
637 637

  
638 638
  if ($form->{id}) {
639 639
    $query =
640
      qq|SELECT g.reference, g.description, g.notes, g.transdate, g.storno, g.storno_id,
640
      qq|SELECT g.reference, g.description, g.notes, g.transdate, g.deliverydate,
641
           g.storno, g.storno_id,
641 642
           g.department_id, d.description AS department,
642 643
           e.name AS employee, g.taxincluded, g.gldate,
643 644
         g.ob_transaction, g.cb_transaction
templates/webpages/gl/form_header.html
67 67
            <table>
68 68
              <tr>
69 69
                <th align=right width=50% nowrap>[% 'Transdate' | $T8 %]</th>
70
                <td>[% L.date_tag('transdate', transdate, readonly=readonly) %]</td>
70
                <td align=left>[% L.date_tag('transdate', transdate, readonly=readonly) %]</td>
71 71
              </tr>
72 72
            </table>
73 73
          </td>
......
80 80
          <table>
81 81
              <tr>
82 82
                <th align=right width=50%>[% 'Gldate' | $T8 %]</th>
83
                <td align=left>[% L.date_tag('gldate', gldate, readonly=1) %]</td>
83
                [%-# hidden img to keep alignment -%]
84
                <td align=left>[% L.date_tag('gldate', gldate, readonly=1) %]<img class="ui-datepicker-trigger" src="image/calendar.png" alt="..." title="..." style='visibility:hidden'></td>
84 85
              </tr>
85 86
            </table>
86 87
          </td>
87 88
        </tr>
88 89
[%- END %]
89 90

  
90
[%- IF ALL_DEPARTMENTS %]
91
        [% SET departments_style = "";
92
           SET departments_style = "style='visibility:hidden'" IF ALL_DEPARTMENTS.size == 0 %]
91 93
        <tr>
92
          <th align=right nowrap>[% 'Department' | $T8 %]</th>
93
          <td>[% L.select_tag('department_id', ALL_DEPARTMENTS, default = department_id, title_key = 'description', with_empty = 1) %]</td>
94
          <th [%- departments_style -%]align=right nowrap>[% 'Department' | $T8 %]</th>
95
          <td [%- departments_style -%]>[% L.select_tag('department_id', ALL_DEPARTMENTS, default = department_id, title_key = 'description', with_empty = 1) %]</td>
96
          <td align=left>
97
            <table>
98
              <tr>
99
                <th align=right width=50% nowrap>[% 'Delivery Date' | $T8 %]</th>
100
                <td align=left>[% L.date_tag('deliverydate', deliverydate) %]</td>
101
              </tr>
102
            </table>
94 103
        </tr>
95
[%- END %]
96 104

  
97 105
        <tr>
98 106
          <th align=right width=1%>[% 'Description' | $T8 %]</th>

Auch abrufbar als: Unified diff