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

[..hidden..]

Revision: 3965
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3965&view=rev
Author:   einhverfr
Date:     2011-11-07 01:13:11 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------
Correcting invalid joins in ship/receive screens
Corrected version numbers

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/Form.pm
    branches/1.3/LedgerSMB/OE.pm
    branches/1.3/LedgerSMB.pm

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2011-11-06 13:14:15 UTC (rev 3964)
+++ branches/1.3/Changelog	2011-11-07 01:13:11 UTC (rev 3965)
@@ -11,6 +11,7 @@
 * Updated Ubuntu notes (Frans S)
 * Corrected a couple of menu items (David B)
 * Added 1.3-1.2 downgrade script to recover from failed upgrades (Chris T)
+* Corrected ship/receive bug due to invalid join conditions (Chris T)
 
 Chris T is Chris Travers
 David B is David Bandel

Modified: branches/1.3/LedgerSMB/Form.pm
===================================================================
--- branches/1.3/LedgerSMB/Form.pm	2011-11-06 13:14:15 UTC (rev 3964)
+++ branches/1.3/LedgerSMB/Form.pm	2011-11-07 01:13:11 UTC (rev 3965)
@@ -150,7 +150,7 @@
     #menubar will be deprecated, replaced with below
     $self->{lynx} = 1 if ( ( defined $self->{path} ) && ( $self->{path} =~ /lynx/i ) );
 
-    $self->{version}   = "1.3.3";
+    $self->{version}   = "1.3.4";
     $self->{dbversion} = "1.3.3";
 
     bless $self, $type;

Modified: branches/1.3/LedgerSMB/OE.pm
===================================================================
--- branches/1.3/LedgerSMB/OE.pm	2011-11-06 13:14:15 UTC (rev 3964)
+++ branches/1.3/LedgerSMB/OE.pm	2011-11-07 01:13:11 UTC (rev 3965)
@@ -152,7 +152,7 @@
         $query = qq|
 			SELECT DISTINCT o.id, o.ordnumber, o.transdate,
 				o.reqdate, o.amount, ct.name, o.netamount, 
-				o.$form->{vc}_id, ex.$rate AS exchangerate,
+				o.entity_credit_account as $form->{vc}_id, ex.$rate AS exchangerate,
 		 		o.closed, o.quonumber, o.shippingpoint, 
 				o.shipvia, ee.name AS employee, o.curr, 
 				o.ponumber
@@ -170,7 +170,8 @@
         }
 
         $query .= qq|
-			LEFT JOIN entity_employee e ON (o.employee_id = e.id)
+                        LEFT JOIN person per ON per.id = o.person_id
+			LEFT JOIN entity_employee e ON (per.entity_id = e.entity_id)
 			LEFT JOIN entity ee ON (e.entity_id = ee.id)
 			LEFT JOIN exchangerate ex 
 				ON (ex.curr = o.curr 

Modified: branches/1.3/LedgerSMB.pm
===================================================================
--- branches/1.3/LedgerSMB.pm	2011-11-06 13:14:15 UTC (rev 3964)
+++ branches/1.3/LedgerSMB.pm	2011-11-07 01:13:11 UTC (rev 3965)
@@ -220,7 +220,7 @@
 $CGI::Simple::POST_MAX = -1;
 
 package LedgerSMB;
-our $VERSION = '1.3.3';
+our $VERSION = '1.3.4';
 
 my $logger = Log::Log4perl->get_logger('LedgerSMB');
 

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