From 687afeaffe99771221c7f155cc0e39ff407ef355 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 2 Feb 2016 15:09:01 +0100
Subject: [PATCH] FIX No project fields if module disabled

---
 htdocs/expensereport/card.php | 41 +++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index a14e006fd7c..48de12a678c 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1652,7 +1652,7 @@ else
 						print '<tr class="liste_titre">';
 						print '<td style="text-align:center;">'.$langs->trans('Piece').'</td>';
 						print '<td style="text-align:center;">'.$langs->trans('Date').'</td>';
-						print '<td>'.$langs->trans('Project').'</td>';
+						if (! empty($conf->projet->enabled)) print '<td>'.$langs->trans('Project').'</td>';
 						print '<td style="text-align:center;">'.$langs->trans('Type').'</td>';
 						print '<td style="text-align:left;">'.$langs->trans('Description').'</td>';
 						print '<td style="text-align:right;">'.$langs->trans('VAT').'</td>';
@@ -1680,14 +1680,17 @@ else
 								print img_picto($langs->trans("Document"), "object_generic");
 								print ' <span>'.$piece_comptable.'</span></td>';
 								print '<td style="text-align:center;">'.dol_print_date($db->jdate($objp->date), 'day').'</td>';
-								print '<td>';
-								if ($objp->projet_id > 0)
+								if (! empty($conf->projet->enabled))
 								{
-									$projecttmp->id=$objp->projet_id;
-									$projecttmp->ref=$objp->projet_ref;
-									print $projecttmp->getNomUrl(1);
+    								print '<td>';
+    								if ($objp->projet_id > 0)
+    								{
+    									$projecttmp->id=$objp->projet_id;
+    									$projecttmp->ref=$objp->projet_ref;
+    									print $projecttmp->getNomUrl(1);
+    								}
+    								print '</td>';
 								}
-								print '</td>';
 								print '<td style="text-align:center;">'.$langs->trans("TF_".strtoupper($objp->type_fees_libelle)).'</td>';
 								print '<td style="text-align:left;">'.$objp->comments.'</td>';
 								print '<td style="text-align:right;">'.vatrate($objp->vatrate,true).'</td>';
@@ -1729,10 +1732,13 @@ else
 									print '</td>';
 
 									// Select project
-									print '<td>';
-									$formproject->select_projects(-1, $objp->fk_projet,'fk_projet', 0, 0, 1, 1);
-									print '</td>';
-
+									if (! empty($conf->projet->enabled))
+									{
+    									print '<td>';
+    									$formproject->select_projects(-1, $objp->fk_projet,'fk_projet', 0, 0, 1, 1);
+    									print '</td>';
+									}
+									
 									// Select type
 									print '<td style="text-align:center;">';
 									select_type_fees_id($objp->type_fees_code,'fk_c_type_fees');
@@ -1790,7 +1796,7 @@ else
 						print '<tr class="liste_titre">';
 						print '<td colspan="2"></td>';
 						//print '<td style="text-align:center;">'.$langs->trans('Date').'</td>';
-						print '<td>'.$langs->trans('Project').'</td>';
+						if (! empty($conf->projet->enabled)) print '<td>'.$langs->trans('Project').'</td>';
 						print '<td align="center">'.$langs->trans('Type').'</td>';
 						print '<td>'.$langs->trans('Description').'</td>';
 						print '<td style="text-align:right;">'.$langs->trans('VAT').'</td>';
@@ -1810,10 +1816,13 @@ else
 						print '</td>';
 
 						// Select project
-						print '<td>';
-						$formproject->select_projects(-1, $fk_projet, 'fk_projet', 0, 0, 1, 1);
-						print '</td>';
-
+						if (! empty($conf->projet->enabled))
+						{
+    						print '<td>';
+    						$formproject->select_projects(-1, $fk_projet, 'fk_projet', 0, 0, 1, 1);
+    						print '</td>';
+						}
+						
 						// Select type
 						print '<td align="center">';
 						select_type_fees_id($fk_c_type_fees,'fk_c_type_fees',1);