From e7ff2ff665bb2c5c3d4aabf52e6cf6200fa00b74 Mon Sep 17 00:00:00 2001
From: Chris Travers <chris.travers@gmail.com>
Date: Tue, 24 Sep 2013 07:43:31 +0000
Subject: [PATCH] Merging commit 6076 from trunk

git-svn-id: svn://svn.code.sf.net/p/ledger-smb/code/branches/1.3@6077 4979c152-3d1c-0410-bac9-87ea11338e46
---
 CONTRIBUTORS              | 3 +++
 Changelog                 | 1 +
 LedgerSMB/Database.pm     | 5 ++---
 sql/upgrade/sl2.8-1.3.sql | 6 +++++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 14991b5982..1fc282cd71 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -125,6 +125,9 @@ Brian Wolf <  brian @ activustech.com > has contributed bug reports.
 Berend Tober < btober @ ieee.org > has contributed some to the 
 documentation.
 
+Ward Vandewege [email redacted] has contributed some bug fixes to LedgerSMB database management and migration scripts.
+
+
 Original Authors of SQL-Ledger:
 ===================================
 Dieter Simader <dsimader @ sql-ledger.com>
diff --git a/Changelog b/Changelog
index 90acf510b1..f200121317 100644
--- a/Changelog
+++ b/Changelog
@@ -17,6 +17,7 @@ Changelog for 1.3.35
 * Fixed unable to edit quotation.tex (Chris T, 885)
 * Silenced warnings in Num2Text (Chris T)
 * Fixed blank weights sometimes making invoices unprintable (Chris T)
+* Fixed some bugs with SL2.8 to LedgerSMB upgrades (Chris T)
 
 Chris T is Chris Travers
 Nick P is Nick Prater
diff --git a/LedgerSMB/Database.pm b/LedgerSMB/Database.pm
index 2d42551b8a..51b3f3e487 100644
--- a/LedgerSMB/Database.pm
+++ b/LedgerSMB/Database.pm
@@ -359,8 +359,8 @@ sub get_info {
        $sth->execute('version');
        if (my $ref = $sth->fetchrow_hashref('NAME_lc')){
             $retval->{appname} = 'sql-ledger';
-            $retval->{full_version} = $ref->{fldname};
-            $retval->{version} = $ref->{fldname};
+            $retval->{full_version} = $ref->{fldvalue};
+            $retval->{version} = $ref->{fldvalue};
             $retval->{version} =~ s/(\d+\.\d+).*/$1/g;
        } else {
             $retval->{appname} = 'unknown';
@@ -623,7 +623,6 @@ sub lsmb_info {
                     users);
     my $retval = {};
     my $qtemp = 'SELECT count(*) FROM TABLE';
-    my $dbh = 
     my $dbh = DBI->connect(
         "dbi:Pg:dbname=$self->{company_name}",  
          $self->{username}, $self->{password},
diff --git a/sql/upgrade/sl2.8-1.3.sql b/sql/upgrade/sl2.8-1.3.sql
index 55a08dd155..3ecf577334 100644
--- a/sql/upgrade/sl2.8-1.3.sql
+++ b/sql/upgrade/sl2.8-1.3.sql
@@ -537,7 +537,11 @@ INSERT INTO audittrail(trans_id, tablename, reference, formname, action,
 INSERT INTO user_preference(id)
      SELECT id from users;
 
-INSERT INTO recurring SELECT * FROM sl28.recurring;
+INSERT INTO recurring(id, reference, startdate, nextdate, enddate, repeat, 
+            unit, howmany, payment)
+     SELECT id, reference, startdate, nextdate, enddate, repeat, 
+            unit, howmany, payment 
+       FROM sl28.recurring;
 
 INSERT INTO recurringemail SELECT * FROM sl28.recurringemail;