[MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852...
authorChristophe Simonis <chs@openerp.com>
Tue, 11 Mar 2014 14:52:05 +0000 (15:52 +0100)
committerChristophe Simonis <chs@openerp.com>
Tue, 11 Mar 2014 14:52:05 +0000 (15:52 +0100)
commitd504764eff52354d4993863d72d1342bcdf704fb
tree09b0d87666f8a8e56dad86d7bc53ea092551e0e2
parent96f744b2712fe0bd6f65ac93b4d347b1559123fc
parent3ceefde48942df95000a0b89698ee71a1187fecb
[MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6

bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
25 files changed:
addons/account/account_invoice_view.xml
addons/auth_oauth/controllers/main.py
addons/auth_signup/views/auth_signup_login.xml
addons/crm/crm_lead.py
addons/crm/crm_phonecall_menu.xml
addons/email_template/email_template.py
addons/mail/mail_thread.py
addons/mrp/mrp.py
addons/mrp_repair/__openerp__.py
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/static/src/js/models.js
addons/sale/sale_view.xml
addons/sale_crm/sale_crm_view.xml
addons/website/controllers/main.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.tour.banner.js
addons/website/views/snippets.xml
addons/website/views/website_templates.xml
addons/website_event/views/website_event.xml
addons/website_event_track/views/website_event.xml
addons/website_mail/models/email_template.py
addons/website_sale/controllers/main.py
addons/website_sale/views/website_sale.xml