[MERGE]: Merged with parent branch

addons/account/account.py

addons/account_tax_include/invoice_tax_incl.py

addons/crm/crm_calendar.py

addons/crm/wizard/wizard_cal_export.py

addons/mrp_jit/__terp__.py

addons/product/i18n/fr.po

addons/product/i18n/nl.po

addons/product/product.py

addons/product/product_view.xml

addons/project_calendar/project_calendar.py

addons/project_calendar/wizard/wizard_cal_export.py

addons/project_mrp/__terp__.py

addons/purchase/purchase.py

addons/sale/sale.py

addons/stock/stock.py