From eacebf8a165d03444aeff7a2897b4cd7a5cbcc9c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= Date: Mon, 21 Feb 2022 11:28:38 +0100 Subject: [PATCH] Vorgangsbezeichnung in Dialogbuchung: Speichern und Laden --- SL/GL.pm | 7 +++++-- bin/mozilla/gl.pl | 1 + templates/webpages/gl/form_header.html | 8 ++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/SL/GL.pm b/SL/GL.pm index 4c892e764..4edd9f1f3 100644 --- a/SL/GL.pm +++ b/SL/GL.pm @@ -124,12 +124,14 @@ sub _post_transaction { qq|UPDATE gl SET reference = ?, description = ?, notes = ?, transdate = ?, deliverydate = ?, tax_point = ?, department_id = ?, taxincluded = ?, - storno = ?, storno_id = ?, ob_transaction = ?, cb_transaction = ? + storno = ?, storno_id = ?, ob_transaction = ?, cb_transaction = ?, + transaction_description = ? WHERE id = ?|; @values = ($form->{reference}, $form->{description}, $form->{notes}, conv_date($form->{transdate}), conv_date($form->{deliverydate}), conv_date($form->{tax_point}), 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', + $form->{transaction_description}, conv_i($form->{id})); do_query($form, $dbh, $query, @values); @@ -657,7 +659,8 @@ sub transaction { 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 + g.ob_transaction, g.cb_transaction, + g.transaction_description FROM gl g LEFT JOIN department d ON (d.id = g.department_id) LEFT JOIN employee e ON (e.id = g.employee_id) diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl index 551937bb0..825668bb1 100644 --- a/bin/mozilla/gl.pl +++ b/bin/mozilla/gl.pl @@ -1218,6 +1218,7 @@ sub post_transaction { $form->isblank("reference", $locale->text('Reference missing!')); $form->isblank("transdate", $locale->text('Transaction Date missing!')); $form->isblank("description", $locale->text('Description missing!')); + $form->isblank("transaction_description", $locale->text('A transaction description is required.')) if $::instance_conf->get_require_transaction_description_ps; my $transdate = $form->datetonum($form->{transdate}, \%myconfig); my $closedto = $form->datetonum($form->{closedto}, \%myconfig); diff --git a/templates/webpages/gl/form_header.html b/templates/webpages/gl/form_header.html index dad0d69cf..98084c6ee 100644 --- a/templates/webpages/gl/form_header.html +++ b/templates/webpages/gl/form_header.html @@ -89,11 +89,15 @@ [% L.date_tag('tax_point', tax_point) %] - [% 'Description' | $T8 %] - [% L.areainput_tag('description', description, cols=50, readonly=readonly) %] + [% 'Transaction description' | $T8 %] + [% L.input_tag("transaction_description", transaction_description, size=35) %] [% 'Delivery Date' | $T8 %] [% L.date_tag('deliverydate', deliverydate) %] + + [% 'Description' | $T8 %] + [% L.areainput_tag('description', description, cols=50, readonly=readonly) %] + [%- IF id %][% 'Mitarbeiter' | $T8 %][% END %] [%- IF id %][% L.input_tag('employee', employee, size=20, readonly=readonly) %][% END %] -- 2.20.1