[freeside-commits] branch master updated. 67ecd0e886a2d08ff77bac7fb82c0b9be202710f

[Ivan]

The branch, master has been updated
       via  67ecd0e886a2d08ff77bac7fb82c0b9be202710f (commit)
      from  1d61483cd82a5d2dd59a2218ea85b4f8773e177e (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 67ecd0e886a2d08ff77bac7fb82c0b9be202710f
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Apr 3 17:29:29 2017 -0700

    discounts on one-time charges< RT#75448

diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html
index 0045b1f..07501a4 100644
--- a/httemplate/edit/quick-charge.html
+++ b/httemplate/edit/quick-charge.html
@@ -224,9 +224,6 @@ function bill_now_changed (what) {
       </TD>
     </TR>
 
-%   if ( $curuser->access_right('Edit package definition costs') ) {
-%   }
-
 %   if ( $conf->exists('invoice-unitprice') ) {
     <TR>
       <TH ALIGN="right"><% mt('Quantity') |h %> </TH>
@@ -262,7 +259,7 @@ function bill_now_changed (what) {
 % unless ($quotationnum) {
 <TR>
   <TD></TD>
-  <TD><FONT SIZE="-1"><% mt('Optional additional description (also printed on invoice):') |h %> </FONT></TD>
+  <TH ALIGN="left"><% mt('Optional additional description (also printed on invoice):') |h %></TH>
 </TR>
 
 %   foreach (@description) {
@@ -349,30 +346,30 @@ function bill_now_changed (what) {
 </SCRIPT>
 
 
-% if ( $curuser->access_right('Edit package definition costs') ) {
+<TD>
 
-  <TD>
+  <FONT CLASS="fsinnerbox-title">Taxation</FONT>
+  <TABLE CLASS="fsinnerbox">
 
-    <FONT CLASS="fsinnerbox-title">Taxation</FONT>
-    <TABLE CLASS="fsinnerbox">
+  <TR>
+    <TH ALIGN="right"><% mt('Tax exempt') |h %> </TH>
+    <TD><INPUT TYPE="checkbox" NAME="setuptax" VALUE="Y" <% $cgi->param('setuptax') ? 'CHECKED' : '' %>></TD>
+  </TR>
 
-    <TR>
-      <TH ALIGN="right"><% mt('Tax exempt') |h %> </TH>
-      <TD><INPUT TYPE="checkbox" NAME="setuptax" VALUE="Y" <% $cgi->param('setuptax') ? 'CHECKED' : '' %>></TD>
-    </TR>
+  <& /elements/tr-select-taxclass.html, 'curr_value' => scalar($cgi->param('taxclass')) &>
 
-    <& /elements/tr-select-taxclass.html, 'curr_value' => scalar($cgi->param('taxclass')) &>
+  <& /elements/tr-select-taxproduct.html,
+    'label'      => emt('Tax product'),
+    'curr_value' => scalar($cgi->param('taxproductnum')),
+  &>
 
-    <& /elements/tr-select-taxproduct.html,
-      'label'      => emt('Tax product'),
-      'curr_value' => scalar($cgi->param('taxproductnum')),
-    &>
+  <& /elements/tr-select-taxoverride.html,
+    'curr_value' => scalar($cgi->param('tax_override')),
+  &>
 
-    <& /elements/tr-select-taxoverride.html,
-      'curr_value' => scalar($cgi->param('tax_override')),
-    &>
+  </TABLE>
 
-    </TABLE>
+% if ( $curuser->access_right('Edit package definition costs') ) {
 
     <BR>
     <FONT CLASS="fsinnerbox-title"><% mt('Cost Accounting') |h %>
@@ -388,10 +385,11 @@ function bill_now_changed (what) {
 
     </TABLE>
 
-  </TD>
-
 % }
 
+</TD>
+
+
 </TR></TABLE>
 
 

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

Summary of changes:
 httemplate/edit/quick-charge.html |   44 ++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 23 deletions(-)