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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
5b89bc18
Commit
5b89bc18
authored
11 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
[ bug #1231 ] PDF always generated in interventions
parent
aad7885b
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+5
-1
5 additions, 1 deletion
ChangeLog
htdocs/fichinter/fiche.php
+20
-16
20 additions, 16 deletions
htdocs/fichinter/fiche.php
with
25 additions
and
17 deletions
ChangeLog
+
5
−
1
View file @
5b89bc18
...
...
@@ -15,6 +15,10 @@ Fix: Link to paypal was invalid into email text.
Fix: ref and date of supplier invoice.
Fix: Check on bank account.
Fix: Problem with file upload and download.
Fix: Page load not ending when large number of thirdparies. We
added option MAIN_DISABLE_AJAX_COMBOX to disable javascript
combo feature that is root cause of problem.
Fix: [ bug #1231 ] PDF always generated in interventions
***** ChangeLog for 3.5 compared to 3.4.* *****
For users:
...
...
This diff is collapsed.
Click to expand it.
htdocs/fichinter/fiche.php
+
20
−
16
View file @
5b89bc18
...
...
@@ -109,7 +109,8 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->fichein
$outputlangs
=
new
Translate
(
""
,
$conf
);
$outputlangs
->
setDefaultLang
(
$newlang
);
}
$result
=
fichinter_create
(
$db
,
$object
,
GETPOST
(
'model'
,
'alpha'
),
$outputlangs
);
if
(
empty
(
$conf
->
global
->
MAIN_DISABLE_PDF_AUTOUPDATE
))
$result
=
fichinter_create
(
$db
,
$object
,
GETPOST
(
'model'
,
'alpha'
),
$outputlangs
);
header
(
'Location: '
.
$_SERVER
[
"PHP_SELF"
]
.
'?id='
.
$object
->
id
);
exit
;
}
...
...
@@ -134,7 +135,8 @@ else if ($action == 'confirm_modify' && $confirm == 'yes' && $user->rights->fich
$outputlangs
=
new
Translate
(
""
,
$conf
);
$outputlangs
->
setDefaultLang
(
$newlang
);
}
$result
=
fichinter_create
(
$db
,
$object
,
(
!
GETPOST
(
'model'
,
'alpha'
))
?
$object
->
model
:
GETPOST
(
'model'
,
'apha'
),
$outputlangs
);
if
(
empty
(
$conf
->
global
->
MAIN_DISABLE_PDF_AUTOUPDATE
))
$result
=
fichinter_create
(
$db
,
$object
,
(
!
GETPOST
(
'model'
,
'alpha'
))
?
$object
->
model
:
GETPOST
(
'model'
,
'apha'
),
$outputlangs
);
header
(
'Location: '
.
$_SERVER
[
"PHP_SELF"
]
.
'?id='
.
$object
->
id
);
exit
;
}
...
...
@@ -459,7 +461,7 @@ else if ($action == "addline" && $user->rights->ficheinter->creer)
{
$db
->
commit
();
fichinter_create
(
$db
,
$object
,
$object
->
modelpdf
,
$outputlangs
);
if
(
empty
(
$conf
->
global
->
MAIN_DISABLE_PDF_AUTOUPDATE
))
fichinter_create
(
$db
,
$object
,
$object
->
modelpdf
,
$outputlangs
);
header
(
'Location: '
.
$_SERVER
[
"PHP_SELF"
]
.
'?id='
.
$object
->
id
);
exit
;
}
...
...
@@ -529,7 +531,7 @@ else if ($action == 'updateline' && $user->rights->ficheinter->creer && GETPOST(
$outputlangs
=
new
Translate
(
""
,
$conf
);
$outputlangs
->
setDefaultLang
(
$newlang
);
}
fichinter_create
(
$db
,
$object
,
$object
->
modelpdf
,
$outputlangs
);
if
(
empty
(
$conf
->
global
->
MAIN_DISABLE_PDF_AUTOUPDATE
))
fichinter_create
(
$db
,
$object
,
$object
->
modelpdf
,
$outputlangs
);
header
(
'Location: '
.
$_SERVER
[
"PHP_SELF"
]
.
'?id='
.
$object
->
id
);
exit
;
...
...
@@ -564,7 +566,7 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->
$outputlangs
=
new
Translate
(
""
,
$conf
);
$outputlangs
->
setDefaultLang
(
$newlang
);
}
fichinter_create
(
$db
,
$object
,
$object
->
modelpdf
,
$outputlangs
);
if
(
empty
(
$conf
->
global
->
MAIN_DISABLE_PDF_AUTOUPDATE
))
fichinter_create
(
$db
,
$object
,
$object
->
modelpdf
,
$outputlangs
);
}
/*
...
...
@@ -585,7 +587,8 @@ else if ($action == 'up' && $user->rights->ficheinter->creer)
$outputlangs
=
new
Translate
(
""
,
$conf
);
$outputlangs
->
setDefaultLang
(
$newlang
);
}
fichinter_create
(
$db
,
$object
,
$object
->
modelpdf
,
$outputlangs
);
if
(
empty
(
$conf
->
global
->
MAIN_DISABLE_PDF_AUTOUPDATE
))
fichinter_create
(
$db
,
$object
,
$object
->
modelpdf
,
$outputlangs
);
header
(
'Location: '
.
$_SERVER
[
"PHP_SELF"
]
.
'?id='
.
$object
->
id
.
'#'
.
GETPOST
(
'line_id'
,
'int'
));
exit
;
}
...
...
@@ -604,7 +607,8 @@ else if ($action == 'down' && $user->rights->ficheinter->creer)
$outputlangs
=
new
Translate
(
""
,
$conf
);
$outputlangs
->
setDefaultLang
(
$newlang
);
}
fichinter_create
(
$db
,
$object
,
$object
->
modelpdf
,
$outputlangs
);
if
(
empty
(
$conf
->
global
->
MAIN_DISABLE_PDF_AUTOUPDATE
))
fichinter_create
(
$db
,
$object
,
$object
->
modelpdf
,
$outputlangs
);
header
(
'Location: '
.
$_SERVER
[
"PHP_SELF"
]
.
'?id='
.
$object
->
id
.
'#'
.
GETPOST
(
'line_id'
,
'int'
));
exit
;
}
...
...
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