odoo-colombia/odoo-colombia — pull request #11 by blaggacao (2014-06-15 05:48:57+00:00)
Title: Merge cleanup changes

- Flake cleanup
- `city` -> `city_id` for compatibility. (as acocunt module loads on travis, travis fails because existing test data uses `city` differently