[freeside-commits] branch master updated. c6e21dc3379f34f23896f2a09731c34981ab6018

[Ivan]

The branch, master has been updated
       via  c6e21dc3379f34f23896f2a09731c34981ab6018 (commit)
      from  8ae921f9d6b1405e3712a7626b80014cd29d5259 (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 c6e21dc3379f34f23896f2a09731c34981ab6018
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Dec 21 00:07:41 2012 -0800

    add option _not_ to apply a lineitem credit, RT#18676

diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index 18d8bed..fe9572f 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -629,6 +629,7 @@ Example:
     'billpkgnums'       => \@billpkgnums,
     'setuprecurs'       => \@setuprecurs,
     'amounts'           => \@amounts,
+    'apply'             => 1, #0 leaves the credit unapplied
 
     #the credit
     'newreasonnum'      => scalar($cgi->param('newreasonnum')),
@@ -706,6 +707,11 @@ sub credit_lineitems {
     return "Error inserting credit: $error";
   }
 
+  unless ( $arg{'apply'} ) {
+    $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+    return '';
+  }
+
   #my $subtotal = 0;
   my $taxlisthash = {};
   my %cust_credit_bill = ();
diff --git a/httemplate/edit/credit-cust_bill_pkg.html b/httemplate/edit/credit-cust_bill_pkg.html
index f5c4eef..e0ca04b 100644
--- a/httemplate/edit/credit-cust_bill_pkg.html
+++ b/httemplate/edit/credit-cust_bill_pkg.html
@@ -91,6 +91,15 @@
   </TD>
 </TR>
 
+% if ( $conf->exists('credits-auto-apply-disable') ) {
+        <INPUT TYPE="HIDDEN" NAME="apply" VALUE="no">
+% } else {
+  <TR>
+    <TD ALIGN="right"><% mt('Apply to selected line items') |h %></TD>
+    <TD><SELECT NAME="apply"><OPTION VALUE="yes" SELECTED><% mt('yes') |h %><OPTION><% mt('no') |h %></SELECT></TD>
+  </TR>
+% }
+
 </table>
 
 <BR>
diff --git a/httemplate/edit/process/credit-cust_bill_pkg.html b/httemplate/edit/process/credit-cust_bill_pkg.html
index 1b61997..cbcf619 100644
--- a/httemplate/edit/process/credit-cust_bill_pkg.html
+++ b/httemplate/edit/process/credit-cust_bill_pkg.html
@@ -32,6 +32,7 @@ my $error = FS::cust_credit->credit_lineitems(
   'billpkgnums'       => \@billpkgnums,
   'setuprecurs'       => \@setuprecurs,
   'amounts'           => \@amounts,
+  'apply'             => ( $cgi->param('apply') eq 'yes' ),
 
   #the credit
   'newreasonnum'      => scalar($cgi->param('newreasonnum')),

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

Summary of changes:
 FS/FS/cust_credit.pm                              |    6 ++++++
 httemplate/edit/credit-cust_bill_pkg.html         |    9 +++++++++
 httemplate/edit/process/credit-cust_bill_pkg.html |    1 +
 3 files changed, 16 insertions(+), 0 deletions(-)