From 1929f9132db3c67023ce284a935943a8c47b232a Mon Sep 17 00:00:00 2001
From: proprum <51385888+proprum@users.noreply.github.com>
Date: Sat, 2 May 2020 17:25:22 +0200
Subject: [PATCH] MAIN_NO_CONCAT_DESCRIPTION in contrat/card.php

Idem to propal/card.php
---
 htdocs/contrat/card.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 3c64b627a5c..111a446d9ae 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -521,7 +521,8 @@ if (empty($reshook))
 				}
 
 			   	$desc = $prod->description;
-			   	$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+			   	if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) $desc = $product_desc;
+				else $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 				$fk_unit = $prod->fk_unit;
 			}
 			else