[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)
bzr revid: rma@tinyerp.com-20140325135635-rev8asknqwk08svy

1  2 
addons/project/project.py
addons/purchase/purchase.py

Simple merge
Simple merge