change city for city_id

Merged Ariel Caruso requested to merge 12.0-add-fiscaltype into 12.0

Merge request reports