From 6fa016dc850cf293718cefc9b21d7ebddec4c725 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 25 Feb 2019 10:44:22 +0100 Subject: [PATCH 1/2] FIX wrong feature2 when user rights "group_advance" is used --- htdocs/user/group/card.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index 1be76e8fb4d..fd497e6986a 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'):'groupcard' $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) From 10e3badb0ae7195fcb4e85ea5c899b0b40421af3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 27 Feb 2019 14:46:23 +0100 Subject: [PATCH 2/2] Fix closing tr --- htdocs/public/payment/newpayment.php | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php index e17f5dfde5f..8a947ab3166 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"); @@ -1344,7 +1344,6 @@ if ($source == 'membersubscription') } // Amount - print ''.$langs->trans("Amount"); if (empty($amount)) { @@ -1392,7 +1391,6 @@ if ($source == 'membersubscription') print ''."\n"; // Tag - print ''.$langs->trans("PaymentCode"); print ''.$fulltag.''; print ''; @@ -1464,22 +1462,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"); @@ -1489,7 +1485,6 @@ if ($source == 'donation') print ''."\n"; // Amount - print ''.$langs->trans("Amount"); if (empty($amount)) { @@ -1537,7 +1532,6 @@ if ($source == 'donation') print ''."\n"; // Tag - print ''.$langs->trans("PaymentCode"); print ''.$fulltag.''; print '';