X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fquick-charge.html;h=1ff70009c12f79f95b98be86d74d6fb22036566b;hb=8eb6542c022ac84b125416f3fb0828b278ba600a;hp=58c1b0a82785c929c934e229d566afe7fe17d83d;hpb=ec7e8155fce544f19f2b6734476ed6db8c200aa9;p=freeside.git
diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html
index 58c1b0a82..1ff70009c 100644
--- a/httemplate/edit/quick-charge.html
+++ b/httemplate/edit/quick-charge.html
@@ -1,5 +1,5 @@
<& /elements/header-popup.html, mt('One-time charge'), '',
- ( $cgi->param('error') ? '' : 'onload="addRow()"' ),
+ ( ($quotationnum || $cgi->param('error')) ? '' : 'onload="addRow()"' ),
&>
@@ -15,9 +15,9 @@ function enable_quick_charge (e) {
if ( document.QuickChargeForm.amount.value
&& document.QuickChargeForm.pkg.value ) {
- document.QuickChargeForm.submit.disabled = false;
+ document.QuickChargeForm.submitButton.disabled = false;
} else {
- document.QuickChargeForm.submit.disabled = true;
+ document.QuickChargeForm.submitButton.disabled = true;
}
% if ( $curuser->option('disable_enter_submit_onetimecharge') ) {
@@ -97,7 +97,7 @@ function bill_now_changed (what) {
NAME = "QuickChargeForm"
ID = "QuickChargeForm"
METHOD = "POST"
- onSubmit = "document.QuickChargeForm.submit.disabled=true; return validate_quick_charge();"
+ onSubmit = "document.QuickChargeForm.submitButton.disabled=true; return validate_quick_charge();"
>
@@ -169,18 +169,22 @@ function bill_now_changed (what) {
noinit => 1,
}
&>
-% }
-% unless ($billed) {
-
- <% mt('Tax exempt') |h %> |
- param('setuptax') ? 'CHECKED' : '' %>> |
-
+ <& /elements/tr-checkbox.html,
+ label => emt('Invoice this charge separately'),
+ field => 'separate_bill',
+ value => 'Y',
+ curr_value => $cust_pkg->get('separate_bill'),
+ &>
+
+ <% mt('Tax exempt') |h %> |
+ param('setuptax') ? 'CHECKED' : '' %>> |
+
-<& /elements/tr-select-taxclass.html, 'curr_value' => $part_pkg->get('taxclass') &>
+ <& /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') &>
-% }
+ <& /elements/tr-select-taxproduct.html, 'label' => emt('Tax product'), 'onclick' => 'parent.taxproductmagic(this);', 'curr_value' => $part_pkg->get('taxproductnum') &>
+% }
% } else { # new one-time charge
@@ -280,6 +284,12 @@ function bill_now_changed (what) {
});
+<& /elements/tr-checkbox.html,
+ label => emt('Invoice this charge separately'),
+ field => 'separate_bill',
+ value => 'Y'
+&>
+
% }
% if ( ! $quotationnum && $cust_main->payby =~ /^(CARD|CHEK)$/ ) {
@@ -317,13 +327,16 @@ function bill_now_changed (what) {
+% my $row = 0;
+% # quotation details are handled by quotation_pkg_detail records, added via link from view/quotation.html
+% # the details below get attached to the part_pkg record, and there's no way to edit that from quotations
+% unless ($quotationnum) {
|
<% mt('Optional additional description (also printed on invoice):') |h %> |
-% my $row = 0;
-% foreach (@description) {
+% foreach (@description) {
|
@@ -338,8 +351,9 @@ function bill_now_changed (what) {
>
|
-% $row++;
-% }
+% $row++;
+% }
+% }
@@ -348,7 +362,7 @@ function bill_now_changed (what) {
% my $label = $cust_pkg
% ? emt('Modify one-time charge')
% : emt('Add one-time charge');
-param('error') || $cust_pkg) ? '' :' DISABLED' %>>