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

[..hidden..]

Revision: 4959
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4959&view=rev
Author:   einhverfr
Date:     2012-07-05 01:57:32 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/LedgerSMB.pm
    trunk/UI/rp-search-generate_balance_sheet.html
    trunk/UI/rp-search-generate_income_statement.html
    trunk/lsmb-request.pl

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-4950
   + /branches/1.3:3711-4958

Modified: trunk/LedgerSMB.pm
===================================================================
--- trunk/LedgerSMB.pm	2012-07-05 01:51:52 UTC (rev 4958)
+++ trunk/LedgerSMB.pm	2012-07-05 01:57:32 UTC (rev 4959)
@@ -290,8 +290,9 @@
         }
     }
     #HV set _locale already to default here,so routines lower in stack can use it;e.g. login.pl
-    $self->{_locale}=LedgerSMB::Locale->get_handle($LedgerSMB::Sysconfig::language)
-      or $self->error( __FILE__ . ':' . __LINE__ .": Locale ($LedgerSMB::Sysconfig::language) not loaded: $!\n" );
+    $self->{_locale}=LedgerSMB::Locale->get_handle('en');
+    #$self->{_locale}=LedgerSMB::Locale->get_handle($LedgerSMB::Sysconfig::language);
+    #$self->error( __FILE__ . ':' . __LINE__ .": Locale ($LedgerSMB::Sysconfig::language) not loaded: $!\n" ) unless $self->{_locale};
 
     $self->{action} = "" unless defined $self->{action};
     $self->{action} =~ s/\W/_/g;

Modified: trunk/UI/rp-search-generate_balance_sheet.html
===================================================================
--- trunk/UI/rp-search-generate_balance_sheet.html	2012-07-05 01:51:52 UTC (rev 4958)
+++ trunk/UI/rp-search-generate_balance_sheet.html	2012-07-05 01:57:32 UTC (rev 4959)
@@ -64,12 +64,6 @@
   label => text('Accrual'),
   checked => 'checked',
   } -?>
-<?lsmb PROCESS input element_data={
-  name => 'method',
-  type => 'radio',
-  value => 'cash',
-  label => text('Cash'),
-  } -?>
         </td>
       </tr>
       <tr>

Modified: trunk/UI/rp-search-generate_income_statement.html
===================================================================
--- trunk/UI/rp-search-generate_income_statement.html	2012-07-05 01:51:52 UTC (rev 4958)
+++ trunk/UI/rp-search-generate_income_statement.html	2012-07-05 01:57:32 UTC (rev 4959)
@@ -114,12 +114,6 @@
   label => text('Accrual'),
   checked => 'checked',
   } -?>
-<?lsmb PROCESS input element_data={
-  name => 'method',
-  type => 'radio',
-  value => 'cash',
-  label => text('Cash'),
-  } -?>
         </td>
       </tr>
       <tr>

Modified: trunk/lsmb-request.pl
===================================================================
--- trunk/lsmb-request.pl	2012-07-05 01:51:52 UTC (rev 4958)
+++ trunk/lsmb-request.pl	2012-07-05 01:57:32 UTC (rev 4959)
@@ -66,8 +66,11 @@
     $locale =  LedgerSMB::Locale->get_handle($request->{_user}->{language});
     $LedgerSMB::App_State::Locale = $locale;
 } else {
-    $locale = LedgerSMB::Locale->get_handle( ${LedgerSMB::Sysconfig::language} )
-       or $request->error( __FILE__ . ':' . __LINE__ . ": Locale not loaded: $!\n" );
+    #$locale = LedgerSMB::Locale->get_handle('en');
+    $locale = LedgerSMB::Locale->get_handle( $LedgerSMB::Sysconfig::language );
+    #$request->error( __FILE__ . ':' . __LINE__ . 
+    #             ": Locale ($LedgerSMB::Sysconfig::language) not loaded: $!\n" 
+    #) unless $locale;
     $LedgerSMB::App_State::Locale = $locale;
 }
 

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