refresh tests with August 2015 updates

12 files changed, 257 insertions, 18 deletions

diff --git a/FS-Test/share/output/view/cust_bill-tex.cgi/invnum=681:notice_name=Invoice b/FS-Test/share/output/view/cust_bill-tex.cgi/invnum=681:notice_name=Invoice
index 7d616f6af..fc9294b20 100644
--- a/FS-Test/share/output/view/cust_bill-tex.cgi/invnum=681:notice_name=Invoice
+++ b/FS-Test/share/output/view/cust_bill-tex.cgi/invnum=681:notice_name=Invoice
@@ -81,7 +81,7 @@
 \begin{tabular}{ll}

 \returninset

 \begin{tabular}{ll}

-  \makebox{ \includegraphics{/usr/local/etc/freeside/cache.DBI:Pg:dbname=freeside/cust_bill.681.aSksR2dX.eps}} & 

+  \makebox{ \includegraphics{/usr/local/etc/freeside/cache.DBI:Pg:dbname=freeside/cust_bill.681.XoeuvJBe.eps}} & 

   \begin{minipage}[b]{5.5cm}

 Freeside Test 5.0.1\\*
 1234 Example Lane\\*
@@ -142,7 +142,7 @@ Freeside Test 5.0.1
     \returninset

     \makebox{

       \begin{tabular}{ll}

-        \includegraphics{/usr/local/etc/freeside/cache.DBI:Pg:dbname=freeside/cust_bill.681.aSksR2dX.eps} & 

+        \includegraphics{/usr/local/etc/freeside/cache.DBI:Pg:dbname=freeside/cust_bill.681.XoeuvJBe.eps} & 

         \begin{minipage}[b]{5.5cm}

 Freeside Test 5.0.1\\*
 1234 Example Lane\\*
@@ -152,7 +152,7 @@ Exampleton, CA~~54321\\*
     }

   }

   { % ... pages

-    %\includegraphics{/usr/local/etc/freeside/cache.DBI:Pg:dbname=freeside/cust_bill.681.aSksR2dX.eps}	% Uncomment if you want the logo on all pages.

+    %\includegraphics{/usr/local/etc/freeside/cache.DBI:Pg:dbname=freeside/cust_bill.681.XoeuvJBe.eps}	% Uncomment if you want the logo on all pages.

   }

 }

 

diff --git a/FS-Test/share/output/view/cust_bill.cgi/681 b/FS-Test/share/output/view/cust_bill.cgi/681
index 3ffad465f..53e49287f 100644
--- a/FS-Test/share/output/view/cust_bill.cgi/681
+++ b/FS-Test/share/output/view/cust_bill.cgi/681
@@ -617,7 +617,7 @@ myMenu48.add(new WebFXMenuItem("Billing", null, "", myMenu65 ));
 myMenu48.add(new WebFXMenuSeparator());
 var myMenu67 = new WebFXMenu;
 myMenu67.emptyText = '';
-myMenu67.add(new WebFXMenuItem("Message templates", "http://localhost/freeside/browse/msg_template.html", "Templates for customer notices" ));
+myMenu67.add(new WebFXMenuItem("Message templates", "http://localhost/freeside/browse/msg_template/email.html", "Templates for customer notices" ));
 myMenu67.add(new WebFXMenuItem("Advertising sources", "http://localhost/freeside/browse/part_referral.html", "Where a customer heard about your service." ));
 myMenu67.add(new WebFXMenuItem("Custom fields", "http://localhost/freeside/browse/part_virtual_field.html", "Locally defined fields" ));
 myMenu67.add(new WebFXMenuItem("Translation strings", "http://localhost/freeside/browse/msgcat.html", "Translations and other customizable labels for each locale" ));
diff --git a/FS-Test/share/output/view/cust_main.cgi/135 b/FS-Test/share/output/view/cust_main.cgi/135
index 011c96f0b..5787fca15 100644
--- a/FS-Test/share/output/view/cust_main.cgi/135
+++ b/FS-Test/share/output/view/cust_main.cgi/135
@@ -617,7 +617,7 @@ myMenu48.add(new WebFXMenuItem("Billing", null, "", myMenu65 ));
 myMenu48.add(new WebFXMenuSeparator());
 var myMenu67 = new WebFXMenu;
 myMenu67.emptyText = '';
-myMenu67.add(new WebFXMenuItem("Message templates", "http://localhost/freeside/browse/msg_template.html", "Templates for customer notices" ));
+myMenu67.add(new WebFXMenuItem("Message templates", "http://localhost/freeside/browse/msg_template/email.html", "Templates for customer notices" ));
 myMenu67.add(new WebFXMenuItem("Advertising sources", "http://localhost/freeside/browse/part_referral.html", "Where a customer heard about your service." ));
 myMenu67.add(new WebFXMenuItem("Custom fields", "http://localhost/freeside/browse/part_virtual_field.html", "Locally defined fields" ));
 myMenu67.add(new WebFXMenuItem("Translation strings", "http://localhost/freeside/browse/msgcat.html", "Translations and other customizable labels for each locale" ));
diff --git a/FS-Test/share/output/view/cust_main.cgi/custnum=135:show=change_history b/FS-Test/share/output/view/cust_main.cgi/custnum=135:show=change_history
index 6d7fd40e1..0b800d686 100644
--- a/FS-Test/share/output/view/cust_main.cgi/custnum=135:show=change_history
+++ b/FS-Test/share/output/view/cust_main.cgi/custnum=135:show=change_history
@@ -617,7 +617,7 @@ myMenu48.add(new WebFXMenuItem("Billing", null, "", myMenu65 ));
 myMenu48.add(new WebFXMenuSeparator());
 var myMenu67 = new WebFXMenu;
 myMenu67.emptyText = '';
-myMenu67.add(new WebFXMenuItem("Message templates", "http://localhost/freeside/browse/msg_template.html", "Templates for customer notices" ));
+myMenu67.add(new WebFXMenuItem("Message templates", "http://localhost/freeside/browse/msg_template/email.html", "Templates for customer notices" ));
 myMenu67.add(new WebFXMenuItem("Advertising sources", "http://localhost/freeside/browse/part_referral.html", "Where a customer heard about your service." ));
 myMenu67.add(new WebFXMenuItem("Custom fields", "http://localhost/freeside/browse/part_virtual_field.html", "Locally defined fields" ));
 myMenu67.add(new WebFXMenuItem("Translation strings", "http://localhost/freeside/browse/msgcat.html", "Translations and other customizable labels for each locale" ));
diff --git a/FS-Test/share/output/view/cust_main.cgi/custnum=135:show=packages b/FS-Test/share/output/view/cust_main.cgi/custnum=135:show=packages
index 132d5f6d0..20a969b89 100644
--- a/FS-Test/share/output/view/cust_main.cgi/custnum=135:show=packages
+++ b/FS-Test/share/output/view/cust_main.cgi/custnum=135:show=packages
@@ -617,7 +617,7 @@ myMenu48.add(new WebFXMenuItem("Billing", null, "", myMenu65 ));
 myMenu48.add(new WebFXMenuSeparator());
 var myMenu67 = new WebFXMenu;
 myMenu67.emptyText = '';
-myMenu67.add(new WebFXMenuItem("Message templates", "http://localhost/freeside/browse/msg_template.html", "Templates for customer notices" ));
+myMenu67.add(new WebFXMenuItem("Message templates", "http://localhost/freeside/browse/msg_template/email.html", "Templates for customer notices" ));
 myMenu67.add(new WebFXMenuItem("Advertising sources", "http://localhost/freeside/browse/part_referral.html", "Where a customer heard about your service." ));
 myMenu67.add(new WebFXMenuItem("Custom fields", "http://localhost/freeside/browse/part_virtual_field.html", "Locally defined fields" ));
 myMenu67.add(new WebFXMenuItem("Translation strings", "http://localhost/freeside/browse/msgcat.html", "Translations and other customizable labels for each locale" ));
diff --git a/FS-Test/share/output/view/cust_main.cgi/custnum=135:show=payment_history b/FS-Test/share/output/view/cust_main.cgi/custnum=135:show=payment_history
index 58e3b142c..e1e75c58e 100644
--- a/FS-Test/share/output/view/cust_main.cgi/custnum=135:show=payment_history
+++ b/FS-Test/share/output/view/cust_main.cgi/custnum=135:show=payment_history
@@ -617,7 +617,7 @@ myMenu48.add(new WebFXMenuItem("Billing", null, "", myMenu65 ));
 myMenu48.add(new WebFXMenuSeparator());
 var myMenu67 = new WebFXMenu;
 myMenu67.emptyText = '';
-myMenu67.add(new WebFXMenuItem("Message templates", "http://localhost/freeside/browse/msg_template.html", "Templates for customer notices" ));
+myMenu67.add(new WebFXMenuItem("Message templates", "http://localhost/freeside/browse/msg_template/email.html", "Templates for customer notices" ));
 myMenu67.add(new WebFXMenuItem("Advertising sources", "http://localhost/freeside/browse/part_referral.html", "Where a customer heard about your service." ));
 myMenu67.add(new WebFXMenuItem("Custom fields", "http://localhost/freeside/browse/part_virtual_field.html", "Locally defined fields" ));
 myMenu67.add(new WebFXMenuItem("Translation strings", "http://localhost/freeside/browse/msgcat.html", "Translations and other customizable labels for each locale" ));
diff --git a/FS-Test/share/output/view/cust_main.cgi/custnum=2:show=packages b/FS-Test/share/output/view/cust_main.cgi/custnum=2:show=packages
index ba5791957..757aa17fe 100644
--- a/FS-Test/share/output/view/cust_main.cgi/custnum=2:show=packages
+++ b/FS-Test/share/output/view/cust_main.cgi/custnum=2:show=packages
@@ -617,7 +617,7 @@ myMenu48.add(new WebFXMenuItem("Billing", null, "", myMenu65 ));
 myMenu48.add(new WebFXMenuSeparator());
 var myMenu67 = new WebFXMenu;
 myMenu67.emptyText = '';
-myMenu67.add(new WebFXMenuItem("Message templates", "http://localhost/freeside/browse/msg_template.html", "Templates for customer notices" ));
+myMenu67.add(new WebFXMenuItem("Message templates", "http://localhost/freeside/browse/msg_template/email.html", "Templates for customer notices" ));
 myMenu67.add(new WebFXMenuItem("Advertising sources", "http://localhost/freeside/browse/part_referral.html", "Where a customer heard about your service." ));
 myMenu67.add(new WebFXMenuItem("Custom fields", "http://localhost/freeside/browse/part_virtual_field.html", "Locally defined fields" ));
 myMenu67.add(new WebFXMenuItem("Translation strings", "http://localhost/freeside/browse/msgcat.html", "Translations and other customizable labels for each locale" ));
@@ -2373,6 +2373,216 @@ function clearhint_search_cust_svc(obj, str) {
 
   </TR>
 
+    
+  <!--pkgnum: 602-->
+  <TR CLASS="row1">
+    <TD CLASS="inv package" BGCOLOR="" VALIGN="top">
+  
+  <TABLE CLASS="inv package"> 
+    <TR>
+      <TD COLSPAN=2>
+        
+        <A NAME="cust_pkg602"
+           ID  ="cust_pkg602"
+        ><B>Test one-time charge</B></A>
+         - 
+        $100.00 - $100.00 one-time
+      </TD>
+    </TR>
+
+
+    <TR>
+      <TD COLSPAN=2>
+        <FONT SIZE=-1>
+
+                (&nbsp;<A HREF="javascript:void(0);"
+   onClick="overlib( OLiframeContent('http://localhost/freeside/edit/quick-charge.html?change_pkgnum=602;pkgnum=602', 690, 440, 'popup-0000000000-0000-000000000.000000', 0, 'auto' ), CAPTION, 'Modify package 602', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '#333399', CGCOLOR, '#333399', FGCOLOR, '#f8f8f8', CLOSETEXT, 'Close'); return false;"
+   
+   
+   
+>Modify&nbsp;one-time&nbsp;charge</A>&nbsp;)
+              (&nbsp;<A HREF="javascript:void(0);"
+   onClick="overlib( OLiframeContent('http://localhost/freeside/edit/cust_pkg_discount.html?pkgnum=602', 616, 336, 'popup-0000000000-0000-000000000.000000', 0, 'auto' ), CAPTION, 'Discount package 602', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '#333399', CGCOLOR, '#333399', FGCOLOR, '#f8f8f8', CLOSETEXT, 'Close'); return false;"
+   
+   
+   
+>Discount</A>&nbsp;)
+          <BR>
+
+        </FONT>
+      </TD>
+    </TR>
+
+
+    <TR>
+      <TD COLSPAN=2>
+
+
+
+      </TD>
+    </TR>
+
+
+    <TR>
+      <TD COLSPAN=2>
+
+
+        <FONT SIZE="-1">
+          (&nbsp;<A HREF="javascript:void(0);"
+   onClick="overlib( OLiframeContent('http://localhost/freeside/edit/cust_pkg_salesnum.html?;pkgnum=602', 390, 220, 'popup-0000000000-0000-000000000.000000', 0, 'auto' ), CAPTION, 'Change package 602', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '#333399', CGCOLOR, '#333399', FGCOLOR, '#f8f8f8', CLOSETEXT, 'Close'); return false;"
+   
+   
+   
+>Change&nbsp;sales&nbsp;person</A>&nbsp;)
+        </FONT>
+
+      </TD>
+    </TR>
+
+
+
+      <TR>
+
+          <TD>
+              <FONT SIZE="-1">
+                (&nbsp;<A HREF="javascript:void(0);"
+   onClick="overlib( OLiframeContent('http://localhost/freeside/edit/cust_pkg_detail.html?pkgnum=602;detailtype=I', 763, 336, 'popup-0000000000-0000-000000000.000000', 0, 'auto' ), CAPTION, 'Add invoice details', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '#333399', CGCOLOR, '#333399', FGCOLOR, '#f8f8f8', CLOSETEXT, 'Close'); return false;"
+   
+   
+   
+>Add&nbsp;invoice&nbsp;details</A>&nbsp;)
+              </FONT>
+          </TD>
+
+          <TD>
+              <FONT SIZE="-1">
+                (&nbsp;<A HREF="javascript:void(0);"
+   onClick="overlib( OLiframeContent('http://localhost/freeside/edit/cust_pkg_detail.html?pkgnum=602;detailtype=C', 763, 336, 'popup-0000000000-0000-000000000.000000', 0, 'auto' ), CAPTION, 'Add comments', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '#333399', CGCOLOR, '#333399', FGCOLOR, '#f8f8f8', CLOSETEXT, 'Close'); return false;"
+   
+   
+   
+>Add&nbsp;comments</A>&nbsp;)
+              </FONT>
+          </TD>
+
+      </TR>
+
+
+  </TABLE>
+
+
+  
+</TD>
+
+
+    <TD CLASS="inv" BGCOLOR="" VALIGN="top">
+  <TABLE CLASS="inv" BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%">
+
+
+    <TR><TD WIDTH="" ALIGN="right">Ordered&nbsp;</TD><TD align="left"><B>Mar</B></TD><TD align="right"><B>&nbsp;2nd,</B></TD><TD align="right"><B>&nbsp;2016</B></TD></TR>
+
+
+          <TR><TD COLSPAN=4 >One-time charge</TD></TR>
+
+          <TR><TD WIDTH="" ALIGN="right">Billed&nbsp;</TD><TD align="left"><B>Mar</B></TD><TD align="right"><B>&nbsp;2nd,</B></TD><TD align="right"><B>&nbsp;2016</B></TD></TR>
+
+          
+
+          
+
+          
+
+          
+
+
+      
+      
+      
+      
+      
+      
+      
+      
+      
+
+
+  </TABLE>
+</TD>
+
+    <TD CLASS="inv" BGCOLOR="" WIDTH="20%" VALIGN="top">
+          <FONT SIZE=-1>
+      (&nbsp;<A HREF="javascript:void(0);"
+   onClick="overlib( OLiframeContent('http://localhost/freeside/misc/change_pkg_contact.html?pkgnum=602', 616, 192, 'popup-0000000000-0000-000000000.000000', 0, 'auto' ), CAPTION, 'Add contact package 602', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '#333399', CGCOLOR, '#333399', FGCOLOR, '#f8f8f8', CLOSETEXT, 'Close'); return false;"
+   
+   
+   
+>Add&nbsp;contact</A>&nbsp;)
+    </FONT>
+    <BR>
+
+              <DIV STYLE="font-style: italic; font-size: small">
+
+      Default service location<BR>24866 VonRueden Roads<BR>Floor 94 X<BR>Crown Point CT 59629-7714
+
+          <BR>
+          <FONT SIZE=-1>
+          38.5000000, -121.5000000
+          
+
+<A HREF="javascript:void(0);"
+   onClick="overlib( OLiframeContent('http://localhost/freeside/view/map.html?name=Oswald%20Schowalter%3A%20Test%20one-time%20charge;lat=38.5000000;lon=-121.5000000', 763, 575, 'popup-0000000000-0000-000000000.000000', 0, 'auto' ), CAPTION, 'Oswald Schowalter: Test one-time charge', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '#333399', CGCOLOR, '#333399', FGCOLOR, '#f8f8f8', CLOSETEXT, 'Close'); return false;"
+   
+   
+   
+>map</A>
+
+  <A HREF="javascript:void(0);"
+   onClick="overlib( OLiframeContent('http://localhost/freeside/view/directions.html?origin=1234%20Example%20Lane%2CExampleton%2C%20CA%20%2054321;name=Oswald%20Schowalter%3A%20Test%20one-time%20charge;lat=38.5000000;lon=-121.5000000', 763, 575, 'popup-0000000000-0000-000000000.000000', 0, 'auto' ), CAPTION, 'Oswald Schowalter: Test one-time charge', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '#333399', CGCOLOR, '#333399', FGCOLOR, '#f8f8f8', CLOSETEXT, 'Close'); return false;"
+   
+   
+   
+>directions</A>
+
+<A HREF="http://localhost/freeside/view/kml.cgi?name=Oswald%20Schowalter%3A%20Test%20one-time%20charge;lat=38.5000000;lon=-121.5000000">earth</A>
+
+
+          </FONT>
+
+      </DIV>
+
+  <BR>
+  <FONT SIZE=-1>
+      (&nbsp;<A HREF="javascript:void(0);"
+   onClick="overlib( OLiframeContent('http://localhost/freeside/misc/change_pkg.cgi?locationnum=-1;pkgpart=6;address1=;address2=;city=;county=;state=;zip=;country=;pkgnum=602', 960, 490, 'popup-0000000000-0000-000000000.000000', 0, 'auto' ), CAPTION, 'Change package 602', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '#333399', CGCOLOR, '#333399', FGCOLOR, '#f8f8f8', CLOSETEXT, 'Close'); return false;"
+   
+   
+   
+>Change&nbsp;location</A>&nbsp;)
+        (&nbsp;<A HREF="javascript:void(0);"
+   onClick="overlib( OLiframeContent('http://localhost/freeside/edit/cust_location.cgi?locationnum=3', 700, 355, 'popup-0000000000-0000-000000000.000000', 0, 'auto' ), CAPTION, 'Edit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '#333399', CGCOLOR, '#333399', FGCOLOR, '#f8f8f8', CLOSETEXT, 'Close'); return false;"
+   
+   
+   
+>Edit&nbsp;location</A>&nbsp;)
+  </FONT>
+
+    </TD>
+    
+  <TD CLASS="inv" BGCOLOR="">
+    <TABLE CLASS="inv" BORDER=0 CELLSPACING=0 CELLPADDING=2 WIDTH="100%">
+    <SCRIPT TYPE="text/javascript">
+function clearhint_search_cust_svc(obj, str) {
+  if (obj.value == str) obj.value = '';
+}
+    </SCRIPT>
+
+
+    </TABLE>
+  </TD>
+
+
+  </TR>
+
 
         </TABLE>
 
diff --git a/FS-Test/share/output/view/cust_main.cgi/custnum=2:show=payment_history b/FS-Test/share/output/view/cust_main.cgi/custnum=2:show=payment_history
index 36a01b077..8d15d4190 100644
--- a/FS-Test/share/output/view/cust_main.cgi/custnum=2:show=payment_history
+++ b/FS-Test/share/output/view/cust_main.cgi/custnum=2:show=payment_history
@@ -617,7 +617,7 @@ myMenu48.add(new WebFXMenuItem("Billing", null, "", myMenu65 ));
 myMenu48.add(new WebFXMenuSeparator());
 var myMenu67 = new WebFXMenu;
 myMenu67.emptyText = '';
-myMenu67.add(new WebFXMenuItem("Message templates", "http://localhost/freeside/browse/msg_template.html", "Templates for customer notices" ));
+myMenu67.add(new WebFXMenuItem("Message templates", "http://localhost/freeside/browse/msg_template/email.html", "Templates for customer notices" ));
 myMenu67.add(new WebFXMenuItem("Advertising sources", "http://localhost/freeside/browse/part_referral.html", "Where a customer heard about your service." ));
 myMenu67.add(new WebFXMenuItem("Custom fields", "http://localhost/freeside/browse/part_virtual_field.html", "Locally defined fields" ));
 myMenu67.add(new WebFXMenuItem("Translation strings", "http://localhost/freeside/browse/msgcat.html", "Translations and other customizable labels for each locale" ));
@@ -1620,6 +1620,35 @@ function areyousure(href, message) {
   </TR>
 
 
+  <TR >
+    <TD VALIGN="top" CLASS="grid" BGCOLOR="#eeeeee">
+
+      03/02/2016
+
+      </FONT>
+    </TD>
+    <TD CLASS="grid" BGCOLOR="#eeeeee">
+      <A HREF="http://localhost/freeside/view/cust_bill.cgi?1585"><B><FONT SIZE="+1" COLOR="#FF0000">Open Invoice #1585 (Balance 100.00)</FONT></B></A>
+
+    </TD>
+    <TD VALIGN="top" ALIGN="right" CLASS="grid" BGCOLOR="#eeeeee">
+      $100.00
+    </TD>
+    <TD VALIGN="top" ALIGN="right" CLASS="grid" BGCOLOR="#eeeeee">
+      
+    </TD>
+    <TD VALIGN="top" ALIGN="right" CLASS="grid" BGCOLOR="#eeeeee">
+      
+    </TD>
+    <TD VALIGN="top" ALIGN="right" CLASS="grid" BGCOLOR="#eeeeee">
+      
+    </TD>
+    <TD VALIGN="top" ALIGN="right" CLASS="grid" BGCOLOR="#eeeeee">
+      $874.03
+    </TD>
+  </TR>
+
+
 </TABLE>
     </TD>
   </TR>
diff --git a/FS-Test/share/output/view/svc_acct.cgi/406 b/FS-Test/share/output/view/svc_acct.cgi/406
index 32d9a568a..60867f8d4 100644
--- a/FS-Test/share/output/view/svc_acct.cgi/406
+++ b/FS-Test/share/output/view/svc_acct.cgi/406
@@ -618,7 +618,7 @@ myMenu48.add(new WebFXMenuItem("Billing", null, "", myMenu65 ));
 myMenu48.add(new WebFXMenuSeparator());
 var myMenu67 = new WebFXMenu;
 myMenu67.emptyText = '';
-myMenu67.add(new WebFXMenuItem("Message templates", "http://localhost/freeside/browse/msg_template.html", "Templates for customer notices" ));
+myMenu67.add(new WebFXMenuItem("Message templates", "http://localhost/freeside/browse/msg_template/email.html", "Templates for customer notices" ));
 myMenu67.add(new WebFXMenuItem("Advertising sources", "http://localhost/freeside/browse/part_referral.html", "Where a customer heard about your service." ));
 myMenu67.add(new WebFXMenuItem("Custom fields", "http://localhost/freeside/browse/part_virtual_field.html", "Locally defined fields" ));
 myMenu67.add(new WebFXMenuItem("Translation strings", "http://localhost/freeside/browse/msgcat.html", "Translations and other customizable labels for each locale" ));
@@ -1015,7 +1015,7 @@ function updateTicketLink() {
 }
 </SCRIPT>
 <A NAME="tickets"><FONT CLASS="fsinnerbox-title">Tickets</FONT></A>
-<A id="CreateTicketLink" HREF="http://localhost/freeside//rt/Ticket/Create.html?Requestors=&new-MemberOf=freeside%3A%2F%2Ffreeside%2Fcust_svc%2F406&Queue=1">Create new ticket</A>
+<A id="CreateTicketLink" HREF="http://localhost/freeside//rt/Ticket/Create.html?Requestors=&Queue=1&new-MemberOf=freeside%3A%2F%2Ffreeside%2Fcust_svc%2F406">Create new ticket</A>
  in queue
 <SELECT NAME="Queue" id="Queue" onchange="updateTicketLink()">
 </SELECT>
diff --git a/FS-Test/share/output/view/svc_broadband.cgi/401 b/FS-Test/share/output/view/svc_broadband.cgi/401
index 31877d80e..8bf4026f9 100644
--- a/FS-Test/share/output/view/svc_broadband.cgi/401
+++ b/FS-Test/share/output/view/svc_broadband.cgi/401
@@ -634,7 +634,7 @@ myMenu48.add(new WebFXMenuItem("Billing", null, "", myMenu65 ));
 myMenu48.add(new WebFXMenuSeparator());
 var myMenu67 = new WebFXMenu;
 myMenu67.emptyText = '';
-myMenu67.add(new WebFXMenuItem("Message templates", "http://localhost/freeside/browse/msg_template.html", "Templates for customer notices" ));
+myMenu67.add(new WebFXMenuItem("Message templates", "http://localhost/freeside/browse/msg_template/email.html", "Templates for customer notices" ));
 myMenu67.add(new WebFXMenuItem("Advertising sources", "http://localhost/freeside/browse/part_referral.html", "Where a customer heard about your service." ));
 myMenu67.add(new WebFXMenuItem("Custom fields", "http://localhost/freeside/browse/part_virtual_field.html", "Locally defined fields" ));
 myMenu67.add(new WebFXMenuItem("Translation strings", "http://localhost/freeside/browse/msgcat.html", "Translations and other customizable labels for each locale" ));
diff --git a/FS-Test/share/output/view/svc_domain.cgi/402 b/FS-Test/share/output/view/svc_domain.cgi/402
index 71977b5d2..b930c3c19 100644
--- a/FS-Test/share/output/view/svc_domain.cgi/402
+++ b/FS-Test/share/output/view/svc_domain.cgi/402
@@ -618,7 +618,7 @@ myMenu48.add(new WebFXMenuItem("Billing", null, "", myMenu65 ));
 myMenu48.add(new WebFXMenuSeparator());
 var myMenu67 = new WebFXMenu;
 myMenu67.emptyText = '';
-myMenu67.add(new WebFXMenuItem("Message templates", "http://localhost/freeside/browse/msg_template.html", "Templates for customer notices" ));
+myMenu67.add(new WebFXMenuItem("Message templates", "http://localhost/freeside/browse/msg_template/email.html", "Templates for customer notices" ));
 myMenu67.add(new WebFXMenuItem("Advertising sources", "http://localhost/freeside/browse/part_referral.html", "Where a customer heard about your service." ));
 myMenu67.add(new WebFXMenuItem("Custom fields", "http://localhost/freeside/browse/part_virtual_field.html", "Locally defined fields" ));
 myMenu67.add(new WebFXMenuItem("Translation strings", "http://localhost/freeside/browse/msgcat.html", "Translations and other customizable labels for each locale" ));
@@ -1025,11 +1025,11 @@ Service #<B>402</B>
 function updateTicketLink() {
   var link = document.getElementById('CreateTicketLink');
   var selector = document.getElementById('Queue')
-  link.href = "http://localhost/freeside//rt/Ticket/Create.html?new-MemberOf=freeside://freeside/cust_svc/402;Requestors=;Queue=" + selector.options[selector.selectedIndex].value;
+  link.href = "http://localhost/freeside//rt/Ticket/Create.html?Requestors=;new-MemberOf=freeside://freeside/cust_svc/402;Queue=" + selector.options[selector.selectedIndex].value;
 }
 </SCRIPT>
 <A NAME="tickets"><FONT CLASS="fsinnerbox-title">Tickets</FONT></A>
-<A id="CreateTicketLink" HREF="http://localhost/freeside//rt/Ticket/Create.html?Requestors=&Queue=1&new-MemberOf=freeside%3A%2F%2Ffreeside%2Fcust_svc%2F402">Create new ticket</A>
+<A id="CreateTicketLink" HREF="http://localhost/freeside//rt/Ticket/Create.html?Requestors=&new-MemberOf=freeside%3A%2F%2Ffreeside%2Fcust_svc%2F402&Queue=1">Create new ticket</A>
  in queue
 <SELECT NAME="Queue" id="Queue" onchange="updateTicketLink()">
 </SELECT>
diff --git a/FS-Test/share/output/view/svc_phone.cgi/403 b/FS-Test/share/output/view/svc_phone.cgi/403
index 113aaf715..1389fd7eb 100644
--- a/FS-Test/share/output/view/svc_phone.cgi/403
+++ b/FS-Test/share/output/view/svc_phone.cgi/403
@@ -634,7 +634,7 @@ myMenu48.add(new WebFXMenuItem("Billing", null, "", myMenu65 ));
 myMenu48.add(new WebFXMenuSeparator());
 var myMenu67 = new WebFXMenu;
 myMenu67.emptyText = '';
-myMenu67.add(new WebFXMenuItem("Message templates", "http://localhost/freeside/browse/msg_template.html", "Templates for customer notices" ));
+myMenu67.add(new WebFXMenuItem("Message templates", "http://localhost/freeside/browse/msg_template/email.html", "Templates for customer notices" ));
 myMenu67.add(new WebFXMenuItem("Advertising sources", "http://localhost/freeside/browse/part_referral.html", "Where a customer heard about your service." ));
 myMenu67.add(new WebFXMenuItem("Custom fields", "http://localhost/freeside/browse/part_virtual_field.html", "Locally defined fields" ));
 myMenu67.add(new WebFXMenuItem("Translation strings", "http://localhost/freeside/browse/msgcat.html", "Translations and other customizable labels for each locale" ));
@@ -977,7 +977,7 @@ function areyousure_delete() {
 function updateTicketLink() {
   var link = document.getElementById('CreateTicketLink');
   var selector = document.getElementById('Queue')
-  link.href = "http://localhost/freeside//rt/Ticket/Create.html?new-MemberOf=freeside://freeside/cust_svc/403;Requestors=;Queue=" + selector.options[selector.selectedIndex].value;
+  link.href = "http://localhost/freeside//rt/Ticket/Create.html?Requestors=;new-MemberOf=freeside://freeside/cust_svc/403;Queue=" + selector.options[selector.selectedIndex].value;
 }
 </SCRIPT>
 <A NAME="tickets"><FONT CLASS="fsinnerbox-title">Tickets</FONT></A>