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

[..hidden..]

Revision: 5701
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5701&view=rev
Author:   einhverfr
Date:     2013-03-23 15:00:17 +0000 (Sat, 23 Mar 2013)
Log Message:
-----------
Merging fixes from trunk, 5698:5700

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/scripts/recon.pl
    branches/1.3/scripts/user.pl

Property Changed:
----------------
    branches/1.3/
    branches/1.3/Changelog
    branches/1.3/scripts/user.pl


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,5694,5696
   + /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,5696,5698,5700

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-03-23 14:55:40 UTC (rev 5700)
+++ branches/1.3/Changelog	2013-03-23 15:00:17 UTC (rev 5701)
@@ -15,6 +15,8 @@
 * Fixed handling of translation strings in Contact Search (Chris T, 3604721)
 * Fixed handling of spaces in debit/credit cols/gl (Chris T, 3607219)
 * Fixed handling of invoice numbers on recurring (Chris T, 3602382)
+* Fixed language code changes delayed (Chris T, 3607220) 
+* Fixed order by on reconciliation screen not working (Chris T, 3607223)
 
 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,5694,5696
   + /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,5696,5698,5700

Modified: branches/1.3/scripts/recon.pl
===================================================================
--- branches/1.3/scripts/recon.pl	2013-03-23 14:55:40 UTC (rev 5700)
+++ branches/1.3/scripts/recon.pl	2013-03-23 15:00:17 UTC (rev 5701)
@@ -68,7 +68,7 @@
     $recon->{dbh}->commit;
     if ($recon->{line_order}){
        $recon->set_ordering(
-		{method => 'reconciliation__report_details', 
+		{method => 'reconciliation__report_details_payee', 
 		column  => $recon->{line_order}}
        );
     }

Modified: branches/1.3/scripts/user.pl
===================================================================
--- branches/1.3/scripts/user.pl	2013-03-23 14:55:40 UTC (rev 5700)
+++ branches/1.3/scripts/user.pl	2013-03-23 15:00:17 UTC (rev 5701)
@@ -26,6 +26,7 @@
 use LedgerSMB;
 use LedgerSMB::Template;
 use LedgerSMB::DBObject::User;
+use LedgerSMB::App_State;
 our $VERSION = 1.0;
 use strict;
 
@@ -71,6 +72,10 @@
 
 sub save_preferences {
     my ($request) = @_;
+    $request->{_user}->{language} = $request->{language};
+    my $locale =  LedgerSMB::Locale->get_handle($request->{_user}->{language});
+    $request->{_locale} = $locale;
+    $LedgerSMB::App_State::Locale = $locale;
     my $user = LedgerSMB::DBObject::User->new({base => $request});
     $user->{dateformat} =~ s/$slash/\//g;
     if ($user->{confirm_password}){


Property changes on: branches/1.3/scripts/user.pl
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/LedgerSMB/Scripts/user.pm:5698-5699
/trunk/scripts/user.pl: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,5696,5698

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