From 9893e8d752cbabc4700500b994b77687b55aeb09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 10 Feb 2019 23:37:12 +0100
Subject: [PATCH 1/2] Update consumption.php

---
 htdocs/contact/consumption.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index 8928be1d626..9c5d82f6aa6 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -322,18 +322,15 @@ if (!empty($sql_select))
 	    $sql.=")";
 	}
 	$sql.= $db->order($sortfield, $sortorder);
-//print ($sql);exit;
 	$resql=$db->query($sql);
 	$totalnboflines = $db->num_rows($resql);
 
 	$sql.= $db->plimit($limit + 1, $offset);
-	//print $sql;
 }
 
 $disabled=0;
 $showempty=2;
-if (empty($elementTypeArray) && ! $object->client && ! $object->fournisseur)
-{
+if (empty($elementTypeArray) && ! $object->thirdparty->client && ! $object->thirdparty->fournisseur) {
     $showempty=$langs->trans("ThirdpartyNotCustomerNotSupplierSoNoRef");
     $disabled=1;
 }
@@ -500,10 +497,7 @@ if ($sql_select)
 			elseif ($objp->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
 			elseif ($objp->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
 			//else $txt=$langs->trans("Discount");
-			print $txt;
-			?>
-			</a>
-			<?php
+			print $txt.'</a>';
 			if ($objp->description)
 			{
 				if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0)

From aa206e5d7cbeec1547d9589985f0477a39447e8c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 Feb 2019 13:45:38 +0100
Subject: [PATCH 2/2] Update consumption.php

---
 htdocs/contact/consumption.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index 9c5d82f6aa6..4191563eaec 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -488,16 +488,16 @@ if ($sql_select)
 			$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($objp->description));
 		}
 
-		if (($objp->info_bits & 2) == 2) { ?>
-			<a href="<?php echo DOL_URL_ROOT.'/comm/remx.php?id='.$object->id; ?>">
-			<?php
+		if (($objp->info_bits & 2) == 2) { 
+			print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'">';
 			$txt='';
 			print img_object($langs->trans("ShowReduc"), 'reduc').' ';
 			if ($objp->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
 			elseif ($objp->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
 			elseif ($objp->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
 			//else $txt=$langs->trans("Discount");
-			print $txt.'</a>';
+			print $txt;
+            print '</a>';
 			if ($objp->description)
 			{
 				if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0)