From: Bernd Bleßmann Date: Fri, 19 Jun 2020 10:31:36 +0000 (+0200) Subject: Lieferdatum in Dialogbuchung: Speichern und Laden in Belegmaske X-Git-Tag: release-3.5.6.1~173 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=36666afc8fe77a7c4922932101761facefffebc1;p=kivitendo-erp.git Lieferdatum in Dialogbuchung: Speichern und Laden in Belegmaske --- diff --git a/SL/GL.pm b/SL/GL.pm index cd63ec0f6..a1d3a9d22 100644 --- a/SL/GL.pm +++ b/SL/GL.pm @@ -123,12 +123,12 @@ sub _post_transaction { $query = qq|UPDATE gl SET reference = ?, description = ?, notes = ?, - transdate = ?, department_id = ?, taxincluded = ?, + transdate = ?, deliverydate = ?, department_id = ?, taxincluded = ?, storno = ?, storno_id = ?, ob_transaction = ?, cb_transaction = ? WHERE id = ?|; @values = ($form->{reference}, $form->{description}, $form->{notes}, - conv_date($form->{transdate}), conv_i($form->{department_id}), $form->{taxincluded} ? 't' : 'f', + conv_date($form->{transdate}), conv_date($form->{deliverydate}), conv_i($form->{department_id}), $form->{taxincluded} ? 't' : 'f', $form->{storno} ? 't' : 'f', conv_i($form->{storno_id}), $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f', conv_i($form->{id})); do_query($form, $dbh, $query, @values); @@ -637,7 +637,8 @@ sub transaction { if ($form->{id}) { $query = - qq|SELECT g.reference, g.description, g.notes, g.transdate, g.storno, g.storno_id, + qq|SELECT g.reference, g.description, g.notes, g.transdate, g.deliverydate, + g.storno, g.storno_id, g.department_id, d.description AS department, e.name AS employee, g.taxincluded, g.gldate, g.ob_transaction, g.cb_transaction diff --git a/templates/webpages/gl/form_header.html b/templates/webpages/gl/form_header.html index e8b7b5a6a..644ff964e 100644 --- a/templates/webpages/gl/form_header.html +++ b/templates/webpages/gl/form_header.html @@ -67,7 +67,7 @@ - +
[% 'Transdate' | $T8 %][% L.date_tag('transdate', transdate, readonly=readonly) %][% L.date_tag('transdate', transdate, readonly=readonly) %]
@@ -80,19 +80,27 @@ - + [%-# hidden img to keep alignment -%] +
[% 'Gldate' | $T8 %][% L.date_tag('gldate', gldate, readonly=1) %][% L.date_tag('gldate', gldate, readonly=1) %]
[%- END %] -[%- IF ALL_DEPARTMENTS %] + [% SET departments_style = ""; + SET departments_style = "style='visibility:hidden'" IF ALL_DEPARTMENTS.size == 0 %] - [% 'Department' | $T8 %] - [% L.select_tag('department_id', ALL_DEPARTMENTS, default = department_id, title_key = 'description', with_empty = 1) %] + [% 'Department' | $T8 %] + [% L.select_tag('department_id', ALL_DEPARTMENTS, default = department_id, title_key = 'description', with_empty = 1) %] + + + + + + +
[% 'Delivery Date' | $T8 %][% L.date_tag('deliverydate', deliverydate) %]
-[%- END %] [% 'Description' | $T8 %]