From 2177596bf13e9de77f09c7380d038200bd675f46 Mon Sep 17 00:00:00 2001
From: Jonathan Prykop <jonathan@freeside.biz>
Date: Mon, 2 Feb 2015 22:02:53 -0600
Subject: RT#27425: Fixed/blank svc_phone domain

---
 httemplate/edit/elements/part_svc_column.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/elements/part_svc_column.html b/httemplate/edit/elements/part_svc_column.html
index 53cda859e..2bb4f5e41 100644
--- a/httemplate/edit/elements/part_svc_column.html
+++ b/httemplate/edit/elements/part_svc_column.html
@@ -140,7 +140,8 @@ that field.
           'value_col'   => $def->{'select_key'},
           'order_by'    => dbdef->table($def->{'select_table'})->primary_key,
           'multiple'    => $def->{'multiple'},
-          'disable_empty' => 1,
+          'disable_empty' => $def->{'select_allow_empty'} ? undef : 1,
+          'empty_label' => $def->{'select_allow_empty'} ? ' ' : undef,
           'curr_value'  => $value,
           # these can be switched between multiple and singular,
           # so put the complete curr_value in an attribute
-- 
cgit v1.2.1


From d9edf24e9d3e1fd87a23359a7679ef6d6637c00d Mon Sep 17 00:00:00 2001
From: Alex Brelsfoard <alex@Alexs-MacBook-Pro.local>
Date: Tue, 3 Feb 2015 07:03:07 -0500
Subject: RT #31482 making sure the tax class is not editable after the
 customer has been billed.

---
 httemplate/edit/quick-charge.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'httemplate/edit')

diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html
index 83620a973..58c1b0a82 100644
--- a/httemplate/edit/quick-charge.html
+++ b/httemplate/edit/quick-charge.html
@@ -171,6 +171,7 @@ function bill_now_changed (what) {
       &>
 %   }
 
+% 		unless ($billed) {
 <TR>
   <TD ALIGN="right"><% mt('Tax exempt') |h %> </TD>
   <TD><INPUT TYPE="checkbox" NAME="setuptax" VALUE="Y" <% $cgi->param('setuptax') ? 'CHECKED' : '' %>></TD>
@@ -179,6 +180,7 @@ function bill_now_changed (what) {
 <& /elements/tr-select-taxclass.html, 'curr_value' => $part_pkg->get('taxclass')  &>
 
 <& /elements/tr-select-taxproduct.html, 'label' => emt('Tax product'), 'onclick' => 'parent.taxproductmagic(this);', 'curr_value' => $part_pkg->get('taxproductnum')  &>
+%		}
 
 % } else { # new one-time charge
 
-- 
cgit v1.2.1