From: Jan Büren <jan@kivitendo-premium.de>
Date: Mon, 6 Jan 2014 13:54:10 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~22^2~53^2^2~2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/0944c42cb08b92576684720c88ab13f21968be0d?hp=08e4ce1ef5caa3f7007d8c97e9e97ef83378b19a

Merge branch 'master' of github.com:kivitendo/kivitendo-erp
---

diff --git a/SL/DB/Manager/BackgroundJobHistory.pm b/SL/DB/Manager/BackgroundJobHistory.pm
index 4f1ddd305..5d7b0d078 100644
--- a/SL/DB/Manager/BackgroundJobHistory.pm
+++ b/SL/DB/Manager/BackgroundJobHistory.pm
@@ -13,7 +13,7 @@ sub object_class { 'SL::DB::BackgroundJobHistory' }
 __PACKAGE__->make_manager_methods;
 
 sub _sort_spec {
-  return ( default => [ 'run_at', 1 ],
+  return ( default => [ 'run_at', 0 ],
            columns => { SIMPLE => 'ALL' } );
 }
 
diff --git a/SL/Presenter/Record.pm b/SL/Presenter/Record.pm
index a00f40055..4f9a51830 100644
--- a/SL/Presenter/Record.pm
+++ b/SL/Presenter/Record.pm
@@ -37,7 +37,7 @@ sub grouped_record_list {
   $output .= _purchase_order_list(         $self, $groups{purchase_orders},          %params) if $groups{purchase_orders};
   $output .= _purchase_delivery_order_list($self, $groups{purchase_delivery_orders}, %params) if $groups{purchase_delivery_orders};
   $output .= _purchase_invoice_list(       $self, $groups{purchase_invoices},        %params) if $groups{purchase_invoices};
-  $output .= _ar_transaction_list(         $self, $groups{ar_transactions},          %params) if $groups{ar_transactions};
+  $output .= _ap_transaction_list(         $self, $groups{ap_transactions},          %params) if $groups{ap_transactions};
 
   $output .= _sepa_collection_list(        $self, $groups{sepa_collections},         %params) if $groups{sepa_collections};
   $output .= _sepa_transfer_list(          $self, $groups{sepa_transfers},           %params) if $groups{sepa_transfers};
diff --git a/templates/webpages/ir/form_header.html b/templates/webpages/ir/form_header.html
index fb9660a01..f5a7daf0a 100644
--- a/templates/webpages/ir/form_header.html
+++ b/templates/webpages/ir/form_header.html
@@ -20,6 +20,7 @@
 <input type="hidden" name="follow_up_trans_type_1" value="sales_invoice">
 <input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
 <input type="hidden" name="follow_up_rowcount" value="1">
+<input type="hidden" name="show_details" value="[% show_details | html %]">
 
 <p><div class="listtop" width="100%">[% title %]</div></p>
 
@@ -224,5 +225,4 @@
      }
    //-->
   </script>
-
-  <input type="hidden" name="webdav" value="[% webdav %]">
+  <input type="hidden" name="webdav" value="[% webdav | html %]">