[freeside-commits] freeside/httemplate/edit/cust_main billing.html, 1.31.2.3, 1.31.2.4 contact.html, 1.17, 1.17.2.1

Erik Levinson levinse at wavetail.420.am
Mon May 30 16:24:53 PDT 2011


Update of /home/cvs/cvsroot/freeside/httemplate/edit/cust_main
In directory wavetail.420.am:/tmp/cvs-serv19008/httemplate/edit/cust_main

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	billing.html contact.html 
Log Message:
optional better visibility for invoicing email field, RT12944

Index: billing.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_main/billing.html,v
retrieving revision 1.31.2.3
retrieving revision 1.31.2.4
diff -u -w -d -r1.31.2.3 -r1.31.2.4
--- billing.html	9 May 2011 22:32:55 -0000	1.31.2.3
+++ billing.html	30 May 2011 23:24:51 -0000	1.31.2.4
@@ -444,12 +444,14 @@
 
 % }
 
+% unless ( $conf->exists('cust-email-high-visibility')) {
     <TR>
       <TD ALIGN="right" WIDTH="200">
         <% $conf->exists('cust_main-require_invoicing_list_email') ? $r : '' %>Email address(es)
       </TD>
       <TD WIDTH="408"><INPUT TYPE="text" NAME="invoicing_list" VALUE="<% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) %>"></TD>
     </TR>
+% }
 
     <TR>
       <TD ALIGN="right" WIDTH="200">Invoice terms </TD>

Index: contact.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_main/contact.html,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -w -d -r1.17 -r1.17.2.1
--- contact.html	2 Nov 2010 00:28:13 -0000	1.17
+++ contact.html	30 May 2011 23:24:51 -0000	1.17.2.1
@@ -18,6 +18,17 @@
 
 </TR>
 
+% if ( $conf->exists('cust-email-high-visibility') && !$pre ) {
+    <TR>
+      <TD ALIGN="right" WIDTH="200">
+        <% $conf->exists('cust_main-require_invoicing_list_email') ? $r : '' %>Email address(es)
+      </TD>
+      <TD bgcolor="#FFFF00">
+        <INPUT TYPE="text" NAME="invoicing_list" VALUE="<% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) %>">
+      </TD>
+    </TR>
+% }
+
 <TR>
   <TD ALIGN="right">Company</TD>
   <TD COLSPAN=7>
@@ -147,4 +158,6 @@
 
 my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
 
+my @invoicing_list = $cust_main->invoicing_list;
+
 </%init>



More information about the freeside-commits mailing list