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

Merge pull request #1483 from FHenry/3.5

Browse Source 
3.5
This commit is contained in:
Laurent Destailleur 2014-03-15 17:30:31 +01:00
commit 9172beb282
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -474,7 +474,7 @@ class pdf_merou extends ModelePdfExpedition
else
{
$text=$this->emetteur->name;
$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($text), 0, 'L');
$pdf->MultiCell(70, 3, $outputlangs->convToOutputCharset($text), 0, 'L');
}
//*********************Entete****************************

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

@ -240,7 +240,7 @@ class pdf_rouget extends ModelePdfExpedition
$pageposbefore=$pdf->getPage();
// Description de la ligne produit
pdf_writelinedesc($pdf,$object,$i,$outputlangs,150,3,$this->posxdesc,$curY,0,1);
pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxqtyordered-10,3,$this->posxdesc,$curY,0,1);
$nexY = $pdf->GetY();
$pageposafter=$pdf->getPage();