Löschen und Häkchen Ändern bei Konten, die als Automatikkonten für andere Konten...

Zumindest bei Forderungen und Verbindlichkeiten.

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 73a2133..997fd2c 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -345,6 +345,14 @@ sub account_header {
 
   }
 
+  # account where AR_tax or AP_tax is set are not orphaned if they are used as
+  # tax-o-matic account
+  if ( $form->{id} && !$form->{orphaned} && ($form->{link} =~ m/(AP_tax|AR_tax)/) ) {
+    if (SL::DB::Manager::Tax->find_by(chart_id => $form->{id})) {
+      $form->{orphaned} = 0;
+    }
+  }
+
   my $ChartTypeIsAccount = ($form->{charttype} eq "A") ? "1":"";
   my $AccountIsPosted = ($form->{orphaned} ) ? "":"1";
 

diff --git a/doc/changelog b/doc/changelog
index 318bd9c..19e6e5a 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -42,6 +42,10 @@
     ein "Bullet" ersetzt. Dafür kann mit <bullet> ein Aufzählungspunkt erzeugt
     werden.
 
+  - Bebuchte Konten und als Steuerautomatik-Konten dienende Konten lassen sich
+    löschen und nur bedingt umkonfigurieren (Häkchen bei Forderungen o.
+    Verbindlichkeiten).
+
 
   Liste gefixter Bugs aus dem Bugtracker:
 

diff --git a/locale/de/all b/locale/de/all
index b662545..5704d20 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -178,6 +178,7 @@ $self->{texts} = {
   'An invalid character was used (invalid characters: #1).' => 'Ein ungültiges Zeichen wurde benutzt (ungültige Zeichen: #1).',
   'An invalid character was used (valid characters: #1).' => 'Ein ungültiges Zeichen wurde benutzt (gültige Zeichen: #1).',
   'An upper-case character is required.' => 'Ein Großbuchstabe ist vorgeschrieben.',
+  'And if the account does not act as tax-o-matic account.' => 'Und wenn das Konto kein Steuerautomatik-Konto ist.',
   'Annotations'                 => 'Anmerkungen',
   'Another user with the login #1 does already exist.' => 'Es existiert bereits ein anderer Benutzer mit diesem Login.',
   'Ap aging on %s'              => 'Offene Verbindlichkeiten zum %s',

diff --git a/locale/de_DE/all b/locale/de_DE/all
index cab3c0b..db7f5e8 100644 (file)
--- a/locale/de_DE/all
+++ b/locale/de_DE/all
@@ -185,6 +185,7 @@ $self->{texts} = {
   'An invalid character was used (invalid characters: #1).' => '',
   'An invalid character was used (valid characters: #1).' => '',
   'An upper-case character is required.' => '',
+  'And if the account does not act as tax-o-matic account.' => 'Und wenn das Konto kein Steuerautomatik-Konto ist.',
   'Annotations'                 => 'Hilfe',
   'Another user with the login #1 does already exist.' => 'Es existiert bereits ein anderer Benutzer mit diesem Login.',
   'Ap aging on %s'              => 'Offene Verbindlichkeiten zum %s',

diff --git a/locale/en/all b/locale/en/all
index 35aedaf..e305a87 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -186,6 +186,7 @@ $self->{texts} = {
   'An invalid character was used (invalid characters: #1).' => '',
   'An invalid character was used (valid characters: #1).' => '',
   'An upper-case character is required.' => '',
+  'And if the account does not act as tax-o-matic account.' => '',
   'Annotations'                 => '',
   'Another user with the login #1 does already exist.' => '',
   'Ap aging on %s'              => '',

diff --git a/templates/webpages/am/edit_accounts.html b/templates/webpages/am/edit_accounts.html
index 87e849b..098ab67 100644 (file)
--- a/templates/webpages/am/edit_accounts.html
+++ b/templates/webpages/am/edit_accounts.html
@@ -93,7 +93,8 @@ window.onload = function() {
 <fieldset class="DEPENDS ON charttype BEING A">
   <legend>[% 'Include in drop-down menus' | $T8 %]</legend>
   <p style='font-weight:normal'>[% 'These will only be effective if the account is NOT a summary account AND there exists at least one taxkey. Setting the account as a summary account will erase these settings.' | $T8 %]</p>
-  <p style='font-weight:normal'>[% 'Changes to Receivables and Payables are only possible if no transactions to this account are posted yet.' | $T8 %]</p>
+  <p style='font-weight:normal'>[% 'Changes to Receivables and Payables are only possible if no transactions to this account are posted yet.' | $T8 %]
+  [% 'And if the account does not act as tax-o-matic account.' | $T8 %]</p>
   <table width="100%">
     <tr>
       <th align="left">[% 'Receivables' | $T8 %]</th>