[MERGE]
authorFabien Pinckaers <fp@tinyerp.com>
Sat, 13 Oct 2012 10:36:54 +0000 (12:36 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Sat, 13 Oct 2012 10:36:54 +0000 (12:36 +0200)
commitcf34e32f8cf87de5b2c40fdc72e514027c97c838
treef2473005706ba391290ae1539803fb7e9d22c46c
parente82d0a3b8a19117b6e6557490ddf98c7667947a9
parentcd07d25ffee548cc11cd0155250d0fa4abf75986
[MERGE]

bzr revid: fp@tinyerp.com-20121013103654-l2v059f12hpmt83u
addons/sale/sale.py