merge addons from odoo
final internal note with calendar