diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index badf93b4e80..760c28ace22 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -1039,8 +1039,8 @@ else print ''.$langs->trans("LinkedIn").''; } - // Birthday - print "".$langs->trans("Birthday")."\n"; + // Birth Date + print "".$langs->trans("DateToBirth")."\n"; print $form->selectDate(($object->birth ? $object->birth : -1), 'birth', '', '', 1, 'formsoc'); print "\n"; @@ -1308,8 +1308,8 @@ else print ''.$langs->trans("LinkedIn").'linkedin).'">'; } - // Birthday - print "".$langs->trans("Birthday")."\n"; + // Birth Date + print "".$langs->trans("DateToBirth")."\n"; print $form->selectDate(($object->birth ? $object->birth : -1), 'birth', '', '', 1, 'formsoc'); print "\n"; @@ -1750,8 +1750,8 @@ else print ''; - // Birthday - print ''; + // Birth Date + print ''; // Public print ''; diff --git a/htdocs/core/boxes/box_birthdays.php b/htdocs/core/boxes/box_birthdays.php index 8204543540e..bedd9c08819 100644 --- a/htdocs/core/boxes/box_birthdays.php +++ b/htdocs/core/boxes/box_birthdays.php @@ -34,7 +34,7 @@ class box_birthdays extends ModeleBoxes { public $boxcode="birthdays"; public $boximg="object_user"; - public $boxlabel="BoxBirthdays"; + public $boxlabel="BoxTitleUserBirthdaysOfMonth"; public $depends = array("user"); /** @@ -76,18 +76,20 @@ class box_birthdays extends ModeleBoxes $this->max=$max; - include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; + include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; + include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; $userstatic=new User($this->db); $this->info_box_head = array('text' => $langs->trans("BoxTitleUserBirthdaysOfMonth")); if ($user->rights->user->user->lire) { - $sql = "SELECT u.rowid, u.firstname, u.lastname"; - $sql.= ", u.birth"; + $tmparray=dol_getdate(dol_now(), true); + + $sql = "SELECT u.rowid, u.firstname, u.lastname, u.birth"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= " WHERE u.entity IN (".getEntity('user').")"; - $sql.= " AND MONTH(u.birth) = ".date('m'); + $sql.= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], $tmparray['year']); $sql.= " ORDER BY u.birth ASC"; $sql.= $this->db->plimit($max, 0); @@ -127,7 +129,7 @@ class box_birthdays extends ModeleBoxes $line++; } - if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'class="center"','text'=>$langs->trans("NoRecordedUsers")); + if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'class="center opacitymedium"','text'=>$langs->trans("None")); $this->db->free($result); } diff --git a/htdocs/core/boxes/box_birthdays_members.php b/htdocs/core/boxes/box_birthdays_members.php index 45f64adce42..4b3805b8908 100644 --- a/htdocs/core/boxes/box_birthdays_members.php +++ b/htdocs/core/boxes/box_birthdays_members.php @@ -34,7 +34,7 @@ class box_birthdays_members extends ModeleBoxes { public $boxcode="birthdays_members"; public $boximg="object_user"; - public $boxlabel="BoxBirthdaysMembers"; + public $boxlabel="BoxTitleMemberNextBirthdays"; public $depends = array("adherent"); /** @@ -76,20 +76,22 @@ class box_birthdays_members extends ModeleBoxes $this->max=$max; - include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; + include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; + include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; $memberstatic=new Adherent($this->db); $this->info_box_head = array('text' => $langs->trans("BoxTitleMemberNextBirthdays")); if ($user->rights->adherent->lire) { - $sql = "SELECT u.rowid, u.firstname, u.lastname"; - $sql.= ", u.birth"; + $tmparray=dol_getdate(dol_now(), true); + + $sql = "SELECT u.rowid, u.firstname, u.lastname, u.birth"; $sql.= " FROM ".MAIN_DB_PREFIX."adherent as u"; $sql.= " WHERE u.entity IN (".getEntity('adherent').")"; $sql.= " AND u.statut = 1"; - $sql.= " AND date_format(u.birth, '%m-%d') >= date_format(curdate(), '%m-%d')"; - $sql.= " ORDER BY date_format(u.birth, '%m-%d') ASC"; + $sql.= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], $tmparray['year']); + $sql.= " ORDER BY u.birth ASC"; $sql.= $this->db->plimit($max, 0); dol_syslog(get_class($this)."::loadBox", LOG_DEBUG); @@ -128,7 +130,7 @@ class box_birthdays_members extends ModeleBoxes $line++; } - if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'class="center"','text'=>$langs->trans("NoRecordedUsers")); + if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'class="center opacitymedium"','text'=>$langs->trans("None")); $this->db->free($result); } diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang index 3cf7ea24493..c0d301710c4 100644 --- a/htdocs/langs/en_US/boxes.lang +++ b/htdocs/langs/en_US/boxes.lang @@ -19,6 +19,7 @@ BoxLastContacts=Latest contacts/addresses BoxLastMembers=Latest members BoxFicheInter=Latest interventions BoxCurrentAccounts=Open accounts balance +BoxTitleMemberNextBirthdays=Birthdays of this month (members) BoxTitleLastRssInfos=Latest %s news from %s BoxTitleLastProducts=Products/Services: last %s modified BoxTitleProductsAlertStock=Products: stock alert @@ -85,4 +86,4 @@ ForProposals=Proposals LastXMonthRolling=The latest %s month rolling ChooseBoxToAdd=Add widget to your dashboard BoxAdded=Widget was added in your dashboard -BoxTitleUserBirthdaysOfMonth=Birthdays of this month \ No newline at end of file +BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users) \ No newline at end of file diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index b92e21d69b3..34590a924be 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -6,7 +6,7 @@ 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=Date of birth +DateToBirth=Birth date BirthdayAlertOn=birthday alert active BirthdayAlertOff=birthday alert inactive TransKey=Translation of the key TransKey diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php index de31dae1256..3698100d37a 100644 --- a/htdocs/modulebuilder/template/myobject_list.php +++ b/htdocs/modulebuilder/template/myobject_list.php @@ -240,6 +240,7 @@ foreach($search as $key => $val) if ($search[$key] != '') $sql.=natural_search($key, $search[$key], (($key == 'status')?2:$mode_search)); } if ($search_all) $sql.= natural_search(array_keys($fieldstosearchall), $search_all); +//$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear); // Add where from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php'; // Add where from hooks
'.$langs->trans("Birthday").''.dol_print_date($object->birth, 'day').'
'.$langs->trans("DateToBirth").''.dol_print_date($object->birth, 'day').'
'.$langs->trans("Public").''.yn($object->public).'