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
4de4c66b
Commit
4de4c66b
authored
9 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Plain Diff
git push origin 3.5Merge branch 'marcosgdf-bug-2576' into 3.5
parents
5f49b2a9
ed6abb0f
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/admin/dict.php
+2
-2
2 additions, 2 deletions
htdocs/admin/dict.php
with
3 additions
and
2 deletions
ChangeLog
+
1
−
0
View file @
4de4c66b
...
...
@@ -14,6 +14,7 @@ Fix: [ bug #1906 ] Deplacement does not allow translated decimal format
Fix: [ bug #1905 ] Custom deplacement types do not get translated in deplacement card
Fix: [ bug #2583 ] Unable to create a bank transfer with localized numbers
Fix: [ bug #2577 ] Incorrect invoice status in "Linked objects" page of a project
Fix: [ bug #2576 ] Unable to edit a dictionary entry that has # in its ref
***** ChangeLog for 3.5.6 compared to 3.5.5 *****
Fix: Avoid missing class error for fetch_thirdparty method #1973
...
...
This diff is collapsed.
Click to expand it.
htdocs/admin/dict.php
+
2
−
2
View file @
4de4c66b
...
...
@@ -6,7 +6,7 @@
* Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2011 Remy Younes <ryounes@gmail.com>
* Copyright (C) 2012-201
3
Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2012-201
5
Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2012 Christophe Battarel <christophe.battarel@ltairis.fr>
* Copyright (C) 2011-2012 Alexandre Spangaro <alexandre.spangaro@gmail.com>
*
...
...
@@ -1104,7 +1104,7 @@ if ($id)
if
(
isset
(
$obj
->
type
)
&&
in_array
(
$obj
->
type
,
array
(
'system'
,
'systemauto'
)))
$iserasable
=
0
;
$url
=
$_SERVER
[
"PHP_SELF"
]
.
'?'
.
(
$page
?
'page='
.
$page
.
'&'
:
''
)
.
'sortfield='
.
$sortfield
.
'&sortorder='
.
$sortorder
.
'&rowid='
.
(
!
empty
(
$obj
->
rowid
)
?
$obj
->
rowid
:
(
!
empty
(
$obj
->
code
)
?
$obj
->
code
:
''
))
.
'&code='
.
(
!
empty
(
$obj
->
code
)
?
$obj
->
code
:
''
)
.
'&id='
.
$id
.
'&'
;
$url
=
$_SERVER
[
"PHP_SELF"
]
.
'?'
.
(
$page
?
'page='
.
$page
.
'&'
:
''
)
.
'sortfield='
.
$sortfield
.
'&sortorder='
.
$sortorder
.
'&rowid='
.
(
!
empty
(
$obj
->
rowid
)
?
$obj
->
rowid
:
(
!
empty
(
$obj
->
code
)
?
$obj
->
code
:
''
))
.
'&code='
.
(
!
empty
(
$obj
->
code
)
?
urlencode
(
$obj
->
code
)
:
''
)
.
'&id='
.
$id
.
'&'
;
// Active
print
'<td align="center" class="nowrap">'
;
...
...
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