| 
                                                        @@ -424,7 +424,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    424
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    424
                                                                                                                                                                                                 | 
                                                             					$to = $adh->makeSubstitution($conf->global->MAIN_INFO_SOCIETE_MAIL);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    425
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    425
                                                                                                                                                                                                 | 
                                                             					$from = getDolGlobalString('ADHERENT_MAIL_FROM'); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    426
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    426
                                                                                                                                                                                                 | 
                                                             					$mailfile = new CMailFile(  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    427
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -						'['.$appli.'] ' . getDolGlobalString('ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT'), | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    427
                                                                                                                                                                                                 | 
                                                            +						'['.$appli.'] '.getDolGlobalString('ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT'), | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    428
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    428
                                                                                                                                                                                                 | 
                                                             						$to,  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    429
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    429
                                                                                                                                                                                                 | 
                                                             						$from,  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    430
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    430
                                                                                                                                                                                                 | 
                                                             						$adh->makeSubstitution($conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL),  | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -604,7 +604,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    604
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    604
                                                                                                                                                                                                 | 
                                                             		}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    605
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    605
                                                                                                                                                                                                 | 
                                                             	} else { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    606
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    606
                                                                                                                                                                                                 | 
                                                             		$adht->fetch(getDolGlobalInt('MEMBER_NEWFORM_FORCETYPE')); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    607
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -		print '<input type="hidden" id="typeid" name="typeid" value="' . getDolGlobalString('MEMBER_NEWFORM_FORCETYPE').'">'; | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    607
                                                                                                                                                                                                 | 
                                                            +		print '<input type="hidden" id="typeid" name="typeid" value="'.getDolGlobalString('MEMBER_NEWFORM_FORCETYPE').'">'; | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    608
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    608
                                                                                                                                                                                                 | 
                                                             	}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    609
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    609
                                                                                                                                                                                                 | 
                                                             	print '</td></tr>'."\n";  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    610
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    610
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -613,7 +613,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    613
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    613
                                                                                                                                                                                                 | 
                                                             	$morphys["phy"] = $langs->trans("Physical"); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    614
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    614
                                                                                                                                                                                                 | 
                                                             	$morphys["mor"] = $langs->trans("Moral"); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    615
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    615
                                                                                                                                                                                                 | 
                                                             	$checkednature = GETPOST("morphy", 'alpha'); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    616
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -	$listetype_natures = $adht->morphyByType(1);		// Load the array of morphy per type  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    616
                                                                                                                                                                                                 | 
                                                            +	$listetype_natures = $adht->morphyByType(1); // Load the array of morphy per type  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    617
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    617
                                                                                                                                                                                                 | 
                                                             	$listetype_natures_json = json_encode($listetype_natures);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    618
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    618
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    619
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    619
                                                                                                                                                                                                 | 
                                                             	if (!getDolGlobalString('MEMBER_NEWFORM_FORCEMORPHY')) { | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -703,7 +703,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    703
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    703
                                                                                                                                                                                                 | 
                                                             			print '</td></tr>'."\n";  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    704
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    704
                                                                                                                                                                                                 | 
                                                             	} else { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    705
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    705
                                                                                                                                                                                                 | 
                                                             		//print $morphys[$conf->global->MEMBER_NEWFORM_FORCEMORPHY];  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    706
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -		print '<input type="hidden" id="morphy" name="morphy" value="' . getDolGlobalString('MEMBER_NEWFORM_FORCEMORPHY').'">'; | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    706
                                                                                                                                                                                                 | 
                                                            +		print '<input type="hidden" id="morphy" name="morphy" value="'.getDolGlobalString('MEMBER_NEWFORM_FORCEMORPHY').'">'; | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    707
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    707
                                                                                                                                                                                                 | 
                                                             	}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    708
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    708
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    709
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    709
                                                                                                                                                                                                 | 
                                                             	// Company   // TODO : optional hide  | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -800,7 +800,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    800
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    800
                                                                                                                                                                                                 | 
                                                             	}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    801
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    801
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    802
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    802
                                                                                                                                                                                                 | 
                                                             	// Other attributes  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    803
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -	$parameters['tpl_context'] = 'public';	// define template context to public  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    803
                                                                                                                                                                                                 | 
                                                            +	$parameters['tpl_context'] = 'public'; // define template context to public  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    804
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    804
                                                                                                                                                                                                 | 
                                                             	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    805
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    805
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    806
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    806
                                                                                                                                                                                                 | 
                                                             	// Comments  | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -861,9 +861,9 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    861
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    861
                                                                                                                                                                                                 | 
                                                             		$adht = new AdherentType($db);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    862
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    862
                                                                                                                                                                                                 | 
                                                             		$adht->fetch($typeid);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    863
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    863
                                                                                                                                                                                                 | 
                                                             		$caneditamount = $adht->caneditamount;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    864
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -		$amountbytype = $adht->amountByType(1);		// Load the array of amount per type  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    864
                                                                                                                                                                                                 | 
                                                            +		$amountbytype = $adht->amountByType(1); // Load the array of amount per type  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    865
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    865
                                                                                                                                                                                                 | 
                                                             		$amountbytype_json = json_encode($amountbytype);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    866
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -		$caneditamountbytype = $adht->caneditamountByType(1);		// Load the array of caneditamount per type  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    866
                                                                                                                                                                                                 | 
                                                            +		$caneditamountbytype = $adht->caneditamountByType(1); // Load the array of caneditamount per type  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    867
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    867
                                                                                                                                                                                                 | 
                                                             		$caneditamountbytype_json = json_encode($caneditamountbytype);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    868
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    868
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    869
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    869
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -887,7 +887,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    887
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    887
                                                                                                                                                                                                 | 
                                                             		// $conf->global->MEMBER_NEWFORM_PAYONLINE is 'paypal', 'paybox' or 'stripe'  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    888
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    888
                                                                                                                                                                                                 | 
                                                             		print '<tr><td>'.$langs->trans("Subscription"); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    889
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    889
                                                                                                                                                                                                 | 
                                                             		if (getDolGlobalString('MEMBER_EXT_URL_SUBSCRIPTION_INFO')) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    890
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			print ' - <a href="' . getDolGlobalString('MEMBER_EXT_URL_SUBSCRIPTION_INFO').'" rel="external" target="_blank" rel="noopener noreferrer">'.$langs->trans("SeeHere").'</a>'; | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    890
                                                                                                                                                                                                 | 
                                                            +			print ' - <a href="'.getDolGlobalString('MEMBER_EXT_URL_SUBSCRIPTION_INFO').'" rel="external" target="_blank" rel="noopener noreferrer">'.$langs->trans("SeeHere").'</a>'; | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    891
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    891
                                                                                                                                                                                                 | 
                                                             		}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    892
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    892
                                                                                                                                                                                                 | 
                                                             		print '</td><td class="nowrap">';  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    893
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    893
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -1019,10 +1019,10 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    1019
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    1019
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    1020
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    1020
                                                                                                                                                                                                 | 
                                                             		$i = 0;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    1021
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    1021
                                                                                                                                                                                                 | 
                                                             		while ($i < $num) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    1022
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			$objp = $db->fetch_object($result);	// Load the member type and information on it  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    1022
                                                                                                                                                                                                 | 
                                                            +			$objp = $db->fetch_object($result); // Load the member type and information on it  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    1023
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    1023
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    1024
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    1024
                                                                                                                                                                                                 | 
                                                             			$caneditamount = $objp->caneditamount;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    1025
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			$amountbytype = $adht->amountByType(1);		// Load the array of amount per type  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    1025
                                                                                                                                                                                                 | 
                                                            +			$amountbytype = $adht->amountByType(1); // Load the array of amount per type  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    1026
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    1026
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    1027
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    1027
                                                                                                                                                                                                 | 
                                                             			print '<tr class="oddeven">';  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    1028
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    1028
                                                                                                                                                                                                 | 
                                                             			// Label  |