[MERGE] Merged with lp:addons
authorron@tinyerp.com <>
Mon, 21 Nov 2011 05:49:03 +0000 (11:19 +0530)
committerron@tinyerp.com <>
Mon, 21 Nov 2011 05:49:03 +0000 (11:19 +0530)
commit472ad4e944874e8ce623395a676b470b90a88177
treeeddf5e93b80a8c6e4bd4b34d87f891548f2fada8
parent2964c7a54b9b9cea121fee9335e52969c15e6a4b
parent7dc7a3849087dbb525b227fc1ddb79c7020a92f3
[MERGE] Merged with lp:addons

bzr revid: ron@tinyerp.com-20111121054903-kikfpfc4kg2n1b6w
addons/crm/__openerp__.py
addons/crm/crm.py
addons/crm/crm_lead.py
addons/crm/crm_lead_demo.xml
addons/crm/crm_lead_view.xml
addons/crm/crm_phonecall.py
addons/crm/wizard/crm_opportunity_to_phonecall.py
addons/crm/wizard/crm_opportunity_to_phonecall_view.xml