Merge lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_partner_address_placeholder_dev_carlos into lp:openerp-mexico-localization/7.0

[Juan Carlos Hernandez]

se corrigió la traducción para el modulo l10n_mx_partner_address para la direccion del partner y de la compañia

[Moisés López - http://www.vauxoo.com (moylop260)]

Cuando se usa la funcion para traducir _('Texto') solo se debe de mandar la cadena que se quiere traducir. No se le debe de pasar código fuente xml.

Por ejemplo, _("placeholder='Locality...'")
Debería de ser: _("Locality...")
Es decir, solo se traduce el elemento Locality, no se debe de traducir placeholder porque esto es un token.

De igual forma, con el siguiente texto:
+ _("Returns the list of the address fields that synchronizes from the parent when the flag is set use_parent_address.")
Este documentación de la función, esto no se muestra en ningun lado en OpenERP, solo es para python y no lo mostrará traducido. dejarlo así:
"Returns the list of the address fields that synchronizes from the parent when the flag is set use_parent_address."

review: Needs Fixing

[Moisés López - http://www.vauxoo.com (moylop260)]

Asegurarse de que primero aparezca el número exterior y luego el número interior (en ese orden) en la vista y no al revés.

review: Needs Fixing

[lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_partner_address_placeholder_dev_carlos]

273. By Juan Carlos Hernandez on 2013-09-09

[MERGE]

274. By Juan Carlos Hernandez on 2013-09-09

[MERGE]

275. By Juan Carlos Hernandez on 2013-09-09

[IMP]

276. By Juan Carlos Hernandez on 2013-09-10

[IMP][l10n_mx_partner_address]fix translation without placehorlder

277. By Juan Carlos Hernandez on 2013-09-10

[IMP][l10n_mx_partner_address]fix es.po and revert in res_company.py

[Moisés López - http://www.vauxoo.com (moylop260)]

Está marcando este problema
https://docs.google.com/file/d/0BwPeHBuUYqNsZlFKRFpSdk5OdU0/edit?usp=drivesdk

review: Needs Fixing

[lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_partner_address_placeholder_dev_carlos]

278. By Juan Carlos Hernandez on 2013-09-11

[MERGE]

[Juan Carlos Hernandez (openerp1)]

Moy.
Ese es porque le faltan de llenar esos campos, los lleno con data demo?

2013/9/11 Moisés López - http://www.vauxoo.com <email address hidden>

> Review: Needs Fixing
>
> Está marcando este problema
>
> https://docs.google.com/file/d/0BwPeHBuUYqNsZlFKRFpSdk5OdU0/edit?usp=drivesdk
> --
>
> https://code.launchpad.net/~vauxoo/openerp-mexico-localization/7.0-l10n_mx_partner_address_placeholder_dev_carlos/+merge/182779
> You proposed
> lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_partner_address_placeholder_dev_carlos
> for merging.
>

[lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_partner_address_placeholder_dev_carlos]

279. By Juan Carlos Hernandez on 2013-09-11

[ADD][l10n_mx_company_multi_address_demo]add data demo for state and country and your city

[Moisés López - http://www.vauxoo.com (moylop260)]

Sí por favor.

2013/9/11 Juan Carlos Hernandez Funes <email address hidden>

> Moy.
> Ese es porque le faltan de llenar esos campos, los lleno con data demo?
>
>
> 2013/9/11 Moisés López - http://www.vauxoo.com <email address hidden>
>
> > Review: Needs Fixing
> >
> > Está marcando este problema
> >
> >
> https://docs.google.com/file/d/0BwPeHBuUYqNsZlFKRFpSdk5OdU0/edit?usp=drivesdk
> > --
> >
> >
> https://code.launchpad.net/~vauxoo/openerp-mexico-localization/7.0-l10n_mx_partner_address_placeholder_dev_carlos/+merge/182779
> > You proposed
> >
> lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_partner_address_placeholder_dev_carlos
> > for merging.
> >
>
> --
>
> https://code.launchpad.net/~vauxoo/openerp-mexico-localization/7.0-l10n_mx_partner_address_placeholder_dev_carlos/+merge/182779
> You are reviewing the proposed merge of
> lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_partner_address_placeholder_dev_carlos
> into lp:openerp-mexico-localization/7.0.
>

--
Moisés López Calderón
Vauxoo - OpenERP's Gold Partner
mobile: [phone]
Tel: [phone]
skype: moylop260
web: http://www.vauxoo.com
twitter: @moylop260
            @vauxoo

[lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_partner_address_placeholder_dev_carlos]

280. By Juan Carlos Hernandez on 2013-09-12

[MERGE]

[Moisés López - http://www.vauxoo.com (moylop260)]

Hacer el siguiente cambio

ANTES
locality = _("'Locality...'")
placeholder= %s %(locality)

CAMBIO
locality = _('Locality...')
placeholder="%s"%(locality)

review: Needs Fixing

[lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_partner_address_placeholder_dev_carlos]

281. By Juan Carlos Hernandez on 2013-09-12

[IMP][l10n_mx_partner_address]fix translate

[Moisés López - http://www.vauxoo.com (moylop260)]

Aprobado

review: Approve

=== modified file 'l10n_mx_company_multi_address/demo/l10n_mx_company_multi_address_demo.xml'
--- l10n_mx_company_multi_address/demo/l10n_mx_company_multi_address_demo.xml	2013-08-05 18:35:43 +0000
+++ l10n_mx_company_multi_address/demo/l10n_mx_company_multi_address_demo.xml	2013-09-12 22:20:12 +0000
@@ -28,6 +28,9 @@
         
         <record id="base.main_company" model="res.company">
             <field name="address_invoice_parent_company_id" ref="main_mx_address_company"/>
+            <field name="city">tu ciudad</field>
+            <field name="state_id" ref="l10n_mx_states.res_country_state_mx_gto" model="res.country.state"/>
+            <field name="country_id" ref="base.mx"/>
         </record>
 
     </data>

=== modified file 'l10n_mx_partner_address/i18n/es.po'
--- l10n_mx_partner_address/i18n/es.po	2013-08-31 05:31:25 +0000
+++ l10n_mx_partner_address/i18n/es.po	2013-09-12 22:20:12 +0000
@@ -1,48 +1,132 @@
-# Spanish translation for openerp-mexico-localization
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openerp-mexico-localization package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_mx_partner_address
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openerp-mexico-localization\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-10-29 17:44+0000\n"
-"PO-Revision-Date: 2013-08-07 17:09+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish <[e-mail]>\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-10 00:25+0000\n"
+"PO-Revision-Date: 2013-09-10 00:25+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-31 05:31+0000\n"
-"X-Generator: Launchpad (build 16750)\n"
-
-#. module: l10n_mx_partner_address
-#: field:res.partner.address,city2:0
-msgid "City2"
-msgstr ""
-
-#. module: l10n_mx_partner_address
-#: field:res.partner.address,street3:0
-msgid "Street3"
-msgstr ""
-
-#. module: l10n_mx_partner_address
-#: field:res.partner.address,street4:0
-msgid "Street4"
-msgstr ""
-
-#. module: base
-#: field:res.partner.address,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base
-#: field:res.partner.address,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base
-#: field:res.partner.address,state_id:0
-msgid "Fed. State"
-msgstr ""
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_mx_partner_address
+#: code:addons/l10n_mx_partner_address/partner_address.py:66
+#, python-format
+msgid "Street..."
+msgstr "Calle..."
+
+#. module: l10n_mx_partner_address
+#: help:res.company,l10n_mx_street4:0
+#: help:res.partner,l10n_mx_street4:0
+msgid "Internal number of the partner address"
+msgstr "Número interior de la dirección de la empresa"
+
+#. module: l10n_mx_partner_address
+#: code:addons/l10n_mx_partner_address/partner_address.py:69
+#, python-format
+msgid "State"
+msgstr "Estado"
+
+#. module: l10n_mx_partner_address
+#: code:addons/l10n_mx_partner_address/partner_address.py:70
+#, python-format
+msgid "No External..."
+msgstr "No Exterior..."
+
+#. module: l10n_mx_partner_address
+#: code:addons/l10n_mx_partner_address/partner_address.py:67
+#, python-format
+msgid "Colony..."
+msgstr "Colonia..."
+
+#. module: l10n_mx_partner_address
+#: view:res.company:0
+msgid "No. Internal..."
+msgstr "No. Interior..."
+
+#. module: l10n_mx_partner_address
+#: view:res.company:0
+msgid "No. External..."
+msgstr "No. Exterior..."
+
+#. module: l10n_mx_partner_address
+#: field:res.company,l10n_mx_city2:0
+#: field:res.partner,l10n_mx_city2:0
+msgid "Locality"
+msgstr "Localidad"
+
+#. module: l10n_mx_partner_address
+#: model:ir.model,name:l10n_mx_partner_address.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: l10n_mx_partner_address
+#: code:addons/l10n_mx_partner_address/partner_address.py:73
+#, python-format
+msgid "City..."
+msgstr "Ciudad..."
+
+#. module: l10n_mx_partner_address
+#: code:addons/l10n_mx_partner_address/partner_address.py:65
+#, python-format
+msgid "Locality..."
+msgstr "Localidad..."
+
+#. module: l10n_mx_partner_address
+#: view:res.company:0
+msgid "Locality"
+msgstr "Localidad"
+
+#. module: l10n_mx_partner_address
+#: field:res.company,l10n_mx_street3:0
+#: field:res.partner,l10n_mx_street3:0
+msgid "No. External"
+msgstr "No. Exterior"
+
+#. module: l10n_mx_partner_address
+#: help:res.company,l10n_mx_city2:0
+#: help:res.partner,l10n_mx_city2:0
+msgid "Locality configurated for this partner"
+msgstr "Localidad configurada para esta empresa"
+
+#. module: l10n_mx_partner_address
+#: code:addons/l10n_mx_partner_address/partner_address.py:68
+#, python-format
+msgid "ZIP"
+msgstr "C.P."
+
+#. module: l10n_mx_partner_address
+#: model:ir.model,name:l10n_mx_partner_address.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: l10n_mx_partner_address
+#: code:addons/l10n_mx_partner_address/partner_address.py:71
+#, python-format
+msgid "No Internal..."
+msgstr "No Interior..."
+
+#. module: l10n_mx_partner_address
+#: field:res.company,l10n_mx_street4:0
+#: field:res.partner,l10n_mx_street4:0
+msgid "No. Internal"
+msgstr "No. Interior"
+
+#. module: l10n_mx_partner_address
+#: help:res.company,l10n_mx_street3:0
+#: help:res.partner,l10n_mx_street3:0
+msgid "External number of the partner address"
+msgstr "Número exterior de la dirección de la empresa"
+
+#. module: l10n_mx_partner_address
+#: code:addons/l10n_mx_partner_address/partner_address.py:72
+#, python-format
+msgid "Country..."
+msgstr "País..."
+

=== modified file 'l10n_mx_partner_address/partner_address.py'
--- l10n_mx_partner_address/partner_address.py	2013-08-15 21:23:09 +0000
+++ l10n_mx_partner_address/partner_address.py	2013-09-12 22:20:12 +0000
@@ -48,8 +48,7 @@
     }
 
     def _address_fields(self, cr, uid, context=None):
-        "Devuelve la lista de los campos de dirección que se sincronizan\
-        desde el padre cuando se establece la bandera `use_parent_address."
+        "Returns the list of the address fields that synchronizes from the parent when the flag is set use_parent_address."
         res = super(res_partner, self)._address_fields(cr, uid, context=None)
         res.extend(['l10n_mx_street3', 'l10n_mx_street4', 'l10n_mx_city2'])
         return res
@@ -63,17 +62,23 @@
         return id
 
     def fields_view_get_address(self, cr, uid, arch, context={}):
-        res = super(res_partner, self).fields_view_get_address(
-            cr, uid, arch, context=context)
+        locality = _('Locality...')
+        street = _('Street...')
+        street2 = _('Colony...')
+        cp = _('ZIP')
+        state = _('State')
+        external = _('No External...')
+        internal = _('No Internal...')
+        country = _('Country...')
+        city2 = _('City...')
+        res = super(res_partner, self).fields_view_get_address(cr, uid, arch, context=context)
         user_obj = self.pool.get('res.users')
-        fmt = user_obj.browse(
-            cr, SUPERUSER_ID, uid, context).company_id.country_id
+        fmt = user_obj.browse(cr, SUPERUSER_ID, uid, context).company_id.country_id
         fmt = fmt and fmt.address_format
-        city = '<field name="city" placeholder="City" style="width: 40%%"/>'
+        city = '<field name="city" placeholder="%s" style="width: 40%%"/>' % (city2)
         for name, field in self._columns.items():
             if name == 'city_id':
-                city = '<field name="city" modifiers="{&quot;invisible&quot;: true}" placeholder="City....." style="width: 50%%"/><field name="city_id" on_change="onchange_city(city_id)" placeholder="City" style="width: 40%%"/>'
-
+                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': """
                     <group>
@@ -89,17 +94,17 @@
 
                             <label for="street" string="Address"/>
                             <div>
-                                <field name="street" placeholder="Street..."/>
-                                <field name="l10n_mx_street4" placeholder="No. Interior..."/>
-                                <field name="l10n_mx_street3" placeholder="No. Exterior..."/>
-                                <field name="street2" placeholder="Colonia..."/>
+                                <field name="street" placeholder="%s"/>
+                                <field name="l10n_mx_street3" placeholder="%s"/>
+                                <field name="l10n_mx_street4" placeholder="%s"/>
+                                <field name="street2" placeholder="%s"/>
                                 <div class="address_format">
                                     %s
-                                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": True}' on_change="onchange_state(state_id)"/>
-                                    <field name="zip" placeholder="ZIP" style="width: 20%%"/>
+                                    <field name="state_id" class="oe_no_button" placeholder="%s" style="width: 37%%" options='{"no_open": True}' on_change="onchange_state(state_id)"/>
+                                    <field name="zip" placeholder="%s" style="width: 20%%"/>
                                 </div>
-                                <field name="l10n_mx_city2" placeholder="Localidad"/>
-                                <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": True}'/>
+                                <field name="l10n_mx_city2" placeholder="%s"/>
+                                <field name="country_id" placeholder="%s" class="oe_no_button" options='{"no_open": True}'/>
                             </div>
                             <field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
                         </group>
@@ -114,7 +119,7 @@
                                 options='{"no_open": True}' attrs="{'invisible': [('is_company','=', True)]}" />
                         </group>
                     </group>
-            """ % (city)
+            """ % (street, external, internal, street2, city, state, cp, locality, country)
         }
         for k, v in layouts.items():
             if fmt and (k in fmt):
@@ -134,7 +139,7 @@
             view_id = self.pool.get('ir.model.data').get_object_reference(
                 cr, user, 'base', 'view_partner_simple_form')[1]
         res = super(res_partner, self).fields_view_get(
-            cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
+            cr, SUPERUSER_ID, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
         if view_type == 'form':
             fields_get = self.fields_get(cr, user, [
                 'l10n_mx_street3', 'l10n_mx_street4', 'l10n_mx_city2'], context)

=== modified file 'l10n_mx_partner_address/res_company_view_inherit.xml'
--- l10n_mx_partner_address/res_company_view_inherit.xml	2013-06-08 04:00:25 +0000
+++ l10n_mx_partner_address/res_company_view_inherit.xml	2013-09-12 22:20:12 +0000
@@ -4,18 +4,14 @@
         <record model="ir.ui.view" id="res_company_inherit_form_view">
                 <field name="name">res.company.inherit.form.view</field>
                 <field name="model">res.company</field>
-                <field name="inherit_id" ref="base.view_company_form" />
+                <field name="inherit_id" ref="base.view_company_form"/>
                 <field name="arch" type="xml">
-
-                    <xpath expr="//field[@name='street2']" position="after" >
-                        <field name="l10n_mx_street4" placeholder="No. Exterior..."/>
-                        <field name="l10n_mx_street3" placeholder="No. Interior..."/>
-                        <field name="l10n_mx_city2" placeholder="Localidad"/>
+                    <xpath expr="//field[@name='street2']" position="after">
+                        <field name="l10n_mx_street3" placeholder="No. External..."/>
+                        <field name="l10n_mx_street4" placeholder="No. Internal..."/>
+                        <field name="l10n_mx_city2" placeholder="Locality"/>
                     </xpath>
-
                 </field>
             </record>
-            
-
         </data>
 </openerp>