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

clean indent

Browse Source
This commit is contained in:
Frédéric FRANCE
2019-10-27 17:01:23 +01:00
parent a25ec35fd4
commit 8f6d38ee82
88 changed files with 2591 additions and 2636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
View File

@@ -497,7 +497,7 @@ class doc_generic_reception_odt extends ModelePdfReception
}
else {
try {
$odfHandler->saveToDisk($file);
$odfHandler->saveToDisk($file);
} catch (Exception $e){
$this->error=$e->getMessage();
return -1;

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

@@ -142,26 +142,25 @@ class pdf_squille extends ModelePdfReception
$realpath='';
foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
foreach ($objphoto->liste_photos($dir, 1) as $key => $obj) {
if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES)) {
// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
if ($obj['photo_vignette'])
{
if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES)) // If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
{
if ($obj['photo_vignette'])
{
$filename= $obj['photo_vignette'];
}
else
{
$filename=$obj['photo'];
}
}
else
{
$filename=$obj['photo'];
}
$filename= $obj['photo_vignette'];
}
else
{
$filename=$obj['photo'];
}
}
else
{
$filename=$obj['photo'];
}
$realpath = $dir.$filename;
break;
$realpath = $dir.$filename;
break;
}
if ($realpath) $realpatharray[$i]=$realpath;
@@ -461,14 +460,13 @@ class pdf_squille extends ModelePdfReception
$pdf->writeHTMLCell($this->posxqtyordered - $this->posxweightvol + 2, 3, $this->posxweightvol - 1, $curY, $weighttxt.(($weighttxt && $voltxt)?'<br>':'').$voltxt, 0, 0, false, true, 'C');
//$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), 3, $weighttxt.(($weighttxt && $voltxt)?'<br>':'').$voltxt,'','C');
if (empty($conf->global->RECEPTION_PDF_HIDE_ORDERED))
{
$pdf->SetXY($this->posxqtyordered, $curY);
if($object->lines[$i]->fk_commandefourndet!=$fk_commandefourndet){
$pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 3, $object->lines[$i]->qty_asked, '', 'C');
$totalOrdered+=$object->lines[$i]->qty_asked;
}
$fk_commandefourndet = $object->lines[$i]->fk_commandefourndet;
if (empty($conf->global->RECEPTION_PDF_HIDE_ORDERED)) {
$pdf->SetXY($this->posxqtyordered, $curY);
if($object->lines[$i]->fk_commandefourndet!=$fk_commandefourndet){
$pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 3, $object->lines[$i]->qty_asked, '', 'C');
$totalOrdered+=$object->lines[$i]->qty_asked;
}
$fk_commandefourndet = $object->lines[$i]->fk_commandefourndet;
}
$pdf->SetXY($this->posxqtytoship, $curY);