Merge pull request #1832 from KreizIT/Calendar

Fix allday event move
Dolibarr · Aug 21, 2014 · b14a1b2 · b14a1b2
2 parents 137efaa + 8d13ab0
commit b14a1b2
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
@@ -1192,23 +1192,20 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     $cssclass=$cssclass.' '.$cssclass.'_day_'.$ymd;
 
                     // Defined style to disable drag and drop feature
-                    if (empty($event->fulldayevent))
+                    if ($event->date_end_in_calendar && date('Ymd',$event->date_start_in_calendar) != date('Ymd',$event->date_end_in_calendar))
                     {
-                        if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar)
-                        {
-                            $tmpyearend    = date('Y',$event->date_end_in_calendar);
-                            $tmpmonthend   = date('m',$event->date_end_in_calendar);
-                            $tmpdayend     = date('d',$event->date_end_in_calendar);
-                            if ($tmpyearend != $annee || $tmpmonthend != $mois || $tmpdayend != $jour)
-                            {
-                                $cssclass.= " unsortable";
-                            }
-                        }
-                        if ($event->type_code =='AC_OTH_AUTO')
+                        $tmpyearend    = date('Y',$event->date_end_in_calendar);
+                        $tmpmonthend   = date('m',$event->date_end_in_calendar);
+                        $tmpdayend     = date('d',$event->date_end_in_calendar);
+                        if ($tmpyearend == $annee && $tmpmonthend == $mois && $tmpdayend == $jour)
                         {
                             $cssclass.= " unsortable";
                         }
                     }
+                    if ($event->type_code =='AC_OTH_AUTO')
+                    {
+                        $cssclass.= " unsortable";
+                    }
 
                     // Show rect of event
                     print '<div id="event_'.$ymd.'_'.$i.'" class="event '.$cssclass.'">';