[MERGE] with trunk
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Tue, 18 Dec 2012 04:50:09 +0000 (10:20 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Tue, 18 Dec 2012 04:50:09 +0000 (10:20 +0530)
commita972f0181d5b00d62bc03ee318ee6604365eb5d9
treebceebdc732e9c64e5cf89420b370cf45e9a2b037
parent1f2f15c51df7018518dae72709faa493537223ab
parent0b32a15d4140f759c0ecca2f81af30a335f864af
[MERGE] with trunk

bzr revid: fka@tinyerp.com-20121218045009-drt4gjkcnpl5hxxr
addons/crm/crm_lead.py
addons/project/project_data.xml
addons/purchase/purchase.py
addons/sale/sale.py