[MERGE]: Merge with lp:openobject-trunk-dev-addons2
authoratp (Open ERP) <atp@tinyerp.co.in>
Tue, 27 Apr 2010 07:11:33 +0000 (12:41 +0530)
committeratp (Open ERP) <atp@tinyerp.co.in>
Tue, 27 Apr 2010 07:11:33 +0000 (12:41 +0530)
commit657d64ced96e6acccc467ef218c49161cb35936d
treedef7dbf72e967a99ead768fca4fc5b1bb3a9326d
parent66224c872fe8b644a2f85d4d2efe51695ce63508
parentde80d5b71203f841ce7ff7802923940d92428d48
[MERGE]: Merge with lp:openobject-trunk-dev-addons2

bzr revid: atp@tinyerp.co.in-20100427071133-nycpp6bl65615oia
addons/crm/crm.py
addons/crm/crm_view.xml
addons/crm/report/crm_report_view.xml