[MERGE] Forward-port saas-3 up to 09ab2d4
authorOlivier Dony <odo@openerp.com>
Wed, 17 Sep 2014 13:15:22 +0000 (15:15 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 17 Sep 2014 13:16:30 +0000 (15:16 +0200)
commitc926b54a49936b75988f4518f07e0b74d17ac1c8
tree05d46f403ca19a69c2788adcf7ac03232447df01
parente04a87e11f500f183d4466e0632a4ba7e4c7fee5
parent09ab2d4109b7b5db4360f3d197b33b3b8f984685
[MERGE] Forward-port saas-3 up to 09ab2d4
addons/point_of_sale/point_of_sale.py
openerp/modules/loading.py
openerp/osv/orm.py