SF.net SVN: ledger-smb:[3443] branches/1.2

[..hidden..]

Revision: 3443
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3443&view=rev
Author:   einhverfr
Date:     2011-07-05 11:11:33 +0000 (Tue, 05 Jul 2011)

Log Message:
-----------
Fix for batch printing issue

Modified Paths:
--------------
    branches/1.2/LedgerSMB/BP.pm
    branches/1.2/LedgerSMB/Form.pm
    branches/1.2/bin/bp.pl
    branches/1.2/ledgersmb-httpd.conf

Modified: branches/1.2/LedgerSMB/BP.pm
===================================================================
--- branches/1.2/LedgerSMB/BP.pm	2011-07-05 10:22:27 UTC (rev 3442)
+++ branches/1.2/LedgerSMB/BP.pm	2011-07-05 11:11:33 UTC (rev 3443)
@@ -334,6 +334,7 @@
 
     # connect to database
     my $dbh = $form->{dbh};
+    $spool = $LedgerSMB::Sysconfig::spool;
 
     my %audittrail;
 
@@ -346,6 +347,7 @@
     foreach my $i ( 1 .. $form->{rowcount} ) {
 
         if ( $form->{"checked_$i"} ) {
+
             open( OUT, '>', $form->{OUT} ) or $form->error("$form->{OUT} : $!");
             binmode(OUT);
 

Modified: branches/1.2/LedgerSMB/Form.pm
===================================================================
--- branches/1.2/LedgerSMB/Form.pm	2011-07-05 10:22:27 UTC (rev 3442)
+++ branches/1.2/LedgerSMB/Form.pm	2011-07-05 11:11:33 UTC (rev 3443)
@@ -2570,8 +2570,8 @@
     my %queued = split / +/, $self->{queued};
     my $spoolfile =
       ( $queued{ $self->{formname} } )
-      ? "'$queued{$self->{formname}}'"
-      : 'NULL';
+      ? $queued{ $self->{formname} }
+      : undef;
 
     my $query = qq|DELETE FROM status
 					WHERE formname = ?
@@ -2604,6 +2604,7 @@
 
     $dbh = $self->{dbh};
 
+
     my $formnames  = $self->{printed};
     my $emailforms = $self->{emailed};
 

Modified: branches/1.2/bin/bp.pl
===================================================================
--- branches/1.2/bin/bp.pl	2011-07-05 10:22:27 UTC (rev 3442)
+++ branches/1.2/bin/bp.pl	2011-07-05 11:11:33 UTC (rev 3443)
@@ -485,8 +485,8 @@
         $module = "$ref->{module}.pl";
 
         $column_data{transdate} = "<td>$ref->{transdate}&nbsp;</td>";
-
-        if ( ${LedgerSMB::Sysconfig::spool} eq $ref->{spoolfile} ) {
+ 
+        if ( $lastfile eq $ref->{spoolfile} ) {
             $column_data{checked} = qq|<td></td>|;
         }
         else {
@@ -526,7 +526,8 @@
 
 |;
 
-        ${LedgerSMB::Sysconfig::spool} = $ref->{spoolfile};
+        
+        $lastfile = $ref->{spoolfile};
 
         $j++;
         $j %= 2;

Modified: branches/1.2/ledgersmb-httpd.conf
===================================================================
--- branches/1.2/ledgersmb-httpd.conf	2011-07-05 10:22:27 UTC (rev 3442)
+++ branches/1.2/ledgersmb-httpd.conf	2011-07-05 11:11:33 UTC (rev 3443)
@@ -28,11 +28,6 @@
   Deny from All
 </Directory>
   
-<Directory WORKING_DIR/spool>
-  Order Deny,Allow
-  Deny from All
-</Directory>
-
 <Directory WORKING_DIR/LedgerSMB>
   Order Deny,Allow
   Deny from All


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