[freeside-commits] branch master updated. 305196a8632844f0224ed58b59aae51e4c6a80cc

[Jonathan Prykop]

The branch, master has been updated
       via  305196a8632844f0224ed58b59aae51e4c6a80cc (commit)
      from  dacfac92a13152bb3060ac000121b41ffc8d877f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 305196a8632844f0224ed58b59aae51e4c6a80cc
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Tue Dec 15 03:55:44 2015 -0600

    RT#39201 Quotation Descriptions

diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html
index 78752c0..4d87fab 100644
--- a/httemplate/edit/quick-charge.html
+++ b/httemplate/edit/quick-charge.html
@@ -1,5 +1,5 @@
 <& /elements/header-popup.html, mt('One-time charge'), '',
-            ( $cgi->param('error') ? '' : 'onload="addRow()"' ),
+            ( ($quotationnum || $cgi->param('error')) ? '' : 'onload="addRow()"' ),
 &>
 
 <LINK REL="stylesheet" TYPE="text/css" HREF="<%$fsurl%>elements/calendar-win2k-2.css" TITLE="win2k-2">
@@ -327,13 +327,14 @@ function bill_now_changed (what) {
   </TD>
 </TR>
 
+% my $row = 0;
+% unless ($quotationnum) {
 <TR>
   <TD></TD>
   <TD><FONT SIZE="-1"><% mt('Optional additional description (also printed on invoice):') |h %> </FONT></TD>
 </TR>
 
-% my $row = 0;
-% foreach (@description) {
+%   foreach (@description) {
     <TR>
       <TD></TD>
       <TD>
@@ -348,8 +349,9 @@ function bill_now_changed (what) {
         >
       </TD>
     </TR>
-% $row++;
-% } 
+%     $row++;
+%   }
+% }
 
 
 </TABLE>

-----------------------------------------------------------------------

Summary of changes:
 httemplate/edit/quick-charge.html |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)