Copy of v9 mail_activity* modules

6 years ago · 469a1c8238
61 changed files with 5876 additions and 0 deletions
--- a/mail_activity/LICENSE
+++ b/mail_activity/LICENSE
@ -0,0 +1,859 @@
+
+For copyright information, please see the COPYRIGHT file.
+
+Odoo is published under the GNU LESSER GENERAL PUBLIC LICENSE, Version 3
+(LGPLv3), as included below. Since the LGPL is a set of additional
+permissions on top of the GPL, the text of the GPL is included at the
+bottom as well.
+
+Some external libraries and contributions bundled with Odoo may be published
+under other GPL-compatible licenses. For these, please refer to the relevant
+source files and/or license files, in the source code tree.
+
+**************************************************************************
+
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
+**************************************************************************
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
+
+**************************************************************************
--- a/mail_activity/README.rst
+++ b/mail_activity/README.rst
@ -0,0 +1,69 @@
+==========
+Activities
+==========
+
+This module backports the activities from 11.0.
+
+Configuration
+=============
+
+To configure this module, you need to do the same as in 11.0.
+
+Usage
+=====
+
+To use this module, you need to do the same as in 11.0.
+
+Known issues / Roadmap
+======================
+
+* The button 'Mark done' that appears for each activity in the chatter
+  is not available.
+
+* It is not possible to schedule a next activity based on a given activity.
+
+* In v9 a hook is needed in the method 'send_mail' of the transient
+  model 'mail.compose.message'. Otherwise the completion of an activity
+  will be notified to external partners. In v10 this feature exists out of
+  of the box in Odoo.
+
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/social/issues>`_. In case of trouble, please
+check there if your issue has already been reported. If you spotted it first,
+help us smashing it by providing a detailed and welcomed feedback.
+
+Credits
+=======
+
+Images
+------
+
+* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.
+
+Contributors
+------------
+
+**This module is a backport from Odoo SA and as such, it is not included in the OCA CLA. That means we do not have a copy of the copyright on it like all other OCA modules.**
+
+* Holger Brunn <hbrunn@therp.nl>
+
+Do not contact contributors directly about help with questions or problems concerning this addon, but use the `community mailing list <mailto:community@mail.odoo.com>`_ or the `appropriate specialized mailinglist <https://odoo-community.org/groups>`_ for help, and the bug tracker linked in `Bug Tracker`_ above for technical issues.
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit https://odoo-community.org.
--- a/mail_activity/init.py
+++ b/mail_activity/init.py
@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+from . import models
+from . import wizards
+from .hooks import post_load_hook
--- a/mail_activity/openerp.py
+++ b/mail_activity/openerp.py
@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Odoo SA <https://www.odoo.com>
+# Copyright 2018 Therp BV <http://therp.nl>
+# Copyright 2018 Eficent <http://www.eficent.com>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+{
+    "name": "Activities",
+    "version": "9.0.1.0.0",
+    "author": "Odoo SA,Therp BV,Odoo Community Association (OCA)",
+    "license": "LGPL-3",
+    "category": "Discuss",
+    "summary": "Backport activities",
+    "depends": [
+        'mail',
+        'web_kanban',
+    ],
+    "data": [
+        "views/res_partner.xml",
+        "data/mail_message_subtype.xml",
+        'security/ir.model.access.csv',
+        'views/mail_activity.xml',
+        'data/mail_activity.xml',
+        'data/ir_model_data.xml',
+        'views/templates.xml',
+    ],
+    "qweb": [
+        'static/src/xml/mail_activity.xml',
+        'static/src/xml/systray.xml',
+        'static/src/xml/web_kanban_activity.xml',
+    ],
+    "post_load": "post_load_hook",
+}
--- a/mail_activity/data/ir_model_data.xml
+++ b/mail_activity/data/ir_model_data.xml
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo noupdate="1">
+    <!-- inject xmlids so that we can address the records via its
+         mail xmlid as we'd do it in 11.0
+    /-->
+    <record id="xmlid_mail_mt_activities" model="ir.model.data">
+        <field name="model">mail.message.subtype</field>
+        <field name="res_id" ref="mt_activities" />
+        <field name="module">mail</field>
+        <field name="name">mt_activities</field>
+        <field name="noupdate" eval="True" />
+    </record>
+    <record id="xmlid_mail_message_activity_done" model="ir.model.data">
+        <field name="model">ir.ui.view</field>
+        <field name="res_id" ref="message_activity_done" />
+        <field name="module">mail</field>
+        <field name="name">message_activity_done</field>
+        <field name="noupdate" eval="True" />
+    </record>
+</odoo>
--- a/mail_activity/data/mail_activity.xml
+++ b/mail_activity/data/mail_activity.xml
@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <record id="mail_activity_data_email" model="mail.activity.type">
+            <field name="name">Email</field>
+            <field name="icon">fa-envelope</field>
+        </record>
+        <record id="mail_activity_data_call" model="mail.activity.type">
+            <field name="name">Call</field>
+            <field name="icon">fa-phone</field>
+            <field name="days">2</field>
+        </record>
+        <record id="mail_activity_data_meeting" model="mail.activity.type">
+            <field name="name">Meeting</field>
+            <field name="icon">fa-users</field>
+        </record>
+        <record id="mail_activity_data_todo" model="mail.activity.type">
+            <field name="name">Todo</field>
+            <field name="icon">fa-tasks</field>
+            <field name="days">5</field>
+        </record>
+    </data>
+</odoo>
--- a/mail_activity/data/mail_message_subtype.xml
+++ b/mail_activity/data/mail_message_subtype.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="mt_activities" model="mail.message.subtype">
+        <field name="name">Activities</field>
+        <field name="default" eval="True"/>
+        <field name="internal" eval="True"/>
+        <field name="sequence" eval="90"/>
+    </record>
+</odoo>
--- a/mail_activity/hooks.py
+++ b/mail_activity/hooks.py
@ -0,0 +1,124 @@
+# Copyright 2018 Eficent Business and IT Consulting Services S.L.
+# Copyright 2018 Odoo, S.A.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
+
+from openerp.addons.mail.wizard.mail_compose_message import MailComposer
+
+
+def post_load_hook():
+    """
+    We need this hook only in v9 in order to be able to capture the subtype.
+
+    """
+    def new_send_mail(self, auto_commit=False):
+
+        if 'subtype_id' not in self._fields:
+            return self.send_mail_original(auto_commit=auto_commit)
+
+        """ Process the wizard content and proceed with sending the related
+                    email(s), rendering any template patterns on the fly 
+                    if needed. """
+        for wizard in self:
+            # Duplicate attachments linked to the email.template.
+            # Indeed, basic mail.compose.message wizard duplicates
+            # attachments in mass
+            # mailing mode. But in 'single post' mode, attachments of
+            # an email template
+            # also have to be duplicated to avoid changing their ownership.
+            if wizard.attachment_ids and \
+                    wizard.composition_mode != 'mass_mail' and \
+                    wizard.template_id:
+                new_attachment_ids = []
+                for attachment in wizard.attachment_ids:
+                    if attachment in wizard.template_id.attachment_ids:
+                        new_attachment_ids.append(attachment.copy(
+                            {'res_model': 'mail.compose.message',
+                             'res_id': wizard.id}).id)
+                    else:
+                        new_attachment_ids.append(attachment.id)
+                    wizard.write({'attachment_ids': [(6, 0,
+                                                      new_attachment_ids)]})
+
+            # Mass Mailing
+            mass_mode = wizard.composition_mode in ('mass_mail', 'mass_post')
+
+            Mail = self.env['mail.mail']
+            ActiveModel = self.env[
+                wizard.model if wizard.model else 'mail.thread']
+            if wizard.template_id:
+                # template user_signature is added when generating body_html
+                # mass mailing: use template auto_delete value -> note,
+                # for emails mass mailing only
+                Mail = Mail.with_context(mail_notify_user_signature=False)
+                ActiveModel = ActiveModel.with_context(
+                    mail_notify_user_signature=False,
+                    mail_auto_delete=wizard.template_id.auto_delete)
+            if not hasattr(ActiveModel, 'message_post'):
+                ActiveModel = self.env['mail.thread'].with_context(
+                    thread_model=wizard.model)
+            if wizard.composition_mode == 'mass_post':
+                # do not send emails directly but use the queue instead
+                # add context key to avoid subscribing the author
+                ActiveModel = ActiveModel.with_context(
+                    mail_notify_force_send=False,
+                    mail_create_nosubscribe=True)
+            # wizard works in batch mode: [res_id] or
+            # active_ids or active_domain
+            if mass_mode and wizard.use_active_domain and wizard.model:
+                res_ids = self.env[wizard.model].search(
+                    eval(wizard.active_domain)).ids
+            elif mass_mode and wizard.model and self._context.get(
+                    'active_ids'):
+                res_ids = self._context['active_ids']
+            else:
+                res_ids = [wizard.res_id]
+
+            batch_size = int(self.env['ir.config_parameter'].sudo().get_param(
+                'mail.batch_size')) or self._batch_size
+            sliced_res_ids = [res_ids[i:i + batch_size] for i in
+                              range(0, len(res_ids), batch_size)]
+
+            # ----  START OF PATCH
+            if wizard.composition_mode == 'mass_mail' or wizard.is_log or (
+                    wizard.composition_mode == 'mass_post'
+                    and not wizard.notify):  # log a note: subtype is False
+                subtype_id = False
+            elif wizard.subtype_id:
+                subtype_id = wizard.subtype_id
+            else:
+                subtype_id = self.sudo().env.ref('mail.mt_comment',
+                                                 raise_if_not_found=False)
+            if subtype_id:
+                external_subtype = subtype_id.get_external_id()
+                if external_subtype:
+                    subtype = external_subtype[subtype_id.id]
+            else:
+                subtype = 'mail.mt_comment'
+            # ----  END OF PATCH
+
+            for res_ids in sliced_res_ids:
+                batch_mails = Mail
+                all_mail_values = wizard.get_mail_values(res_ids)
+                for res_id, mail_values in all_mail_values.iteritems():
+                    if wizard.composition_mode == 'mass_mail':
+                        batch_mails |= Mail.create(mail_values)
+                    else:
+                        # subtype = 'mail.mt_comment' -> Removed
+                        if wizard.is_log or (
+                                wizard.composition_mode == 'mass_post'
+                                and not wizard.notify):  # log a note:
+                            # subtype is False
+                            subtype = False
+                        ActiveModel.browse(res_id).message_post(
+                            message_type='comment', subtype=subtype,
+                            **mail_values)
+
+                if wizard.composition_mode == 'mass_mail':
+                    batch_mails.send(auto_commit=auto_commit)
+
+        return {'type': 'ir.actions.act_window_close'}
+
+    if not hasattr(MailComposer, 'send_mail_original'):
+        MailComposer.send_mail_original = MailComposer.send_mail
+
+    MailComposer.send_mail = new_send_mail
--- a/mail_activity/i18n/fr.po
+++ b/mail_activity/i18n/fr.po
@ -0,0 +1,419 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* mail_activity
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-06-05 13:44+0000\n"
+"PO-Revision-Date: 2018-06-05 13:44+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_type_days
+msgid "# Days"
+msgstr "# Jours"
+
+#. module: mail_activity
+#: model:ir.ui.view,arch_db:mail_activity.message_activity_done
+msgid "<strong> Feedback</strong>"
+msgstr "<strong> Commentaire</strong>"
+
+#. module: mail_activity
+#: model:ir.ui.view,arch_db:mail_activity.mail_activity_view_form_popup
+msgid "<strong>Recommended Activities</strong>"
+msgstr "<strong>Activités recommandées</strong>"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_res_partner_activity_ids
+#: model:ir.ui.view,arch_db:mail_activity.mail_activity_type_view_form
+#: model:ir.ui.view,arch_db:mail_activity.mail_activity_type_view_tree
+#: model:mail.message.subtype,name:mail_activity.mt_activities
+msgid "Activities"
+msgstr "Activités"
+
+#. module: mail_activity
+#: model:ir.model,name:mail_activity.model_mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_activity_type_id
+#: model:ir.ui.view,arch_db:mail_activity.mail_activity_view_calendar
+#: model:ir.ui.view,arch_db:mail_activity.mail_activity_view_form_popup
+#: model:ir.ui.view,arch_db:mail_activity.mail_activity_view_search
+msgid "Activity"
+msgstr "Activité"
+
+#. module: mail_activity
+#: model:ir.model,name:mail_activity.model_mail_activity_type
+#: model:ir.ui.view,arch_db:mail_activity.mail_activity_view_search
+msgid "Activity Type"
+msgstr "Type d'activité"
+
+#. module: mail_activity
+#: model:ir.actions.act_window,name:mail_activity.mail_activity_type_action
+#: model:ir.ui.menu,name:mail_activity.menu_mail_activity_type
+msgid "Activity Types"
+msgstr "Types d'activités"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_user_id
+msgid "Assigned to"
+msgstr "Assigné à"
+
+#. module: mail_activity
+#: model:mail.activity.type,name:mail_activity.mail_activity_data_call
+msgid "Call"
+msgstr "Appeler"
+
+#. module: mail_activity
+#: model:ir.model.fields,help:mail_activity.field_mail_activity_activity_category
+#: model:ir.model.fields,help:mail_activity.field_mail_activity_type_category
+msgid "Categories may trigger specific behavior like opening calendar view"
+msgstr ""
+"Les catégories peuvent déclencher un comportement spécifique, tel que "
+"l'ouverture d'une vue calendrier"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_activity_category
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_type_category
+msgid "Category"
+msgstr "Catégorie"
+
+#. module: mail_activity
+#: model:ir.ui.view,arch_db:mail_activity.mail_activity_view_search
+msgid "Created By"
+msgstr "Créé par"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_create_uid
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_type_create_uid
+msgid "Created by"
+msgstr "Créé par"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_create_date
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_type_create_date
+msgid "Created on"
+msgstr "Créé le"
+
+#. module: mail_activity
+#: model:ir.ui.view,arch_db:mail_activity.mail_activity_view_search
+msgid "Deadline"
+msgstr "Echéance"
+
+#. module: mail_activity
+#: model:ir.ui.view,arch_db:mail_activity.mail_activity_view_form_popup
+msgid "Discard"
+msgstr "Annuler"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_display_name
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_type_display_name
+msgid "Display Name"
+msgstr "Nom à afficher"
+
+#. module: mail_activity
+#: model:ir.model.fields,help:mail_activity.field_mail_activity_res_name
+msgid "Display name of the related document."
+msgstr "Afficher le nom du document connexe."
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_res_name
+msgid "Document Name"
+msgstr "Nom du document"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_date_deadline
+msgid "Due Date"
+msgstr "Date d'échéance"
+
+#. module: mail_activity
+#: model:mail.activity.type,name:mail_activity.mail_activity_data_email
+msgid "Email"
+msgstr "Courriel"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_feedback
+msgid "Feedback"
+msgstr "Discussion"
+
+#. module: mail_activity
+#: model:ir.model.fields,help:mail_activity.field_mail_activity_icon
+#: model:ir.model.fields,help:mail_activity.field_mail_activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr "Icône Font Awesome e.g. fa-tasks"
+
+#. module: mail_activity
+#: model:ir.ui.view,arch_db:mail_activity.mail_activity_view_search
+msgid "Future Activities"
+msgstr "Activités futures"
+
+#. module: mail_activity
+#: model:ir.ui.view,arch_db:mail_activity.mail_activity_view_search
+msgid "Group By"
+msgstr "Regrouper par"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_id
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_type_id
+msgid "ID"
+msgstr "ID"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_icon
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_type_icon
+msgid "Icon"
+msgstr "Icône"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity___last_update
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_type___last_update
+msgid "Last Modified on"
+msgstr "Dernière modification le"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_type_write_uid
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_write_uid
+msgid "Last Updated by"
+msgstr "Dernière mise à jour par"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_type_write_date
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_write_date
+msgid "Last Updated on"
+msgstr "Dernière mise à jour le"
+
+#. module: mail_activity
+#: model:ir.ui.view,arch_db:mail_activity.mail_activity_view_search
+msgid "Late Activities"
+msgstr "Activités en retard"
+
+#. module: mail_activity
+#: model:ir.ui.view,arch_db:mail_activity.mail_activity_view_form_popup
+msgid "Log a note..."
+msgstr "Enregistrer une note"
+
+#. module: mail_activity
+#: model:ir.ui.view,arch_db:mail_activity.mail_activity_view_form_popup
+msgid "Log an Activity"
+msgstr "Planifier une Activité"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_message_mail_activity_type_id
+msgid "Mail Activity Type"
+msgstr "Envoyer le type d'activité par e-mail"
+
+#. module: mail_activity
+#: model:ir.ui.view,arch_db:mail_activity.mail_activity_view_form_popup
+msgid "Mark as Done"
+msgstr "Marqué comme fait"
+
+#. module: mail_activity
+#: model:mail.activity.type,name:mail_activity.mail_activity_data_meeting
+msgid "Meeting"
+msgstr "Rendez-vous"
+
+#. module: mail_activity
+#: model:ir.model,name:mail_activity.model_mail_message
+msgid "Message"
+msgstr "Message"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_type_res_model_id
+msgid "Model"
+msgstr "Modèle"
+
+#. module: mail_activity
+#: model:ir.ui.view,arch_db:mail_activity.mail_activity_view_search
+msgid "My Activities"
+msgstr "Mes activités"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_type_name
+msgid "Name"
+msgstr "Nom"
+
+#. module: mail_activity
+#: model:ir.ui.view,arch_db:mail_activity.mail_activity_view_tree
+msgid "Next Activities"
+msgstr "Activités suivantes"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_res_partner_activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr "Date limite de l'Activité à Venir"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_res_partner_activity_summary
+msgid "Next Activity Summary"
+msgstr "Résumé d'activité suivant"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_res_partner_activity_type_id
+msgid "Next Activity Type"
+msgstr "Type d'Activités à Venir"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_has_recommended_activities
+msgid "Next activities available"
+msgstr "Activités suivantes disponibles"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_note
+msgid "Note"
+msgstr "Note"
+
+#. module: mail_activity
+#: model:ir.model.fields,help:mail_activity.field_mail_activity_type_days
+msgid ""
+"Number of days before executing the action. It allows to plan the action "
+"deadline."
+msgstr ""
+"Nombre de jours avant l'exécution de l'action. Cela permet de planifier "
+"l'échéance de l'action."
+
+#. module: mail_activity
+#: selection:mail.activity.type,category:0
+msgid "Other"
+msgstr "Autre"
+
+#. module: mail_activity
+#: selection:mail.activity,state:0
+#: selection:res.partner,activity_state:0
+msgid "Overdue"
+msgstr "Retard"
+
+#. module: mail_activity
+#: model:ir.model,name:mail_activity.model_res_partner
+msgid "Partner"
+msgstr "Partenaire"
+
+#. module: mail_activity
+#: selection:mail.activity,state:0
+#: selection:res.partner,activity_state:0
+msgid "Planned"
+msgstr "Planifié"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_type_previous_type_ids
+msgid "Preceding Activities"
+msgstr "Activités précédentes"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_previous_activity_type_id
+msgid "Previous Activity Type"
+msgstr "Type d'activité précédente"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_recommended_activity_type_id
+msgid "Recommended Activity Type"
+msgstr "Type d'activité recommandée"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_type_next_type_ids
+msgid "Recommended Next Activities"
+msgstr "Activités suivantes recommandées"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_res_id
+msgid "Related Document ID"
+msgstr "ID du document associé"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_res_model
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_res_model_id
+msgid "Related Document Model"
+msgstr "Modèle de document concerné"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_res_partner_activity_user_id
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: mail_activity
+#: model:ir.ui.view,arch_db:mail_activity.mail_activity_view_form_popup
+msgid "Schedule"
+msgstr "Planifier"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_type_sequence
+msgid "Sequence"
+msgstr "Séquence"
+
+#. module: mail_activity
+#: model:ir.ui.view,arch_db:mail_activity.mail_activity_view_search
+msgid "Show all records which has next action date is before today"
+msgstr ""
+"Montrez toutes les enregistrements pour lesquelles la date des prochaines "
+"actions est pour aujourd'hui ou avant. "
+
+#. module: mail_activity
+#: model:ir.model.fields,help:mail_activity.field_mail_activity_type_res_model_id
+msgid "Specify a model if the activity should be specific to a modeland not available when managing activities for other models."
+msgstr ""
+"Spécifiez un modèle si l'activité doit être réservée à un certain modèle et "
+"qu'elle ne doit pas être disponible lors de la gestion des activités des "
+"autres modèles."
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_state
+#: model:ir.model.fields,field_description:mail_activity.field_res_partner_activity_state
+msgid "State"
+msgstr "Statut"
+
+#. module: mail_activity
+#: model:ir.model.fields,help:mail_activity.field_res_partner_activity_state
+msgid "Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+"Statut basé sur les activités\n"
+"En retard : la date d'échéance est déjà dépassée\n"
+"Aujourd'hui : la date d'activité est aujourd'hui\n"
+"Planifiée : activités futures"
+
+#. module: mail_activity
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_summary
+#: model:ir.model.fields,field_description:mail_activity.field_mail_activity_type_summary
+msgid "Summary"
+msgstr "Résumé"
+
+#. module: mail_activity
+#: model:ir.model.fields,help:mail_activity.field_mail_activity_has_recommended_activities
+msgid "Technical field for UX purpose"
+msgstr "Champ technique à des fins d'expérience utilisateur"
+
+#. module: mail_activity
+#: selection:mail.activity,state:0
+#: selection:res.partner,activity_state:0
+msgid "Today"
+msgstr "Aujourd'hui"
+
+#. module: mail_activity
+#: model:ir.ui.view,arch_db:mail_activity.mail_activity_view_search
+msgid "Today Activities"
+msgstr "Activités du Jour"
+
+#. module: mail_activity
+#: model:mail.activity.type,name:mail_activity.mail_activity_data_todo
+msgid "Todo"
+msgstr "À faire"
+
+#. module: mail_activity
+#: model:ir.ui.view,arch_db:mail_activity.message_activity_done
+msgid "done\n"
+"        by"
+msgstr ""
+"fait\n"
+"        par"
+
+#. module: mail_activity
+#: model:ir.ui.view,arch_db:mail_activity.mail_activity_view_form_popup
+msgid "e.g. Discuss proposal"
+msgstr "Ex. : Proposition d'examen"
--- a/mail_activity/models/init.py
+++ b/mail_activity/models/init.py
@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+from . import mail_activity_type
+from . import mail_activity_mixin
+from . import mail_activity
+from . import res_partner
+from . import mail_message
+from . import res_users
--- a/mail_activity/models/mail_activity.py
+++ b/mail_activity/models/mail_activity.py
@ -0,0 +1,229 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Odoo SA <https://www.odoo.com>
+# Copyright 2018 Eficent <http://www.eficent.com>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+from datetime import date, datetime, timedelta
+from openerp import api, fields, models
+
+
+def message_post_with_view(records, views_or_xmlid, **kwargs):
+    """ Method ported from mail.thread in v10 """
+    values = kwargs.pop('values', None) or dict()
+    try:
+        from openerp.addons.website.models.website import slug
+        values['slug'] = slug
+    except ImportError:
+        values['slug'] = lambda self: self.id
+    if isinstance(views_or_xmlid, basestring):
+        views = records.env.ref(views_or_xmlid, raise_if_not_found=False)
+    else:
+        views = views_or_xmlid
+    if not views:
+        return
+    for record in records:
+        values['object'] = record
+        rendered_template = views.render(values, engine='ir.qweb')
+        kwargs['body'] = rendered_template
+        kwargs['message_type'] = 'notification'  # default in v10
+        kwargs['subtype_id'] = record.env.ref('mail.mt_activities').id,
+        record.message_post_with_template(False, **kwargs)
+
+
+class MailActivity(models.Model):
+    """ An actual activity to perform. Activities are linked to
+    documents using res_id and res_model_id fields. Activities have a deadline
+    that can be used in kanban view to display a status. Once done activities
+    are unlinked and a message is posted. This message has a new
+    activity_type_id field that indicates the activity linked to the message.
+    """
+    _name = 'mail.activity'
+    _description = 'Activity'
+    _order = 'date_deadline ASC'
+    _rec_name = 'summary'
+
+    @api.model
+    def default_get(self, fields):
+        res = super(MailActivity, self).default_get(fields)
+        if not fields or 'res_model_id' in fields and res.get('res_model'):
+            res['res_model_id'] = self.env['ir.model'].search([
+                ('model', '=', res['res_model']),
+            ]).id
+        return res
+
+    # owner
+    res_id = fields.Integer('Related Document ID', index=True, required=True)
+    res_model_id = fields.Many2one(
+        'ir.model', 'Related Document Model',
+        index=True, ondelete='cascade', required=True)
+    res_model = fields.Char(
+        'Related Document Model',
+        index=True, related='res_model_id.model', store=True, readonly=True)
+    res_name = fields.Char(
+        'Document Name', compute='_compute_res_name', store=True,
+        help="Display name of the related document.", readonly=True)
+    # activity
+    activity_type_id = fields.Many2one(
+        'mail.activity.type', 'Activity',
+        domain="['|', ('res_model_id', '=', False), "
+        "('res_model_id', '=', res_model_id)]")
+    activity_category = fields.Selection(related='activity_type_id.category')
+    icon = fields.Char('Icon', related='activity_type_id.icon')
+    summary = fields.Char('Summary')
+    note = fields.Html('Note')
+    feedback = fields.Html('Feedback')
+    date_deadline = fields.Date(
+        'Due Date', index=True, required=True, default=fields.Date.today,
+    )
+    # description
+    user_id = fields.Many2one(
+        'res.users', 'Assigned to',
+        default=lambda self: self.env.user,
+        index=True, required=True)
+    state = fields.Selection([
+        ('overdue', 'Overdue'),
+        ('today', 'Today'),
+        ('planned', 'Planned')], 'State',
+        compute='_compute_state')
+    recommended_activity_type_id = fields.Many2one(
+        'mail.activity.type', string="Recommended Activity Type",
+    )
+    previous_activity_type_id = fields.Many2one(
+        'mail.activity.type', string='Previous Activity Type',
+    )
+    has_recommended_activities = fields.Boolean(
+        'Next activities available',
+        compute='_compute_has_recommended_activities',
+        help='Technical field for UX purpose')
+
+    @api.multi
+    @api.onchange('previous_activity_type_id')
+    def _compute_has_recommended_activities(self):
+        for record in self:
+            record.has_recommended_activities = bool(
+                record.previous_activity_type_id.next_type_ids
+            )
+
+    @api.depends('res_model', 'res_id')
+    def _compute_res_name(self):
+        for activity in self:
+            activity.res_name = self.env[activity.res_model].browse(
+                activity.res_id
+            ).name_get()[0][1]
+
+    @api.depends('date_deadline')
+    def _compute_state(self):
+        today = date.today()
+        for record in self.filtered(lambda activity: activity.date_deadline):
+            date_deadline = fields.Date.from_string(record.date_deadline)
+            diff = (date_deadline - today)
+            if diff.days == 0:
+                record.state = 'today'
+            elif diff.days < 0:
+                record.state = 'overdue'
+            else:
+                record.state = 'planned'
+
+    @api.onchange('activity_type_id')
+    def _onchange_activity_type_id(self):
+        if self.activity_type_id:
+            self.summary = self.activity_type_id.summary
+            self.date_deadline = (
+                datetime.now() + timedelta(days=self.activity_type_id.days)
+            )
+
+    @api.onchange('previous_activity_type_id')
+    def _onchange_previous_activity_type_id(self):
+        if self.previous_activity_type_id.next_type_ids:
+            self.recommended_activity_type_id =\
+                self.previous_activity_type_id.next_type_ids[0]
+
+    @api.onchange('recommended_activity_type_id')
+    def _onchange_recommended_activity_type_id(self):
+        self.activity_type_id = self.recommended_activity_type_id
+
+    @api.model
+    def create(self, values):
+        activity = super(MailActivity, self).create(values)
+        self.env[activity.res_model].browse(activity.res_id).message_subscribe(
+            partner_ids=[activity.user_id.partner_id.id]
+        )
+        if activity.date_deadline <= fields.Date.today():
+            self.env['bus.bus'].sendone(
+                (
+                    self._cr.dbname, 'res.partner',
+                    activity.user_id.partner_id.id
+                ),
+                {'type': 'activity_updated', 'activity_created': True})
+        return activity
+
+    @api.multi
+    def write(self, values):
+        if values.get('user_id'):
+            pre_responsibles = self.mapped('user_id.partner_id')
+        res = super(MailActivity, self).write(values)
+        if values.get('user_id'):
+            for activity in self:
+                self.env[activity.res_model].browse(
+                    activity.res_id
+                ).message_subscribe(
+                    partner_ids=[activity.user_id.partner_id.id]
+                )
+                if activity.date_deadline <= fields.Date.today():
+                    self.env['bus.bus'].sendone(
+                        (
+                            self._cr.dbname, 'res.partner',
+                            activity.user_id.partner_id.id
+                        ),
+                        {'type': 'activity_updated', 'activity_created': True})
+            for activity in self:
+                if activity.date_deadline <= fields.Date.today():
+                    for partner in pre_responsibles:
+                        self.env['bus.bus'].sendone(
+                            (self._cr.dbname, 'res.partner', partner.id),
+                            {
+                                'type': 'activity_updated',
+                                'activity_deleted': True
+                            }
+                        )
+        return res
+
+    @api.multi
+    def unlink(self):
+        for activity in self:
+            if activity.date_deadline <= fields.Date.today():
+                self.env['bus.bus'].sendone(
+                    (
+                        self._cr.dbname, 'res.partner',
+                        activity.user_id.partner_id.id
+                    ),
+                    {'type': 'activity_updated', 'activity_deleted': True})
+        return super(MailActivity, self).unlink()
+
+    @api.multi
+    def action_done(self):
+        """ Wrapper without feedback because web button add context as
+        parameter, therefore setting context to feedback """
+        return self.action_feedback()
+
+    @api.multi
+    def action_feedback(self, feedback=False):
+        message = self.env['mail.message']
+        if feedback:
+            self.write(dict(feedback=feedback))
+        for activity in self:
+            record = self.env[activity.res_model].browse(activity.res_id)
+            message_post_with_view(
+                record,
+                'mail.message_activity_done',
+                values={'activity': activity},
+                subtype_id=self.env.ref('mail.mt_activities').id,
+                mail_activity_type_id=activity.activity_type_id.id,
+            )
+            message |= record.message_ids[0]
+
+        self.unlink()
+        return {'type': 'ir.actions.act_window_close'}
+
+    @api.multi
+    def action_close_dialog(self):
+        return {'type': 'ir.actions.act_window_close'}
--- a/mail_activity/models/mail_activity_mixin.py
+++ b/mail_activity/models/mail_activity_mixin.py
@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Odoo SA <https://www.odoo.com>
+# Copyright 2018 Therp BV <http://therp.nl>
+# Copyright 2018 Eficent <http://www.eficent.com>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+from openerp import api, fields
+
+
+def setup_mail_actitivities(cls):
+    """ Mixin using AbstractModels are problematic in Odoo v9, since they
+        prevent the new-style computed fields from working correctly.
+        This decorator edits the original class in-place, so the Odoo model
+        is left unchanged. """
+    cls.activity_ids = fields.One2many(
+        'mail.activity', 'res_id', 'Activities',
+        auto_join=True,
+        domain=lambda self: [('res_model', '=', self._name)])
+    cls.activity_state = fields.Selection([
+        ('overdue', 'Overdue'),
+        ('today', 'Today'),
+        ('planned', 'Planned')], string='State',
+        compute='_compute_activity_state',
+        help='Status based on activities\n'
+        'Overdue: Due date is already passed\n'
+        'Today: Activity date is today\nPlanned: Future activities.')
+    cls.activity_user_id = fields.Many2one(
+        'res.users', 'Responsible',
+        related='activity_ids.user_id',
+        search='_search_activity_user_id')
+    cls.activity_type_id = fields.Many2one(
+        'mail.activity.type', 'Next Activity Type',
+        related='activity_ids.activity_type_id',
+        search='_search_activity_type_id')
+    cls.activity_date_deadline = fields.Date(
+        'Next Activity Deadline', related='activity_ids.date_deadline',
+        readonly=True, store=True)  # store to enable ordering + search
+    cls.activity_summary = fields.Char(
+        'Next Activity Summary', related='activity_ids.summary',
+        search='_search_activity_summary')
+    cls.nbr_activities = fields.Integer(compute='_compute_nbr_activities')
+
+    @api.depends('activity_ids')
+    def _compute_nbr_activities(self):
+        for record in self:
+            record.nbr_activities = len(record.activity_ids)
+    cls._compute_nbr_activities = _compute_nbr_activities
+
+    @api.depends('activity_ids.state')
+    def _compute_activity_state(self):
+        for record in self:
+            states = record.activity_ids.mapped('state')
+            if 'overdue' in states:
+                record.activity_state = 'overdue'
+            elif 'today' in states:
+                record.activity_state = 'today'
+            elif 'planned' in states:
+                record.activity_state = 'planned'
+    cls._compute_activity_state = _compute_activity_state
+
+    @api.model
+    def _search_activity_user_id(self, operator, operand):
+        return [('activity_ids.user_id', operator, operand)]
+    cls._search_activity_user_id = _search_activity_user_id
+
+    @api.model
+    def _search_activity_type_id(self, operator, operand):
+        return [('activity_ids.activity_type_id', operator, operand)]
+    cls._search_activity_type_id = _search_activity_type_id
+
+    @api.model
+    def _search_activity_summary(self, operator, operand):
+        return [('activity_ids.summary', operator, operand)]
+    cls._search_activity_summary = _search_activity_summary
+
+    original_unlink = cls.unlink
+
+    @api.multi
+    def unlink(self):
+        """ Override unlink to delete records activities through
+        (res_model, res_id). """
+        record_ids = self.ids
+        result = original_unlink(self)
+        self.env['mail.activity'].sudo().search(
+            [('res_model', '=', self._name), ('res_id', 'in', record_ids)]
+        ).unlink()
+        return result
+    cls.unlink = unlink
+
+    return cls
--- a/mail_activity/models/mail_activity_type.py
+++ b/mail_activity/models/mail_activity_type.py
@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Odoo SA <https://www.odoo.com>
+# Copyright 2018 Therp BV <http://therp.nl>
+# Copyright 2018 Eficent <http://www.eficent.com>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+from openerp import fields, models
+
+
+class MailActivityType(models.Model):
+    """ Activity Types are used to categorize activities. Each type is a
+    different kind of activity e.g. call, mail, meeting. An activity can be
+    generic i.e. available for all models using activities; or specific to a
+    model in which case res_model_id field should be used. """
+    _name = 'mail.activity.type'
+    _description = 'Activity Type'
+    _rec_name = 'name'
+    _order = 'sequence, id'
+
+    name = fields.Char('Name', required=True, translate=True)
+    summary = fields.Char('Summary', translate=True)
+    sequence = fields.Integer('Sequence', default=10)
+    days = fields.Integer(
+        '# Days', default=0,
+        help='Number of days before executing the action. It allows to plan '
+        'the action deadline.')
+    icon = fields.Char('Icon', help="Font awesome icon e.g. fa-tasks")
+    res_model_id = fields.Many2one(
+        'ir.model', 'Model', index=True,
+        help='Specify a model if the activity should be specific to a model'
+             'and not available when managing activities for other models.')
+    next_type_ids = fields.Many2many(
+        'mail.activity.type', 'mail_activity_rel', 'activity_id',
+        'recommended_id', string='Recommended Next Activities')
+    previous_type_ids = fields.Many2many(
+        'mail.activity.type', 'mail_activity_rel', 'recommended_id',
+        'activity_id', string='Preceding Activities')
+    category = fields.Selection([
+        ('default', 'Other')], default='default',
+        string='Category',
+        help='Categories may trigger specific behavior like opening calendar '
+        'view')
--- a/mail_activity/models/mail_message.py
+++ b/mail_activity/models/mail_message.py
@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Odoo SA <https://www.odoo.com>
+# Copyright 2018 Therp BV <http://therp.nl>
+# Copyright 2018 Eficent <http://www.eficent.com>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+from openerp import fields, models
+
+
+class MailMessage(models.Model):
+    _inherit = 'mail.message'
+
+    mail_activity_type_id = fields.Many2one(
+        'mail.activity.type', 'Mail Activity Type', index=True,
+        ondelete='set null',
+    )
--- a/mail_activity/models/res_partner.py
+++ b/mail_activity/models/res_partner.py
@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Odoo SA <https://www.odoo.com>
+# Copyright 2018 Therp BV <http://therp.nl>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+from openerp import models
+from .mail_activity_mixin import setup_mail_actitivities
+
+
+@setup_mail_actitivities
+class ResPartner(models.Model):
+    _inherit = 'res.partner'
--- a/mail_activity/models/res_users.py
+++ b/mail_activity/models/res_users.py
@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Odoo SA <https://www.odoo.com>
+# Copyright 2018 Therp BV <http://therp.nl>
+# Copyright 2018 Eficent <http://www.eficent.com>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+from openerp import api, fields, models, modules
+
+
+class ResUsers(models.Model):
+    _inherit = 'res.users'
+
+    @api.model
+    def activity_user_count(self):
+        query = """SELECT m.id, count(*), act.res_model as model,
+                        CASE
+                            WHEN %(today)s::date -
+                            act.date_deadline::date = 0 Then 'today'
+                            WHEN %(today)s::date -
+                            act.date_deadline::date > 0 Then 'overdue'
+                            WHEN %(today)s::date -
+                            act.date_deadline::date < 0 Then 'planned'
+                        END AS states
+                    FROM mail_activity AS act
+                    JOIN ir_model AS m ON act.res_model_id = m.id
+                    WHERE user_id = %(user_id)s
+                    GROUP BY m.id, states, act.res_model;
+                    """
+        self.env.cr.execute(query, {
+            'today': fields.Date.context_today(self),
+            'user_id': self.env.uid,
+        })
+        activity_data = self.env.cr.dictfetchall()
+        model_ids = [a['id'] for a in activity_data]
+        model_names = {n[0]: n[1] for n in self.env['ir.model'].browse(
+            model_ids).name_get()}
+
+        user_activities = {}
+        for activity in activity_data:
+            if not user_activities.get(activity['model']):
+                user_activities[activity['model']] = {
+                    'name': model_names[activity['id']],
+                    'model': activity['model'],
+                    'icon': modules.module.get_module_icon(
+                        self.env[activity['model']]._original_module),
+                    'total_count': 0, 'today_count': 0,
+                    'overdue_count': 0, 'planned_count': 0,
+                }
+            user_activities[activity['model']][
+                '%s_count' % activity['states']] += activity['count']
+            if activity['states'] in ('today', 'overdue'):
+                user_activities[activity['model']][
+                    'total_count'] += activity['count']
+
+        return list(user_activities.values())
--- a/mail_activity/security/ir.model.access.csv
+++ b/mail_activity/security/ir.model.access.csv
@ -0,0 +1,5 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+access_mail_activity_all,mail.activity.all,model_mail_activity,,1,0,0,0
+access_mail_activity_user,mail.activity.user,model_mail_activity,base.group_user,1,1,1,1
+access_mail_activity_type_all,mail.activity.type.all,model_mail_activity_type,,1,0,0,0
+access_mail_activity_type_user,mail.activity.type.user,model_mail_activity_type,base.group_user,1,1,1,1
--- a/mail_activity/static/description/icon.png
+++ b/mail_activity/static/description/icon.png
--- a/mail_activity/static/src/css/mail_activity.css
+++ b/mail_activity/static/src/css/mail_activity.css
@ -0,0 +1,64 @@
+.o_mail_activity #o_chatter_planned_activities .o_thread_message .o_thread_message_sidebar .o_avatar_stack img {
+    width: 31px;
+    height: 31px;
+}
+#o_chatter_planned_activities .o_thread_message .o_thread_message_sidebar .o_avatar_stack .o_avatar_icon {
+    position: absolute;
+    top: auto;
+    left: auto;
+    bottom: -5px;
+    right: -5px;
+    width: 25px;
+    height: 25px;
+    padding: 6px 5px;
+    text-align: center;
+    line-height: 1.2;
+    color: white;
+    border-radius: 100%;
+    border: 2px solid white;
+}
+.o_mail_activity .o_thread_message {
+    display: -ms-flexbox;
+    display: -moz-box;
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: flex;
+    padding: 4px 16px;
+    margin-bottom: 0px;
+}
+.o_mail_activity .o_thread_message .o_thread_message_sidebar {
+    -ms-flex: 0 0 36px;
+    -moz-flex: 0 0 36px;
+    -webkit-box-flex: 0;
+    -webkit-flex: 0 0 36px;
+    flex: 0 0 36px;
+    margin-right: 10px;
+    margin-top: 2px;
+    text-align: center;
+    font-size: smaller;
+}
+.o_mail_activity .o_thread_message .o_thread_message_core {
+    -ms-flex: 1 1 auto;
+    -moz-flex: 1 1 auto;
+    -webkit-box-flex: 1;
+    -webkit-flex: 1 1 auto;
+    flex: 1 1 auto;
+    min-width: 0;
+    max-width: 100%;
+    word-wrap: break-word;
+}
+.o_mail_activity .o_thread_date_separator.o_border_dashed[data-toggle="collapse"] {
+    cursor: pointer;
+}
+.o_mail_activity .o_thread_date_separator.o_border_dashed {
+    border-bottom-style: dashed;
+}
+.o_mail_activity .o_thread_date_separator {
+    margin-top: 15px;
+    margin-bottom: 30px;
+    border-bottom: 1px solid #d9d7d7;
+    text-align: center;
+}
+.o_mail_activity.o_form_field {
+    display: block;
+}
--- a/mail_activity/static/src/js/kanban_activity.js
+++ b/mail_activity/static/src/js/kanban_activity.js
@ -0,0 +1,124 @@
+odoo.define('web_kanban_activity.widget', function (require) {
+"use strict";
+
+var core = require('web.core');
+var kanban_widgets = require('web_kanban.widgets');
+var Model = require('web.Model');
+var AbstractField = kanban_widgets.AbstractField;
+var fields_registry = kanban_widgets.registry;
+var _t = core._t;
+var time = require('web.time');
+
+/**
+ * Set the 'label_delay' entry in activity data according to the deadline date
+ * @param {Array} activities list of activity Object
+ * @return {Array} : list of modified activity Object
+ */
+var setDelayLabel = function(activities){
+    var today = moment().startOf('day');
+    _.each(activities, function(activity){
+        var to_display = '';
+        var diff = activity.date_deadline.diff(today, 'days', true); // true means no rounding
+        if(diff === 0){
+            to_display = _t('Today');
+        }else{
+            if(diff < 0){ // overdue
+                if(diff === -1){
+                    to_display = _t('Yesterday');
+                }else{
+                    to_display = _.str.sprintf(_t('%d days overdue'), Math.abs(diff));
+                }
+            }else{ // due
+                if(diff === 1){
+                    to_display = _t('Tomorrow');
+                }else{
+                    to_display = _.str.sprintf(_t('Due in %d days'), Math.abs(diff));
+                }
+            }
+        }
+        activity.label_delay = to_display;
+    });
+    return activities;
+};
+
+var KanbanActivity = AbstractField.extend({
+
+    events: {
+        'click .o_activity_btn': '_onButtonClicked',
+        'click .o_schedule_activity': '_onScheduleActivity',
+    },
+
+    init: function (parent, name, record) {
+        this._super.apply(this, arguments);
+    },
+    start: function() {
+        this.display_field();
+        return this._super();
+    },
+
+    display_field: function() {
+        this.$el.html(core.qweb.render("mail.KanbanActivity"));
+    },
+    // private
+    _reload: function () {
+        this.trigger_up('reload', {db_id: this.record_id});
+    },
+    _renderDropdown: function () {
+        var self = this;
+        var session = require('web.session');
+        this.$('.o_activity').html(core.qweb.render("mail.KanbanActivityLoading"));
+        return self._readActivities().then(function (activities) {
+            self.$('.o_activity').html(core.qweb.render("mail.KanbanActivityDropdown", {
+                records: _.groupBy(setDelayLabel(activities), 'state'),
+                uid: session.uid,
+            }));
+        });
+    },
+    _scheduleActivity: function (id, previous_activity_type_id) {
+        var self = this,
+            action = {
+            type: 'ir.actions.act_window',
+            res_model: 'mail.activity',
+            view_mode: 'form',
+            view_type: 'form',
+            views: [[false, 'form']],
+            target: 'new',
+            context: {},
+            res_id: id || false,
+        };
+        this.do_action(action);
+    },
+    _readActivities: function() {
+        var self = this;
+        return new Model('mail.activity')
+        .query([])
+        .filter([['id', 'in', this.get('value')]])
+        .all()
+        .then(function(activities) {
+            // convert create_date and date_deadline to moments
+            _.each(activities, function (activity) {
+                activity.create_date = moment(time.auto_str_to_date(activity.create_date));
+                activity.date_deadline = moment(time.auto_str_to_date(activity.date_deadline));
+            });
+
+            // sort activities by due date
+            activities = _.sortBy(activities, 'date_deadline');
+            return activities;
+        });
+    },
+    _onScheduleActivity: function (event) {
+        var activity_id = $(event.currentTarget).data('activity-id') || false;
+        return this._scheduleActivity(activity_id, false);
+    },
+    // handlers
+    _onButtonClicked: function (event) {
+        event.preventDefault();
+        if (!this.$el.hasClass('open')) {
+            this._renderDropdown();
+        }
+    },
+});
+
+fields_registry.add("kanban_activity", KanbanActivity);
+
+});
--- a/mail_activity/static/src/js/mail_activity.js
+++ b/mail_activity/static/src/js/mail_activity.js
@ -0,0 +1,177 @@
+//-*- coding: utf-8 -*-
+//© 2017-2018 Therp BV <http://therp.nl>
+//License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+odoo.define('mail.Activity', function(require)
+{
+    "use strict";
+    var Chatter = require('mail.Chatter');
+    var kanban_widgets = require('web_kanban.widgets');
+    var Model = require('web.Model');
+    var form_common = require('web.form_common');
+    var core = require('web.core');
+    var time = require('web.time');
+    var _t = core._t;
+    Chatter.include({
+        init: function() {
+            this._super.apply(this, arguments);
+            this.schedule_activity_btn = !!this.view.fields.activity_ids;
+        },
+        start: function() {
+            this.$('button.o_chatter_button_schedule_activity').click(
+                this.proxy('_onScheduleActivity')
+            );
+            this.activity = this.view.fields.activity_ids;
+            if(this.activity) {
+                this.$('.o_chatter_topbar').after(this.activity.$el);
+            }
+            return this._super.apply(this, arguments);
+        },
+        _onScheduleActivity: function() {
+            return this.view.fields.activity_ids._scheduleActivity(false);
+        },
+    });
+
+    /**
+     * Set the 'label_delay' entry in activity data according to the deadline date
+     * @param {Array} activities list of activity Object
+     * @return {Array} : list of modified activity Object
+     */
+    var setDelayLabel = function(activities) {
+        var today = moment().startOf('day');
+        _.each(activities, function(activity){
+            var to_display = '';
+            var deadline = moment(activity.date_deadline + ' 00:00:00');
+            var diff = deadline.diff(today, 'days', true); // true means no rounding
+            if(diff === 0){
+                to_display = _t('Today');
+            }else{
+                if(diff < 0){ // overdue
+                    if(diff === -1){
+                        to_display = _t('Yesterday');
+                    }else{
+                        to_display = _.str.sprintf(_t('%d days overdue'), Math.abs(diff));
+                    }
+                }else{ // due
+                    if(diff === 1){
+                        to_display = _t('Tomorrow');
+                    }else{
+                        to_display = _.str.sprintf(_t('Due in %d days'), Math.abs(diff));
+                    }
+                }
+            }
+            activity.label_delay = to_display;
+        });
+        return activities;
+    };
+
+    var AbstractActivityField = form_common.AbstractField.extend({
+        _scheduleActivity: function (id, previous_activity_type_id, callback) {
+            var self = this,
+                action = {
+                type: 'ir.actions.act_window',
+                res_model: 'mail.activity',
+                view_mode: 'form',
+                view_type: 'form',
+                views: [[false, 'form']],
+                target: 'new',
+                context: {
+                    default_res_id: this.view.datarecord.id,
+                    default_res_model: this.view.dataset.model,
+                    default_previous_activity_type_id:
+                    previous_activity_type_id || false,
+                },
+                res_id: id || false,
+            };
+            return this.do_action(action, {
+                on_close: function() {
+                    if(callback) {
+                        callback();
+                    }
+                    return self.field_manager.reload();
+                },
+            });
+        },
+    });
+
+    var Activity = AbstractActivityField.extend({
+        className: 'o_mail_activity',
+        custom_events: {
+            reload_mail_fields: '_onReloadMailFields',
+        },
+        events: {
+            'click .o_activity_edit': '_onEditActivity',
+            'click .o_activity_unlink': '_onUnlinkActivity',
+            'click .o_activity_done': '_onMarkActivityDone',
+        },
+        render_value: function() {
+            return $.when(
+                this._super.apply(this, arguments),
+                this._readActivities()
+            ).then(this.proxy('_render_value'));
+        },
+        _render_value: function() {
+            var activities = setDelayLabel(this.activities);
+            if (activities.length) {
+                var nbActivities = _.countBy(activities, 'state');
+                this.$el.html(core.qweb.render('mail.activity_items', {
+                    activities: activities,
+                    nbPlannedActivities: nbActivities.planned,
+                    nbTodayActivities: nbActivities.today,
+                    nbOverdueActivities: nbActivities.overdue,
+                }));
+            } else {
+                this.$el.empty();
+            }
+        },
+        _readActivities: function() {
+            var self = this;
+            return new Model('mail.activity')
+            .query([])
+            .filter([['id', 'in', this.get('value')]])
+            .all()
+            .then(function(activities) {
+                self.activities = activities;
+            });
+        },
+        // handlers
+        _onEditActivity: function (event, options) {
+            event.preventDefault();
+            var self = this;
+            var activity_id = $(event.currentTarget).data('activity-id');
+            var action = _.defaults(options || {}, {
+                type: 'ir.actions.act_window',
+                res_model: 'mail.activity',
+                view_mode: 'form',
+                view_type: 'form',
+                views: [[false, 'form']],
+                target: 'new',
+                context: {
+                    default_res_id: this.view.datarecord.id,
+                    default_res_model: this.view.dataset.model,
+                },
+                res_id: activity_id,
+            });
+            return this.do_action(action, {
+                on_close: function () {
+                    return self.field_manager.reload();
+                },
+            });
+        },
+        _onUnlinkActivity: function (event, options) {
+            event.preventDefault();
+            var activity_id = $(event.currentTarget).data('activity-id');
+            options = _.defaults(options || {}, {
+                model: 'mail.activity',
+                args: [[activity_id]],
+            });
+            return new Model('mail.activity')
+            .call('unlink', [activity_id])
+            .then(this.render_value.bind(this));
+        },
+    });
+    core.form_widget_registry.add('mail_activity', Activity);
+
+    return Activity;
+
+});
--- a/mail_activity/static/src/js/systray.js
+++ b/mail_activity/static/src/js/systray.js
@ -0,0 +1,148 @@
+odoo.define('mail.systray.activities', function (require) {
+"use strict";
+
+var core = require('web.core');
+var SystrayMenu = require('web.SystrayMenu');
+var Widget = require('web.Widget');
+var session = require('web.session');
+var chat_manager = require('mail.chat_manager');
+
+var QWeb = core.qweb;
+
+var Model = require('web.Model');
+
+/**
+ * Menu item appended in the systray part of the navbar, redirects to the next activities of all app
+ */
+var ActivityMenu = Widget.extend({
+    template:'mail.chat.ActivityMenu',
+    events: {
+        "click": "_onActivityMenuClick",
+        "click .o_mail_channel_preview": "_onActivityFilterClick",
+    },
+    start: function () {
+        this.$activities_preview = this.$('.o_mail_navbar_dropdown_channels');
+        chat_manager.bus.on("activity_updated", this, this._updateCounter);
+        chat_manager.is_ready.then(this._updateCounter.bind(this));
+        this._updateActivityPreview();
+        return this._super();
+    },
+
+    // Private
+
+    /**
+     * Make call to model and get current user's activity details
+     * @private
+     */
+    _getActivityData: function(){
+        var self = this;
+        self.model = new Model("res.users")
+        return self.model.call(
+                "activity_user_count",
+                [],
+                {'context': session.user_context}
+                ).then(function(data){
+                    self.activities = data;
+                    self.activityCounter = _.reduce(data, function(total_count, p_data){ return total_count + p_data.total_count; }, 0);
+                    self.$('.o_notification_counter').text(self.activityCounter);
+                    self.$el.toggleClass('o_no_notification', !self.activityCounter);
+                });
+    },
+    /**
+     * Get particular model view to redirect on click of activity scheduled on that model.
+     * @private
+     * @param {string} model
+     */
+    _getActivityModelViewID: function (model) {
+        self.model = new Model(model)
+        return self.model.call("get_activity_view_id", [],{});
+    },
+    /**
+     * Check wether activity systray dropdown is open or not
+     * @private
+     * @returns {boolean}
+     */
+    _isOpen: function () {
+        return this.$el.hasClass('open');
+    },
+    /**
+     * Update(render) activity system tray view on activity updation.
+     * @private
+     */
+    _updateActivityPreview: function () {
+        var self = this;
+        self._getActivityData().then(function (){
+            self.$activities_preview.html(QWeb.render('mail.chat.ActivityMenuPreview', {
+                activities : self.activities
+            }));
+        });
+    },
+    /**
+     * update counter based on activity status(created or Done)
+     * @private
+     * @param {Object} [data] key, value to decide activity created or deleted
+     * @param {String} [data.type] notification type
+     * @param {Boolean} [data.activity_deleted] when activity deleted
+     * @param {Boolean} [data.activity_created] when activity created
+     */
+    _updateCounter: function (data) {
+        if (data) {
+            if (data.activity_created) {
+                this.activityCounter ++;
+            }
+            if (data.activity_deleted && this.activityCounter > 0) {
+                this.activityCounter --;
+            }
+            this.$('.o_notification_counter').text(this.activityCounter);
+            this.$el.toggleClass('o_no_notification', !this.activityCounter);
+        }
+    },
+
+
+    // Handlers
+
+    /**
+     * Redirect to particular model view
+     * @private
+     * @param {MouseEvent} event
+     */
+    _onActivityFilterClick: function (event) {
+        // fetch the data from the button otherwise fetch the ones from the parent (.o_mail_channel_preview).
+        var data = _.extend({}, $(event.currentTarget).data(), $(event.target).data());
+        var context = {};
+        if (data.filter === 'my') {
+            context['search_default_activities_overdue'] = 1;
+            context['search_default_activities_today'] = 1;
+        } else {
+            context['search_default_activities_' + data.filter] = 1;
+        }
+        this.do_action({
+            type: 'ir.actions.act_window',
+            name: data.model_name,
+            res_model:  data.res_model,
+            views: [[false, 'kanban'], [false, 'form']],
+            search_view_id: [false],
+            domain: [['activity_user_id', '=', session.uid]],
+            context:context,
+        });
+    },
+    /**
+     * When menu clicked update activity preview if counter updated
+     * @private
+     * @param {MouseEvent} event
+     */
+    _onActivityMenuClick: function () {
+        if (!this._isOpen()) {
+            this._updateActivityPreview();
+        }
+    },
+
+});
+
+SystrayMenu.Items.push(ActivityMenu);
+
+// to test activity menu in qunit test cases we need it
+return {
+    ActivityMenu: ActivityMenu,
+};
+});
--- a/mail_activity/static/src/less/kanban_activity.less
+++ b/mail_activity/static/src/less/kanban_activity.less
@ -0,0 +1,70 @@
+/* Kanban View */
+.o_kanban_record {
+    .o_kanban_inline_block {
+        display: inline-block;
+    }
+
+    .o_mail_activity {
+        .o_activity_btn {
+            span.fa {
+                overflow: visible;
+                line-height: 1;
+                vertical-align: middle;
+            }
+        }
+
+        .o_activity_link_kanban {
+            visibility: hidden;
+        }
+
+        ul.o_activity {
+            width: 290px;
+
+            & > li:last-child {
+                background-color: @odoo-brand-lightsecondary;
+                color: @gray-dark;
+                line-height: 3em;
+            }
+            li > ul.o_activity_log {
+                max-height: 300px;
+                overflow-y: auto;
+                color: @text-color;
+
+                li {
+                    width: 100%;
+                    display: inline-block;
+
+                    &.o_activity_label {
+                        line-height: 2.5em;
+                        padding: 0px 5px;
+                        background-color: @odoo-brand-lightsecondary;
+                    }
+
+                    &.o_schedule_activity {
+                        padding: 8px 10px 8px 0px;
+                        vertical-align: middle;
+                        &:hover {
+                            background-color: @gray-lighter;
+                            .o_activity_link_kanban {
+                                visibility: visible;
+                            }
+                        }
+
+                        .o_activity_title {
+                            width: 85%;
+                            padding: 0px 5px 0px 10px;
+                            white-space: nowrap;
+                            overflow: hidden;
+                            text-overflow: ellipsis;
+                        }
+                    }
+                }
+            }
+
+            .o_no_activity {
+                padding: 10px;
+                cursor: initial;
+            }
+        }
+    }
+}
--- a/mail_activity/static/src/less/mail_activity.less
+++ b/mail_activity/static/src/less/mail_activity.less
@ -0,0 +1,25 @@
+.o_mail_activity{
+    #o_chatter_planned_activities {
+        .o_thread_message {
+            .o_thread_message_sidebar {
+                .o_avatar_stack {
+                    position: relative;
+                    .o_avatar_icon{
+                        &.bg-success-full {
+                            background-color: @brand-success;
+                        }
+                        &.bg-warning-full {
+                            background-color: @brand-warning;
+                        }
+                        &.bg-danger-full {
+                            background-color: @brand-danger;
+                        }
+                        &.bg-info-full {
+                            background-color: @brand-info;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
--- a/mail_activity/static/src/less/systray.less
+++ b/mail_activity/static/src/less/systray.less
@ -0,0 +1,215 @@
+@gray-lighter-darker: #d9d7d7;
+@gray-lighter-dark: #E5E5E5;
+// Navbar icon and dropdown
+.o_mail_navbar_item {
+    > a {
+        opacity: 1;
+        > i {
+            font-size: larger;
+        }
+    }
+    &.o_no_notification > a {
+        opacity: 0.5;
+        .o_notification_counter {
+            display: none;
+        }
+    }
+    &.open .o_mail_navbar_dropdown {
+        .o-flex-display();
+        .o-flex-flow(column, nowrap);
+    }
+    .o_notification_counter {
+        .o-position-absolute(@top: 20%, @right: 1px);
+        background: @odoo-brand-optional;
+        color: white;
+        padding: 0em 0.3em;
+        font-size: 0.7em;
+    }
+    .o_mail_navbar_dropdown {
+        width: 350px;
+        padding: 0;
+
+        .o_spinner {
+            .o-flex-display();
+            .o-align-items(center);
+            .o-justify-content(center);
+            color: @odoo-main-text-color;
+            height: 50px;
+        }
+
+        .o_mail_navbar_dropdown_top {
+            .o-flex-display();
+            .o-flex(0, 0, auto);
+            justify-content: space-between;
+            border-bottom: 1px solid @gray-lighter-darker;
+            box-shadow: 0 0 2px @gray-lighter-darker;
+            .o_filter_button, .o_new_message {
+                .btn-link;
+                padding: 5px;
+            }
+            .o_filter_button {
+                color: @odoo-main-color-muted;
+                &:hover, &.active {
+                    color: @odoo-brand-optional;
+                }
+                &.active {
+                    cursor: default;
+                    font-weight: bold;
+                }
+            }
+        }
+
+        .o_mail_navbar_dropdown_channels {
+            .o-flex(0, 1, auto);
+            max-height: 400px;
+            min-height: 50px;
+            overflow-y: auto;
+
+            @media (min-width: @screen-sm-min) {
+                .o_mail_channel_preview {
+                    height: 50px;
+                    padding: 5px;
+                    .o_mail_channel_image {
+                        width: 40px;
+                    }
+                    .o_channel_info {
+                        margin-left: 10px;
+                        .o_channel_title {
+                            .o_last_message_date {
+                                padding-top: 2px;
+                                font-size: x-small;
+                                margin-left: 10px;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        .o_activity_filter_button {
+            .btn-link;
+            padding: 2px;
+        }
+        .o_no_activity {
+            cursor: initial;
+            .o-align-items(center);
+            color: grey;
+            opacity: 0.5;
+            padding: 3px;
+        }
+    }
+}
+
+.o_no_chat_window .o_mail_navbar_dropdown .o_new_message {
+    display: none;  // hide 'new message' button if chat windows are disabled
+}
+
+// Mobile rules
+// Goal: mock the design of Discuss in mobile
+@media (max-width: @screen-xs-max) {
+    .o_mail_navbar_item {
+        .o_notification_counter {
+            top: 10%;
+        }
+        .o_mail_navbar_dropdown {
+            position: relative;
+            .o_mail_navbar_dropdown_top {
+                padding: 5px;
+            }
+            .o_mail_navbar_mobile_header {
+                padding: 5px;
+                height: 44px;
+                border-bottom: 1px solid #ebebeb;
+                box-shadow: 0 0 2px @gray-lighter-darker;
+            }
+            .o_mail_navbar_dropdown_channels {
+                max-height: none;
+                padding-bottom: 52px; // leave space for tabs
+            }
+            .o_mail_mobile_tabs {
+                position: fixed;
+                bottom: 0px;
+                left: 0px;
+                right: 0px;
+                background-color: white;
+                color: @odoo-main-text-color;
+            }
+        }
+    }
+}
+
+// ------------------------------------------------------------------
+// Channel preview: shared between client action (mobile) and systray
+// ------------------------------------------------------------------
+
+.o_mail_channel_preview {
+    .o-flex-display();
+    background-color: @gray-lighter;
+    color: @odoo-main-text-color;
+    cursor: pointer;
+    overflow: hidden;
+    position: relative;
+    &:hover {
+        background-color: @gray-lighter-dark;
+        .o_channel_name {
+            color: @headings-color;
+        }
+    }
+    &:not(:last-child) {
+        border-bottom: 1px solid @gray-lighter-darker;
+    }
+    .o_mail_channel_image {
+        .o-flex(0, 0, auto);
+        position: relative;
+        > img {
+            .square(100%);
+            border-radius: 50%;
+        }
+        &.o_mail_channel_app > img {
+            border-radius: 2px;
+        }
+        .o_mail_user_status {
+            .o-position-absolute(@bottom: 0px, @right: 0px);
+        }
+    }
+    .o_channel_info {
+        .o-flex(1, 1, 100%);
+        overflow: hidden;
+        .o_channel_title {
+            .o-flex-display();
+            .o_channel_name {
+                .o-flex(0, 1, auto);
+                .o-text-overflow();
+            }
+            .o_channel_counter {
+                .o-flex(1, 1, auto);
+            }
+            .o_last_message_date {
+                .o-flex(0, 0, auto);
+                color: @odoo-main-color-muted;
+                font-weight: 500;
+            }
+        }
+        .o_last_message_preview {
+            width: 100%;
+            max-height: 20px;
+            color: @odoo-main-color-muted;
+            .o-text-overflow();
+        }
+    }
+    &.o_channel_unread {
+        background-color: transparent;
+        &:hover {
+            background-color: @gray-lighter;
+        }
+        .o_channel_info {
+            .o_channel_title {
+                .o_channel_name, .o_channel_counter {
+                    font-weight: 700;
+                }
+                .o_last_message_date {
+                    color: @odoo-brand-optional;
+                }
+            }
+        }
+    }
+}
--- a/mail_activity/static/src/xml/mail_activity.xml
+++ b/mail_activity/static/src/xml/mail_activity.xml
@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates>
+    <t t-extend="mail.Chatter">
+        <t t-jquery="button.o_chatter_button_log_note" t-operation="after">
+            <button t-if="widget.schedule_activity_btn" class="btn btn-sm btn-link o_chatter_button_schedule_activity" title="Log or schedule an activity">
+                <i class="fa fa-clock-o"/> Schedule activity
+            </button>
+        </t>
+    </t>
+    <t t-name="mail.activity_items">
+        <div class="o_thread_date_separator o_border_dashed" data-toggle="collapse" data-target="#o_chatter_planned_activities">
+            <span class="o_thread_date btn">
+                <i class="fa fa-fw fa-caret-down"/>
+                Planned activities
+                <small class="o_chatter_planned_activities_summary ml8">
+                    <span class="label img-circle label-danger"><t t-esc="nbOverdueActivities"/></span>
+                    <span class="label img-circle label-warning"><t t-esc="nbTodayActivities"/></span>
+                    <span class="label img-circle label-success"><t t-esc="nbPlannedActivities"/></span>
+                </small>
+            </span>
+        </div>
+        <div id="o_chatter_planned_activities" class="collapse in">
+            <t t-foreach="activities" t-as="activity">
+                <div class="o_thread_message" style="margin-bottom: 10px">
+                    <div class="o_thread_message_sidebar">
+                        <div class="o_avatar_stack">
+                            <img t-attf-src="/web/image#{activity.user_id[0] >= 0 ? ('/res.users/' + activity.user_id[0] + '/image_small') : ''}" class="o_thread_message_avatar img-circle mb8" t-att-title="activity.create_uid[1]"/>
+                            <i t-att-class="'o_avatar_icon fa ' + activity.icon + ' bg-' + (activity.state == 'planned'? 'success' : (activity.state == 'today'? 'warning' : 'danger')) + '-full'"
+                               t-att-title="activity.activity_type_id[1]"/>
+                        </div>
+                    </div>
+                    <div class="o_thread_message_core">
+                        <div class="o_mail_info">
+                            <strong><span t-attf-class="o_activity_date o_activity_color_#{activity.state}"><t t-esc="activity.label_delay" /></span></strong>:
+                            <strong t-if="activity.summary"> &#8220;<t t-esc="activity.summary"/>&#8221;</strong>
+                            <strong t-if="!activity.summary"> <t t-esc="activity.activity_type_id[1]" /></strong>
+                            <em> for </em>
+                            <t t-esc="activity.user_id[1]" />
+                            <a class="btn btn-link btn-info text-muted collapsed o_activity_info ml4" role="button" data-toggle="collapse" t-attf-data-target="#o_chatter_activity_info_#{activity.id}">
+                                <i class="fa fa-info-circle"></i>
+                            </a>
+                            <div class="o_thread_message_collapse collapse" t-attf-id="o_chatter_activity_info_#{activity.id}">
+                                <dl class="dl-horizontal well">
+                                    <dt>Activity type</dt>
+                                    <dd class="mb8">
+                                        <t t-esc="activity.activity_type_id[1]"/>
+                                    </dd>
+                                    <dt>Created on</dt>
+                                    <dd class="mb8">
+                                        <t t-esc="moment(activity.create_date)"/>
+                                    </dd>
+                                    <dt>Assigned to</dt>
+                                    <dd class="mb8">
+                                        <img t-attf-src="/web/image#{activity.user_id[0] >= 0 ? ('/res.users/' + activity.user_id[0] + '/image_small') : ''}" height="18" width="18" class="img-circle mr4" t-att-title="activity.create_uid[1]"/>
+                                        <b><t t-esc="activity.user_id[1]"/></b>
+                                        <em>, due on </em><span t-attf-class="o_activity_color_#{activity.state}"><t t-esc="moment(activity.date_deadline)"/></span>
+                                    </dd>
+                                </dl>
+                            </div>
+                        </div>
+                        <div t-if="activity.note" class="o_thread_message_note small">
+                            <t t-raw="activity.note"/>
+                        </div>
+                        <div class="o_thread_message_tools btn-group">
+                            <a href="#" class="btn btn-link btn-default text-muted btn-sm o_activity_edit o_activity_link" t-att-data-activity-id="activity.id">
+                                <i class="fa fa-pencil"/> Edit
+                            </a>
+                            <a href="#" class="btn btn-link btn-sm btn-danger text-muted o_activity_unlink o_activity_link" t-att-data-activity-id="activity.id">
+                                <i class="fa fa-times"/> Cancel
+                            </a>
+                        </div>
+                    </div>
+                </div>
+            </t>
+        </div>
+    </t>
+    <t t-name="mail.activity_feedback_form">
+        <div>
+            <textarea class="form-control" rows="3" id="activity_feedback" placeholder="Write Feedback"/>
+            <div class="mt8">
+                <button type="button" class="btn btn-xs btn-primary o_activity_popover_done_next" t-att-data-previous-activity-type-id="previous_activity_type_id">
+                    Done &amp; Schedule Next</button>
+                <button type="button" class="btn btn-xs btn-primary o_activity_popover_done">
+                    Done</button>
+                <button type="button" class="btn btn-xs btn-link o_activity_popover_discard">
+                    Discard</button>
+            </div>
+        </div>
+    </t>
+</templates>
--- a/mail_activity/static/src/xml/systray.xml
+++ b/mail_activity/static/src/xml/systray.xml
@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates>
+    
+    <t t-name="mail.chat.ActivityMenuPreview">
+        <t t-if="_.isEmpty(activities)">
+            <li class="text-center o_no_activity">
+                <span>No activities planned.</span>
+            </li>
+        </t>
+        <t t-foreach="activities" t-as="activity">
+            <div class="o_mail_channel_preview" t-att-data-res_model="activity.model" t-att-data-model_name="activity.name" data-filter='my'>
+                <div class="o_mail_channel_image o_mail_channel_app">
+                    <img t-att-src="activity.icon"/>
+                </div>
+                <div class="o_channel_info">
+                    <div class="o_channel_title">
+                        <span class="o_channel_name">
+                            <t t-esc="activity.name"/>
+                        </span>
+                    </div>
+                    <div>
+                        <button t-if="activity.overdue_count" type="button" class="btn btn-link o_activity_filter_button mr16" t-att-data-res_model="activity.model" t-att-data-model_name="activity.name" data-filter='overdue'><t t-esc="activity.overdue_count"/> Late </button>
+                        <span t-if="!activity.overdue_count" class="o_no_activity mr16">0 Late </span>
+                        <button t-if="activity.today_count" type="button" class="btn btn-link o_activity_filter_button mr16" t-att-data-res_model="activity.model" t-att-data-model_name="activity.name" data-filter='today'> <t t-esc="activity.today_count"/> Today </button>
+                        <span t-if="!activity.today_count" class="o_no_activity mr16">0 Today </span>
+                        <button t-if="activity.planned_count" type="button" class="btn btn-link o_activity_filter_button pull-right" t-att-data-res_model="activity.model" t-att-data-model_name="activity.name" data-filter='upcoming_all'> <t t-esc="activity.planned_count"/> Future </button>
+                        <span t-if="!activity.planned_count" class="o_no_activity pull-right">0 Future</span>
+                    </div>
+                </div>
+            </div>
+        </t>
+    </t>
+
+    <t t-name="mail.chat.ActivityMenu">
+        <li class="o_mail_navbar_item">
+            <a class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false" title="Activities" href="#">
+                <i class="fa fa-clock-o"/> <span class="o_notification_counter badge"/>
+            </a>
+            <ul class="o_mail_navbar_dropdown dropdown-menu" role="menu">
+                <li class="o_mail_navbar_dropdown_channels"/>
+            </ul>
+        </li>
+    </t>
+</templates>
+
--- a/mail_activity/static/src/xml/web_kanban_activity.xml
+++ b/mail_activity/static/src/xml/web_kanban_activity.xml
@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+
+<t t-name="mail.KanbanActivity">
+    <div class="o_kanban_inline_block dropdown o_kanban_selection o_mail_activity">
+        <a class="dropdown-toggle o_activity_btn" data-toggle="dropdown">
+            <span class="fa fa-clock-o fa-lg fa-fw"/>
+        </a>
+        <ul class="dropdown-menu o_activity" role="menu">
+        </ul>
+    </div>
+</t>
+
+<t t-name="mail.KanbanActivityLoading">
+    <li class="text-center o_no_activity">
+        <span class="fa fa-spinner fa-spin fa-2x" />
+    </li>
+</t>
+
+<t t-name="mail.KanbanActivityDropdown">
+    <li t-if="_.isEmpty(records)" class="text-center o_no_activity">
+        <span>No activities planned.</span>
+    </li>
+    <li t-if="!_.isEmpty(records)">
+        <ul class="nav o_activity_log">
+            <t t-foreach="_.keys(records)" t-as="key">
+                <t t-set="logs" t-value="records[key]" />
+                <li t-foreach="logs" t-as="log" t-att-data-activity-id="log.id" class="o_schedule_activity">
+                    <div class="o_activity_title pull-left">
+                        <span t-attf-class="o_activity_color_#{key}">
+                            <span class="fa fa-clock-o fa-fw" />
+                            <span t-att-title="log.date_deadline"><t t-esc="log.label_delay" /></span>
+                            <t t-if="log.user_id[0] != uid">
+                                <span class="ml4 fa fa-user" />
+                                <span><t t-esc="log.user_id[1]" /></span>
+                            </t>
+                        </span>
+                        <span t-attf-class="fa #{log.icon} fa-fw" />
+                        <t t-esc="log.title_action or log.activity_type_id[1]" />
+                        :
+                        <t t-esc="log.summary or ''" />
+                    </div>
+                </li>
+            </t>
+        </ul>
+    </li>
+</t>
+
+</templates>
--- a/mail_activity/tests/init.py
+++ b/mail_activity/tests/init.py
@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# © 2017 Therp BV <http://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from . import test_mail_activity
--- a/mail_activity/tests/test_mail_activity.py
+++ b/mail_activity/tests/test_mail_activity.py
@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+# © 2017 Therp BV <http://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from openerp import fields
+from openerp.tests.common import TransactionCase
+
+
+class TestMailActivity(TransactionCase):
+    def test_mail_activity(self):
+        partner = self.env.ref('base.res_partner_address_1')
+        activity = self.env['mail.activity'].with_context(
+            default_res_model=partner._name,
+        ).create({
+            'res_id': partner.id,
+            'activity_type_id': self.env.ref(
+                'mail_activity.mail_activity_data_meeting',
+            ).id,
+            'date_deadline': fields.Date.today(),
+            'summary': 'Hello world',
+        })
+        self.assertEqual(activity.res_name, partner.display_name)
+        self.assertEqual(activity.state, 'today')
+        self.assertEqual(partner.activity_state, 'today')
+        activity.write({'user_id': self.env.ref('base.user_demo').id})
+        self.assertIn(
+            partner,
+            self.env['res.partner'].search([
+                ('activity_user_id', '=', activity.user_id.id),
+            ])
+        )
+        self.assertIn(
+            partner,
+            self.env['res.partner'].search([
+                ('activity_summary', 'like', 'Hello world'),
+            ])
+        )
+        activity.action_feedback('feedback')
+        self.assertIn('feedback', partner.message_ids[:1].body)
+        self.assertFalse(activity.exists())
+        partner.unlink()
+        self.assertFalse(self.env['mail.activity'].search([
+            ('res_model', '=', 'res.partner'),
+            ('res_id', '=', partner.id),
+        ]))
--- a/mail_activity/views/mail_activity.xml
+++ b/mail_activity/views/mail_activity.xml
@ -0,0 +1,185 @@
+<?xml version="1.0"?>
+<odoo>
+    <!--
+        Copyright 2016 Odoo SA <https://www.odoo.com>
+        License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+    -->
+    <record id="mail_activity_type_view_form" model="ir.ui.view">
+        <field name="name">mail.activity.type.view.form</field>
+        <field name="model">mail.activity.type</field>
+        <field name="arch" type="xml">
+            <form string="Activities">
+                <sheet>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only"/>
+                        <h1><field name="name"/></h1>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="category" invisible="1"/>
+                            <field name="res_model_id" groups="base.group_no_one"/>
+                            <field name="summary"/>
+                            <field name="icon" groups="base.group_no_one"/>
+                            <field name="days"/>
+                        </group>
+                        <group>
+                            <field name="next_type_ids" widget="many2many_tags"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="mail_activity_type_view_tree" model="ir.ui.view">
+        <field name="name">mail.activity.type.view.tree</field>
+        <field name="model">mail.activity.type</field>
+        <field name="arch" type="xml">
+            <tree string="Activities">
+                <field name="sequence" widget="handle"/>
+                <field name="name"/>
+                <field name="summary"/>
+                <field name="days"/>
+                <field name="res_model_id" groups="base.group_no_one"/>
+                <field name="icon" groups="base.group_no_one"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="mail_activity_type_action" model="ir.actions.act_window">
+        <field name="name">Activity Types</field>
+        <field name="res_model">mail.activity.type</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+      id="menu_mail_activity_type"
+      action="mail_activity_type_action"
+      parent="base.menu_email"
+    />
+
+    <record id="mail_activity_view_form_popup" model="ir.ui.view">
+        <field name="name">mail.activity.view.form.popup</field>
+        <field name="model">mail.activity</field>
+        <field name="priority">20</field>
+        <field name="arch" type="xml">
+            <form string="Log an Activity" create="false">
+                <sheet string="Activity">
+                    <group invisible="1">
+                        <field name="activity_category" invisible="1" />
+                        <field name="res_model" invisible="1"/>
+                        <field name="res_model_id" invisible="1"/>
+                        <field name="res_id" invisible="1"/>
+                        <field name="previous_activity_type_id"/>
+                        <field name="has_recommended_activities"/>
+                    </group>
+                    <group attrs="{'invisible': [('has_recommended_activities','=',False)]}">
+                        <div>
+                            <p><strong>Recommended Activities</strong></p>
+                            <field name="recommended_activity_type_id" widget="radio"
+                                domain="[('previous_type_ids', '=', previous_activity_type_id)]"
+                                options="{'horizontal':true}"
+                                nolabel="1"/>
+                        </div>
+                    </group>
+                    <group>
+                        <group>
+                            <field name="activity_type_id" required="1" options="{'no_create': True, 'no_open': True}"/>
+                            <field name="summary" placeholder="e.g. Discuss proposal"/>
+                        </group>
+                        <group>
+                            <field name="date_deadline"/>
+                            <field name="user_id"/>
+                        </group>
+                    </group>
+                    <field name="note" placeholder="Log a note..."/>
+                    <label for="feedback"/>
+                    <field name="feedback" placeholder="e.g. Enter feedback"/>
+                    <footer>
+                        <button string="Schedule" name="action_close_dialog"
+                            type="object" class="btn-primary"/>
+                        <button string="Mark as Done" name="action_done"
+                            type="object" class="btn-primary"/>
+                        <button string="Discard" class="btn-default" special="cancel" />
+                    </footer>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="mail_activity_view_search" model="ir.ui.view">
+        <field name="name">mail.activity.view.search</field>
+        <field name="model">mail.activity</field>
+        <field name="arch" type="xml">
+            <search string="Activity">
+                <field name="res_model_id"/>
+                <field name="summary"/>
+                <field name="activity_type_id"/>
+                <separator/>
+                <filter string="My Activities" name="activities_my"
+                        domain="[('create_uid', '=', uid)]"/>
+                <separator/>
+                <filter string="Late Activities" name="activities_overdue"
+                        domain="[('date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
+                        help="Show all records which has next action date is before today"/>
+                <filter string="Today Activities" name="activities_today"
+                        domain="[('date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
+                <filter string="Future Activities" name="activities_upcoming_all"
+                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
+                        ]"/>
+                <separator/>
+                <group expand="0" string="Group By">
+                    <filter string="Deadline" context="{'group_by': 'date_deadline'}"/>
+                    <filter string="Created By" context="{'group_by': 'create_uid'}"/>
+                    <filter string="Activity Type" context="{'group_by': 'activity_type_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="mail_activity_view_tree" model="ir.ui.view">
+        <field name="name">mail.activity.view.tree</field>
+        <field name="model">mail.activity</field>
+        <field name="arch" type="xml">
+            <tree string="Next Activities"
+                    decoration-danger="date_deadline &lt; current_date"
+                    decoration-success="date_deadline == current_date"
+                    default_order="date_deadline" create="false">
+                <field name="res_name"/>
+                <field name="activity_type_id"/>
+                <field name="summary"/>
+                <field name="date_deadline"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="mail_activity_view_calendar" model="ir.ui.view">
+        <field name="name">mail.activity.view.calendar</field>
+        <field name="model">mail.activity</field>
+        <field name="priority" eval="2"/>
+        <field name="arch" type="xml">
+            <calendar string="Activity" date_start="date_deadline" color="activity_type_id">
+                <field name="res_name"/>
+                <field name="create_uid"/>
+                <field name="summary"/>
+            </calendar>
+        </field>
+    </record>
+
+    <template id="message_activity_done">
+<div>
+    <p>
+        <strong><span t-attf-class="fa #{activity.activity_type_id.icon}"/></strong> <span t-field="activity.activity_type_id.name"/> done
+        by <span t-field="activity.user_id.name"/>:
+        <span t-if="activity.summary" t-field="activity.summary"/>
+    </p>
+    <div t-field="activity.note" style="margin-left: 8px;"/>
+    <div t-if="activity.feedback" style="margin-top: 8px;">
+        <strong> Feedback</strong>
+    <div t-field="activity.feedback" style="margin-left: 8px;"></div>
+    </div>
+</div>
+    </template>
+
+</odoo>
--- a/mail_activity/views/res_partner.xml
+++ b/mail_activity/views/res_partner.xml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <!--
+        Copyright 2016 Odoo SA <https://www.odoo.com>
+        Copyright 2018 Eficent <http://www.eficent.com>
+        License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+    -->
+    <record id="view_partner_form" model="ir.ui.view">
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="mail.view_emails_partner_info_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//div[@class='oe_chatter']/field[@name='message_follower_ids']" position="after">
+                <field name="activity_ids" widget="mail_activity" />
+            </xpath>
+        </field>
+    </record>
+</odoo>
--- a/mail_activity/views/templates.xml
+++ b/mail_activity/views/templates.xml
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <!--
+        Copyright 2016 Odoo SA <https://www.odoo.com>
+        Copyright 2018 Eficent <http://www.eficent.com>
+        License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+    -->
+    <template id="assets_backend" name="mail_activity assets" inherit_id="web.assets_backend">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/mail_activity/static/src/js/mail_activity.js"></script>
+            <script type="text/javascript" src="/mail_activity/static/src/js/kanban_activity.js"></script>
+            <script type="text/javascript" src="/mail_activity/static/src/js/systray.js"></script>
+            <link rel="stylesheet" href="/mail_activity/static/src/css/mail_activity.css"/>
+            <link rel="stylesheet" href="/mail_activity/static/src/less/mail_activity.less" type="text/less"/>
+            <link rel="stylesheet" href="/mail_activity/static/src/less/kanban_activity.less" type="text/less"/>
+            <link rel="stylesheet" href="/mail_activity/static/src/less/systray.less" type="text/less"/>
+        </xpath>
+    </template>
+</odoo>
--- a/mail_activity/wizards/init.py
+++ b/mail_activity/wizards/init.py
@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import mail_compose_message
--- a/mail_activity/wizards/mail_compose_message.py
+++ b/mail_activity/wizards/mail_compose_message.py
@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+from openerp import fields, models
+
+
+class MailComposer(models.TransientModel):
+
+    _inherit = 'mail.compose.message'
+
+    # This field is already in v10 onwards.
+    subtype_id = fields.Many2one(
+        default=lambda self: self.sudo().env.ref('mail.mt_comment',
+                                                 raise_if_not_found=False).id)
--- a/mail_activity_calendar/LICENSE
+++ b/mail_activity_calendar/LICENSE
@ -0,0 +1,859 @@
+
+For copyright information, please see the COPYRIGHT file.
+
+Odoo is published under the GNU LESSER GENERAL PUBLIC LICENSE, Version 3
+(LGPLv3), as included below. Since the LGPL is a set of additional
+permissions on top of the GPL, the text of the GPL is included at the
+bottom as well.
+
+Some external libraries and contributions bundled with Odoo may be published
+under other GPL-compatible licenses. For these, please refer to the relevant
+source files and/or license files, in the source code tree.
+
+**************************************************************************
+
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
+**************************************************************************
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
+
+**************************************************************************
--- a/mail_activity_calendar/README.rst
+++ b/mail_activity_calendar/README.rst
@ -0,0 +1,67 @@
+======================
+Mail Activity Calendar
+======================
+
+Adds the ability to create calendar meetings when you schedule an
+activity of category 'Meeting'.
+
+Configuration
+=============
+
+* Go to 'Settings / Technical / Email / Activity Types' and configure
+  the category 'Meeting'
+
+Usage
+=====
+
+When you schedule an activity of category 'Meeting' you will be directed
+to the calendar.
+
+
+Known issues / Roadmap
+======================
+
+* When the user is redirected from the activity to the calendar view,
+  the summary of the activity does not appear in the pop-up window following
+  the creation of a new calendar event.
+
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/social/issues>`_. In case of trouble, please
+check there if your issue has already been reported. If you spotted it first,
+help us smashing it by providing a detailed and welcomed feedback.
+
+Credits
+=======
+
+Images
+------
+
+* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.
+
+Contributors
+------------
+
+**This module is a backport from Odoo SA and as such, it is not included in the OCA CLA. That means we do not have a copy of the copyright on it like all other OCA modules.**
+
+* Jordi Ballester Alomar <jordi.ballester@eficent.com>
+
+Do not contact contributors directly about help with questions or problems concerning this addon, but use the `community mailing list <mailto:community@mail.odoo.com>`_ or the `appropriate specialized mailinglist <https://odoo-community.org/groups>`_ for help, and the bug tracker linked in `Bug Tracker`_ above for technical issues.
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit https://odoo-community.org.
--- a/mail_activity_calendar/init.py
+++ b/mail_activity_calendar/init.py
@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+from . import models
+from .hooks import pre_init_hook
--- a/mail_activity_calendar/openerp.py
+++ b/mail_activity_calendar/openerp.py
@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Odoo SA <https://www.odoo.com>
+# Copyright 2018 Therp BV <http://therp.nl>
+# Copyright 2018 Eficent <http://www.eficent.com>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+{
+    "name": "Mail Activity Calendar",
+    "version": "9.0.1.0.0",
+    "author": "Odoo SA,Eficent,Odoo Community Association (OCA)",
+    "license": "LGPL-3",
+    "category": "Discuss",
+    "summary": "Backport of integration between activities and calendar",
+    "depends": [
+        'mail_activity',
+        'crm',
+    ],
+    "data": [
+        "views/mail_activity_views.xml",
+        "views/calendar_event_views.xml",
+        'views/calendar_templates.xml',
+        "data/mail_activity_data.xml",
+    ],
+    "pre_init_hook": "pre_init_hook",
+}
--- a/mail_activity_calendar/data/mail_activity_data.xml
+++ b/mail_activity_calendar/data/mail_activity_data.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!--
+        Copyright 2016 Odoo SA <https://www.odoo.com>
+        License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+    -->
+    <data noupdate="1">
+        <record id="mail_activity.mail_activity_data_meeting" model="mail.activity.type">
+            <field name="category">meeting</field>
+        </record>
+    </data>
+</odoo>
--- a/mail_activity_calendar/hooks.py
+++ b/mail_activity_calendar/hooks.py
@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# Copyright 2018 Tecnativa <https://www.tecnativa.com>
+# Copyright 2018 Eficent <http://www.eficent.com>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+import logging
+
+
+_logger = logging.getLogger(__name__)
+
+
+def pre_init_hook(cr):
+    """
+    This pre-creates before ORM related computation the field `res_model`,
+    for avoiding an error when writing back the value on virtual records
+    created by recurring events. No need of writing any possible value, as
+    this is a new feature not available in v10.
+    See https://github.com/OCA/OpenUpgrade/blob/11.0/addons/calendar
+    /migrations/11.0.1.0/pre-migration.py
+    """
+    _logger.info('Pre-creating column res_model in table calendar_event')
+
+    cr.execute("""SELECT column_name
+        FROM information_schema.columns
+        WHERE table_name='calendar_event' AND
+        column_name='res_model'""")
+    if not cr.fetchone():
+        cr.execute(
+            """
+            ALTER TABLE calendar_event
+            ADD COLUMN res_model
+            character varying;
+            COMMENT ON COLUMN calendar_event.res_model
+            IS 'Document Model Name';
+            """)
--- a/mail_activity_calendar/models/init.py
+++ b/mail_activity_calendar/models/init.py
@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+from . import mail_activity
+from . import calendar_event
--- a/mail_activity_calendar/models/calendar_event.py
+++ b/mail_activity_calendar/models/calendar_event.py
@ -0,0 +1,119 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Odoo SA <https://www.odoo.com>
+# Copyright 2018 Eficent <http://www.eficent.com>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+from openerp import api, models, fields
+
+
+class CalendarEvent(models.Model):
+    _inherit = "calendar.event"
+
+    @api.model
+    def default_get(self, fields):
+        if self.env.context.get('default_res_model') and not \
+                self.env.context.get('default_res_model_id'):
+            self = self.with_context(
+                default_res_model_id=self.env['ir.model'].sudo().search([
+                    ('model', '=', self.env.context['default_res_model'])
+                ], limit=1).id
+            )
+        defaults = super(CalendarEvent, self).default_get(fields)
+
+        # support active_model / active_id as replacement of
+        # default_* if not already given
+        if 'res_model_id' not in defaults and 'res_model_id' in fields and \
+                self.env.context.get('active_model') and \
+                self.env.context['active_model'] != 'calendar.event':
+            defaults['res_model_id'] = self.env['ir.model'].sudo().search(
+                [('model', '=', self.env.context['active_model'])],
+                limit=1).id
+        if 'res_id' not in defaults and 'res_id' in fields and \
+                defaults.get(
+                    'res_model_id') and self.env.context.get('active_id'):
+            defaults['res_id'] = self.env.context['active_id']
+
+        return defaults
+
+    # linked document
+    res_id = fields.Integer('Document ID')
+    res_model_id = fields.Many2one('ir.model',
+                                   'Document Model', ondelete='cascade')
+    res_model = fields.Char('Document Model Name',
+                            related='res_model_id.model', readonly=True,
+                            store=True)
+    activity_ids = fields.One2many('mail.activity', 'calendar_event_id',
+                                   string='Activities')
+
+    @api.model
+    def create(self, values):
+        # created from calendar: try to create an activity
+        # on the related record
+        if not values.get('activity_ids'):
+            defaults = self.default_get(['activity_ids',
+                                         'res_model_id', 'res_id', 'user_id'])
+            res_model_id = values.get('res_model_id', defaults.get(
+                'res_model_id'))
+            res_id = values.get('res_id', defaults.get('res_id'))
+            user_id = values.get('user_id', defaults.get('user_id'))
+            if not defaults.get('activity_ids') and res_model_id and res_id:
+                if hasattr(self.env[self.env['ir.model'].sudo().browse(
+                        res_model_id).model], 'activity_ids'):
+                    meeting_activity_type = \
+                        self.env['mail.activity.type'].search(
+                            [('category', '=', 'meeting')], limit=1)
+                    if meeting_activity_type:
+                        activity_vals = {
+                            'res_model_id': res_model_id,
+                            'res_id': res_id,
+                            'activity_type_id': meeting_activity_type.id,
+                        }
+                        if user_id:
+                            activity_vals['user_id'] = user_id
+                        values['activity_ids'] = [(0, 0, activity_vals)]
+
+        meeting = super(CalendarEvent, self).create(values)
+        meeting._sync_activities(values)
+        return meeting
+
+    @api.multi
+    def write(self, values):
+        # compute duration, only if start and stop are modified
+        if 'duration' not in values and 'start' in values and 'stop' in values:
+            values['duration'] = self._get_duration(values['start'],
+                                                    values['stop'])
+
+        self._sync_activities(values)
+        return super(CalendarEvent, self).write(values)
+
+    @api.multi
+    def action_close_dialog(self):
+        return {'type': 'ir.actions.act_window_close'}
+
+    @api.multi
+    def action_done(self):
+        for rec in self:
+            rec.activity_ids.action_feedback()
+        return {'type': 'ir.actions.act_window_close'}
+
+    @api.multi
+    def action_open_calendar_event(self):
+        if self.res_model and self.res_id:
+            return self.env[self.res_model].browse(
+                self.res_id).get_formview_action()[0]
+        return False
+
+    def _sync_activities(self, values):
+        # update activities
+        if self.mapped('activity_ids'):
+            activity_values = {}
+            if values.get('name'):
+                activity_values['summary'] = values['name']
+            if values.get('description'):
+                activity_values['note'] = values['description']
+            if values.get('start'):
+                activity_values['date_deadline'] = \
+                    fields.Datetime.from_string(values['start']).date()
+            if values.get('user_id'):
+                activity_values['user_id'] = values['user_id']
+            if activity_values.keys():
+                self.mapped('activity_ids').write(activity_values)
--- a/mail_activity_calendar/models/mail_activity.py
+++ b/mail_activity_calendar/models/mail_activity.py
@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Odoo SA <https://www.odoo.com>
+# Copyright 2018 Eficent <http://www.eficent.com>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+from openerp import api, models, fields, tools, _
+
+
+class MailActivityType(models.Model):
+    _inherit = "mail.activity.type"
+
+    category = fields.Selection(selection_add=[('meeting', 'Meeting')])
+
+
+class MailActivity(models.Model):
+    _inherit = "mail.activity"
+
+    calendar_event_id = fields.Many2one('calendar.event',
+                                        string="Calendar Meeting",
+                                        ondelete='cascade')
+
+    @api.multi
+    def action_create_calendar_event(self):
+        self.ensure_one()
+        action = self.env.ref('calendar.action_calendar_event').read()[0]
+        action['context'] = {
+            'default_activity_type_id': self.activity_type_id.id,
+            'default_res_id': self.env.context.get('default_res_id'),
+            'default_res_model': self.env.context.get('default_res_model'),
+            'default_name': self.summary,
+            'default_description': self.note and tools.html2plaintext(
+                self.note) or '',
+            'default_activity_ids': [(6, 0, self.ids)],
+        }
+        return action
+
+    def action_feedback(self, feedback=False):
+        events = self.mapped('calendar_event_id')
+        res = super(MailActivity, self).action_feedback(feedback)
+        if feedback:
+            for event in events:
+                description = event.description
+                description = '%s\n%s%s' % (description or '', _(
+                    "Feedback: "), feedback)
+                event.write({'description': description})
+        return res
+
+    @api.one
+    def unlink_w_meeting(self):
+        events = self.mapped('calendar_event_id')
+        res = self.unlink()
+        events.unlink()
+        return res
--- a/mail_activity_calendar/static/src/js/mail_activity.js
+++ b/mail_activity_calendar/static/src/js/mail_activity.js
@ -0,0 +1,63 @@
+odoo.define('calendar.Activity', function (require) {
+"use strict";
+
+var Activity = require('mail.Activity');
+var Dialog = require('web.Dialog');
+var core = require('web.core');
+var Model = require('web.Model');
+var _t = core._t;
+
+Activity.include({
+
+    /**
+     * Override behavior to redirect to calendar event instead of activity
+     *
+     * @override
+     */
+    _onEditActivity: function (event, options) {
+        var self = this;
+        var activity_id = $(event.currentTarget).data('activity-id');
+        var activity = _.find(this.activities, function (act) { return act.id === activity_id; });
+        if (activity && activity.activity_category === 'meeting' && activity.calendar_event_id) {
+            return self._super(event, _.extend({
+                res_model: 'calendar.event',
+                res_id: activity.calendar_event_id[0],
+            }));
+        }
+        return self._super(event, options);
+    },
+
+    /**
+     * Override behavior to warn that the calendar event is about to be removed as well
+     *
+     * @override
+     */
+    _onUnlinkActivity: function (event, options) {
+        event.preventDefault();
+        var self = this;
+        var activity_id = $(event.currentTarget).data('activity-id');
+        var activity = _.find(this.activities, function (act) { return act.id === activity_id; });
+        if (activity && activity.activity_category === 'meeting' && activity.calendar_event_id) {
+            var done = $.Deferred();
+            Dialog.confirm(
+                self,
+                _t("The activity is linked to a meeting. Deleting it will remove the meeting as well. Do you want to proceed ?"), {
+                    confirm_callback: function () {
+                        new Model('mail.activity')
+                            .call('unlink_w_meeting', [[activity_id]])
+                            .then(function(res) {
+                                self.render_value();
+                                done.resolve(res);
+                            });
+                    },
+                }
+            );
+            return done;
+        }
+        else {
+            return self._super(event, options);
+        }
+    },
+});
+
+});
--- a/mail_activity_calendar/views/calendar_event_views.xml
+++ b/mail_activity_calendar/views/calendar_event_views.xml
@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<odoo>
+    <!--
+        Copyright 2016 Odoo SA <https://www.odoo.com>
+        Copyright 2018 Eficent <http://www.eficent.com>
+        License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+    -->
+    <record id="view_calendar_event_form" model="ir.ui.view">
+        <field name="name">calendar.event.form</field>
+        <field name="model">calendar.event</field>
+        <field name="inherit_id" ref="calendar.view_calendar_event_form"/>
+        <field name="arch" type="xml">
+            <field name="state" position="before">
+                <group>
+                    <button string="Document" class="oe_stat_button pull-right"
+                            icon="fa-bars" type="object"
+                            name="action_open_calendar_event"
+                            attrs="{'invisible': ['|', ('res_model', '=', False), ('res_id', '=', False)]}"/>
+                </group>
+                <field name="res_model" invisible="1"/>
+                <field name="res_id" invisible="1"/>
+            </field>
+            <sheet position="inside">
+                <footer>
+                    <button string="Schedule" name="action_close_dialog"
+                                type="object" class="btn-primary"/>
+                    <button string="Mark Activity as Done" name="action_done"
+                                type="object" class="btn-primary"/>
+                </footer>
+            </sheet>
+        </field>
+    </record>
+
+    <record id="view_calendar_event_form_popup" model="ir.ui.view">
+        <field name="name">calendar.event.form</field>
+        <field name="model">calendar.event</field>
+        <field name="inherit_id" ref="calendar.view_calendar_event_form_popup"/>
+        <field name="arch" type="xml">
+            <field name="state" position="before">
+                <group>
+                    <button string="Document"
+                            class="oe_stat_button pull-right"
+                            icon="fa-bars"
+                            type="object"
+                            name="action_open_calendar_event"
+                            attrs="{'invisible': ['|', ('res_model', '=', False), ('res_id', '=', False)]}"/>
+                </group>
+                <field name="res_model" invisible="1"/>
+                <field name="res_id" invisible="1"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>
--- a/mail_activity_calendar/views/calendar_templates.xml
+++ b/mail_activity_calendar/views/calendar_templates.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!--
+        Copyright 2016 Odoo SA <https://www.odoo.com>
+        Copyright 2018 Eficent <http://www.eficent.com>
+        License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+    -->
+    <template id="assets_backend" name="calendar assets" inherit_id="web.assets_backend">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/mail_activity_calendar/static/src/js/mail_activity.js"></script>
+        </xpath>
+    </template>
+</odoo>
--- a/mail_activity_calendar/views/mail_activity_views.xml
+++ b/mail_activity_calendar/views/mail_activity_views.xml
@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<odoo>
+    <!--
+        Copyright 2016 Odoo SA <https://www.odoo.com>
+        Copyright 2018 Eficent <http://www.eficent.com>
+        License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+    -->
+    <record id="mail_activity_type_view_form" model="ir.ui.view">
+        <field name="name">mail.activity.type.form.inherit.calendar</field>
+        <field name="model">mail.activity.type</field>
+        <field name="inherit_id" ref="mail_activity.mail_activity_type_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='category']" position="attributes">
+                <attribute name="invisible">0</attribute>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="mail_activity_view_form_popup" model="ir.ui.view">
+        <field name="name">mail.activity.form.inherit.calendar</field>
+        <field name="model">mail.activity</field>
+        <field name="inherit_id" ref="mail_activity.mail_activity_view_form_popup"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='date_deadline']" position="attributes">
+                  <attribute name="attrs">{'invisible': [('activity_category', '=', 'meeting')]}</attribute>
+            </xpath>
+            <xpath expr="//field[@name='user_id']" position="attributes">
+                  <attribute name="attrs">{'invisible': [('activity_category', '=', 'meeting')]}</attribute>
+            </xpath>
+            <xpath expr="//button[@name='action_close_dialog']" position="attributes">
+                  <attribute name="attrs">{'invisible': [('activity_category', '=', 'meeting')]}</attribute>
+            </xpath>
+            <xpath expr="//button[@name='action_done']" position="attributes">
+                  <attribute name="attrs">{'invisible': [('activity_category', '=', 'meeting')]}</attribute>
+            </xpath>
+            <xpath expr="//button[@special='cancel']" position="attributes">
+                  <attribute name="attrs">{'invisible': [('activity_category', '=', 'meeting')]}</attribute>
+            </xpath>
+            <xpath expr="//button[@name='action_close_dialog']" position="before">
+                <button string="Schedule a meeting"
+                    attrs="{'invisible': [('activity_category', '!=', 'meeting')]}"
+                    name="action_create_calendar_event"
+                    type="object"
+                    class="btn-primary"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
--- a/mail_activity_crm/LICENSE
+++ b/mail_activity_crm/LICENSE
@ -0,0 +1,859 @@
+
+For copyright information, please see the COPYRIGHT file.
+
+Odoo is published under the GNU LESSER GENERAL PUBLIC LICENSE, Version 3
+(LGPLv3), as included below. Since the LGPL is a set of additional
+permissions on top of the GPL, the text of the GPL is included at the
+bottom as well.
+
+Some external libraries and contributions bundled with Odoo may be published
+under other GPL-compatible licenses. For these, please refer to the relevant
+source files and/or license files, in the source code tree.
+
+**************************************************************************
+
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
+**************************************************************************
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
+
+**************************************************************************
--- a/mail_activity_crm/README.rst
+++ b/mail_activity_crm/README.rst
@ -0,0 +1,67 @@
+=================
+Activities in CRM
+=================
+
+This module adds activities to CRM.
+
+Configuration
+=============
+
+To configure this module, you need to do the same as in 11.0.
+
+Usage
+=====
+
+To use this module, you need to do the same as in 11.0.
+
+Known issues / Roadmap
+======================
+
+* From the Kanban view you can only display the activities. You cannot
+  schedule new activities from the kanban pop-up window, and the layout is
+  slightly different.
+
+* The Kanban view shows the next activity date and summary, in red if it
+  is overdue.
+
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/social/issues>`_. In case of trouble, please
+check there if your issue has already been reported. If you spotted it first,
+help us smashing it by providing a detailed and welcomed feedback.
+
+Credits
+=======
+
+Images
+------
+
+* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.
+
+Contributors
+------------
+
+**This module is a backport from Odoo SA and as such, it is not included in the OCA CLA. That means we do not have a copy of the copyright on it like all other OCA modules.**
+
+* Holger Brunn <hbrunn@therp.nl>
+* Jordi Ballester <jordi.ballester@eficent.com>
+
+Do not contact contributors directly about help with questions or problems concerning this addon, but use the `community mailing list <mailto:community@mail.odoo.com>`_ or the `appropriate specialized mailinglist <https://odoo-community.org/groups>`_ for help, and the bug tracker linked in `Bug Tracker`_ above for technical issues.
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit https://odoo-community.org.
--- a/mail_activity_crm/init.py
+++ b/mail_activity_crm/init.py
@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+from . import models
+from .hooks import post_init_hook
--- a/mail_activity_crm/openerp.py
+++ b/mail_activity_crm/openerp.py
@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Odoo SA <https://www.odoo.com>
+# Copyright 2018 Therp BV <http://therp.nl>
+# Copyright 2018 Eficent <http://www.eficent.com>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+{
+    "name": "Activities in CRM",
+    "version": "9.0.1.0.0",
+    "author": "Odoo SA,Therp BV,Odoo Community Association (OCA)",
+    "license": "LGPL-3",
+    "category": "Discuss",
+    "summary": "Backport activities in CRM",
+    "depends": [
+        'mail_activity',
+        'mail_activity_calendar',
+        'crm',
+    ],
+    "data": [
+        "views/crm_lead_views.xml",
+        'views/crm_activity_report_view.xml',
+        'views/crm_lead_menu.xml',
+        'views/crm_action_views.xml',
+    ],
+    'post_init_hook': 'post_init_hook',
+}
--- a/mail_activity_crm/hooks.py
+++ b/mail_activity_crm/hooks.py
@ -0,0 +1,102 @@
+# Copyright 2018 Eficent Business and IT Consulting Services S.L.
+# Copyright 2018 Tecnativa, S.L.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
+from openerp import api, SUPERUSER_ID
+
+
+def convert_crm_activity_types(env):
+    """Point default crm.activity.type records to their equivalents now in v11,
+    and create the rest manually."""
+    column_name = "crm_activity"
+    table = 'mail_activity_type'
+    column = 'crm_activity'
+    env.cr.execute("""
+            SELECT column_name
+            FROM information_schema.columns
+            WHERE table_name = %s AND column_name = %s""", (table, column))
+    if not bool(env.cr.fetchall()):
+        env.cr.execute(
+            "ALTER TABLE mail_activity_type ADD COLUMN crm_activity INTEGER")
+
+    type_mapping = {
+        'crm.crm_activity_data_email':
+            'mail_activity.mail_activity_data_email',
+        'crm.crm_activity_data_call':
+            'mail_activity.mail_activity_data_call',
+        'crm.crm_activity_data_meeting':
+            'mail_activity.mail_activity_data_todo',
+    }
+    migrated_ids = []
+    for old_xml_id, new_xml_id in type_mapping.items():
+        env.cr.execute(
+            "SELECT res_id FROM ir_model_data "
+            "WHERE module = %s and name = %s",
+            (old_xml_id.split('.')[0], old_xml_id.split('.')[1]),
+        )
+        row = env.cr.fetchone()
+        if row:
+            old_id = row[0]
+            migrated_ids.append(old_id)
+            env.cr.execute(
+                "UPDATE mail_activity_type "
+                "SET %s = %s WHERE id = %s"
+                % (column_name, old_id, env.ref(new_xml_id).id)
+            )
+    env.cr.execute("""
+        INSERT INTO mail_activity_type
+            (name, sequence, res_model_id, category, days,
+             create_date, create_uid, write_uid, write_date, %s)
+        SELECT
+            mms.name, ca.sequence, im.id, 'default', ca.days,
+            ca.create_date, ca.create_uid, ca.write_uid, ca.write_date, ca.id
+        FROM
+            crm_activity AS ca,
+            mail_message_subtype AS mms,
+            ir_model AS im
+        WHERE
+             mms.id = ca.subtype_id AND
+             im.model = 'crm.lead' AND
+             ca.id NOT IN %s
+        """ % (column_name, tuple(migrated_ids), )
+    )
+
+
+def convert_crm_lead_activities(env):
+    """Create mail.activity records for the corresponding activities in v10."""
+    column_name = 'crm_activity'
+    env.cr.execute("""
+        INSERT INTO mail_activity
+            (res_id, res_model_id, res_model, res_name, summary,
+             activity_type_id, date_deadline, create_uid, create_date,
+             write_uid, write_date, user_id)
+         SELECT
+            cl.id,  im.id, 'crm.lead', cl.name, cl.title_action,
+            mat.id, cl.date_action, cl.create_uid, cl.create_date,
+            cl.write_uid, cl.write_date, COALESCE(cl.user_id, cl.create_uid)
+         FROM
+            crm_lead AS cl,
+            mail_activity_type AS mat,
+            ir_model AS im
+         WHERE
+            next_activity_id IS NOT NULL AND
+            date_action IS NOT NULL AND
+            im.model = 'crm.lead' AND
+            mat.%s = cl.next_activity_id
+         """ % (column_name, )
+    )
+
+
+def delete_crm_activities(env):
+    """Delete old activities in order to avoid duplicating them
+    when we transition to v11."""
+    env.cr.execute("""
+        DELETE FROM crm_activity
+    """)
+
+
+def post_init_hook(cr, registry):
+    with api.Environment.manage():
+        env = api.Environment(cr, SUPERUSER_ID, {})
+        convert_crm_activity_types(env)
+        convert_crm_lead_activities(env)
+        delete_crm_activities(env)
--- a/mail_activity_crm/models/init.py
+++ b/mail_activity_crm/models/init.py
@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+from . import crm_lead
+from . import calendar_event
+from . import mail_activity
--- a/mail_activity_crm/models/calendar_event.py
+++ b/mail_activity_crm/models/calendar_event.py
@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Odoo SA <https://www.odoo.com>
+# Copyright 2018 Therp BV <http://therp.nl>
+# Copyright 2018 Eficent <http://www.eficent.com>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+from openerp import api, models
+
+
+class CalendarEvent(models.Model):
+    _inherit = 'calendar.event'
+
+    @api.model
+    def default_get(self, fields):
+        if self.env.context.get('default_opportunity_id'):
+            self = self.with_context(
+                default_res_model_id=self.env.ref('crm.model_crm_lead').id,
+                default_res_id=self.env.context['default_opportunity_id']
+            )
+        defaults = super(CalendarEvent, self).default_get(fields)
+
+        # sync res_model / res_id to opportunity id (aka
+        # creating meeting from lead chatter)
+        if 'opportunity_id' not in defaults and defaults.get('res_id') and \
+                (defaults.get('res_model') or defaults.get('res_model_id')):
+            if (defaults.get('res_model') and
+                defaults['res_model'] == 'crm.lead') or \
+                    (defaults.get('res_model_id') and self.env[
+                        'ir.model'].sudo().browse(
+                        defaults['res_model_id']).model == 'crm.lead'):
+                defaults['opportunity_id'] = defaults['res_id']
+
+        return defaults
+
+    def _compute_is_highlighted(self):
+        super(CalendarEvent, self)._compute_is_highlighted()
+        if self.env.context.get('active_model') == 'crm.lead':
+            opportunity_id = self.env.context.get('active_id')
+            for event in self:
+                if event.opportunity_id.id == opportunity_id:
+                    event.is_highlighted = True
--- a/mail_activity_crm/models/crm_lead.py
+++ b/mail_activity_crm/models/crm_lead.py
@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Odoo SA <https://www.odoo.com>
+# Copyright 2018 Therp BV <http://therp.nl>
+# Copyright 2018 Eficent <http://www.eficent.com>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+from openerp import models
+from openerp.addons.mail_activity.models.mail_activity_mixin import \
+    setup_mail_actitivities
+
+
+@setup_mail_actitivities
+class CrmLead(models.Model):
+    _inherit = 'crm.lead'
--- a/mail_activity_crm/models/mail_activity.py
+++ b/mail_activity_crm/models/mail_activity.py
@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Odoo SA <https://www.odoo.com>
+# Copyright 2018 Therp BV <http://therp.nl>
+# Copyright 2018 Eficent <http://www.eficent.com>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+from openerp import api, models
+
+
+class MailActivity(models.Model):
+    _inherit = "mail.activity"
+
+    @api.multi
+    def action_create_calendar_event(self):
+        action = super(MailActivity, self).action_create_calendar_event()
+        res_model = self.env.context.get('default_res_model', False)
+        if res_model and res_model == 'crm.lead':
+            action['context']['default_opportunity_id'] = \
+                self.env.context.get('default_res_id')
+        return action
--- a/mail_activity_crm/views/crm_action_views.xml
+++ b/mail_activity_crm/views/crm_action_views.xml
@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<odoo>
+    <!-- hide -->
+    <record id="crm.crm_activity_menu" model="ir.ui.menu">
+        <field name="groups_id" eval="[(6, 0, [ref('base.group_no_one')])]"/>
+        <field name="name">Activities (obsolete)</field>
+    </record>
+
+</odoo>
--- a/mail_activity_crm/views/crm_activity_report_view.xml
+++ b/mail_activity_crm/views/crm_activity_report_view.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- hide -->
+        <record id="crm.crm_activity_report_menu" model="ir.ui.menu">
+            <field name="groups_id" eval="[(6, 0, [ref('base.group_no_one')])]"/>
+            <field name="name">Activities (obsolete)</field>
+        </record>
+
+    </data>
+</openerp>
--- a/mail_activity_crm/views/crm_lead_menu.xml
+++ b/mail_activity_crm/views/crm_lead_menu.xml
@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+    <!-- hide -->
+    <record id="crm.crm_lead_menu_activities" model="ir.ui.menu">
+        <field name="groups_id" eval="[(6, 0, [ref('base.group_no_one')])]"/>
+        <field name="name">Next Activities (obsolete)</field>
+    </record>
+
+</data>
+</openerp>
--- a/mail_activity_crm/views/crm_lead_views.xml
+++ b/mail_activity_crm/views/crm_lead_views.xml
@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<odoo>
+    <!--
+        Copyright 2016 Odoo SA <https://www.odoo.com>
+        Copyright 2018 Therp BV <http://therp.nl>
+        Copyright 2018 Eficent <http://www.eficent.com>
+        License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+    -->
+    <record model="ir.ui.view" id="crm_case_kanban_view_leads">
+        <field name="name">CRM - Leads Kanban</field>
+        <field name="model">crm.lead</field>
+        <field name="inherit_id" ref="crm.crm_case_kanban_view_leads"/>
+        <field name="arch" type="xml">
+            <field name="message_needaction_counter" position="after">
+                <field name="activity_ids"/>
+                <field name="nbr_activities"/>
+            </field>
+             <xpath expr="//div[@class='oe_kanban_content']" position="inside">
+                 Next activity:
+                <div class="text-muted">
+                    <t t-if="record.activity_date_deadline.raw_value and record.activity_date_deadline.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
+                    <span t-attf-class="#{red || ''}">
+                        <field name="activity_date_deadline"/>
+                        <t t-if="record.activity_date_deadline.raw_value"> : </t>
+                        <field name="activity_summary"/>
+                    </span>
+                </div>
+                <div t-if="record.nbr_activities.raw_value">
+                    <field name="activity_ids" widget="kanban_activity"/>
+                </div>
+            </xpath>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="crm_case_form_view_leads">
+        <field name="name">CRM - Leads Form</field>
+        <field name="model">crm.lead</field>
+        <field name="inherit_id" ref="crm.crm_case_form_view_leads" />
+        <field name="arch" type="xml">
+            <xpath expr="//div[@class='oe_chatter']/field[@name='message_follower_ids']" position="after">
+                <field name="activity_ids" widget="mail_activity" />
+            </xpath>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="crm_case_form_view_oppor">
+        <field name="name">Opportunities</field>
+        <field name="model">crm.lead</field>
+        <field name="inherit_id" ref="crm.crm_case_form_view_oppor" />
+        <field name="arch" type="xml">
+            <xpath expr="//div[@class='oe_chatter']/field[@name='message_follower_ids']" position="after">
+                <field name="activity_ids" widget="mail_activity" />
+            </xpath>
+            <xpath expr="//sheet/group/group[2]/label" position="attributes">
+                <attribute name="invisible">True</attribute>
+            </xpath>
+            <xpath expr="//sheet/group/group[2]/div" position="attributes">
+                <attribute name="invisible">True</attribute>
+            </xpath>
+        </field>
+    </record>
+</odoo>