Bugfix 1626: changing charttype from account to heading

Empty certain values in chart before saving to database when converting an
account from chart to heading, so that for example link is empty.

Added a TODO: make sure that accounts that have been booked can't be converted
to a heading

diff --git a/SL/AM.pm b/SL/AM.pm
index 445abd2..f73456c 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -199,6 +199,9 @@ sub get_account {
 sub save_account {
   $main::lxdebug->enter_sub();
 
+  # TODO: it should be forbidden to change an account to a heading if there
+  # have been bookings to this account in the past
+
   my ($self, $myconfig, $form) = @_;
 
   # connect to database, turn off AutoCommit
@@ -242,7 +245,23 @@ sub save_account {
 
   my @values;
 
+
   if ($form->{id}) {
+
+    # if charttype is heading make sure certain values are empty
+    # specifically, if charttype is changed from an existing account, empty the
+    # fields unnecessary for headings, so that e.g. heading doesn't appear in 
+    # drop-down menues due to still having a valid "link" entry
+
+    if ( $form->{charttype} eq 'H' ) {
+      $form->{link} = '';
+      $form->{pos_bwa} = '';
+      $form->{pos_bilanz} = '';
+      $form->{pos_eur} = '';
+      $form->{new_chart_id} = '';
+      $form->{valid_from} = '';
+    };
+
     $query = qq|UPDATE chart SET
                   accno = ?,
                   description = ?,
@@ -272,6 +291,7 @@ sub save_account {
                 $form->{id},
     );
 
+
   }
 
   do_query($form, $dbh, $query, @values);

diff --git a/doc/changelog b/doc/changelog
index 6763889..e60ffd1 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -22,8 +22,8 @@
   Liste gefixter Bugs aus dem Bugtracker:
 
   - Bugfix 1613: Status teilweise
-  - Bugfix 1642:  Lieferantenrabatt wird korrekt gespeichert, aber nicht mehr angezeigt
-
+  - Bugfix 1642: Lieferantenrabatt wird korrekt gespeichert, aber nicht mehr angezeigt
+  - Bugfix 1626: Beim Festlegen der Standardkonten kann beim Warenbestand eine Überschrift ausgewählt werden.
 
 
 2011-02-02 - Release 2.6.2