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

[..hidden..]

Revision: 811
          http://svn.sourceforge.net/ledger-smb/?rev=811&view=rev
Author:   einhverfr
Date:     2007-02-17 16:34:13 -0800 (Sat, 17 Feb 2007)

Log Message:
-----------
Fixing bug 1661261

Modified Paths:
--------------
    trunk/LedgerSMB/RC.pm
    trunk/UPGRADE
    trunk/install.sh
    trunk/ledger-smb.conf
    trunk/sl2ls.sh

Modified: trunk/LedgerSMB/RC.pm
===================================================================
--- trunk/LedgerSMB/RC.pm	2007-02-18 00:33:10 UTC (rev 810)
+++ trunk/LedgerSMB/RC.pm	2007-02-18 00:34:13 UTC (rev 811)
@@ -232,11 +232,11 @@
 	if ($form->{fx_transaction}) {
 		$fx_transaction = qq|
 			AND NOT (ac.chart_id IN 
-				(SELECT value AS fxgain_accno_id FROM defaults
+				(SELECT value FROM defaults
 					WHERE setting_key = 'fxgain_accno_id'
 				UNION
-				SELECT value AS fxloss_accno_id FROM defaults
-					WHERE setting_key = 'fxloss_accno_id))|;
+				SELECT value FROM defaults
+					WHERE setting_key = 'fxloss_accno_id'))|;
 	} else {
 		$fx_transaction = qq|
 			AND ac.fx_transaction = '0'|;

Modified: trunk/UPGRADE
===================================================================
--- trunk/UPGRADE	2007-02-18 00:33:10 UTC (rev 810)
+++ trunk/UPGRADE	2007-02-18 00:34:13 UTC (rev 811)
@@ -13,6 +13,10 @@
 notes.  If you have not already done so, please read the release_notes file in
 the doc/ directory.
 
+Before you begin, make sure that you are running at least PostgreSQL 8.0.  If 
+you are running a prior version, you will need to dump your data, upgrade the 
+database server and restore the data before proceeding.
+
 MANUAL UPGRADE:
 ===============================================================================
 
@@ -78,6 +82,8 @@
 7)  Copy the files from the LedgerSMB tarball over your existing installation.
 8)  Delete the users directory.
 
+9)  Edit the ledger-smb.conf file as appropriate.
+
 Congratulations, you have manually upgraded to LedgerSMB 1.2.
 
 TODO:  Add upgrade.pl script and automate the above process.

Modified: trunk/install.sh
===================================================================
--- trunk/install.sh	2007-02-18 00:33:10 UTC (rev 810)
+++ trunk/install.sh	2007-02-18 00:34:13 UTC (rev 811)
@@ -7,7 +7,7 @@
 echo "Which user does your web server run as?"
 read username
 
-chmod $username spool templates css
+chown $username spool templates css
 
 echo "Where do we copy the ledger-smb-httpd.conf file to?"
 read location

Modified: trunk/ledger-smb.conf
===================================================================
--- trunk/ledger-smb.conf	2007-02-18 00:33:10 UTC (rev 810)
+++ trunk/ledger-smb.conf	2007-02-18 00:34:13 UTC (rev 811)
@@ -13,6 +13,6 @@
 #
 [globaldb]
 ##uncomment below and set to correct values
-#DBConnect: dbi:Pg:dbname=ledgersmb;host=localhost;port=5432
-#DBUserName: ledgersmb
-#DBPassword: password
+DBConnect: dbi:Pg:dbname=lsmb13;host=localhost;port=5432
+DBUserName: postgres
+# DBPassword: password

Modified: trunk/sl2ls.sh
===================================================================
--- trunk/sl2ls.sh	2007-02-18 00:33:10 UTC (rev 810)
+++ trunk/sl2ls.sh	2007-02-18 00:34:13 UTC (rev 811)
@@ -12,7 +12,10 @@
 LSDB=lsmbprod
 LSOWN=ledgersmb
 
+# Installation directory
 
+IDIR=`pwd`
+
 psql template1 -c "DROP DATABASE ${LSDB};"
 
 pg_dump ${SLDB} > sl2ls.sql
@@ -22,7 +25,7 @@
 
 createdb -O ${LSOWN} ${LSDB}
 
-psql ${LSDB} ${LSOWN} -c "\i /usr/local/ledger-smb/sql/Pg-central.sql"
+psql ${LSDB} ${LSOWN} -c "\i ${IDIR}/sql/Pg-central.sql"
 
 psql template1 -c "ALTER USER ${LSOWN} WITH superuser;"
 
@@ -30,7 +33,7 @@
 
 psql template1 -c "ALTER USER ${LSOWN} WITH nosuperuser;"
 
-cd /usr/local/ledger-smb/sql/legacy/
+cd ${IDIR}/sql/legacy/
 
 psql ${LSDB} ${LSOWN} -c "SELECT version FROM defaults;"
 
@@ -54,7 +57,7 @@
 
 psql ${LSDB} ${LSOWN} -c "update users_conf set password = md5('apasswrd');"
 
-cd /usr/local/ledger-smb
+cd ${IDIR}
 
 ./import_members.pl users/members
 


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