Thibault Delavallée 9cf78e93cc [MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files. ...

bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk

2014-01-16 11:39:10 +01:00

..

controllers

…

data

[IMP] Backport one feature from website: this feature allows to specify a file

2014-01-09 16:45:50 +01:00

doc

…

i18n

Launchpad automatic translations update.

2014-01-06 05:05:03 +00:00

report

…

security

…

static

[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.

2014-01-16 11:39:10 +01:00

tests

[MERGE] Sync with trunk

2013-12-13 10:40:16 +01:00

wizard

[MERGE] forward port of branch saas-2 up to revid 9024 chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp

2013-11-30 14:07:25 +01:00

__init__.py

[IMP] shop: added openchatter on product shop

2014-01-06 14:57:27 +01:00

__openerp__.py

[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9691 rev-id: dle@openerp.com-20131211134120-fco4rlqjh258ba36

2013-12-11 14:43:17 +01:00

ir_attachment.py

[IMP] shop: added openchatter on product shop

2014-01-06 14:57:27 +01:00

mail_alias_view.xml

…

mail_alias.py

[FIX] migrate_to_alias() of mail.alias didn't care about result value of _auto_init

2014-01-06 14:36:00 +01:00

mail_followers_view.xml

…

mail_followers.py

…

mail_group_menu.py

…

mail_group_view.xml

…

mail_group.py

[CLEAN] mail_group: removed mail_post_access modification because it is

2013-12-06 11:01:31 +01:00

mail_mail_view.xml

[MERGE] forward port of branch 7.0 up to revid 9651 chs@openerp.com-20131127104459-jb77x7quwcvtifm7

2013-11-27 12:00:46 +01:00

mail_mail.py

[FIX] email_template: support of email_recipients in send_mail.

2013-12-20 15:46:52 +01:00

mail_message_subtype.py

…

mail_message_subtype.xml

…

mail_message_view.xml

…

mail_message.py

[IMP] shop: added openchatter on product shop

2014-01-06 14:57:27 +01:00

mail_thread_view.xml

…

mail_thread.py

[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.

2014-01-16 11:39:10 +01:00

mail_vote.py

…

res_config_view.xml

…

res_config.py

…

res_partner_view.xml

…

res_partner.py

…

res_users_view.xml

…

res_users.py

[FIX] migrate_to_alias() of mail.alias didn't care about result value of _auto_init

2014-01-06 14:36:00 +01:00

update.py

[IMP] mail: update: call to get_object updated

2013-12-06 11:02:30 +01:00