Häkchen bei der Konto-Konfiguration als Radio-Buttons ...

... f. Forderungen u. Verbindlichkeiten.

diff --git a/SL/AM.pm b/SL/AM.pm
index f6c93ada039ce8df4a3fbbc1b83c7af27ff11e54..df8bf23e510f5414a6baf0ffcf5309919264e54f 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -213,6 +213,13 @@ sub save_account {
       qw(AR_amount AR_tax AR_paid AP_amount AP_tax AP_paid IC_sale IC_cogs IC_taxpart IC_income IC_expense IC_taxservice);
   }
 
+  if ($form->{AR_include_in_dropdown}) {
+    $form->{$form->{AR_include_in_dropdown}} = $form->{AR_include_in_dropdown};
+  }
+  if ($form->{AP_include_in_dropdown}) {
+    $form->{$form->{AP_include_in_dropdown}} = $form->{AP_include_in_dropdown};
+  }
+
   $form->{link} = "";
   foreach my $item ($form->{AR},            $form->{AR_amount},
                     $form->{AR_tax},        $form->{AR_paid},

diff --git a/doc/changelog b/doc/changelog
index 19e6e5a7f15880168496e90160203d1a5095f377..7fb4386191a6b8353f2f5303d456e53fbf5896fb 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -46,6 +46,9 @@
     löschen und nur bedingt umkonfigurieren (Häkchen bei Forderungen o.
     Verbindlichkeiten).
 
+  - Häkchen bei der Konto-Konfiguration f. Forderungen u. Verbindlichkeiten
+    als Radio-Buttons.
+
 
   Liste gefixter Bugs aus dem Bugtracker:
 

diff --git a/locale/de/all b/locale/de/all
index 5704d20cde5edab7a1dc50c53d093e3cc951cb5b..2b911de8cd365217696e4c810f1170d15465577c 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -2162,6 +2162,7 @@ $self->{texts} = {
   'deliverydate'                => 'Lieferdatum',
   'direct debit'                => 'Lastschrift',
   'disposed'                    => 'Entsorgung',
+  'do not include'              => 'Nicht aufnehmen',
   'done'                        => 'erledigt',
   'down'                        => 'runter',
   'dunning_list'                => 'mahnungsliste',

diff --git a/locale/de_DE/all b/locale/de_DE/all
index db7f5e8f9ae62b3cf32b1e7cbc5fba644eaaac39..c164b7e707cfa7d340ecf55f855993fe130cc777 100644 (file)
--- a/locale/de_DE/all
+++ b/locale/de_DE/all
@@ -2008,6 +2008,7 @@ $self->{texts} = {
   'deliverydate'                => 'Lieferdatum',
   'direct debit'                => 'Lastschrift',
   'disposed'                    => 'Entsorgung',
+  'do not include'              => 'Nicht aufnehmen',
   'done'                        => 'erledigt',
   'down'                        => 'runter',
   'dunning_list'                => 'mahnungsliste',

diff --git a/locale/en/all b/locale/en/all
index e305a877362ef7ad7e4a76803932de14977c601d..5f658eda2b8ee60ae0bdeab725d4cb992bfd01b8 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -2016,6 +2016,7 @@ $self->{texts} = {
   'deliverydate'                => '',
   'direct debit'                => '',
   'disposed'                    => '',
+  'do not include'              => '',
   'done'                        => '',
   'down'                        => '',
   'dunning_list'                => '',

diff --git a/templates/webpages/am/edit_accounts.html b/templates/webpages/am/edit_accounts.html
index 098ab67076b58b49219d2568231fb391c6748eb2..bb8d48431b58fe77487c354abaa548e6017f6766 100644 (file)
--- a/templates/webpages/am/edit_accounts.html
+++ b/templates/webpages/am/edit_accounts.html
@@ -104,26 +104,46 @@ window.onload = function() {
     </tr>
     <tr>
       <td>
-        <input name="AR_amount" type="checkbox" class="checkbox" value="AR_amount"
-          [% HTML.escape(AR_amount)%][% DIS %]>&nbsp;
-        [% 'Revenue' | $T8 %] <br>
-        <input name="AR_paid" type="checkbox" class="checkbox" value="AR_paid"
-          [% HTML.escape(AR_paid) %][% DIS %]>&nbsp;
-        [% 'Receipt' | $T8 %] <br>
-        <input name="AR_tax" type="checkbox" class="checkbox" value="AR_tax"
-          [% HTML.escape(AR_tax) %][% DIS %]>&nbsp;
-        [% 'Tax' | $T8 %]
+        [% L.radio_button_tag('AR_include_in_dropdown',
+          value => 'AR_amount',
+          disabled => AccountIsPosted,
+          checked  => AR_amount) %]
+        &nbsp;[% 'Revenue' | $T8 %] <br>
+        [% L.radio_button_tag('AR_include_in_dropdown',
+          value => 'AR_paid',
+          disabled => AccountIsPosted,
+          checked  => AR_paid) %]
+        &nbsp;[% 'Receipt' | $T8 %] <br>
+        [% L.radio_button_tag('AR_include_in_dropdown',
+          value => 'AR_tax',
+          disabled => AccountIsPosted,
+          checked  => AR_tax) %]
+        &nbsp;[% 'Tax' | $T8 %] <br>
+        [% L.radio_button_tag('AR_include_in_dropdown',
+          value => '',
+          disabled => AccountIsPosted) %]
+        &nbsp;[% 'do not include' | $T8 %]
       </td>
       <td>
-        <input name="AP_amount" type="checkbox" class="checkbox" value="AP_amount"
-          [% HTML.escape(AP_amount) %][% DIS %]>&nbsp;
-        [% 'Expense/Asset' | $T8 %] <br>
-        <input name="AP_paid" type="checkbox" class="checkbox" value="AP_paid"
-          [% HTML.escape(AP_paid) %][% DIS %]>&nbsp;
-        [% 'Payment' | $T8 %] <br>
-        <input name="AP_tax" type="checkbox" class="checkbox" value="AP_tax"
-            [% HTML.escape(AP_tax) %][% DIS %]>&nbsp;
-        [% 'Tax' | $T8 %]
+        [% L.radio_button_tag('AP_include_in_dropdown',
+          value => 'AP_amount',
+          disabled => AccountIsPosted,
+          checked  => AP_amount) %]
+        &nbsp;[% 'Expense/Asset' | $T8 %] <br>
+        [% L.radio_button_tag('AP_include_in_dropdown',
+          value => 'AP_paid',
+          disabled => AccountIsPosted,
+          checked  => AP_paid) %]
+        &nbsp;[% 'Payment' | $T8 %] <br>
+        [% L.radio_button_tag('AP_include_in_dropdown',
+          value => 'AP_tax',
+          disabled => AccountIsPosted,
+          checked  => AP_tax) %]
+        &nbsp;[% 'Tax' | $T8 %] <br>
+        [% L.radio_button_tag('AP_include_in_dropdown',
+          value => '',
+          disabled => AccountIsPosted) %]
+        &nbsp;[% 'do not include' | $T8 %]
       </td>
       <td>
         <input name="IC_sale" type="checkbox" class="checkbox" value="IC_sale"
@@ -135,6 +155,7 @@ window.onload = function() {
         <input name="IC_taxpart" type="checkbox" class="checkbox" value="IC_taxpart"
           [% HTML.escape(IC_taxpart) %]>&nbsp;
         [% 'Tax' | $T8 %]
+        <br><br>
       </td>
       <td>
         <input name=IC_income type=checkbox class=checkbox value="IC_income"
@@ -146,6 +167,7 @@ window.onload = function() {
         <input name=IC_taxservice type=checkbox class=checkbox value="IC_taxservice"
           [% HTML.escape(IC_taxservice) %]>&nbsp;
         [% 'Tax' | $T8 %]
+        <br><br>
       </td>
     </tr>
   </table>