From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 19 Nov 2012 14:39:29 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta2~11^2~2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/5a68fd1378de2f66315dc897d426fb397764f75e?hp=4f08d0be48e16be585e3c33a0ad82d56b37ac55d

Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
---

diff --git a/SL/Controller/Helper/Paginated.pm b/SL/Controller/Helper/Paginated.pm
index 11eddd32d..1683aada0 100644
--- a/SL/Controller/Helper/Paginated.pm
+++ b/SL/Controller/Helper/Paginated.pm
@@ -7,6 +7,8 @@ our @EXPORT = qw(make_paginated get_paginate_spec get_current_paginate_params _s
 
 use constant PRIV => '__paginatedhelper_priv';
 
+use List::Util qw(min);
+
 my %controller_paginate_spec;
 
 sub make_paginated {
@@ -60,7 +62,8 @@ sub get_current_paginate_params {
                         :                                         ();
   my $calculated_params = "SL::DB::Manager::$spec->{MODEL}"->paginate(%paginate_params, args => \%paginate_args);
   %paginate_params      = (
-    %paginate_params,
+    page         => min($paginate_params{page}, $calculated_params->{max}),
+    per_page     => $paginate_params{per_page},
     num_pages    => $calculated_params->{max},
     common_pages => $calculated_params->{common},
   );
diff --git a/sql/Pg-upgrade2/rename_buchungsgruppe_16_19_to_19.sql b/sql/Pg-upgrade2/rename_buchungsgruppe_16_19_to_19.sql
new file mode 100644
index 000000000..6cf6a161b
--- /dev/null
+++ b/sql/Pg-upgrade2/rename_buchungsgruppe_16_19_to_19.sql
@@ -0,0 +1,5 @@
+-- @tag: rename_buchungsgruppe_16_19_to_19
+-- @description: Buchungsgruppe '16%/19%' in '19%' umbenennen
+-- @depends: release_2_7_0
+
+UPDATE buchungsgruppen SET description = 'Standard 19%' WHERE description = 'Standard 16%/19%';