From: Werner Hahn <wh@futureworldsearch.net>
Date: Wed, 4 Jul 2018 16:31:31 +0000 (+0200)
Subject: Verbindlichkeits-/Forderungskonto bei Kred-/debitoren mit Standardkonto
X-Git-Tag: release-3.5.4~386
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ec8a10a0909d2f0a90de0a14b4d69e9599899d6e;p=kivitendo-erp.git

Verbindlichkeits-/Forderungskonto bei Kred-/debitoren mit Standardkonto
aus Mandantenkonfiguration vorbelegen wenn vorhanden
---

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index b20584140..bfcf468a8 100644
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -308,6 +308,7 @@ sub create_links {
   $form->{$_}        = $saved{$_} for keys %saved;
   $form->{rowcount}  = 1;
   $form->{AP_chart_id} = $form->{acc_trans} && $form->{acc_trans}->{AP} ? $form->{acc_trans}->{AP}->[0]->{chart_id} : $form->{AP_links}->{AP}->[0]->{chart_id};
+  $form->{AP_chart_id} = $form->{acc_trans} && $form->{acc_trans}->{AP} ? $form->{acc_trans}->{AP}->[0]->{chart_id} : $::instance_conf->get_ap_chart_id || $form->{AP_links}->{AP}->[0]->{chart_id};
 
   # build the popup menus
   $form->{taxincluded} = ($form->{id}) ? $form->{taxincluded} : "checked";
diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 562f8aac2..0ea557d27 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -307,7 +307,7 @@ sub create_links {
 
   $form->{$_}          = $saved{$_} for keys %saved;
   $form->{rowcount}    = 1;
-  $form->{AR_chart_id} = $form->{acc_trans} && $form->{acc_trans}->{AR} ? $form->{acc_trans}->{AR}->[0]->{chart_id} : $form->{AR_links}->{AR}->[0]->{chart_id};
+  $form->{AR_chart_id} = $form->{acc_trans} && $form->{acc_trans}->{AR} ? $form->{acc_trans}->{AR}->[0]->{chart_id} : $::instance_conf->get_ar_chart_id || $form->{AR_links}->{AR}->[0]->{chart_id};
 
   # currencies
   $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);