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

[..hidden..]

Revision: 5028
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5028&view=rev
Author:   einhverfr
Date:     2012-07-24 02:10:21 +0000 (Tue, 24 Jul 2012)
Log Message:
-----------
Corrected customer info not populating orders list for shipping.  Fixed shipping redirects.

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/AA.pm
    branches/1.3/LedgerSMB/OE.pm
    branches/1.3/bin/oe.pl

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2012-07-24 00:18:23 UTC (rev 5027)
+++ branches/1.3/Changelog	2012-07-24 02:10:21 UTC (rev 5028)
@@ -6,6 +6,8 @@
 * Added a default numberformat in Form.pm (Chris T)
 * Added a container div for theming saved and/or posted docs (Chris T)
 * Fixed an is_zero error saving purchase transactions (Nick P)
+* Fixed shipping selection not displaying customer info (Chris T, 3543932)
+* Fixed shipping redirection not displaying orders (Chris T, h/t Nigel T)
 
 Changelog for 1.3.20
 * Fixes for es_AR translation, duplicate keys removed (Andres B)

Modified: branches/1.3/LedgerSMB/AA.pm
===================================================================
--- branches/1.3/LedgerSMB/AA.pm	2012-07-24 00:18:23 UTC (rev 5027)
+++ branches/1.3/LedgerSMB/AA.pm	2012-07-24 02:10:21 UTC (rev 5028)
@@ -121,7 +121,7 @@
     my $tax         = 0;
     my $fxtax       = 0;
     my $amount;
-    my $diff = 0;
+    my $diff        = 0;
 
     my %tax = ();
     my $accno;

Modified: branches/1.3/LedgerSMB/OE.pm
===================================================================
--- branches/1.3/LedgerSMB/OE.pm	2012-07-24 00:18:23 UTC (rev 5027)
+++ branches/1.3/LedgerSMB/OE.pm	2012-07-24 02:10:21 UTC (rev 5028)
@@ -177,8 +177,10 @@
         #HV alias company.ct changed to company.c
         $query = qq|
 			SELECT DISTINCT o.id, o.ordnumber, o.transdate,
-				o.reqdate, o.amount, c.legal_name, o.netamount, 
-				o.entity_credit_account as $form->{vc}_id, ex.$rate AS exchangerate,
+				o.reqdate, o.amount, c.legal_name as name, 
+                                eca.meta_number, o.netamount, eca.entity_id,
+                                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

Modified: branches/1.3/bin/oe.pl
===================================================================
--- branches/1.3/bin/oe.pl	2012-07-24 00:18:23 UTC (rev 5027)
+++ branches/1.3/bin/oe.pl	2012-07-24 02:10:21 UTC (rev 5028)
@@ -1625,7 +1625,7 @@
     for (
         "oldsort",     "direction", "path",      "type",
         "vc",          "login",     "sessionid", "transdatefrom",
-        "transdateto", "open",      "closed"
+        "transdateto", "open",      "closed", "oe_class_id"
       )
     {
         $callback .= qq|&$_=$form->{$_}|;

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