Vorgangsbezeichnung in Kreditorenbuchung: Speichern, Laden, Workflow

diff --git a/SL/AP.pm b/SL/AP.pm
index 8ca5634..a02d6ff 100644 (file)
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -142,7 +142,7 @@ sub _post_transaction {
                 transdate = ?, ordnumber = ?, vendor_id = ?, taxincluded = ?,
                 amount = ?, duedate = ?, deliverydate = ?, tax_point = ?, paid = ?, netamount = ?,
                 currency_id = (SELECT id FROM currencies WHERE name = ?), notes = ?, department_id = ?, storno = ?, storno_id = ?,
-                globalproject_id = ?, direct_debit = ?, payment_id = ?
+                globalproject_id = ?, direct_debit = ?, payment_id = ?, transaction_description = ?
                WHERE id = ?|;
     @values = ($form->{invnumber}, conv_date($form->{transdate}),
                   $form->{ordnumber}, conv_i($form->{vendor_id}),
@@ -153,7 +153,7 @@ sub _post_transaction {
                   conv_i($form->{department_id}), $form->{storno},
                   $form->{storno_id}, conv_i($form->{globalproject_id}),
                   $form->{direct_debit} ? 't' : 'f',
-                  conv_i($form->{payment_id}),
+                  conv_i($form->{payment_id}), $form->{transaction_description},
                   $form->{id});
     do_query($form, $dbh, $query, @values);
 

diff --git a/SL/Form.pm b/SL/Form.pm
index a0e7856..46c7f6e 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -2525,7 +2525,7 @@ sub create_links {
            a.mtime, a.itime,
            a.intnotes, a.department_id, a.amount AS oldinvtotal,
            a.paid AS oldtotalpaid, a.employee_id, a.gldate, a.type,
-           a.globalproject_id, ${extra_columns}
+           a.globalproject_id, a.transaction_description, ${extra_columns}
            c.name AS $table,
            d.description AS department,
            e.name AS employee

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 7fcfef1..8e964b2 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -1248,6 +1248,7 @@ sub add_from_purchase_order {
   $::form->{globalproject_id}   = $order->globalproject_id;
   $::form->{ordnumber}          = $order->number;
   $::form->{department_id}      = $order->department_id;
+  $::form->{transaction_description} = $order->transaction_description;
   $::form->{currency}           = $order->currency->name;
   $::form->{taxincluded}        = 1; # we use amount below, so tax is included
   $::form->{transdate}          = $today->to_kivitendo;

diff --git a/templates/webpages/ap/form_header.html b/templates/webpages/ap/form_header.html
index c4902bb..d59a65e 100644 (file)
--- a/templates/webpages/ap/form_header.html
+++ b/templates/webpages/ap/form_header.html
@@ -138,6 +138,10 @@
                 </tr>
               [% END %]
 
+              <tr>
+                <th align="right">[% 'Transaction description' | $T8 %]</th>
+                <td colspan="3">[% L.input_tag("transaction_description", transaction_description, size=35, "data-validate"=INSTANCE_CONF.get_require_transaction_description_ps ? 'required' : '') %]</td>
+              </tr>
               <tr>
                 <td align="right"><input name="taxincluded" class="checkbox" type="checkbox" value="1" [% IF ( taxincluded ) %]checked[% END %]></td>
                 <th align=left nowrap>[% 'Tax Included' | $T8 %]</th>