summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2014-02-06 09:34:37 -0800
committerIvan Kohler <ivan@freeside.biz>2014-02-06 09:34:37 -0800
commit02b8d7a9f1689ccd74d749bc18ed2d0d17447925 (patch)
treeccd48e32546626192824a6fcc2c123c5a473de50
parent2981cbf6dba3a412349731872aebd9c4b232f3b3 (diff)
parente8b12b86dceb0649b883433a8051d5bc18dc59b9 (diff)
Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH
-rw-r--r--FS/FS/Conf.pm7
-rw-r--r--httemplate/elements/select-terms.html3
2 files changed, 7 insertions, 3 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 71b6ee353..2d9dc64c1 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 a66aa29ae..57a83f053 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} } : ();