X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fquick-charge.html;h=99cc19c35a60322717038d48787649d577878f8f;hb=62b18c75989a1b00a25079f8f110992aaad81bba;hp=64ee97bb9a5c71a4dfa4325271c73dc41aefcba0;hpb=1d4ea4545c4a86a0664feb537f06aa5eb7f54c07;p=freeside.git
diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html
index 64ee97bb9..99cc19c35 100644
--- a/httemplate/edit/quick-charge.html
+++ b/httemplate/edit/quick-charge.html
@@ -1,11 +1,12 @@
<& /elements/header-popup.html, mt('One-time charge'), '',
- ( $cgi->param('error') ? '' : 'onload="addRow()"' ),
+ ( ($quotationnum || $cgi->param('error')) ? '' : 'onload="addRow()"' ),
&>
+
<& /elements/error.html &>
@@ -39,7 +40,7 @@ function enable_quick_charge (e) {
function validate_quick_charge () {
var pkg = document.QuickChargeForm.pkg.value;
- var pkg_regex = /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=\[\]]*)$/ ;
+ var pkg_regex = XRegExp('^([\\p{L}\\p{N} \_\!\@\#\$\%\&\(\)\+\;\:\'\"\,\.\?\/\=\\-\\[\\]]*)$');
var amount = document.QuickChargeForm.amount.value;
var amount_regex = /^\s*\$?\s*(\d*(\.?\d{1,2}))\s*$/ ;
var rval = true;
@@ -169,18 +170,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 +285,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)$/ ) {
@@ -295,11 +306,11 @@ function bill_now_changed (what) {
param('setuptax') ? 'CHECKED' : '' %>> |
-<& /elements/tr-select-taxclass.html, 'curr_value' => $cgi->param('taxclass') &>
+<& /elements/tr-select-taxclass.html, 'curr_value' => scalar($cgi->param('taxclass')) &>
-<& /elements/tr-select-taxproduct.html, 'label' => emt('Tax product'), 'onclick' => 'parent.taxproductmagic(this);', 'curr_value' => $cgi->param('taxproductnum') &>
+<& /elements/tr-select-taxproduct.html, 'label' => emt('Tax product'), 'onclick' => 'parent.taxproductmagic(this);', 'curr_value' => scalar($cgi->param('taxproductnum')) &>
-<& /elements/tr-select-taxoverride.html, 'onclick' => 'parent.taxoverridemagic(this);', 'curr_value' => $cgi->param('tax_override') &>
+<& /elements/tr-select-taxoverride.html, 'onclick' => 'parent.taxoverridemagic(this);', 'curr_value' => scalar($cgi->param('tax_override')) &>
% } # if !$cust_pkg
@@ -317,13 +328,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 +352,9 @@ function bill_now_changed (what) {
>
|
-% $row++;
-% }
+% $row++;
+% }
+% }