diff --git a/ChangeLog b/ChangeLog index b4255c930104d7a785731a9039eeb631ecf38552..cc36bf9241294d42c848c0e49d12f6f25423320a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ Fix: [ bug #1591 ] Linked object block shows Total HT/TTC even if not having per Fix: [ bug #1577 ] When creating new Private individual third, selected third type is ignored Fix: [ bug #1555 ] Update accountancy code of products does not throw PRODUCT_MODIFY trigger Fix: [ bug #1548 ] Supplier payment card shows type in French +Fix: [ bug #1546 ] Incorrect page number when searching in the list of bank transactions ***** ChangeLog for 3.5.4 compared to 3.5.3 ***** Fix: Hide title of event when agenda module disabled. diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 2cdda511bdb97514acb25f39c9fa4301d6f0ff4a..e1d595aefccdbadbf8f88256ce82f2c8fc7cd891 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -5,7 +5,7 @@ * Copyright (C) 2004 Christophe Combelles <ccomb@free.fr> * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2010-2011 Juanjo Menent <jmenent@@2byte.es> - * Copyright (C) 2012 Marcos García <marcosgdf@gmail.com> + * Copyright (C) 2012-2014 Marcos García <marcosgdf@gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -253,17 +253,22 @@ if ($id > 0 || ! empty($ref)) //Total pages $totalPages = ceil($total_lines/$viewline); - if ($page > 0) - { - $limitsql = ($totalPages - $page) * $viewline; - if ($limitsql < $viewline) $limitsql = $viewline; - $nbline = $limitsql; - } - else - { + if ($totalPages == 0) { $page = 0; - $limitsql = $nbline; + } else { + + if ($page > 0) { + $limitsql = ($totalPages - $page) * $viewline; + if ($limitsql < $viewline) { + $limitsql = $viewline; + } + $nbline = $limitsql; + } else { + $page = 0; + $limitsql = $nbline; + } } + //print $limitsql.'-'.$page.'-'.$viewline; // Onglets