X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/14d71a6d1215e4fc67136c060fd21cd6c59602af..76592c8a3:/bin/mozilla/am.pl

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 8233b55d3..b3ec6045c 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -24,7 +24,8 @@
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
 #======================================================================
 #
 # administration
@@ -45,6 +46,8 @@ use SL::TODO;
 use SL::DB::Printer;
 use SL::DB::Tax;
 use SL::DB::Language;
+use SL::DB::Default;
+use SL::DBUtils qw(selectall_array_query);
 use CGI;
 
 require "bin/mozilla/common.pl";
@@ -87,10 +90,17 @@ sub edit_account {
 
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
+  my $defaults = SL::DB::Default->get;
 
   $main::auth->assert('config');
 
   $form->{title} = "Edit";
+  $form->{feature_balance} = $defaults->feature_balance;
+  $form->{feature_datev} = $defaults->feature_datev;
+  $form->{feature_erfolgsrechnung} = $defaults->feature_erfolgsrechnung;
+  $form->{feature_eurechnung} = $defaults->feature_eurechnung;
+  $form->{feature_ustva} = $defaults->feature_ustva;
+
   AM->get_account(\%myconfig, \%$form);
 
   foreach my $item (split(/:/, $form->{link})) {
@@ -261,7 +271,7 @@ sub account_header {
        1  => "Ertrag",
        6  => "Aufwand");
   foreach my $item (sort({ $a <=> $b } keys(%er))) {
-    my $text = H($::locale->{iconv_utf8}->convert($eur{$item}));
+    my $text = H($::locale->{iconv_utf8}->convert($er{$item}));
     if ($item == $form->{pos_er}) {
       $select_er .= qq|<option value=$item selected>|. sprintf("%.2d", $item) .qq|. $text</option>\n|;
     } else {
@@ -1634,7 +1644,7 @@ sub delete_warehouse {
 
     $form->header();
     print $form->parse_html_template('am/confirm_delete_warehouse');
-    ::end_of_request();
+    $::dispatcher->end_request;
   }
 
   if (AM->delete_warehouse(\%myconfig, $form)) {