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

FIX for mask

Browse Source
This commit is contained in:
atm-quentin 2018-10-18 14:48:20 +02:00
parent eeb75bf650
commit ba997a0d0f
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/modules/reception/doc/pdf_squille.modules.php
View File

@ -187,9 +187,9 @@ class pdf_squille extends ModelePdfReception
} }
else else
{ {
$expref = dol_sanitizeFileName($object->ref); $rcpref = dol_sanitizeFileName($object->ref);
$dir = $conf->reception->dir_output."/" . $expref; $dir = $conf->reception->dir_output."/" . $rcpref;
$file = $dir . "/" . $expref . ".pdf"; $file = $dir . "/" . $rcpref . ".pdf";
} }
if (! file_exists($dir)) if (! file_exists($dir))

10
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle_reception.modules.php
View File

@ -391,13 +391,15 @@ class pdf_canelle_reception extends ModelePDFSuppliersInvoices
if(!empty($object->linkedObjects['reception'])){ if(!empty($object->linkedObjects['reception'])){
if(count($object->linkedObjects['reception']) == 1){ if(count($object->linkedObjects['reception']) == 1){
$reception = array_shift($object->linkedObjects['reception']); $reception = array_shift($object->linkedObjects['reception']);
$reception_content = $reception->ref.' du '.date('d/m/Y', $reception->date_delivery); $reception_content = $reception->ref;
if(!empty($reception->date_delivery))$reception_content .=' du '.date('d/m/Y', $reception->date_delivery);
}else { }else {
$object->lines[$i]->fetchObjectLinked(); $object->lines[$i]->fetchObjectLinked();
if (!empty($object->lines[$i]->linkedObjects['reception'])) if (!empty($object->lines[$i]->linkedObjects['reception']))
{ {
$reception = array_shift($object->lines[$i]->linkedObjects['reception']); $reception = array_shift($object->lines[$i]->linkedObjects['reception']);
$reception_content = $reception->ref.' du '.date('d/m/Y', $reception->date_delivery); $reception_content = $reception->ref;
if(!empty($reception->date_delivery))$reception_content .=' du '.date('d/m/Y', $reception->date_delivery);
} }
} }
@ -405,8 +407,8 @@ class pdf_canelle_reception extends ModelePDFSuppliersInvoices
$pdf->SetXY($this->posxreception-5, $curY); $pdf->SetXY($this->posxreception-1, $curY);
$pdf->MultiCell($this->posxtva-$this->posxreception+4, 3, $reception_content, 0, 'R'); $pdf->MultiCell($this->posxtva-$this->posxreception+1, 3, $reception_content, 0, 'C');
// VAT Rate // VAT Rate
if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))