3 files changed, 29 insertions, 1 deletions
diff --git a/httemplate/elements/select-part_event.html b/httemplate/elements/select-part_event.html
new file mode 100644
index 000000000..f510672ba
--- /dev/null
+++ b/httemplate/elements/select-part_event.html
@@ -0,0 +1,6 @@
+<% include( '/elements/select-table.html',
+              'table'      => 'part_event',
+              'name_col'   => 'event',
+              @_,
+          )
+%>
diff --git a/httemplate/elements/select-payby.html b/httemplate/elements/select-payby.html
index 3f19cb952..e0fb4f07d 100644
--- a/httemplate/elements/select-payby.html
+++ b/httemplate/elements/select-payby.html
@@ -8,7 +8,9 @@
 % }
 
 % foreach my $option ( keys %{ $opt{'paybys'} } ) { 
-%   my $sel = ( ref($value) && $value->{$option} ) || $option eq $value;
+%   my $sel = $opt{'all_selected'}
+%               || ( ref($value) && $value->{$option} )
+%               || $option eq $value;
 
     <OPTION VALUE="<% $option %>"
             <% $sel ? 'SELECTED' : '' %>
diff --git a/httemplate/elements/tr-select-part_event.html b/httemplate/elements/tr-select-part_event.html
new file mode 100644
index 000000000..e1d913f2a
--- /dev/null
+++ b/httemplate/elements/tr-select-part_event.html
@@ -0,0 +1,20 @@
+% unless ( $opt{'js_only'} ) {
+
+    <% include('tr-td-label.html', @_ ) %>
+
+      <TD <% $style %>>
+% }
+
+        <% include( '/elements/select-part_event.html', %opt ) %>
+
+% unless ( $opt{'js_only'} ) {
+      </TD>
+    </TR>
+% }
+<%init>
+
+my( %opt ) = @_;
+
+my $style = $opt{'cell_style'} ? 'STYLE="'. $opt{'cell_style'}. '"' : '';
+
+</%init>