[freeside-commits] freeside/httemplate/edit part_pkg_taxoverride.html, 1.3, 1.4 quick-charge.html, 1.8, 1.9

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/httemplate/edit
In directory wavetail.420.am:/tmp/cvs-serv22114/httemplate/edit

Modified Files:
	part_pkg_taxoverride.html quick-charge.html 
Log Message:
taxproduct selection for one time charges

Index: part_pkg_taxoverride.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/part_pkg_taxoverride.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- part_pkg_taxoverride.html	28 Aug 2008 07:38:40 -0000	1.3
+++ part_pkg_taxoverride.html	28 Aug 2008 21:32:22 -0000	1.4
@@ -10,8 +10,8 @@
   <TR><TD>
 <FORM="dummy">
   <CENTER>
-    <INPUT type="submit" value="Finish" onclick="s=fetchSelected(); s.shift(); parent.document.getElementById('<% $element_name || "tax_override" %>').value=s.toString(); parent.cClick();">
-    <INPUT type="reset" value="Cancel" onclick="parent.cClick();">
+    <INPUT type="submit" value="Finish" onclick="s=fetchSelected(); s.shift(); parent.document.getElementById('<% $element_name || "tax_override" %>').value=s.toString(); parent.<% $onclick %>();">
+    <INPUT type="reset" value="Cancel" onclick="parent.<% $onclick %>();">
   </CENTER>
 </FORM>
   </TD></TR>
@@ -124,4 +124,9 @@
 my $element_name = $1
   if $cgi->param('element_name') =~/^(\w+)$/;
 
+my $onclick = $1
+  if $cgi->param('onclick') =~/^(\w+)$/;
+
+$onclick = 'cClick' unless $onclick;
+
 </%init>

Index: quick-charge.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/quick-charge.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- quick-charge.html	5 Jun 2008 19:24:33 -0000	1.8
+++ quick-charge.html	28 Aug 2008 21:32:22 -0000	1.9
@@ -71,7 +71,7 @@
 
 </SCRIPT>
 
-<FORM ACTION="process/quick-charge.cgi" NAME="QuickChargeForm" METHOD="POST" onsubmit="document.QuickChargeForm.submit.disabled=true;return validate_quick_charge();">
+<FORM ACTION="process/quick-charge.cgi" NAME="QuickChargeForm" ID="QuickChargeForm" METHOD="POST" onsubmit="document.QuickChargeForm.submit.disabled=true;return validate_quick_charge();">
 
 <INPUT TYPE="hidden" NAME="custnum" VALUE="<% $custnum %>">
 
@@ -97,6 +97,10 @@
 
 <% include('/elements/tr-select-taxclass.html', 'curr_value' => $cgi->param('taxclass') ) %>
 
+<% include('/elements/tr-select-taxproduct.html', 'label' => 'Tax product', 'onclick' => 'parent.taxproductmagic(this);', 'curr_value' => $cgi->param('taxproductnum') ) %>
+
+<% include('/elements/tr-select-taxoverride.html', 'onclick' => 'parent.taxoverridemagic(this);', 'curr_value' => $cgi->param('tax_override') ) %>
+
 <TR>
   <TD>Description:</TD>
   <TD>
@@ -110,7 +114,7 @@
 </TR>
 
 % my $row = 0;
-%   if ( $cgi->param('error') ) {
+%   if ( $cgi->param('error') || $cgi->param('magic') ) {
 %     my $param = $cgi->Vars;
 %
 % for ( $row = 0; exists($param->{"description$row"}); $row++ ) {