[MERGE] merged with main addons
authorBharat R. Devnani (OpenERP) <bde@tinyerp.com>
Tue, 31 Dec 2013 05:25:02 +0000 (10:55 +0530)
committerBharat R. Devnani (OpenERP) <bde@tinyerp.com>
Tue, 31 Dec 2013 05:25:02 +0000 (10:55 +0530)
commitac2ad8e02986fb50daf1c146952085fa73168ea1
tree18ade5f91de1a6bcffc0f7a1c27e0ae398e6409a
parent598d42036566f6cf35b7baf00b822dc500b9486e
parent67e479e96e97be4d9aaba21a19ebf43511407ac8
[MERGE] merged with main addons

bzr revid: bde@tinyerp.com-20131231052502-k8uge2fxeulestpa
addons/purchase/purchase.py
addons/sale_stock/sale_stock.py
addons/stock/stock.py