merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 24 Dec 2008 15:50:06 +0000 (16:50 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 24 Dec 2008 15:50:06 +0000 (16:50 +0100)
commitc245b591741c60bf00e9d18f7b8b0872369f1ade
treeba6b7596504f2b9b523f2f4d194b7129f6332efe
parentba28a538b9d9a0b2bc5209e265f4db739f69863e
parentdfb4a39b6b67bc6ff7adc7c538b76eeb8019fa50
merge

bzr revid: fp@tinyerp.com-20081224155006-uefgofghmofr1r5g
addons/product/pricelist.py
addons/purchase/purchase.py