[MERGE]Latest trunk
authordle@openerp.com <>
Mon, 17 Dec 2012 08:48:28 +0000 (09:48 +0100)
committerdle@openerp.com <>
Mon, 17 Dec 2012 08:48:28 +0000 (09:48 +0100)
commitd0db750bfd260103279e00ec75e5a4b890b9611a
tree172d2d3771324f1fdb1a553da74b0bc6f0a23e48
parent70a0215a300eed7186a5ef759fac48e3b27192b8
parentfc4ad4f8715b776115ab6939a3ec5ddbc7f7426a
[MERGE]Latest trunk

bzr revid: dle@openerp.com-20121216155740-l5pf92r3nwubs2et
bzr revid: dle@openerp.com-20121217084828-a6yqkokxmb5gkyqr
addons/stock/stock.py