diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index c3c14171386..72c9f7ef880 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -942,7 +942,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { } // Birth Date - print "".$langs->trans("DateToBirth")."\n"; + print "".$langs->trans("DateOfBirth")."\n"; print $form->selectDate(($object->birth ? $object->birth : -1), 'birth', '', '', 1, 'formsoc'); print "\n"; @@ -1175,7 +1175,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { } // Birth Date - print "".$langs->trans("DateToBirth")."\n"; + print "".$langs->trans("DateOfBirth")."\n"; print $form->selectDate(($object->birth ? $object->birth : -1), 'birth', '', '', 1, 'formsoc'); print "\n"; @@ -1570,7 +1570,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { print ''; // Birth Date - print ''; + print ''; // Public print ''; diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 8b643dcbe92..1475f544f67 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -282,7 +282,7 @@ class Adherent extends CommonObject 'phone' => array('type' => 'varchar(30)', 'label' => 'Phone', 'enabled' => 1, 'visible' => -1, 'position' => 115), 'phone_perso' => array('type' => 'varchar(30)', 'label' => 'Phone perso', 'enabled' => 1, 'visible' => -1, 'position' => 120), 'phone_mobile' => array('type' => 'varchar(30)', 'label' => 'Phone mobile', 'enabled' => 1, 'visible' => -1, 'position' => 125), - 'birth' => array('type' => 'date', 'label' => 'DateToBirth', 'enabled' => 1, 'visible' => -1, 'position' => 130), + 'birth' => array('type' => 'date', 'label' => 'DateOfBirth', 'enabled' => 1, 'visible' => -1, 'position' => 130), 'photo' => array('type' => 'varchar(255)', 'label' => 'Photo', 'enabled' => 1, 'visible' => -1, 'position' => 135), 'public' => array('type' => 'smallint(6)', 'label' => 'Public', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 145), 'datefin' => array('type' => 'datetime', 'label' => 'DateEnd', 'enabled' => 1, 'visible' => -1, 'position' => 150), diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index 606e4e626b0..6afef016d47 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -851,7 +851,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) print '
'.$langs->trans("DateToBirth").''.dol_print_date($object->birth, 'day').'
'.$langs->trans("DateOfBirth").''.dol_print_date($object->birth, 'day').'
'.$langs->trans("Public").''.yn($object->public).'
'; // Date To Birth - print ''; // Date To Birth - print ''; @@ -272,7 +272,7 @@ if ($action == 'edit') { include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; - print ''; } else { - print ''; + print ''; } print ""; diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php index 4f0c1e04307..29a96c0f03c 100644 --- a/htdocs/core/modules/modCategorie.class.php +++ b/htdocs/core/modules/modCategorie.class.php @@ -275,7 +275,7 @@ class modCategorie extends DolibarrModules 'p.town' => 'Town', 'country.code' => 'CountryCode', 'country.label' => 'Country', - 'p.birthday' => 'DateToBirth', + 'p.birthday' => 'DateOfBirth', 'p.poste' => 'PostOrFunction', 'p.phone' => 'Phone', 'p.phone_perso' => 'PhonePerso', diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php index 6ce1088aa2f..a752b3a4c1a 100644 --- a/htdocs/core/modules/modSociete.class.php +++ b/htdocs/core/modules/modSociete.class.php @@ -632,7 +632,7 @@ class modSociete extends DolibarrModules 's.town' => "Town", 's.fk_departement' => "StateCode", 's.fk_pays' => "CountryCode", - 's.birthday' => "BirthdayDate", + 's.birthday' => "DateOfBirth", 's.poste' => "Role", 's.phone' => "Phone", 's.phone_perso' => "PhonePerso", diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php index c2ce0fec86f..56e08ee7644 100644 --- a/htdocs/core/modules/modUser.class.php +++ b/htdocs/core/modules/modUser.class.php @@ -227,7 +227,7 @@ class modUser extends DolibarrModules 'u.email'=>"Email", 'u.note'=>"Note", 'u.signature'=>'Signature', 'u.fk_user'=>'HierarchicalResponsible', 'u.thm'=>'THM', 'u.tjm'=>'TJM', 'u.weeklyhours'=>'WeeklyHours', 'u.dateemployment'=>'DateEmployment', 'u.salary'=>'Salary', 'u.color'=>'Color', 'u.api_key'=>'ApiKey', - 'u.birth'=>'BirthdayDate', + 'u.birth'=>'DateOfBirth', 'u.datec'=>"DateCreation", 'u.tms'=>"DateLastModification", 'u.admin'=>"Administrator", 'u.statut'=>'Status', 'u.datelastlogin'=>'LastConnexion', 'u.datepreviouslogin'=>'PreviousConnexion', 'u.fk_socpeople'=>"IdContact", 'u.fk_soc'=>"IdCompany", 'u.fk_member'=>"MemberId" @@ -283,7 +283,7 @@ class modUser extends DolibarrModules 'u.email'=>"Email", 'u.note'=>"Note", 'u.signature'=>'Signature', 'u.fk_user'=>'HierarchicalResponsible', 'u.thm'=>'THM', 'u.tjm'=>'TJM', 'u.weeklyhours'=>'WeeklyHours', 'u.dateemployment'=>'DateEmployment', 'u.salary'=>'Salary', 'u.color'=>'Color', 'u.api_key'=>'ApiKey', - 'u.birth'=>'BirthdayDate', + 'u.birth'=>'DateOfBirth', 'u.datec'=>"DateCreation", 'u.statut'=>'Status' ); diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql index e3a1d1807bc..f529e285d0e 100644 --- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql +++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql @@ -176,6 +176,7 @@ CREATE TABLE llx_recruitment_recruitmentcandidature( lastname varchar(128), email varchar(255), phone varchar(64), + date_birth date, remuneration_requested integer, remuneration_proposed integer, email_msgid varchar(255), @@ -186,6 +187,7 @@ CREATE TABLE llx_recruitment_recruitmentcandidature( ALTER TABLE llx_recruitment_recruitmentcandidature ADD COLUMN entity integer NOT NULL DEFAULT 1; ALTER TABLE llx_recruitment_recruitmentcandidature ADD COLUMN email_msgid varchar(255); ALTER TABLE llx_recruitment_recruitmentcandidature ADD COLUMN fk_recruitment_origin INTEGER NULL; +ALTER TABLE llx_recruitment_recruitmentcandidature ADD COLUMN date_birth date; ALTER TABLE llx_recruitment_recruitmentcandidature ADD INDEX idx_recruitment_recruitmentcandidature_rowid (rowid); ALTER TABLE llx_recruitment_recruitmentcandidature ADD INDEX idx_recruitment_recruitmentcandidature_ref (ref); diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.sql index 924d80ba540..f135c1af72f 100644 --- a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.sql +++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.sql @@ -23,7 +23,7 @@ CREATE TABLE llx_recruitment_recruitmentcandidature( description text, note_public text, note_private text, - date_creation datetime NOT NULL, + date_creation datetime NOT NULL, tms timestamp, fk_user_creat integer NOT NULL, fk_user_modif integer, @@ -34,6 +34,7 @@ CREATE TABLE llx_recruitment_recruitmentcandidature( lastname varchar(128), email varchar(255), phone varchar(64), + date_birth date, remuneration_requested integer, remuneration_proposed integer, email_msgid varchar(255), diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 4ad56467cf7..16805424e61 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -1090,3 +1090,4 @@ VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved DefaultMailModel=Default Mail Model PublicVendorName=Public name of vendor +DateOfBirth=Date of birth diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index 59a0069cd7d..7495291cf3f 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -5,8 +5,6 @@ Tools=Tools TMenuTools=Tools ToolsDesc=All tools not included in other menu entries are grouped here.
All the tools can be accessed via the left menu. Birthday=Birthday -BirthdayDate=Birthday date -DateToBirth=Birth date BirthdayAlertOn=birthday alert active BirthdayAlertOff=birthday alert inactive TransKey=Translation of the key TransKey diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php index 036d6bb1610..74644270e6a 100644 --- a/htdocs/recruitment/class/recruitmentcandidature.class.php +++ b/htdocs/recruitment/class/recruitmentcandidature.class.php @@ -116,6 +116,7 @@ class RecruitmentCandidature extends CommonObject 'firstname' => array('type'=>'varchar(128)', 'label'=>'Firstname', 'enabled'=>'1', 'position'=>21, 'notnull'=>0, 'visible'=>1,), 'email' => array('type'=>'varchar(255)', 'label'=>'EMail', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1,), 'phone' => array('type'=>'varchar(64)', 'label'=>'Phone', 'enabled'=>'1', 'position'=>31, 'notnull'=>0, 'visible'=>1,), + 'date_birth' => array('type'=>'date', 'label'=>'DateOfBirth', 'enabled'=>'1', 'position'=>70, 'visible'=>-1,), 'email_msgid' => array('type'=>'varchar(255)', 'label'=>'EmailMsgID', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'help'=>'EmailMsgIDDesc'), //'fk_recruitment_origin' => array('type'=>'integer:CRecruitmentOrigin:recruitment/class/crecruitmentorigin.class.php', 'label'=>'Origin', 'enabled'=>'1', 'position'=>45, 'visible'=>1, 'index'=>1), 'remuneration_requested' => array('type'=>'integer', 'label'=>'RequestedRemuneration', 'enabled'=>'1', 'position'=>80, 'notnull'=>0, 'visible'=>-1,), @@ -140,9 +141,10 @@ class RecruitmentCandidature extends CommonObject public $firstname; public $email; public $phone; + public $date_birth; + public $email_msgid; public $remuneration_requested; public $remuneration_proposed; - public $email_msgid; public $fk_recruitment_origin; public $import_key; public $model_pdf;
'; + print '
'; $form = new Form($db); if ($object->birthday) { diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index a5a1714b6e5..724d9077ff1 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -188,7 +188,7 @@ if ($action == 'edit') print '
'.$langs->trans("DateToBirth").''; + print '
'.$langs->trans("DateOfBirth").''; $form = new Form($db); print $form->selectDate($object->birthday, 'birthday', 0, 0, 1, "perso", 1, 0); print ''.$langs->trans("DateToBirth").''.dol_print_date($object->birthday, "day"); + print ''.$langs->trans("DateOfBirth").''.dol_print_date($object->birthday, "day"); print '   '; //var_dump($birthdatearray); @@ -288,7 +288,7 @@ if ($action == 'edit') else print $langs->trans("BirthdayAlertOff"); print ''.$langs->trans("DateToBirth").''.$langs->trans("DateOfBirth").'