diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index c307299c2f9..622accdd5b1 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -550,6 +550,7 @@ if ($rowid > 0) { print dol_get_fiche_end(); + /* * Buttons */ @@ -562,8 +563,16 @@ if ($rowid > 0) { } // Add + if ($object->morphy == 'phy') { + $morphy = 'phy'; + } elseif ($object->morphy == 'mor') { + $morphy = 'mor'; + } else { + $morphy = ''; + } + if ($user->hasRight('adherent', 'configurer')&& !empty($object->status)) { - print '
'; + print ''; } else { print ''; } diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php index cd4dbb468b6..08a5444d725 100644 --- a/htdocs/public/payment/newpayment.php +++ b/htdocs/public/payment/newpayment.php @@ -1646,7 +1646,7 @@ if ($source == 'member' || $source == 'membersubscription') { } else { print ''.price($amount, 1, $langs, 1, -1, -1, $currency).''; // Price with currency if ($minimumamount > $amount) { - print ' '. $langs->trans("AmountIsLowerToMinimumNotice", price($minimumamount, 1, $langs, 1, -1, -1, $currency)); + print ' '. $langs->trans("AmountIsLowerToMinimumNotice", price($minimumamount, 1, $langs, 1, -1, -1, $currency)).''; } print ''; }