Olivier Dony ee77b351b4 [MERGE] Latest fixes from 6.1 ...

bzr revid: odo@openerp.com-20120322143654-w7etvdnq4z5tg6bt

2012-03-22 15:36:54 +01:00

..

i18n

Launchpad automatic translations update.

2012-03-22 06:23:52 +00:00

security

[IMP] Security Rule: removed duplicates due to inheritancies of groups

2011-12-12 19:11:13 +01:00

wizard

[FIX] email_template: don't re-encode attachments copied from template'

2012-03-22 15:11:04 +01:00

__init__.py

[IMP] email_template: added opt_out flag on res.partner

2011-10-05 13:38:46 +02:00

__openerp__.py

[IMP] manifest: renamed active to auto_install.

2012-01-30 11:18:37 +01:00

email_template_view.xml

[IMP] mail,email_template: improved views, assert missing email_from

2012-02-13 15:35:31 +01:00

email_template.py

[FIX] email_template: ensure non-empty context when rendering template'

2012-03-22 15:11:53 +01:00

html2text.py

[IMP] Added missing vim mode lines

2011-11-22 09:51:38 +01:00

res_partner_demo.yml

[IMP] email_template: added opt_out flag on res.partner

2011-10-05 13:38:46 +02:00

res_partner_view.xml

[FIX] email_template: typo in partner view

2011-10-06 13:33:53 +02:00

res_partner.py

[MERGE] Missing modelines, requested and provided by Lionel Sausin (Numerigraphe)

2011-11-24 16:50:58 +01:00