[MERGE] forward port of branch 8.0 up to c92e70b
authorChristophe Simonis <chs@odoo.com>
Mon, 17 Nov 2014 16:31:12 +0000 (17:31 +0100)
committerChristophe Simonis <chs@odoo.com>
Mon, 17 Nov 2014 16:31:12 +0000 (17:31 +0100)
commitd64fe8279b4a1d3083a87b7e5fb211ddbbae50ca
tree207e10e9f6f69206862c6329a5dcd25be5d15f9b
parentb2563509ffd89fdadc1256cb8118d7106f36e2e3
parentc92e70b929376ba742ea17187ec521cf706302e5
[MERGE] forward port of branch 8.0 up to c92e70b
20 files changed:
addons/account/account.py
addons/account_voucher/account_voucher.py
addons/crm/crm_lead.py
addons/fleet/fleet.py
addons/hr_recruitment/hr_recruitment.py
addons/hr_timesheet/security/ir.model.access.csv
addons/mrp/mrp.py
addons/point_of_sale/static/src/css/pos.css
addons/point_of_sale/static/src/js/models.js
addons/product/product.py
addons/project_timesheet/project_timesheet.py
addons/purchase/purchase.py
addons/sale/sale.py
addons/stock/stock.py
addons/stock/stock_view.xml
addons/web/static/src/js/view_form.js
addons/website/views/website_templates.xml
addons/website_sale/controllers/main.py
openerp/addons/base/ir/ir_model.py
openerp/models.py