[MERGE] lp: 890156
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 16 Nov 2011 10:44:17 +0000 (11:44 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 16 Nov 2011 10:44:17 +0000 (11:44 +0100)
bzr revid: qdp-launchpad@openerp.com-20111116104417-uye1rsmui836js2d

1  2 
addons/sale/sale.py

Simple merge