Commit Graph

8 Commits

Author SHA1 Message Date
Olivier Dony 50507512cb [MERGE] latest trunk
This was a helluva merge, with hundreds of conflicts resolved manually!!
I hope I did not break too many things, but a full review of the mail-related
features (where most of the conflicts occurred) must still be done before
this feature branch can be merged.

bzr revid: odo@openerp.com-20110809234428-3dsvxrt6t54ju0cf
2011-08-10 01:44:28 +02:00
Olivier Dony 3e6b0297d0 [IMP] crm*: update crm modules to new mail module (wip)
bzr revid: odo@openerp.com-20110722182337-5irz3g2qva0cf45e
2011-07-22 20:23:37 +02:00
AVP(Axelor) cc3d7333c8 [FIX][IMP] all modules improvement.
bzr revid: amp@tinyerp.com-20110429084948-x0pny8n2ersc4h8m
2011-04-29 14:19:48 +05:30
uco (OpenERP) 6dd290e824 [REF]: Replace the condition 'if not context' with 'if context is None'.
bzr revid: uco@tinyerp.com-20101123070505-9i2lrqhgxzaii3zn
2010-11-23 12:35:05 +05:30
uco (OpenERP) 12fcd1be2f [IMP] : Added context=None on methods used for _constraints and replaced context={} with context=None.
bzr revid: uco@tinyerp.com-20101119134801-974ev29j4tu46pq2
2010-11-19 19:18:01 +05:30
uco (OpenERP) eccc1d33b2 [REF] copyrights: Replaced 'GNU General Public License' with 'GNU Affero General Public License'
bzr revid: uco@tinyerp.com-20101028065418-ahi6poaxn1aa5dmp
2010-10-28 12:24:18 +05:30
Stephane Wirtel fb3ef7a2f4 [FIX] Change the year of the copyright
bzr revid: stephane@openerp.com-20100112091839-a6p7tenhb4e4zxyx
2010-01-12 10:18:39 +01:00
rpa (Open ERP) 6e24064d33 [IMP]: Merged crm and crm_configuration modules
bzr revid: rpa@tinyerp.com-20091204141517-kz8gmgih8kbtge6e
2009-12-04 19:45:17 +05:30