From b17937ce0d66e49750ae79a1fef00b7ae29a9c4b Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Wed, 28 Jun 2017 21:29:01 +0200
Subject: [PATCH] Error fields and add date end on rapport pdf
percentage instead percent
---
htdocs/core/modules/action/rapport.pdf.php | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php
index 65a80d97e5b..a2d9bbe05dc 100644
--- a/htdocs/core/modules/action/rapport.pdf.php
+++ b/htdocs/core/modules/action/rapport.pdf.php
@@ -229,7 +229,7 @@ class CommActionRapport
$obj = $this->db->fetch_object($resql);
$eventstatic->id=$obj->id;
- $eventstatic->percentage=$obj->percentage;
+ $eventstatic->percentage=$obj->percent;
$eventstatic->fulldayevent=$obj->fulldayevent;
$eventstatic->punctual=$obj->punctual;
@@ -266,7 +266,14 @@ class CommActionRapport
// Date
$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();
// Third party
--
GitLab