[MERGE] forward port of 7.0 until revision 9546 (launchpad_translations_on_behalf_of_...
authorMartin Trigaux <mat@openerp.com>
Mon, 28 Oct 2013 16:12:27 +0000 (17:12 +0100)
committerMartin Trigaux <mat@openerp.com>
Mon, 28 Oct 2013 16:12:27 +0000 (17:12 +0100)
commitd5211929b8f3895e0b33211a6ddc662cda2d655d
treed5ac46735932632443df1297a38a17da9f29351e
parentbf29caa576a95048ecd17095df42fbb5cf94d643
parent40c309024c166bda40256d768108dca1748108c2
[MERGE] forward port of 7.0 until revision 9546 (launchpad_translations_on_behalf_of_openerp-20131028054233-15znliqv2eh2jq0i)

bzr revid: mat@openerp.com-20131028161227-rpv6d0unjmg12jgk
addons/account/partner.py
addons/hr_timesheet/hr_timesheet_view.xml
addons/stock/report/report_stock_move.py
addons/stock_invoice_directly/wizard/stock_invoice.py