[MERGE] Update from odoo/10.0

Vauxoo / odoo

Fork of Odoo (formerly OpenERP). [This project is not publically mantained just born for internal usage with some little patches] go to official repository on github.com/odoo/odoo

https://www.odoo.com

Other

9 stars 9 forks source link

[MERGE] Update from odoo/10.0 #240

Closed moylop260 closed 7 years ago

moylop260 commented 7 years ago

Commits dropped:

https://github.com/Vauxoo/odoo/pull/231
- [FIX] Reverting sha 6981320 temporarily due to an error in mexico repository. #231
https://github.com/Vauxoo/odoo/pull/213

dsabrinarg commented 7 years ago

@luistorresm 👍

luistorresm commented 7 years ago

@moylop260

Could you merge, please?

This is related with https://github.com/Vauxoo/enterprise/pull/152.

Regards

moylop260 commented 7 years ago

merged manually