[freeside-commits] branch FREESIDE_4_BRANCH updated. b2394238aa56b29ede1f7f46c023ac580e32d758

[Jonathan Prykop]

The branch, FREESIDE_4_BRANCH has been updated
       via  b2394238aa56b29ede1f7f46c023ac580e32d758 (commit)
       via  8f002272a3e5dab09c0df7ef5bad6dc712a4c0ad (commit)
      from  39e94017fa012d970f281099858ccceb997fa6b5 (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 b2394238aa56b29ede1f7f46c023ac580e32d758
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 4d87fab..14c3f51 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 8f002272a3e5dab09c0df7ef5bad6dc712a4c0ad
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 |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)