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

[..hidden..]

Revision: 5738
          http://sourceforge.net/p/ledger-smb/code/5738
Author:   einhverfr
Date:     2013-05-02 10:35:04 +0000 (Thu, 02 May 2013)
Log Message:
-----------
Merging Nick Prater's (1.3 only) patch for bug 806 in

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/AA.pm

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-05-02 10:29:35 UTC (rev 5737)
+++ branches/1.3/Changelog	2013-05-02 10:35:04 UTC (rev 5738)
@@ -6,6 +6,7 @@
 * Fixed em-dash handling for pdfs (Chris T)
 * Fixed multiple blank line handling for pdfs (Chris T)
 * Fixed multiple repeat entries in chart of accounts drop down (Nick P, 812)
+* Fixed transaction list empty if searched by creditor name (Nick P, 806)
 
 Nick P is Nick Prater
 

Modified: branches/1.3/LedgerSMB/AA.pm
===================================================================
--- branches/1.3/LedgerSMB/AA.pm	2013-05-02 10:29:35 UTC (rev 5737)
+++ branches/1.3/LedgerSMB/AA.pm	2013-05-02 10:35:04 UTC (rev 5738)
@@ -1059,8 +1059,12 @@
         $where .= " AND vc.meta_number = " . $dbh->quote($form->{meta_number});
     }
     if ( $form->{"$form->{vc}_id"} ) {
-        $form->{entity_id} = $form->{$form->{vc}."_id"};
-        $where .= qq| AND a.entity_id = $form->{entity_id}|;
+        # This was looking at entity_id (a.entity_id = $form->{entity_id}...)
+        # but on a 1.3.30 database, both ar.entity_id and ap.entity_id colums are NULL
+        # so it seems that entity_credit_account is what we actually want
+        # fix for bug 806
+        $form->{entity_credit_account} = $form->{$form->{vc}."_id"};
+        $where .= qq| AND a.entity_credit_account = $form->{entity_credit_account}|;
     }
     else {
         if ( $form->{ $form->{vc} } ) {
@@ -1069,7 +1073,7 @@
         }
     }
 
-    for (qw(department_id entity_credit_account)) {
+    for (qw(department_id)) {
         if ( $form->{$_} ) {
             ( $null, $var ) = split /--/, $form->{$_};
             $var = $dbh->quote($var);

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