Merge branch '12-RV-ZOrder-dep-region' into '12.0'

Reorder dep et région

See merge request !12

views/res_partner.xml

@@ -333,11 +333,11 @@
                                     <field name="country_id" placeholder="Pays" class="o_address_country" options='{"no_open": True, "no_create": True}'
                                         attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')]}" modifiers="{'readonly':[['project_status', '=', '6_suivi']]}"/>
                                 </div>
+                                <field name="zip_departement" string="N° de département" />
+                                <field name="region" />                               
                                 <field name="phone" widget="phone" string="Téléphone 1" attrs="{'required':['|', ('project_status','in',('4_adhesion', '5_cg')), '&amp;', ('write_date', '=', False), ('project_status', '=', '6_suivi')]}"/>
                                 <field name="mobile" widget="phone" string="Téléphone 2" attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}"/>
                                 <field name="email" widget="email" string="E-mail"/>
-                                <field name="zip_departement" string="N° de département" />
-                                <field name="region" />
                                 <field name="website" widget="url" attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic'))]}"/>
                                 <label for='facebook' class="oe_read_only" string="Réseaux sociaux" attrs="{'invisible':[('facebook','=',False),('linkedin','=',False),('twitter','=',False),('instagram','=',False)]}"/>
                                 <div >