X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fquick-charge.html;h=379aaaea44004320699309438cee53f054673086;hb=30026a09a72bb16b8c7e17035250b9d797bd47e2;hp=4d85c72e48b02ba23cab061d5c706f6d1d9abe4f;hpb=1553b7eca477f52824b6b352a0e87df68622411b;p=freeside.git diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html index 4d85c72e4..379aaaea4 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; @@ -106,7 +107,7 @@ function bill_now_changed (what) {
<% mt('Tax exempt') |h %> | +param('setuptax') ? 'CHECKED' : '' %>> | +
<% mt('Optional additional description (also printed on invoice):') |h %> | |
@@ -327,8 +352,9 @@ function bill_now_changed (what) { > |