[MERGE] Forward-port of latest 7.0 fixes up to rev 9629 rev-id odo@openerp.com-201311...
authorOlivier Dony <odo@openerp.com>
Thu, 21 Nov 2013 15:42:05 +0000 (16:42 +0100)
committerOlivier Dony <odo@openerp.com>
Thu, 21 Nov 2013 15:42:05 +0000 (16:42 +0100)
commit2cba6a535568471b29fed18bad6fda665ca5d1d1
treecd5fa321d4806d5a9e3a4dfc73d06344e17434f6
parentd602f9de03a3ab45cc4a5494bd47748c8e538307
parent17144e9914eb21e42dcd287b794813ec1cb5ad20
[MERGE] Forward-port of latest 7.0 fixes up to rev 9629 rev-id odo@openerp.com-20131121153230-keie85rmes2zh2o8

bzr revid: chs@openerp.com-20131121112139-aw2ara1i1xymue62
bzr revid: odo@openerp.com-20131121154205-ul9hf9tz3h0x2n7m
24 files changed:
addons/account/edi/invoice_action_data.xml
addons/account_analytic_analysis/account_analytic_analysis_cron.xml
addons/fleet/fleet_view.xml
addons/hr_expense/hr_expense_view.xml
addons/l10n_be/__openerp__.py
addons/l10n_be/account_chart_template.xml
addons/l10n_ch/sterchi_chart/account.xml
addons/l10n_mx/data/account_chart.xml
addons/l10n_pt/account_chart_template.xml
addons/l10n_us/account_chart_template.xml
addons/mail/mail_thread.py
addons/marketing_campaign/marketing_campaign_demo.xml
addons/portal_sale/portal_sale_data.xml
addons/project/project_data.xml
addons/project/project_demo.xml
addons/purchase/edi/purchase_order_action_data.xml
addons/sale/edi/sale_order_action_data.xml
addons/sale/sale_view.xml
addons/sale_stock/sale_stock.py
addons/stock/stock.py
addons/stock/wizard/stock_fill_inventory.py
addons/survey/report/survey_analysis_report.py
addons/survey/report/survey_browse_response.py
addons/survey/report/survey_form.py