[MERGE] forward port of branch 8.0 up to 591e329
authorChristophe Simonis <chs@odoo.com>
Tue, 2 Dec 2014 15:18:08 +0000 (16:18 +0100)
committerChristophe Simonis <chs@odoo.com>
Tue, 2 Dec 2014 15:18:08 +0000 (16:18 +0100)
commit1d3f8eba879f02da7fc0bb46c9801029eccbc8c8
tree10ef917de1be8ef9755cba4f3c9ac951af176b18
parent7878b2fd0cb42827b71bd00a1fd8199e73269fe4
parent591e329bb0efe4997677a0bee2e6f3b558e35df8
[MERGE] forward port of branch 8.0 up to 591e329
67 files changed:
addons/account/account_bank_statement.py
addons/account/account_invoice.py
addons/analytic_user_function/analytic_user_function_view.xml
addons/calendar/calendar.py
addons/crm/crm.py
addons/crm/crm_lead_view.xml
addons/crm/report/crm_lead_report_view.xml
addons/crm/report/crm_opportunity_report_view.xml
addons/im_chat/im_chat.py
addons/mass_mailing/models/mass_mailing.py
addons/mrp/mrp_view.xml
addons/mrp/security/ir.model.access.csv
addons/payment/models/payment_acquirer.py
addons/payment/views/payment_acquirer.xml
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/widgets.js
addons/product/pricelist_view.xml
addons/product/product.py
addons/product/product_view.xml
addons/project_timesheet/project_timesheet.py
addons/purchase/purchase.py
addons/purchase/purchase_view.xml
addons/stock/product.py
addons/stock/stock_demo.yml
addons/stock/stock_view.xml
addons/web/controllers/main.py
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass
addons/web/static/src/js/chrome.js
addons/web/static/src/js/search.js
addons/web/static/src/js/view_form.js
addons/web/static/src/js/view_list.js
addons/web/views/webclient_templates.xml
addons/web_calendar/static/src/js/web_calendar.js
addons/web_graph/static/src/js/graph_widget.js
addons/website/models/res_config.py
addons/website/models/website.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/views/res_config.xml
addons/website_blog/data/website_blog_data.xml
addons/website_blog/models/website_blog.py
addons/website_blog/security/ir.model.access.csv
addons/website_blog/views/website_blog_views.xml
addons/website_crm/controllers/main.py
addons/website_forum/controllers/main.py
addons/website_forum/models/forum.py
addons/website_forum/static/src/js/website_forum.js
addons/website_forum/views/website_forum.xml
addons/website_mail/views/website_email_designer.xml
addons/website_sale/controllers/main.py
addons/website_sale/models/sale_order.py
doc/conf.py
doc/reference.rst
openerp/addons/base/ir/ir_qweb.py
openerp/addons/base/ir/ir_ui_view.py
openerp/addons/base/res/res_partner.py
openerp/addons/base/res/res_partner_view.xml
openerp/addons/base/res/res_users.py
openerp/models.py
openerp/service/server.py
openerp/tools/convert.py
openerp/tools/misc.py
setup/win32/setup.nsi