[MERGE]
authorHarry (Open ERP) <hmo@tinyerp.com>
Thu, 4 Mar 2010 13:28:44 +0000 (18:58 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Thu, 4 Mar 2010 13:28:44 +0000 (18:58 +0530)
commitc8c3ba54dcd9b7f4dbf7a19dd9809eda51507ba3
tree741599b18b8a3dff06650d0283b22d72ba1869c9
parenta80207cb64e6856c7b8caa1cd144571b13a81ffc
parent69fb27723d372d51924c3288665abe4c0aee3b44
[MERGE]

bzr revid: hmo@tinyerp.com-20100304132844-patzedhk0a71d5av
addons/sale_crm/sale_crm_view.xml
addons/sale_crm/wizard/makesale.py