[MERGE] Forward-port 7.0 up to 23cffab
authorOlivier Dony <odo@openerp.com>
Wed, 13 Aug 2014 15:30:06 +0000 (17:30 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 13 Aug 2014 15:30:06 +0000 (17:30 +0200)
commitb9275da8a52255d0fc3f914de9d406612e7dde50
tree9e6ddad2054cf3da4995763eb14f6cea7fdc1375
parent7aa0376f3ec6e7e8bf1c4fb6fb5581a6f18f985e
parent23cffab1f8cab7f456df56e6f1b002f4fa9b2ef0
[MERGE] Forward-port 7.0 up to 23cffab
addons/account/account_invoice.py
addons/account_followup/account_followup.py
addons/portal_sale/portal_sale.py
addons/portal_sale/security/ir.model.access.csv
addons/portal_sale/security/portal_security.xml
addons/web/controllers/main.py
addons/web/static/src/js/data_export.js
openerp/addons/base/ir/ir_cron.py
openerp/addons/base/res/res_partner_view.xml
openerp/osv/fields.py