diff --git a/CHANGELOG b/CHANGELOG index c3d6508a12..a0eace7480 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +* Add day view on calendar * Raise NotImplementedError when setting Function field without setter * Add exports in view_toolbar_get * Add resources method to ModelStorage diff --git a/doc/topics/views/index.rst b/doc/topics/views/index.rst index 0ad74602d8..717951a233 100644 --- a/doc/topics/views/index.rst +++ b/doc/topics/views/index.rst @@ -804,7 +804,8 @@ Each calendar view must start with this tag. * ``dtend``: The name of the field that contains the end date. * ``mode``: An optional name for the view that will be used first. - Available views are: `week` and `month`. The default value is `month`. + Available views are: `day`, `week` and `month`. The default value is + `month`. * ``color``: An optional field name that contains the text color for the event. The default value is `black`. diff --git a/trytond/ir/ui/calendar.rnc b/trytond/ir/ui/calendar.rnc index 66d7082a6d..1a3e9e4e7d 100644 --- a/trytond/ir/ui/calendar.rnc +++ b/trytond/ir/ui/calendar.rnc @@ -6,7 +6,8 @@ attlist.calendar &= attlist.calendar &= attribute dtend { text }? attlist.calendar &= - attribute mode { "week" + attribute mode { "day" + | "week" | "month" }? attlist.calendar &= [ a:defaultValue = "black" ] attribute color { text }? diff --git a/trytond/ir/ui/calendar.rng b/trytond/ir/ui/calendar.rng index 93e47daf30..8ea1a13fbf 100644 --- a/trytond/ir/ui/calendar.rng +++ b/trytond/ir/ui/calendar.rng @@ -29,6 +29,7 @@ mode + day week month