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

More control on member creation

Browse Source
This commit is contained in:
Laurent Destailleur 2010-01-24 18:19:19 +00:00
parent 516e19b366
commit e92beda648
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
htdocs/adherents/fiche.php
View File

@ -386,10 +386,10 @@ if ($_POST["action"] == 'add' && $user->rights->adherent->creer)
} }
} }
// Test validite des parametres // Check parameters
if (empty($typeid)) { if (empty($morphy) || $morphy == "-1") {
$error++; $error++;
$errmsg .= $langs->trans("ErrorMemberTypeNotDefined")."<br>\n"; $errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Person"))."<br>\n";
} }
// Test si le login existe deja // Test si le login existe deja
if (empty($login)) { if (empty($login)) {
@ -418,6 +418,10 @@ if ($_POST["action"] == 'add' && $user->rights->adherent->creer)
$langs->load("errors"); $langs->load("errors");
$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Firstname"))."<br>\n"; $errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Firstname"))."<br>\n";
} }
if (! ($typeid > 0)) { // Keep () before !
$error++;
$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type"))."<br>\n";
}
if ($conf->global->ADHERENT_MAIL_REQUIRED && ! isValidEMail($email)) { if ($conf->global->ADHERENT_MAIL_REQUIRED && ! isValidEMail($email)) {
$error++; $error++;
$langs->load("errors"); $langs->load("errors");
@ -631,13 +635,6 @@ llxHeader('',$langs->trans("Member"),'EN:Module_Foundations|FR:Module_Adh&eacute
$html = new Form($db); $html = new Form($db);
if ($errmsg)
{
print '<div class="error">'.$errmsg.'</div>';
print "\n";
}
if ($mesg) print '<div class="ok">'.$mesg.'</div>';
// fetch optionals attributes and labels // fetch optionals attributes and labels
$adho->fetch_name_optionals_label(); $adho->fetch_name_optionals_label();
@ -670,6 +667,13 @@ if ($action == 'edit')
dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user'); dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
if ($errmsg)
{
print '<div class="error">'.$errmsg.'</div>';
}
if ($mesg) print '<div class="ok">'.$mesg.'</div>';
$rowspan=15; $rowspan=15;
$rowspan+=sizeof($adho->attribute_label); $rowspan+=sizeof($adho->attribute_label);
if ($conf->societe->enabled) $rowspan++; if ($conf->societe->enabled) $rowspan++;
@ -825,6 +829,12 @@ if ($action == 'create')
print_fiche_titre($langs->trans("NewMember")); print_fiche_titre($langs->trans("NewMember"));
if ($errmsg)
{
print '<div class="error">'.$errmsg.'</div>';
}
if ($mesg) print '<div class="ok">'.$mesg.'</div>';
print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="post" enctype="multipart/form-data">'; print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="post" enctype="multipart/form-data">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="add">'; print '<input type="hidden" name="action" value="add">';
@ -835,7 +845,7 @@ if ($action == 'create')
$morphys["phy"] = "Physique"; $morphys["phy"] = "Physique";
$morphys["mor"] = "Morale"; $morphys["mor"] = "Morale";
print "<tr><td>".$langs->trans("Person")."*</td><td>\n"; print "<tr><td>".$langs->trans("Person")."*</td><td>\n";
$html->select_array("morphy", $morphys, $adh->morphy); $html->select_array("morphy", $morphys, $adh->morphy, 1);
print "</td>\n"; print "</td>\n";
// Company // Company
@ -872,7 +882,7 @@ if ($action == 'create')
$listetype=$adht->liste_array(); $listetype=$adht->liste_array();
if (sizeof($listetype)) if (sizeof($listetype))
{ {
$html->select_array("typeid", $listetype, $typeid); $html->select_array("typeid", $listetype, $typeid, 1);
} else { } else {
print '<font class="error">'.$langs->trans("NoTypeDefinedGoToSetup").'</font>'; print '<font class="error">'.$langs->trans("NoTypeDefinedGoToSetup").'</font>';
} }
@ -1285,7 +1295,8 @@ if ($rowid && $action != 'edit')
{ {
if ($user->rights->societe->creer) if ($user->rights->societe->creer)
{ {
print '<a class="butAction" href="fiche.php?rowid='.$adh->id.'&amp;action=create_thirdparty">'.$langs->trans("CreateDolibarrThirdParty").'</a>'; if ($adh->statut != -1) print '<a class="butAction" href="fiche.php?rowid='.$adh->id.'&amp;action=create_thirdparty">'.$langs->trans("CreateDolibarrThirdParty").'</a>';
else print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrLogin").'</a>';
} }
else else
{ {

2
htdocs/langs/en_US/main.lang
View File

@ -552,7 +552,7 @@ NotSupported=Not supported
RequiredField=Required field RequiredField=Required field
Result=Result Result=Result
ToTest=Test ToTest=Test
ValidateBefore=Card must be validated before using this feature
# Week day # Week day
Day1=Monday Day1=Monday
Day2=Tuesday Day2=Tuesday

2
htdocs/langs/fr_FR/main.lang
View File

@ -551,7 +551,7 @@ NotSupported=Non supporté
RequiredField=Champ obligatoire RequiredField=Champ obligatoire
Result=Résultat Result=Résultat
ToTest=Tester ToTest=Tester
ValidateBefore=La fiche doit être validée pour pouvoir utiliser cette fonction
# Week day # Week day
Day1=Lundi Day1=Lundi
Day2=Mardi Day2=Mardi