'. $_. '

'. + + join('
', grep { warn "$access_group->access_right($_): ". + $access_group->access_right($_). "\n"; + $access_group->access_right($_); } + map { ref($_) ? $_->{'rightname'} : $_; } + @{ $rights{$_} } + ). + + '

'. $_. '
'. + include( '/elements/checkboxes-table-name.html', + 'source_obj' => $access_group, + 'link_table' => 'access_right', + 'link_static' => { 'righttype' => + 'FS::access_group', + }, + 'num_col' => 'rightobjnum', + 'name_col' => 'rightname', + 'names_list' => [ map { + my $rn = + ref($_) ? $_->{'rightname'} : $_; + my %hash = (); + $hash{'note'} = ' *' + if ref($_) && $_->{'global'}; + $hash{'desc'} = $_->{'desc'} + if ref($_) && $_->{'desc'}; + [ $rn => \%hash ]; + } + @{ $rights{$_} } + ], + ). + ' '. + '

'. $_. '

'. + include( '/elements/checkboxes-table-name.html', + 'source_obj' => $access_group, + 'link_table' => 'access_right', + 'link_static' => { 'righttype' => + 'FS::access_group', + }, + 'num_col' => 'rightobjnum', + 'name_col' => 'rightname', + 'names_list' => [ map { + my $rn = + ref($_) ? $_->{'rightname'} : $_; + my %hash = (); + $hash{'note'} = ' *' + if ref($_) && $_->{'global'}; + $hash{'desc'} = $_->{'desc'} + if ref($_) && $_->{'desc'}; + [ $rn => \%hash ]; + } + @{ $rights{$_} } + ], + ). + '
'. + '

- <% ( $opt{labels} && exists $opt{labels}->{$field} ) - ? $opt{labels}->{$field} - : $field - %> -
Current logo	New logo preview
+ +% if ( $type eq 'png' ) { + + + +% } elsif ( $type eq 'eps' ) { + + EPS preview not yet supported + +% } + +	+ +% if ( $mode eq 'upload' ) { + + Upload new logo (PNG format): + + +% } elsif ( $mode eq 'preview' ) { + + + +% } + +

- <% ( $opt{labels} && exists $opt{labels}->{$field} ) - ? $opt{labels}->{$field} - : $field - %> -

Current logo

New logo preview

+ +% if ( $type eq 'png' ) { + +

+ +% } elsif ( $type eq 'eps' ) { + + EPS preview not yet supported + +% } + +

+ +% if ( $mode eq 'upload' ) { + + Upload new logo (PNG format): +
+ +% } elsif ( $mode eq 'preview' ) { + +

+ +% } + +

' ; + + if ( !this.CheckBrowser || this._IsCompatibleBrowser() ) + { + sHtml += '' ; + sHtml += this._GetConfigHtml() ; + sHtml += this._GetIFrameHtml() ; + } + else + { + var sWidth = this.Width.toString().indexOf('%') > 0 ? this.Width : this.Width + 'px' ; + var sHeight = this.Height.toString().indexOf('%') > 0 ? this.Height : this.Height + 'px' ; + sHtml += '

' + this._HTMLEncode( this.Value ) + '<\/textarea>' ;
+	}
+
+	sHtml += '</div>' ;
+
+	return sHtml ;
+}
+
+FCKeditor.prototype.ReplaceTextarea = function()
+{
+	if ( !this.CheckBrowser || this._IsCompatibleBrowser() )
+	{
+		// We must check the elements firstly using the Id and then the name.
+		var oTextarea = document.getElementById( this.InstanceName ) ;
+		var colElementsByName = document.getElementsByName( this.InstanceName ) ;
+		var i = 0;
+		while ( oTextarea || i == 0 )
+		{
+			if ( oTextarea && oTextarea.tagName.toLowerCase() == 'textarea' )
+				break ;
+			oTextarea = colElementsByName[i++] ;
+		}
+
+		if ( !oTextarea )
+		{
+			alert( 'Error: The TEXTAREA with id or name set to "' + this.InstanceName + '" was not found' ) ;
+			return ;
+		}
+
+		oTextarea.style.display = 'none' ;
+		this._InsertHtmlBefore( this._GetConfigHtml(), oTextarea ) ;
+		this._InsertHtmlBefore( this._GetIFrameHtml(), oTextarea ) ;
+	}
+}
+
+FCKeditor.prototype._InsertHtmlBefore = function( html, element )
+{
+	if ( element.insertAdjacentHTML )	// IE
+		element.insertAdjacentHTML( 'beforeBegin', html ) ;
+	else								// Gecko
+	{
+		var oRange = document.createRange() ;
+		oRange.setStartBefore( element ) ;
+		var oFragment = oRange.createContextualFragment( html );
+		element.parentNode.insertBefore( oFragment, element ) ;
+	}
+}
+
+FCKeditor.prototype._GetConfigHtml = function()
+{
+	var sConfig = '' ;
+	for ( var o in this.Config )
+	{
+		if ( sConfig.length > 0 ) sConfig += '&' ;
+		sConfig += encodeURIComponent( o ) + '=' + encodeURIComponent( this.Config[o] ) ;
+	}
+
+	return '<input type="hidden" id="' + this.InstanceName + '___Config" value="' + sConfig + '" style="display:none" />' ;
+}
+
+FCKeditor.prototype._GetIFrameHtml = function()
+{
+	var sFile = 'fckeditor.html' ;
+
+	try
+	{
+		if ( (/fcksource=true/i).test( window.top.location.search ) )
+			sFile = 'fckeditor.original.html' ;
+	}
+	catch (e) { /* Ignore it. Much probably we are inside a FRAME where the "top" is in another domain (security error). */ }
+
+	var sLink = this.BasePath + 'editor/' + sFile + '?InstanceName=' + encodeURIComponent( this.InstanceName ) ;
+	if (this.ToolbarSet) sLink += '&Toolbar=' + this.ToolbarSet ;
+
+	return '<iframe id="' + this.InstanceName + '___Frame" src="' + sLink + '" width="' + this.Width + '" height="' + this.Height + '" frameborder="0" scrolling="no"></iframe>' ;
+}
+
+FCKeditor.prototype._IsCompatibleBrowser = function()
+{
+	return FCKeditor_IsCompatibleBrowser( this.EnableSafari, this.EnableOpera ) ;
+}
+
+FCKeditor.prototype._ThrowError = function( errorNumber, errorDescription )
+{
+	this.ErrorNumber		= errorNumber ;
+	this.ErrorDescription	= errorDescription ;
+
+	if ( this.DisplayErrors )
+	{
+		document.write( '<div style="COLOR: #ff0000">' ) ;
+		document.write( '[ FCKeditor Error ' + this.ErrorNumber + ': ' + this.ErrorDescription + ' ]' ) ;
+		document.write( '</div>' ) ;
+	}
+
+	if ( typeof( this.OnError ) == 'function' )
+		this.OnError( this, errorNumber, errorDescription ) ;
+}
+
+FCKeditor.prototype._HTMLEncode = function( text )
+{
+	if ( typeof( text ) != "string" )
+		text = text.toString() ;
+
+	text = text.replace(
+		/&/g, "&").replace(
+		/"/g, """).replace(
+		/</g, "<").replace(
+		/>/g, ">") ;
+
+	return text ;
+}
+
+function FCKeditor_IsCompatibleBrowser( enableSafari, enableOpera )
+{
+	var sAgent = navigator.userAgent.toLowerCase() ;
+
+	// Internet Explorer
+	if ( sAgent.indexOf("msie") != -1 && sAgent.indexOf("mac") == -1 && sAgent.indexOf("opera") == -1 )
+	{
+		var sBrowserVersion = navigator.appVersion.match(/MSIE (.\..)/)[1] ;
+		return ( sBrowserVersion >= 5.5 ) ;
+	}
+
+	// Gecko (Opera 9 tries to behave like Gecko at this point).
+	if ( navigator.product == "Gecko" && navigator.productSub >= 20030210 && !( typeof(opera) == 'object' && opera.postError ) )
+		return true ;
+
+	// Opera
+	if ( enableOpera && sAgent.indexOf( 'opera' ) == 0 && parseInt( navigator.appVersion, 10 ) >= 9 )
+			return true ;
+
+	// Safari
+	if ( enableSafari && sAgent.indexOf( 'safari' ) != -1 )
+		return ( sAgent.match( /safari\/(\d+)/ )[1] >= 312 ) ;	// Build must be at least 312 (1.3)
+
+	return false ;
+}
\ No newline at end of file
diff --git a/httemplate/elements/fckeditor/fckpackager.xml b/httemplate/elements/fckeditor/fckpackager.xml
new file mode 100644
index 000000000..3cae595a6
--- /dev/null
+++ b/httemplate/elements/fckeditor/fckpackager.xml
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Package>
+	<Header><![CDATA[/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * 
+ * == BEGIN LICENSE ==
+ * 
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ * 
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ * 
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ * 
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ * 
+ * == END LICENSE ==
+ * 
+ * This file has been compressed for better performance. The original source
+ * can be found at "editor/_source".
+ */
+]]></Header>
+	<Constants removeDeclaration="false">
+		<Constant name="FCK_STATUS_NOTLOADED" value="0" />
+		<Constant name="FCK_STATUS_ACTIVE" value="1" />
+		<Constant name="FCK_STATUS_COMPLETE" value="2" />
+		<Constant name="FCK_TRISTATE_OFF" value="0" />
+		<Constant name="FCK_TRISTATE_ON" value="1" />
+		<Constant name="FCK_TRISTATE_DISABLED" value="-1" />
+		<Constant name="FCK_UNKNOWN" value="-9" />
+		<Constant name="FCK_TOOLBARITEM_ONLYICON" value="0" />
+		<Constant name="FCK_TOOLBARITEM_ONLYTEXT" value="1" />
+		<Constant name="FCK_TOOLBARITEM_ICONTEXT" value="2" />
+		<Constant name="FCK_EDITMODE_WYSIWYG" value="0" />
+		<Constant name="FCK_EDITMODE_SOURCE" value="1" />
+	</Constants>
+	<PackageFile path="editor/js/fckeditorcode_ie.js">
+		<File path="editor/_source/fckconstants.js" />
+		<File path="editor/_source/fckjscoreextensions.js" />
+		<File path="editor/_source/classes/fckiecleanup.js" />
+		<File path="editor/_source/internals/fckbrowserinfo.js" />
+		<File path="editor/_source/internals/fckurlparams.js" />
+		<File path="editor/_source/classes/fckevents.js" />
+		<File path="editor/_source/internals/fck.js" />
+		<File path="editor/_source/internals/fck_ie.js" />
+		<File path="editor/_source/internals/fckconfig.js" />
+		<File path="editor/_source/internals/fckdebug.js" />
+		<File path="editor/_source/internals/fckdomtools.js" />
+		<File path="editor/_source/internals/fcktools.js" />
+		<File path="editor/_source/internals/fcktools_ie.js" />
+		<File path="editor/_source/fckeditorapi.js" />
+		<File path="editor/_source/classes/fckimagepreloader.js" />
+
+		<File path="editor/_source/internals/fckregexlib.js" />
+		<File path="editor/_source/internals/fcklistslib.js" />
+		<File path="editor/_source/internals/fcklanguagemanager.js" />
+		<File path="editor/_source/internals/fckxhtmlentities.js" />
+		<File path="editor/_source/internals/fckxhtml.js" />
+		<File path="editor/_source/internals/fckxhtml_ie.js" />
+		<File path="editor/_source/internals/fckcodeformatter.js" />
+		<File path="editor/_source/internals/fckundo_ie.js" />
+		<File path="editor/_source/classes/fckeditingarea.js" />
+		<File path="editor/_source/classes/fckkeystrokehandler.js" />
+
+		<File path="editor/_source/internals/fcklisthandler.js" />
+		<File path="editor/_source/classes/fckelementpath.js" />
+		<File path="editor/_source/classes/fckdomrange.js" />
+		<File path="editor/_source/classes/fckdomrange_ie.js" />
+		<File path="editor/_source/classes/fckdocumentfragment_ie.js" />
+		<File path="editor/_source/classes/fckw3crange.js" />
+		<File path="editor/_source/classes/fckenterkey.js" />
+
+		<File path="editor/_source/internals/fckdocumentprocessor.js" />
+		<File path="editor/_source/internals/fckselection.js" />
+		<File path="editor/_source/internals/fckselection_ie.js" />
+
+		<File path="editor/_source/internals/fcktablehandler.js" />
+		<File path="editor/_source/internals/fcktablehandler_ie.js" />
+		<File path="editor/_source/classes/fckxml_ie.js" />
+		<File path="editor/_source/classes/fckstyledef.js" />
+		<File path="editor/_source/classes/fckstyledef_ie.js" />
+		<File path="editor/_source/classes/fckstylesloader.js" />
+
+		<File path="editor/_source/commandclasses/fcknamedcommand.js" />
+		<File path="editor/_source/commandclasses/fck_othercommands.js" />
+		<File path="editor/_source/commandclasses/fckspellcheckcommand_ie.js" />
+		<File path="editor/_source/commandclasses/fcktextcolorcommand.js" />
+		<File path="editor/_source/commandclasses/fckpasteplaintextcommand.js" />
+		<File path="editor/_source/commandclasses/fckpastewordcommand.js" />
+		<File path="editor/_source/commandclasses/fcktablecommand.js" />
+		<File path="editor/_source/commandclasses/fckstylecommand.js" />
+		<File path="editor/_source/commandclasses/fckfitwindow.js" />
+		<File path="editor/_source/internals/fckcommands.js" />
+
+		<File path="editor/_source/classes/fckpanel.js" />
+		<File path="editor/_source/classes/fckicon.js" />
+		<File path="editor/_source/classes/fcktoolbarbuttonui.js" />
+		<File path="editor/_source/classes/fcktoolbarbutton.js" />
+		<File path="editor/_source/classes/fckspecialcombo.js" />
+		<File path="editor/_source/classes/fcktoolbarspecialcombo.js" />
+		<File path="editor/_source/classes/fcktoolbarfontscombo.js" />
+		<File path="editor/_source/classes/fcktoolbarfontsizecombo.js" />
+		<File path="editor/_source/classes/fcktoolbarfontformatcombo.js" />
+		<File path="editor/_source/classes/fcktoolbarstylecombo.js" />
+		<File path="editor/_source/classes/fcktoolbarpanelbutton.js" />
+		<File path="editor/_source/internals/fcktoolbaritems.js" />
+		<File path="editor/_source/classes/fcktoolbar.js" />
+		<File path="editor/_source/classes/fcktoolbarbreak_ie.js" />
+		<File path="editor/_source/internals/fcktoolbarset.js" />
+		<File path="editor/_source/internals/fckdialog.js" />
+		<File path="editor/_source/internals/fckdialog_ie.js" />
+
+		<File path="editor/_source/classes/fckmenuitem.js" />
+		<File path="editor/_source/classes/fckmenublock.js" />
+		<File path="editor/_source/classes/fckmenublockpanel.js" />
+		<File path="editor/_source/classes/fckcontextmenu.js" />
+		<File path="editor/_source/internals/fck_contextmenu.js" />
+
+		<File path="editor/_source/classes/fckplugin.js" />
+		<File path="editor/_source/internals/fckplugins.js" />
+	</PackageFile>
+
+	<PackageFile path="editor/js/fckeditorcode_gecko.js">
+		<File path="editor/_source/fckconstants.js" />
+		<File path="editor/_source/fckjscoreextensions.js" />
+		<File path="editor/_source/internals/fckbrowserinfo.js" />
+		<File path="editor/_source/internals/fckurlparams.js" />
+		<File path="editor/_source/classes/fckevents.js" />
+		<File path="editor/_source/internals/fck.js" />
+		<File path="editor/_source/internals/fck_gecko.js" />
+		<File path="editor/_source/internals/fckconfig.js" />
+		<File path="editor/_source/internals/fckdebug.js" />
+		<File path="editor/_source/internals/fckdomtools.js" />
+		<File path="editor/_source/internals/fcktools.js" />
+		<File path="editor/_source/internals/fcktools_gecko.js" />
+		<File path="editor/_source/fckeditorapi.js" />
+		<File path="editor/_source/classes/fckimagepreloader.js" />
+
+		<File path="editor/_source/internals/fckregexlib.js" />
+		<File path="editor/_source/internals/fcklistslib.js" />
+		<File path="editor/_source/internals/fcklanguagemanager.js" />
+		<File path="editor/_source/internals/fckxhtmlentities.js" />
+		<File path="editor/_source/internals/fckxhtml.js" />
+		<File path="editor/_source/internals/fckxhtml_gecko.js" />
+		<File path="editor/_source/internals/fckcodeformatter.js" />
+		<File path="editor/_source/internals/fckundo_gecko.js" />
+		<File path="editor/_source/classes/fckeditingarea.js" />
+		<File path="editor/_source/classes/fckkeystrokehandler.js" />
+
+		<File path="editor/_source/internals/fcklisthandler.js" />
+		<File path="editor/_source/classes/fckelementpath.js" />
+		<File path="editor/_source/classes/fckdomrange.js" />
+		<File path="editor/_source/classes/fckdomrange_gecko.js" />
+		<File path="editor/_source/classes/fckdocumentfragment_gecko.js" />
+		<File path="editor/_source/classes/fckw3crange.js" />
+		<File path="editor/_source/classes/fckenterkey.js" />
+
+		<File path="editor/_source/internals/fckdocumentprocessor.js" />
+		<File path="editor/_source/internals/fckselection.js" />
+		<File path="editor/_source/internals/fckselection_gecko.js" />
+
+		<File path="editor/_source/internals/fcktablehandler.js" />
+		<File path="editor/_source/internals/fcktablehandler_gecko.js" />
+		<File path="editor/_source/classes/fckxml_gecko.js" />
+		<File path="editor/_source/classes/fckstyledef.js" />
+		<File path="editor/_source/classes/fckstyledef_gecko.js" />
+		<File path="editor/_source/classes/fckstylesloader.js" />
+
+		<File path="editor/_source/commandclasses/fcknamedcommand.js" />
+		<File path="editor/_source/commandclasses/fck_othercommands.js" />
+		<File path="editor/_source/commandclasses/fckspellcheckcommand_gecko.js" />
+		<File path="editor/_source/commandclasses/fcktextcolorcommand.js" />
+		<File path="editor/_source/commandclasses/fckpasteplaintextcommand.js" />
+		<File path="editor/_source/commandclasses/fckpastewordcommand.js" />
+		<File path="editor/_source/commandclasses/fcktablecommand.js" />
+		<File path="editor/_source/commandclasses/fckstylecommand.js" />
+		<File path="editor/_source/commandclasses/fckfitwindow.js" />
+		<File path="editor/_source/internals/fckcommands.js" />
+
+		<File path="editor/_source/classes/fckpanel.js" />
+		<File path="editor/_source/classes/fckicon.js" />
+		<File path="editor/_source/classes/fcktoolbarbuttonui.js" />
+		<File path="editor/_source/classes/fcktoolbarbutton.js" />
+		<File path="editor/_source/classes/fckspecialcombo.js" />
+		<File path="editor/_source/classes/fcktoolbarspecialcombo.js" />
+		<File path="editor/_source/classes/fcktoolbarfontscombo.js" />
+		<File path="editor/_source/classes/fcktoolbarfontsizecombo.js" />
+		<File path="editor/_source/classes/fcktoolbarfontformatcombo.js" />
+		<File path="editor/_source/classes/fcktoolbarstylecombo.js" />
+		<File path="editor/_source/classes/fcktoolbarpanelbutton.js" />
+		<File path="editor/_source/internals/fcktoolbaritems.js" />
+		<File path="editor/_source/classes/fcktoolbar.js" />
+		<File path="editor/_source/classes/fcktoolbarbreak_gecko.js" />
+		<File path="editor/_source/internals/fcktoolbarset.js" />
+		<File path="editor/_source/internals/fckdialog.js" />
+		<File path="editor/_source/internals/fckdialog_gecko.js" />
+
+		<File path="editor/_source/classes/fckmenuitem.js" />
+		<File path="editor/_source/classes/fckmenublock.js" />
+		<File path="editor/_source/classes/fckmenublockpanel.js" />
+		<File path="editor/_source/classes/fckcontextmenu.js" />
+		<File path="editor/_source/internals/fck_contextmenu.js" />
+
+		<File path="editor/_source/classes/fckplugin.js" />
+		<File path="editor/_source/internals/fckplugins.js" />
+	</PackageFile>
+
+</Package>
\ No newline at end of file
diff --git a/httemplate/elements/fckeditor/fckstyles.xml b/httemplate/elements/fckeditor/fckstyles.xml
new file mode 100644
index 000000000..bfd80e717
--- /dev/null
+++ b/httemplate/elements/fckeditor/fckstyles.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Styles>
+	<Style name="Image on Left" element="img">
+		<Attribute name="style" value="padding: 5px; margin-right: 5px" />
+		<Attribute name="border" value="2" />
+		<Attribute name="align" value="left" />
+	</Style>
+	<Style name="Image on Right" element="img">
+		<Attribute name="style" value="padding: 5px; margin-left: 5px" />
+		<Attribute name="border" value="2" />
+		<Attribute name="align" value="right" />
+	</Style>
+	<Style name="Custom Bold" element="span">
+		<Attribute name="style" value="font-weight: bold;" />
+	</Style>
+	<Style name="Custom Italic" element="em" />
+	<Style name="Title" element="span">
+		<Attribute name="class" value="Title" />
+	</Style>
+	<Style name="Code" element="span">
+		<Attribute name="class" value="Code" />
+	</Style>
+	<Style name="Title H3" element="h3" />
+	<Style name="Custom Ruler" element="hr">
+		<Attribute name="size" value="1" />
+		<Attribute name="color" value="#ff0000" />
+	</Style>
+</Styles>
\ No newline at end of file
diff --git a/httemplate/elements/fckeditor/fcktemplates.xml b/httemplate/elements/fckeditor/fcktemplates.xml
new file mode 100644
index 000000000..87610628a
--- /dev/null
+++ b/httemplate/elements/fckeditor/fcktemplates.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Templates imagesBasePath="fck_template/images/">
+	<Template title="Image and Title" image="template1.gif">
+		<Description>One main image with a title and text that surround the image.</Description>
+		<Html>
+			<![CDATA[
+				<img style="MARGIN-RIGHT: 10px" height="100" alt="" width="100" align="left"/>
+				<h3>Type the title here</h3>
+				Type the text here
+			]]>
+		</Html>
+	</Template>
+	<Template title="Strange Template" image="template2.gif">
+		<Description>A template that defines two colums, each one with a title, and some text.</Description>
+		<Html>
+			<![CDATA[
+				<table cellspacing="0" cellpadding="0" width="100%" border="0">
+					<tbody>
+						<tr>
+							<td width="50%">
+							<h3>Title 1</h3>
+							</td>
+							<td>          </td>
+							<td width="50%">
+							<h3>Title 2</h3>
+							</td>
+						</tr>
+						<tr>
+							<td>Text 1</td>
+							<td> </td>
+							<td>Text 2</td>
+						</tr>
+					</tbody>
+				</table>
+				More text goes here.
+			]]>
+		</Html>
+	</Template>
+	<Template title="Text and Table" image="template3.gif">
+		<Description>A title with some text and a table.</Description>
+		<Html>
+			<![CDATA[
+				<table align="left" width="80%" border="0" cellspacing="0" cellpadding="0"><tr><td>
+					<h3>Title goes here</h3>
+					<p>
+					<table style="FLOAT: right" cellspacing="0" cellpadding="0" width="150" border="1">
+						<tbody>
+							<tr>
+								<td align="center" colspan="3"><strong>Table title</strong></td>
+							</tr>
+							<tr>
+								<td> </td>
+								<td> </td>
+								<td> </td>
+							</tr>
+							<tr>
+								<td> </td>
+								<td> </td>
+								<td> </td>
+							</tr>
+							<tr>
+								<td> </td>
+								<td> </td>
+								<td> </td>
+							</tr>
+							<tr>
+								<td> </td>
+								<td> </td>
+								<td> </td>
+							</tr>
+						</tbody>
+					</table>
+					Type the text here</p>
+				</td></tr></table>
+			]]>
+		</Html>
+	</Template>
+</Templates>
diff --git a/httemplate/elements/freeside.css b/httemplate/elements/freeside.css
index 6f7cadb2e..c310e2fa0 100644
--- a/httemplate/elements/freeside.css
+++ b/httemplate/elements/freeside.css
@@ -1,5 +1,6 @@
 * {
   font-family: Arial, Verdana, Helvetica, sans-serif;
+  /* font-family: Verdana, Arial, Helvetica, sans-serif; */
 }
 
 A:link IMG, A:visited { border-style: none }
diff --git a/httemplate/elements/hidden.html b/httemplate/elements/hidden.html
new file mode 100644
index 000000000..26da70ac0
--- /dev/null
+++ b/httemplate/elements/hidden.html
@@ -0,0 +1,11 @@
+<INPUT TYPE  = "hidden"
+       NAME  = "<% $opt{field} %>"
+       ID    = "<% $opt{field} %>"
+       VALUE = "<% $opt{curr_value} || $opt{value} %>"
+>
+
+<%init>
+
+my %opt = @_;
+
+</%init>
diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index 7ee34a977..42e2a8389 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -152,8 +152,10 @@ tie my %report_rating, 'Tie::IxHash',
 ;
 
 tie my %report_bill_event, 'Tie::IxHash',
-  'All billing events' => [ $fsurl.'search/cust_bill_event.html', 'All billing events for a date range' ],
-  'Invoice event errors' => [ $fsurl.'search/cust_bill_event.html?failed=1', 'failed credit cards, processor or printer problems, etc.' ],
+  'All billing events' => [ $fsurl.'search/report_cust_event.html', 'All billing events for a date range' ],
+  'Billing event errors' => [ $fsurl.'search/report_cust_event.html?failed=1', 'Failed credit cards, processor or printer problems, etc.' ],
+  'All invoice events' => [ $fsurl.'search/cust_bill_event.html', 'Reports on deprecated, old-style invoice events for a date range' ],
+  'Invoice event errors' => [ $fsurl.'search/cust_bill_event.html?failed=1', 'Reports on deprecated, old-style events for failed credit cards, processor or printer problems, etc.' ],
 ;
 
 tie my %report_financial, 'Tie::IxHash', 
@@ -235,12 +237,18 @@ tie my %config_agent, 'Tie::IxHash',
 ;
 
 tie my %config_billing, 'Tie::IxHash',
-  'View/Edit payment gateways'         => [ $fsurl.'browse/payment_gateway.html', 'Credit card and electronic check processors' ],
-  'View/Edit invoice events'           => [ $fsurl.'browse/part_bill_event.cgi', 'Actions for overdue invoices' ],
-  'View/Edit prepaid cards'            => [ $fsurl.'search/prepay_credit.html', 'View outstanding cards, generate new cards' ],
-  'View/Edit call rates and regions'   => [ $fsurl.'browse/rate.cgi', 'Manage rate plans, regions and prefixes for VoIP and call billing' ],
-  'View/Edit locales and tax rates'    => [ $fsurl.'browse/cust_main_county.cgi', 'Change tax rates, or break down a country into states, or a state into counties and assign different tax rates to each' ],
-;
+  'View/Edit payment gateways'         => [ $fsurl.'browse/payment_gateway.html', 'Credit card and electronic check processors' ];
+$config_billing{'View/Edit billing events'} = [ $fsurl.'browse/part_event.html', 'Billing actions for customers, invoices and packages' ]
+    if $curuser->access_right('Configuration')
+    || $curuser->access_right('Edit billing events')
+    || $curuser->access_right('Edit global billing events');
+if ( $curuser->access_right('Configuration') ) {
+  $config_billing{'View/Edit invoice events'}         = [ $fsurl.'browse/part_bill_event.cgi', 'Deprecated, old-style actions for overdue invoices' ];
+  $config_billing{'View/Edit invoice templates'}      = [ $fsurl.'browse/invoice_template.html', 'Edit templates for HTML, plaintext and typeset invoices' ];
+  $config_billing{'View/Edit prepaid cards'}          = [ $fsurl.'search/prepay_credit.html', 'View outstanding cards, generate new cards' ];
+  $config_billing{'View/Edit call rates and regions'} = [ $fsurl.'browse/rate.cgi', 'Manage rate plans, regions and prefixes for VoIP and call billing' ];
+  $config_billing{'View/Edit locales and tax rates'}  = [ $fsurl.'browse/cust_main_county.cgi', 'Change tax rates, or break down a country into states, or a state into counties and assign different tax rates to each' ];
+}
 
 tie my %config_dialup, 'Tie::IxHash',
   'View/Edit access numbers' => [ $fsurl.'browse/svc_acct_pop.cgi', 'Points of Presence' ],
@@ -271,12 +279,17 @@ if ( $curuser->access_right('Configuration' ) ) {
     'Provisioning, services and packages'
                     => [ \%config_export_svc_pkg, ''    ],
     'Resellers'     => [ \%config_agent, ''    ],
-    'Billing'       => [ \%config_billing, ''    ],
-    'Dialup'        => [ \%config_dialup, ''    ],
-    'Fixed (username-less) broadband'
-                    => [ \%config_broadband, ''    ],
   );
 }
+$config_menu{'Billing'} = [ \%config_billing, ''    ]
+  if $curuser->access_right('Configuration')
+  || $curuser->access_right('Edit billing events')
+  || $curuser->access_right('Edit global billing events');
+if ( $curuser->access_right('Configuration') ) {
+  $config_menu{'Dialup'}  = [ \%config_dialup, ''    ];
+  $config_menu{'Fixed (username-less) broadband'} = 
+                            [ \%config_broadband, ''    ];
+}
 $config_menu{'Miscellaneous'} = [ \%config_misc, ''    ]
   if $curuser->access_right('Configuration')
   || $curuser->access_right('Edit advertising sources')
diff --git a/httemplate/elements/select-agent.html b/httemplate/elements/select-agent.html
index 3107ff9d4..54069a5cb 100644
--- a/httemplate/elements/select-agent.html
+++ b/httemplate/elements/select-agent.html
@@ -1,10 +1,3 @@
-%
-%  my( $agentnum, %opt ) = @_;
-%
-%  $opt{'records'} = delete $opt{'agents'}
-%    if $opt{'agents'};
-%
-%
 <% include( '/elements/select-table.html',
                  'table'       => 'agent',
                  'name_col'    => 'agent',
@@ -17,3 +10,12 @@
                  %opt,
              )
 %>
+<%init>
+
+my %opt = @_;
+my $agentnum = $opt{'curr_value'} || $opt{'value'};
+
+$opt{'records'} = delete $opt{'agents'}
+  if $opt{'agents'};
+
+</%init>
diff --git a/httemplate/elements/select-agent_type.html b/httemplate/elements/select-agent_type.html
new file mode 100644
index 000000000..ba59cd397
--- /dev/null
+++ b/httemplate/elements/select-agent_type.html
@@ -0,0 +1,21 @@
+<% include( '/elements/select-table.html',
+                 'table'       => 'agent_type',
+                 'name_col'    => 'atype',
+                 'value'       => $typenum || '',
+                 'empty_label' => 'all',
+                 'hashref'     => { 'disabled' => '' },
+                 #'extra_sql'   => ' AND '.
+                 #                 $FS::CurrentUser::CurrentUser->agentnums_sql.
+                 #                 ' ORDER BY agent',
+                 %opt,
+             )
+%>
+<%init>
+
+my %opt = @_;
+my $typenum = $opt{'curr_value'} || $opt{'value'};
+
+$opt{'records'} = delete $opt{'agent_types'}
+  if $opt{'agent_types'};
+
+</%init>
diff --git a/httemplate/elements/select-cust_main-status.html b/httemplate/elements/select-cust_main-status.html
new file mode 100644
index 000000000..2e0b6cb24
--- /dev/null
+++ b/httemplate/elements/select-cust_main-status.html
@@ -0,0 +1,30 @@
+<SELECT NAME="<% $opt{'field'} || 'status' %>"
+        <% $opt{'multiple'} ? 'MULTIPLE' : '' %>
+        <% $onchange %>
+>
+
+  <OPTION VALUE="">all
+
+% foreach my $option ( @{ $opt{'statuses'} } ) { 
+
+    <OPTION VALUE="<% $option %>"
+            <% $option eq $curr_value ? 'SELECTED' : '' %>
+    ><% $option %>
+
+% } 
+
+</SELECT>
+
+<%init>
+
+my %opt = @_;
+
+$opt{'statuses'} ||= [ FS::cust_main->statuses() ]; # { disabled=>'' } )
+
+my $onchange = $opt{'onchange'}
+                 ? 'onChange="'. $opt{'onchange'}. '(this)"'
+                 : '';
+
+my $curr_value = $opt{'curr_value'} || $opt{'value'};
+
+</%init>
diff --git a/httemplate/elements/select-cust_pkg-status.html b/httemplate/elements/select-cust_pkg-status.html
index 71aaa84b6..2d545c047 100644
--- a/httemplate/elements/select-cust_pkg-status.html
+++ b/httemplate/elements/select-cust_pkg-status.html
@@ -1,21 +1,30 @@
-<SELECT NAME="status" <% $opt{'onchange'} %>>
+<SELECT NAME="<% $opt{'field'} || 'status' %>"
+        <% $opt{'multiple'} ? 'MULTIPLE' : '' %>
+        <% $onchange %>
+>
 
   <OPTION VALUE="">all
 
 % foreach my $option ( @{ $opt{'statuses'} } ) { 
-       <OPTION VALUE="<% $option %>" <% $option eq $status ? 'SELECTED' : '' %>><% $option %>
+
+    <OPTION VALUE="<% $option %>"
+            <% $option eq $curr_value ? 'SELECTED' : '' %>
+    ><% $option %>
+
 % } 
 
 </SELECT>
+
 <%init>
-  my( $status, %opt ) = @_;
 
-  $opt{'statuses'} ||= [ FS::cust_pkg->statuses() ]; # { disabled=>'' } )
+my %opt = @_;
+
+$opt{'statuses'} ||= [ FS::cust_pkg->statuses() ]; # { disabled=>'' } )
+
+my $onchange = $opt{'onchange'}
+                 ? 'onChange="'. $opt{'onchange'}. '(this)"'
+                 : '';
 
-  if ( exists $opt{'onchange'} && $opt{'onchange'} ) {
-    $opt{'onchange'} = ' onChange="' . $opt{'onchange'}. '"';
-  } else {
-    $opt{'onchange'} = '';
-  }
+my $curr_value = $opt{'curr_value'} || $opt{'value'};
 
 </%init>
diff --git a/httemplate/elements/select-part_referral.html b/httemplate/elements/select-part_referral.html
index 670b70c7c..c4b8829c8 100644
--- a/httemplate/elements/select-part_referral.html
+++ b/httemplate/elements/select-part_referral.html
@@ -1,10 +1,3 @@
-%
-%  my( $refnum, %opt ) = @_;
-%
-%  $opt{'records'} = delete $opt{'part_referrals'}
-%    if $opt{'part_referrals'};
-%
-%
 <% include( '/elements/select-table.html',
                  'table'       => 'part_referral',
                  'name_col'    => 'referral',
@@ -16,3 +9,12 @@
                  %opt,
              )
 %>
+<%init>
+
+my %opt = @_;
+my $refnum = $opt{'curr_value'} || $opt{'value'};
+
+$opt{'records'} = delete $opt{'part_referrals'}
+  if $opt{'part_referrals'};
+
+</%init>
diff --git a/httemplate/elements/select-pkg_class.html b/httemplate/elements/select-pkg_class.html
index 8e873ed66..f30259e55 100644
--- a/httemplate/elements/select-pkg_class.html
+++ b/httemplate/elements/select-pkg_class.html
@@ -1,10 +1,3 @@
-%  my( $classnum, %opt ) = @_;
-%
-%  $opt{'records'} = delete $opt{'pkg_class'}
-%    if $opt{'pkg_class'};
-%
-%  #warn "***** select-pkg-class: \n". Dumper(%opt);
-%
 <% include( '/elements/select-table.html',
                  'table'       => 'pkg_class',
                  'name_col'    => 'classname',
@@ -14,3 +7,12 @@
                  %opt,
              )
 %>
+<%init>
+
+my %opt = @_;
+my $classnum = $opt{'curr_value'} || $opt{'value'};
+
+$opt{'records'} = delete $opt{'pkg_class'}
+  if $opt{'pkg_class'};
+
+</%init>
diff --git a/httemplate/elements/select-table.html b/httemplate/elements/select-table.html
index 3235ef627..4bf3d1c4d 100644
--- a/httemplate/elements/select-table.html
+++ b/httemplate/elements/select-table.html
@@ -1,73 +1,89 @@
-<SELECT NAME="<% $opt{'element_name'} || $key %>" <% $opt{'element_etc'} %>>
+<%doc>
+
+Example:
+
+  include( '/elements/select-table.html',
+
+    #required
+    'table'    => 'table_name',
+    'name_col' => 'name_column',
+   
+    #strongly recommended (you want your forms to be "sticky" on errors, right?)
+    'value'    => 'current_value',
+   
+    #opt
+    'empty_label'   => '', #better specify it though, the default might change
+    'hashref'       => {},
+    'extra_sql'     => '',
+    'records'       => \@records, #instead of hashref
+    'pre_options'   => [ 'value' => 'option' ], #before normal options
+    'element_name ' => '', #HTML element name, defaults to the name of
+                           # the primary key column
+    'field'         => '', #synonym for element_name
+    'element_etc'   => '', #additional attributes (i.e. "DISABLED") for the
+                           #<SELECT> element
+    'multiple'      => 0, # bool
+    'disable_empty' => 0, # bool (implied by multiple)
+    'debug'         => 0, #set true to enable
+
+  )
+
+</%doc>
+
+<SELECT <% $opt{'multiple'} ? 'MULTIPLE' : '' %> NAME="<% $opt{'element_name'} || $opt{'field'} || $key %>" <% $opt{'element_etc'} %>>
 
 % while ( @pre_options ) { 
-
     <OPTION VALUE="<% shift(@pre_options) %>"><% shift(@pre_options) %>
 
 % } 
 
-  <OPTION VALUE=""><% $opt{'empty_label'} || 'all' %>
+% unless ( $opt{'multiple'} || $opt{'disable_empty'} ) {
+    <OPTION VALUE=""><% $opt{'empty_label'} || 'all' %>
+% }
 
 % foreach my $record ( sort { $a->$name_col() cmp $b->$name_col() } @records ) {
-%   my $matches = 0;
-%   ref($opt{'value'}) ? (exists($opt{'value'}->{$record->$key()}) and $matches=1)
-%                      : ($opt{'value'} == $record->$key() and $matches=1);
-
-    <OPTION VALUE="<% $record->$key() %>"<% $matches ? ' SELECTED' : '' %>><% $record->$name_col() %>
-
+%   my $recvalue = $record->$key();
+    <OPTION VALUE="<% $recvalue %>"
+            <% ref($value) && $value->{$recvalue} || $value == $recvalue
+               ? ' SELECTED' : ''
+            %>
+    ><% $record->$name_col() %>
 % } 
 
 </SELECT>
-<%init>
 
-##required
-# 'table'    => 'table_name',
-# 'name_col' => 'name_column',
-#
-##strongly recommended (you want your forms to be "sticky" on errors, right?)
-# 'value'    => 'current_value',
-#
-##opt
-# 'empty_label'  => '', #better specify it though, the default might change
-# 'hashref'      => {},
-# 'extra_sql'    => '',
-# 'records'      => \@records, #instead of hashref
-# 'pre_options'  => [ 'value' => 'option' ], #before normal options
-# 'element_name' => '', #HTML element name, defaults to the name of
-#                       # the primary key column
-# 'element_etc'  => '', #additional attributes (i.e. "DISABLED") for the
-#                       #<SELECT> element
-# 'debug'        => 0, #set true to enable
+<%init>
 
 my( %opt ) = @_;
 
 warn "elements/select-table.html: \n". Dumper(%opt)
   if exists $opt{debug} && $opt{debug};
 
-my $key = dbdef->table($opt{table})->primary_key; #? $opt{primary_key} ||
+my $key = dbdef->table($opt{'table'})->primary_key; #? $opt{'primary_key'} ||
 
-my $name_col = $opt{name_col};
+my $name_col = $opt{'name_col'};
 
-$opt{hashref} ||= {};
+my $value = $opt{'curr_value'} || $opt{'value'};
+$value = [ split(/\s*,\s*/, $value) ] if $opt{'multiple'} && $value =~ /,/;
 
 my @records = ();
-if ( $opt{records} ) {
-  @records = @{ $opt{records} };
+if ( $opt{'records'} ) {
+  @records = @{ $opt{'records'} };
 } else {
   @records = qsearch( {
-    'table'     => $opt{table},
-    'hashref'   => $opt{hashref},
-    'extra_sql' => ( $opt{extra_sql} || '' ),
+    'table'     => $opt{'table'},
+    'hashref'   => ( $opt{'hashref'} || {} ),
+    'extra_sql' => ( $opt{'extra_sql'} || '' ),
   });
 }
 
-unless (    ! $opt{value}
-         or ref($opt{value})
+unless (    ! $value
+         or ref($value)
          or ! exists( $opt{hashref}->{disabled} ) #??
-         or grep { $opt{value} == $_->$key() } @records
+         or grep { $value == $_->$key() } @records
        ) {
   delete $opt{hashref}->{disabled};
-  $opt{hashref}->{$key} = $opt{value};
+  $opt{hashref}->{$key} = $value;
   my $record = qsearchs( {
     'table'     => $opt{table},
     'hashref'   => $opt{hashref},
@@ -76,8 +92,8 @@ unless (    ! $opt{value}
   push @records, $record if $record;
 }
 
-if ( ref( $opt{value} ) eq 'ARRAY' ) {
-  $opt{value} = { map { $_ => 1 } @{$opt{value}} };
+if ( ref( $value ) eq 'ARRAY' ) {
+  $value = { map { $_ => 1 } @$value };
 }
 
 my @pre_options = $opt{pre_options} ? @{ $opt{pre_options} } : ();
diff --git a/httemplate/elements/selectlayers.html b/httemplate/elements/selectlayers.html
new file mode 100644
index 000000000..4496892ff
--- /dev/null
+++ b/httemplate/elements/selectlayers.html
@@ -0,0 +1,201 @@
+<%doc>
+
+Example:
+
+  include( '/elements/selectlayers.html',
+    'field'        => $key, # SELECT element NAME (passed as form field)
+                            # also used as ID and a unique key for layers and
+                            # functions
+    'curr_value'   => $selected_layer,
+    'options'      => [ 'option1', 'option2' ],
+    'labels'       => { 'option1' => 'Option 1 Label',
+                        'option2' => 'Option 2 Label',
+                      },
+
+    #XXX put this handling it its own selectlayers-fields.html element?
+    'layer_prefix' => 'prefix_', #optional prefix for fieldnames
+    'layer_fields' => [ 'layer'  => [ 'fieldname',
+                                      { label => 'fieldname2',
+                                        type  => 'text', #implemented:
+                                                         # text, money, fixed,
+                                                         # hidden, checkbox,
+                                                         # checkbox-multiple,
+                                                         # select, select-agent,
+                                                         # select-pkg_class,
+                                                         # select-part_referral,
+                                                         # select-table,
+                                                         #XXX tbd:
+                                                         # more?
+                                      },
+                                      ...
+                                    ],
+                        'layer2' => [ 'l2fieldname',
+                                      ...
+                                    ],
+
+    #current values for layer fields above
+    'layer_values' => { 'layer'  => { 'fieldname'  => 'current_value',
+                                      'fieldname2' => 'field2value',
+                                      ...
+                                    },
+                        'layer2' => { 'l2fieldname' => 'l2value',
+                                      ...
+                                    },
+                        ...
+                      },
+
+    'html_between  => '', #optional HTML displayed between the SELECT and the
+                          #layers, scalar or coderef ('field' passed as a param)
+    'onchange'     => '', #javascript code run when the SELECT changes
+                          # ("what" is the element)
+    'js_only'      => 0, #set true to return only the JS portions
+    'html_only'    => 0, #set true to return only the HTML portions
+  )
+
+</%doc>
+% unless ( $opt{html_only} || $opt{js_only} ) {
+    <SCRIPT TYPE="text/javascript">
+% }
+% unless ( $opt{html_only} ) {
+      //alert('start function define');
+      function <% $key %>changed(what) {
+
+        <% $opt{'onchange'} %>
+
+        var <% $key %>layer = what.options[what.selectedIndex].value;
+
+%       foreach my $layer ( keys %$options ) {
+
+          if (<% $key %>layer == "<% $layer %>" ) {
+
+%           foreach my $not ( grep { $_ ne $layer } keys %$options ) {
+%             my $element = "document.getElementById('${key}d$not').style";
+              <% $element %>.display = "none";
+              <% $element %>.zIndex = 0;
+%           }
+
+%           my $element = "document.getElementById('${key}d$layer').style";
+            <% $element %>.display = "";
+            <% $element %>.zIndex = 1;
+
+          }
+%       }
+
+        //<% $opt{'onchange'} %>
+
+      }
+      //alert('end function define');
+% }
+% unless ( $opt{html_only} || $opt{js_only} ) {
+    </SCRIPT>
+% }
+%
+% unless ( $opt{js_only} ) {
+
+    <SELECT NAME          = "<% $key %>"
+            ID            = "<% $key %>"
+            previousValue = "<% $selected %>"
+            previousText  = "<% $options{$selected} %>"
+            onChange="<% $key %>changed(this);"
+    >
+
+%     foreach my $option ( keys %$options ) {
+
+        <OPTION VALUE="<% $option %>"
+                <% $option eq $selected ? ' SELECTED' : '' %>
+        ><% $options->{$option} %></OPTION>
+
+%     }
+
+    </SELECT>
+
+<% ref($between) ? &{$between}($key) : $between %>
+
+%   foreach my $layer ( keys %$options ) {
+
+      <DIV ID="<% $key %>d<% $layer %>"
+           STYLE="<% $layer eq $selected
+                       ? 'display: ""  ; z-index: 1'
+                       : 'display: none; z-index: 0'
+                  %>"
+      >
+
+        <% layer_callback($layer, $layer_fields, $layer_values, $layer_prefix) %>
+
+      </DIV>
+
+%   }
+
+% }
+<%once>
+
+my $conf = new FS::Conf;
+my $money_char = $conf->config('money_char') || '$';
+
+</%once>
+<%init>
+
+my %opt = @_;
+
+#use Data::Dumper;
+#warn Dumper(%opt);
+
+my $key = $opt{field}; # || 'generate_one' #?
+
+tie my %options, 'Tie::IxHash',
+   map { $_ => $opt{'labels'}->{$_} }
+       @{ $opt{'options'} }; #just arrayref for now
+
+my $between = exists($opt{html_between}) ? $opt{html_between} : '';
+my $options = \%options;
+
+my $selected = exists($opt{curr_value}) ? $opt{curr_value} : '';
+
+#XXX eek.  also eek $layer_fields in the layer_callback() call...
+my $layer_fields = $opt{layer_fields};
+my $layer_values = $opt{layer_values};
+my $layer_prefix = $opt{layer_prefix};
+
+sub layer_callback {
+  my( $layer, $layer_fields, $layer_values, $layer_prefix ) = @_;
+
+  return  '' unless $layer && exists $layer_fields->{$layer};
+  tie my %fields, 'Tie::IxHash', @{ $layer_fields->{$layer} };
+
+  #XXX this should become an element itself... (false laziness w/edit.html)
+  # but at least all the elements inside are the shared mason elements now
+
+  return '' unless keys %fields;
+  my $html = "<TABLE>";
+
+  foreach my $field ( keys %fields ) {
+
+    my $lf = ref($fields{$field})
+               ? $fields{$field}
+               : { 'label'=>$fields{$field} };
+
+    my $value = $layer_values->{$layer}{$field};
+
+    my $type = $lf->{type} || 'text';
+
+    my $include = $type;
+    $include = "input-$include" if $include =~ /^(text|money)$/;
+    $include = "tr-$include" unless $include eq 'hidden';
+
+    $html .= include( "/elements/$include.html",
+                        %$lf,
+                        'field'      => "$layer_prefix$field",
+                        'id'         => "$layer_prefix$field", #separate?
+                        #don't want field0_label0...?
+                        'label_id'   => $layer_prefix.$field."_label",
+
+                        'value'      => ( $lf->{'value'} || $value ), #hmm.
+                        'curr_value' => $value,
+                    );
+
+  }
+  $html .= '</TABLE>';
+  return $html;
+}
+
+</%init>
diff --git a/httemplate/elements/table-grid.html b/httemplate/elements/table-grid.html
index 0f532e86b..e1e6c36dc 100644
--- a/httemplate/elements/table-grid.html
+++ b/httemplate/elements/table-grid.html
@@ -1,10 +1,3 @@
-%
-%  my %opt = @_;
-%  $opt{cellspacing} ||= 0;
-%  $opt{cellpadding} ||= 0;
-%
-%
-
 <STYLE TYPE="text/css">
 
 .grid table { border: solid; empty-cells: show }
@@ -17,5 +10,16 @@
 
 </STYLE>
 
-<TABLE CLASS="grid" CELLSPACING=<% $opt{cellspacing} %> CELLPADDING=<% $opt{cellpadding} %> BORDER=1 BORDERCOLOR="#000000" STYLE="border: solid 1px black; empty-cells: show">
+<TABLE CLASS="grid" CELLSPACING=<% $opt{cellspacing} %> CELLPADDING=<% $opt{cellpadding} %> BORDER=1 BORDERCOLOR="#000000" <% $opt{bgcolor} %> STYLE="border: solid 1px black; empty-cells: show">
+
+<%init>
+
+my %opt = @_;
+$opt{cellspacing} ||= 0;
+$opt{cellpadding} ||= 0;
+
+$opt{bgcolor} =~ s/^#//;
+$opt{bgcolor} = 'BGCOLOR="#'. $opt{bgcolor}. '"' if length($opt{bgcolor});
+
+</%init>
 
diff --git a/httemplate/elements/tr-checkbox-multiple.html b/httemplate/elements/tr-checkbox-multiple.html
new file mode 100644
index 000000000..bb90a820b
--- /dev/null
+++ b/httemplate/elements/tr-checkbox-multiple.html
@@ -0,0 +1,40 @@
+<% include('tr-td-label.html', @_ ) %>
+
+  <TD <% $style %>>
+
+%   foreach my $option ( @{ $opt{options} } ) { #just arrayref for now
+
+      <INPUT TYPE  = "checkbox"
+             NAME  = "<% $opt{field} %>"
+             ID    = "<% $opt{id}.'_'.$option %>"
+             VALUE = "<% $option %>"
+             <% ref($value) && $value->{$option} || $value eq $option
+                  ? ' CHECKED' : ''
+             %>
+             <% $onchange %>
+
+      > <% $labels->{$option} %>
+
+      <BR>
+
+%   }
+
+  </TD>
+
+</TR>
+
+<%init>
+
+my %opt = @_;
+
+my $onchange = $opt{'onchange'}
+                 ? 'onChange="'. $opt{'onchange'}. '(this)"'
+                 : '';
+
+my $value = $opt{'curr_value'} || $opt{'value'};
+
+my $labels = $opt{'option_labels'} || $opt{'labels'};
+
+my $style = $opt{'cell_style'} ? 'STYLE="'. $opt{'cell_style'}. '"' : '';
+
+</%init>
diff --git a/httemplate/elements/tr-checkbox.html b/httemplate/elements/tr-checkbox.html
new file mode 100644
index 000000000..2e6d1f107
--- /dev/null
+++ b/httemplate/elements/tr-checkbox.html
@@ -0,0 +1,25 @@
+<% include('tr-td-label.html', @_ ) %>
+
+  <TD <% $style %>>
+    <INPUT TYPE  = "checkbox"
+           NAME  = "<% $opt{field} %>"
+           ID    = "<% $opt{id} %>"
+           VALUE = "<% $opt{value} %>"
+           <% $opt{curr_value} eq $opt{value} ? ' CHECKED' : '' %>
+           <% $onchange %>
+    >
+  </TD>
+
+</TR>
+
+<%init>
+
+my %opt = @_;
+
+my $onchange = $opt{'onchange'}
+                 ? 'onChange="'. $opt{'onchange'}. '(this)"'
+                 : '';
+
+my $style = $opt{'cell_style'} ? 'STYLE="'. $opt{'cell_style'}. '"' : '';
+
+</%init>
diff --git a/httemplate/elements/tr-fixed.html b/httemplate/elements/tr-fixed.html
new file mode 100644
index 000000000..ac0dc8db6
--- /dev/null
+++ b/httemplate/elements/tr-fixed.html
@@ -0,0 +1,15 @@
+<% include('tr-td-label.html', @_ ) %>
+
+  <TD BGCOLOR="#dddddd" <% $style %>><% $opt{'value'} %></TD>
+
+</TR>
+
+<% include('hidden.html', %opt ) %>
+
+<%init>
+
+my %opt = @_;
+
+my $style = $opt{'cell_style'} ? 'STYLE="'. $opt{'cell_style'}. '"' : '';
+
+</%init>
diff --git a/httemplate/elements/tr-freq.html b/httemplate/elements/tr-freq.html
new file mode 100644
index 000000000..cb58bf6b5
--- /dev/null
+++ b/httemplate/elements/tr-freq.html
@@ -0,0 +1,54 @@
+<% include('tr-td-label.html', @_) %>
+
+  <TD <% $style %>>
+
+    <INPUT TYPE  = "text"
+           SIZE  = "<% $opt{'size'} || 4 %>"
+           NAME  = "<% $opt{'field'} || 'freq' %>"
+           ID    = "<% $opt{'id'} %>"
+           VALUE = "<% $curr_value %>"
+    >
+
+    <SELECT NAME = "<% $opt{'field'} || 'freq' %>_units">
+%     foreach my $freq ( keys %freq ) {
+        <OPTION VALUE="<% $freq %>"
+                <% $freq eq $units ? 'SELECTED' : '' %>
+        ><% $freq{$freq} %>
+%     }
+    </SELECT>
+
+  </TD>
+
+</TR>
+
+<%once>
+
+  tie my %freq, 'Tie::IxHash',
+    #'y' => 'years',
+    'm' => 'months',
+    'w' => 'weeks',
+    'd' => 'days',
+    'h' => 'hours',
+  ;
+
+</%once>
+<%init>
+
+my %opt = @_;
+
+my $onchange = $opt{'onchange'}
+                 ? 'onChange="'. $opt{'onchange'}. '(this)"'
+                 : '';
+
+my $style = $opt{'cell_style'} ? 'STYLE="'. $opt{'cell_style'}. '"' : '';
+
+my $curr_value = $opt{'curr_value'} || $opt{'value'};
+my $units = 'm';
+
+if ( $curr_value =~ /^(\d*)([mwdh])$/i ) {
+  $curr_value = $1;
+  $units = lc($2);
+}
+
+</%init>
+
diff --git a/httemplate/elements/tr-input-money.html b/httemplate/elements/tr-input-money.html
new file mode 100644
index 000000000..88014192d
--- /dev/null
+++ b/httemplate/elements/tr-input-money.html
@@ -0,0 +1,13 @@
+<% include('tr-input-text.html', @_,
+             'type'   => 'text',
+             'prefix' => $money_char,
+             'size'   => 8,
+          )
+%>
+<%once>
+
+my $conf = new FS::Conf;
+my $money_char = $conf->config('money_char') || '$';
+
+</%once>
+
diff --git a/httemplate/elements/tr-input-text.html b/httemplate/elements/tr-input-text.html
new file mode 100644
index 000000000..ac21cb577
--- /dev/null
+++ b/httemplate/elements/tr-input-text.html
@@ -0,0 +1,31 @@
+<% include('tr-td-label.html', @_ ) %>
+
+  <TD <% $style %>>
+
+    <% $opt{'prefix'} %><INPUT TYPE  = "<% $opt{type} || 'text' %>"
+                               NAME  = "<% $opt{field} %>"
+                               ID    = "<% $opt{id} %>"
+                               VALUE = "<% $opt{curr_value} || $opt{value} %>"
+                               <% $size %>
+                               <% $onchange %>
+                        >
+
+  </TD>
+
+</TR>
+
+<%init>
+
+my %opt = @_;
+
+my $onchange = $opt{'onchange'}
+                 ? 'onChange="'. $opt{'onchange'}. '(this)"'
+                 : '';
+
+my $size = $opt{'size'}
+             ? 'SIZE="'. $opt{'size'}. '"'
+             : '';
+
+my $style = $opt{'cell_style'} ? 'STYLE="'. $opt{'cell_style'}. '"' : '';
+
+</%init>
diff --git a/httemplate/elements/tr-password.html b/httemplate/elements/tr-password.html
new file mode 100644
index 000000000..bbc624d8c
--- /dev/null
+++ b/httemplate/elements/tr-password.html
@@ -0,0 +1,4 @@
+<% include('tr-input-text.html', @_,
+             'type'   => 'password',
+          )
+%>
diff --git a/httemplate/elements/tr-select-agent.html b/httemplate/elements/tr-select-agent.html
index 37b1c1e88..69cd95cb0 100644
--- a/httemplate/elements/tr-select-agent.html
+++ b/httemplate/elements/tr-select-agent.html
@@ -1,34 +1,37 @@
-%
-%  my( $agentnum, %opt ) = @_;
-%
-%  my @agents;
-%  if ( $opt{'agents'} ) {
-%    #@agents = @{ $opt{'agents'} };
-%    #here is the agent virtualization
-%    my $agentnums_href = $FS::CurrentUser::CurrentUser->agentnums_href;
-%    @agents = grep $agentnums_href->{$_->agentnum}, @{ $opt{'agents'} };
-%    delete $opt{'agents'};
-%  } else {
-%    @agents = $FS::CurrentUser::CurrentUser->agents;
-%  }
-%
-%
 % if ( scalar(@agents) == 1 ) { 
 
+  <INPUT TYPE="hidden" NAME="<% $opt{'field'} || 'agentnum' %>" VALUE="<% $agents[0]->agentnum %>">
 
-  <INPUT TYPE="hidden" NAME="agentnum" VALUE="<% $agents[0]->agentnum %>">
 % } else { 
 
-
   <TR>
     <TD ALIGN="right"><% $opt{'label'} || 'Agent' %></TD>
     <TD>
-      <% include( '/elements/select-agent.html', $agentnum,
-                     'agents' => \@agents,
+      <% include( '/elements/select-agent.html',
+                     'curr_value' => $agentnum,
+                     'agents'     => \@agents,
                      %opt,
                  )
       %>
     </TD>
   </TR>
+
 % } 
 
+<%init>
+
+my %opt = @_;
+my $agentnum = $opt{'curr_value'} || $opt{'value'};
+
+my @agents;
+if ( $opt{'agents'} ) {
+  #@agents = @{ $opt{'agents'} };
+  #here is the agent virtualization
+  my $agentnums_href = $FS::CurrentUser::CurrentUser->agentnums_href;
+  @agents = grep $agentnums_href->{$_->agentnum}, @{ $opt{'agents'} };
+  delete $opt{'agents'};
+} else {
+  @agents = $FS::CurrentUser::CurrentUser->agents;
+}
+
+</%init>
diff --git a/httemplate/elements/tr-select-agent_type.html b/httemplate/elements/tr-select-agent_type.html
new file mode 100644
index 000000000..1b0dfd445
--- /dev/null
+++ b/httemplate/elements/tr-select-agent_type.html
@@ -0,0 +1,39 @@
+% if ( scalar(@agent_types) == 1 ) { 
+
+  <INPUT TYPE="hidden" NAME="<% $opt{'field'} || 'typenum' %>" VALUE="<% $agent_types[0]->typenum %>">
+
+% } else { 
+
+  <TR>
+    <TD ALIGN="right"><% $opt{'label'} || 'Agent Type' %></TD>
+    <TD>
+      <% include( '/elements/select-agent_type.html',
+                     'curr_value'  => $typenum,
+                     'agent_types' => \@agent_types,
+                     %opt,
+                 )
+      %>
+    </TD>
+  </TR>
+
+% } 
+
+<%init>
+
+my %opt = @_;
+my $typenum = $opt{'curr_value'} || $opt{'value'};
+
+my @agent_types = ();
+if ( $opt{'agent_types'} ) {
+  #@agents = @{ $opt{'agents'} };
+
+  #here is the agent virtualization
+#  my $agentnums_href = $FS::CurrentUser::CurrentUser->agentnums_href;
+#  @agent_types = grep $agentnums_href->{$_->agentnum}, @{ $opt{'agent_types'} };
+
+  delete $opt{'agent_types'};
+} else {
+#  @agents = $FS::CurrentUser::CurrentUser->agents;
+}
+
+</%init>
diff --git a/httemplate/elements/tr-select-cust_main-status.html b/httemplate/elements/tr-select-cust_main-status.html
new file mode 100644
index 000000000..6700d7ed9
--- /dev/null
+++ b/httemplate/elements/tr-select-cust_main-status.html
@@ -0,0 +1,29 @@
+<% include ('tr-td-label.html', @_ ) %>
+
+  <TD <% $style %>>
+
+    <% include( '/elements/select-cust_main-status.html', 
+                  'curr_value' => $curr_value,
+                  %opt
+              )
+    %>
+
+  </TD>
+
+</TR>
+
+<%init>
+
+my %opt = @_;
+
+#my $onchange = $opt{'onchange'}
+#                 ? 'onChange="'. $opt{'onchange'}. '(this)"'
+#                 : '';
+
+my $style = $opt{'cell_style'} ? 'STYLE="'. $opt{'cell_style'}. '"' : '';
+
+$opt{'statuses'} ||= [ FS::cust_main->statuses() ]; # { disabled=>'' } )
+
+my $curr_value = $opt{'curr_value'} || $opt{'value'};
+
+</%init>
diff --git a/httemplate/elements/tr-select-cust_pkg-status.html b/httemplate/elements/tr-select-cust_pkg-status.html
index 22ee146cd..c3daf728c 100644
--- a/httemplate/elements/tr-select-cust_pkg-status.html
+++ b/httemplate/elements/tr-select-cust_pkg-status.html
@@ -1,14 +1,29 @@
-%
-%  my( $status, %opt ) = @_;
-%
-%  $opt{'statuses'} ||= [ FS::cust_pkg->statuses() ]; # { disabled=>'' } )
-%
-%
-
-
-<TR>
-  <TD ALIGN="right"><% $opt{'label'} || 'Status' %></TD>
-  <TD>
-    <% include( '/elements/select-cust_pkg-status.html', $status, %opt ) %>
+<% include ('tr-td-label.html', @_ ) %>
+
+  <TD <% $style %>>
+
+    <% include( '/elements/select-cust_pkg-status.html', 
+                  'curr_value' => $curr_value,
+                  %opt
+              )
+    %>
+
   </TD>
+
 </TR>
+
+<%init>
+
+my %opt = @_;
+
+#my $onchange = $opt{'onchange'}
+#                 ? 'onChange="'. $opt{'onchange'}. '(this)"'
+#                 : '';
+
+my $style = $opt{'cell_style'} ? 'STYLE="'. $opt{'cell_style'}. '"' : '';
+
+$opt{'statuses'} ||= [ FS::cust_pkg->statuses() ]; # { disabled=>'' } )
+
+my $curr_value = $opt{'curr_value'} || $opt{'value'};
+
+</%init>
diff --git a/httemplate/elements/tr-select-invoice_template.html b/httemplate/elements/tr-select-invoice_template.html
new file mode 100644
index 000000000..7ba8d9907
--- /dev/null
+++ b/httemplate/elements/tr-select-invoice_template.html
@@ -0,0 +1,39 @@
+<% include('tr-td-label.html', @_) %>
+
+  <TD <% $style %>>
+
+    <SELECT NAME = "<% $opt{'field'} || 'templatename' %>"
+            ID   = "<% $opt{'id'} %>"
+    >
+
+%     foreach my $templatename ( '', @templatenames ) {
+            
+        <OPTION VALUE="<% $templatename %>"
+                <% $templatename eq $curr_value ? 'SELECTED' : '' %>
+        ><% $templatename || '(Default)' %>
+
+%     }
+
+    </SELECT>
+
+  </TD>
+
+</TR>
+
+<%init>
+
+my %opt = @_;
+
+my $onchange = $opt{'onchange'}
+                 ? 'onChange="'. $opt{'onchange'}. '(this)"'
+                 : '';
+
+my $style = $opt{'cell_style'} ? 'STYLE="'. $opt{'cell_style'}. '"' : '';
+
+my $curr_value = $opt{'curr_value'} || $opt{'value'};
+
+my $conf = new FS::Conf;
+
+my @templatenames = $conf->invoice_templatenames;
+
+</%init>
diff --git a/httemplate/elements/tr-select-part_pkg.html b/httemplate/elements/tr-select-part_pkg.html
new file mode 100644
index 000000000..b6d4d4d9e
--- /dev/null
+++ b/httemplate/elements/tr-select-part_pkg.html
@@ -0,0 +1,29 @@
+% if ( scalar(@{ $opt{'part_pkg'} }) == 0 ) { 
+
+  <INPUT TYPE="hidden" NAME="<% $opt{'field'} || 'pkgpart' %>" VALUE="">
+
+% } else { 
+
+  <TR>
+    <TD ALIGN="right"><% $opt{'label'} || 'Package definition' %></TD>
+    <TD>
+      <% include( '/elements/select-table.html',
+                    'table'     => 'part_pkg',
+                    'name_col'  => 'pkg',
+                    'multiple'  => 1,
+                    #N/A 'empty_label' => '(none)',
+                    %opt,
+                )
+      %>
+    </TD>
+  </TR>
+
+% } 
+
+<%init>
+
+my( %opt ) = @_;
+
+$opt{'part_pkg'} ||= [ qsearch( 'part_pkg', {} ) ]; # { disabled=>'' } )
+
+</%init>
diff --git a/httemplate/elements/tr-select-part_referral.html b/httemplate/elements/tr-select-part_referral.html
index 35c5b8047..cd26c254d 100644
--- a/httemplate/elements/tr-select-part_referral.html
+++ b/httemplate/elements/tr-select-part_referral.html
@@ -1,30 +1,35 @@
-%
-%  my( $refnum, %opt ) = @_;
-%
-%  $opt{'part_referrals'} ||=
-%    [ FS::part_referral->all_part_referral( 1 ) ]; #1: include global
-%
-%  my $r = qq!<font color="#ff0000">*</font> !;
-%
-%
 % if ( scalar( @{$opt{'part_referrals'}} ) == 0 ) {
 %     eidiot "You have not created any advertising sources.  You must create at least one advertising source before adding a customer.  Go to ". popurl(2). "browse/part_referral.html and create one or more advertising sources.";
 %   } elsif ( scalar( @{$opt{'part_referrals'}} ) == 1 ) {
-%
 
+     <INPUT TYPE="hidden" NAME="<% $opt{'element_name'} || $opt{'field'} || 'refnum' %>" VALUE="<% $opt{'part_referrals'}->[0]->refnum %>">
 
-     <INPUT TYPE="hidden" NAME="refnum" VALUE="<% $opt{'part_referrals'}->[0]->refnum %>">
 % } else { 
 
-
      <TR>
-       <TH ALIGN="right"><%$r%>Advertising source</TH>
+%      if ( $opt{'label'} ) {
+         <TD ALIGN="right"><% $opt{'label'} %></TD>
+%      } else {
+         <TH ALIGN="right"><%$r%>Advertising source</TH>
+%      }
        <TD>
-         <% include( '/elements/select-part_referral.html', $refnum,
-                        'part_referrals' => $opt{'part_referrals'},
-                    )
+         <% include( '/elements/select-part_referral.html',
+                       'curr_value' => $refnum,
+                       %opt
+                   )
          %>
        </TD>
      </TR>
+
 % } 
+<%init>
+
+my %opt = @_;
+my $refnum = $opt{'curr_value'} || $opt{'value'};
+
+$opt{'part_referrals'} ||=
+  [ FS::part_referral->all_part_referral( 1 ) ]; #1: include global
+
+my $r = qq!<font color="#ff0000">*</font> !;
 
+</%init>
diff --git a/httemplate/elements/tr-select-pkg_class.html b/httemplate/elements/tr-select-pkg_class.html
index 542142466..aa2760996 100644
--- a/httemplate/elements/tr-select-pkg_class.html
+++ b/httemplate/elements/tr-select-pkg_class.html
@@ -1,20 +1,27 @@
-%  my( $classnum, %opt ) = @_;
-%
-%  $opt{'pkg_class'} ||= [ qsearch( 'pkg_class', { disabled=>'' } ) ];
-%
-%  #warn "***** tr-select-pkg-class: \n". Dumper(%opt);
-%
 % if ( scalar(@{ $opt{'pkg_class'} }) == 0 ) { 
 
-  <INPUT TYPE="hidden" NAME="classnum" VALUE="">
+  <INPUT TYPE="hidden" NAME="<% $opt{'field'} || 'classnum' %>" VALUE="">
 
 % } else { 
 
   <TR>
     <TD ALIGN="right"><% $opt{'label'} || 'Package class' %></TD>
     <TD>
-      <% include( '/elements/select-pkg_class.html', $classnum, %opt ) %>
+      <% include( '/elements/select-pkg_class.html',
+                    'curr_value' => $classnum,
+                    %opt
+                )
+      %>
     </TD>
   </TR>
 
 % } 
+
+<%init>
+
+my %opt = @_;
+my $classnum = $opt{'curr_value'} || $opt{'value'};
+
+$opt{'pkg_class'} ||= [ qsearch( 'pkg_class', {} ) ]; # { disabled=>'' } )
+
+</%init>
diff --git a/httemplate/elements/tr-select-reason.html b/httemplate/elements/tr-select-reason.html
index 2f8f3a109..71997c221 100755
--- a/httemplate/elements/tr-select-reason.html
+++ b/httemplate/elements/tr-select-reason.html
@@ -1,31 +1,30 @@
-
 <SCRIPT TYPE="text/javascript">
-  function sh_add<% $name %>()
+  function sh_add<% $func_suffix %>()
   {
 
-    if (document.getElementById('<% $name %>').selectedIndex == 0){
+    if (document.getElementById('<% $id %>').selectedIndex == 0){
       <% $controlledbutton ? $controlledbutton.'.disabled = true;' : ';' %>
     }else{
       <% $controlledbutton ? $controlledbutton.'.disabled = false;' : ';' %>
     }
 
-%if ($curuser->access_right($access_right)){
+%if ($curuser->access_right($add_access_right)){
 
-    if (document.getElementById('<% $name %>').selectedIndex == 
-         (document.getElementById('<% $name %>').length - 1)) {
-      document.getElementById('new<% $name %>').disabled = false;
-      document.getElementById('new<% $name %>').style.display = 'inline';
-      document.getElementById('new<% $name %>Label').style.display = 'inline';
-      document.getElementById('new<% $name %>T').disabled = false;
-      document.getElementById('new<% $name %>T').style.display = 'inline';
-      document.getElementById('new<% $name %>TLabel').style.display = 'inline';
-    }else{
-      document.getElementById('new<% $name %>').disabled = true;
-      document.getElementById('new<% $name %>').style.display = 'none';
-      document.getElementById('new<% $name %>Label').style.display = 'none';
-      document.getElementById('new<% $name %>T').disabled = true;
-      document.getElementById('new<% $name %>T').style.display = 'none';
-      document.getElementById('new<% $name %>TLabel').style.display = 'none';
+    if (document.getElementById('<% $id %>').selectedIndex == 
+         (document.getElementById('<% $id %>').length - 1)) {
+      document.getElementById('new<% $id %>').disabled = false;
+      document.getElementById('new<% $id %>').style.display = 'inline';
+      document.getElementById('new<% $id %>Label').style.display = 'inline';
+      document.getElementById('new<% $id %>T').disabled = false;
+      document.getElementById('new<% $id %>T').style.display = 'inline';
+      document.getElementById('new<% $id %>TLabel').style.display = 'inline';
+    } else {
+      document.getElementById('new<% $id %>').disabled = true;
+      document.getElementById('new<% $id %>').style.display = 'none';
+      document.getElementById('new<% $id %>Label').style.display = 'none';
+      document.getElementById('new<% $id %>T').disabled = true;
+      document.getElementById('new<% $id %>T').style.display = 'none';
+      document.getElementById('new<% $id %>TLabel').style.display = 'none';
     }
 
 %}
@@ -36,7 +35,7 @@
 <TR>
   <TD ALIGN="right">Reason</TD>
   <TD>
-    <SELECT id="<% $name %>" name="<% $name %>" onFocus="sh_add<% $name %>()" onChange="sh_add<% $name %>()">
+    <SELECT id="<% $id %>" name="<% $name %>" onFocus="sh_add<% $func_suffix %>()" onChange="sh_add<% $func_suffix %>()">
 %    my @reasons = qsearch( { table =>'reason', 
 %                             hashref => {},
 %                             extra_sql => $extra_sql,
@@ -44,9 +43,9 @@
 %			     });
       <OPTION VALUE="" <% ($init_reason eq "") ? 'SELECTED' : '' %>>Select Reason...</OPTION>
 %    foreach my $reason (@reasons) {
-      <OPTION VALUE="<% $reason->reasonnum %>" <% ($init_reason == $reason->reasonnum) ? 'SELECTED' : '' %>><% $reason->reason %></OPTION>
+      <OPTION VALUE="<% $reason->reasonnum %>" <% ($init_reason == $reason->reasonnum) ? 'SELECTED' : '' %>><% $reason->reasontype->type %> : <% $reason->reason %></OPTION>
 %    }
-%    if ($curuser->access_right($access_right)) {
+%    if ($curuser->access_right($add_access_right)) {
       <OPTION VALUE="-1" <% ($init_reason == -1) ? 'SELECTED' : '' %>>Add new reason</OPTION>
 %    }
 %
@@ -56,10 +55,10 @@
 
 <TR>
   <TD ALIGN="right">
-    <P id="new<% $name %>TLabel" style="display:<% $display %>">Reason Type</P>
+    <P id="new<% $id %>TLabel" style="display:<% $display %>">Reason Type</P>
   </TD>
   <TD>
-    <SELECT id="new<% $name %>T" name="new<% $name %>T" disabled="<% $disabled %>" style="display:<% $display %>">
+    <SELECT id="new<% $id %>T" name="new<% $name %>T" "<% $disabled %>" style="display:<% $display %>">
 %     for my $type (qsearch( 'reason_type', { 'class' => $class } )){
         <OPTION VALUE="<% $type->typenum %>" <% ($init_type == $type->typenum) ? 'SELECTED' : '' %>><% $type->type %></OPTION>
 %     }
@@ -69,33 +68,52 @@
 
 <TR>
   <TD ALIGN="right">
-    <P id="new<% $name %>Label" style="display:<% $display %>">New Reason</P>
+    <P id="new<% $id %>Label" style="display:<% $display %>">New Reason</P>
   </TD>
-  <TD><INPUT id="new<% $name %>" name="new<% $name %>" type="text" value="<% $init_newreason %>" disabled="<% $disabled %>" style="display:<% $display %>"></TD>
+  <TD><INPUT id="new<% $id %>" name="new<% $name %>" type="text" value="<% $init_newreason %>" "<% $disabled %>" style="display:<% $display %>"></TD>
 </TR>
 
 <%init>
-my($name, $class, $init_reason, $init_type, $init_newreason, $controlledbutton) = @_;
-my($extra_sql, $curuser, $access_right, $display, $disabled); 
 
+my %opt = @_;
+
+my $name = $opt{'field'};
+my $class = $opt{'reason_class'};
+my $init_reason = $opt{'curr_value'};
+
+my $controlledbutton = $opt{'control_button'};
+
+( my $func_suffix = $name ) =~ s/\./_/g;
+
+my $id = $opt{'id'} || $func_suffix;
+
+my( $add_access_right, $access_right ); 
 if ($class eq 'C') {
-  $access_right='Add on-the-fly cancel reason';
-}elsif ($class eq 'S') {
-  $access_right='Add on-the-fly suspend reason';
-}else{
-  print "illegal class: $class";
+  $access_right = 'Cancel customer';
+  $add_access_right = 'Add on-the-fly cancel reason';
+} elsif ($class eq 'S') {
+  $access_right = 'Suspend customer package';
+  $add_access_right = 'Add on-the-fly suspend reason';
+} else {
+  die "illegal class: $class";
 }
 
-if ($init_reason == -1){
+my( $display, $disabled ) = ( 'none', 'DISABLED' );
+my( $init_type, $init_newreason ) = ( '', '' );
+if ($init_reason == -1 || ref($init_reason) ) {
+
   $display = 'inline';
-  $disabled = 'false';
-}else{
-  $display = 'none';
-  $disabled = 'true';
+  $disabled = '';
+
+  if ( ref($init_reason) ) {
+    $init_type      = $init_reason->{'typenum'};
+    $init_newreason = $init_reason->{'reason'};
+    $init_reason = -1;
+  }
+
 }
 
-$extra_sql = "WHERE class = '$class' ORDER BY reason_type";
-$curuser = $FS::CurrentUser::CurrentUser;
+my $extra_sql = "WHERE class = '$class' ORDER BY reason_type";
+my $curuser = $FS::CurrentUser::CurrentUser;
 
 </%init>
-
diff --git a/httemplate/elements/tr-select-taxclass.html b/httemplate/elements/tr-select-taxclass.html
index 424d5ad02..a20dd17b5 100644
--- a/httemplate/elements/tr-select-taxclass.html
+++ b/httemplate/elements/tr-select-taxclass.html
@@ -2,7 +2,7 @@
 %      || scalar(@{ $opt{'taxclasses'} }) == 0
 % ) { 
 
-  <INPUT TYPE="hidden" NAME="taxclass" VALUE="<% $taxclass %>">
+  <INPUT TYPE="hidden" NAME=""<% $opt{'element_name'} || $opt{'field'} || 'taxclass' %>" VALUE="<% $taxclass %>">
 
 % } else { 
 
diff --git a/httemplate/elements/tr-select.html b/httemplate/elements/tr-select.html
new file mode 100644
index 000000000..07b0a01d5
--- /dev/null
+++ b/httemplate/elements/tr-select.html
@@ -0,0 +1,61 @@
+<% include('tr-td-label.html', @_ ) %>
+
+  <TD <% $style %>>
+
+    <SELECT NAME          = "<% $opt{field} %>"
+            ID            = "<% $opt{id} %>"
+            previousValue = "<% $curr_value %>"
+            previousText  = "<% $labels->{$curr_value} || $curr_value %>"
+            <% $onchange %>
+    >
+
+%   if ( $opt{options} ) {
+%
+%     foreach my $option ( @{ $opt{options} } ) { #just arrayref for now
+
+        <OPTION VALUE="<% $option %>"
+                <% $opt{curr_value} eq $option ? 'SELECTED' : '' %>
+        >
+          <% $labels->{$option} || $option %>
+        </OPTION>
+
+%     }
+%
+%   } else { #deprecated weird value hashref used only by reason.html
+%
+%     my $aref = $opt{'value'}->{'values'};
+%     my $vkey = $opt{'value'}->{'vcolumn'};
+%     my $ckey = $opt{'value'}->{'ccolumn'};
+%     foreach my $v (@$aref) {
+
+        <OPTION VALUE="<% $v->$vkey %>"
+                <% ($opt{curr_value} eq $v->$vkey) ? 'SELECTED' : '' %>
+        >
+          <% $v->$ckey %>
+        </OPTION>
+
+%     }
+%
+%   }
+
+    </SELECT>
+
+  </TD>
+
+</TR>
+
+<%init>
+
+my %opt = @_;
+
+my $onchange = $opt{'onchange'}
+                 ? 'onChange="'. $opt{'onchange'}. '(this)"'
+                 : '';
+
+my $labels = $opt{'option_labels'} || $opt{'labels'};
+
+my $style = $opt{'cell_style'} ? 'STYLE="'. $opt{'cell_style'}. '"' : '';
+
+my $curr_value = $opt{'curr_value'};
+
+</%init>
diff --git a/httemplate/elements/tr-selectlayers.html b/httemplate/elements/tr-selectlayers.html
new file mode 100644
index 000000000..865d8226a
--- /dev/null
+++ b/httemplate/elements/tr-selectlayers.html
@@ -0,0 +1,25 @@
+% unless ( $opt{js_only} ) {
+
+  <% include('tr-td-label.html', @_ ) %>
+
+    <TD <% $style %>>
+
+% }
+
+      <% include('selectlayers.html', @_ ) %>
+
+% unless ( $opt{js_only} ) {
+
+    </TD>
+
+  </TR>
+
+% }
+
+<%init>
+
+my %opt = @_;
+
+my $style = $opt{'cell_style'} ? 'STYLE="'. $opt{'cell_style'}. '"' : '';
+
+</%init>
diff --git a/httemplate/elements/tr-selectmultiple-part_pkg.html b/httemplate/elements/tr-selectmultiple-part_pkg.html
index bd96d1c3a..455038da9 100644
--- a/httemplate/elements/tr-selectmultiple-part_pkg.html
+++ b/httemplate/elements/tr-selectmultiple-part_pkg.html
@@ -1,8 +1,3 @@
-%
-%  my( %opt ) = @_;
-%
-
-
 <TR>
   <TD ALIGN="right"><% $opt{'label'} || 'Packages' %></TD>
   <TD>
@@ -17,3 +12,9 @@
     %>
   </TD>
 </TR>
+
+<%init>
+
+my %opt = @_;
+
+</%init>
diff --git a/httemplate/elements/tr-td-label.html b/httemplate/elements/tr-td-label.html
new file mode 100644
index 000000000..77c048405
--- /dev/null
+++ b/httemplate/elements/tr-td-label.html
@@ -0,0 +1,17 @@
+<TR>
+
+  <TD ALIGN="right" VALIGN="top" STYLE="<% $style %>" ID="<% $opt{label_id} || $opt{id}. '_label0' %>">
+
+    <% $opt{label} %>
+
+  </TD>
+
+<%init>
+
+my %opt = @_;
+
+my $style = 'padding-top: 3px';
+$style .= '; '. $opt{'cell_style'}
+  if $opt{'cell_style'};
+
+</%init>
diff --git a/httemplate/elements/tr-title.html b/httemplate/elements/tr-title.html
new file mode 100644
index 000000000..6e2f58f6a
--- /dev/null
+++ b/httemplate/elements/tr-title.html
@@ -0,0 +1,15 @@
+<TR>
+  <TD BGCOLOR="#e8e8e8" COLSPAN=2> </TD>
+</TR>
+
+<TR>
+  <TH BGCOLOR="#e8e8e8" COLSPAN=2 ALIGN="left">
+    <FONT SIZE="+1"><% $opt{value} %></FONT>
+  </TH>
+</TR>
+
+<%init>
+
+my %opt = @_;
+
+</%init>
diff --git a/httemplate/graph/report_cust_bill_pkg.html b/httemplate/graph/report_cust_bill_pkg.html
index c18e94d5d..be5a71a7a 100644
--- a/httemplate/graph/report_cust_bill_pkg.html
+++ b/httemplate/graph/report_cust_bill_pkg.html
@@ -8,7 +8,7 @@
 
 <% include('/elements/tr-select-agent.html', '', 'label' => 'For agent: ' ) %>
 
-<% include('/elements/tr-select-pkg_class.html', '',
+<% include('/elements/tr-select-pkg_class.html',
               'pre_options' => [ '0' => 'all' ],
               'empty_label' => '(empty class)',
            )
diff --git a/httemplate/graph/report_money_time.html b/httemplate/graph/report_money_time.html
index 652d7152e..04e4c19b2 100644
--- a/httemplate/graph/report_money_time.html
+++ b/httemplate/graph/report_money_time.html
@@ -18,7 +18,7 @@
 
 <% include('/elements/tr-select-from_to.html' ) %>
 
-<% include('/elements/tr-select-agent.html', '', 'label' => 'For agent: ' ) %>
+<% include('/elements/tr-select-agent.html', 'label' => 'For agent: ' ) %>
 
 <TR>
   <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="12mo" VALUE="1"></TD>
diff --git a/httemplate/misc/cancel_cust.html b/httemplate/misc/cancel_cust.html
new file mode 100644
index 000000000..a757aa6e3
--- /dev/null
+++ b/httemplate/misc/cancel_cust.html
@@ -0,0 +1,75 @@
+<% include('/elements/header-popup.html', 'Cancel customer' ) %>
+
+% if ( $cgi->param('error') ) { 
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <% $cgi->param('error') %></FONT>
+  <BR><BR>
+% } 
+
+<FORM NAME="cust_cancel_popup" ACTION="<% popurl(1) %>cust_main-cancel.cgi" METHOD=POST>
+<INPUT TYPE="hidden" NAME="custnum" VALUE="<% $custnum %>">
+
+
+ <P ALIGN="center"><B>Permanently delete all services and cancel this customer?</B>
+
+ <% $ban %>
+ 
+<BR><BR>
+
+<% ntable("#cccccc", 2) %>
+
+<% include('/elements/tr-select-reason.html',
+             'field'          => 'reasonnum',
+             'reason_class'   => 'C',
+             #XXX these need to be sticky on errors too...
+             #'curr_value'     => '',
+             'control_button' => 'document.cust_cancel_popup.submit',
+          )
+%>
+
+</TABLE>
+
+<BR>
+<P ALIGN="CENTER">
+<INPUT TYPE="submit" NAME="submit" VALUE="Cancel customer" disabled='true'>         <INPUT TYPE="BUTTON" VALUE="Don't cancel" onClick="parent.cClick();"> 
+
+</FORM>
+</BODY>
+</HTML>
+
+<%init>
+
+my($custnum, $reasonnum, $submit, $cust_main, $curuser, $class); 
+if ( $cgi->param('error') ) {
+  $custnum        = $cgi->param('custnum');
+  $reasonnum     = $cgi->param('reasonnum');
+} else {
+  my( $query ) = $cgi->keywords;
+  if ( $query =~ /^(\d+)$/ ) {
+    $custnum  = $1;
+  } else {
+    die "illegal query ". $cgi->keywords;
+  }
+}
+
+$curuser = $FS::CurrentUser::CurrentUser;
+
+$cust_main = qsearchs( {
+  'table'     => 'cust_main',
+  'hashref'   => { 'custnum' => $custnum },
+  'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+} );
+die "No customer # $custnum" unless $cust_main;
+
+my $ban = '';
+if ( $cust_main->payby =~ /^(CARD|DCRD|CHEK|DCHK)$/ ) {
+  $ban = '<BR><P ALIGN="center">'.
+         '<INPUT TYPE="checkbox" NAME="ban" VALUE="1"> Ban this customer\'s ';
+  if ( $cust_main->payby =~ /^(CARD|DCRD)$/ ) {
+    $ban .= 'credit card';
+  } elsif (  $cust_main->payby =~ /^(CHEK|DCHK)$/ ) {
+    $ban .= 'ACH account';
+  }
+}
+
+</%init>
+
diff --git a/httemplate/misc/cancel_pkg.html b/httemplate/misc/cancel_pkg.html
index b085d2281..642f0c83e 100755
--- a/httemplate/misc/cancel_pkg.html
+++ b/httemplate/misc/cancel_pkg.html
@@ -42,7 +42,14 @@
 %}
 %
 
-<% include('/elements/tr-select-reason.html', 'reasonnum', $class, '', '', '', 'document.sc_popup.submit' ) %>
+<% include('/elements/tr-select-reason.html',
+             'field'          => 'reasonnum',
+             'reason_class'   => $class,
+             #XXX these need to be sticky on errors too...
+             #'curr_value'     => '',
+             'control_button' => 'document.sc_popup.submit',
+          )
+%>
 
 </TABLE>
 
diff --git a/httemplate/misc/cust_main-cancel.cgi b/httemplate/misc/cust_main-cancel.cgi
index d29e4f5fc..2f9c38004 100755
--- a/httemplate/misc/cust_main-cancel.cgi
+++ b/httemplate/misc/cust_main-cancel.cgi
@@ -1,23 +1,54 @@
-%
-%
-%my $custnum;
-%my $ban = '';
-%if ( $cgi->param('custnum') =~ /^(\d+)$/ ) {
-%  $custnum = $1;
-%  $ban = $cgi->param('ban');
-%} else {
-%  my($query) = $cgi->keywords;
-%  $query =~ /^(\d+)$/ || die "Illegal custnum";
-%  $custnum = $1;
-%}
-%
-%my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
-%
-%my @errors = $cust_main->cancel( 'ban' => $ban );
-%eidiot(join(' / ', @errors)) if scalar(@errors);
-%
-%#print $cgi->redirect($p. "view/cust_main.cgi?". $cust_main->custnum);
-%print $cgi->redirect($p);
-%
-%
+<% header("Customer cancelled") %>
+  <SCRIPT TYPE="text/javascript">
+    window.top.location.reload();
+  </SCRIPT>
+  </BODY>
+</HTML>
+<%init>
 
+my $custnum;
+my $ban = '';
+if ( $cgi->param('custnum') =~ /^(\d+)$/ ) {
+  $custnum = $1;
+  $ban = $cgi->param('ban');
+} else {
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/ || die "Illegal custnum";
+  $custnum = $1;
+}
+
+#false laziness w/process/cancel_pkg.html
+
+#untaint reasonnum
+my $reasonnum = $cgi->param('reasonnum');
+$reasonnum =~ /^(-?\d+)$/ || die "Illegal reasonnum";
+$reasonnum = $1;
+
+if ($reasonnum == -1) {
+  $reasonnum = {
+    'typenum' => scalar( $cgi->param('newreasonnumT') ),
+    'reason'  => scalar( $cgi->param('newreasonnum' ) ),
+  };
+}
+
+#eslaf
+
+my $cust_main = qsearchs( {
+  'table'     => 'cust_main',
+  'hashref'   => { 'custnum' => $custnum },
+  'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+} );
+
+warn "cancelling $cust_main";
+my @errors = $cust_main->cancel(
+  'ban'    => $ban,
+  'reason' => $reasonnum,
+);
+my $error = join(' / ', @errors) if scalar(@errors);
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "cancel_pkg.html?". $cgi->query_string );
+}
+
+</%init>
diff --git a/httemplate/misc/cust_main-import.cgi b/httemplate/misc/cust_main-import.cgi
index 73efd3705..b273a80aa 100644
--- a/httemplate/misc/cust_main-import.cgi
+++ b/httemplate/misc/cust_main-import.cgi
@@ -24,7 +24,8 @@ target table.
 
 <% &ntable("#cccccc") %>
 
-<% include('/elements/tr-select-agent.html', '', #$agentnum,
+<% include('/elements/tr-select-agent.html',
+              #'curr_value' => '', #$agentnum,
               'label'       => "<B>Agent</B>",
               'empty_label' => 'Select agent',
            )
diff --git a/httemplate/misc/email_events.cgi b/httemplate/misc/email_events.cgi
new file mode 100644
index 000000000..c6efa7dc9
--- /dev/null
+++ b/httemplate/misc/email_events.cgi
@@ -0,0 +1,4 @@
+%
+%my $server = new FS::UI::Web::JSRPC 'FS::cust_event::process_reemail', $cgi;
+%
+<% $server->process %>
diff --git a/httemplate/misc/fax_events.cgi b/httemplate/misc/fax_events.cgi
new file mode 100644
index 000000000..bf5ddd138
--- /dev/null
+++ b/httemplate/misc/fax_events.cgi
@@ -0,0 +1,4 @@
+% 
+%my $server = new FS::UI::Web::JSRPC 'FS::cust_event::process_refax', $cgi;
+%
+<% $server->process %>
diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html
new file mode 100644
index 000000000..c81f5b06f
--- /dev/null
+++ b/httemplate/misc/order_pkg.html
@@ -0,0 +1,67 @@
+<% include('/elements/header-popup.html', 'Order new package' ) %>
+
+<SCRIPT TYPE="text/javascript">
+function enable_order_pkg () {
+  if ( document.OrderPkgForm.pkgpart.selectedIndex > 0 ) {
+    document.OrderPkgForm.submit.disabled = false;
+  } else {
+    document.OrderPkgForm.submit.disabled = true;
+  }
+}
+</SCRIPT>
+
+<FORM NAME="OrderPkgForm" ACTION="<% $p %>edit/process/quick-cust_pkg.cgi" METHOD="POST">
+
+<INPUT TYPE="hidden" NAME="custnum" VALUE="<% $cust_main->custnum %>">
+
+<% ntable("#cccccc", 2) %>
+<TR>
+  <TH ALIGN="right">Package</TH>
+  <TD>
+    <SELECT NAME="pkgpart" onChange="enable_order_pkg()"><OPTION>Select package
+
+%foreach my $part_pkg (
+%  qsearch( 'part_pkg', { 'disabled' => '' }, '',
+%           ' AND 0 < ( SELECT COUNT(*) FROM type_pkgs '.
+%           '             WHERE typenum = '. $cust_main->agent->typenum.
+%           '             AND type_pkgs.pkgpart = part_pkg.pkgpart )'
+%         )
+%) {
+
+      <OPTION VALUE="<% $part_pkg->pkgpart %>"><% $part_pkg->pkg %> - <% $part_pkg->comment %>
+
+% } 
+
+    </SELECT>
+  </TD>
+</TR>
+
+% if ( $conf->exists('pkg_referral') ) {
+  <% include('/elements/tr-select-part_referral.html',
+               'curr_value'    => scalar( $cgi->param('refnum') ), #get rid of empty_label first# || $cust_main->refnum,
+               'disable_empty' => 1,
+               'multiple'      => $conf->exists('pkg_referral-multiple'),
+            )
+  %>
+% }
+
+</TABLE>
+
+<BR>
+<INPUT NAME="submit" TYPE="submit" VALUE="Order Package" disabled>
+
+</FORM>
+<%init>
+
+my $conf = new FS::Conf;
+
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
+my $custnum = $1;
+my $cust_main = qsearchs({
+  'table'     => 'cust_main',
+  'hashref'   => { 'custnum' => $custnum },
+  'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+});
+
+</%init>
diff --git a/httemplate/misc/print_events.cgi b/httemplate/misc/print_events.cgi
new file mode 100644
index 000000000..db7f9843e
--- /dev/null
+++ b/httemplate/misc/print_events.cgi
@@ -0,0 +1,4 @@
+%
+%my $server = new FS::UI::Web::JSRPC 'FS::cust_event::process_reprint', $cgi; 
+
+<% $server->process %>
diff --git a/httemplate/misc/process/cancel_pkg.html b/httemplate/misc/process/cancel_pkg.html
index aa542187a..805d1a711 100755
--- a/httemplate/misc/process/cancel_pkg.html
+++ b/httemplate/misc/process/cancel_pkg.html
@@ -1,4 +1,20 @@
+<% header("Package $past{$method}") %>
+  <SCRIPT TYPE="text/javascript">
+    window.top.location.reload();
+  </SCRIPT>
+  </BODY>
+</HTML>
+<%once>
+
+my %past = ( 'cancel'  => 'cancelled',
+             'expire'  => 'expired',
+             'suspend' => 'suspended',
+             'adjourn' => 'adjourned',
+           );
+
+</%once>
 <%init>
+
 #untaint method
 my $method = $cgi->param('method');
 $method =~ /^(cancel|expire|suspend|adjourn)$/ || die "Illegal method";
@@ -24,56 +40,30 @@ if ($method eq 'expire' || $method eq 'adjourn'){
 
 my $cust_pkg = qsearchs( 'cust_pkg', {'pkgnum'=>$pkgnum} );
 
-my $oldAutoCommit = $FS::UID::AutoCommit;
-local $FS::UID::AutoCommit = 0;
-my $dbh = dbh;
-
 #my $otaker = $FS::CurrentUser::CurrentUser->name;
 #$otaker = $FS::CurrentUser::CurrentUser->username
 #  if ($otaker eq "User, Legacy");
 
-my $error = '';
 if ($reasonnum == -1) {
-
-  $error = 'Enter a new reason (or select an existing one)'
-    unless $cgi->param('newreasonnum') !~ /^\s*$/;
-
-  my $reason = new FS::reason({ 'reason_type' => $cgi->param('newreasonnumT'),
-                                'reason'      => $cgi->param('newreasonnum'),
-                              });
-  $error ||= $reason->insert;
-  $reasonnum = $reason->reasonnum
-    unless $error;
+  $reasonnum = {
+    'typenum' => scalar( $cgi->param('newreasonnumT') ),
+    'reason'  => scalar( $cgi->param('newreasonnum' ) ),
+  };
 }
 
-unless ($error) {
-  if ($method eq 'expire' || $method eq 'adjourn'){
-    my %hash = $cust_pkg->hash;
-    $hash{$method}=$date;
-    my $new = new FS::cust_pkg (\%hash);
-    $error = $new->replace($cust_pkg, 'reason' => $reasonnum);
-  }else{
-    $error = $cust_pkg->$method( 'reason' => $reasonnum );
-  }
+my $error;
+if ($method eq 'expire' || $method eq 'adjourn'){
+  my %hash = $cust_pkg->hash;
+  $hash{$method} = $date;
+  my $new = new FS::cust_pkg \%hash;
+  $error = $new->replace($cust_pkg, 'reason' => $reasonnum);
+} else {
+  $error = $cust_pkg->$method( 'reason' => $reasonnum );
 }
 
 if ($error) {
   $cgi->param('error', $error);
-  $dbh->rollback if $oldAutoCommit;
   print $cgi->redirect(popurl(2). "cancel_pkg.html?". $cgi->query_string );
 }
 
-$dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
- my %past = ( 'cancel'  => 'cancelled',
-              'expire'  => 'expired',
-              'suspend' => 'suspended',
-              'adjourn' => 'adjourned',
-            );
 </%init>
-<% header("Package $past{$method}") %>
-  <SCRIPT TYPE="text/javascript">
-    window.top.location.reload();
-  </SCRIPT>
-  </BODY></HTML>
-
diff --git a/httemplate/pref/pref-process.html b/httemplate/pref/pref-process.html
index 3f9b70686..25f30e9a9 100644
--- a/httemplate/pref/pref-process.html
+++ b/httemplate/pref/pref-process.html
@@ -27,6 +27,8 @@
 %
 % }
 %
+% my %param = $access_user->options;
+%
 % #XXX autogen
 % my @paramlist = qw( menu_position
 %                     email_address
@@ -40,9 +42,11 @@
 %   last;
 % }
 %
-% $error ||= $access_user->replace( {
-%   map { $_ => scalar($cgi->param($_)) } @paramlist,
-% } );
+% foreach (@paramlist) {
+%   $param{$_} = scalar($cgi->param($_));
+% }
+%
+% $error ||= $access_user->replace( \%param );
 %
 % if ( $error ) {
 %   $cgi->param('error', $error);
diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html
index b65608eab..7b9386ec6 100755
--- a/httemplate/search/cust_bill.html
+++ b/httemplate/search/cust_bill.html
@@ -199,18 +199,41 @@ my $html_init = join("\n", map {
  qq!<INPUT TYPE="hidden" NAME="open"      VALUE="$open">!,
  qq!<INPUT TYPE="hidden" NAME="days"      VALUE="$days">!,
  qq!</FORM>!
-} qw( print_ email_ fax_ ) );
+} qw( print_ email_ fax_ ) ). 
+
+'<SCRIPT TYPE="text/javascript">
+
+function confirm_print_process() {
+  if ( ! confirm("Are you sure you want to reprint these invoices?") ) {
+    return;
+  }
+  print_process();
+}
+function confirm_email_process() {
+  if ( ! confirm("Are you sure you want to re-email these invoices?") ) {
+    return;
+  }
+  email_process();
+}
+function confirm_fax_process() {
+  if ( ! confirm("Are you sure you want to re-fax these invoices?") ) {
+    return;
+  }
+  fax_process();
+}
+
+</SCRIPT>';
 
 my $menubar =  [
                 'Main menu' => $p,
                 'Print these invoices' =>
-                  "javascript:print_process()",
+                  "javascript:confirm_print_process()",
                 'Email these invoices' =>
-                  "javascript:email_process()",
+                  "javascript:confirm_email_process()",
               ];
 
 push @$menubar, 'Fax these invoices' =>
-                 "javascript:fax_process()"
+                 "javascript:confirm_fax_process()"
  if $conf->exists('hylafax');
 
 </%init>
diff --git a/httemplate/search/cust_bill_event.cgi b/httemplate/search/cust_bill_event.cgi
index ada7e4362..ffd95e976 100644
--- a/httemplate/search/cust_bill_event.cgi
+++ b/httemplate/search/cust_bill_event.cgi
@@ -64,8 +64,12 @@
 %>
 <%init>
 
+my $curuser = $FS::CurrentUser::CurrentUser;
+
 die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Billing event reports');
+  unless $curuser->access_right('Billing event reports')
+      or $curuser->access_right('View customer billing events')
+         && $cgi->param('invnum') =~ /^(\d+)$/;
 
 my $title = $cgi->param('failed')
               ? 'Failed invoice events'
@@ -93,6 +97,10 @@ if ( $cgi->param('part_bill_event.payby') =~ /^(\w+)$/ ) {
   push @search, "part_bill_event.payby = '$1'";
 }
 
+if ( $cgi->param('invnum') =~ /^(\d+)$/ ) {
+  push @search, "cust_bill_event.invnum = '$1'";
+}
+
 #here is the agent virtualization
 push @search, $FS::CurrentUser::CurrentUser->agentnums_sql;
 
@@ -123,7 +131,11 @@ my $conf = new FS::Conf;
 
 my $failed = $cgi->param('failed');
 
-my $html_init = join("\n", map {
+my $html_init = '
+    <FONT SIZE="+1">Invoice events are the deprecated, old-style actions taken o
+n open invoices.  See Reports->Billing events->Billing events for current event reports.</FONT><BR><BR>';
+
+$html_init .= join("\n", map {
   ( my $action = $_ ) =~ s/_$//;
   include('/elements/progress-init.html',
             $_.'form',
diff --git a/httemplate/search/cust_bill_event.html b/httemplate/search/cust_bill_event.html
index 334bda3d3..0e78ce125 100755
--- a/httemplate/search/cust_bill_event.html
+++ b/httemplate/search/cust_bill_event.html
@@ -4,6 +4,9 @@
    )
 %>
 
+    <FONT SIZE="+1">Invoice events are the deprecated, old-style actions taken
+    on open invoices.  See Reports->Billing events->Billing events for current event reports.</FONT><BR><BR>
+
     <FORM ACTION="cust_bill_event.cgi" METHOD="GET">
     <INPUT TYPE="hidden" NAME="failed" VALUE="<% $cgi->param('failed') %>">
     <TABLE>
diff --git a/httemplate/search/cust_event.html b/httemplate/search/cust_event.html
new file mode 100644
index 000000000..f9cce46ca
--- /dev/null
+++ b/httemplate/search/cust_event.html
@@ -0,0 +1,282 @@
+<% include( 'elements/search.html',
+                 'title'       => $title,
+                 'html_init'   => $html_init,
+                 'menubar'     => $menubar,
+                 'name'        => 'billing events',
+                 'query'       => $sql_query,
+                 'count_query' => $count_sql,
+                 'header'      => [ 'Event',
+                                    'Date',
+                                    'Status',
+                                    'Trigger',
+                                    #'Inv #', 'Inv Date', 'Cust #',
+                                    #'Invoice',
+                                    
+                                    FS::UI::Web::cust_header(), #'cust_main_custnum',
+                                  ],
+                 'fields' => [
+                               'event',
+                               sub { time2str("%b %d %Y %T", $_[0]->_date) },
+                               $status_sub,
+                               $trigger_sub,
+                               #sub {
+                               #      #my $cust_event = shift;
+                               #      'Invoice #'. $_[0]->invnum.
+                               #      ' ('.
+                               #        time2str("%D", $_[0]->cust_bill_date).
+                               #      ')';
+                               #    },
+                               \&FS::UI::Web::cust_fields,
+                             ],
+                'align' => 'lrll'.FS::UI::Web::cust_aligns(),
+                'links' => [
+                              '',
+                              '',
+                              '',
+                              $trigger_link,
+                              #sub {
+                              #  my $part_event = shift;
+                              #  #XXX
+                              #  my $template = $part_event->templatename;
+                              #  $template .= '-' if $template;
+                              #  [ "${p}view/cust_bill.cgi?$template", 'invnum'];
+                              #},
+
+                              ( map { $_ ne 'Cust. Status' ? $link_cust : '' }
+                                    FS::UI::Web::cust_header()
+                              ),
+                            ],
+                 'color' => [ 
+                              '',
+                              '',
+                              '',
+                              '',
+                              #'',
+                              FS::UI::Web::cust_colors(),
+                            ],
+                 'style' => [ 
+                              '',
+                              '',
+                              '',
+                              '',
+                              #'',
+                              FS::UI::Web::cust_styles(),
+                            ],
+             )
+%>
+<%once>
+
+my $status_sub = sub { 
+  my $cust_event = shift;
+
+  my $status = $cust_event->status;
+  $status .= ': '.$cust_event->statustext
+    if $cust_event->statustext;
+
+  my $part_event = $cust_event->part_event;
+
+  if ( $part_event->eventtable eq 'cust_bill' && $part_event->templatename ) {
+    my $alt_templatename = $part_event->templatename;
+    my $alt_link = "$alt_templatename-". $cust_event->tablenum;
+
+    my $conf = new FS::Conf;
+    my $cust_bill = $cust_event->cust_X;
+
+    $status .= qq{
+          ( <A HREF="${p}view/cust_bill.cgi?$alt_link">view</A>
+          | <A HREF="${p}view/cust_bill-pdf.cgi?$alt_link.pdf">view
+              typeset</A>
+          | <A HREF="${p}misc/print-invoice.cgi?$alt_link">re-print</A>
+    };
+
+    if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) { 
+      $status .= qq{
+            | <A HREF="${p}misc/email-invoice.cgi?$alt_link">re-email</A>
+      };
+    } 
+   
+    if ( $conf->exists('hylafax') && length($cust_bill->cust_main->fax) ) { 
+      $status .= qq{
+            | <A HREF="${p}misc/fax-invoice.cgi?$alt_link">re-fax</A>
+      }
+    } 
+
+    $status .= ' ) ';
+
+  }
+
+  $status;
+};
+
+my $trigger_sub = sub {
+  my $cust_event = shift;
+  my $eventtable = $cust_event->eventtable;
+  my $label = FS::part_event->eventtable_labels->{$eventtable};
+  #if ( $eventtable eq 'cust_pkg' || $eventtable eq 'cust_bill' ) {
+    "$label #". $cust_event->tablenum;
+  #} else {
+  #  $label;
+  #}
+};
+
+my $trigger_link = sub {
+  my $cust_event = shift;
+  my $eventtable = $cust_event->eventtable;
+  if ( $eventtable eq 'cust_pkg' ) {
+    my $custnum = $cust_event->cust_main_custnum;
+    [ "${p}view/cust_main.cgi?$custnum#cust_pkg", 'tablenum' ];
+  } else {
+    [ "${p}view/$eventtable.cgi?", 'tablenum' ];
+  }
+};
+
+</%once>
+<%init>
+
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+die "access denied"
+  unless $curuser->access_right('Billing event reports')
+      or $curuser->access_right('View customer billing events')
+         && (    $cgi->param('custnum') =~ /^(\d+)$/
+              || $cgi->param('invnum')  =~ /^(\d+)$/
+              || $cgi->param('pkgnum')  =~ /^(\d+)$/
+            );
+         
+
+my $title = $cgi->param('failed')
+              ? 'Failed billing events'
+              : 'Billing events';
+
+my @search = ();
+
+if ( $cgi->param('agentnum') && $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+  push @search, "agentnum = $1";
+  #my $agent = qsearchs('agent', { 'agentnum' => $1 } );
+  #die "unknown agentnum $1" unless $agent;
+}
+
+my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
+push @search, "cust_event._date >= $beginning",
+              "cust_event._date <= $ending";
+
+if ( $cgi->param('failed') ) {
+  push @search, "statustext != ''",
+                "statustext IS NOT NULL",
+                "statustext != 'N/A'";
+}
+
+#if ( $cgi->param('part_event.payby') =~ /^(\w+)$/ ) {
+#  push @search, "part_event.payby = '$1'";
+#}
+
+if ( $cgi->param('custnum') =~ /^(\d+)$/ ) {
+  push @search, "cust_main.custnum = '$1'";
+}
+if ( $cgi->param('invnum') =~ /^(\d+)$/ ) {
+  push @search, "part_event.eventtable = 'cust_bill'",
+                "tablenum = '$1'";
+}
+if ( $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
+  push @search, "part_event.eventtable = 'cust_pkg'",
+                "tablenum = '$1'";
+}
+
+#here is the agent virtualization
+my $agent_sql = $curuser->agentnums_sql;
+$agent_sql =~ s/agentnum/cust_main.agentnum/g;
+push @search, $agent_sql;
+
+my $where = 'WHERE '. join(' AND ', @search );
+
+my $join = "
+       JOIN part_event USING ( eventpart )
+  LEFT JOIN cust_bill ON ( eventtable = 'cust_bill' AND tablenum = invnum  )
+  LEFT JOIN cust_pkg  ON ( eventtable = 'cust_pkg'  AND tablenum = pkgnum  )
+  LEFT JOIN cust_main ON (    ( eventtable = 'cust_main' AND tablenum = cust_main.custnum )
+                           OR ( eventtable = 'cust_bill' AND cust_bill.custnum = cust_main.custnum )
+                           OR ( eventtable = 'cust_pkg'  AND cust_pkg.custnum  = cust_main.custnum )
+                         )
+";
+           #'LEFT JOIN cust_main  USING ( custnum   ) ';
+
+my $sql_query = {
+  'table'     => 'cust_event',
+  'select'    => join(', ',
+                    'cust_event.*',
+                    'part_event.*',
+                    #'cust_bill.custnum',
+                    #'cust_bill._date AS cust_bill_date',
+                    'cust_main.custnum AS cust_main_custnum',
+                    FS::UI::Web::cust_sql_fields(),
+                  ),
+  'hashref'   => {}, 
+  'extra_sql' => "$where ORDER BY _date ASC",
+  'addl_from' => $join,
+};
+
+my $count_sql = "SELECT COUNT(*) FROM cust_event $join $where";
+
+my $conf = new FS::Conf;
+
+my $failed = $cgi->param('failed');
+
+my $html_init = join("\n", map {
+  ( my $action = $_ ) =~ s/_$//;
+  include('/elements/progress-init.html',
+            $_.'form',
+            [ 'action', 'beginning', 'ending', 'failed' ],
+            "../misc/${_}events.cgi",
+            { 'message' => "Invoices re-${action}ed" }, #would be nice to show the number of them, but...
+            $_, #key
+         ),
+  qq!<FORM NAME="${_}form">!,
+  qq!<INPUT TYPE="hidden" NAME="action" VALUE="$_">!, #not used though
+  qq!<INPUT TYPE="hidden" NAME="beginning" VALUE="$beginning">!,
+  qq!<INPUT TYPE="hidden" NAME="ending"    VALUE="$ending">!,
+  qq!<INPUT TYPE="hidden" NAME="failed"    VALUE="$failed">!,
+  qq!</FORM>!
+} qw( print_ email_ fax_ ) ).
+
+'<SCRIPT TYPE="text/javascript">
+
+function confirm_print_process() {
+  if ( ! confirm("Are you sure you want to reprint these invoices?") ) {
+    return;
+  }
+  print_process();
+}
+function confirm_email_process() {
+  if ( ! confirm("Are you sure you want to re-email these invoices?") ) {
+    return;
+  }
+  email_process();
+}
+function confirm_fax_process() {
+  if ( ! confirm("Are you sure you want to re-fax these invoices?") ) {
+    return;
+  }
+  fax_process();
+}
+
+</SCRIPT>';
+
+my $menubar =  [
+                 'Re-print these events' =>
+                   "javascript:confirm_print_process()",
+                 'Re-email these events' =>
+                   "javascript:confirm_email_process()",
+               ];
+
+push @$menubar, 'Re-fax these events' =>
+                  "javascript:confirm_fax_process()"
+  if $conf->exists('hylafax');
+
+my $link_cust = sub {
+  my $cust_event = shift;
+  $cust_event->cust_main_custnum
+    ? [ "${p}view/cust_main.cgi?", 'cust_main_custnum' ]
+    : '';
+};
+
+</%init>
diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
index 7d5e58a3b..5afc3dc20 100644
--- a/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@ -34,7 +34,7 @@
 %  #                    'select'    => '*',
 %  #                    'addl_from' => '', #'LEFT JOIN othertable USING ( key )',
 %  #                    'extra_sql' => '', #'AND otherstuff', #'WHERE onlystuff',
-%  #                    
+%  #                    'order_by'  => 'ORDER BY something',
 %  #
 %  #                  },
 %  #                  # "select * from tablename";
@@ -54,6 +54,20 @@
 %  # 'disable_nonefound' => '', # set true to disable the "No matching Xs found"
 %  #                            # message
 %  #
+%  # 'disableable' => 1,  # set true if this table has a "disabled" field, to
+%  #                      # hide disabled records & have "show disabled" links
+%  # 'disabled_statuspos' => 3, #optional position (starting from 0) to insert
+%  #                            #a Status column when showing disabled records
+%  #                            #(query needs to be a qsearch hashref and
+%  #                            # header & fields need to be defined)
+
+%  # 'agent_virt' => 1, # set true if this search should be agent-virtualized
+%  # 'agent_null_right' => 'Access Right', #opt. right to view global records
+%  # 'agent_pos' => 3, #optional position (starting from 0) to insert
+%  #                   #an Agent column 
+%  #                   #(query needs to be a qsearch hashref and
+%  #                   # header & fields need to be defined)
+%  #
 %  # #listref - each item is a literal column name (or method) or coderef
 %  # #if not specified all columns will be shown
 %  # 'fields'      => [
@@ -88,11 +102,11 @@
 %  # #(can't be used with a literal query)
 %  # 'disableable' => 1,
 %
-%  my $DEBUG = 0;
-%
 %  my(%opt) = @_;
 %  #warn join(' / ', map { "$_ => $opt{$_}" } keys %opt ). "\n";
 %
+%  my $curuser = $FS::CurrentUser::CurrentUser;
+%
 %  my %align = (
 %    'l' => 'left',
 %    'r' => 'right',
@@ -103,6 +117,90 @@
 %  $opt{align} = [ map $align{$_}, split(//, $opt{align}) ],
 %    unless !$opt{align} || ref($opt{align});
 %
+%  if ( $opt{'agent_virt'} ) {
+%
+%    my $agentnums_sql = $curuser->agentnums_sql(
+%                          'null_right' => $opt{'agent_null_right'}
+%                        );
+%
+%    $opt{'query'}{'extra_sql'} .=
+%      ( $opt{'query'}       =~ /WHERE/i ? ' AND ' : ' WHERE ' ).
+%      $agentnums_sql;
+%    $opt{'count_query'} .=
+%      ( $opt{'count_query'} =~ /WHERE/i ? ' AND ' : ' WHERE ' ).
+%      $agentnums_sql;
+%
+%    if ( $opt{'agent_pos'} || $opt{'agent_pos'} eq '0'
+%         and scalar($curuser->agentnums) > 1           ) {
+%      #false laziness w/statuspos above
+%      my $pos = $opt{'agent_pos'};
+%
+%      foreach my $att (qw( align style color size )) {
+%        $opt{$att} ||= [ map '', @{ $opt{'fields'} } ];
+%      }
+%
+%      splice @{ $opt{'header'} }, $pos, 0, 'Agent'; 
+%      splice @{ $opt{'align'}  }, $pos, 0, 'c'; 
+%      splice @{ $opt{'style'}  }, $pos, 0, ''; 
+%      splice @{ $opt{'size'}   }, $pos, 0, ''; 
+%      splice @{ $opt{'fields'} }, $pos, 0,
+%        sub { $_[0]->agentnum ? $_[0]->agent->agent : '(global)'; };
+%      splice @{ $opt{'color'}  }, $pos, 0, '';
+%      splice @{ $opt{'links'}  }, $pos, 0, '' #[ 'agent link?', 'agentnum' ]
+%        if $opt{'links'};
+%
+%    }
+%
+%  }
+%
+%  if ( $opt{'disableable'} ) {
+%  
+%    unless ( $cgi->param('showdisabled') ) { #modify searches
+%  
+%      $opt{'query'}{'hashref'}{'disabled'} = '';
+%      $opt{'query'}{'extra_sql'} =~ s/^\s*WHERE/ AND/i;
+%  
+%      $opt{'count_query'} .=
+%        ( $opt{'count_query'} =~ /WHERE/i ? ' AND ' : ' WHERE ' ).
+%        "( disabled = '' OR disabled IS NULL )";
+%
+%    } elsif (    $opt{'disabled_statuspos'}
+%              || $opt{'disabled_statuspos'} eq '0' ) { #add status column
+%
+%      my $pos = $opt{'disabled_statuspos'};
+%
+%      foreach my $att (qw( align style color size )) {
+%        $opt{$att} ||= [ map '', @{ $opt{'fields'} } ];
+%      }
+%
+%      splice @{ $opt{'header'} }, $pos, 0, 'Status'; 
+%      splice @{ $opt{'align'}  }, $pos, 0, 'c'; 
+%      splice @{ $opt{'style'}  }, $pos, 0, 'b'; 
+%      splice @{ $opt{'size'}   }, $pos, 0, ''; 
+%      splice @{ $opt{'fields'} }, $pos, 0,
+%        sub { shift->disabled ? 'DISABLED' : 'Active'; };
+%      splice @{ $opt{'color'}  }, $pos, 0,
+%        sub { shift->disabled ? 'FF0000'   : '00CC00'; };
+%      splice @{ $opt{'links'}  }, $pos, 0, ''
+%        if $opt{'links'};
+%    }
+%  
+%    #add show/hide disabled links
+%    my $items = $opt{'name'} || PL($opt{'name_singular'});
+%    if ( $cgi->param('showdisabled') ) {
+%      $cgi->param('showdisabled', 0);
+%      $opt{'html_posttotal'} .=
+%        '( <a href="'. $cgi->self_url. qq!">hide disabled $items</a> )!;
+%      $cgi->param('showdisabled', 1);
+%    } else {
+%      $cgi->param('showdisabled', 1);
+%      $opt{'html_posttotal'} .=
+%        '( <a href="'. $cgi->self_url. qq!">show disabled $items</a> )!;
+%      $cgi->param('showdisabled', 0);
+%    }
+%  
+%  }
+%
 %  my $type = '';
 %  my $limit = '';
 %  my($confmax, $maxrecords, $total, $offset, $count_arrayref);
@@ -146,61 +244,6 @@
 %
 %  }
 %
-%  #disableable handling
-%  my $posttotal = '';
-%  if ( $opt{disableable} ) {
-%
-%    my $name= $opt{'name_singular'} ? PL($opt{'name_singular'}) : $opt{'name'};
-%
-%    if ( $cgi->param('showdisabled') ) {
-%      $cgi->param('showdisabled', 0);
-%      $posttotal= '( <a href="'. $cgi->self_url. '">'.
-%                  "hide disabled $name</a> )";
-%      $cgi->param('showdisabled', 1);
-%    } else {
-%      $cgi->param('showdisabled', 1);
-%      $posttotal= '( <a href="'. $cgi->self_url. '">'.
-%                  "show disabled $name</a> )";
-%      $cgi->param('showdisabled', 0);
-%    }
-%
-%    if ( $cgi->param('showdisabled') ) {
-%
-%      my $offset = $opt{disableable};
-%
-%      splice @{ $opt{header} }, $offset, 0, 'Status';
-%
-%      splice @{ $opt{fields} }, $offset, 0,
-%        sub { shift->disabled ? 'DISABLED' : 'Active' };
-%
-%      if ( $opt{links} && scalar( @{ $opt{links} } ) ) {
-%        splice @{ $opt{links} }, $offset, 0, '';
-%      }
-%
-%      if ( $opt{align} && scalar( @{ $opt{align} } ) ) {
-%        splice @{ $opt{align} }, $offset, 0, 'center';
-%      }
-%
-%      unless ( $opt{color} && scalar( @{ $opt{color} } ) ) {
-%        #$opt{color} = [ map { '000000'; } @{$opt{header}} ];
-%        $opt{color} = [ map { ''; } @{$opt{header}} ];
-%      }
-%      splice @{ $opt{color} }, $offset, 0,
-%        sub { shift->disabled ? 'FF0000' : '00CC00'; };
-%
-%      if ( $opt{size} && scalar( @{ $opt{size} } ) ) {
-%        splice @{ $opt{size} }, $offset, 0, '';
-%      }
-%
-%      unless ( $opt{style} && scalar( @{ $opt{style} } ) ) {
-%        $opt{style} = [ map { ''; } @{$opt{header}} ];
-%      }
-%      splice @{ $opt{style} }, $offset, 0, 'b';
-%
-%    }
-%
-%  }
-%
 %  # run the query
 %
 %  my $header = $opt{header};
@@ -214,17 +257,15 @@
 %    }
 %
 %    #eval "use FS::$opt{'query'};";
-%    $rows = [ qsearch(
-%      $opt{'query'}->{'table'}, 
-%      $opt{'query'}->{'hashref'} || {}, 
-%      $opt{'query'}->{'select'},
-%      $opt{'query'}->{'extra_sql'}. " $limit",
-%      '',
-%      (exists($opt{'query'}->{'addl_from'}) ? $opt{'query'}->{'addl_from'} : '')
-%    ) ];
-%
+%    $rows = [ qsearch({
+%      'select'    => $opt{'query'}->{'select'},
+%      'table'     => $opt{'query'}->{'table'}, 
+%      'addl_from' => (exists($opt{'query'}->{'addl_from'}) ? $opt{'query'}->{'addl_from'} : ''),
+%      'hashref'   => $opt{'query'}->{'hashref'} || {}, 
+%      'extra_sql' => $opt{'query'}->{'extra_sql'},
+%      'order_by'  => $opt{'query'}->{'order_by'}. " $limit",
+%    }) ];
 %  } else {
-%
 %    my $sth = dbh->prepare("$opt{'query'} $limit")
 %      or die "Error preparing $opt{'query'}: ". dbh->errstr;
 %    $sth->execute
@@ -234,15 +275,8 @@
 %    $rows = $sth->fetchall_arrayref;
 %
 %    $header ||= $sth->{NAME};
-%
 %  }
 %
-%  warn scalar(@$rows). ' rows returned from '.
-%       ( ref($opt{'query'}) ? 'qsearch query' : 'literal SQL query' )
-%    if $DEBUG || $opt{'debug'};
-%
-%  # display the results - csv, xls or html
-%
 %  if ( $type eq 'csv' ) {
 %
 %    #http_header('Content-Type' => 'text/comma-separated-values' ); #IE chokes
@@ -430,8 +464,6 @@
 %           $cgi->param('maxrecords', $maxrecords);
 %         }
 
-          <% $posttotal %>
-
           <% defined($opt{'html_posttotal'}) 
                 ? ( ref($opt{'html_posttotal'})
                       ? &{$opt{'html_posttotal'}}()
@@ -522,7 +554,7 @@
 %
 %                                  my $tableref = $_;
 %
-%                                  '<TABLE CLASS="inv" CELLSPACING=0 CELLPADDING=0>'.
+%                                  '<TABLE CLASS="inv" CELLSPACING=0 CELLPADDING=0 WIDTH="100%">'.
 %
 %                                  join('', map {
 %
@@ -532,22 +564,37 @@
 %
 %                                    join('', map {
 %
-%                                      my $element = $_;
+%                                      my $e = $_;
+%
+%                                      '<TD '.
+%                                        join(' ', map {
+%                                          uc($_).'="'. $e->{$_}. '"';
+%                                        }
+%                                        grep exists($e->{$_}),
+%                                             qw( align bgcolor colspan rowspan
+%                                                 style valign width )
+%                                        ).
+%                                      '>'.
 %
-%                                      '<TD'.
-%                                      ( $element->{'align'}
-%                                          ? ' ALIGN="'. $element->{'align'}. '"'
+%                                      ( $e->{'link'}
+%                                          ? '<A HREF="'. $e->{'link'}. '">'
 %                                          : ''
-%                                      ). '>'.
-%                                      ( $element->{'link'}
-%                                          ? '<A HREF="'. $element->{'link'}.'">'
+%                                      ).
+%                                      ( $e->{'size'}
+%                                         ? '<FONT SIZE="'.uc($e->{'size'}).'">'
+%                                         : ''
+%                                      ).
+%                                      ( $e->{'data_style'}
+%                                          ? '<'. uc($e->{'data_style'}). '>'
 %                                          : ''
 %                                      ).
-%                                      $element->{'data'}.
-%                                      ( $element->{'link'}
-%                                          ? '</A>'
+%                                      $e->{'data'}.
+%                                      ( $e->{'data_style'}
+%                                          ? '</'. uc($e->{'data_style'}). '>'
 %                                          : ''
 %                                      ).
+%                                      ( $e->{'size'} ? '</FONT>' : '' ).
+%                                      ( $e->{'link'} ? '</A>'    : '' ).
 %                                      '</td>';
 %
 %                                    } @$rowref ).
@@ -620,7 +667,7 @@
 % } else { 
 % foreach ( @$row ) { 
 
-                          <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $_ %></TD>
+                          <TD CLASS="grid" BGCOLOR="$bgcolor"><% $_ %></TD>
 % } 
 % } 
 
diff --git a/httemplate/search/report_cust_bill.html b/httemplate/search/report_cust_bill.html
index d6848921e..892f5c4d9 100644
--- a/httemplate/search/report_cust_bill.html
+++ b/httemplate/search/report_cust_bill.html
@@ -5,8 +5,8 @@
 
 <TABLE>
   <% include( '/elements/tr-select-agent.html',
-                 ($cgi->param('agentnum') || ''),
-                 'label' => 'Invoices for agent: ',
+                 'curr_value' => scalar( $cgi->param('agentnum') ),
+                 'label'      => 'Invoices for agent: ',
              )
   %>
   <% include( '/elements/tr-input-beginning_ending.html' ) %>
diff --git a/httemplate/search/report_cust_credit.html b/httemplate/search/report_cust_credit.html
index 139902228..0490f4323 100644
--- a/httemplate/search/report_cust_credit.html
+++ b/httemplate/search/report_cust_credit.html
@@ -18,8 +18,8 @@
   </TR>
 
   <% include( '/elements/tr-select-agent.html',
-                 ($cgi->param('agentnum') || ''),
-                 'label' => 'for agent: ',
+                 'curr_value' => scalar( $cgi->param('agentnum') ),
+                 'label'      => 'for agent: ',
              )
   %>
 
diff --git a/httemplate/search/report_cust_event.html b/httemplate/search/report_cust_event.html
new file mode 100644
index 000000000..44cbadbe6
--- /dev/null
+++ b/httemplate/search/report_cust_event.html
@@ -0,0 +1,65 @@
+<% include(
+      '/elements/header.html',
+      ( $cgi->param('failed') ? 'Failed billing events' : 'Billing events' ),
+   )
+%>
+
+    <FORM ACTION="cust_event.html" METHOD="GET">
+    <INPUT TYPE="hidden" NAME="failed" VALUE="<% $cgi->param('failed') %>">
+    <TABLE>
+
+      <% include( '/elements/tr-select-agent.html' ) %>
+
+      
+      <% include( '/elements/tr-input-beginning_ending.html' ) %>
+      
+
+    </TABLE>
+    <BR><INPUT TYPE="submit" VALUE="Get Report">
+    </FORM>
+
+<% include('/elements/footer.html') %>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Billing event reports');
+
+</%init>
diff --git a/httemplate/search/report_cust_main-zip.html b/httemplate/search/report_cust_main-zip.html
index c5a64ae7a..19b7ecc91 100644
--- a/httemplate/search/report_cust_main-zip.html
+++ b/httemplate/search/report_cust_main-zip.html
@@ -34,8 +34,8 @@
       </TR>
 
       <% include( '/elements/tr-select-agent.html',
-                     ($cgi->param('agentnum') || ''),
-                     'label' => 'for agent: ',
+                     'curr_value' => scalar( $cgi->param('agentnum') ),
+                     'label'      => 'For agent: ',
                  )
       %>
 
diff --git a/httemplate/search/report_cust_pay.html b/httemplate/search/report_cust_pay.html
index b32b1287e..d7cb0aec9 100644
--- a/httemplate/search/report_cust_pay.html
+++ b/httemplate/search/report_cust_pay.html
@@ -49,8 +49,8 @@
   </TR>
 
   <% include( '/elements/tr-select-agent.html',
-                 ($cgi->param('agentnum') || ''),
-                 'label' => 'for agent: ',
+                 'curr_value' => scalar($cgi->param('agentnum')),
+                 'label'      => 'for agent: ',
              )
   %>
 
diff --git a/httemplate/search/report_cust_pay_batch.html b/httemplate/search/report_cust_pay_batch.html
index 4e8937cac..0cd656c49 100644
--- a/httemplate/search/report_cust_pay_batch.html
+++ b/httemplate/search/report_cust_pay_batch.html
@@ -16,8 +16,8 @@
   </TR>
 
   <% include( '/elements/tr-select-agent.html',
-                 ($cgi->param('agentnum') || ''),
-                 'label' => 'for agent: ',
+                 'curr_value' => scalar( $cgi->param('agentnum') ),
+                 'label'      => 'For agent: ',
              )
   %>
 
diff --git a/httemplate/search/report_cust_pkg.html b/httemplate/search/report_cust_pkg.html
index 57180c18e..dd62f3ead 100755
--- a/httemplate/search/report_cust_pkg.html
+++ b/httemplate/search/report_cust_pkg.html
@@ -9,11 +9,11 @@
       <TH BGCOLOR="#e8e8e8" COLSPAN=2 ALIGN="left"><FONT SIZE="+1">Search options</FONT></TH>
     </TR>
     <% include( '/elements/tr-select-agent.html',
-                   ($cgi->param('agentnum') || ''),
+                   'curr_value' => scalar( $cgi->param('agentnum') ),
                )
     %>
 
-    <% include( '/elements/tr-select-cust_pkg-status.html', '',
+    <% include( '/elements/tr-select-cust_pkg-status.html',
                   'onchange' => 'status_changed(this);',
               )
     %>
@@ -62,7 +62,7 @@
 
     </SCRIPT>
 
-    <% include( '/elements/tr-select-pkg_class.html', '',
+    <% include( '/elements/tr-select-pkg_class.html',
                    'pre_options' => [ '0' => 'all' ],
                    'empty_label' => '(empty class)',
                )
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index a702d604b..ee8a5d0a7 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -132,7 +132,9 @@ my $addl_from = ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
                 ' LEFT JOIN cust_main USING ( custnum ) ';
 
 #here is the agent virtualization
-push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql;
+push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql( 
+                   'null_right' => 'View/link unlinked services'
+                 );
 
 my $extra_sql = 
   scalar(@extra_sql)
diff --git a/httemplate/search/svc_broadband.cgi b/httemplate/search/svc_broadband.cgi
index 1bbdbfcdb..a89b19610 100755
--- a/httemplate/search/svc_broadband.cgi
+++ b/httemplate/search/svc_broadband.cgi
@@ -5,9 +5,18 @@
 %
 %my @svc_broadband = ();
 %my $sortby=\*svcnum_sort;
+%#XXX agent-virtualization needs to be finished :/
+%my $agentnums_sql = $FS::CurrentUser::CurrentUser->agentnums_sql( 
+%                      'null_right' => 'View/link unlinked services'
+%                    );
+%
 %if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
 %
-%  @svc_broadband=qsearch('svc_broadband',{});
+%  @svc_broadband = qsearch(
+%    'table'     => 'svc_broadband',
+%    'hashref'   => {},
+%    #needs the join first 'extra_sql' => "WHERE $agentnums_sql",
+%  );
 %
 %  if ( $cgi->param('magic') eq 'unlinked' ) {
 %    @svc_broadband = grep { qsearchs('cust_svc', {
@@ -17,7 +26,7 @@
 %                                    )
 %                          }
 %		      @svc_broadband;
-%  }
+%  } else {
 %
 %  if ( $cgi->param('sortby') =~ /^(\w+)$/ ) {
 %    my $sortby = $1;
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index b14a1cc4f..08ffdba5e 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -69,7 +69,9 @@ my $addl_from = ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
                 ' LEFT JOIN cust_main USING ( custnum ) ';
 
 #here is the agent virtualization
-push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql;
+push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql( 
+                   'null_right' => 'View/link unlinked services'
+                 );
 
 my $extra_sql = '';
 if ( @extra_sql ) {
diff --git a/httemplate/search/svc_forward.cgi b/httemplate/search/svc_forward.cgi
index eeb4c1075..2bcd0c8c8 100755
--- a/httemplate/search/svc_forward.cgi
+++ b/httemplate/search/svc_forward.cgi
@@ -46,7 +46,6 @@
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('List services');
 
-
 my $conf = new FS::Conf;
 
 my $orderby = 'ORDER BY svcnum';
@@ -71,7 +70,9 @@ my $addl_from = ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
                 ' LEFT JOIN cust_main USING ( custnum ) ';
 
 #here is the agent virtualization
-push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql;
+push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql( 
+                   'null_right' => 'View/link unlinked services'
+                 );
 
 my $extra_sql = 
   scalar(@extra_sql)
diff --git a/httemplate/search/svc_phone.cgi b/httemplate/search/svc_phone.cgi
index 0c1d57887..49340c6c3 100644
--- a/httemplate/search/svc_phone.cgi
+++ b/httemplate/search/svc_phone.cgi
@@ -74,7 +74,9 @@ my $addl_from = ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
                 ' LEFT JOIN cust_main USING ( custnum ) ';
 
 #here is the agent virtualization
-push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql;
+push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql(
+                   'null_right' => 'View/link unlinked services'
+                 );
 
 my $extra_sql = '';
 if ( @extra_sql ) {
diff --git a/httemplate/search/svc_www.cgi b/httemplate/search/svc_www.cgi
index d9332e95d..2e3c4615b 100755
--- a/httemplate/search/svc_www.cgi
+++ b/httemplate/search/svc_www.cgi
@@ -76,7 +76,9 @@ my $addl_from = ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
                 ' LEFT JOIN cust_main USING ( custnum ) ';
 
 #here is the agent virtualization
-push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql;
+push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql(
+                   'null_right' => 'View/link unlinked services'
+                 );
 
 my $extra_sql = 
   scalar(@extra_sql)
diff --git a/httemplate/view/cust_bill-logo.cgi b/httemplate/view/cust_bill-logo.cgi
index e2f810c3f..9c1c1d71d 100755
--- a/httemplate/view/cust_bill-logo.cgi
+++ b/httemplate/view/cust_bill-logo.cgi
@@ -2,7 +2,8 @@
 <%init>
 
 die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('View invoices');
+  unless $FS::CurrentUser::CurrentUser->access_right('View invoices')
+      or $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
 my $conf = new FS::Conf;
 
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 42e1e6177..c5373ff19 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -60,63 +60,18 @@
   <A HREF="<% $p %>view/cust_bill-pdf.cgi?<% $link %>.pdf">View typeset invoice</A>
   <BR><BR>
 % } 
-% #false laziness with search/cust_bill_event.cgi
-%   unless ( $templatename ) { 
-
-
-  <% table() %>
-  <TR>
-    <TH>Event</TH>
-    <TH>Date</TH>
-    <TH>Status</TH>
-  </TR>
-% foreach my $cust_bill_event (
-%       sort { $a->_date <=> $b->_date } $cust_bill->cust_bill_event
-%     ) {
-%
-%    my $status = $cust_bill_event->status;
-%    $status .= ': '. encode_entities($cust_bill_event->statustext)
-%      if $cust_bill_event->statustext;
-%    my $part_bill_event = $cust_bill_event->part_bill_event;
-%  
-
-    <TR>
-      <TD><% $part_bill_event->event %>
-% if ( $part_bill_event->templatename ) {
-%          my $alt_templatename = $part_bill_event->templatename;
-%          my $alt_link = "$alt_templatename-$invnum";
-%        
-
-          ( <A HREF="<% $p %>view/cust_bill.cgi?<% $alt_link %>">view</A>
-          | <A HREF="<% $p %>view/cust_bill-pdf.cgi?<% $alt_link %>.pdf">view
-              typeset</A>
-          | <A HREF="<% $p %>misc/print-invoice.cgi?<% $alt_link %>">re-print</A>
-% if ( grep { $_ ne 'POST' }
-%                       $cust_bill->cust_main->invoicing_list ) { 
-
-            | <A HREF="<% $p %>misc/email-invoice.cgi?<% $alt_link %>">re-email</A>
-% } 
-% if ( $conf->exists('hylafax')
-%                  && length($cust_bill->cust_main->fax) ) { 
 
-            | <A HREF="<% $p %>misc/fax-invoice.cgi?<% $alt_link %>">re-fax</A>
+% my $br = 0;
+% if ( $cust_bill->num_cust_event ) { $br++;
+<A HREF="<%$p%>search/cust_event.html?invnum=<% $cust_bill->invnum %>">( View invoice events )</A> 
 % } 
 
+% if ( $cust_bill->num_cust_bill_event ) { $br++;
+<A HREF="<%$p%>search/cust_bill_event.cgi?invnum=<% $cust_bill->invnum %>">( View deprecated, old-style invoice events )</A> 
+% }
 
-          )
-% } 
+<% $br ? '<BR><BR>' : '' %>
 
-  
-      </TD>
-      <TD><% time2str("%a %b %e %T %Y", $cust_bill_event->_date) %></TD>
-      <TD><% $status %></TD>
-    </TR>
-% } 
-
-
-  </TABLE>
-  <BR>
-% } 
 % if ( $conf->exists('invoice_html') ) { 
 
   <% join('', $cust_bill->print_html('', $templatename) ) %>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 850b48b27..4ca777d6a 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -16,52 +16,38 @@ function areyousure(href, message) {
 }
 </SCRIPT>
 
-<SCRIPT TYPE="text/javascript">
-%
-%my $ban = '';
-%if ( $cust_main->payby =~ /^(CARD|DCRD|CHEK|DCHK)$/ ) {
-%  $ban = '<BR><P ALIGN="center">'.
-%         '<INPUT TYPE="checkbox" NAME="ban" VALUE="1"> Ban this customer\\\'s ';
-%  if ( $cust_main->payby =~ /^(CARD|DCRD)$/ ) {
-%    $ban .= 'credit card';
-%  } elsif (  $cust_main->payby =~ /^(CHEK|DCHK)$/ ) {
-%    $ban .= 'ACH account';
-%  }
-%}
-%
-
-
-var confirm_cancel = '<FORM METHOD="POST" ACTION="<% $p %>misc/cust_main-cancel.cgi"> <INPUT TYPE="hidden" NAME="custnum" VALUE="<% $custnum %>"> <BR><P ALIGN="center"><B>Permanently delete all services and cancel this customer?</B> <% $ban%><BR><P ALIGN="CENTER"> <INPUT TYPE="submit" VALUE="Cancel customer">        <INPUT TYPE="BUTTON" VALUE="Don\'t cancel" onClick="cClick()"> </FORM> ';
-
-</SCRIPT>
 % if ( $curuser->access_right('Cancel customer')
 %        && $cust_main->ncancelled_pkgs
 %      ) {
-%
 
-  <A HREF="javascript:void(0);" onClick="overlib(confirm_cancel, CAPTION, 'Confirm cancellation', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', MIDX, 0, MIDY, 0, DRAGGABLE, WIDTH, 576, HEIGHT, 128, TEXTSIZE, 3, BGCOLOR, '#ff0000', CGCOLOR, '#ff0000' ); return false; ">Cancel this customer</A> | 
+  <% cust_cancel_link($cust_main) %> | 
+
 % } 
+
 % if ( $conf->exists('deletecustomers')
 %        && $curuser->access_right('Delete customer')
 %      ) {
-%
-
   <A HREF="<% $p %>misc/delete-customer.cgi?<% $custnum%>">Delete this customer</A> | 
 % } 
-% unless ( $conf->exists('disable_customer_referrals') ) { 
 
-  <A HREF="<% popurl(2) %>edit/cust_main.cgi?referral_custnum=<% $custnum %>">Refer a new customer</A> | 
-  <A HREF="<% popurl(2) %>search/cust_main.cgi?referral_custnum=<% $custnum %>">View this customer's referrals</A>
+% unless ( $conf->exists('disable_customer_referrals') ) { 
+  <A HREF="<% $p %>edit/cust_main.cgi?referral_custnum=<% $custnum %>">Refer a new customer</A> | 
+  <A HREF="<% $p %>search/cust_main.cgi?referral_custnum=<% $custnum %>">View this customer's referrals</A>
 % } 
 
+<BR><BR>
 
+% if (    $curuser->access_right('Billing event reports') 
+%      || $curuser->access_right('View customer billing events')
+%    ) {
+
+  <A HREF="<% $p %>search/cust_event.html?custnum=<% $custnum %>">View billing events for this customer</A>
+  <BR><BR>
+
+% }
 
-<BR><BR>
-%
 %my $signupurl = $conf->config('signupurl');
 %if ( $signupurl ) {
-%
-
   This customer's signup URL: <A HREF="<% $signupurl %>?ref=<% $custnum %>"><% $signupurl %>?ref=<% $custnum %></A><BR><BR>
 % } 
 
@@ -161,11 +147,41 @@ die "No customer specified (bad URL)!" unless $cgi->keywords;
 my($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
 $query =~ /^(\d+)$/;
 my $custnum = $1;
-my $cust_main = qsearchs({
+my $cust_main = qsearchs( {
   'table'     => 'cust_main',
-  'hashref'   => {'custnum'=>$custnum},
+  'hashref'   => { 'custnum' => $custnum },
   'extra_sql' => ' AND '. $curuser->agentnums_sql,
 });
 die "Customer not found!" unless $cust_main;
 
 </%init>
+<%once>
+
+
+sub cust_cancel_link { cust_popup_link( 'misc/cancel_cust.html',
+                                        'Cancel this customer',
+                                        'Confirm Cancellation',
+                                        '#ff0000',
+                                        @_,
+                                      );
+}
+
+#false laziness w/view/cust_main/packages.html
+
+sub cust_popup_link {
+  my($action, $label, $actionlabel, $color, $cust_main) = @_;
+  $action .= '?'. $cust_main->custnum;
+  popup_link($action, $label, $actionlabel, $color);
+}
+
+sub popup_link {
+  my($action, $label, $actionlabel, $color) = @_;
+  $color ||= '#333399';
+  qq!<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('$p$action', 540, 336, 'pkg_or_svc_action_popup' ), CAPTION, '$actionlabel', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '$color', CGCOLOR, '$color', CLOSETEXT, '' ); return false;">$label</A>!;
+
+# CLOSETEXT, '', 
+#WIDTH, 576, HEIGHT, 128, TEXTSIZE, 3,
+#BGCOLOR, '#ff0000', CGCOLOR, '#ff0000'
+}
+
+</%once>
diff --git a/httemplate/view/cust_main/order_pkg.html b/httemplate/view/cust_main/order_pkg.html
deleted file mode 100644
index f48bf0929..000000000
--- a/httemplate/view/cust_main/order_pkg.html
+++ /dev/null
@@ -1,41 +0,0 @@
-%
-%  my( $cust_main ) = @_;
-%
-
-
-<SCRIPT TYPE="text/javascript">
-function enable_order_pkg () {
-  if ( document.OrderPkgForm.pkgpart.selectedIndex > 0 ) {
-    document.OrderPkgForm.submit.disabled = false;
-  } else {
-    document.OrderPkgForm.submit.disabled = true;
-  }
-}
-</SCRIPT>
-
-<FORM NAME="OrderPkgForm" ACTION="<% $p %>edit/process/quick-cust_pkg.cgi" METHOD="POST">
-
-<INPUT TYPE="hidden" NAME="custnum" VALUE="<% $cust_main->custnum %>">
-
-<SELECT NAME="pkgpart" onChange="enable_order_pkg()"><OPTION>Order additional package
-%
-%foreach my $part_pkg (
-%  qsearch( 'part_pkg', { 'disabled' => '' }, '',
-%           ' AND 0 < ( SELECT COUNT(*) FROM type_pkgs '.
-%           '             WHERE typenum = '. $cust_main->agent->typenum.
-%           '             AND type_pkgs.pkgpart = part_pkg.pkgpart )'.
-%           ' ORDER BY pkg'   # case ?
-%         )
-%) {
-%
-
-
-  <OPTION VALUE="<% $part_pkg->pkgpart %>"><% $part_pkg->pkg %> - <% $part_pkg->comment %>
-% } 
-
-
-</SELECT>
-
-<INPUT NAME="submit" TYPE="submit" VALUE="Order Package" disabled>
-
-</FORM>
diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index 5890726ae..f424425a7 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -1,22 +1,17 @@
-%  my( $cust_main ) = @_;
-%  my $conf = new FS::Conf;
-%
-%  my $curuser = $FS::CurrentUser::CurrentUser;
-%
-%  my $packages = get_packages($cust_main, $conf);
-
+<A NAME="cust_pkg"><FONT SIZE="+2">Packages</FONT></A><BR>
 
-<A NAME="cust_pkg"><FONT SIZE="+2">Packages</FONT></A>
+% my $s = 0;
 % if ( $curuser->access_right('Order customer package') ) { 
-
-  <% include('order_pkg.html', $cust_main ) %>
+  <% $s++ ? ' | ' : '' %>
+  <% order_pkg_link($cust_main) %>
 % } 
+
 % if ( $curuser->access_right('One-time charge')
 %        && $conf->config('payby-default') ne 'HIDE'
 %      ) {
 %
 
-  <% popup_link('edit/quick-charge.html?custnum='. $cust_main->custnum, 'One-time charge', 'One-time charge', 545) %>
+  <% popup_link('edit/quick-charge.html?custnum='. $cust_main->custnum, 'One-time charge', 'One-time charge', '#333399', 545) %>
   <BR>
 % } 
 % if ( $curuser->access_right('Bulk change customer packages') ) { 
@@ -77,27 +72,43 @@ Current packages
 
 
 <TR>
+
   <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
-    <A NAME="cust_pkg<% $cust_pkg->pkgnum %>"><% $cust_pkg->pkgnum %></A>:
-    <% $part_pkg->pkg %> - <% $part_pkg->comment %><BR>
+
+    <A NAME="cust_pkg<% $cust_pkg->pkgnum %>" ID="cust_pkg<% $cust_pkg->pkgnum %>"><% $cust_pkg->pkgnum %></A>:
+    <% $part_pkg->pkg %> - <% $part_pkg->comment %>
+    <BR>
+
     <FONT SIZE=-1>
 % unless ( $cust_pkg->get('cancel') ) { 
-% if ( $curuser->access_right('Change customer package') ) { 
+%   my $br = 0;
+%   if ( $curuser->access_right('Change customer package') ) { $br=1;
 
             ( <%pkg_change_link($cust_pkg)%> )
-% } 
-% if ( $curuser->access_right('Edit customer package dates') ) { 
+%   } 
+%   if ( $curuser->access_right('Edit customer package dates') ) { $br=1;
 
             ( <%pkg_dates_link($cust_pkg)%> )
-% } 
-% if ( $curuser->access_right('Customize customer package') ) { 
+%   } 
+%   if ( $curuser->access_right('Customize customer package') ) { $br=1;
 
             ( <%pkg_customize_link($cust_pkg,$cust_main->custnum)%> )
+%   } 
+    <% $br ? '<BR>' : '' %>
 % } 
-% } 
+
+% if ( $cust_pkg->num_cust_event
+%      && (    $curuser->access_right('Billing event reports')
+%           || $curuser->access_right('View customer billing events')
+%         )
+%    ) {
+    ( <%pkg_event_link($cust_pkg)%> )
+% }
 
     </FONT>
+
   </TD>
+
   <TD CLASS="inv" BGCOLOR="<% $bgcolor %>">
     <TABLE CLASS="inv" BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%">
 %
@@ -417,157 +428,207 @@ Current packages
 
 <BR>
 % } 
-%
-%#subroutines
-%
-%sub get_packages {
-%  my $cust_main = shift or return undef;
-%  my $conf = shift;
-%  
-%  my @packages = ();
-%  my $method;
-%  if (  $cgi->param('showcancelledpackages') eq '0' #see if it was set by me
-%     || ( $conf->exists('hidecancelledpackages')
-%           && ! $cgi->param('showcancelledpackages') )
-%     )
-%  {
-%    $method = 'ncancelled_pkgs';
-%  } else {
-%    $method = 'all_pkgs';
-%  }
-%
-%  [ $cust_main->$method() ];
-%}
-%  
-%sub svc_provision_link {
-%  my ($cust_pkg, $part_svc, $conf, $curuser) = @_;
-%  ( my $svc_nbsp = $part_svc->svc ) =~ s/\s+/ /g;
-%  my $num_avail = $part_svc->num_avail;
-%  my $pkgnum_svcpart = "pkgnum=". $cust_pkg->pkgnum. ';'.
-%                       "svcpart=". $part_svc->svcpart;
-%  my $url;
-%  if ( $part_svc->svcdb eq 'svc_external' #could be generalized
-%       && $conf->exists('svc_external-skip_manual')
-%  ) {
-%    $url = "${p}edit/process/". $part_svc->svcdb. ".cgi?$pkgnum_svcpart";
-%  } else {
-%    $url = svc_url(
-%                    'm'        => $m,
-%                    'action'   => 'edit',
-%                    'part_svc' => $part_svc, 
-%                    'query'    => $pkgnum_svcpart,
-%                  );
-%    #$url = "${p}edit/$svcpart->{svcdb}.cgi?$pkgnum_svcpart";
-%  }
-%
-%  my $link = qq!<A CLASS="provision" HREF="$url">!.
-%             "Provision $svc_nbsp ($num_avail)</A>";
-%  if ( $conf->exists('legacy_link')
-%       && $curuser->access_right('View/link unlinked services')
-%     )
-%  {
-%    $link .= '<BR>'.
-%             qq!<A CLASS="provision" HREF="${p}misc/link.cgi?!.
-%             qq!$pkgnum_svcpart">!.
-%            "Link to legacy $svc_nbsp ($num_avail)</A>";
-%  }
-%  $link;
-%}
-%
-%sub svc_unprovision_link {
-%  my $cust_svc = shift or return '';
-%  qq!<A HREF="javascript:areyousure('${p}misc/unprovision.cgi?!. $cust_svc->svcnum.
-%  qq!', 'Permanently unprovision and delete this service?')">Unprovision</A>!;
-%}
-%
-%sub pkg_datestr {
-%  my($cust_pkg, $field, $conf) = @_ or return '';
-%  return ' ' unless $cust_pkg->get($field);
-%  my $format = '<TD align="left"><B>%b</B></TD>'.
-%               '<TD align="right"><B> %o,</B></TD>'.
-%               '<TD align="right"><B> %Y</B></TD>';
-%  #$format .= ' <FONT SIZE=-3>%l:%M:%S%P %z</FONT>'
-%  $format .= '<TD ALIGN="right"><B> %l</TD>'.
-%             '<TD ALIGN="center"><B>:</B></TD>'.
-%             '<TD ALIGN="left"><B>%M</B></TD>'.
-%             '<TD ALIGN="left"><B> %P</B></TD>'
-%    if $conf->exists('cust_pkg-display_times');
-%  my $strip = time2str($format, $cust_pkg->get($field) );
-%  $strip =~ s/ (\d)/$1/g;
-%  $strip;
-%}
-%
-%sub pkg_change_link    { pkg_link('misc/change_pkg',    'Change package', @_ ); }
-%
-%sub pkg_suspend_link   { pkg_popup_link( 'misc/cancel_pkg.html?method=suspend',
-%                                         'Suspend now',
-%                                         'Suspend',
-%                                         @_
-%                                       );
-%                       }
-%
-%sub pkg_unsuspend_link { pkg_link('misc/unsusp_pkg',    'Unsuspend',           @_ ); }
-%sub pkg_expire_link    { pkg_link('misc/expire_pkg',    'Cancel later',   @_ ); }
-%sub pkg_dates_link     { pkg_link('edit/REAL_cust_pkg', 'Edit dates',     @_ ); }
-%
-%sub pkg_cancel_link    { pkg_popup_link( 'misc/cancel_pkg.html?method=cancel',
-%                                         'Cancel now',
-%                                         'Cancel',
-%                                         @_
-%                                       );
-%                       }
-%sub pkg_adjourn_link   { pkg_popup_link( 'misc/cancel_pkg.html?method=adjourn',
-%                                         'Suspend later',
-%                                         'Adjourn',
-%                                         @_
-%                                       );
-%                       }
-%
-%sub pkg_expire_link    { pkg_popup_link( 'misc/cancel_pkg.html?method=expire',
-%                                         'Cancel later',
-%                                         'Expire', #"Cancel package $num later"
-%                                         @_
-%                                       );
-%                       }
-%
-%sub svc_recharge_link  { svc_popup_link( 'misc/recharge_svc.html',
-%                                         'Recharge',
-%                                         'Recharge',
-%                                         @_
-%                                       );
-%                       }
-%
-%sub pkg_link {
-%  my($action, $label, $cust_pkg) = @_;
-%  return '' unless $cust_pkg;
-%  qq!<a href="$p$action.cgi?!. $cust_pkg->pkgnum. qq!">$label</a>!;
-%}
-%
-%sub pkg_popup_link {
-%  my($action, $label, $actionlabel, $cust_pkg) = @_;
-%  $action .= '&pkgnum='. $cust_pkg->pkgnum;
-%  $actionlabel .= ' package '. $cust_pkg->pkgnum;
-%  popup_link($action, $label, $actionlabel, 392);
-%}
-%
-%sub svc_popup_link {
-%  my($action, $label, $actionlabel, $cust_svc) = @_;
-%  $action .= '?svcnum='. $cust_svc->svcnum;
-%  $actionlabel .= ' service '. $cust_svc->svcnum;
-%  popup_link($action, $label, $actionlabel, 392);
-%}
-%
-%sub popup_link {
-%  my($action, $label, $actionlabel, $width) = @_;
-%  qq!<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('$p$action', $width, 336, 'pkg_or_svc_action_popup' ), CAPTION, '$actionlabel', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">$label</A>!;
-%}
-%
-%sub pkg_customize_link {
-%  my $cust_pkg = shift or return '';
-%  my $custnum = $cust_pkg->custnum;
-%  qq!<A HREF="${p}edit/part_pkg.cgi?!.
-%    "keywords=$custnum;".
-%    "clone=". $cust_pkg->part_pkg->pkgpart. ';'.
-%    "pkgnum=". $cust_pkg->pkgnum.
-%    qq!">Customize</A>!;
-%}
+% if ( $cgi->param('fragment') =~ /^cust_pkg(\d+)$/ ) {
+  <SCRIPT>
+    // IE-specific hack.  other browsers listen to #fragments
+    // is this even working?  or is the #target redirection just working cause
+    // we set the URL params differently?
+    var el = document.getElementById( 'cust_pkg<% $1 %>' );
+    if ( el ) el.scrollIntoView(true);
+  </SCRIPT>
+% }
+<%init>
+
+my( $cust_main ) = @_;
+my $conf = new FS::Conf;
+
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+my $packages = get_packages($cust_main, $conf);
+</%init>
+<%once>
+
+#subroutines
+
+sub get_packages {
+  my $cust_main = shift or return undef;
+  my $conf = shift;
+  
+  my @packages = ();
+  my $method;
+  if (  $cgi->param('showcancelledpackages') eq '0' #see if it was set by me
+     || ( $conf->exists('hidecancelledpackages')
+           && ! $cgi->param('showcancelledpackages') )
+     )
+  {
+    $method = 'ncancelled_pkgs';
+  } else {
+    $method = 'all_pkgs';
+  }
+
+  [ $cust_main->$method() ];
+}
+  
+sub svc_provision_link {
+  my ($cust_pkg, $part_svc, $conf, $curuser) = @_;
+  ( my $svc_nbsp = $part_svc->svc ) =~ s/\s+/ /g;
+  my $num_avail = $part_svc->num_avail;
+  my $pkgnum_svcpart = "pkgnum=". $cust_pkg->pkgnum. ';'.
+                       "svcpart=". $part_svc->svcpart;
+  my $url;
+  if ( $part_svc->svcdb eq 'svc_external' #could be generalized
+       && $conf->exists('svc_external-skip_manual')
+  ) {
+    $url = "${p}edit/process/". $part_svc->svcdb. ".cgi?$pkgnum_svcpart";
+  } else {
+    $url = svc_url(
+                    'm'        => $m,
+                    'action'   => 'edit',
+                    'part_svc' => $part_svc, 
+                    'query'    => $pkgnum_svcpart,
+                  );
+    #$url = "${p}edit/$svcpart->{svcdb}.cgi?$pkgnum_svcpart";
+  }
+
+  my $link = qq!<A CLASS="provision" HREF="$url">!.
+             "Provision $svc_nbsp ($num_avail)</A>";
+  if ( $conf->exists('legacy_link')
+       && $curuser->access_right('View/link unlinked services')
+     )
+  {
+    $link .= '<BR>'.
+             qq!<A CLASS="provision" HREF="${p}misc/link.cgi?!.
+             qq!$pkgnum_svcpart">!.
+            "Link to legacy $svc_nbsp ($num_avail)</A>";
+  }
+  $link;
+}
+
+sub svc_unprovision_link {
+  my $cust_svc = shift or return '';
+  qq!<A HREF="javascript:areyousure('${p}misc/unprovision.cgi?!. $cust_svc->svcnum.
+  qq!', 'Permanently unprovision and delete this service?')">Unprovision</A>!;
+}
+
+sub pkg_datestr {
+  my($cust_pkg, $field, $conf) = @_ or return '';
+  return ' ' unless $cust_pkg->get($field);
+  my $format = '<TD align="left"><B>%b</B></TD>'.
+               '<TD align="right"><B> %o,</B></TD>'.
+               '<TD align="right"><B> %Y</B></TD>';
+  #$format .= ' <FONT SIZE=-3>%l:%M:%S%P %z</FONT>'
+  $format .= '<TD ALIGN="right"><B> %l</TD>'.
+             '<TD ALIGN="center"><B>:</B></TD>'.
+             '<TD ALIGN="left"><B>%M</B></TD>'.
+             '<TD ALIGN="left"><B> %P</B></TD>'
+    if $conf->exists('cust_pkg-display_times');
+  my $strip = time2str($format, $cust_pkg->get($field) );
+  $strip =~ s/ (\d)/$1/g;
+  $strip;
+}
+
+sub pkg_change_link    { pkg_link('misc/change_pkg',    'Change package', @_ ); }
+
+sub pkg_suspend_link   { pkg_popup_link( 'misc/cancel_pkg.html?method=suspend',
+                                         'Suspend now',
+                                         'Suspend',
+                                         '#FF9900',
+                                         @_
+                                       );
+                       }
+
+sub pkg_adjourn_link   { pkg_popup_link( 'misc/cancel_pkg.html?method=adjourn',
+                                         'Suspend later',
+                                         'Adjourn',
+                                         '#CC6600',
+                                         @_
+                                       );
+                       }
+
+sub pkg_unsuspend_link { pkg_link('misc/unsusp_pkg',    'Unsuspend',           @_ ); }
+sub pkg_expire_link    { pkg_link('misc/expire_pkg',    'Cancel later',   @_ ); }
+sub pkg_dates_link     { pkg_link('edit/REAL_cust_pkg', 'Edit dates',     @_ ); }
+
+sub pkg_cancel_link    { pkg_popup_link( 'misc/cancel_pkg.html?method=cancel',
+                                         'Cancel now',
+                                         'Cancel',
+                                         '#ff0000',
+                                         @_
+                                       );
+                       }
+
+sub pkg_expire_link    { pkg_popup_link( 'misc/cancel_pkg.html?method=expire',
+                                         'Cancel later',
+                                         'Expire', #"Cancel package $num later"
+                                         '#CC0000',
+                                         @_
+                                       );
+                       }
+
+sub svc_recharge_link  { svc_popup_link( 'misc/recharge_svc.html',
+                                         'Recharge',
+                                         'Recharge',
+                                         '#333399',
+                                         @_
+                                       );
+                       }
+
+sub order_pkg_link { cust_popup_link( 'misc/order_pkg.html',
+                                      'Order new package',
+                                      'Order new package',
+                                      '#333399',
+                                      @_
+                                    );
+                   }
+
+sub pkg_event_link {
+  my($cust_pkg) = @_;
+  qq!<a href="${p}search/cust_event.html?pkgnum=!. $cust_pkg->pkgnum. qq!">!.
+  'View package events'.
+  '</a>';
+}
+
+sub pkg_link {
+  my($action, $label, $cust_pkg) = @_;
+  return '' unless $cust_pkg;
+  qq!<a href="$p$action.cgi?!. $cust_pkg->pkgnum. qq!">$label</a>!;
+}
+
+sub pkg_popup_link {
+  my($action, $label, $actionlabel, $color, $cust_pkg) = @_;
+  $action .= '&pkgnum='. $cust_pkg->pkgnum;
+  $actionlabel .= ' package '. $cust_pkg->pkgnum;
+  popup_link($action, $label, $actionlabel, $color);
+}
+
+sub svc_popup_link {
+  my($action, $label, $actionlabel, $color, $cust_svc) = @_;
+  $action .= '?svcnum='. $cust_svc->svcnum;
+  $actionlabel .= ' service '. $cust_svc->svcnum;
+  popup_link($action, $label, $actionlabel, $color);
+}
+
+sub cust_popup_link {
+  my($action, $label, $actionlabel, $color, $cust_main) = @_;
+  $action .= '?'. $cust_main->custnum;
+  popup_link($action, $label, $actionlabel, $color);
+}
+
+sub popup_link {
+  my($action, $label, $actionlabel, $color, $width) = @_;
+  $color ||= '#333399';
+  $width ||= 540;
+  qq!<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('$p$action', $width, 336, 'pkg_or_svc_action_popup' ), CAPTION, '$actionlabel', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '$color', CGCOLOR, '$color' ); return false;">$label</A>!;
+}
+
+sub pkg_customize_link {
+  my $cust_pkg = shift or return '';
+  my $custnum = $cust_pkg->custnum;
+  qq!<A HREF="${p}edit/part_pkg.cgi?!.
+    "keywords=$custnum;".
+    "clone=". $cust_pkg->part_pkg->pkgpart. ';'.
+    "pkgnum=". $cust_pkg->pkgnum.
+    qq!">Customize</A>!;
+}
+
+</%once>
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index b2d98cc55..099bc4f2b 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -73,11 +73,21 @@
 %  my $link = $curuser->access_right('View invoices')
 %               ? qq!<A HREF="${p}view/cust_bill.cgi?$invnum">!
 %               : '';
+%  my $events = '';
+%  if ( $cust_bill->num_cust_event
+%       && (    $curuser->access_right('Billing event reports')
+%            || $curuser->access_right('View customer billing events')
+%          )
+%     ) {
+%    $events =
+%      qq!<BR><FONT SIZE="-1"><A HREF="${p}search/cust_event.html?invnum=!.
+%      $cust_bill->invnum. '">( View invoice events )</A></FONT>';
+%  }
 %  push @history, {
 %    'date'   => $cust_bill->_date,
 %    'desc'   => $link. $pre.
 %                "Invoice #$invnum (Balance \$". $cust_bill->owed. ')'.
-%                $post. ( $link ? '</A>' : '' ),
+%                $post. ( $link ? '</A>' : '' ). $events,
 %    'charge' => $cust_bill->charged,
 %  };
 %}
diff --git a/httemplate/view/logo.cgi b/httemplate/view/logo.cgi
new file mode 100644
index 000000000..aeca0f3b3
--- /dev/null
+++ b/httemplate/view/logo.cgi
@@ -0,0 +1,47 @@
+<% $data %>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+
+my $conf = new FS::Conf;
+
+my $type;
+if ( $cgi->param('type') eq 'png' ) {
+  $type = 'png';
+} elsif ( $cgi->param('type') eq 'eps' ) {
+  $type = 'eps';
+} else {
+  die "unknown logo type ". $cgi->param('type');
+}
+
+my $data;
+if ( $cgi->param('preview_session') =~ /^(\w+)$/ ) {
+
+  my $session = $1;
+  my $curuser = $FS::CurrentUser::CurrentUser;
+  $data = decode_base64( $curuser->option("logo_preview$session") );
+
+} elsif ( $cgi->param('name') =~ /^([^\.\/]*)$/ ) {
+
+  my $templatename = $1;
+  if ( $templatename && $conf->exists("logo_$templatename.$type") ) {
+    $templatename = "_$templatename";
+  } else {
+    $templatename = '';
+  }
+
+  if ( $type eq 'png' ) {
+    $data = $conf->config_binary("logo$templatename.png");
+  } elsif ( $type eq 'eps' ) {
+    #convert EPS to a png... punting on that for now
+  }
+
+} else {
+  die "neither a valid name nor a valid preview_session specified";
+}
+
+http_header('Content-Type' => 'image/png' );
+
+</%init>
+
diff --git a/httemplate/view/svc_Common.html b/httemplate/view/svc_Common.html
index defbee974..bb3a6dd33 100644
--- a/httemplate/view/svc_Common.html
+++ b/httemplate/view/svc_Common.html
@@ -1,9 +1,3 @@
-<% include('elements/svc_Common.html',
-             'table'    => $table,
-	     'edit_url' => $p."edit/svc_Common.html?svcdb=$table;svcnum=",
-	     %opt,
-          )
-%>
 <%init>
 
 # false laziness w/edit/svc_Common.html
@@ -27,3 +21,9 @@ if ( UNIVERSAL::can("FS::$table", 'table_info') ) {
 }
 
 </%init>
+<% include('elements/svc_Common.html',
+             'table'    => $table,
+	     'edit_url' => $p."edit/svc_Common.html?svcdb=$table;svcnum=",
+	     %opt,
+          )
+%>
diff --git a/test/cgi-test b/test/cgi-test
index 2dda4849b..85074d2df 100755
--- a/test/cgi-test
+++ b/test/cgi-test
@@ -1,7 +1,5 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cgi-test,v 1.3 2001-08-21 02:32:54 ivan Exp $
-#
 # This is the beginning of a test suite for the web interface.
 # It's also excellent for populating your database with some meaningful test
 # data.  (a derivative is used by the web demo)
-- 
2.11.0

+ Normal Text +	+ Link Text +
+ Visited Link +	+ Active Link +

$error_message

FontFormats Localization

+ + Find what: +	+ +	+ +
+ Match + case + + + Match + whole word + +

+ + Find what: +	+ +	+ +
+ + Replace with: +	+ +	+ +
+ Match + case + + Match + whole word +

<% $num_cust %>	customers
<% $num_pkg %>	packages

<% $num_cust %>	customers
<% $num_pkg %>	packages