X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Forder_pkg.html;h=7a63b5c2b0ffc2b86de63f52b7ee38372accf3da;hb=95cffb2e514c6117fc3eb111581d387b5d0b4e77;hp=39cb2f4d6185022748872adb40474aff6301f5ea;hpb=9972d7caa7a3e1a29dc4201e0c7256ba093ea705;p=freeside.git
diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html
index 39cb2f4d6..7a63b5c2b 100644
--- a/httemplate/misc/order_pkg.html
+++ b/httemplate/misc/order_pkg.html
@@ -30,7 +30,7 @@
<% mt('Sales') |h %>
% }
% if ( $show_sales_table ) {
- <% ntable("#cccccc") %>
+
% }
<& /elements/tr-select-sales.html,
@@ -53,7 +53,7 @@
% }
<% mt('Package') |h %>
-<% ntable("#cccccc") %>
+
% if ( $part_pkg ) {
@@ -136,17 +136,16 @@
-<% include('/misc/cust_pkg_usageprice.html',
+<& /elements/table-cust_pkg_usageprice.html,
'pkgpart' => $pkgpart
- ) %>
-
+&>
% my $discount_cust_pkg = $curuser->access_right('Discount customer package');
% my $waive_setup_fee = $curuser->access_right('Waive setup fee');
%
% if ( $discount_cust_pkg || $waive_setup_fee ) {
<% mt('Discounting') |h %>
- <% ntable("#cccccc") %>
+
<& /elements/tr-select-pkg-discount.html &>
@@ -157,7 +156,7 @@
% my $contact_title = $lock_locationnum ? 'Contact'
% : 'Contact and Location';
<% mt($contact_title) |h %>
-<% ntable("#cccccc") %>
+
<& /elements/tr-select-contact.html,
'cgi' => $cgi,
@@ -189,17 +188,29 @@
<& /elements/standardize_locations.html,
'form' => "OrderPkgForm",
- 'callback' => 'document.OrderPkgForm.submit()',
+ 'callback' => $conf->exists('tax_district_method')
+ ? 'wa_state_tax_district()'
+ : 'submit_continue()',
'with_census' => 1,
'with_census_functions' => 1,
&>
+
+
% }
% if ($quotationnum) {
<% mt('Quotation details') |h %>
-
+
|
@@ -222,7 +233,7 @@
% } else {
<% mt('Invoice details') |h %>
-
+
<& /edit/elements/detail-table.html,
id => 'InvoiceDetailTable',
details => $details->{'invoice_detail'},
@@ -232,7 +243,7 @@
<% mt('Package comments') |h %>
- |