From 028833836445f5553e4a9a9b3140464b363090ec Mon Sep 17 00:00:00 2001
From: John Botella <john.botella@atm-consulting.fr>
Date: Tue, 2 Jul 2019 14:38:09 +0200
Subject: [PATCH 1/2] Fix column price display

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

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index c636deab22b..4b777feb6ef 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1554,12 +1554,12 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_
     			{
     				print '<td align="right">';
     				if (empty($objp->price_by_qty)) {
-    					print ($objp->price_base_type != 'TTC' ? price($objp->price) : '');
+    					print price($objp->price);
     				}
     				print "</td>";
     				print '<td align="right">';
     				if (empty($objp->price_by_qty)) {
-    					print ($objp->price_base_type == 'TTC' ? price($objp->price_ttc) : '');
+    					print price($objp->price_ttc);
     				}
     				print "</td>";
     				if (! empty($conf->dynamicprices->enabled)) { //Only if module is enabled
@@ -1569,13 +1569,13 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_
 
     			print '<td align="right">';
     			if (empty($objp->price_by_qty)) {
-    				print ($objp->price_base_type != 'TTC' ? price($objp->price_min) : '');
+    				print price($objp->price_min);
     			}
     			print '</td>';
 
     			print '<td align="right">';
     			if (empty($objp->price_by_qty)) {
-    				print ($objp->price_base_type == 'TTC' ? price($objp->price_min_ttc) : '');
+    				print price($objp->price_min_ttc);
     			}
     			print '</td>';
 

From 818a8c7d5963c719f26ebaa92f069aef345c8ab4 Mon Sep 17 00:00:00 2001
From: Louis Sautier <sautier.louis@gmail.com>
Date: Wed, 3 Jul 2019 10:44:12 +0200
Subject: [PATCH 2/2] Fix missing form end tag in prelevement

---
 htdocs/compta/prelevement/create.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index d9298c9f607..747bbdf828d 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -181,6 +181,7 @@ else
     print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoInvoiceToWithdraw", $langs->transnoentitiesnoconv("StandingOrders"))).'">'.$langs->trans("CreateAll")."</a>\n";
 }
 
+print "</form>\n";
 print "</div>\n";
 print '<br>';