diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 0dc64c5a9fe..fffd5cc9d80 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -180,11 +180,11 @@ class BlockedLog
public function setObjectData(&$object)
{
// Set date
- if($object->element == 'payment' || $object->element == 'payment_supplier')
+ if ($object->element == 'payment' || $object->element == 'payment_supplier')
{
$this->date_object = $object->datepaye;
}
- if ($object->element=='payment_salary')
+ elseif ($object->element=='payment_salary')
{
$this->date_object = $object->datev;
}
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index bda7dd7a594..7004457b97d 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1364,7 +1364,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
print '>';
print '
db);
$b->action = $action;
$b->amounts= $amounts;
- $b->setObjectData($object); // Set field ref_object, fk_object, element, object_data
+ $b->setObjectData($object); // Set field date_object, ref_object, fk_object, element, object_data
$res = $b->create($user);
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 2ffb2836f15..ce0f59cf940 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -3323,6 +3323,8 @@ img.datecallink { padding-left: 2px !important; padding-right: 2px !important; }
.ui-datepicker-trigger {
vertical-align: middle;
cursor: pointer;
+ padding-left: 2px;
+ padding-right: 2px;
}
.bodyline {
@@ -3475,6 +3477,10 @@ a.websitebuttonsitepreviewdisabled img {
/* Module agenda */
/* ============================================================================== */
+.dayevent .tagtr:first-of-type {
+ height: 24px;
+}
+
.agendacell { height: 60px; }
table.cal_month { border-spacing: 0px; }
table.cal_month td:first-child { border-left: 0px; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 16c1bb47129..061ab132f99 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3418,6 +3418,8 @@ img.datecallink { padding-left: 2px !important; padding-right: 2px !important; }
.ui-datepicker-trigger {
vertical-align: middle;
cursor: pointer;
+ padding-left: 2px;
+ padding-right: 2px;
}
.bodyline {
@@ -3571,6 +3573,9 @@ a.websitebuttonsitepreviewdisabled img {
/* Module agenda */
/* ============================================================================== */
+.dayevent .tagtr:first-of-type {
+ height: 24px;
+}
.agendacell { height: 60px; }
table.cal_month { border-spacing: 0px; }
table.cal_month td:first-child { border-left: 0px; }