Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
0dcd41ff
Commit
0dcd41ff
authored
10 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Plain Diff
Merge branch 'marcosgdf-bug-1546' into 3.5
parents
e8758bc1
c4facf20
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+1
-0
1 addition, 0 deletions
ChangeLog
htdocs/compta/bank/account.php
+15
-10
15 additions, 10 deletions
htdocs/compta/bank/account.php
with
16 additions
and
10 deletions
ChangeLog
+
1
−
0
View file @
0dcd41ff
...
...
@@ -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.
...
...
This diff is collapsed.
Click to expand it.
htdocs/compta/bank/account.php
+
15
−
10
View file @
0dcd41ff
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment