summaryrefslogtreecommitdiff
path: root/httemplate
diff options
context:
space:
mode:
Diffstat (limited to 'httemplate')
-rw-r--r--httemplate/docs/index.html1
-rw-r--r--httemplate/docs/upgrade10.html6
-rwxr-xr-xhttemplate/view/cust_main.cgi7
3 files changed, 12 insertions, 2 deletions
diff --git a/httemplate/docs/index.html b/httemplate/docs/index.html
index 8f6f91378..b57b06feb 100644
--- a/httemplate/docs/index.html
+++ b/httemplate/docs/index.html
@@ -9,6 +9,7 @@
<li><a href="upgrade7.html">Upgrading from 1.3.0 to 1.3.1</a>
<li><a href="upgrade8.html">Upgrading from 1.3.1 to 1.4.0</a>
<li><a href="upgrade9.html">Upgrading from 1.4.0 to 1.4.1</a>
+ <li><a href="upgrade10.html">Upgrading from 1.4.1 (or 1.4.2?) to 1.5.0</a>
<!--
<li><a href="config.html">Configuration files</a>
!-->
diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 7aa26f698..6c4fe0c37 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -1,5 +1,8 @@
+<pre>
this is very incomplete
+install NetAddr::IP and Chart
+
CREATE TABLE cust_bill_pkg_detail (
detailnum serial,
pkgnum int NOT NULL,
@@ -9,3 +12,6 @@ CREATE TABLE cust_bill_pkg_detail (
);
CREATE INDEX cust_bill_pkg_detail1 ON cust_bill_pkg_detail ( pkgnum, invnum );
+create all of the new broadband tables
+
+</pre>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 1d6243e23..01ad57373 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -365,8 +365,11 @@ if ( $conf->exists('hidecancelledpackages') ) {
if ( @packages ) {
#formatting
+
+ my $colspan = $packages[0]->dbdef_table->column('last_bill') ? 6 : 5;
+
print &table(), "\n",
- qq!<TR><TH COLSPAN=2 ROWSPAN=2>Package</TH><TH COLSPAN=5>!,
+ qq!<TR><TH COLSPAN=2 ROWSPAN=2>Package</TH><TH COLSPAN=$colspan>!,
qq!Dates</TH><TH COLSPAN=2 ROWSPAN=2>Services</TH></TR>\n<TR>!,
qq!<TH><FONT SIZE=-1>Setup</FONT></TH>!;
@@ -375,7 +378,7 @@ if ( @packages ) {
print qq!<TH><FONT SIZE=-1>Next bill</FONT></TH>!,
qq!<TH><FONT SIZE=-1>Susp.</FONT></TH>!,
- qq!<TH><FONT SIZE=-1>Expire!</FONT></TH>!,
+ qq!<TH><FONT SIZE=-1>Expire</FONT></TH>!,
qq!<TH><FONT SIZE=-1>Cancel</FONT></TH>!,
qq!</TR>\n!;
}