diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 6166aae1e8a..1e091bc7779 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -838,6 +838,7 @@ if ($source == 'order')
// Debitor
print '
| '.$langs->trans("ThirdParty");
print ' | '.$order->thirdparty->name.'';
+ print ' |
'."\n";
// Object
$text=''.$langs->trans("PaymentOrderRef", $order->ref).'';
@@ -958,6 +959,7 @@ if ($source == 'invoice')
// Debitor
print '| '.$langs->trans("ThirdParty");
print ' | '.$invoice->thirdparty->name.'';
+ print ' |
'."\n";
// Object
$text=''.$langs->trans("PaymentInvoiceRef", $invoice->ref).'';
@@ -1295,22 +1297,20 @@ if ($source == 'membersubscription')
$fulltag=dol_string_unaccent($fulltag);
// Creditor
-
print '| '.$langs->trans("Creditor");
print ' | '.$creditor.'';
print '';
print ' |
'."\n";
// Debitor
-
print '| '.$langs->trans("Member");
print ' | ';
if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
else print $member->getFullName($langs);
print '';
+ print ' |
'."\n";
// Object
-
$text=''.$langs->trans("PaymentSubscription").'';
if (GETPOST('desc', 'alpha')) $text=''.$langs->trans(GETPOST('desc', 'alpha')).'';
print '| '.$langs->trans("Designation");
@@ -1343,7 +1343,6 @@ if ($source == 'membersubscription')
}
// Amount
-
print ' |
| '.$langs->trans("Amount");
if (empty($amount))
{
@@ -1391,7 +1390,6 @@ if ($source == 'membersubscription')
print ' |
'."\n";
// Tag
-
print '| '.$langs->trans("PaymentCode");
print ' | '.$fulltag.'';
print '';
@@ -1463,22 +1461,20 @@ if ($source == 'donation')
$fulltag=dol_string_unaccent($fulltag);
// Creditor
-
print ' |
| '.$langs->trans("Creditor");
print ' | '.$creditor.'';
print '';
print ' |
'."\n";
// Debitor
-
print '| '.$langs->trans("ThirdParty");
print ' | ';
if ($don->morphy == 'mor' && ! empty($don->societe)) print $don->societe;
else print $don->getFullName($langs);
print '';
+ print ' |
'."\n";
// Object
-
$text=''.$langs->trans("PaymentDonation").'';
if (GETPOST('desc', 'alpha')) $text=''.$langs->trans(GETPOST('desc', 'alpha')).'';
print '| '.$langs->trans("Designation");
@@ -1488,7 +1484,6 @@ if ($source == 'donation')
print ' |
'."\n";
// Amount
-
print '| '.$langs->trans("Amount");
if (empty($amount))
{
@@ -1536,7 +1531,6 @@ if ($source == 'donation')
print ' |
'."\n";
// Tag
-
print '| '.$langs->trans("PaymentCode");
print ' | '.$fulltag.'';
print '';
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index a41345820b4..25ee449b889 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -35,12 +35,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
$canreadperms=($user->admin || $user->rights->user->user->lire);
$caneditperms=($user->admin || $user->rights->user->user->creer);
$candisableperms=($user->admin || $user->rights->user->user->supprimer);
+$feature2 = 'user';
+
// Advanced permissions
if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
{
$canreadperms=($user->admin || $user->rights->user->group_advance->read);
$caneditperms=($user->admin || $user->rights->user->group_advance->write);
$candisableperms=($user->admin || $user->rights->user->group_advance->delete);
+ $feature2 = 'group_advance';
}
// Load translation files required by page
@@ -55,7 +58,7 @@ $contextpage = GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'groupc
$userid = GETPOST('user', 'int');
// Security check
-$result = restrictedArea($user, 'user', $id, 'usergroup&usergroup', 'user');
+$result = restrictedArea($user, 'user', $id, 'usergroup&usergroup', $feature2);
// Users/Groups management only in master entity if transverse mode
if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
|