[MERGE] merge with latest trunk
authorRandhir Mayatra rma-openerp <rma@tinyerp.com>
Tue, 25 Mar 2014 13:56:35 +0000 (19:26 +0530)
committerRandhir Mayatra rma-openerp <rma@tinyerp.com>
Tue, 25 Mar 2014 13:56:35 +0000 (19:26 +0530)
commitc086291ddd52eec96f0d9d481b1e0d92da0d2602
tree58e4e543ca0aa408a5f2277347eecefeda1bed92
parent231556d78c99a61466797621ce8a948165a0b59b
parentc2e7a69ebaa378e290df64cd4d144669e24a602c
[MERGE] merge with latest trunk

bzr revid: rma@tinyerp.com-20140325135635-rev8asknqwk08svy
addons/project/project.py
addons/purchase/purchase.py