[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9439 revid:dle@openerp...
authorDenis Ledoux <dle@openerp.com>
Tue, 29 Apr 2014 11:27:38 +0000 (13:27 +0200)
committerDenis Ledoux <dle@openerp.com>
Tue, 29 Apr 2014 11:27:38 +0000 (13:27 +0200)
commit79d4c57877e6671026cc394ef9f086503aa6ab36
tree7265a1896b01fb326459208d4ecb6288a931258b
parent3891e0f2aa3b3ecb7f4eacffdea447102a62448c
parentb2e56a0128a3703dede79b40eb8e673fc69f1765
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9439 revid:dle@openerp.com-20140429112147-hqfqd0y487s817n7

bzr revid: dle@openerp.com-20140429112738-y2el246dmd2o2zy9
addons/account_analytic_analysis/account_analytic_analysis.py
addons/gamification/static/src/js/gamification.js
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
addons/sale_stock/sale_stock.py
addons/website_event_sale/models/sale_order.py
addons/website_sale/controllers/main.py
addons/website_sale/models/sale_order.py
addons/website_sale/models/website.py
addons/website_sale/static/src/js/website_sale.js