Ajay Chauhan (OpenERP) bdeb623399 [IMP]: resolved all conflicts ... bzr revid: cha@tinyerp.com-20120530133024-ex0xf9142j8cn34o		2012-05-30 19:00:24 +05:30
..
i18n	Launchpad automatic translations update.	2012-05-27 04:40:06 +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]all: remove a complexity in openerp and move asset management and Payroll in extra modules	2012-05-18 10:56:05 +05:30
email_template.py	[IMP] adapt po files to label changes, to ease translations	2012-05-10 15:07:51 +02:00
email_template_view.xml	[IMP] : removed button from tree	2012-05-23 16:30:47 +05:30
html2text.py	[IMP] Added missing vim mode lines	2011-11-22 09:51:38 +01:00
res_partner.py	[FIX] crm: rename fields optin, optout to opt_in, opt_out, to make them consistent with opt_out in res.partner (module email_template)	2012-05-08 09:43:38 +02: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	[IMP] base_*, email_template, fetchmail, mail, import_*: remove group_extended	2012-04-25 16:42:58 +02:00