From 4dce09cd27fab0fd41b109884929f7802f2db43d Mon Sep 17 00:00:00 2001
From: abb <bafbes@gmail.com>
Date: Tue, 9 Feb 2016 14:36:57 +0100
Subject: [PATCH] include expense reports in linked objects section and provide
 template for them in this section

Conflicts:
	htdocs/core/class/html.form.class.php
---
 htdocs/core/class/html.form.class.php         |  7 +-
 htdocs/expensereport/tpl/index.html           |  0
 .../tpl/linkedobjectblock.tpl.php             | 75 +++++++++++++++++++
 htdocs/langs/en_US/expensereports.lang        |  2 +
 htdocs/langs/eu_ES/expensereports.lang        |  2 +
 htdocs/langs/fr_FR/expensereports.lang        |  2 +
 6 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 htdocs/expensereport/tpl/index.html
 create mode 100644 htdocs/expensereport/tpl/linkedobjectblock.tpl.php
 create mode 100644 htdocs/langs/en_US/expensereports.lang
 create mode 100644 htdocs/langs/eu_ES/expensereports.lang
 create mode 100644 htdocs/langs/fr_FR/expensereports.lang

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 2230aebdbb5..b815fa6031d 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5000,8 +5000,11 @@ class Form
         		else if ($objecttype == 'order_supplier')   {
         			$tplpath = 'fourn/commande';
         		}
-        		
-        		global $linkedObjectBlock;
+        		else if ($objecttype == 'expensereport')   {
+        			$tplpath = 'expensereport';
+        		}
+
+                global $linkedObjectBlock;
         		$linkedObjectBlock = $objects;
 
         		// Output template part (modules that overwrite templates must declare this into descriptor)
diff --git a/htdocs/expensereport/tpl/index.html b/htdocs/expensereport/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
new file mode 100644
index 00000000000..f2f26e625f7
--- /dev/null
+++ b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
@@ -0,0 +1,75 @@
+<?php
+/* Copyright (C) 2010-2011	Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2014       Marcos García <marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+?>
+
+<!-- BEGIN PHP TEMPLATE -->
+
+<?php
+
+global $user;
+
+$langs = $GLOBALS['langs'];
+$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
+
+$langs->load("expensereports");
+echo '<br>';
+print_titre($langs->trans("RelatedExpenseReports"));
+?>
+<table class="noborder allwidth">
+<tr class="liste_titre">
+	<td><?php echo $langs->trans("Ref"); ?></td>
+	<td align="center"><?php echo $langs->trans("Date"); ?></td>
+	<td align="right"><?php echo $langs->trans("AmountHTShort"); ?></td>
+	<td align="right"><?php echo $langs->trans("Status"); ?></td>
+	<td></td>
+</tr>
+<?php
+$var=true;
+$total=0;
+foreach($linkedObjectBlock as $key => $objectlink)
+{
+	$var=!$var;
+?>
+<tr <?php echo $GLOBALS['bc'][$var]; ?> >
+    <td><?php echo $objectlink->getNomUrl(1); ?></td>
+	<td align="center"><?php echo dol_print_date($objectlink->date_debut,'day'); ?></td>
+	<td align="right"><?php
+		if ($user->rights->expensereport->lire) {
+			$total = $total + $objectlink->total_ht;
+			echo price($objectlink->total_ht);
+		} ?></td>
+	<td align="right"><?php echo $objectlink->getLibStatut(3); ?></td>
+	<td align="right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_delete($langs->transnoentitiesnoconv("RemoveLink")); ?></a></td>
+</tr>
+<?php
+}
+?>
+<tr class="liste_total">
+	<td align="left" colspan="3"><?php echo $langs->trans("TotalHT"); ?></td>
+	<td align="right"><?php
+		if ($user->rights->expensereport->lire) {
+			echo price($total);
+		} ?></td>
+	<td></td>
+	<td></td>
+</tr>
+</table>
+
+<!-- END PHP TEMPLATE -->
\ No newline at end of file
diff --git a/htdocs/langs/en_US/expensereports.lang b/htdocs/langs/en_US/expensereports.lang
new file mode 100644
index 00000000000..b378b12060d
--- /dev/null
+++ b/htdocs/langs/en_US/expensereports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - expensereports
+RelatedExpenseReports=associated expense reports
\ No newline at end of file
diff --git a/htdocs/langs/eu_ES/expensereports.lang b/htdocs/langs/eu_ES/expensereports.lang
new file mode 100644
index 00000000000..b378b12060d
--- /dev/null
+++ b/htdocs/langs/eu_ES/expensereports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - expensereports
+RelatedExpenseReports=associated expense reports
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/expensereports.lang b/htdocs/langs/fr_FR/expensereports.lang
new file mode 100644
index 00000000000..e08723322e2
--- /dev/null
+++ b/htdocs/langs/fr_FR/expensereports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - expensereports
+RelatedExpenseReports=Notes de frais associées
\ No newline at end of file