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
fa733c8b
Commit
fa733c8b
authored
11 years ago
by
Marcos García de La Fuente
Browse files
Options
Downloads
Patches
Plain Diff
Fix: [ bug #1405 ] Rouget PDF expedition incorrect when two expeditions under the same commande
parent
9ae9f062
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+1
-0
1 addition, 0 deletions
ChangeLog
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+1
-1
1 addition, 1 deletion
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
with
2 additions
and
1 deletion
ChangeLog
+
1
−
0
View file @
fa733c8b
...
...
@@ -26,6 +26,7 @@ Fix: [ bug #1381 ] PHP Warning when listing stock transactions page.
Fix: [ bug #1367 ] "Show invoice" link after a POS sell throws an error.
Fix: TCPDF error file not found in member card generation.
Fix: [ bug #1380 ] Customer invoices are not grouped in company results report.
Fix: [ bug #1405 ] Rouget PDF expedition incorrect when two expeditions under the same commande
***** ChangeLog for 3.5.2 compared to 3.5.1 *****
Fix: Can't add user for a task.
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+
1
−
1
View file @
fa733c8b
...
...
@@ -179,7 +179,7 @@ class pdf_rouget extends ModelePdfExpedition
$tab_height
=
130
;
$tab_height_newpage
=
150
;
if
(
!
empty
(
$object
->
note_public
)
||
!
empty
(
$object
->
tracking_number
))
if
(
!
empty
(
$object
->
note_public
)
||
(
!
empty
(
$object
->
tracking_number
)
&&
!
empty
(
$object
->
shipping_method_id
))
)
{
$tab_top
=
88
;
...
...
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