summaryrefslogtreecommitdiff
path: root/httemplate
diff options
context:
space:
mode:
Diffstat (limited to 'httemplate')
-rw-r--r--httemplate/edit/elements/edit.html3
-rw-r--r--httemplate/elements/tr-select-from_to.html2
-rw-r--r--httemplate/view/cust_main/notes/email.html5
3 files changed, 7 insertions, 3 deletions
diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index 113f611e1..8ba703a2f 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -358,6 +358,7 @@ Example:
% #contact
% 'custnum' => $f->{'custnum'},
% 'prospectnum' => $f->{'prospectnum'},
+%
% );
%
% $include_common{$_} = $f->{$_} foreach grep exists($f->{$_}),
@@ -370,7 +371,7 @@ Example:
% qw( formatted_value ), #fixed
% qw( country ), #select-country
% qw( width height config ), #htmlarea
-% qw( alt_format ), #select-cust_location
+% qw( is_optional alt_format ), #select-cust_location
% qw( classnum ), # select-inventory_item
% qw( aligned ), # columnstart
% qw( debug ), # select-table
diff --git a/httemplate/elements/tr-select-from_to.html b/httemplate/elements/tr-select-from_to.html
index 1224de68a..c24209737 100644
--- a/httemplate/elements/tr-select-from_to.html
+++ b/httemplate/elements/tr-select-from_to.html
@@ -39,7 +39,7 @@
my %hash = (
'show_month_abbr' => 1,
'start_year' => '1999',
- 'end_year' => '2017',
+ 'end_year' => $eyear+3,
@_,
);
</%init>
diff --git a/httemplate/view/cust_main/notes/email.html b/httemplate/view/cust_main/notes/email.html
index 41c5b8ad4..9e217e4f0 100644
--- a/httemplate/view/cust_main/notes/email.html
+++ b/httemplate/view/cust_main/notes/email.html
@@ -61,7 +61,10 @@ my $cust_main = $opt{'cust_main'}
my $custnum = $cust_main->custnum;
my $where = "WHERE cust_msg.custnum = $custnum";
-my $maxrecords = $curuser->option('customer_view_emails') || 10;
+my $maxrecords = 10;
+if ( $curuser->option('customer_view_emails') =~ /^\s*(\d+)\s*$/ ) {
+ $maxrecords = $1;
+}
my $order_by = '_date DESC';