[freeside-commits] branch FREESIDE_4_BRANCH updated. 435f0dc9c5b8a4c703ecd52e34f54779d2a22b62
Ivan
ivan at 420.am
Tue Nov 8 01:47:24 PST 2016
The branch, FREESIDE_4_BRANCH has been updated
via 435f0dc9c5b8a4c703ecd52e34f54779d2a22b62 (commit)
from 801fc8102568cf06bcd727b8de376c19473e54a1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 435f0dc9c5b8a4c703ecd52e34f54779d2a22b62
Author: Ivan Kohler <ivan at freeside.biz>
Date: Tue Nov 8 01:47:22 2016 -0800
4.x style one-time charge
diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html
index 3300815..51cd854 100644
--- a/httemplate/edit/quick-charge.html
+++ b/httemplate/edit/quick-charge.html
@@ -1,9 +1,11 @@
% if ( $quotationnum ) {
-<& /elements/header.html, mt('One-time charge'), '',
- ( ($quotationnum || $cgi->param('error')) ? '' : 'onload="addRow()"' ),
-&>
+<& /elements/header.html, mt('One-time charge') &>
% } else {
-<& /elements/header-cust_main.html, view=>'packages', cust_main=>$cust_main &>
+<& /elements/header-cust_main.html,
+ view => 'packages',
+ cust_main => $cust_main,
+ etc => $cgi->param('error') ? '' : 'onload="addRow()"',
+&>
<h2>One-time charge</h2>
% }
@@ -113,7 +115,7 @@ function bill_now_changed (what) {
<INPUT TYPE="hidden" NAME="prospectnum" VALUE="<% $prospect_main ? $prospect_main->prospectnum : '' %>">
<INPUT TYPE="hidden" NAME="quotationnum" VALUE="<% $quotationnum %>">
-<TABLE ID="QuickChargeTable" BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 STYLE="background-color: #cccccc">
+<TABLE ID="QuickChargeTable" CLASS="fsinnerbox">
% if ( $cust_pkg ) { #modify one-time charge
@@ -201,7 +203,7 @@ function bill_now_changed (what) {
% } else { # new one-time charge
<TR>
- <TD ALIGN="right"><% mt('Amount to charge') |h %> </TD>
+ <TH ALIGN="right"><% mt('Amount to charge') |h %> </TH>
<TD>
<% $money_char %><INPUT TYPE = "text"
NAME = "amount"
@@ -225,7 +227,7 @@ function bill_now_changed (what) {
% if ( $conf->exists('invoice-unitprice') ) {
<TR>
- <TD ALIGN="right"><% mt('Quantity') |h %> </TD>
+ <TH ALIGN="right"><% mt('Quantity') |h %> </TH>
<TD>
<INPUT TYPE = "text"
NAME = "quantity"
@@ -241,7 +243,7 @@ function bill_now_changed (what) {
% unless ( $quotationnum ) {
<TR>
- <TD ALIGN="right"><% mt('Invoice now') |h %></TD>
+ <TH ALIGN="right"><% mt('Invoice now') |h %></TH>
<TD>
<INPUT TYPE = "checkbox"
NAME = "bill_now"
@@ -261,7 +263,7 @@ function bill_now_changed (what) {
% # false laziness w/misc/order_pkg.html
<TR>
- <TD ALIGN="right"><% mt('Charge date') |h %> </TD>
+ <TH ALIGN="right"><% mt('Charge date') |h %> </TH>
<TD>
<INPUT TYPE = "text"
NAME = "start_date"
@@ -313,7 +315,7 @@ function bill_now_changed (what) {
% }
<TR>
- <TD ALIGN="right"><% mt('Tax exempt') |h %> </TD>
+ <TH ALIGN="right"><% mt('Tax exempt') |h %> </TH>
<TD><INPUT TYPE="checkbox" NAME="setuptax" VALUE="Y" <% $cgi->param('setuptax') ? 'CHECKED' : '' %>></TD>
</TR>
@@ -331,7 +333,7 @@ function bill_now_changed (what) {
% } # if !$cust_pkg
<TR>
- <TD ALIGN="right"><% mt('Description') |h %> </TD>
+ <TH ALIGN="right"><% mt('Description') |h %> </TH>
<TD>
<INPUT TYPE = "text"
NAME = "pkg"
diff --git a/httemplate/elements/header-cust_main.html b/httemplate/elements/header-cust_main.html
index 91d90c2..a481881 100644
--- a/httemplate/elements/header-cust_main.html
+++ b/httemplate/elements/header-cust_main.html
@@ -10,10 +10,11 @@ Examples:
</%doc>
<& /elements/header.html, {
- 'title' => $title,
+ 'title' => $title,
'title_noescape' => $title_noescape,
- 'head' => $head,
- 'nobr' => 1,
+ 'head' => $head,
+ 'nobr' => 1,
+ 'etc' => $opt{'etc'},
}
&>
diff --git a/httemplate/elements/tr-select-pkg_class.html b/httemplate/elements/tr-select-pkg_class.html
index 28ed5d6..9f782e6 100644
--- a/httemplate/elements/tr-select-pkg_class.html
+++ b/httemplate/elements/tr-select-pkg_class.html
@@ -5,7 +5,7 @@
% } else {
<TR>
- <TD ALIGN="right"><% $opt{'label'} || 'Package class' %></TD>
+ <TH ALIGN="right"><% $opt{'label'} || 'Package class' %></TH>
<TD>
<% include( '/elements/select-pkg_class.html',
'curr_value' => $classnum,
diff --git a/httemplate/elements/tr-select-taxclass.html b/httemplate/elements/tr-select-taxclass.html
index 97f3cad..22c560e 100644
--- a/httemplate/elements/tr-select-taxclass.html
+++ b/httemplate/elements/tr-select-taxclass.html
@@ -7,7 +7,7 @@
% } else {
<TR>
- <TD ALIGN="right"><% $opt{'label'} || 'Tax class: ' %></TD>
+ <TH ALIGN="right"><% $opt{'label'} || 'Tax class: ' %></TH>
<TD>
<% include( '/elements/select-taxclass.html',
'curr_value' => $selected_taxclass,
-----------------------------------------------------------------------
Summary of changes:
httemplate/edit/quick-charge.html | 24 +++++++++++++-----------
httemplate/elements/header-cust_main.html | 7 ++++---
httemplate/elements/tr-select-pkg_class.html | 2 +-
httemplate/elements/tr-select-taxclass.html | 2 +-
4 files changed, 19 insertions(+), 16 deletions(-)
More information about the freeside-commits
mailing list