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
1=== modified file 'l10n_ar_invoice/currency.py' (properties changed: -x to +x)
2=== modified file 'l10n_ar_invoice/data/afip.concept_type.csv' (properties changed: -x to +x)
3=== modified file 'l10n_ar_invoice/data/document_class.xml' (properties changed: -x to +x)
4=== modified file 'l10n_ar_invoice/data/res.currency.csv' (properties changed: -x to +x)
5=== modified file 'l10n_ar_invoice/data/responsability.xml'
6--- l10n_ar_invoice/data/responsability.xml 2013-10-25 15:29:34 +0000
7+++ l10n_ar_invoice/data/responsability.xml 2013-12-18 18:43:04 +0000
8@@ -33,7 +33,7 @@
9 </record>
10 <record model='afip.responsability' id='res_EXT'>
11 <field name='code'>EXT</field>
12- <field name='name'>Extrangero</field>
13+ <field name='name'>Extranjero</field>
14 <field name='active' eval="True"/>
15 </record>
16 </data>
17
18=== modified file 'l10n_ar_invoice/data/responsability_class.xml'
19--- l10n_ar_invoice/data/responsability_class.xml 2013-10-25 15:29:34 +0000
20+++ l10n_ar_invoice/data/responsability_class.xml 2013-12-18 18:43:04 +0000
21@@ -10,7 +10,7 @@
22 </record>
23 <record model='afip.responsability_relation' id='ivari_ext'>
24 <field name='document_class_id' ref='dc_E'/>
25- <field name='name'>Responsable Inscripto A Extrangero</field>
26+ <field name='name'>Responsable Inscripto A Extranjero</field>
27 <field name='issuer_id' ref='res_IVARI'/>
28 <field name='receptor_id' ref='res_EXT'/>
29 <field name='active' eval="True"/>
30@@ -73,7 +73,7 @@
31 </record>
32 <record model='afip.responsability_relation' id='rm_ext'>
33 <field name='document_class_id' ref='dc_E'/>
34- <field name='name'>Responsable Monotributo A Extrangero</field>
35+ <field name='name'>Responsable Monotributo A Extranjero</field>
36 <field name='issuer_id' ref='res_RM'/>
37 <field name='receptor_id' ref='res_EXT'/>
38 <field name='active' eval="True"/>
39
40=== modified file 'l10n_ar_invoice/i18n/l10n_ar_invoice.pot' (properties changed: -x to +x)
41=== modified file 'l10n_ar_invoice/invoice.py' (properties changed: -x to +x)
42=== modified file 'l10n_ar_invoice/partner.py'
43--- l10n_ar_invoice/partner.py 2013-11-03 18:11:10 +0000
44+++ l10n_ar_invoice/partner.py 2013-12-18 18:43:04 +0000
45@@ -75,7 +75,7 @@
46
47 def afip_validation(sefl, cr, uid, ids, context={}):
48 """ Hay que validar si el partner no es de tipo 'consumidor final' tenga un CUIT asociado.
49- - Si el cuit es extrangero, hay que asignar a document_number y document_type los correspondientes
50+ - Si el cuit es extranjero, hay que asignar a document_number y document_type los correspondientes
51 a la interpretación argentina del CUIT.
52 - Si es responsable monotributo hay que asegurarse que tenga vat asignado. El documento y
53 número de documento deberían ser DNI.
54
55=== modified file 'l10n_ar_invoice/product.py' (properties changed: -x to +x)
56=== modified file 'l10n_ar_invoice/test/com_rm1.yml' (properties changed: -x to +x)
57=== modified file 'l10n_ar_invoice/test/products.yml' (properties changed: -x to +x)
58=== modified file 'l10n_ar_invoice/view/afip_concept_type_view.xml' (properties changed: -x to +x)
59=== modified file 'l10n_ar_invoice/view/afip_document_class_view.xml' (properties changed: -x to +x)
60=== modified file 'l10n_ar_invoice/view/afip_journal_template_view.xml' (properties changed: -x to +x)
61=== modified file 'l10n_ar_invoice/view/afip_optional_type_view.xml' (properties changed: -x to +x)
62=== modified file 'l10n_ar_invoice/view/invoice_view.xml' (properties changed: -x to +x)
63=== modified file 'l10n_ar_invoice/view/res_config_view.xml' (properties changed: -x to +x)

Subscribers

People subscribed via source and target branches