[MERGE] lp881356
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 15 Feb 2012 17:16:25 +0000 (18:16 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 15 Feb 2012 17:16:25 +0000 (18:16 +0100)
commita9697c5404a53deada56432f8e9a37f3412257f7
treeb672f6bd4c418ca509e33f8fe7a8f6288045afe7
parentefee12a1bb7139ddf8fb67dc3f97be447aa77aa3
parentc4edc796253d021976950cb43a45944c3b84176c
[MERGE] lp881356

lp bug: https://launchpad.net/bugs/881356 fixed

bzr revid: qdp-launchpad@openerp.com-20120215171625-i3zf4nhhjuz82bob
addons/sale/sale.py
addons/stock/stock.py