[MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8793 rev-id: dle@openerp...

[odoo/odoo.git] / doc / changelog.rst

diff --git a/doc/changelog.rst b/doc/changelog.rst
index 02196aa..46f8436 100644 (file)
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -6,6 +6,10 @@ Changelog
 `trunk`
 -------
 
+- Added support of custom group_by format and display format when using group_by
+  on a datetime field, using datetime_format context key
+- Improved ``html_email_clean`` in tools: better quote and signature finding,
+  added shortening.
 - Cleaned and slightly refactored ``ir.actions.server``. The ``loop``, ``sms``
   and ``dummy`` server actions have been removed; ``object_create`` and
   ``object_copy`` have been merged into ``object_create``; ``other`` is now ``multi``
@@ -29,5 +33,15 @@ Changelog
   ``openerp.exceptions.RedirectWarning``.
 - Give a pair of new methods to ``res.config.settings`` and a helper to make
   them easier to use: ``get_config_warning()``.
-- Path to webkit report files (field ``report_file``) must be writen with the
-  Unix way (with ``/`` and not ``\``)
\ No newline at end of file
+- Path to webkit report files (field ``report_file``) must be written the
+  Unix way (with ``/`` and not ``\``)
+
+
+`7.0`
+-----
+
+- Modules may now include an ``i18n_extra`` directory that will be treated like the
+  default ``i18n`` directory. This is typically useful for manual translation files
+  that are not managed by Launchpad's translation system. An example is l10n modules
+  that depend on ``l10n_multilang``.
+