50507512cb
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 |
||
|---|---|---|
| .. | ||
| i18n | ||
| report | ||
| security | ||
| test | ||
| wizard | ||
| __init__.py | ||
| __openerp__.py | ||
| crm_lead_view.xml | ||
| partner_geo_assign.py | ||
| res_partner_view.xml | ||