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

Merge pull request #1133 from atm-maxime/develop

Browse Source 
CRLF issue
This commit is contained in:
Juanjo Menent 2013-07-26 03:45:35 -07:00
commit 6fb2fe03d0
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
View File

@ -636,13 +636,13 @@ class pdf_typhon extends ModelePDFDeliveryOrder
pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK); pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
} }
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('','B', $default_font_size + 3); $pdf->SetFont('','B', $default_font_size + 3);
$posy=$this->marge_haute; $posy=$this->marge_haute;
$posx=$this->page_largeur-$this->marge_droite-100; $posx=$this->page_largeur-$this->marge_droite-100;
$pdf->SetXY($this->marge_gauche,$posy); $pdf->SetXY($this->marge_gauche,$posy);
// Logo // Logo
$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo; $logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;

18
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@ -275,8 +275,8 @@ class pdf_azur extends ModelePDFPropales
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
// Define size of image if we need it // Define size of image if we need it
$imglinesize=array(); $realpath=''; $imglinesize=array(); $realpath='';
if (! empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE)) if (! empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
{ {
if ($object->lines[$i]->fk_product) if ($object->lines[$i]->fk_product)
{ {
@ -347,13 +347,13 @@ class pdf_azur extends ModelePDFPropales
$pageposafter=$pageposbefore; $pageposafter=$pageposbefore;
//print $pageposafter.'-'.$pageposbefore;exit; //print $pageposafter.'-'.$pageposbefore;exit;
$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it. $pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
if (empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE)) if (empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
{ {
pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc); pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc);
} }
else else
{ {
pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc); pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
} }
$pageposafter=$pdf->getPage(); $pageposafter=$pdf->getPage();