projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66224c8 de80d5b)
[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)
bzr revid: atp@tinyerp.co.in-20100427071133-nycpp6bl65615oia

1  2 
addons/crm/crm.py patch | diff1 | diff2 | blob | history
addons/crm/crm_view.xml patch | diff1 | diff2 | blob | history
addons/crm/report/crm_report_view.xml patch | diff1 | diff2 | blob | history

diff --cc addons/crm/crm.py
Simple merge
diff --cc addons/crm/crm_view.xml
Simple merge
diff --cc addons/crm/report/crm_report_view.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.