[MERGE] : with trunk
authorajay javiya (OpenERP) <aja@tinyerp.com>
Mon, 3 Mar 2014 06:47:42 +0000 (12:17 +0530)
committerajay javiya (OpenERP) <aja@tinyerp.com>
Mon, 3 Mar 2014 06:47:42 +0000 (12:17 +0530)
commite0f8d3f80a1feabe31acf5b76134c9bee2013354
treeecf0d9fc697fed9470b86c543c55a5b0031f7bb5
parent1fbe3f9b077b9bedb8022cb6c6191b854e4fd086
parent7851c9f825f0e1133b928ce66bc7d3d6056b54da
[MERGE] : with trunk

bzr revid: aja@tinyerp.com-20140303064742-klvoa7t5l6wnzrg9
addons/calendar/base_calendar_view.xml
addons/crm/__openerp__.py
addons/crm/crm_lead.py
addons/crm/crm_lead_view.xml
addons/crm/crm_phonecall_menu.xml
addons/crm/crm_phonecall_view.xml
addons/crm/res_config.py
addons/crm/res_config_view.xml
addons/crm/security/crm_security.xml
addons/crm/test/lead2opportunity2win.yml
addons/crm/wizard/crm_phonecall_to_opportunity.py