SF.net SVN: ledger-smb:[6077] branches/1.3

[..hidden..]

Revision: 6077
          http://sourceforge.net/p/ledger-smb/code/6077
Author:   einhverfr
Date:     2013-09-24 07:43:31 +0000 (Tue, 24 Sep 2013)
Log Message:
-----------
Merging commit 6076 from trunk

Modified Paths:
--------------
    branches/1.3/CONTRIBUTORS
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/Database.pm
    branches/1.3/sql/upgrade/sl2.8-1.3.sql

Modified: branches/1.3/CONTRIBUTORS
===================================================================
--- branches/1.3/CONTRIBUTORS	2013-09-24 07:38:17 UTC (rev 6076)
+++ branches/1.3/CONTRIBUTORS	2013-09-24 07:43:31 UTC (rev 6077)
@@ -125,6 +125,9 @@
 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>

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-09-24 07:38:17 UTC (rev 6076)
+++ branches/1.3/Changelog	2013-09-24 07:43:31 UTC (rev 6077)
@@ -17,6 +17,7 @@
 * 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

Modified: branches/1.3/LedgerSMB/Database.pm
===================================================================
--- branches/1.3/LedgerSMB/Database.pm	2013-09-24 07:38:17 UTC (rev 6076)
+++ branches/1.3/LedgerSMB/Database.pm	2013-09-24 07:43:31 UTC (rev 6077)
@@ -359,8 +359,8 @@
        $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 @@
                     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},

Modified: branches/1.3/sql/upgrade/sl2.8-1.3.sql
===================================================================
--- branches/1.3/sql/upgrade/sl2.8-1.3.sql	2013-09-24 07:38:17 UTC (rev 6076)
+++ branches/1.3/sql/upgrade/sl2.8-1.3.sql	2013-09-24 07:43:31 UTC (rev 6077)
@@ -537,7 +537,11 @@
 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;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from 
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits