[MERGE] Forward-port saas-5 up to f9bcd67
authorOlivier Dony <odo@openerp.com>
Wed, 17 Sep 2014 14:38:51 +0000 (16:38 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 17 Sep 2014 14:39:06 +0000 (16:39 +0200)
commite5bff82aff5f906f76eac163c26dad3d798a2cb5
treed7d9433b958d54efad5f0c1d16587a22c0d70e9c
parent10c3b8c3c8f4b82301c03ea4fd6d910226cbd235
parentf9bcd67f5ba0d5f4f0b3f783566eac7c1ff1876b
[MERGE] Forward-port saas-5 up to f9bcd67
addons/auth_ldap/users_ldap.py
addons/point_of_sale/point_of_sale.py
addons/website_sale/controllers/main.py
addons/website_sale/models/sale_order.py
openerp/models.py
openerp/modules/loading.py