[MERGE] account: merge with mdi branch related to account customer invoice changes

author Purnendu Singh (OpenERP) <psi@tinyerp.com>

Wed, 29 Feb 2012 10:13:48 +0000 (15:43 +0530)

committer Purnendu Singh (OpenERP) <psi@tinyerp.com>

Wed, 29 Feb 2012 10:13:48 +0000 (15:43 +0530)
author Purnendu Singh (OpenERP) <psi@tinyerp.com>
Wed, 29 Feb 2012 10:13:48 +0000 (15:43 +0530)
committer Purnendu Singh (OpenERP) <psi@tinyerp.com>
Wed, 29 Feb 2012 10:13:48 +0000 (15:43 +0530)
diff --cc addons/account/account_invoice_view.xml
Simple merge
diff --cc addons/account_voucher/account_voucher_pay_invoice.xml
Simple merge
diff --cc addons/account_voucher/voucher_payment_receipt_view.xml
Simple merge
author	Purnendu Singh (OpenERP) <psi@tinyerp.com>
	Wed, 29 Feb 2012 10:13:48 +0000 (15:43 +0530)
committer	Purnendu Singh (OpenERP) <psi@tinyerp.com>
	Wed, 29 Feb 2012 10:13:48 +0000 (15:43 +0530)
		1	2
addons/account/account_invoice_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/account_voucher/account_voucher_pay_invoice.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/account_voucher/voucher_payment_receipt_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history