[freeside-commits] freeside/FS/FS Conf.pm, 1.468.2.33, 1.468.2.34 cust_bill.pm, 1.350.2.18, 1.350.2.19

Mark Wells mark at wavetail.420.am
Sat Jan 14 18:18:34 PST 2012


Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv25145/FS/FS

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	Conf.pm cust_bill.pm 
Log Message:
per-agent disable_previous_balance, #15863

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.468.2.33
retrieving revision 1.468.2.34
diff -u -w -d -r1.468.2.33 -r1.468.2.34
--- Conf.pm	14 Jan 2012 07:05:16 -0000	1.468.2.33
+++ Conf.pm	15 Jan 2012 02:18:29 -0000	1.468.2.34
@@ -3693,6 +3693,7 @@
     'section'     => 'invoicing',
     'description' => 'Disable inclusion of previous balance, payment, and credit lines on invoices',
     'type'        => 'checkbox',
+    'per_agent'   => 1,
   },
 
   {

Index: cust_bill.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_bill.pm,v
retrieving revision 1.350.2.18
retrieving revision 1.350.2.19
diff -u -w -d -r1.350.2.18 -r1.350.2.19
--- cust_bill.pm	3 Jan 2012 05:10:25 -0000	1.350.2.18
+++ cust_bill.pm	15 Jan 2012 02:18:31 -0000	1.350.2.19
@@ -2993,7 +2993,7 @@
     }
   }
 
-  unless (    $conf->exists('disable_previous_balance')
+  unless (    $conf->exists('disable_previous_balance', $agentnum)
            || $conf->exists('previous_balance-summary_only')
          )
   {
@@ -3027,7 +3027,8 @@
 
   }
   
-  if ( @pr_cust_bill && !$conf->exists('disable_previous_balance') ) {
+  if ( @pr_cust_bill && !$conf->exists('disable_previous_balance', $agentnum) ) 
+    {
     push @buf, ['','-----------'];
     push @buf, [ $self->mt('Total Previous Balance'),
                  $money_char. sprintf("%10.2f", $pr_total) ];
@@ -3143,7 +3144,7 @@
   $invoice_data{current_less_finance} =
     sprintf('%.2f', $self->charged - $invoice_data{finance_amount} );
 
-  if ( $multisection && !$conf->exists('disable_previous_balance')
+  if ( $multisection && !$conf->exists('disable_previous_balance', $agentnum)
     || $conf->exists('previous_balance-summary_only') )
   {
     unshift @sections, $previous_section if $pr_total;
@@ -3207,7 +3208,7 @@
 
   push @buf,['','-----------'];
   push @buf,[$self->mt( 
-              $conf->exists('disable_previous_balance') 
+              $conf->exists('disable_previous_balance', $agentnum) 
                ? 'Total Charges'
                : 'Total New Charges'
              ),
@@ -3221,7 +3222,7 @@
          || 'Total New Charges'
       if $conf->exists('previous_balance-exclude_from_total');
     my $amount = $self->charged +
-                   ( $conf->exists('disable_previous_balance') ||
+                   ( $conf->exists('disable_previous_balance', $agentnum) ||
                      $conf->exists('previous_balance-exclude_from_total')
                      ? 0
                      : $pr_total
@@ -3248,7 +3249,7 @@
     push @buf,['',''];
   }
   
-  unless ( $conf->exists('disable_previous_balance') ) {
+  unless ( $conf->exists('disable_previous_balance', $agentnum) ) {
     #foreach my $thing ( sort { $a->_date <=> $b->_date } $self->_items_credits, $self->_items_payments
   
     # credits



More information about the freeside-commits mailing list