[MERGE] Forward-port saas-3 up to b9275da
authorOlivier Dony <odo@openerp.com>
Wed, 13 Aug 2014 15:33:12 +0000 (17:33 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 13 Aug 2014 15:33:12 +0000 (17:33 +0200)
commit2694ed1472c987d8b4e713f62183d5ecd419c58c
tree859105e40e4c59a18f4ca8e0fbc8028e38a4e795
parentff0ab6426a116bb504188764f76b63e4387279b7
parentb9275da8a52255d0fc3f914de9d406612e7dde50
[MERGE] Forward-port saas-3 up to b9275da
addons/account/account_invoice.py
addons/account_followup/account_followup.py
addons/gamification/models/goal.py
addons/portal_sale/portal_sale.py
addons/web/controllers/main.py
addons/web/static/src/js/data_export.js
openerp/osv/fields.py
openerp/osv/orm.py