From 6eeb1d3a96471e1fced632e3268bdfa69f8bdb9f Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Sat, 29 Aug 2020 13:36:52 +0200 Subject: [PATCH] Update invoice.php --- htdocs/takepos/invoice.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php index 0ec346c01d0..b23d6723ddf 100644 --- a/htdocs/takepos/invoice.php +++ b/htdocs/takepos/invoice.php @@ -816,12 +816,10 @@ $( document ).ready(function() { if ($result > 0) { $adh->ref = $adh->getFullName($langs); + if (empty($adh->statut)) { $s .= ""; } $s .= $adh->getFullName($langs); $s .= ' - '.$adh->type; - if (empty($adh->statut) && $adh->datefin) { - $s .= '
'.$langs->trans("MemberStatusResiliated"); - } - elseif ($adh->datefin) + if ($adh->datefin) { $s .= '
'.$langs->trans("SubscriptionEndDate").': '.dol_print_date($adh->datefin, 'day'); if ($adh->hasDelay()) { @@ -831,6 +829,7 @@ $( document ).ready(function() { $s .= '
'.$langs->trans("SubscriptionNotReceived"); if ($adh->statut > 0) $s .= " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated } + if (empty($adh->statut)) { $s .= "
"; } } else { $s .= '
'.$langs->trans("ThirdpartyNotLinkedToMember"); }