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

Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0

Browse Source
This commit is contained in:
Laurent Destailleur 2021-10-20 12:38:32 +02:00
commit 54c9a60fa3
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/admin/member.php
View File

@ -228,7 +228,7 @@ print "</td></tr>\n";
// Allow members to change type on renewal forms
/* To test during next beta
print '<tr class="oddeven"><td>'.$langs->trans("MemberAllowchangeOfType").'</td><td>';
print $form->selectyesno('ADHERENT_LOGIN_NOT_REQUIRED', (!empty($conf->global->MEMBER_ALLOW_CHANGE_OF_TYPE) ? 0 : 1), 1);
print $form->selectyesno('MEMBER_ALLOW_CHANGE_OF_TYPE', (!empty($conf->global->MEMBER_ALLOW_CHANGE_OF_TYPE) ? 0 : 1), 1);
print "</td></tr>\n";
*/

4
htdocs/societe/card.php
View File

@ -1151,6 +1151,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
$("#typent_id").change();
$("#effectif_id").val(id_ef15);
$("#effectif_id").change();
/* Force to recompute the width of a select2 field when it was hidden and then shown programatically */
if ($("#civility_id").data("select2")) {
$("#civility_id").select2({width: "resolve"});
}
$("#TypeName").html(document.formsoc.LastName.value);
document.formsoc.private.value=1;
});