Überflüssigen/unwirksamen Code entfernt.

[mfinanz.git] / SL / AR.pm

diff --git a/SL/AR.pm b/SL/AR.pm
index 45c445396cd33a8f8b0f4601910c6e0d29243f10..96e66ef4be2434c39d21a3a5e4af18c703d95436 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -61,8 +61,8 @@ sub post_transaction {
     $form->{AR_amounts}{"amount_$i"} =
       (split(/--/, $form->{"AR_amount_$i"}))[0];
   }
-  ($form->{AR_amounts}{receivables}) = split(/--/, $form->{ARselected});
-  ($form->{AR}{receivables})         = split(/--/, $form->{ARselected});
+  $form->{AR_amounts}{receivables} = $form->{ARselected};
+  $form->{AR}{receivables}         = $form->{ARselected};
 
   $form->{exchangerate} =
     ($exchangerate)
@@ -170,6 +170,10 @@ sub post_transaction {
 
     $query = qq|INSERT INTO ar (id, invnumber, employee_id) VALUES (?, 'dummy', ?)|;
     do_query($form, $dbh, $query, $form->{id}, $form->{employee_id});
+
+    if (!$form->{invnumber}) {
+      $form->{invnumber} = $form->update_defaults($myconfig, "invnumber", $dbh);
+    }
   }
 
   # update department
@@ -378,7 +382,7 @@ sub post_payment {
       $form->get_exchangerate($dbh, $form->{currency}, $form->{transdate},
                               "buy");
 
-  my ($accno_ar) = split(/--/, $form->{ARselected});
+  my $accno_ar = $form->{ARselected};
 
   # record payments and offsetting AR
   for my $i (1 .. $form->{paidaccounts}) {
@@ -605,7 +609,12 @@ sub ar_transactions {
   my @a = (transdate, invnumber, name);
   push @a, "employee" if $form->{l_employee};
   my $sortorder = join(', ', @a);
-  $sortorder = $form->{sort} if ($form->{sort} && grep({ $_ eq $form->{sort} } @a));
+
+  if (grep({ $_ eq $form->{sort} }
+           qw(id transdate duedate invnumber ordnumber name
+              datepaid employee shippingpoint shipvia))) {
+    $sortorder = $form->{sort};
+  }
 
   $query .= " WHERE $where ORDER by $sortorder";