diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 2db2d988add..91c77895540 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -657,6 +657,8 @@ if ($resql)
$actionstatic->label = $obj->label;
$actionstatic->location = $obj->location;
$actionstatic->note_private = dol_htmlentitiesbr($obj->note);
+ $actionstatic->datep = $db->jdate($obj->dp);
+ $actionstatic->percentage = $obj->percent;
$actionstatic->fetchResources();
@@ -738,10 +740,7 @@ if ($resql)
print '
';
print dol_print_date($db->jdate($obj->dp), $formatToUse, 'tzuser');
$late = 0;
- if ($obj->percent == 0 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) $late = 1;
- if ($obj->percent == 0 && !$obj->dp && $obj->dp2 && $db->jdate($obj->dp) < ($now - $delay_warning)) $late = 1;
- if ($obj->percent > 0 && $obj->percent < 100 && $obj->dp2 && $db->jdate($obj->dp2) < ($now - $delay_warning)) $late = 1;
- if ($obj->percent > 0 && $obj->percent < 100 && !$obj->dp2 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) $late = 1;
+ if ($actioncomm->hasDelay() && $actioncomm->percentage >= 0 && $actioncomm->percentage < 100 ) $late = 1;
if ($late) print img_warning($langs->trans("Late")).' ';
print ' | ';
}
diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index 55923d68a79..0b0fbf623c0 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -1,5 +1,6 @@
+ * Copyright (C) 2022 Ferran Marcet
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -289,7 +290,7 @@ class pdf_standard extends ModelePDFStock
$pdf->MultiCell(0, 3, ''); // Set interline to 3
$pdf->SetTextColor(0, 0, 0);
- $tab_top = 80 + $top_shift;
+ $tab_top = 65 + $top_shift;
$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
$tab_height = 130;
@@ -323,7 +324,7 @@ class pdf_standard extends ModelePDFStock
$i = 0;
$nblines = $num;
- $this->tabTitleHeight = 0;
+ $this->tabTitleHeight = 10;
$nexY = $tab_top + $this->tabTitleHeight;
for ($i = 0; $i < $nblines; $i++)
@@ -362,7 +363,8 @@ class pdf_standard extends ModelePDFStock
$showpricebeforepagebreak = 1;
$pdf->startTransaction();
- pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 3, $curX, $curY, $hideref, $hidedesc);
+ $pdf->writeHTMLCell($this->wref, 3, $curX, $curY, $outputlangs->convToOutputCharset($objp->ref), 0, 1, false, true, 'J', true);
+ //pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 3, $curX, $curY, $hideref, $hidedesc);
$pageposafter = $pdf->getPage();
if ($pageposafter > $pageposbefore) // There is a pagebreak
{
@@ -370,7 +372,8 @@ class pdf_standard extends ModelePDFStock
$pageposafter = $pageposbefore;
//print $pageposafter.'-'.$pageposbefore;exit;
$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
- pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 4, $curX, $curY, $hideref, $hidedesc);
+ $pdf->writeHTMLCell($this->wref, 4, $curX, $curY, $outputlangs->convToOutputCharset($objp->ref), 0, 1, false, true, 'J', true);
+ //pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 4, $curX, $curY, $hideref, $hidedesc);
$pageposafter = $pdf->getPage();
$posyafter = $pdf->GetY();
if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) // There is no space left for total+free text
@@ -418,8 +421,8 @@ class pdf_standard extends ModelePDFStock
$productstatic->status_batch = $objp->tobatch;
// Ref.
- $pdf->SetXY($this->posxdesc, $curY);
- $pdf->MultiCell($this->wref, 3, $productstatic->ref, 0, 'L');
+ //$pdf->SetXY($this->posxdesc, $curY);
+ //$pdf->MultiCell($this->wref, 3, $productstatic->ref, 0, 'L');
// Label
$pdf->SetXY($this->posxlabel + 0.8, $curY);
@@ -506,7 +509,7 @@ class pdf_standard extends ModelePDFStock
/**
* Footer table
*/
- $nexY = $pdf->GetY();
+ //$nexY = $pdf->GetY();
$nexY += 2;
$curY = $nexY;
@@ -572,11 +575,11 @@ class pdf_standard extends ModelePDFStock
$height_note = 0;
}
- $iniY = $tab_top + 7;
+ /*$iniY = $tab_top + 7;
$curY = $tab_top + 7;
$nexY = $tab_top + 7;
- $tab_top = $tab_top_newpage + 25 + $top_shift;
+ $tab_top = $tab_top_newpage + 25 + $top_shift;*/
// Show square
if ($pagenb == 1)
@@ -732,10 +735,12 @@ class pdf_standard extends ModelePDFStock
$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 2, $outputlangs->transnoentities("EstimatedStockValueSellShort"), '', 'R');
}
- $pdf->SetDrawColor(200, 200, 200);
- $pdf->SetLineStyle(array('dash'=>'0', 'color'=>array(200, 200, 200)));
- $pdf->line($this->marge_gauche, $tab_top + 11, $this->page_largeur - $this->marge_droite, $tab_top + 11);
- $pdf->SetLineStyle(array('dash'=>0));
+ if (empty($hidetop)) {
+ $pdf->SetDrawColor(200, 200, 200);
+ $pdf->SetLineStyle(array('dash' => '0', 'color' => array(200, 200, 200)));
+ $pdf->line($this->marge_gauche, $tab_top + 10, $this->page_largeur - $this->marge_droite, $tab_top + 10);
+ $pdf->SetLineStyle(array('dash' => 0));
+ }
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore