[MERGE] forward port of branch 8.0 up to 2b192be
authorChristophe Simonis <chs@odoo.com>
Thu, 16 Oct 2014 14:04:39 +0000 (16:04 +0200)
committerChristophe Simonis <chs@odoo.com>
Thu, 16 Oct 2014 14:04:39 +0000 (16:04 +0200)
commit52fee2811d658031a34257b911b1d2b40bfa0c04
tree61a625efad5e5ffe237e712bf1db2a840b71cb4a
parent904adc8b51abd3a0fc29c979884f845d6641da3c
parent2b192bef2242c71d0ff3a45b9efb9e717fd364c4
[MERGE] forward port of branch 8.0 up to 2b192be
57 files changed:
README.md
addons/account/account_bank_statement.py
addons/account/account_invoice.py
addons/account/res_config.py
addons/account_analytic_analysis/account_analytic_analysis.py
addons/calendar/calendar.py
addons/crm/crm_lead.py
addons/event/event.py
addons/hr_holidays/hr_holidays.py
addons/mrp/mrp.py
addons/point_of_sale/point_of_sale_view.xml
addons/point_of_sale/static/src/js/models.js
addons/point_of_sale/static/src/js/screens.js
addons/point_of_sale/static/src/js/widget_base.js
addons/point_of_sale/static/src/xml/pos.xml
addons/product/product.py
addons/product/product_view.xml
addons/project/project.py
addons/purchase/purchase.py
addons/purchase/purchase_view.xml
addons/stock/static/src/js/widgets.js
addons/stock/stock.py
addons/stock_landed_costs/stock_landed_costs_view.xml
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass
addons/web/static/src/js/openerpframework.js
addons/web/static/src/js/view_form.js
addons/web/static/src/js/views.js
addons/web/static/src/xml/base.xml
addons/web_kanban/static/src/js/kanban.js
addons/website/models/ir_http.py
addons/website/models/ir_qweb.py
addons/website/static/src/css/website.css
addons/website/static/src/css/website.sass
addons/website/static/src/js/website.editor.js
addons/website/static/src/js/website.js
addons/website/static/src/js/website.snippets.editor.js
addons/website/static/src/xml/website.editor.xml
addons/website/views/snippets.xml
addons/website_event/data/event_demo.xml
addons/website_event/models/event.py
addons/website_event_sale/static/src/js/website.tour.event_sale.js
addons/website_membership/views/website_membership.xml
addons/website_quote/data/website_quotation_data.xml
addons/website_quote/models/order.py
addons/website_quote/views/website_quotation.xml
addons/website_sale/controllers/main.py
addons/website_sale/views/templates.xml
doc/conf.py
openerp/addons/base/ir/ir_attachment.py
openerp/addons/base/ir/ir_model.py
openerp/addons/base/ir/ir_qweb.py
openerp/addons/base/ir/ir_ui_view.py
openerp/addons/base/res/res_users.py
openerp/models.py
openerp/tools/config.py
openerp/tools/mail.py