Thibault Francois 33765897a3 [MERGE][FIX] merge from trunk + fixes conflict ...

bzr revid: tfr@openerp.com-20110224150309-nujh3109r295yc9b

2011-02-24 16:03:09 +01:00

..

i18n

Launchpad automatic translations update.

2011-02-03 04:45:26 +00:00

security

[MERGE] my-addons

2011-02-14 17:32:31 +01:00

wizard

[IMP] : Added context=None on methods used for _constraints and replaced context={} with context=None.

2010-11-19 19:18:01 +05:30

__init__.py

[FIX] changed the copyright as requested by sharoon

2010-09-15 14:32:13 +02:00

__openerp__.py

[IMP] Add the missing certificates

2011-01-17 11:26:16 +01:00

email_template_account_view.xml

[FIX] Email_template : Corrected context of action

2011-02-07 17:02:52 +05:30

email_template_account.py

[MERGE]: Merged with trunk-addons.

2010-12-06 18:41:02 +05:30

email_template_mailbox_view.xml

[FIX] Email_template : Corrected context of action

2011-02-07 17:02:52 +05:30

email_template_mailbox.py

[MERGE] backport of email_template fix from trunk

2011-01-20 15:03:04 +01:00

email_template_scheduler_data.xml

[IMP]: email_template: Changed number of calls to -1 in scheduler

2010-08-25 12:55:58 +05:30

email_template_view.xml

[MOD/IMP] crm,stock,marketing_campaign,stock : Usebility Improvement in Icon

2010-10-27 18:38:17 +05:30

email_template_workflow.xml

[REM] all: modules: removed all remaining references to res.roles, replaced by specific res.groups

2010-10-14 02:02:58 +02:00

email_template.py

[FIX] email template mailbox from field

2011-01-13 14:02:17 +01:00

html2text.py

[IMP] email_template: review + many improvements:

2010-08-18 17:22:27 +02:00