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

[..hidden..]

Revision: 5886
          http://sourceforge.net/p/ledger-smb/code/5886
Author:   einhverfr
Date:     2013-05-30 13:46:24 +0000 (Thu, 30 May 2013)
Log Message:
-----------
Save as shown now works (previously deadlock victim)

Modified Paths:
--------------
    trunk/LedgerSMB/AA.pm
    trunk/LedgerSMB/IR.pm
    trunk/LedgerSMB/IS.pm
    trunk/bin/aa.pl
    trunk/bin/gl.pl

Modified: trunk/LedgerSMB/AA.pm
===================================================================
--- trunk/LedgerSMB/AA.pm	2013-05-30 13:09:13 UTC (rev 5885)
+++ trunk/LedgerSMB/AA.pm	2013-05-30 13:46:24 UTC (rev 5886)
@@ -28,6 +28,7 @@
 
 package AA;
 use LedgerSMB::Sysconfig;
+use LedgerSMB::App_State;
 use Log::Log4perl;
 use LedgerSMB::File;
 use Math::BigFloat;
@@ -78,7 +79,7 @@
     }
 
     # connect to database
-    my $dbh = $form->{dbh};
+    my $dbh = $LedgerSMB::App_State::DBH;
 
     my $query;
     my $sth;

Modified: trunk/LedgerSMB/IR.pm
===================================================================
--- trunk/LedgerSMB/IR.pm	2013-05-30 13:09:13 UTC (rev 5885)
+++ trunk/LedgerSMB/IR.pm	2013-05-30 13:46:24 UTC (rev 5886)
@@ -42,6 +42,7 @@
 use LedgerSMB::PriceMatrix;
 use LedgerSMB::Sysconfig;
 use LedgerSMB::Setting;
+use LedgerSMB::App_State;
 use Math::BigFloat;
 
 =over
@@ -82,7 +83,7 @@
     if ($form->{id}){
         delete_invoice($self, $myconfig, $form);
     }
-    my $dbh = $form->{dbh};
+    my $dbh = $LedgerSMB::App_State::DBH;
     $form->{invnumber} = $form->update_defaults( $myconfig, "vinumber", $dbh )
       unless $form->{invnumber};
 

Modified: trunk/LedgerSMB/IS.pm
===================================================================
--- trunk/LedgerSMB/IS.pm	2013-05-30 13:09:13 UTC (rev 5885)
+++ trunk/LedgerSMB/IS.pm	2013-05-30 13:46:24 UTC (rev 5886)
@@ -41,6 +41,7 @@
 use LedgerSMB::PriceMatrix;
 use LedgerSMB::Sysconfig;
 use LedgerSMB::Setting;
+use LedgerSMB::App_State;
 use Log::Log4perl;
 
 my $logger = Log::Log4perl->get_logger('LedgerSMB::IS');
@@ -929,7 +930,7 @@
     $form->{invnumber} = $form->update_defaults( $myconfig, "sinumber", $dbh )
       unless $form->{invnumber};
 
-    my $dbh = $form->{dbh};
+    my $dbh = $LedgerSMB::App_State::DBH;;
 
     my $query;
     my $sth;

Modified: trunk/bin/aa.pl
===================================================================
--- trunk/bin/aa.pl	2013-05-30 13:09:13 UTC (rev 5885)
+++ trunk/bin/aa.pl	2013-05-30 13:46:24 UTC (rev 5886)
@@ -985,7 +985,7 @@
                $button{edit_and_save} = { 
                    ndx   => 4, 
                    key   => 'E', 
-                   value => $locale->text('Post as Shown') };
+                   value => $locale->text('Save as Shown') };
           }
            delete $button{post_as_new};
            delete $button{post};

Modified: trunk/bin/gl.pl
===================================================================
--- trunk/bin/gl.pl	2013-05-30 13:09:13 UTC (rev 5885)
+++ trunk/bin/gl.pl	2013-05-30 13:46:24 UTC (rev 5886)
@@ -313,7 +313,7 @@
 		    $button{edit_and_save} = { 
 			ndx   => 4, 
 			key   => 'O', 
-			value => $locale->text('Post as Shown') };
+			value => $locale->text('Save as Shown') };
 		}
 		delete $button{post_as_new};
 		delete $button{post};

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