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

[..hidden..]

Revision: 3967
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3967&view=rev
Author:   einhverfr
Date:     2011-11-07 23:14:09 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------

Final commit for 1.3.4:
Corrects grants to jcitems
Updates changelog
Setup.pl now reloads Roles.sql when upgrading minor versions.
1.3-1.2 back-out script split into two transactions to handle case where schema was renamed but lsmb12 tables did not get mapping data added

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/Form.pm
    branches/1.3/LedgerSMB.pm
    branches/1.3/dists/rpm/ledgersmb.spec
    branches/1.3/dists/source/build.sh
    branches/1.3/scripts/setup.pl
    branches/1.3/sql/Pg-database.sql
    branches/1.3/sql/modules/Roles.sql
    branches/1.3/sql/upgrade/1.3-1.2.sql

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2011-11-07 15:38:22 UTC (rev 3966)
+++ branches/1.3/Changelog	2011-11-07 23:14:09 UTC (rev 3967)
@@ -12,6 +12,9 @@
 * Corrected a couple of menu items (David B)
 * Added 1.3-1.2 downgrade script to recover from failed upgrades (Chris T)
 * Corrected ship/receive bug due to invalid join conditions (Chris T)
+* Corrected template error in printPayment.html (Herman V)
+* Form.pl now provides instructions to use setup.pl to correct database
+versioning errors (Chris T)
 
 Chris T is Chris Travers
 David B is David Bandel

Modified: branches/1.3/LedgerSMB/Form.pm
===================================================================
--- branches/1.3/LedgerSMB/Form.pm	2011-11-07 15:38:22 UTC (rev 3966)
+++ branches/1.3/LedgerSMB/Form.pm	2011-11-07 23:14:09 UTC (rev 3967)
@@ -151,7 +151,7 @@
     $self->{lynx} = 1 if ( ( defined $self->{path} ) && ( $self->{path} =~ /lynx/i ) );
 
     $self->{version}   = "1.3.4";
-    $self->{dbversion} = "1.3.3";
+    $self->{dbversion} = "1.3.4";
 
     bless $self, $type;
 

Modified: branches/1.3/LedgerSMB.pm
===================================================================
--- branches/1.3/LedgerSMB.pm	2011-11-07 15:38:22 UTC (rev 3966)
+++ branches/1.3/LedgerSMB.pm	2011-11-07 23:14:09 UTC (rev 3967)
@@ -238,7 +238,7 @@
     $logger->debug("Begin LedgerSMB.pm");
 
     $self->{version} = $VERSION;
-    $self->{dbversion} = "1.3.3";
+    $self->{dbversion} = "1.3.4";
     
     bless $self, $type;
     $logger->debug("LedgerSMB::new: \$argstr = $argstr");
@@ -960,7 +960,7 @@
 
     ($self->{_role_prefix}) = $sth->fetchrow_array;
     if ($dbversion ne $self->{dbversion}){
-        $self->error("Database is not the expected version.  Was $dbversion, expected $self->{dbversion}");
+        $self->error("Database is not the expected version.  Was $dbversion, expected $self->{dbversion}.  Please re-run setup.pl against this database to correct.");
     }
 
     $sth = $dbh->prepare('SELECT check_expiration()');

Modified: branches/1.3/dists/rpm/ledgersmb.spec
===================================================================
--- branches/1.3/dists/rpm/ledgersmb.spec	2011-11-07 15:38:22 UTC (rev 3966)
+++ branches/1.3/dists/rpm/ledgersmb.spec	2011-11-07 23:14:09 UTC (rev 3967)
@@ -1,7 +1,7 @@
 # RPM spec written for and tested on CentOS 4 and CentOS 5 
 Summary: LedgerSMB - Open Source accounting software
 Name: ledgersmb
-Version: 1.3.3
+Version: 1.3.4
 Release: 1
 License: GPL
 URL: http://www.ledgersmb.org/

Modified: branches/1.3/dists/source/build.sh
===================================================================
--- branches/1.3/dists/source/build.sh	2011-11-07 15:38:22 UTC (rev 3966)
+++ branches/1.3/dists/source/build.sh	2011-11-07 23:14:09 UTC (rev 3967)
@@ -2,7 +2,7 @@
 
 # Simple script to prepare for release
 
-version="1.3.3";
+version="1.3.4";
 build_d="../release";
 
 if test -d $build_d/ledgersmb; then

Modified: branches/1.3/scripts/setup.pl
===================================================================
--- branches/1.3/scripts/setup.pl	2011-11-07 15:38:22 UTC (rev 3966)
+++ branches/1.3/scripts/setup.pl	2011-11-07 23:14:09 UTC (rev 3967)
@@ -646,6 +646,7 @@
     $ENV{PGDATABASE} = $request->{database};
     
     $database->load_modules('LOADORDER');
+    $database->process_roles('Roles.sql');
     # Credentials set above via environment variables --CT
     $request->{dbh} = DBI->connect("dbi:Pg:dbname=$request->{database}");
     my $dbh = $request->{dbh};

Modified: branches/1.3/sql/Pg-database.sql
===================================================================
--- branches/1.3/sql/Pg-database.sql	2011-11-07 15:38:22 UTC (rev 3966)
+++ branches/1.3/sql/Pg-database.sql	2011-11-07 23:14:09 UTC (rev 3967)
@@ -967,7 +967,7 @@
 sonumber|1
 yearend|1
 businessnumber|1
-version|1.3.3
+version|1.3.4
 closedto|\N
 revtrans|1
 ponumber|1

Modified: branches/1.3/sql/modules/Roles.sql
===================================================================
--- branches/1.3/sql/modules/Roles.sql	2011-11-07 15:38:22 UTC (rev 3966)
+++ branches/1.3/sql/modules/Roles.sql	2011-11-07 23:14:09 UTC (rev 3967)
@@ -1037,7 +1037,7 @@
 WITH INHERIT NOLOGIN
 IN ROLE "lsmb_<?lsmb dbname ?>__contact_read";
 
-GRANT INSERT ON jcitems TO "lsmb_<?lsmb dbname ?>__project_timecard_add";
+GRANT INSERT, UPDATE ON jcitems TO "lsmb_<?lsmb dbname ?>__project_timecard_add";
 GRANT ALL ON jcitems_id_seq TO "lsmb_<?lsmb dbname ?>__project_timecard_add";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)

Modified: branches/1.3/sql/upgrade/1.3-1.2.sql
===================================================================
--- branches/1.3/sql/upgrade/1.3-1.2.sql	2011-11-07 15:38:22 UTC (rev 3966)
+++ branches/1.3/sql/upgrade/1.3-1.2.sql	2011-11-07 23:14:09 UTC (rev 3967)
@@ -2,8 +2,9 @@
 BEGIN;
 ALTER SCHEMA public RENAME TO lsmb_13fail;
 ALTER SCHEMA lsmb12 RENAME TO public;
+COMMIT;
 
-
+BEGIN;
 ALTER TABLE vendor DROP COLUMN entity_id;
 ALTER TABLE vendor DROP COLUMN company_id;
 ALTER TABLE vendor DROP COLUMN credit_id;

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