[MERGE] forward port of branch 7.0 up to revid 9668 launchpad_translations_on_behalf_...
authorChristophe Simonis <chs@openerp.com>
Sat, 30 Nov 2013 13:00:14 +0000 (14:00 +0100)
committerChristophe Simonis <chs@openerp.com>
Sat, 30 Nov 2013 13:00:14 +0000 (14:00 +0100)
commit0ac4a8f696d1750bc26e528a0cde41a9a88c140c
treefc645f2f692c7e79ca1e651c76a38c0b64698d3b
parent3a47a73272cece0bdb6569bf558880a7d3bd61e8
parent4fd98907ce7ae8e16aed8a1c176c5b8ed57a0d7f
[MERGE] forward port of branch 7.0 up to revid 9668 launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf

bzr revid: chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp
13 files changed:
addons/account/account.py
addons/account/res_config.py
addons/crm/wizard/crm_lead_to_opportunity.py
addons/crm/wizard/crm_lead_to_opportunity_view.xml
addons/crm_claim/report/crm_claim_report_view.xml
addons/document/document.py
addons/mail/static/src/css/mail.css
addons/purchase/purchase.py
addons/purchase/purchase_view.xml
addons/sale/wizard/sale_line_invoice.py
addons/sale_stock/res_config.py
addons/sale_stock/sale_stock.py
addons/stock/stock.py