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

Merge pull request #7074 from defrance/patch-19

Browse Source 
Error fields and add date end on rapport pdf
This commit is contained in:
Laurent Destailleur 2017-06-29 02:47:23 +02:00 committed by GitHub
commit 6983e2ff12
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/modules/action/rapport.pdf.php
View File

@ -229,7 +229,7 @@ class CommActionRapport
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
$eventstatic->id=$obj->id; $eventstatic->id=$obj->id;
$eventstatic->percentage=$obj->percentage; $eventstatic->percentage=$obj->percent;
$eventstatic->fulldayevent=$obj->fulldayevent; $eventstatic->fulldayevent=$obj->fulldayevent;
$eventstatic->punctual=$obj->punctual; $eventstatic->punctual=$obj->punctual;
@ -266,7 +266,14 @@ class CommActionRapport
// Date // Date
$pdf->SetXY($this->marge_gauche, $y); $pdf->SetXY($this->marge_gauche, $y);
$pdf->MultiCell(22, $height, dol_print_date($this->db->jdate($obj->dp),"day")."\n".dol_print_date($this->db->jdate($obj->dp),"hour"), 0, 'L', 0); $textdate = dol_print_date($this->db->jdate($obj->dp),"day")."\n".dol_print_date($this->db->jdate($obj->dp),"hour");
if ($obj->dp2) {
if (dol_print_date($this->db->jdate($obj->dp),"day") != dol_print_date($this->db->jdate($obj->dp2),"day"))
$textdate.= " -> ".dol_print_date($this->db->jdate($obj->dp2), "day")." - ".dol_print_date($this->db->jdate($obj->dp2), "hour");
else
$textdate.= " -> ".dol_print_date($this->db->jdate($obj->dp2), "hour");
}
$pdf->MultiCell(22, $height, $textdate, 0, 'L', 0);
$y0 = $pdf->GetY(); $y0 = $pdf->GetY();
// Third party // Third party