[freeside-commits] branch FREESIDE_3_BRANCH updated. b8144cab2a804b964d1a97164780e2ddc6ae60ec

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  b8144cab2a804b964d1a97164780e2ddc6ae60ec (commit)
      from  8924a9dd6fa3d985a061e8c6e542990173adae34 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b8144cab2a804b964d1a97164780e2ddc6ae60ec
Author: Mark Wells <mark at freeside.biz>
Date:   Tue May 28 17:18:17 2013 -0700

    fix some problems with ordering packages on alt. locations, #23189, #940

diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index 14dbda1..fe5ee5e 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -160,6 +160,8 @@ if ( $quotationnum ) {
           ('custnum', FS::cust_main->location_fields)
     });
     $opt{'cust_location'} = $cust_location;
+  } else {
+    $opt{'locationnum'} = $locationnum;
   }
 
   $error = $cust_main->order_pkg( \%opt );
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index 6855233..41a67a0 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -219,8 +219,7 @@ Example:
   </TD>
 </TR>
 % }
-% if ( $conf->config('tax_district_method') ) {
-%   if ( $opt{enable_district} ) {
+% if ( $opt{enable_district} and $conf->config('tax_district_method') ) {
   <TR>
     <TD ALIGN="right">Tax district</TD>
     <TD COLSPAN=8>
@@ -231,9 +230,8 @@ Example:
     <% '(automatic)' %>
     </TD>
   </TR>
-%   } else {
+% } else {
     <INPUT TYPE="hidden" ID="<%$pre%>" NAME="<%$pre%>district" VALUE="<% $object->district %>">
-%   }
 % }
 
 %# For address standardization:

-----------------------------------------------------------------------

Summary of changes:
 httemplate/edit/process/quick-cust_pkg.cgi |    2 ++
 httemplate/elements/location.html          |    6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)