[freeside-commits] branch master updated. 0b6bd6405107c1abf8f2c5e2bc1b569870a02309

Ivan ivan at 420.am
Sun Jan 18 15:13:30 PST 2015


The branch, master has been updated
       via  0b6bd6405107c1abf8f2c5e2bc1b569870a02309 (commit)
      from  f5a77514d6816225b378ced1d598ba745d0c22b4 (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 0b6bd6405107c1abf8f2c5e2bc1b569870a02309
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun Jan 18 15:13:28 2015 -0800

    remove Ref field from quotations and invoices, RT#22232

diff --git a/conf/invoice_html b/conf/invoice_html
index ae17da3..e9b0bdf 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -143,7 +143,7 @@
             $OUT .= $header;
             $columncount = scalar(my @array = split /<\/th><th/i, $header);
           } else {
-            $OUT .=  '<th align="center">' . emt('Ref') . '</th>'.
+            $OUT .=  '<th align="center"></th>'.
                      '<th align="left">' . emt('Description') . '</th>'.
                      ( $unitprices 
                        ? '<th align="right">' . emt('Unit Price') . '</th>'.
@@ -172,9 +172,9 @@
               }
               $OUT .= '<tr class="'.$class.'">
                        <td align="center">';
-              if ( $line->{'ref'} ne $lastref ) {
-                $OUT .= $line->{'ref'};
-              }
+              #if ( $line->{'ref'} ne $lastref ) {
+              #  $OUT .= $line->{'ref'};
+              #}
               $OUT .= '</td>
                        <td align="left">'. $line->{'description'}. '</td>';
               if ( $unitprices ) {
diff --git a/conf/invoice_latex b/conf/invoice_latex
index 99d12d5..822afcb 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -176,7 +176,7 @@
 \newcommand{\FShead}{
   \hline
   \rule{0pt}{2.5ex}
-  \makebox[1.4cm]{\textbf{Ref}} &
+  \makebox[1.4cm]{} &
   \multicolumn{\FSdescriptioncolumncount}{l}{\makebox[\FSdescriptionlength][l]{\textbf{[@-- emt('Description') --@]}}}&
   \FSunitcolumns
   \makebox[1.6cm][r]{\textbf{[@-- emt('Amount') --@]}} \\
@@ -332,7 +332,7 @@
           $OUT .= &{$section->{description_generator}}($line);
         } else {
           $OUT .= '\FSdesc'.
-                  '{' . ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ) . '}'.
+                  '{}'. #'{' . ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ) . '}'.
                   '{' . $line->{'description'} . '}' ;
           if ( $unitprices and length($line->{'unit_amount'}) ) {
             # then show the unit amount and quantity
diff --git a/conf/quotation_html b/conf/quotation_html
index 7d69205..a05bb60 100644
--- a/conf/quotation_html
+++ b/conf/quotation_html
@@ -129,7 +129,7 @@
             $OUT .= $header;
             $columncount = scalar(my @array = split /<\/th><th/i, $header);
           } else {
-            $OUT .=  '<th align="center">' . emt('Ref') . '</th>'.
+            $OUT .=  '<th align="center"></th>'.
                      '<th align="left">' . emt('Description') . '</th>'.
                      ( $unitprices 
                        ? '<th align="left">' . emt('Unit Price') . '</th>'.
@@ -156,7 +156,7 @@
                        '">'.
                        '<td align="center">'. 
                          ( $line->{'ref'} ne $lastref
-                             ? $line->{'preref_html'}. $line->{'ref'}
+                             ? $line->{'preref_html'} #. $line->{'ref'}
                              : ''
                          ).
                        '</td>'.
diff --git a/conf/quotation_latex b/conf/quotation_latex
index d56a7fb..7ebc38d 100644
--- a/conf/quotation_latex
+++ b/conf/quotation_latex
@@ -171,7 +171,7 @@
 \newcommand{\FShead}{
   \hline
   \rule{0pt}{2.5ex}
-  \makebox[1.4cm]{\textbf{Ref}} &
+  \makebox[1.4cm]{} &
   \multicolumn{\FSdescriptioncolumncount}{l}{\makebox[\FSdescriptionlength][l]{\textbf{[@-- emt('Description') --@]}}}&
   \FSunitcolumns
   \makebox[1.6cm][r]{\textbf{[@-- emt('Amount') --@]}} \\
@@ -313,7 +313,7 @@
           $OUT .= &{$section->{description_generator}}($line);
         } else {
           $OUT .= '\FSdesc'.
-                  '{' . ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ) . '}'.
+                  '{}'. #'{' . ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ) . '}'.
                   '{' . $line->{'description'} . '}' .
                   '{' . ( $unitprices ? $line->{'unit_amount'} : '' ) . '}'.
                   '{' . ( $unitprices ? $line->{'quantity'} : ''  ) . '}' .

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

Summary of changes:
 conf/invoice_html    |    8 ++++----
 conf/invoice_latex   |    4 ++--
 conf/quotation_html  |    4 ++--
 conf/quotation_latex |    4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)




More information about the freeside-commits mailing list