Merge lp:~acysos-team/openerp-spain/openerp-spain-7.0-fix-toponyms into lp:~openerp-spain-team/openerp-spain/7.0

[Ignacio Ibeas (www.acysos.com)]

Solución al Bug #1329877

Saludos

[Ana Juaristi Olalde (ajuaristio)]

review: Approve

[Pedro Manuel Baeza (pedro.baeza)]

Gracias, Ignacio. Paso a hacer el merge.

Un saludo.

review: Approve (code review)

=== modified file 'l10n_es_toponyms/wizard/l10n_es_toponyms_wizard.xml'
--- l10n_es_toponyms/wizard/l10n_es_toponyms_wizard.xml	2014-03-06 00:06:18 +0000
+++ l10n_es_toponyms/wizard/l10n_es_toponyms_wizard.xml	2014-06-13 18:23:24 +0000
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="base.res_config_installer"/>
             <field name="arch" type="xml">
                 <data>
-                    <form position="attributes" version="7.0">
+                    <form position="attributes">
                         <attribute name="string">Spanish states and cities configuration</attribute>
                     </form>
                     <separator string="title" position="replace">