Merge lp:~daniel-blancomartin/openerp-l10n-ar-localization/trunk into lp:openerp-l10n-ar-localization

Proposed by Daniel Blanco
Status: Needs review
Proposed branch: lp:~daniel-blancomartin/openerp-l10n-ar-localization/trunk
Merge into: lp:openerp-l10n-ar-localization
Diff against target: 63 lines (+4/-4)
3 files modified
l10n_ar_invoice/data/responsability.xml (+1/-1)
l10n_ar_invoice/data/responsability_class.xml (+2/-2)
l10n_ar_invoice/partner.py (+1/-1)
To merge this branch: bzr merge lp:~daniel-blancomartin/openerp-l10n-ar-localization/trunk
Reviewer Review Type Date Requested Status
Daniel Blanco translated terms Pending
Review via email: mp+199528@code.launchpad.net

Description of the change

Is a testing collab. Just translated extrangero to extranjero.

To post a comment you must log in.
Revision history for this message
Darío De Giacomo (dariokdg) wrote :

Daniel, no es por desmerecer tu merge proposal ni mucho menos, pero ya está propuesto dentro del merge proposal de mi branch.

Un abrazo,
Darío.

Revision history for this message
Daniel Blanco (daniel-blancomartin) wrote :

No hay problema. Cuando tenga algo de más valor lo paso. Aparte estoy
tratando de amigarme con launchpad
El dic 18, 2013 4:26 PM, "Darío De Giacomo" <email address hidden> escribió:

> Daniel, no es por desmerecer tu merge proposal ni mucho menos, pero ya
> está propuesto dentro del merge proposal de mi branch.
>
> Un abrazo,
> Darío.
> --
>
> https://code.launchpad.net/~daniel-blancomartin/openerp-l10n-ar-localization/trunk/+merge/199528
> You are the owner of
> lp:~daniel-blancomartin/openerp-l10n-ar-localization/trunk.
>

Revision history for this message
Lopez Ignacio (lopezignacio) wrote :

Convendria que Daniel revise el trabajo de Darío y lo apruebe,si está
correcto, asi seguimos desde ahi... sin desmerecer el trabajo de Daniel,
al contrario, es mucho mejor estar en el tema.

El 18/12/13 16:26, Darío De Giacomo escribió:
> Daniel, no es por desmerecer tu merge proposal ni mucho menos, pero ya está propuesto dentro del merge proposal de mi branch.
>
> Un abrazo,
> Darío.

Unmerged revisions

236. By Daniel Blanco

Translated some terms

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'l10n_ar_invoice/currency.py' (properties changed: -x to +x)
=== modified file 'l10n_ar_invoice/data/afip.concept_type.csv' (properties changed: -x to +x)
=== modified file 'l10n_ar_invoice/data/document_class.xml' (properties changed: -x to +x)
=== modified file 'l10n_ar_invoice/data/res.currency.csv' (properties changed: -x to +x)
=== modified file 'l10n_ar_invoice/data/responsability.xml'
--- l10n_ar_invoice/data/responsability.xml 2013-10-25 15:29:34 +0000
+++ l10n_ar_invoice/data/responsability.xml 2013-12-18 18:43:04 +0000
@@ -33,7 +33,7 @@
33 </record>33 </record>
34 <record model='afip.responsability' id='res_EXT'>34 <record model='afip.responsability' id='res_EXT'>
35 <field name='code'>EXT</field>35 <field name='code'>EXT</field>
36 <field name='name'>Extrangero</field>36 <field name='name'>Extranjero</field>
37 <field name='active' eval="True"/>37 <field name='active' eval="True"/>
38 </record>38 </record>
39 </data>39 </data>
4040
=== modified file 'l10n_ar_invoice/data/responsability_class.xml'
--- l10n_ar_invoice/data/responsability_class.xml 2013-10-25 15:29:34 +0000
+++ l10n_ar_invoice/data/responsability_class.xml 2013-12-18 18:43:04 +0000
@@ -10,7 +10,7 @@
10 </record> 10 </record>
11 <record model='afip.responsability_relation' id='ivari_ext'>11 <record model='afip.responsability_relation' id='ivari_ext'>
12 <field name='document_class_id' ref='dc_E'/>12 <field name='document_class_id' ref='dc_E'/>
13 <field name='name'>Responsable Inscripto A Extrangero</field>13 <field name='name'>Responsable Inscripto A Extranjero</field>
14 <field name='issuer_id' ref='res_IVARI'/>14 <field name='issuer_id' ref='res_IVARI'/>
15 <field name='receptor_id' ref='res_EXT'/>15 <field name='receptor_id' ref='res_EXT'/>
16 <field name='active' eval="True"/>16 <field name='active' eval="True"/>
@@ -73,7 +73,7 @@
73 </record> 73 </record>
74 <record model='afip.responsability_relation' id='rm_ext'>74 <record model='afip.responsability_relation' id='rm_ext'>
75 <field name='document_class_id' ref='dc_E'/>75 <field name='document_class_id' ref='dc_E'/>
76 <field name='name'>Responsable Monotributo A Extrangero</field>76 <field name='name'>Responsable Monotributo A Extranjero</field>
77 <field name='issuer_id' ref='res_RM'/>77 <field name='issuer_id' ref='res_RM'/>
78 <field name='receptor_id' ref='res_EXT'/>78 <field name='receptor_id' ref='res_EXT'/>
79 <field name='active' eval="True"/>79 <field name='active' eval="True"/>
8080
=== modified file 'l10n_ar_invoice/i18n/l10n_ar_invoice.pot' (properties changed: -x to +x)
=== modified file 'l10n_ar_invoice/invoice.py' (properties changed: -x to +x)
=== modified file 'l10n_ar_invoice/partner.py'
--- l10n_ar_invoice/partner.py 2013-11-03 18:11:10 +0000
+++ l10n_ar_invoice/partner.py 2013-12-18 18:43:04 +0000
@@ -75,7 +75,7 @@
7575
76 def afip_validation(sefl, cr, uid, ids, context={}):76 def afip_validation(sefl, cr, uid, ids, context={}):
77 """ Hay que validar si el partner no es de tipo 'consumidor final' tenga un CUIT asociado.77 """ Hay que validar si el partner no es de tipo 'consumidor final' tenga un CUIT asociado.
78 - Si el cuit es extrangero, hay que asignar a document_number y document_type los correspondientes78 - Si el cuit es extranjero, hay que asignar a document_number y document_type los correspondientes
79 a la interpretación argentina del CUIT.79 a la interpretación argentina del CUIT.
80 - Si es responsable monotributo hay que asegurarse que tenga vat asignado. El documento y80 - Si es responsable monotributo hay que asegurarse que tenga vat asignado. El documento y
81 número de documento deberían ser DNI.81 número de documento deberían ser DNI.
8282
=== modified file 'l10n_ar_invoice/product.py' (properties changed: -x to +x)
=== modified file 'l10n_ar_invoice/test/com_rm1.yml' (properties changed: -x to +x)
=== modified file 'l10n_ar_invoice/test/products.yml' (properties changed: -x to +x)
=== modified file 'l10n_ar_invoice/view/afip_concept_type_view.xml' (properties changed: -x to +x)
=== modified file 'l10n_ar_invoice/view/afip_document_class_view.xml' (properties changed: -x to +x)
=== modified file 'l10n_ar_invoice/view/afip_journal_template_view.xml' (properties changed: -x to +x)
=== modified file 'l10n_ar_invoice/view/afip_optional_type_view.xml' (properties changed: -x to +x)
=== modified file 'l10n_ar_invoice/view/invoice_view.xml' (properties changed: -x to +x)
=== modified file 'l10n_ar_invoice/view/res_config_view.xml' (properties changed: -x to +x)

Subscribers

People subscribed via source and target branches