Merge pull request #2715 from ehuelsmann/1.4-mc

1.4 mc
ledgersmb · Apr 9, 2017 · e8b9d89 · e8b9d89
2 parents d487eb1 + 488db8d
commit e8b9d89
Show file tree

Hide file tree

Showing 108 changed files with 14,143 additions and 3,522 deletions.
diff --git a/Changelog b/Changelog
@@ -6,6 +6,9 @@ Released 2014-09-15
 
 Changelog for 1.4.41
 * Fix 'Bad interval' error with PNL comparisons (Erik H, #2146)
+* Refactor filter pages for income statement and balance sheet (Erik H)
+* Follow-up to earlier compensation for '.' missing from @INC (Erik H, #2275)
+* Fix reversal of payments against non-eca-default AR/AP account (Erik H, #2558)
 
 Erik H is Erik Huelsmann
 

diff --git a/LedgerSMB.pm b/LedgerSMB.pm
@@ -179,7 +179,7 @@ use Try::Tiny;
 use DBI;
 
 use base qw(LedgerSMB::Request);
-our $VERSION = '1.4.41-dev';
+our $VERSION = '1.4.41';
 
 my $logger = Log::Log4perl->get_logger('LedgerSMB');
 

diff --git a/LedgerSMB/Form.pm b/LedgerSMB/Form.pm
@@ -174,8 +174,8 @@ sub new {
     #menubar will be deprecated, replaced with below
     $self->{lynx} = 1 if ( ( defined $self->{path} ) && ( $self->{path} =~ /lynx/i ) );
 
-    $self->{version}   = "1.4.41-dev";
-    $self->{dbversion} = "1.4.41-dev";
+    $self->{version}   = "1.4.41";
+    $self->{dbversion} = "1.4.41";
 
     bless $self, $type;
 

diff --git a/Reconciliation.pl b/Reconciliation.pl
@@ -4,7 +4,7 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 
 require "lsmb-request.pl";
diff --git a/account.pl b/account.pl
@@ -4,7 +4,7 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 
 require "lsmb-request.pl";

diff --git a/admin.pl b/admin.pl
@@ -3,7 +3,7 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 
 

diff --git a/am.pl b/am.pl
@@ -4,6 +4,6 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 require "old-handler.pl";
diff --git a/ap.pl b/ap.pl
@@ -4,6 +4,6 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 require "old-handler.pl";
diff --git a/ar.pl b/ar.pl
@@ -4,6 +4,6 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 require "old-handler.pl";
diff --git a/asset.pl b/asset.pl
@@ -4,6 +4,6 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 require "lsmb-request.pl";
diff --git a/budget_reports.pl b/budget_reports.pl
@@ -4,7 +4,7 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 
 require 'lsmb-request.pl';
diff --git a/budgets.pl b/budgets.pl
@@ -4,7 +4,7 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 
 require 'lsmb-request.pl';
diff --git a/business_unit.pl b/business_unit.pl
@@ -4,7 +4,7 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 
 require "lsmb-request.pl";
diff --git a/configuration.pl b/configuration.pl
@@ -4,6 +4,6 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 require "lsmb-request.pl";
diff --git a/contact.pl b/contact.pl
@@ -4,7 +4,7 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 
 require 'lsmb-request.pl';
diff --git a/contact_reports.pl b/contact_reports.pl
@@ -4,7 +4,7 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 
 require 'lsmb-request.pl';
diff --git a/customer.pl b/customer.pl
@@ -3,7 +3,7 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 
 

diff --git a/dists/rpm/build.sh b/dists/rpm/build.sh
@@ -2,7 +2,7 @@
 
 # One must run the source file build first.
 
-VERSION="1.4.41-dev"
+VERSION="1.4.41"
 hg archive -ttgz ~/ledgersmb.tar.gz
 
 # Remove Dojo

diff --git a/dists/rpm/ledgersmb.spec b/dists/rpm/ledgersmb.spec
@@ -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.4.41-dev
+Version: 1.4.41
 Release: 1
 License: GPL
 URL: http://www.ledgersmb.org/

diff --git a/dists/source/build.sh b/dists/source/build.sh
@@ -2,7 +2,7 @@
 
 # Simple script to prepare for release
 
-version="1.4.41-dev";
+version="1.4.41";
 build_d="../release";
 
 if test -d $build_d/ledgersmb; then

diff --git a/doc/release_notes b/doc/release_notes
@@ -1,7 +1,7 @@
 RELEASE NOTES
 LedgerSMB 1.4
 
-Latest Revision:  1.4.41-dev
+Latest Revision:  1.4.41
 
 1:  Welcome to LedgerSMB
 

diff --git a/document_series.pl b/document_series.pl
@@ -4,6 +4,6 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 require "lsmb-request.pl";
diff --git a/drafts.pl b/drafts.pl
@@ -3,7 +3,7 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 
 

diff --git a/file.pl b/file.pl
@@ -3,7 +3,7 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 
 

diff --git a/gl.pl b/gl.pl
@@ -4,6 +4,6 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 require "old-handler.pl";
diff --git a/goods.pl b/goods.pl
@@ -3,7 +3,7 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 
 

diff --git a/ic.pl b/ic.pl
@@ -4,6 +4,6 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 require "old-handler.pl";
diff --git a/import_csv.pl b/import_csv.pl
@@ -4,6 +4,6 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 require 'lsmb-request.pl';
diff --git a/inv_reports.pl b/inv_reports.pl
@@ -4,7 +4,7 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 
 require 'lsmb-request.pl';
diff --git a/inventory.pl b/inventory.pl
@@ -4,6 +4,6 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 require "lsmb-request.pl";
diff --git a/invoice.pl b/invoice.pl
@@ -4,7 +4,7 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 
 require 'lsmb-request.pl';
diff --git a/ir.pl b/ir.pl
@@ -4,6 +4,6 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 require "old-handler.pl";
diff --git a/is.pl b/is.pl
@@ -4,6 +4,6 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 require "old-handler.pl";
diff --git a/job.pl b/job.pl
@@ -4,7 +4,7 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 
 require "lsmb-request.pl";
diff --git a/journal.pl b/journal.pl
@@ -4,7 +4,7 @@
 use FindBin;
 BEGIN {
   unshift @INC, $FindBin::Bin
-      unless grep(@INC, $FindBin::Bin) || $ENV{mod_perl}
+      unless grep($_ eq $FindBin::Bin, @INC) || $ENV{mod_perl}
 }
 
 require "lsmb-request.pl";