SF.net SVN: ledger-smb:[5606] trunk

[..hidden..]

Revision: 5606
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5606&view=rev
Author:   einhverfr
Date:     2013-01-18 08:06:03 +0000 (Fri, 18 Jan 2013)
Log Message:
-----------
Corrections to 1.3-1.4 upgrade workflow.

Modified Paths:
--------------
    trunk/LedgerSMB/Scripts/setup.pm
    trunk/sql/upgrade/1.3-1.4.sql

Modified: trunk/LedgerSMB/Scripts/setup.pm
===================================================================
--- trunk/LedgerSMB/Scripts/setup.pm	2013-01-17 20:03:07 UTC (rev 5605)
+++ trunk/LedgerSMB/Scripts/setup.pm	2013-01-18 08:06:03 UTC (rev 5606)
@@ -888,12 +888,16 @@
        {id => '0', label => $locale->text('Manage Users')},
        {id => '1', label => $locale->text('Full Permissions')},
    );
-    my $template = LedgerSMB::Template->new(
+   if ($v eq '1.2'){
+        my $template = LedgerSMB::Template->new(
                    path => 'UI/setup',
                    template => 'new_user',
                    format => 'HTML',
-     );
-     $template->render($request);
+         );
+         $template->render($request);
+   } else {
+         rebuild_modules($request);
+   }
 }
 
 =item cancel

Modified: trunk/sql/upgrade/1.3-1.4.sql
===================================================================
--- trunk/sql/upgrade/1.3-1.4.sql	2013-01-17 20:03:07 UTC (rev 5605)
+++ trunk/sql/upgrade/1.3-1.4.sql	2013-01-18 08:06:03 UTC (rev 5606)
@@ -526,7 +526,9 @@
  person_id,
  notes,
  total,
- non_billable
+ non_billable,
+ jctype, 
+ curr
 )
 SELECT 
  id,
@@ -543,7 +545,10 @@
  person_id,
  notes,
  total,
- non_billable
+ non_billable,
+ 1,
+  (SELECT (string_to_array(value, ':'))[1] 
+     FROM lsmb13.defaults WHERE setting_key = 'curr')
   FROM lsmb13.jcitems;
 INSERT INTO custom_table_catalog SELECT * FROM lsmb13.custom_table_catalog;
 INSERT INTO custom_field_catalog SELECT * FROM lsmb13.custom_field_catalog;

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