[MRG] merge lp:openobject-addons
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Tue, 13 Aug 2013 10:50:40 +0000 (16:20 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Tue, 13 Aug 2013 10:50:40 +0000 (16:20 +0530)
commit91403dbcb7bbe5ec04a94853e399629454bbb4d5
treeb1a834e73365defd4139d4c18810bbc0fe763d0a
parent40e693aa64b3a6f5db18066a4ea61e6fdb21e9d8
parente8164c9a927ec8339252712bae3bf0a5ca1760e3
[MRG] merge lp:openobject-addons

bzr revid: tpa@tinyerp.com-20130813105040-bzc0jzotlnlwa197
addons/crm/crm.py
addons/crm/i18n/es_AR.po
addons/crm/report/crm_lead_report.py
addons/crm/report/crm_lead_report_view.xml
addons/project/i18n/zh_CN.po
addons/sale_crm/sale_crm_view.xml