lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17527 from daraelmin/daraelmin-setup-newmembermorphy

Browse Source 
Fix missing FORCEMORPHY in new member form setup
This commit is contained in:
Laurent Destailleur 2021-05-11 19:52:35 +02:00 committed by GitHub
commit b090516a73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/adherents/admin/website.php
View File

@ -182,6 +182,16 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
print $form->selectarray("MEMBER_NEWFORM_FORCETYPE", $listofval, $forcetype, count($listofval) > 1 ? 1 : 0); print $form->selectarray("MEMBER_NEWFORM_FORCETYPE", $listofval, $forcetype, count($listofval) > 1 ? 1 : 0);
print "</td></tr>\n"; print "</td></tr>\n";
// Force nature of member (mor/phy)
$morphys["phy"] = $langs->trans("Physical");
$morphys["mor"] = $langs->trans("Moral");
print '<tr class="oddeven drag" id="trforcenature"><td>';
print $langs->trans("ForceMemberNature");
print '</td><td class="right">';
$forcenature = empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY) ? 0 : $conf->global->MEMBER_NEWFORM_FORCEMORPHY;
print $form->selectarray("MEMBER_NEWFORM_FORCEMORPHY", $morphys, $forcenature, 1);
print "</td></tr>\n";
// Amount // Amount
print '<tr class="oddeven" id="tramount"><td>'; print '<tr class="oddeven" id="tramount"><td>';
print $langs->trans("DefaultAmount"); print $langs->trans("DefaultAmount");

1
htdocs/langs/en_US/members.lang
View File

@ -214,3 +214,4 @@ MembershipPaid=Membership paid for current period (until %s)
YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
XMembersClosed=%s member(s) closed XMembersClosed=%s member(s) closed
XExternalUserCreated=%s external user(s) created XExternalUserCreated=%s external user(s) created
ForceMemberNature=Force member nature (Individual or Corporation)

9
htdocs/langs/fr_FR/members.lang
View File

@ -83,10 +83,10 @@ WelcomeEMail=Email de bienvenue
SubscriptionRequired=Soumis à cotisation SubscriptionRequired=Soumis à cotisation
DeleteType=Supprimer DeleteType=Supprimer
VoteAllowed=Vote autorisé VoteAllowed=Vote autorisé
Physical=Individual Physical=Personne physique
Moral=Corporation Moral=Personne morale
MorAndPhy=Corporation and Individual MorAndPhy=Personne physique et personne morale
Reenable=Re-Enable Reenable=Réactivé
ExcludeMember=Exclure un adhérent ExcludeMember=Exclure un adhérent
ConfirmExcludeMember=Êtes-vous sûr de vouloir exclure cet adhérent ? ConfirmExcludeMember=Êtes-vous sûr de vouloir exclure cet adhérent ?
ResiliateMember=Résilier un adhérent ResiliateMember=Résilier un adhérent
@ -213,3 +213,4 @@ SendReminderForExpiredSubscription=Envoyer un rappel par e-mail aux membres lors
MembershipPaid=Adhésion payée pour la période en cours (jusqu'au %s) MembershipPaid=Adhésion payée pour la période en cours (jusqu'au %s)
YouMayFindYourInvoiceInThisEmail=Vous pouvez trouver votre facture jointe à cet email YouMayFindYourInvoiceInThisEmail=Vous pouvez trouver votre facture jointe à cet email
XMembersClosed=%s adhérent(s) résilié(s) XMembersClosed=%s adhérent(s) résilié(s)
ForceMemberNature=Forcer la nature du membre (Personne physique ou personne morale)