From e0528790654fbd4c464a9cdb33df9ad04a0bc42f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernd=20Ble=C3=9Fmann?= <bernd@kivitendo-premium.de>
Date: Mon, 16 Oct 2023 16:00:42 +0200
Subject: [PATCH 1/2] 'Buchen auf' in EK/VK Rechnungen auch vorbelegen, wenn in
 Mandantenkonfig leer

Wird dann mit dem ersten Verbindlichkeitskonto/Forderungskonto vorbelegt,
sowie bei der Kreditorenbuchung/Debitorenbuchung auch.
---
 bin/mozilla/ir.pl | 2 +-
 bin/mozilla/is.pl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index f898269304..094c68baec 100644
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -214,7 +214,7 @@ sub invoice_links {
   }
   $form->{AP} = $form->{AP_1} unless $form->{id};
   my ($chart_accno)      = split /--/, $form->{AP};
-  $form->{AP_chart_id} = $form->{id} ? SL::DB::Manager::Chart->find_by( accno => $chart_accno)->id : $::instance_conf->get_ap_chart_id ;
+  $form->{AP_chart_id} = $form->{id} ? SL::DB::Manager::Chart->find_by( accno => $chart_accno)->id : $::instance_conf->get_ap_chart_id || $form->{AP_links}->{AP}->[0]->{chart_id};
 
   $form->{locked} =
     ($form->datetonum($form->{invdate}, \%myconfig) <=
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 5b1f5389b8..a28823018a 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -270,7 +270,7 @@ sub invoice_links {
   }
   $form->{AR} = $form->{AR_1} unless $form->{id};
   my ($chart_accno)      = split /--/, $form->{AR};
-  $form->{AR_chart_id} = $form->{id} ? SL::DB::Manager::Chart->find_by( accno => $chart_accno)->id : $::instance_conf->get_ar_chart_id ;
+  $form->{AR_chart_id} = $form->{id} ? SL::DB::Manager::Chart->find_by( accno => $chart_accno)->id : $::instance_conf->get_ar_chart_id || $form->{AR_links}->{AR}->[0]->{chart_id};
 
   $form->{locked} = ($form->datetonum($form->{invdate},  \%myconfig)
                   <= $form->datetonum($form->{closedto}, \%myconfig));

From d34e3267b6a9b8282385fca47ae904466e655dae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernd=20Ble=C3=9Fmann?= <bernd@kivitendo-premium.de>
Date: Mon, 16 Oct 2023 16:15:05 +0200
Subject: [PATCH 2/2] 'Buchen auf' in EK/VK Rechnungen darf nicht leer sein

---
 templates/design40_webpages/ir/form_header.html | 2 +-
 templates/design40_webpages/is/form_header.html | 2 +-
 templates/webpages/ir/form_header.html          | 2 +-
 templates/webpages/is/form_header.html          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/design40_webpages/ir/form_header.html b/templates/design40_webpages/ir/form_header.html
index dc0ffecdbf..010e57b177 100644
--- a/templates/design40_webpages/ir/form_header.html
+++ b/templates/design40_webpages/ir/form_header.html
@@ -105,7 +105,7 @@ <h1>[% title %]</h1>
     [% END %]
     <tr>
       <th>[% 'Record in' | $T8 %]</th>
-      <td>[% P.chart.picker("AP_chart_id", AP_chart_id, class="wi-wide", type="AP") %]</td>
+      <td>[% P.chart.picker("AP_chart_id", AP_chart_id, class="wi-wide", type="AP", "data-validate"="required") %]</td>
     </tr>
     <tr>
       <th>[% 'Steuersatz' | $T8 %]</th>
diff --git a/templates/design40_webpages/is/form_header.html b/templates/design40_webpages/is/form_header.html
index e6c3d2d7d7..a5bca3bc37 100644
--- a/templates/design40_webpages/is/form_header.html
+++ b/templates/design40_webpages/is/form_header.html
@@ -144,7 +144,7 @@ <h1>[% title %]</h1>
     [% END %]
     <tr>
       <th>[% 'Record in' | $T8 %]</th>
-      <td>[% P.chart.picker("AR_chart_id", AR_chart_id, class="wi-wide", type="AR") %]</td>
+      <td>[% P.chart.picker("AR_chart_id", AR_chart_id, class="wi-wide", type="AR", "data-validate"="required") %]</td>
     </tr>
     [% IF currencies %]
       <tr>
diff --git a/templates/webpages/ir/form_header.html b/templates/webpages/ir/form_header.html
index 3a6156a39c..57ae0f068d 100644
--- a/templates/webpages/ir/form_header.html
+++ b/templates/webpages/ir/form_header.html
@@ -97,7 +97,7 @@ <h1>[% title %]</h1>
 [%- END %]
         <tr>
           <th align="right" nowrap>[% 'Record in' | $T8 %]</th>
-          <td colspan="3">[% P.chart.picker("AP_chart_id", AP_chart_id, style="width:250px;", type="AP") %]</td>
+          <td colspan="3">[% P.chart.picker("AP_chart_id", AP_chart_id, style="width:250px;", type="AP", "data-validate"="required") %]</td>
         </tr>
         <tr>
           <th align="right">[% 'Steuersatz' | $T8 %]</th>
diff --git a/templates/webpages/is/form_header.html b/templates/webpages/is/form_header.html
index c47db6392e..fec26ae93e 100644
--- a/templates/webpages/is/form_header.html
+++ b/templates/webpages/is/form_header.html
@@ -143,7 +143,7 @@ <h1>[% title %]</h1>
         <tr>
           <th align="right" nowrap>[% 'Record in' | $T8 %]</th>
           <td colspan="3">
-            [% P.chart.picker("AR_chart_id", AR_chart_id, style="width:259px;", type="AR") %]
+            [% P.chart.picker("AR_chart_id", AR_chart_id, style="width:259px;", type="AR", "data-validate"="required") %]
           </td>
         </tr>
         <tr>