[MERGE] forward port of 7.0 until revision 9546 (launchpad_translations_on_behalf_of_...

author Martin Trigaux <mat@openerp.com>

Mon, 28 Oct 2013 16:12:27 +0000 (17:12 +0100)

committer Martin Trigaux <mat@openerp.com>

Mon, 28 Oct 2013 16:12:27 +0000 (17:12 +0100)
author Martin Trigaux <mat@openerp.com>
Mon, 28 Oct 2013 16:12:27 +0000 (17:12 +0100)
committer Martin Trigaux <mat@openerp.com>
Mon, 28 Oct 2013 16:12:27 +0000 (17:12 +0100)
diff --cc addons/account/partner.py
Simple merge
diff --cc addons/hr_timesheet/hr_timesheet_view.xml
Simple merge
diff --cc addons/stock/report/report_stock_move.py
Simple merge
diff --cc addons/stock_invoice_directly/wizard/stock_invoice.py
Simple merge
author	Martin Trigaux <mat@openerp.com>
	Mon, 28 Oct 2013 16:12:27 +0000 (17:12 +0100)
committer	Martin Trigaux <mat@openerp.com>
	Mon, 28 Oct 2013 16:12:27 +0000 (17:12 +0100)
		1	2
addons/account/partner.py	patch \|	diff1 \|	diff2 \|	blob \| history
addons/hr_timesheet/hr_timesheet_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/stock/report/report_stock_move.py	patch \|	diff1 \|	diff2 \|	blob \| history
addons/stock_invoice_directly/wizard/stock_invoice.py	patch \|	diff1 \|	diff2 \|	blob \| history