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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2011-11-30 11:55:54 +01:00
commit 3448173ae4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/adherents/fiche.php
View File

@ -247,7 +247,7 @@ if ($_REQUEST["action"] == 'update' && ! $_POST["cancel"] && $user->rights->adhe
$object->naiss = $datenaiss; $object->naiss = $datenaiss;
$object->typeid = $_POST["typeid"]; $object->typeid = $_POST["typeid"];
$object->note = trim($_POST["comment"]); //$object->note = trim($_POST["comment"]);
$object->morphy = $_POST["morphy"]; $object->morphy = $_POST["morphy"];
$object->amount = $_POST["amount"]; $object->amount = $_POST["amount"];
@ -371,7 +371,7 @@ if ($_POST["action"] == 'add' && $user->rights->adherent->creer)
$login=$_POST["member_login"]; $login=$_POST["member_login"];
$pass=$_POST["password"]; $pass=$_POST["password"];
$photo=$_POST["photo"]; $photo=$_POST["photo"];
$comment=$_POST["comment"]; //$comment=$_POST["comment"];
$morphy=$_POST["morphy"]; $morphy=$_POST["morphy"];
$cotisation=$_POST["cotisation"]; $cotisation=$_POST["cotisation"];
$public=$_POST["public"]; $public=$_POST["public"];
@ -400,7 +400,7 @@ if ($_POST["action"] == 'add' && $user->rights->adherent->creer)
$object->naiss = $datenaiss; $object->naiss = $datenaiss;
$object->photo = $photo; $object->photo = $photo;
$object->typeid = $typeid; $object->typeid = $typeid;
$object->note = $comment; //$object->note = $comment;
$object->morphy = $morphy; $object->morphy = $morphy;
$object->user_id = $userid; $object->user_id = $userid;
$object->fk_soc = $socid; $object->fk_soc = $socid;
@ -704,7 +704,7 @@ if ($action == 'create')
print '</tr>'; print '</tr>';
// Firstname // Firstname
print '<tr><td>'.$langs->trans("Firstname").'</td><td><input type="text" name="prenom" size="40" value="'.(isset($_POST["prenom"])?$_POST["prenom"]:$object->prenom).'"></td>'; print '<tr><td><span class="fieldrequired">'.$langs->trans("Firstname").'</td><td><input type="text" name="prenom" size="40" value="'.(isset($_POST["prenom"])?$_POST["prenom"]:$object->prenom).'"></td>';
print '</tr>'; print '</tr>';
// Password // Password
@ -932,7 +932,7 @@ if ($action == 'edit')
print '</tr>'; print '</tr>';
// Firstname // Firstname
print '<tr><td width="20%">'.$langs->trans("Firstname").'</td><td><input type="text" name="prenom" size="40" value="'.(isset($_POST["prenom"])?$_POST["prenom"]:$object->prenom).'"></td>'; print '<tr><td><span class="fieldrequired">'.$langs->trans("Firstname").'</td><td><input type="text" name="prenom" size="40" value="'.(isset($_POST["prenom"])?$_POST["prenom"]:$object->prenom).'"></td>';
print '</tr>'; print '</tr>';
// Password // Password

2
htdocs/langs/es_ES/members.lang
View File

@ -182,7 +182,7 @@ MembersStatisticsDesc=Elija las estadísticas que desea consultar...
MenuMembersStats=Estadísticas MenuMembersStats=Estadísticas
LastMemberDate=Fecha último miembro LastMemberDate=Fecha último miembro
Nature=Naturaleza Nature=Naturaleza
Public=Informació pública (no=privada) Public=Información pública (no=privada)
Exports=Exportaciones Exports=Exportaciones
NewMemberbyWeb=Nuevo miembro añadido. En espera de validación NewMemberbyWeb=Nuevo miembro añadido. En espera de validación
NewMemberForm=Formulario de inscripción NewMemberForm=Formulario de inscripción