Christophe Simonis 91aaaec0a5 [MERGE] forward port of branch saas-2 up to revid 9092 dle@openerp.com-20140115165506-yuux9km39gbv7k4n ...

bzr revid: chs@openerp.com-20140115214454-dhl8xzr429co0j5d

2014-01-15 22:44:54 +01:00

..

i18n

Launchpad automatic translations update.

2013-12-31 04:47:45 +00:00

security

[IMP] groups: remove auto-inclusion of admin in groups, and make the inclusion explicit in groups

2012-04-04 11:08:30 +02:00

__init__.py

[MERGE] trunk-v62_marketing_config-jap (config wizard for marketing)

2012-04-20 10:25:59 +02:00

__openerp__.py

[IMP] Channel_id and type field displayed if marketing module installed and in lead form reffered field put inside Misc section.

2012-11-29 19:10:18 +05:30

marketing_demo.xml

…

marketing_view.xml

[FIX] mass_mailing, marketing: menus displayed to employees only (no portal/anonymous). ACL change too.

2014-01-13 16:10:18 +01:00

res_config_view.xml

[MERGE] merged trunk.

2012-08-13 18:06:57 +02:00

res_config.py

[IMP]align multi-line string

2013-09-17 18:38:14 +05:30