From ccd43bc4da3e070cd986ee837bfc0311d5a0f598 Mon Sep 17 00:00:00 2001
From: einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>
Date: Tue, 31 Oct 2006 17:56:40 +0000
Subject: UNTESTED fix for system->defaults

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@424 4979c152-3d1c-0410-bac9-87ea11338e46
---
 LedgerSMB/AM.pm       | 13 +++++++++++++
 LedgerSMB/Num2text.pm |  2 +-
 bin/am.pl             |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/LedgerSMB/AM.pm b/LedgerSMB/AM.pm
index 25415a15..8014c41e 100755
--- a/LedgerSMB/AM.pm
+++ b/LedgerSMB/AM.pm
@@ -1835,5 +1835,18 @@ sub post_yearend {
 
 }
 
+sub get_all_defaults{
+	my ($self, $form) = @_;
+	my $dbh = $form->{dbh};
+	my $query = "select setting_key, value FROM defaults";
+	$sth = $dbh->prepare($query);
+	$sth->execute;
+	while (($skey, $value) = $sth->fetchrow_array()){
+		$form->{$skey} = $value;
+	}
+
+	$self->defaultaccounts(undef, $form);
+	$dbh->commit;
+}
 
 1;
diff --git a/LedgerSMB/Num2text.pm b/LedgerSMB/Num2text.pm
index bd66bcfa..74ed8a4a 100755
--- a/LedgerSMB/Num2text.pm
+++ b/LedgerSMB/Num2text.pm
@@ -23,7 +23,7 @@
 #
 #======================================================================
 #
-# This file has NOT undergone whitespace cleanup.
+# This file has undergone whitespace cleanup.
 #
 #======================================================================
 #
diff --git a/bin/am.pl b/bin/am.pl
index 5015660e..76423e9a 100755
--- a/bin/am.pl
+++ b/bin/am.pl
@@ -1693,7 +1693,7 @@ sub save_template {
 sub defaults {
   
   # get defaults for account numbers and last numbers
-  AM->defaultaccounts(\%myconfig, \%$form);
+  AM->get_all_defaults(\%$form);
 
   foreach $key (keys %{ $form->{accno} }) {
     foreach $accno (sort keys %{ $form->{accno}{$key} }) {
-- 
cgit v1.2.3