[MERGE] OPW 576019: sale/purchase: when changing SO or PO line product, use product...

author Xavier ALT <xal@openerp.com>

Tue, 9 Oct 2012 12:16:14 +0000 (14:16 +0200)

committer Xavier ALT <xal@openerp.com>

Tue, 9 Oct 2012 12:16:14 +0000 (14:16 +0200)
author Xavier ALT <xal@openerp.com>
Tue, 9 Oct 2012 12:16:14 +0000 (14:16 +0200)
committer Xavier ALT <xal@openerp.com>
Tue, 9 Oct 2012 12:16:14 +0000 (14:16 +0200)
diff --cc addons/purchase/purchase.py
Simple merge
diff --cc addons/purchase/purchase_view.xml
Simple merge
diff --cc addons/sale/sale.py
Simple merge
diff --cc addons/sale/sale_view.xml
Simple merge
author	Xavier ALT <xal@openerp.com>
	Tue, 9 Oct 2012 12:16:14 +0000 (14:16 +0200)
committer	Xavier ALT <xal@openerp.com>
	Tue, 9 Oct 2012 12:16:14 +0000 (14:16 +0200)
		1	2
addons/purchase/purchase.py	patch \|	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	patch \|	diff1 \|	diff2 \|	blob \| history
addons/sale/sale_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history