[MERGE] Merge with lp:openobject-addons
authorBhumika (OpenERP) <sbh@tinyerp.com>
Wed, 1 Jun 2011 10:39:49 +0000 (16:09 +0530)
committerBhumika (OpenERP) <sbh@tinyerp.com>
Wed, 1 Jun 2011 10:39:49 +0000 (16:09 +0530)
commit3a6010b7069919ed005b1ab3eb87c4477d6afdf7
treee2671235e78e86e1af5229fa48ef894023f8721a
parentd27ae843a36d53802a5afea2b1c60d625bcc1140
parent7d60eddba8f89c00c5f3cad205c478f84f72e769
[MERGE] Merge with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20110601103949-lhzpnstpexkxca91
addons/crm/crm.py
addons/crm/crm_lead.py
addons/crm/crm_meeting_menu.xml
addons/crm/crm_meeting_view.xml
addons/crm/crm_phonecall.py
addons/crm/wizard/crm_lead_to_partner.py
addons/crm/wizard/crm_merge_opportunities.py