[MERGE] OPW 381524 - on picking invoicing, do not invoice scrapped products
authorXavier ALT <xal@openerp.com>
Tue, 6 Mar 2012 15:50:32 +0000 (16:50 +0100)
committerXavier ALT <xal@openerp.com>
Tue, 6 Mar 2012 15:50:32 +0000 (16:50 +0100)
bzr revid: xal@openerp.com-20120306155032-tstgulwdv8i4wg5v

1  2 
addons/stock/stock.py

Simple merge