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

Merge pull request #12579 from atm-maxime/fix_pdf_rouget

Browse Source 
Fix PDF rouget for SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME
This commit is contained in:
Laurent Destailleur 2019-11-30 23:26:43 +01:00 committed by GitHub
commit 20e941c585
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,6 +155,8 @@ class pdf_rouget extends ModelePdfExpedition
$this->posxtotalht=$this->page_largeur - $this->marge_droite - 20; $this->posxtotalht=$this->page_largeur - $this->marge_droite - 20;
} }
if(!empty($conf->global->SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME)) $this->posxweightvol = $this->posxqtyordered;
$this->posxpicture=$this->posxweightvol - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images $this->posxpicture=$this->posxweightvol - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
if ($this->page_largeur < 210) // To work with US executive format if ($this->page_largeur < 210) // To work with US executive format