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

[..hidden..]

Revision: 2050
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=2050&view=rev
Author:   einhverfr
Date:     2008-01-17 21:10:19 -0800 (Thu, 17 Jan 2008)

Log Message:
-----------
Correcting join projection issues in AP/Outstanding report

Modified Paths:
--------------
    trunk/LedgerSMB/AA.pm
    trunk/lsmb-request.pl
    trunk/scripts/vouchers.pl

Modified: trunk/LedgerSMB/AA.pm
===================================================================
--- trunk/LedgerSMB/AA.pm	2008-01-17 01:51:21 UTC (rev 2049)
+++ trunk/LedgerSMB/AA.pm	2008-01-18 05:10:19 UTC (rev 2050)
@@ -722,6 +722,8 @@
     $rc;
 }
 
+# This is going to get a little awkward because it involves delving into the 
+# acc_trans table in order to avoid catching unapproved payment vouchers.
 sub transactions {
     my ( $self, $myconfig, $form ) = @_;
 
@@ -793,7 +795,7 @@
 		          d.description AS department, 
 		          a.ponumber $acc_trans_flds
 		     FROM $table a
-		     JOIN entity_credit_account vc USING (entity_id)
+		     JOIN entity_credit_account vc ON (a.entity_credit_account = vc.id)
 		LEFT JOIN employee e ON (a.person_id = e.entity_id)
 		LEFT JOIN employee m ON (e.manager_id = m.entity_id)
 		     JOIN entity ee ON (e.entity_id = ee.id)

Modified: trunk/lsmb-request.pl
===================================================================
--- trunk/lsmb-request.pl	2008-01-17 01:51:21 UTC (rev 2049)
+++ trunk/lsmb-request.pl	2008-01-18 05:10:19 UTC (rev 2050)
@@ -36,7 +36,7 @@
 
 $request = new LedgerSMB;
 $request->{action} = '__default' if (!$request->{action});
-
+$request->debug({file => '/tmp/request'});
 $ENV{SCRIPT_NAME} =~ m/([^\/\\]*.pl)\?*.*$/;
 $script = $1;
 $locale = LedgerSMB::Locale->get_handle( ${LedgerSMB::Sysconfig::language} )

Modified: trunk/scripts/vouchers.pl
===================================================================
--- trunk/scripts/vouchers.pl	2008-01-17 01:51:21 UTC (rev 2049)
+++ trunk/scripts/vouchers.pl	2008-01-18 05:10:19 UTC (rev 2050)
@@ -384,5 +384,5 @@
     search_batch($request);
 }
 
-eval { do "scripts/custom/vouchers.pl"};
+require  "scripts/custom/vouchers.pl";
 1;


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