From a915a4faaf118f898d3938e5194766e3039214ca Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 7 Feb 2020 11:14:13 +0100
Subject: [PATCH 01/15] FIX missing hook parameter

---
 htdocs/comm/propal/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index ae713bbab20..7f5c80b11e8 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -996,7 +996,7 @@ if ($resql)
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i);
 		$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation

From 14531bf16092f9287a97e9622ad6504b49f16e27 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 8 Feb 2020 15:28:40 +0100
Subject: [PATCH 02/15] Fix #13046 - Bad parenthesis on test

---
 htdocs/core/class/html.formmail.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index db758f6c614..10bbda7647b 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -593,7 +593,7 @@ class FormMail extends Form
 						$out.= ' &lt;'.$this->tomail.'&gt;';
 						if ($this->withtofree)
 						{
-							$out.= '<br>'.$langs->trans("and").' <input class="minwidth200" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
+							$out.= '<br>'.$langs->trans("and").' <input class="minwidth200" id="sendto" name="sendto" value="'.((! is_array($this->withto) && ! is_numeric($this->withto)) ? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) : "").'" />';
 						}
 					}
 					else
@@ -606,7 +606,7 @@ class FormMail extends Form
 				{
 					if (! empty($this->withtofree))
 					{
-						$out.= '<input class="minwidth200" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
+						$out.= '<input class="minwidth200" id="sendto" name="sendto" value="'.((! is_array($this->withto) && ! is_numeric($this->withto)) ? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) : "").'" />';
 					}
 					if (! empty($this->withto) && is_array($this->withto))
 					{

From 6badf724cf3dbfbccd3ace3523f1d75e110cfd9b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 9 Feb 2020 15:51:43 +0100
Subject: [PATCH 03/15] FIX Mail smtps truncated if content has a line with
 single .

Conflicts:
	htdocs/core/class/CMailFile.class.php
---
 htdocs/core/class/CMailFile.class.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 809cf15edbf..853f2f98b05 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -176,7 +176,7 @@ class CMailFile
 		if (empty($msg))
 		{
 		    dol_syslog("CMailFile::CMailfile: Try to send an email with empty body");
-		    $msg='.';     // Avoid empty message (with empty message conten show a multipart structure)
+		    $msg = '.'; // Avoid empty message (with empty message content, you will see a multipart structure)
 		}
 
 		// Detect if message is HTML (use fast method)
@@ -198,7 +198,7 @@ class CMailFile
 		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 		// Replace relative /viewimage to absolute path
-		$msg = preg_replace('/src="'.preg_quote(DOL_URL_ROOT, '/').'\/viewimage\.php/ims', 'src="'.$urlwithroot.'/viewimage.php', $msg, -1, $nbrep);
+		$msg = preg_replace('/src="'.preg_quote(DOL_URL_ROOT, '/').'\/viewimage\.php/ims', 'src="'.$urlwithroot.'/viewimage.php', $msg, -1);
 
 		if (! empty($conf->global->MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML)) $this->msgishtml=1; // To force to send everything with content type html.
 
@@ -330,6 +330,9 @@ class CMailFile
 				$msg = $this->checkIfHTML($msg);
 			}
 
+			// Replace . alone on a new line with .. to avoid to have SMTP interpret this as end of message
+			$msg = preg_replace('/(\r|\n)\.(\r|\n)/ims', '\1..\2', $msg);
+
 			if ($this->msgishtml) $smtps->setBodyContent($msg, 'html');
 			else $smtps->setBodyContent($msg, 'plain');
 

From 815206cb15d8881e80c8eb2aaba905e77950e92e Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Mon, 10 Feb 2020 08:59:22 +0100
Subject: [PATCH 04/15] Add Project Title in header of pdf

Add project Title if Global Constant PDF_SHOW_PROJECT_TITLE is active.
---
 .../core/modules/facture/doc/pdf_crabe.modules.php   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index ed99a04fcc2..597c612d6f1 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1634,6 +1634,18 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
+		
+		if (! empty($conf->global->PDF_SHOW_PROJECT_TITLE))
+		{
+			$object->fetch_projet();
+			if (! empty($object->project->ref))
+			{
+				$posy+=3;
+				$pdf->SetXY($posx,$posy);
+				$pdf->SetTextColor(0,0,60);
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Project")." : " . (empty($object->project->title)?'':$object->projet->title), '', 'R');
+			}
+		}
 
 		$objectidnext=$object->getIdReplacingInvoice('validated');
 		if ($object->type == 0 && $objectidnext)

From 6ffbab0a6371dfcac38b3636745b561a08b66290 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 10 Feb 2020 08:01:40 +0000
Subject: [PATCH 05/15] Fixing style errors.

---
 htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 597c612d6f1..6eb6bb939de 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1641,8 +1641,8 @@ class pdf_crabe extends ModelePDFFactures
 			if (! empty($object->project->ref))
 			{
 				$posy+=3;
-				$pdf->SetXY($posx,$posy);
-				$pdf->SetTextColor(0,0,60);
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Project")." : " . (empty($object->project->title)?'':$object->projet->title), '', 'R');
 			}
 		}

From bd008030900012a779b48d983e82b7f6b0b2d609 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Mon, 10 Feb 2020 09:03:00 +0100
Subject: [PATCH 06/15] Update pdf_crabe.modules.php

---
 .../core/modules/facture/doc/pdf_crabe.modules.php   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 6eb6bb939de..580689d3218 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1646,6 +1646,18 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Project")." : " . (empty($object->project->title)?'':$object->projet->title), '', 'R');
 			}
 		}
+		
+		if (! empty($conf->global->PDF_SHOW_PROJECT))
+		{
+			$object->fetch_projet();
+			if (! empty($object->project->ref))
+			{
+				$posy+=3;
+				$pdf->SetXY($posx,$posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ProjectRef")." : " . (empty($object->project->ref)?'':$object->projet->title), '', 'R');
+			}
+		}
 
 		$objectidnext=$object->getIdReplacingInvoice('validated');
 		if ($object->type == 0 && $objectidnext)

From 5022e58b95fb9f19bb6d3febe17489eebd56b249 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 10 Feb 2020 08:04:40 +0000
Subject: [PATCH 07/15] Fixing style errors.

---
 htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 580689d3218..9311361b745 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1653,7 +1653,7 @@ class pdf_crabe extends ModelePDFFactures
 			if (! empty($object->project->ref))
 			{
 				$posy+=3;
-				$pdf->SetXY($posx,$posy);
+				$pdf->SetXY($posx, $posy);
 				$pdf->SetTextColor(0, 0, 60);
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ProjectRef")." : " . (empty($object->project->ref)?'':$object->projet->title), '', 'R');
 			}

From d74e1d9182b3542e435f054af67f4afb37e06e95 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Mon, 10 Feb 2020 09:07:26 +0100
Subject: [PATCH 08/15] Update pdf_crabe.modules.php

---
 htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 9311361b745..e7d19d605f7 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1655,7 +1655,7 @@ class pdf_crabe extends ModelePDFFactures
 				$posy+=3;
 				$pdf->SetXY($posx, $posy);
 				$pdf->SetTextColor(0, 0, 60);
-				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ProjectRef")." : " . (empty($object->project->ref)?'':$object->projet->title), '', 'R');
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ProjectRef")." : " . (empty($object->project->ref)?'':$object->projet->ref), '', 'R');
 			}
 		}
 

From 6de379564842d2a59d53dbae91555dfc3417611d Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Mon, 10 Feb 2020 09:10:45 +0100
Subject: [PATCH 09/15] change translation Ref

ProjectRef -> RefProject
---
 htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index e7d19d605f7..297c202a57d 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1655,7 +1655,7 @@ class pdf_crabe extends ModelePDFFactures
 				$posy+=3;
 				$pdf->SetXY($posx, $posy);
 				$pdf->SetTextColor(0, 0, 60);
-				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ProjectRef")." : " . (empty($object->project->ref)?'':$object->projet->ref), '', 'R');
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefProject")." : " . (empty($object->project->ref)?'':$object->projet->ref), '', 'R');
 			}
 		}
 

From f279b4138b555c9dd696ea5d3b764c07318d47f8 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Mon, 10 Feb 2020 16:52:41 +0100
Subject: [PATCH 10/15] Add Project Ref and Title

---
 .../facture/doc/pdf_sponge.modules.php        | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 1f4d9524bc8..e40f4583fad 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -1665,6 +1665,30 @@ class pdf_sponge extends ModelePDFFactures
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
+		
+		if (! empty($conf->global->PDF_SHOW_PROJECT_TITLE))
+		{
+			$object->fetch_projet();
+			if (! empty($object->project->ref))
+			{
+				$posy+=3;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Project")." : " . (empty($object->project->title)?'':$object->projet->title), '', 'R');
+			}
+		}
+		
+		if (! empty($conf->global->PDF_SHOW_PROJECT))
+		{
+			$object->fetch_projet();
+			if (! empty($object->project->ref))
+			{
+				$posy+=3;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefProject")." : " . (empty($object->project->ref)?'':$object->projet->ref), '', 'R');
+			}
+		}
 
 		$objectidnext=$object->getIdReplacingInvoice('validated');
 		if ($object->type == 0 && $objectidnext)

From 546e7b1bcf6f64627f9f6db8c64a3a5e8911c4b6 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Mon, 10 Feb 2020 16:57:02 +0100
Subject: [PATCH 11/15] Add project Ref and Title

---
 .../commande/doc/pdf_einstein.modules.php     | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 7c1aaefb8bf..ae4018b213a 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -1312,6 +1312,30 @@ class pdf_einstein extends ModelePDFCommandes
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
+		
+		if (! empty($conf->global->PDF_SHOW_PROJECT_TITLE))
+		{
+			$object->fetch_projet();
+			if (! empty($object->project->ref))
+			{
+				$posy+=3;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Project")." : " . (empty($object->project->title)?'':$object->projet->title), '', 'R');
+			}
+		}
+		
+		if (! empty($conf->global->PDF_SHOW_PROJECT))
+		{
+			$object->fetch_projet();
+			if (! empty($object->project->ref))
+			{
+				$posy+=3;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefProject")." : " . (empty($object->project->ref)?'':$object->projet->ref), '', 'R');
+			}
+		}
 
 		$posy+=4;
 		$pdf->SetXY($posx, $posy);

From 573d86c725d33579d01d3676bb89c6bd310ec5f6 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Mon, 10 Feb 2020 16:57:59 +0100
Subject: [PATCH 12/15] Add project's ref and Title

---
 .../commande/doc/pdf_eratosthene.modules.php  | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 89f36d34352..8f39828d3f4 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -1447,6 +1447,30 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
+		if (! empty($conf->global->PDF_SHOW_PROJECT_TITLE))
+		{
+			$object->fetch_projet();
+			if (! empty($object->project->ref))
+			{
+				$posy+=3;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Project")." : " . (empty($object->project->title)?'':$object->projet->title), '', 'R');
+			}
+		}
+		
+		if (! empty($conf->global->PDF_SHOW_PROJECT))
+		{
+			$object->fetch_projet();
+			if (! empty($object->project->ref))
+			{
+				$posy+=3;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefProject")." : " . (empty($object->project->ref)?'':$object->projet->ref), '', 'R');
+			}
+		}
+		
 		$posy+=4;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);

From f9b03596f663071e42834b25d31dd5f43b39b994 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Mon, 10 Feb 2020 17:01:21 +0100
Subject: [PATCH 13/15] Add project ref and title

---
 .../modules/propale/doc/pdf_azur.modules.php  | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 80e80d24d7e..1029187f21c 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -1521,6 +1521,30 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
+		
+		if (! empty($conf->global->PDF_SHOW_PROJECT_TITLE))
+		{
+			$object->fetch_projet();
+			if (! empty($object->project->ref))
+			{
+				$posy+=3;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Project")." : " . (empty($object->project->title)?'':$object->projet->title), '', 'R');
+			}
+		}
+		
+		if (! empty($conf->global->PDF_SHOW_PROJECT))
+		{
+			$object->fetch_projet();
+			if (! empty($object->project->ref))
+			{
+				$posy+=3;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefProject")." : " . (empty($object->project->ref)?'':$object->projet->ref), '', 'R');
+			}
+		}
 
 		$posy+=4;
 		$pdf->SetXY($posx, $posy);

From fab8536f05eefcc4a688475c54117fce800e42bc Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Mon, 10 Feb 2020 17:02:10 +0100
Subject: [PATCH 14/15] add project ref and title

---
 .../modules/propale/doc/pdf_cyan.modules.php  | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index b2d1c9b4996..d810321a2de 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -1559,6 +1559,30 @@ class pdf_cyan extends ModelePDFPropales
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
+		
+		if (! empty($conf->global->PDF_SHOW_PROJECT_TITLE))
+		{
+			$object->fetch_projet();
+			if (! empty($object->project->ref))
+			{
+				$posy+=3;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Project")." : " . (empty($object->project->title)?'':$object->projet->title), '', 'R');
+			}
+		}
+		
+		if (! empty($conf->global->PDF_SHOW_PROJECT))
+		{
+			$object->fetch_projet();
+			if (! empty($object->project->ref))
+			{
+				$posy+=3;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefProject")." : " . (empty($object->project->ref)?'':$object->projet->ref), '', 'R');
+			}
+		}
 
 		$posy+=4;
 		$pdf->SetXY($posx, $posy);

From f8eaca24af5c7ae75f84a5639a90391faf19f6bd Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 12 Feb 2020 20:54:56 +0000
Subject: [PATCH 15/15] Fixing style errors.

---
 htdocs/core/modules/commande/doc/pdf_einstein.modules.php   | 4 ++--
 .../core/modules/commande/doc/pdf_eratosthene.modules.php   | 6 +++---
 htdocs/core/modules/facture/doc/pdf_crabe.modules.php       | 4 ++--
 htdocs/core/modules/facture/doc/pdf_sponge.modules.php      | 4 ++--
 htdocs/core/modules/propale/doc/pdf_azur.modules.php        | 4 ++--
 htdocs/core/modules/propale/doc/pdf_cyan.modules.php        | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index b3cec036ee9..6e3d887cbce 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -1314,7 +1314,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
-		
+
 		if (! empty($conf->global->PDF_SHOW_PROJECT_TITLE))
 		{
 			$object->fetch_projet();
@@ -1326,7 +1326,7 @@ class pdf_einstein extends ModelePDFCommandes
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Project")." : " . (empty($object->project->title)?'':$object->projet->title), '', 'R');
 			}
 		}
-		
+
 		if (! empty($conf->global->PDF_SHOW_PROJECT))
 		{
 			$object->fetch_projet();
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 5dcfb2ffd81..f4fc2b3cb2f 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -1486,7 +1486,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Project")." : " . (empty($object->project->title)?'':$object->projet->title), '', 'R');
 			}
 		}
-		
+
 		if (! empty($conf->global->PDF_SHOW_PROJECT))
 		{
 			$object->fetch_projet();
@@ -1498,10 +1498,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefProject")." : " . (empty($object->project->ref)?'':$object->projet->ref), '', 'R');
 			}
 		}
-		
+
 		$posy += 4;
 
-    $pdf->SetXY($posx, $posy);
+		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 440970105bf..6e8918920a6 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1706,7 +1706,7 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
-		
+
 		if (! empty($conf->global->PDF_SHOW_PROJECT_TITLE))
 		{
 			$object->fetch_projet();
@@ -1718,7 +1718,7 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Project")." : " . (empty($object->project->title)?'':$object->projet->title), '', 'R');
 			}
 		}
-		
+
 		if (! empty($conf->global->PDF_SHOW_PROJECT))
 		{
 			$object->fetch_projet();
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 195660e5fb0..37fa1cb3ae2 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -1962,7 +1962,7 @@ class pdf_sponge extends ModelePDFFactures
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
-		
+
 		if (! empty($conf->global->PDF_SHOW_PROJECT_TITLE))
 		{
 			$object->fetch_projet();
@@ -1974,7 +1974,7 @@ class pdf_sponge extends ModelePDFFactures
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Project")." : " . (empty($object->project->title)?'':$object->projet->title), '', 'R');
 			}
 		}
-		
+
 		if (! empty($conf->global->PDF_SHOW_PROJECT))
 		{
 			$object->fetch_projet();
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 8d93df6cb67..3810ad67237 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -1527,7 +1527,7 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
-		
+
 		if (! empty($conf->global->PDF_SHOW_PROJECT_TITLE))
 		{
 			$object->fetch_projet();
@@ -1539,7 +1539,7 @@ class pdf_azur extends ModelePDFPropales
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Project")." : " . (empty($object->project->title)?'':$object->projet->title), '', 'R');
 			}
 		}
-		
+
 		if (! empty($conf->global->PDF_SHOW_PROJECT))
 		{
 			$object->fetch_projet();
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index f1417e309cf..07ceb461803 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -1587,7 +1587,7 @@ class pdf_cyan extends ModelePDFPropales
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
-		
+
 		if (! empty($conf->global->PDF_SHOW_PROJECT_TITLE))
 		{
 			$object->fetch_projet();
@@ -1599,7 +1599,7 @@ class pdf_cyan extends ModelePDFPropales
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Project")." : " . (empty($object->project->title)?'':$object->projet->title), '', 'R');
 			}
 		}
-		
+
 		if (! empty($conf->global->PDF_SHOW_PROJECT))
 		{
 			$object->fetch_projet();