diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 79aa64fb1abaaaf7932f768e4a25d551b9b83666..945ed849f577336c4d785a11133ff746e32aa3ef 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -83,6 +83,9 @@ class Adherent extends CommonObject var $datevalid; var $birth; + var $note_public; + var $note_private; + var $typeid; // Id type adherent var $type; // Libelle type adherent var $need_subscription; @@ -410,7 +413,9 @@ class Adherent extends CommonObject $this->country_id=($this->country_id > 0?$this->country_id:$this->country_id); $this->state_id=($this->state_id > 0?$this->state_id:$this->state_id); if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname=ucwords(trim($this->lastname)); - if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname=ucwords(trim($this->firstname)); + if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname=ucwords(trim($this->firstname)); + $this->note_public=($this->note_public?$this->note_public:$this->note_public); + $this->note_private=($this->note_private?$this->note_private:$this->note_private); // Check parameters if (! empty($conf->global->ADHERENT_MAIL_REQUIRED) && ! isValidEMail($this->email)) @@ -440,7 +445,7 @@ class Adherent extends CommonObject $sql.= ", phone_perso=" .($this->phone_perso?"'".$this->db->escape($this->phone_perso)."'":"null"); $sql.= ", phone_mobile=" .($this->phone_mobile?"'".$this->db->escape($this->phone_mobile)."'":"null"); $sql.= ", note_private=" .($this->note_private?"'".$this->db->escape($this->note_private)."'":"null"); - $sql.= ", note_public=" .($this->note_private?"'".$this->db->escape($this->note_public)."'":"null"); + $sql.= ", note_public=" .($this->note_public?"'".$this->db->escape($this->note_public)."'":"null"); $sql.= ", photo=" .($this->photo?"'".$this->photo."'":"null"); $sql.= ", public='".$this->public."'"; $sql.= ", statut=" .$this->statut; @@ -1146,11 +1151,11 @@ class Adherent extends CommonObject $this->birth = $this->db->jdate($obj->birthday); $this->note_private = $obj->note_private; - $this->note_public = $obj->note_public; + $this->note_public = $obj->note_public; $this->morphy = $obj->morphy; $this->typeid = $obj->fk_adherent_type; - $this->type = $obj->type; + $this->type = $obj->type; $this->need_subscription = $obj->subscription; $this->user_id = $obj->user_id; diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index c026ad859e50e8b4270e126deb5bb6036b9e5dda..6d2b469fb551ff675ffd903c5b1d0fe6ce23fbbc 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -238,11 +238,10 @@ if ($action == 'add') $adh->pass = $_POST["pass1"]; } $adh->photo = $_POST["photo"]; - $adh->note = $_POST["note"]; $adh->country_id = $_POST["country_id"]; $adh->state_id = $_POST["state_id"]; $adh->typeid = $_POST["type"]; - $adh->note = $_POST["comment"]; + $adh->note_private= $_POST["note_private"]; $adh->morphy = $_POST["morphy"]; $adh->birth = $birthday; @@ -520,7 +519,7 @@ foreach($extrafields->attribute_label as $key=>$value) // Comments print '<tr>'; print '<td valign="top">'.$langs->trans("Comments").'</td>'; -print '<td valign="top"><textarea name="comment" wrap="soft" cols="60" rows="'.ROWS_4.'">'.dol_escape_htmltag(GETPOST('comment')).'</textarea></td>'; +print '<td valign="top"><textarea name="note_private" id="note_private" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note_private')).'</textarea></td>'; print '</tr>'."\n"; // Add specific fields used by Dolibarr foundation for example diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php index 908ad220f72af6394d9fbf4d5ffd141333f13b3f..cbac1692103450b593dc7b81b7725d893f07880a 100644 --- a/htdocs/public/members/public_card.php +++ b/htdocs/public/members/public_card.php @@ -95,10 +95,10 @@ if ($id > 0) print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur">'.$object->lastname.' </td></tr>'; print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->societe.' </td></tr>'; print '<tr><td>'.$langs->trans("Address").'</td><td class="valeur">'.nl2br($object->address).' </td></tr>'; - print '<tr><td>'.$langs->trans("Zip").' '.$langs->trans("Town").'</td><td class="valeur">'.$object->zip.' '.$object->town.' </td></tr>'; + print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td class="valeur">'.$object->zip.' '.$object->town.' </td></tr>'; print '<tr><td>'.$langs->trans("Country").'</td><td class="valeur">'.$object->country.' </td></tr>'; print '<tr><td>'.$langs->trans("EMail").'</td><td class="valeur">'.$object->email.' </td></tr>'; - print '<tr><td>'.$langs->trans("Birthday").'</td><td class="valeur">'.$object->birth.' </td></tr>'; + print '<tr><td>'.$langs->trans("Birthday").'</td><td class="valeur">'.dol_print_date($object->birth,'day').'</td></tr>'; if (isset($object->photo) && $object->photo !='') { @@ -111,7 +111,7 @@ if ($id > 0) // print "<tr><td>$value</td><td>".$object->array_options["options_$key"]." </td></tr>\n"; // } - print '<tr><td valign="top">'.$langs->trans("Comments").'</td><td>'.nl2br($object->note).'</td></tr>'; + print '<tr><td valign="top">'.$langs->trans("Comments").'</td><td>'.nl2br($object->note_public).'</td></tr>'; print '</table>'; }