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
7da1b215
Commit
7da1b215
authored
7 years ago
by
Regis Houssin
Browse files
Options
Downloads
Patches
Plain Diff
Fix: avoid error "A non-numeric value encountered"
parent
ccb5344d
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
htdocs/compta/bank/document.php
+7
-9
7 additions, 9 deletions
htdocs/compta/bank/document.php
htdocs/core/class/dolgraph.class.php
+3
-2
3 additions, 2 deletions
htdocs/core/class/dolgraph.class.php
with
10 additions
and
11 deletions
htdocs/compta/bank/document.php
+
7
−
9
View file @
7da1b215
...
...
@@ -3,7 +3,7 @@
/* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* Copyright (C) 2005-201
1
Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2005-201
7
Regis Houssin <regis@dolibarr.fr>
*
* 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
...
...
@@ -62,9 +62,7 @@ $result = restrictedArea($user, 'banque', $fieldvalue, 'bank_account', '', '',
$sortfield
=
GETPOST
(
"sortfield"
,
'alpha'
);
$sortorder
=
GETPOST
(
"sortorder"
,
'alpha'
);
$page
=
GETPOST
(
"page"
,
'int'
);
if
(
$page
==
-
1
)
{
$page
=
0
;
}
if
(
empty
(
$page
)
||
$page
==
-
1
)
{
$page
=
0
;
}
$offset
=
$conf
->
liste_limit
*
$page
;
$pageprev
=
$page
-
1
;
$pagenext
=
$page
+
1
;
...
...
@@ -122,21 +120,21 @@ if ($id > 0 || !empty($ref)) {
$linkback
=
'<a href="'
.
DOL_URL_ROOT
.
'/compta/bank/index.php">'
.
$langs
->
trans
(
"BackToList"
)
.
'</a>'
;
dol_banner_tab
(
$object
,
'ref'
,
$linkback
,
1
,
'ref'
,
'ref'
,
$morehtmlref
);
print
'<div class="fichecenter">'
;
print
'<div class="underbanner clearboth"></div>'
;
print
'<table class="border" width="100%">'
;
print
'<tr><td class="titlefield">'
.
$langs
->
trans
(
"NbOfAttachedFiles"
)
.
'</td><td colspan="3">'
.
count
(
$filearray
)
.
'</td></tr>'
;
print
'<tr><td>'
.
$langs
->
trans
(
"TotalSizeOfAttachedFiles"
)
.
'</td><td colspan="3">'
.
$totalsize
.
' '
.
$langs
->
trans
(
"bytes"
)
.
'</td></tr>'
;
print
"</table>
\n
"
;
print
'</div>'
;
dol_fiche_end
();
$modulepart
=
'bank'
;
$permission
=
$user
->
rights
->
banque
->
modifier
;
$permtoedit
=
$user
->
rights
->
banque
->
modifier
;
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/class/dolgraph.class.php
+
3
−
2
View file @
7da1b215
...
...
@@ -25,7 +25,7 @@
/**
* Class to build graphs.
* Usage is:
* Usage is:
* $dolgraph=new DolGraph();
* $dolgraph->SetTitle($langs->transnoentities('Tracking_Projects_Pourcent').'<br>'.$langs->transnoentities('Tracking_IndicatorDefGraph').'%');
* $dolgraph->SetMaxValue(50);
...
...
@@ -570,6 +570,7 @@ class DolGraph
function
GetFloorMinValue
()
{
$min
=
$this
->
GetMinValueInData
();
if
(
$min
==
''
)
$min
=
0
;
if
(
$min
!=
0
)
$min
--
;
$size
=
dol_strlen
(
abs
(
floor
(
$min
)));
$factor
=
1
;
...
...
@@ -868,7 +869,7 @@ class DolGraph
return
;
}
$this
->
stringtoshow
.
=
'<div id="placeholder_'
.
$tag
.
'" style="width:'
.
$this
->
width
.
'px;height:'
.
$this
->
height
.
'px;" class="dolgraph'
.
(
empty
(
$this
->
cssprefix
)
?
''
:
' dolgraph'
.
$this
->
cssprefix
)
.
'"></div>'
.
"
\n
"
;
$this
->
stringtoshow
.
=
'<script id="'
.
$tag
.
'">'
.
"
\n
"
;
$this
->
stringtoshow
.
=
'$(function () {'
.
"
\n
"
;
$i
=
$firstlot
;
...
...
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