[MERGE] Merge lp:~openerp-dev/openobject-addons/ron-dev-addons
authorSbh (OpenERP) <sbh@tinyerp.com>
Wed, 29 Dec 2010 11:27:14 +0000 (16:57 +0530)
committerSbh (OpenERP) <sbh@tinyerp.com>
Wed, 29 Dec 2010 11:27:14 +0000 (16:57 +0530)
commit4367b52c566e59eb08ee8a3af3d204740e990ebc
treefce54c7028346648146d744ee9be59e6c75211f2
parent6e725393dee682e88c56ec09107e3d1b6207b238
parentc0771e85542a7a8e52b069316bdceff2d8bd96c6
[MERGE] Merge lp:~openerp-dev/openobject-addons/ron-dev-addons

bzr revid: sbh@tinyerp.com-20101229112714-nwewmpad0dkwurkf
addons/product/pricelist.py
addons/purchase/purchase_view.xml