[MERGE] from trunk
authorchm@openerp.com <>
Mon, 5 May 2014 11:23:14 +0000 (13:23 +0200)
committerchm@openerp.com <>
Mon, 5 May 2014 11:23:14 +0000 (13:23 +0200)
bzr revid: chm@openerp.com-20140505112314-1zbn7ae61mg8xavl

1  2 
addons/sale/sale.py
addons/sale/sale_view.xml

Simple merge
Simple merge