[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[5136] trunk

Subject: SF.net SVN: ledger-smb:[5136] trunk
From: ..hidden..
Date: Wed, 03 Oct 2012 08:38:57 +0000
Revision: 5136
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5136&view=rev
Author:   einhverfr
Date:     2012-10-03 08:38:57 +0000 (Wed, 03 Oct 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/CONTRIBUTORS
    trunk/Changelog
    trunk/LedgerSMB/Form.pm
    trunk/LedgerSMB/Template/CSV.pm
    trunk/sql/upgrade/1.2-1.3-manual.sql
    trunk/sql/upgrade/1.2-1.4.sql

Property Changed:
----------------
    trunk/
    trunk/sql/upgrade/1.2-1.3-manual.sql
    trunk/sql/upgrade/1.2-1.4.sql


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-5125
   + /branches/1.3:3711-5135

Modified: trunk/CONTRIBUTORS
===================================================================
--- trunk/CONTRIBUTORS	2012-10-03 08:33:19 UTC (rev 5135)
+++ trunk/CONTRIBUTORS	2012-10-03 08:38:57 UTC (rev 5136)
@@ -7,13 +7,13 @@
 Wrote the inventory activity report, helped with the session handling fix, 
 and other tasks.
 
-Joshua Drake <jd @ commandprompt . com>
-Contributed database fixes, the contact/company/entity schema, and other 
-db-centric changes.
-
 Erik Huelsmann <ehuels @ gmail.com> has provided numerous bugfixes and guidance for the
 project.
 
+Havard Sorli <havard @ anix no>
+Contributed documentation fixes, bug hunting, website updates and user support.
+
+
 Other Committers:
 ==================
 Jeff Kowalczyk [email omitted] contributed the ledger-smb-smallgray.css and has submitted numerous bug fixes.
@@ -30,9 +30,11 @@
 re-engineered the localization framework.  She has also provided support for 
 Excel, ODS, and other formats for reports.
 
-Havard Sorli <havard @ anix no>
-Contributed documentation fixes, bug hunting, website updates and user support.
+Joshua Drake <jd @ commandprompt . com>
+Contributed database fixes, the contact/company/entity schema, and other 
+db-centric changes.
 
+
 Other Contributors:
 ========================
 David Bandel <david.bandel @ gmail.com> Provided some bug fixes and 
@@ -119,7 +121,12 @@
 
 Nick Prater <  nick @ npbroadcast.com > has contributed bugfixes.
 
+Istvan Pongracz has contributed a number of bug fixes and some bug reports.
 
+Brian Wolf <  brian @ activustech.com > has contributed bug reports.
+
+
+
 Original Authors of SQL-Ledger:
 ===================================
 Dieter Simader <dsimader @ sql-ledger.com>

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-10-03 08:33:19 UTC (rev 5135)
+++ trunk/Changelog	2012-10-03 08:38:57 UTC (rev 5136)
@@ -84,7 +84,17 @@
 * Fixed fatal gettext errors in ar_EG, fi, nb po's (Havard S)
 * Fixed prices being selected on RFQ (Chris T, h/t Erik H)
 * Fixed discount wrong after multiple parts selection (Chris T, h/T Istvan P)
+* Fixed action not found on redirect (Chris T, h/t Brian W)
+* Fixed issues upgrading from 1.2 if email and bcc are filled in (Chris T)
+* Fixed error exporting aging to csv (Havard S, h/t Nick P, 3559403)
 
+Chris T is Chris Travers
+Havard S is Havard Sorli
+Erik H is Erik Huelsmann
+Istvan P is Istvan Pongracz
+Brian W is Brian Wolf 
+Nick P is Nick Prater
+
 Changelog for 1.3.22
 * Fixed error when trying to save multiple make/models for a part (Chris T)
 * Better error handling when date is entered into statement balance (Chris T)

Modified: trunk/LedgerSMB/Form.pm
===================================================================
--- trunk/LedgerSMB/Form.pm	2012-10-03 08:33:19 UTC (rev 5135)
+++ trunk/LedgerSMB/Form.pm	2012-10-03 08:38:57 UTC (rev 5136)
@@ -102,11 +102,10 @@
         print "Status: 413\n Request entity too large\n\n";
         die "Error: Request entity too large\n";
     }
-
-    if ($ENV{CONTENT_LENGTH}!= 0){
-        read( STDIN, $_, $ENV{CONTENT_LENGTH} );
-    }elsif ($argstr) {
+    if ($argstr) {
         $_ = $argstr;
+    }elsif ($ENV{CONTENT_LENGTH}!= 0){
+        read( STDIN, $_, $ENV{CONTENT_LENGTH} );
     }
     elsif ( $ENV{QUERY_STRING} ) {
         $_ = $ENV{QUERY_STRING};

Modified: trunk/LedgerSMB/Template/CSV.pm
===================================================================
--- trunk/LedgerSMB/Template/CSV.pm	2012-10-03 08:33:19 UTC (rev 5135)
+++ trunk/LedgerSMB/Template/CSV.pm	2012-10-03 08:38:57 UTC (rev 5136)
@@ -73,12 +73,15 @@
 			# Scalars or GMP objects (which are SCALAR refs) --CT
 		if ($type eq 'SCALAR' or $type eq 'Math::BigInt::GMP') {
 			$vars = $$rawvars;
+			return unless defined $vars;
 		} else {
 			$vars = $rawvars;
 		}
 		$vars =~ s/(^ +| +$)//g;
 		$vars =~ s/"/""/g;
 		$vars = qq|"$vars"| if $vars =~ /[^0-9.+-]/;
+	} elsif ( $type eq 'CODE' ) { # a code reference makes no sense
+		return undef;
 	} else { # hashes and objects
 		for ( keys %{$rawvars} ) {
 			$vars->{$_} = preprocess( $rawvars->{$_} );

Modified: trunk/sql/upgrade/1.2-1.3-manual.sql
===================================================================
--- trunk/sql/upgrade/1.2-1.3-manual.sql	2012-10-03 08:33:19 UTC (rev 5135)
+++ trunk/sql/upgrade/1.2-1.3-manual.sql	2012-10-03 08:38:57 UTC (rev 5136)
@@ -128,13 +128,13 @@
        and v.email ~ '[[:alnum:]_]'::text 
 group by v.credit_id, v.email
 UNION
-select v.credit_id, 12, v.cc, 'Carbon Copy email address' as description 
+select v.credit_id, 13, v.cc, 'Carbon Copy email address' as description 
 from lsmb12.vendor v 
 where v.company_id is not null and v.cc is not null 
       and v.cc ~ '[[:alnum:]_]'::text 
 group by v.credit_id, v.cc
 UNION 
-select v.credit_id, 12, v.bcc, 'Blind Carbon Copy email address' as description 
+select v.credit_id, 14, v.bcc, 'Blind Carbon Copy email address' as description 
 from lsmb12.vendor v 
 where v.company_id is not null and v.bcc is not null 
        and v.bcc ~ '[[:alnum:]_]'::text 
@@ -160,13 +160,13 @@
        and v.email ~ '[[:alnum:]_]'::text 
 group by v.credit_id, v.email
 UNION
-select v.credit_id, 12, v.cc, 'Carbon Copy email address' as description 
+select v.credit_id, 13, v.cc, 'Carbon Copy email address' as description 
 from lsmb12.customer v 
 where v.company_id is not null and v.cc is not null 
       and v.cc ~ '[[:alnum:]_]'::text 
 group by v.credit_id, v.cc
 UNION 
-select v.credit_id, 12, v.bcc, 'Blind Carbon Copy email address' as description 
+select v.credit_id, 14, v.bcc, 'Blind Carbon Copy email address' as description 
 from lsmb12.customer v 
 where v.company_id is not null and v.bcc is not null 
        and v.bcc ~ '[[:alnum:]_]'::text 


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-4945
/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:3711-5135
/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.4.sql
===================================================================
--- trunk/sql/upgrade/1.2-1.4.sql	2012-10-03 08:33:19 UTC (rev 5135)
+++ trunk/sql/upgrade/1.2-1.4.sql	2012-10-03 08:38:57 UTC (rev 5136)
@@ -111,13 +111,13 @@
        and v.email ~ '[[:alnum:]_]'::text 
 group by v.credit_id, v.email
 UNION
-select v.credit_id, 12, v.cc, 'Carbon Copy email address' as description 
+select v.credit_id, 13, v.cc, 'Carbon Copy email address' as description 
 from lsmb12.vendor v 
 where v.company_id is not null and v.cc is not null 
       and v.cc ~ '[[:alnum:]_]'::text 
 group by v.credit_id, v.cc
 UNION 
-select v.credit_id, 12, v.bcc, 'Blind Carbon Copy email address' as description 
+select v.credit_id, 14, v.bcc, 'Blind Carbon Copy email address' as description 
 from lsmb12.vendor v 
 where v.company_id is not null and v.bcc is not null 
        and v.bcc ~ '[[:alnum:]_]'::text 
@@ -143,13 +143,13 @@
        and v.email ~ '[[:alnum:]_]'::text 
 group by v.credit_id, v.email
 UNION
-select v.credit_id, 12, v.cc, 'Carbon Copy email address' as description 
+select v.credit_id, 13, v.cc, 'Carbon Copy email address' as description 
 from lsmb12.customer v 
 where v.company_id is not null and v.cc is not null 
       and v.cc ~ '[[:alnum:]_]'::text 
 group by v.credit_id, v.cc
 UNION 
-select v.credit_id, 12, v.bcc, 'Blind Carbon Copy email address' as description 
+select v.credit_id, 14, v.bcc, 'Blind Carbon Copy email address' as description 
 from lsmb12.customer v 
 where v.company_id is not null and v.bcc is not null 
        and v.bcc ~ '[[:alnum:]_]'::text 


Property changes on: trunk/sql/upgrade/1.2-1.4.sql
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/1.3/sql/upgrade/1.2-1.3.sql:3711-5135
/branches/1.3/sql/upgrade/1.2-1.4.sql:3711-5135

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Prev by Date: SF.net SVN: ledger-smb:[5135] trunk
Next by Date: SF.net SVN: ledger-smb:[5137] trunk/LedgerSMB
Previous by thread: SF.net SVN: ledger-smb:[5135] trunk
Next by thread: SF.net SVN: ledger-smb:[5137] trunk/LedgerSMB
Index(es):
- Date
- Thread