lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: [ bug #1405 ] Rouget PDF expedition incorrect when two expeditions under the same commande

Browse Source
This commit is contained in:
Marcos García de La Fuente 2014-05-23 11:42:14 +02:00
parent 9ae9f062ac
commit fa733c8ba4
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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: [ bug #1367 ] "Show invoice" link after a POS sell throws an error.
Fix: TCPDF error file not found in member card generation. Fix: TCPDF error file not found in member card generation.
Fix: [ bug #1380 ] Customer invoices are not grouped in company results report. 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 ***** ***** ChangeLog for 3.5.2 compared to 3.5.1 *****
Fix: Can't add user for a task. Fix: Can't add user for a task.

2
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
View File

@ -179,7 +179,7 @@ class pdf_rouget extends ModelePdfExpedition
$tab_height = 130; $tab_height = 130;
$tab_height_newpage = 150; $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; $tab_top = 88;