Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.7' into 3.8

Browse Source 
Conflicts:
	htdocs/core/modules/modHoliday.class.php
	htdocs/holiday/card.php
This commit is contained in:
Laurent Destailleur
2015-09-03 23:27:47 +02:00
parent ce2e5e7862 2e3d25c055
commit d19ec89bf1
16 changed files with 70 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@@ -1325,9 +1325,11 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
$posy = $pdf->getY();
// Show recipient information
$pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->SetXY($posx+2,$posy);
$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
}

4
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
View File

@@ -1217,9 +1217,11 @@ class pdf_proforma extends ModelePDFCommandes
$pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
$posy = $pdf->getY();
// Show recipient information
$pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->SetXY($posx+2,$posy);
$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
}