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

[..hidden..]

Revision: 4962
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4962&view=rev
Author:   einhverfr
Date:     2012-07-10 09:06:49 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
Merging from branches/1.3
Also correcting some database cleanup behavior on errors

Modified Paths:
--------------
    trunk/Changelog
    trunk/lsmb-request.pl
    trunk/old-handler.pl

Property Changed:
----------------
    trunk/
    trunk/Changelog


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-4958
   + /branches/1.3:3711-4961

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-07-10 08:44:43 UTC (rev 4961)
+++ trunk/Changelog	2012-07-10 09:06:49 UTC (rev 4962)
@@ -71,11 +71,14 @@
 * Added access to parts.image for ar invoice, order, quote templates (Chris T)
 * Fixed error on redirect from attaching file to part (Chris T h/t Brian W)
 * Fixed inability to look up vendor by ECA with discounts (Erik H h/t Matt B)
+* Removed broken cash-basis reports (Chris T, h/t Jigme D
+* Backporting LedgerSMB::App_State to make other backports easier (Chris T)
 
 Andres B is Andres Basile
 Brian W is Brian Wolf
 Chris T is Chris Travers
 Erik H is Erik Huelsmann
+Jigme D is JigmeDatse
 Matt B is Matthew Bourque
 
 Changelog for 1.3.19


Property changes on: trunk/Changelog
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/1.3/Changelog:3711-4956

Modified: trunk/lsmb-request.pl
===================================================================
--- trunk/lsmb-request.pl	2012-07-10 08:44:43 UTC (rev 4961)
+++ trunk/lsmb-request.pl	2012-07-10 09:06:49 UTC (rev 4962)
@@ -108,12 +108,15 @@
     $script->can($request->{action}) 
       || $request->error($locale->text("Action Not Defined: ") . $request->{action});
     $script->can( $request->{action} )->($request);
+    LedgerSMB::App_State->cleanup();
   }
   catch {
       # We have an exception here because otherwise we always get an exception
       # when output terminates.  A mere 'die' will no longer trigger an 
       # automatic error, but die 'foo' will map to $request->error('foo')
       # -- CT
+     $LedgerSMB::App_State::DBH->rollback if $LedgerSMB::App_State::DBH;
+     LedgerSMB::App_State->cleanup();
      $request->error($_) unless $_ eq 'Died';
   };
 }

Modified: trunk/old-handler.pl
===================================================================
--- trunk/old-handler.pl	2012-07-10 08:44:43 UTC (rev 4961)
+++ trunk/old-handler.pl	2012-07-10 09:06:49 UTC (rev 4962)
@@ -49,6 +49,7 @@
 use LedgerSMB::Sysconfig;
 use Digest::MD5;
 use Try::Tiny;
+use LedgerSMB::App_State;
 
 $| = 1;
 

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