SF.net SVN: ledger-smb:[5689] branches/1.3

[..hidden..]

Revision: 5689
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5689&view=rev
Author:   einhverfr
Date:     2013-03-16 09:00:18 +0000 (Sat, 16 Mar 2013)
Log Message:
-----------
merging spurious commit fix from trunk

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/AA.pm
    branches/1.3/LedgerSMB/IS.pm
    branches/1.3/bin/bp.pl
    branches/1.3/bin/is.pl

Property Changed:
----------------
    branches/1.3/
    branches/1.3/Changelog


Property changes on: branches/1.3
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5515,5519,5524,5526,5528-5529,5533,5544-5546,5548-5549,5554-5555,5563,5565,5569,5576,5579,5589-5590,5597,5602-5603,5608,5610,5615,5617,5620,5622,5633-5634,5649-5650,5655-5657,5668,5670,5675,5677,5680-5682,5684
   + /trunk:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5515,5519,5524,5526,5528-5529,5533,5544-5546,5548-5549,5554-5555,5563,5565,5569,5576,5579,5589-5590,5597,5602-5603,5608,5610,5615,5617,5620,5622,5633-5634,5649-5650,5655-5657,5668,5670,5675,5677,5680-5682,5684,5687-5688

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-03-16 08:54:25 UTC (rev 5688)
+++ branches/1.3/Changelog	2013-03-16 09:00:18 UTC (rev 5689)
@@ -9,6 +9,8 @@
 * R5680-1, (tentatively) fixes to shipping/invoice onhand numbers (Chris T)
 * Fixed customer search showing sales rather than billing addresses (Chris T)
 * Fixed parts descriptions not showing on inventory actibity report (Chris T)
+* Fixed encoding issues when printing from the queue (Chris T, 3602073)
+* Fixed spurious commit in Invoice Shipped (Chris T)
 
 Changelog for 1.3.30
 * Documented behavior of Outstanding Summary report (Chris T, 3601314)


Property changes on: branches/1.3/Changelog
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/Changelog:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5513,5515,5519,5524,5529,5548,5563,5565,5578-5579,5581,5583,5587,5590,5593,5595,5597,5608,5610,5612,5615,5617,5620,5622,5626,5633-5634,5649-5650,5652,5655,5668,5670,5675,5677,5680-5682,5684
   + /trunk/Changelog:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5513,5515,5519,5524,5529,5548,5563,5565,5578-5579,5581,5583,5587,5590,5593,5595,5597,5608,5610,5612,5615,5617,5620,5622,5626,5633-5634,5649-5650,5652,5655,5668,5670,5675,5677,5680-5682,5684,5687-5688

Modified: branches/1.3/LedgerSMB/AA.pm
===================================================================
--- branches/1.3/LedgerSMB/AA.pm	2013-03-16 08:54:25 UTC (rev 5688)
+++ branches/1.3/LedgerSMB/AA.pm	2013-03-16 09:00:18 UTC (rev 5689)
@@ -1640,7 +1640,6 @@
     my $sth = $form->{dbh}->prepare("UPDATE $table SET intnotes = ? " .
                                       "where id = ?");
     $sth->execute($form->{intnotes}, $form->{id});
-    $form->{dbh}->commit;
 }
 
 =back

Modified: branches/1.3/LedgerSMB/IS.pm
===================================================================
--- branches/1.3/LedgerSMB/IS.pm	2013-03-16 08:54:25 UTC (rev 5688)
+++ branches/1.3/LedgerSMB/IS.pm	2013-03-16 09:00:18 UTC (rev 5689)
@@ -2704,8 +2704,6 @@
           $sth->execute($invoice_id,$report) || $form->dberror("$query");
    }
 
-   $dbh->commit();
-
 }
 
 

Modified: branches/1.3/bin/bp.pl
===================================================================
--- branches/1.3/bin/bp.pl	2013-03-16 08:54:25 UTC (rev 5688)
+++ branches/1.3/bin/bp.pl	2013-03-16 09:00:18 UTC (rev 5689)
@@ -257,6 +257,9 @@
                 )
               )
             {
+                my $binmode = ':utf8';
+                binmode STDOUT, $binmode;
+                binmode STDERR, $binmode;
                 print $locale->text('done');
                 $form->redirect( $locale->text('Marked entries printed!') );
             }

Modified: branches/1.3/bin/is.pl
===================================================================
--- branches/1.3/bin/is.pl	2013-03-16 08:54:25 UTC (rev 5688)
+++ branches/1.3/bin/is.pl	2013-03-16 09:00:18 UTC (rev 5689)
@@ -1521,7 +1521,7 @@
 
 		}
 		
-	    }    
+	    }   
 
 	    if ($form->{callback}){
 		print "Location: $form->{callback}\n";

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