From 95cc007b39d78c4d78ae8759836478af24a67c40 Mon Sep 17 00:00:00 2001 From: Nicolas Leichtle Date: Sat, 30 Sep 2017 15:40:17 +0200 Subject: [PATCH 1/3] NEW: Add project related fields to ODT --- htdocs/core/class/commondocgenerator.class.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index 535200ab95a..91da8072922 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -418,6 +418,21 @@ abstract class CommonDocGenerator $resarray[$array_key.'_total_discount_ht'] = ''; } + // Fetch project information if there is a project assigned to this object + if ($object->element != "project" && $object->fk_project > 0) + { + if(!isset($object->project)) + { + $object->fetch_projet(); + } + + $resarray[$array_key.'_project_ref'] = $object->project->ref; + $resarray[$array_key.'_project_title'] = $object->project->title; + $resarray[$array_key.'_project_description'] = $object->project->description; + $resarray[$array_key.'_project_date_start'] = dol_print_date($object->project->date_start, 'day'); + $resarray[$array_key.'_project_date_end'] = dol_print_date($object->project->date_end, 'day'); + } + // Add vat by rates if (is_array($object->lines) && count($object->lines)>0) { From f15ce54c05e79667d513f5aaccf0fb60ed45b92c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 2 Oct 2017 00:34:55 +0200 Subject: [PATCH 2/3] Update commondocgenerator.class.php --- htdocs/core/class/commondocgenerator.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index 91da8072922..6ac96190245 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -419,7 +419,7 @@ abstract class CommonDocGenerator } // Fetch project information if there is a project assigned to this object - if ($object->element != "project" && $object->fk_project > 0) + if ($object->element != "project" && ! empty($object->fk_project) && $object->fk_project > 0) { if(!isset($object->project)) { From 48c3d0e3f2fe6ce61be1073fa754c8aa71ff7302 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 2 Oct 2017 00:36:15 +0200 Subject: [PATCH 3/3] Update commondocgenerator.class.php --- htdocs/core/class/commondocgenerator.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index 6ac96190245..937634de5d4 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -421,7 +421,7 @@ abstract class CommonDocGenerator // Fetch project information if there is a project assigned to this object if ($object->element != "project" && ! empty($object->fk_project) && $object->fk_project > 0) { - if(!isset($object->project)) + if (! is_object($object->project)) { $object->fetch_projet(); }