Bugfix für 1648 - bebuchte Konten sollten nicht in Überschriften umgewandelt werden...

wird jetzt auf der Oberfläche verhindert.

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 997fd2c284006041dfa1049e787ee6d553dc0556..2dacb6f98245760af9c5100b25384bf59ca5f525 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -328,22 +328,11 @@ sub account_header {
   }
 
   # preselection chart type
   }
 
   # preselection chart type

-  my $select_charttype = q{};
-
-  my %charttype = (
-      'A'  => $locale->text('Account'),
-      'H'  => $locale->text('Heading'),
-  );
-
-  foreach my $item ( sort({ $a <=> $b } keys %charttype) ) {
-    if ($item eq $form->{charttype}) {
-      $select_charttype .= qq|<option value="$item" selected="selected">$charttype{$item}\n|;
-
-    } else {
-      $select_charttype .= qq|<option value="$item">$charttype{$item}\n|;
-    }
+  my @all_charttypes = ({'name' => $locale->text('Account'), 'value' => 'A'},
+                        {'name' => $locale->text('Heading'), 'value' => 'H'},
+    );
+  my $selected_charttype = $form->{charttype};

 
 

-  }

 
   # account where AR_tax or AP_tax is set are not orphaned if they are used as
   # tax-o-matic account
 
   # account where AR_tax or AP_tax is set are not orphaned if they are used as
   # tax-o-matic account


@@ -362,7 +351,8 @@ sub account_header {
     ChartTypeIsAccount         => $ChartTypeIsAccount,
     AccountIsPosted            => $AccountIsPosted,
     select_category            => $select_category,
     ChartTypeIsAccount         => $ChartTypeIsAccount,
     AccountIsPosted            => $AccountIsPosted,
     select_category            => $select_category,

-    select_charttype           => $select_charttype,
+    all_charttypes             => \@all_charttypes,
+    selected_charttype         => $selected_charttype,

     select_bwa                 => $select_bwa,
     select_bilanz              => $select_bilanz,
     select_eur                 => $select_eur,
     select_bwa                 => $select_bwa,
     select_bilanz              => $select_bilanz,
     select_eur                 => $select_eur,

diff --git a/doc/changelog b/doc/changelog
index 28cb78637852edd6d87d07d74f5dde43fb61904b..c19e8c4c1f2c3dfee9f427cd89678ac00b7af73b 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -86,6 +86,7 @@
   - Bugfix 1760 - 1760: Bei einem Lieferschein wird die Abteilung nicht mitgespeichert
   - Bugfix 1752: Rechnung -> Druckvorschau ignoriert Änderung des Steuersatz beim Beleg
   - Bugfix 1708: Fehlender Übertrag der Lieferadresse von Angebot -> Auftragsbestätigung
   - Bugfix 1760 - 1760: Bei einem Lieferschein wird die Abteilung nicht mitgespeichert
   - Bugfix 1752: Rechnung -> Druckvorschau ignoriert Änderung des Steuersatz beim Beleg
   - Bugfix 1708: Fehlender Übertrag der Lieferadresse von Angebot -> Auftragsbestätigung

+  - Bugfix 1648: bebuchte Konten sollten nicht in Überschriften umgewandelt werden können

 
 
 2011-06-15 - Release 2.6.3
 
 
 2011-06-15 - Release 2.6.3

diff --git a/templates/webpages/am/edit_accounts.html b/templates/webpages/am/edit_accounts.html
index bb8d48431b58fe77487c354abaa548e6017f6766..4a7503d859f07fed8c7bce65d8f0975344150b5c 100644 (file)
--- a/templates/webpages/am/edit_accounts.html
+++ b/templates/webpages/am/edit_accounts.html
@@ -60,10 +60,25 @@ window.onload = function() {
 
         </label>
       </td>
 
         </label>
       </td>

-      <td><select name="charttype">[% select_charttype %]</select></td>
+      <td>
+[% IF AccountIsPosted %]
+        [% L.select_tag('dummy_charttype',
+                        L.options_for_select(all_charttypes,
+                                             title => 'name', value => 'value',
+                                             default => selected_charttype),
+                        disabled => '1') %]
+        [% L.hidden_tag('charttype', selected_charttype) %]
+[% ELSE %]
+        [% L.select_tag('charttype',
+                        L.options_for_select(all_charttypes,
+                                             title => 'name', value => 'value',
+                                             default => selected_charttype)) %]
+[% END %]
+      </td>

     </tr>
   </table>
 </fieldset>
     </tr>
   </table>
 </fieldset>

+

 <fieldset class="DEPENDS ON charttype BEING A">
   <legend>[% 'Account Type' | $T8 %]</legend>
   <select name="category" id="AccountType" class="DEPENDS ON charttype BEING A">
 <fieldset class="DEPENDS ON charttype BEING A">
   <legend>[% 'Account Type' | $T8 %]</legend>
   <select name="category" id="AccountType" class="DEPENDS ON charttype BEING A">