Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-08 02:28:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0

Browse Source
This commit is contained in:
Laurent Destailleur
2023-07-12 16:41:11 +02:00
parent a4663291a7 1998248e96
commit 42fea0090d
5 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
View File

@@ -1162,35 +1162,38 @@ class pdf_vinci extends ModelePDFMo
}
// product info
$posy += 7;
$prodToMake = new Product($this->db);
$prodToMake->fetch($object->fk_product);
$pdf->SetFont('', 'B', $default_font_size + 1);
$pdf->SetXY($posx, $posy);
$pdf->SetTextColor(0, 0, 60);
$pdf->MultiCell($w, 3, $prodToMake->ref, '', 'R');
$resProdToMake = $prodToMake->fetch($object->fk_product);
$posy += 5;
$prodToMake = new Product($this->db);
$prodToMake->fetch($object->fk_product);
$pdf->SetFont('', 'B', $default_font_size + 3);
$pdf->SetXY($posx, $posy);
$pdf->SetTextColor(0, 0, 60);
$pdf->MultiCell($w, 3, $prodToMake->description, '', 'R');
if ($resProdToMake > 0) {
// ref
$posy += 7;
$pdf->SetFont('', 'B', $default_font_size + 1);
$pdf->SetXY($posx, $posy);
$pdf->SetTextColor(0, 0, 60);
$pdf->MultiCell($w, 3, $prodToMake->ref, '', 'R');
$array = array_filter(array($prodToMake->length, $prodToMake->width, $prodToMake->height));
$dim = implode("x", $array);
if (!empty($dim)) {
// description
$posy += 5;
$pdf->SetFont('', 'B', $default_font_size + 3);
$pdf->SetXY($posx, $posy);
$pdf->SetTextColor(0, 0, 60);
$pdf->MultiCell($w, 3, $dim, '', 'R');
$pdf->MultiCell($w, 3, html_entity_decode($prodToMake->description), '', 'R');
$posy = $pdf->GetY() - 5;
// dimensions
$array = array_filter(array($prodToMake->length, $prodToMake->width, $prodToMake->height));
$dim = implode("x", $array);
if (!empty($dim)) {
$posy += 5;
$pdf->SetFont('', 'B', $default_font_size + 3);
$pdf->SetXY($posx, $posy);
$pdf->SetTextColor(0, 0, 60);
$pdf->MultiCell($w, 3, $dim, '', 'R');
}
}
$posy += 5;
$prodToMake = new Product($this->db);
$prodToMake->fetch($object->fk_product);
$pdf->SetFont('', 'B', $default_font_size + 3);
$pdf->SetXY($posx, $posy);
$pdf->SetTextColor(0, 0, 60);