[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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



Revision: 3952
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3952&view=rev
Author:   einhverfr
Date:     2011-11-02 13:09:09 +0000 (Wed, 02 Nov 2011)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/UPGRADE
    trunk/bin/aa.pl
    trunk/dists/rpm/ledgersmb.spec
    trunk/doc/release_notes
    trunk/sql/coa/no/chart/General.sql
    trunk/sql/upgrade/1.2-1.3.sql

Property Changed:
----------------
    trunk/
    trunk/LedgerSMB/Scripts/admin.pm
    trunk/LedgerSMB/Scripts/employee.pm
    trunk/LedgerSMB/Scripts/setup.pm
    trunk/sql/upgrade/1.2-1.3-manual.sql


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-3936
   + /branches/1.3:3711-3951

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2011-11-01 23:35:02 UTC (rev 3951)
+++ trunk/Changelog	2011-11-02 13:09:09 UTC (rev 3952)
@@ -9,6 +9,14 @@
 Initial Release:  Monday, Oct 12 2011
 Supported Presently
 
+Changelog for LedgerSMB 1.3.4
+* Corrected case matching error in upgrade script (Chris T)
+* Corrected version number on new databases (Chris T)
+* Corrected multiple load errors on upgrade (David B)
+
+Chris T is Chris Travers
+David B is David Bandel
+
 Changelog for LedgerSMB 1.3.3
 * Fix for being unable to delete AR/AP drafts (Herman V)
 * Additional button cleanup (Herman V)
@@ -17,8 +25,14 @@
 * API inconsistency fixed (Chris T)
 * Fix for translation string standardization (Herman V)
 * Fix for AP posting issue with 1.000,00 number format (Herman V)
+* More number format fixes (Herman V)
 * Database upgrade within 1.3 now possible from setup.pl (Chris T)
+* Corrected Norwegian tax rates (Erik H)
 
+Chris T is Chris Travers
+Herman V is Herman Vierendeels
+Erik H is Erik Huelsman
+
 Changelog for LedgerSMB 1.3.2
 * Fixed a few files where suExec fixes were not applied (Chris T)
 * Fixed erroneous buttons marked "Save and Post" showing up (Chris T)


Property changes on: trunk/LedgerSMB/Scripts/admin.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-3936
/branches/1.3/scripts/admin.pl:3711-3903
   + /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-3951
/branches/1.3/scripts/admin.pl:3711-3903


Property changes on: trunk/LedgerSMB/Scripts/employee.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-3936
/branches/1.3/scripts/employee.pl:3842-3843
   + /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-3951
/branches/1.3/scripts/employee.pl:3842-3843


Property changes on: trunk/LedgerSMB/Scripts/setup.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/scripts/setup.pl:3711-3936
   + /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-3951
/branches/1.3/scripts/setup.pl:3711-3951

Modified: trunk/UPGRADE
===================================================================
--- trunk/UPGRADE	2011-11-01 23:35:02 UTC (rev 3951)
+++ trunk/UPGRADE	2011-11-02 13:09:09 UTC (rev 3952)
@@ -1,93 +1,41 @@
-Upgrading to LedgerSMB 1.2 
+Upgrading to LedgerSMB 1.3.3 
 
-From LedgerSMB (1.1.1 or earlier) 
-or 
-SQL-Ledger (2.6.19 or earlier)
+From LedgerSMB 1.3.0-1.3.2:
 
-This document contains information on how to upgrade from earlier versions of 
-LedgerSMB or SQL-Ledger.  This upgrade is a major revision and may not go 
-smoothly.  We recommend that the reader start by reading the section on manual
-installation and then start by trying the automated means mentioned later.
+Untar over the top and then:
 
-Also this document assumes that the reader is already familiar with the release
-notes.  If you have not already done so, please read the release_notes file in
-the doc/ directory.
+1)  Shell script process (UNIX/Linux only):
 
-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.
+* cd to the sql/modules directory of the ledgersmb installation.
+* sh reload_modules.sh [dbname] 
+* repeat the shell script for each database for each database
 
-MANUAL UPGRADE:
-===============================================================================
+2)  Automated process (all platforms):
 
-1)  Back up old installation
-THis is a major upgrade.  If something goes wrong, you want to be able to get
-back to a known good state.  To back up the old installation do as follows:
-  a)  Copy the LedgerSMB install directory (for example /usr/local/ledger-smb) 
-      to another location
-  b)  Back up the database using pg_dump or other PostgreSQL backup program.
-  c)  (optional) Make a live bakup of the accounting database by creating a new
-      db with it as the template.  Something like:
-      createdb -U postgres -T ledgersmb accounting_backup
+* direct browser to the setup.pl file in the directory you are in.
+* provide PostgreSQL superuser credentials and the name of your data base.
+* Click continue.
+* Repeat for each database.
 
+From LedgerSMB 1.1 and earlier:
 
-2)  Check New Dependencies
+For versions prior to 1.2, please upgrade to LedgerSMB 1.2 before upgrading to 
+1.3.x.  To do this upgrade, simply untar the version of 1.2.x over your old
+installation and run the relevant database upgrade scripts (in
+sql/upgrade/legacy).  Then proceed below.
 
-The Build.PL script can be used to test for unmet dependencies and run other
-tests.  It doesn't install anything yet, but it will tell you what you are 
-missing.  To check for dependencies, run "perl Build.PL" from the command line.
-Missing dependencies can generally be installed via a Linux distributor's
-package manager or by CPAN.
+From LedgerSMB 1.2.x
 
-Once this is done and dependencies are satisfied, you can check to see whether
-the installation nominally works by running "./Build test" from the command
-line.  The test suites currently check to make sure all the perl modules load
-and that a number of numeric tests are passed.
-
-Dependencies which are recommended are needed only for specific functionality
-and may not be required in all circumstances.  These include:
-  * Net::TCLink for credit card processing in a POS environment
-  * Parse::RecDescent for the CLI script host
-
-3)  Upgrade database
-
-  a) cd to the sql/legacy/ directory of the new ledger directory
-  b) run "psql" with appropriate options to connect to your database.
-  c) Note the db schema version by running the following query:
-     "SELECT value from defaults where setting_key = 'version';" (1.2.0 or 
-     later)
-       or
-     "SELECT version FROM defaults;" (SQL-Ledger 2.6.x or LedgerSMB 1.1.x 
-     or earlier)
-  d) Run the SQL upgrade scripts in order starting with the one whose name
-     begins with "Pg-upgrade-[version]" (each of these scripts will upgrade to
-     the next database version which is also identified in the file name).
-
-Note that this will create three tables that may not actually be used depending
-on your setup:  users, users_conf, and session.  In general if you have multiple
-datasets, these tables will only be used in one.
-
-4)  Decide where to put the user/session management tables.  In general, we
-recommend as follows:
-  a)  Single dataset installations should use the user tables in the dataset.
-  b)  Multicompany installations should use user tables in a separate dataset
-      from any accounting data.
-
-If you need to create another dataset, you can create the db and import the
-sql/Pg-central.sql file into it.
-
-5)  Set the admin password:
-  a)  From psql, determine what admin password you wish to use.  Then type:
-      "update users_conf set password = md5('my_password');"
-      Naturally you would use your password instead of my_password.
-
-6)  Import the users.  Run the import-members script to do this.
-
-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.
+* Untar over the top.
+* Check your Perl dependencies:
+   * perl Makefile.PL
+   * make
+   * make test
+* run the install.sh script.
+* direct your browser to the setup.pl script in your ledgersmb directory (via
+  http) and follow the prompts:
+   * Provide Pg superuser and database information for your existing database
+   * Click continue when asked to upgrade
+   * Provide user information.
+   * log into the application and create additional users under System/User
+     Management

Modified: trunk/bin/aa.pl
===================================================================
--- trunk/bin/aa.pl	2011-11-01 23:35:02 UTC (rev 3951)
+++ trunk/bin/aa.pl	2011-11-02 13:09:09 UTC (rev 3952)
@@ -269,7 +269,8 @@
     $netamount = 0;
     $tax       = 0;
     $taxrate   = 0;
-    $ml        = ( $form->{ARAP} eq 'AR' ) ? 1 : -1;
+    #$ml        = ( $form->{ARAP} eq 'AR' ) ? 1 : -1;
+    $ml        = new Math::BigFloat( ( $form->{ARAP} eq 'AR' ) ? 1 : -1);
 
     foreach $key ( keys %{ $form->{"$form->{ARAP}_links"} } ) {
 
@@ -345,8 +346,7 @@
                     }
                     else {
                         $form->{invtotal} =
-                          $form->{acc_trans}{$key}->[ $i - 1 ]->{amount} * -1 *
-                          $ml;
+                          $form->{acc_trans}{$key}->[ $i - 1 ]->{amount} * -1 * $ml;
                     }
                     $form->{"${key}_$i"} =
 "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";

Modified: trunk/dists/rpm/ledgersmb.spec
===================================================================
--- trunk/dists/rpm/ledgersmb.spec	2011-11-01 23:35:02 UTC (rev 3951)
+++ trunk/dists/rpm/ledgersmb.spec	2011-11-02 13:09:09 UTC (rev 3952)
@@ -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.0
+Version: 1.3.3
 Release: 1
 License: GPL
 URL: http://www.ledgersmb.org/

Modified: trunk/doc/release_notes
===================================================================
--- trunk/doc/release_notes	2011-11-01 23:35:02 UTC (rev 3951)
+++ trunk/doc/release_notes	2011-11-02 13:09:09 UTC (rev 3952)
@@ -1,8 +1,8 @@
 RELEASE NOTES
 LedgerSMB 1.3
 
+Latest Revision:  1.3.3, October 28th.
 
-
 1:  Welcome to LedgerSMB
 
 LedgerSMB is an accounting and ERP program initially aimed at small to midsize
@@ -15,7 +15,7 @@
 
 * Perl 5.8.
 * Apache, IIS, or other web server that supports CGI.
-* PostgreSQL 8.1 or higher.
+* PostgreSQL 8.2 or higher.
 * Any operating system that supports the above environment.
 * The following CPAN modules:
 	* Data::Dumper

Modified: trunk/sql/coa/no/chart/General.sql
===================================================================
--- trunk/sql/coa/no/chart/General.sql	2011-11-01 23:35:02 UTC (rev 3951)
+++ trunk/sql/coa/no/chart/General.sql	2011-11-02 13:09:09 UTC (rev 3952)
@@ -1,8 +1,11 @@
 begin;
 -- Default chart of accounts
--- charset: ISO-8859-1
---   http://www.nif.idrett.no/ftp/Lover/doc/kontoplan.htm
---   http://www.legemiddelverket.no/rundskriv/frahtil/1999/ik-1499.htm
+-- charset: ISO-8859-1, see:
+--   http://www.idrett.no/TEMA/KLUBBGUIDEN/%C3%98KONOMI/Sider/regnskap.aspx
+--   http://www.idrett.no/tema/klubbguiden/%C3%B8konomi/Documents/Norskstandardkontoplan_ny.pdf
+--
+--  http://web.archive.org/web/20041227034757/http://www.legemiddelverket.no/rundskriv/frahtil/1999/ik-1499.htm
+--
 -- sample only
 SELECT account_heading_save(NULL,'10','Immaterielle eiendeler', NULL);
 SELECT account_save(NULL,'1000','Forskning og utvikling','A','', NULL, false, false, string_to_array('', ':'));
@@ -104,11 +107,13 @@
 SELECT account_save(NULL,'2650','Forsikringstrekk','L','', NULL, false, false, string_to_array('', ':'));
 SELECT account_save(NULL,'2660','Fagforeningstrekk','L','', NULL, false, false, string_to_array('', ':'));
 SELECT account_save(NULL,'2690','Andre trekk','L','', NULL, false, false, string_to_array('', ':'));
-SELECT account_save(NULL,'2710','UtgÃende 24% mva','L','', NULL, false, false, string_to_array('AR_tax:IC_taxpart:IC_taxservice', ':'));
-SELECT account_save(NULL,'2715','UtgÃende 12% mva','L','', NULL, false, false, string_to_array('AR_tax:IC_taxpart:IC_taxservice', ':'));
+SELECT account_save(NULL,'2710','UtgÃende 25% mva','L','', NULL, false, false, string_to_array('AR_tax:IC_taxpart:IC_taxservice', ':'));
+SELECT account_save(NULL,'2720','UtgÃende 14% mva','L','', NULL, false, false, string_to_array('AR_tax:IC_taxpart:IC_taxservice', ':'));
+SELECT account_save(NULL,'2730','UtgÃende 8% mva','L','', NULL, false, false, string_to_array('AR_tax:IC_taxpart:IC_taxservice', ':'));
 SELECT account_save(NULL,'2717','Beregnet avgift utlandet','L','', NULL, false, false, string_to_array('', ':'));
-SELECT account_save(NULL,'2720','InngÃende 24% mva','L','', NULL, false, false, string_to_array('AP_tax:IC_taxpart:IC_taxservice', ':'));
-SELECT account_save(NULL,'2725','InngÃende 12% mva','L','', NULL, false, false, string_to_array('AP_tax:IC_taxpart:IC_taxservice', ':'));
+SELECT account_save(NULL,'2715','InngÃende 25% mva','L','', NULL, false, false, string_to_array('AP_tax:IC_taxpart:IC_taxservice', ':'));
+SELECT account_save(NULL,'2725','InngÃende 14% mva','L','', NULL, false, false, string_to_array('AP_tax:IC_taxpart:IC_taxservice', ':'));
+SELECT account_save(NULL,'2735','InngÃende 25% mva','L','', NULL, false, false, string_to_array('AP_tax:IC_taxpart:IC_taxservice', ':'));
 SELECT account_save(NULL,'2745','Grunnlag 1 tjenester utlandet','L','', NULL, false, false, string_to_array('', ':'));
 SELECT account_save(NULL,'2746','Grunnlag 2 tjenester utlandet','L','', NULL, false, false, string_to_array('', ':'));
 SELECT account_save(NULL,'2750','OppgjÃrskonto merverdiavgift','L','', NULL, false, false, string_to_array('', ':'));
@@ -287,10 +292,12 @@
 SELECT account_save(NULL,'8980','Avsatt til fri egenkapital','E','', NULL, false, false, string_to_array('', ':'));
 SELECT account_save(NULL,'8990','Udekket tap','E','', NULL, false, false, string_to_array('', ':'));
 --
-insert into tax (chart_id,rate) values ((select id from chart where accno = '2710'),0.24);
-insert into tax (chart_id,rate) values ((select id from chart where accno = '2715'),0.12);
-insert into tax (chart_id,rate) values ((select id from chart where accno = '2720'),0.24);
-insert into tax (chart_id,rate) values ((select id from chart where accno = '2725'),0.12);
+insert into tax (chart_id,rate) values ((select id from chart where accno = '2710'),0.25);
+insert into tax (chart_id,rate) values ((select id from chart where accno = '2720'),0.14);
+insert into tax (chart_id,rate) values ((select id from chart where accno = '2730'),0.08);
+insert into tax (chart_id,rate) values ((select id from chart where accno = '2715'),0.25);
+insert into tax (chart_id,rate) values ((select id from chart where accno = '2725'),0.14);
+insert into tax (chart_id,rate) values ((select id from chart where accno = '2735'),0.08);
 --
 INSERT INTO defaults (setting_key, value) VALUES ('inventory_accno_id', (select id from chart where accno = '1250'));
 


Property changes on: trunk/sql/upgrade/1.2-1.3-manual.sql
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-3936
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
   + /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-3951
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710

Modified: trunk/sql/upgrade/1.2-1.3.sql
===================================================================
--- trunk/sql/upgrade/1.2-1.3.sql	2011-11-01 23:35:02 UTC (rev 3951)
+++ trunk/sql/upgrade/1.2-1.3.sql	2011-11-02 13:09:09 UTC (rev 3952)
@@ -5,25 +5,6 @@
 \set ar '''<?lsmb default_ar ?>'''
 \set ap '''<?lsmb default_ap ?>'''
 
--- This will be moved out of this part.
-ALTER SCHEMA public RENAME TO lsmb12;
-CREATE SCHEMA public;
-
-\cd :contribdir
-\i pg_trgm.sql
-\i tsearch2.sql
-\i tablefunc.sql
-
-\cd :lsmbdir
-
--- Full module load should be part of upgrade wizard, at this stage.
-\i sql/Pg-database.sql
-\i sql/modules/Setting.sql
-\i sql/modules/Location.sql
-\i sql/modules/Account.sql
-\i sql/modules/Payment.sql
-\i sql/modules/Person.sql
-\i sql/modules/Reconciliation.sql
 BEGIN;
 
 -- adding mapping info for import.
@@ -52,14 +33,14 @@
 INSERT INTO entity (name, control_code, entity_class, country_id)
 SELECT name, 'V-' || vendornumber, 1, 
        (select id from country 
-         where lower(short_name)  = :default_country)
+         where lower(short_name)  = lower(:default_country))
 FROM lsmb12.vendor
 GROUP BY name, vendornumber;
 
 INSERT INTO entity (name, control_code, entity_class, country_id)
 SELECT name, 'C-' || customernumber, 2, 
        (select id from country 
-         where lower(short_name)  =  :default_country)
+         where lower(short_name)  =  lower(:default_country))
 FROM lsmb12.customer
 GROUP BY name, customernumber;
 
@@ -371,7 +352,7 @@
 
 INSERT INTO entity(control_code, entity_class, name, country_id)
 select 'E-' || employeenumber, 3, name,
-        (select id from country where lower(short_name) = :default_country)
+        (select id from country where lower(short_name) = lower(:default_country))
 FROM lsmb12.employee;
 
 UPDATE lsmb12.employee set entity_id = 
@@ -381,7 +362,8 @@
 select name, name, entity_id FROM lsmb12.employee;
 
 INSERT INTO users (entity_id, username)
-     SELECT entity_id, login FROM lsmb12.employee em;
+     SELECT entity_id, login FROM lsmb12.employee em
+      WHERE login IS NOT NULL;
 
 INSERT 
   INTO entity_employee(entity_id, startdate, enddate, role, ssn, sales,

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