[MERGE] forward port of branch saas-5 up to 0739bc4
authorDenis Ledoux <dle@odoo.com>
Mon, 11 Aug 2014 13:52:15 +0000 (15:52 +0200)
committerDenis Ledoux <dle@odoo.com>
Mon, 11 Aug 2014 13:58:02 +0000 (15:58 +0200)
commitae65be2b2ae98860f70a7e6f3d7679c40ea9bd93
tree15529b8a6658361866b94af8616732f9c317ba0d
parentc64b07736204c0f9f575ee167879ccbdf4603645
parent0739bc4edabab7e74571087c01a2da68ccadb10e
[MERGE] forward port of branch saas-5 up to 0739bc4
28 files changed:
addons/account/account_invoice.py
addons/account/report/account_invoice_report_view.xml
addons/account/wizard/account_fiscalyear_close.py
addons/account_analytic_plans/account_analytic_plans.py
addons/account_voucher/account_voucher.py
addons/analytic/analytic.py
addons/calendar/calendar.py
addons/calendar/calendar_view.xml
addons/crm/base_partner_merge.py
addons/crm_claim/crm_claim_view.xml
addons/email_template/email_template.py
addons/mail/mail_followers.py
addons/mail/static/src/xml/mail.xml
addons/point_of_sale/point_of_sale_view.xml
addons/point_of_sale/static/src/xml/pos.xml
addons/portal_sale/portal_sale_data.xml
addons/stock/stock.py
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass
addons/web/static/src/js/view_form.js
addons/web_kanban/static/src/js/kanban.js
addons/website/controllers/main.py
addons/website/models/website.py
addons/website/views/website_templates.xml
addons/website_quote/models/order.py
openerp/addons/base/ir/ir_cron.py
openerp/report/report_sxw.py
openerp/tools/yaml_import.py