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

[..hidden..]

Revision: 2794
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=2794&view=rev
Author:   einhverfr
Date:     2009-11-12 19:00:48 +0000 (Thu, 12 Nov 2009)

Log Message:
-----------
Trial balances for projects now working

Modified Paths:
--------------
    trunk/LedgerSMB/RP.pm
    trunk/UI/rp-search.html
    trunk/bin/rp.pl

Modified: trunk/LedgerSMB/RP.pm
===================================================================
--- trunk/LedgerSMB/RP.pm	2009-11-11 17:03:24 UTC (rev 2793)
+++ trunk/LedgerSMB/RP.pm	2009-11-12 19:00:48 UTC (rev 2794)
@@ -1452,7 +1452,7 @@
              } elsif ($year_end eq 'all'){
                   $yearend_filter = "AND (y.trans_id is null or ac.transdate < coalesce($datefrom, ac.transdate))";
              } else {
-                 $form->error($locale->text('Invalid Year-end filter request!'));
+                 $form->error($main::locale->text('Invalid Year-end filter request!'));
              }
         }
         $query = "SELECT c.id AS chart_id, c.accno, c.description, c.contra, 

Modified: trunk/UI/rp-search.html
===================================================================
--- trunk/UI/rp-search.html	2009-11-11 17:03:24 UTC (rev 2793)
+++ trunk/UI/rp-search.html	2009-11-12 19:00:48 UTC (rev 2794)
@@ -35,7 +35,7 @@
           </td>
         </tr>
 <?lsmb END ?>
-<?lsmb IF form.report == 'trial_balance' ?>
+<?lsmb IF form.report == 'trial_balance' or form.report == 'projects' ?>
 	<tr>
 	  <th align="right"><?lsmb text('Ignore Year-ends'); ?></th>
 	  <td><?lsmb PROCESS select element_data = {

Modified: trunk/bin/rp.pl
===================================================================
--- trunk/bin/rp.pl	2009-11-11 17:03:24 UTC (rev 2793)
+++ trunk/bin/rp.pl	2009-11-12 19:00:48 UTC (rev 2794)
@@ -170,7 +170,7 @@
     my $subform;
     if ( $form->{report} eq "projects" ) {
         $hiddens{nextsub} = 'generate_projects';
-        $subform = 'generate_projects';
+        $subform = 'projects';
     } elsif ( $form->{report} eq "inv_activity" ) {
         $gifi = 0;
         $hiddens{nextsub} = 'generate_inv_activity';
@@ -613,7 +613,7 @@
     $form->{nextsub} = "generate_projects";
     $form->{title}   = $locale->text('Project Transactions');
 
-    RP->trial_balance( \%myconfig, \%$form );
+    RP->trial_balance( \%myconfig, $form );
 
     &list_accounts;
 


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