Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision eacebf8a

Von Bernd Bleßmann vor fast 3 Jahren hinzugefügt

  • ID eacebf8a165d03444aeff7a2897b4cd7a5cbcc9c
  • Vorgänger 2144dd8e
  • Nachfolger 0a0f5f6c

Vorgangsbezeichnung in Dialogbuchung: Speichern und Laden

Unterschiede anzeigen:

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

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

  
......
657 659
           g.storno, g.storno_id,
658 660
           g.department_id, d.description AS department,
659 661
           e.name AS employee, g.taxincluded, g.gldate,
660
         g.ob_transaction, g.cb_transaction
662
         g.ob_transaction, g.cb_transaction,
663
         g.transaction_description
661 664
         FROM gl g
662 665
         LEFT JOIN department d ON (d.id = g.department_id)
663 666
         LEFT JOIN employee e ON (e.id = g.employee_id)
bin/mozilla/gl.pl
1218 1218
  $form->isblank("reference",   $locale->text('Reference missing!'));
1219 1219
  $form->isblank("transdate",   $locale->text('Transaction Date missing!'));
1220 1220
  $form->isblank("description", $locale->text('Description missing!'));
1221
  $form->isblank("transaction_description", $locale->text('A transaction description is required.')) if $::instance_conf->get_require_transaction_description_ps;
1221 1222

  
1222 1223
  my $transdate = $form->datetonum($form->{transdate}, \%myconfig);
1223 1224
  my $closedto  = $form->datetonum($form->{closedto},  \%myconfig);
templates/webpages/gl/form_header.html
89 89
          <td>[% L.date_tag('tax_point', tax_point) %]</td>
90 90
        </tr>
91 91
        <tr>
92
          <th align="right">[% 'Description' | $T8 %]</th>
93
          <td>[% L.areainput_tag('description', description, cols=50, readonly=readonly) %]</td>
92
          <th align="right">[% 'Transaction description' | $T8 %]</th>
93
          <td>[% L.input_tag("transaction_description", transaction_description, size=35) %]</td>
94 94
          <th align=right>[% 'Delivery Date' | $T8 %]</th>
95 95
          <td>[% L.date_tag('deliverydate', deliverydate) %]</td>
96 96
        </tr>
97
        <tr>
98
          <th align="right">[% 'Description' | $T8 %]</th>
99
          <td>[% L.areainput_tag('description', description, cols=50, readonly=readonly) %]</td>
100
        </tr>
97 101
        <tr>
98 102
          <th align="right">[%- IF id %][% 'Mitarbeiter' | $T8 %][% END %]</th>
99 103
          <td>[%- IF id %][% L.input_tag('employee', employee, size=20, readonly=readonly) %][% END %]</td>

Auch abrufbar als: Unified diff