Merge lp:~vauxoo/openerp-mexico-localization/7.0_l10n_mx_partner_address-bug_240316-jc into lp:openerp-mexico-localization/7.0

[Juan Carlos Hernandez]

=== modified file 'l10n_mx_partner_address/country_data.xml'
--- l10n_mx_partner_address/country_data.xml	2013-02-13 23:07:40 +0000
+++ l10n_mx_partner_address/country_data.xml	2013-12-07 02:03:29 +0000
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
         <record id="base.mx" model="res.country">
-            <field name="address_format" eval="'%(l10n_mx_street3)s\n%(l10n_mx_street4)s\n%(l10n_mx_city2)s'" />
+            <field name="address_format" eval="'%(street)s %(l10n_mx_street3)s %(l10n_mx_street4)s\n%(street2)s %(city)s %(l10n_mx_city2)s\n%(state_name)s %(country_name)s %(zip)s'"/>
         </record>
     </data>
 </openerp>

=== modified file 'l10n_mx_partner_address/partner_address.py'
--- l10n_mx_partner_address/partner_address.py	2013-11-01 01:56:58 +0000
+++ l10n_mx_partner_address/partner_address.py	2013-12-07 02:03:29 +0000
@@ -80,7 +80,7 @@
             if name == 'city_id':
                 city = '<field name="city" modifiers="{&quot;invisible&quot;: true}" placeholder="%s" style="width: 50%%"/><field name="city_id" on_change="onchange_city(city_id)" placeholder="%s" style="width: 40%%"/>' % (city2, city2)
         layouts = {
-            '%(l10n_mx_street3)s\n%(l10n_mx_street4)s\n%(l10n_mx_city2)s': """
+            '%(street)s %(l10n_mx_street3)s %(l10n_mx_street4)s\n%(street2)s %(city)s %(l10n_mx_city2)s\n%(state_name)s %(country_name)s %(zip)s': """
                     <group>
                         <group>
                             <label for="type" attrs="{'invisible': [('parent_id','=', False)]}"/>