Re-Datum und Knopf neben einander anordnen mit "nowrap"

[kivitendo-erp.git] / SL / AR.pm

diff --git a/SL/AR.pm b/SL/AR.pm
index d9a42ce362a3038d49a1cccf5284670b5d99a3fb..c7965f8d57c1db76d2e81a59587136d948c23135 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -195,6 +195,10 @@ sub post_transaction {
                  VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, (SELECT taxkey_id FROM chart WHERE accno = ?))|;
     @values = (conv_i($form->{id}), $form->{AR_amounts}{receivables}, conv_i($form->{receivables}), conv_date($form->{transdate}), $form->{AR_amounts}{receivables});
     do_query($form, $dbh, $query, @values);
+
+  } else {
+    # Record paid amount.
+    do_query($form, $dbh, qq|UPDATE ar SET paid = ? WHERE id = ?|, $form->{paid}, conv_i($form->{id}));
   }
 
   # add paid transactions
@@ -468,12 +472,10 @@ sub ar_transactions {
 
   my @a = (transdate, invnumber, name);
   push @a, "employee" if $form->{l_employee};
-  my $sortdir   = $form->{sortdir} ? 'ASC' : 'DESC';
+  my $sortdir   = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
   my $sortorder = join(', ', map { "$_ $sortdir" } @a);
 
-  if (grep({ $_ eq $form->{sort} }
-           qw(id transdate duedate invnumber ordnumber name
-              datepaid employee shippingpoint shipvia))) {
+  if (grep({ $_ eq $form->{sort} } qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description))) {
     $sortorder = $form->{sort} . " $sortdir";
   }