[MRG] merge with lp:openobject-addons
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Fri, 11 Oct 2013 06:12:03 +0000 (11:42 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Fri, 11 Oct 2013 06:12:03 +0000 (11:42 +0530)
commit0d840256c56a1ced574be83160c59923e464ffba
tree83b63fca43aef15bb2a97202d205b29a971cd5e8
parentda358b54ab12b175d673a067132eaa5df16af449
parent5050231a9c0d496a557e1bb28e122c0084469ea4
[MRG] merge with lp:openobject-addons

bzr revid: tpa@tinyerp.com-20131011061203-z13xuqw5fzznr6qc
addons/crm/crm.py
addons/sale_crm/sale_crm.py
addons/sale_crm/sale_crm_view.xml