diff options
| author | Mark Wells <mark@freeside.biz> | 2013-05-28 17:18:46 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2013-05-28 17:18:46 -0700 |
| commit | 8f8283f365995ff83040ee6b62920dd0149c1eac (patch) | |
| tree | 55d45dc40d2402ad4139083084dc50e3297128b6 | |
| parent | 376c002c0e68282aa4365e69581bd1e8b2b0d0b6 (diff) | |
fix some problems with ordering packages on alt. locations, #23189, #940
| -rw-r--r-- | httemplate/edit/process/quick-cust_pkg.cgi | 2 | ||||
| -rw-r--r-- | httemplate/elements/location.html | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi index 14dbda166..fe5ee5e9e 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 685523314..41a67a0cb 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: |