[freeside-commits] branch FREESIDE_3_BRANCH updated. e8b12b86dceb0649b883433a8051d5bc18dc59b9

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  e8b12b86dceb0649b883433a8051d5bc18dc59b9 (commit)
      from  7ce15a2d67f0eff134b8c3ca9be58ccc58ad9029 (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 e8b12b86dceb0649b883433a8051d5bc18dc59b9
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Feb 5 11:44:38 2014 -0800

    add "Net 25" invoice terms, #27429

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 71b6ee3..2d9dc64 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1529,8 +1529,11 @@ and customer address. Include units.',
     'section'     => 'invoicing',
     'description' => 'Optional default invoice term, used to calculate a due date printed on invoices.',
     'type'        => 'select',
-    'select_enum' => [ '', 'Payable upon receipt', 'Net 0', 'Net 3', 'Net 9', 'Net 10', 'Net 15', 'Net 18', 'Net 20', 'Net 21', 'Net 30', 'Net 45', 'Net 60', 'Net 90' ],
-  },
+    'select_enum' => [ 
+      '', 'Payable upon receipt', 'Net 0', 'Net 3', 'Net 9', 'Net 10', 
+      'Net 15', 'Net 18', 'Net 20', 'Net 21', 'Net 25', 'Net 30', 'Net 45', 
+      'Net 60', 'Net 90'
+    ], },
 
   { 
     'key'         => 'invoice_show_prior_due_date',
diff --git a/httemplate/elements/select-terms.html b/httemplate/elements/select-terms.html
index a66aa29..57a83f0 100644
--- a/httemplate/elements/select-terms.html
+++ b/httemplate/elements/select-terms.html
@@ -33,7 +33,8 @@ my $empty_label =
 my $empty_value = $opt{'empty_value'} || '';
 
 my @terms = ( emt('Payable upon receipt'),
-              ( map "Net $_", 0, 3, 9, 10, 15, 18, 20, 30, 45, 60, 90 ),
+              ( map "Net $_",
+                0, 3, 9, 10, 15, 18, 20, 21, 25, 30, 45, 60, 90 ),
             );
 
 my @pre_options = $opt{pre_options} ? @{ $opt{pre_options} } : ();

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

Summary of changes:
 FS/FS/Conf.pm                         |    7 +++++--
 httemplate/elements/select-terms.html |    3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)