[freeside-commits] branch FREESIDE_3_BRANCH updated. cc76d8abb5dec3012f6c24d18ccef346296b6579

[Jonathan Prykop]

The branch, FREESIDE_3_BRANCH has been updated
       via  cc76d8abb5dec3012f6c24d18ccef346296b6579 (commit)
       via  de1462c50bb8f9c841d193accddd1e4a4e9390e6 (commit)
      from  83a67f4751c0ffe5a176a1a2043ad9f1f5a33c5c (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 cc76d8abb5dec3012f6c24d18ccef346296b6579
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Sat Dec 19 00:55:57 2015 -0600

    RT#39201 Quotation Descriptions [added comments]

diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html
index 1ceefcb..02946c2 100644
--- a/httemplate/edit/quick-charge.html
+++ b/httemplate/edit/quick-charge.html
@@ -328,6 +328,8 @@ function bill_now_changed (what) {
 </TR>
 
 % my $row = 0;
+% # quotation details are handled by quotation_pkg_detail records, added via link from view/quotation.html
+% # the details below get attached to the part_pkg record, and there's no way to edit that from quotations
 % unless ($quotationnum) {
 <TR>
   <TD></TD>

commit de1462c50bb8f9c841d193accddd1e4a4e9390e6
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 de427c1..1ceefcb 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 |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)