X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Far.pl;h=e0ed1e7935bd983f00a7905cd2292011e66a050c;hb=5b8e9fcb2f9c94d69519c927b8aa59184d93cea3;hp=cec9db7a695e3ec07721baf76779aa66f926a8ad;hpb=916aae37796feb1b4bf42eaf548cbea1f1f05de9;p=kivitendo-erp.git

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index cec9db7a6..e0ed1e793 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -409,12 +409,15 @@ sub form_header {
       gldate           => $form->{"gldate_$i"},
     };
 
+  # default account for current assets (i.e. 1801 - SKR04) if no account is selected
+  $form->{accno_arap} = IS->get_standard_accno_current_assets(\%myconfig, \%$form);
+
     $payment->{selectAR_paid} =
       NTI($cgi->popup_menu('-name' => "AR_paid_$i",
                            '-id' => "AR_paid_$i",
                            '-values' => \@AR_paid_values,
                            '-labels' => \%chart_labels,
-                           '-default' => $payment->{AR_paid}));
+                           '-default' => $payment->{AR_paid} || $form->{accno_arap}));
 
 
 
@@ -844,7 +847,7 @@ sub search {
                    "departments"    => "ALL_DEPARTMENTS",
                    "customers"      => "ALL_VC",
                    "business_types" => "ALL_BUSINESS_TYPES");
-  $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);
+  $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]);
   $form->{SHOW_BUSINESS_TYPES} = scalar @{ $form->{ALL_BUSINESS_TYPES} } > 0;
 
   # constants and subs for template