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

[..hidden..]

Revision: 5695
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5695&view=rev
Author:   einhverfr
Date:     2013-03-23 12:48:24 +0000 (Sat, 23 Mar 2013)
Log Message:
-----------
Merging whitespace in gl fix from trunk

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/bin/gl.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,5687-5688,5690
   + /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,5690,5694

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-03-23 12:44:49 UTC (rev 5694)
+++ branches/1.3/Changelog	2013-03-23 12:48:24 UTC (rev 5695)
@@ -12,6 +12,8 @@
 * Fixed encoding issues when printing from the queue (Chris T, 3602073)
 * Fixed spurious commit in Invoice Shipped (Chris T)
 * Fixed handling of long notes/descriptions on GL (Chris T, 3603939)
+* Fixed handling of translation strings in Conatact Search (Chris T, 3604721)
+* Fixed handling of spaces in debit/credit cols/gl (Chris T, 3607219)
 
 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,5687-5688,5690
   + /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,5690,5694

Modified: branches/1.3/bin/gl.pl
===================================================================
--- branches/1.3/bin/gl.pl	2013-03-23 12:44:49 UTC (rev 5694)
+++ branches/1.3/bin/gl.pl	2013-03-23 12:48:24 UTC (rev 5695)
@@ -1061,6 +1061,8 @@
     @flds  = qw(accno debit credit projectnumber fx_transaction source memo);
 
     for $i ( 0 .. $form->{rowcount} ) {
+        $form->{"debit_$i"} =~ s/\s+//g; 
+        $form->{"credit_$i"} =~ s/\s+//g; 
         unless ( ( $form->{"debit_$i"} eq "" )
             && ( $form->{"credit_$i"} eq "" ) )
         {
@@ -1186,6 +1188,8 @@
     my ($form) = @_;
     # add up debits and credits
     for $i ( 0 .. $form->{rowcount} ) {
+        $form->{"debit_$i"} =~ s/\s+//g; 
+        $form->{"credit_$i"} =~ s/\s+//g; 
         $dr = $form->parse_amount( \%myconfig, $form->{"debit_$i"} );
         $cr = $form->parse_amount( \%myconfig, $form->{"credit_$i"} );
 

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