Merge lp:~vauxoo/openerp-venezuela-localization/jose-wh-iva-translation into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

Status: Rejected
Rejected by: Gabriela Quilarque
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/jose-wh-iva-translation
Merge into: lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk
Diff against target: 432 lines (+121/-102)
3 files modified
l10n_ve_sale_purchase/i18n/es_VE.po (+4/-0)
l10n_ve_withholding_iva/generate_txt.py (+1/-1)
l10n_ve_withholding_iva/i18n/es_VE.po (+116/-101)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/jose-wh-iva-translation
Reviewer Review Type Date Requested Status
Nhomar - Vauxoo Pending
Review via email: mp+79157@code.launchpad.net

Description of the change

changed text in the models that are in spanish and add the translation.
Only that unknown if chage the reports that are in spanish in the "list_report_wh_vat"

TOTAL DE MONTO DE RETENCION.
TOTAL DE BASE IMPONIBLE.
RETENCIONES DE IVA/PAGINA.
DECLARACION INFORMATIVA DE RETENCIONES IVA.
PEÍODO FISCAL.
TIPO DOC.
TIPO OPE.

To post a comment you must log in.

Unmerged revisions

437. By josemorales

[IMP] Changed text in the models and add the translation

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_ve_sale_purchase/i18n/es_VE.po'
2--- l10n_ve_sale_purchase/i18n/es_VE.po 2011-10-06 19:50:28 +0000
3+++ l10n_ve_sale_purchase/i18n/es_VE.po 2011-10-12 17:36:23 +0000
4@@ -111,7 +111,11 @@
5 #. module: l10n_ve_sale_purchase
6 #: field:stock.picking,nro_ctrl:0
7 msgid "Invoice ref."
8+<<<<<<< TREE
9+msgstr "Factura de referencia"
10+=======
11 msgstr "Referencia de Factura"
12+>>>>>>> MERGE-SOURCE
13
14 #. module: l10n_ve_sale_purchase
15 #: model:ir.model,name:l10n_ve_sale_purchase.model_sale_order_line
16
17=== modified file 'l10n_ve_withholding_iva/generate_txt.py'
18--- l10n_ve_withholding_iva/generate_txt.py 2011-10-05 22:33:01 +0000
19+++ l10n_ve_withholding_iva/generate_txt.py 2011-10-12 17:36:23 +0000
20@@ -65,7 +65,7 @@
21 ('confirmed', 'Confirmed'),
22 ('done','Done'),
23 ('cancel','Cancelled')
24- ],'Estado', select=True, readonly=True, help="proof status"),
25+ ],'State', select=True, readonly=True, help="proof status"),
26 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True,readonly=True,states={'draft':[('readonly',False)]}),
27 'period_id':fields.many2one('account.period','Period',required=True,readonly=True,states={'draft':[('readonly',False)]}, domain="[('fiscalyear_id','=',fiscalyear_id)]"),
28 'type':fields.boolean('Retention Suppliers?',required=True,states={'draft':[('readonly',False)]}, help="Select the type of retention to make"),
29
30=== modified file 'l10n_ve_withholding_iva/i18n/es_VE.po'
31--- l10n_ve_withholding_iva/i18n/es_VE.po 2011-10-06 14:42:29 +0000
32+++ l10n_ve_withholding_iva/i18n/es_VE.po 2011-10-12 17:36:23 +0000
33@@ -33,7 +33,7 @@
34 #. module: l10n_ve_withholding_iva
35 #: field:res.partner,wh_iva_agent:0
36 msgid "Wh. Agent"
37-msgstr "Wh. Agente"
38+msgstr "Agente de retención"
39
40 #. module: l10n_ve_withholding_iva
41 #: report:list_report_wh_vat2:0
42@@ -99,11 +99,6 @@
43 msgstr "Compañía"
44
45 #. module: l10n_ve_withholding_iva
46-#: field:wh_iva.config,vat:0
47-msgid "Give VAT Number for your company."
48-msgstr "Indique el RIF de su compañía."
49-
50-#. module: l10n_ve_withholding_iva
51 #: help:account.invoice,wh_iva:0
52 msgid "The account moves of the invoice have been retention with account moves of the payment(s)."
53 msgstr "Los movimientos de la cuenta de la factura se han de retención con movimientos de la cuenta de pago (s)."
54@@ -162,7 +157,7 @@
55 #. module: l10n_ve_withholding_iva
56 #: model:ir.actions.act_window,name:l10n_ve_withholding_iva.action_withholding_iva_wizard
57 msgid "OpenERP Report Designer"
58-msgstr "Disenador de reporte OpenERP"
59+msgstr "Diseñador de reporte OpenERP"
60
61 #. module: l10n_ve_withholding_iva
62 #: field:account.invoice.tax,base_ret:0
63@@ -177,12 +172,6 @@
64 msgstr "Tipo de retención"
65
66 #. module: l10n_ve_withholding_iva
67-#: code:addons/l10n_ve_withholding_iva/partner.py:113
68-#, python-format
69-msgid "Unregistered VAT!"
70-msgstr "Sin registrar RIF!"
71-
72-#. module: l10n_ve_withholding_iva
73 #: view:account.wh.iva:0
74 msgid "Other Information"
75 msgstr "Otra información"
76@@ -219,11 +208,6 @@
77 msgstr "Datos de retención"
78
79 #. module: l10n_ve_withholding_iva
80-#: field:wh_iva.config,add:0
81-msgid "Invoice Address"
82-msgstr "Dirección de facturación"
83-
84-#. module: l10n_ve_withholding_iva
85 #: view:wh_iva.config:0
86 msgid "Setup your Withholding Values."
87 msgstr "Los valores de configuración de su retención."
88@@ -274,12 +258,6 @@
89 msgstr "Bill/ND/NC"
90
91 #. module: l10n_ve_withholding_iva
92-#: code:addons/l10n_ve_withholding_iva/partner.py:107
93-#, python-format
94-msgid "Invalid VAT!"
95-msgstr "RIF Invalido!"
96-
97-#. module: l10n_ve_withholding_iva
98 #: constraint:res.partner:0
99 msgid "Error ! The partner does not have an invoice address. "
100 msgstr "Error ! El cliente o proveedor no tiene una dirección de facturación. "
101@@ -290,16 +268,11 @@
102 msgstr "Salto"
103
104 #. module: l10n_ve_withholding_iva
105-#: help:txt.iva,type:0
106-msgid "Seleccione el tipo de retencion a realizar"
107-msgstr "Seleccione el tipo de retención a realizar"
108-
109-#. module: l10n_ve_withholding_iva
110 #: view:account.wh.iva:0
111 #: field:account.wh.iva,partner_id:0
112 #: model:ir.model,name:l10n_ve_withholding_iva.model_res_partner
113 msgid "Partner"
114-msgstr "Cliente o Proveedor"
115+msgstr "Cliente"
116
117 #. module: l10n_ve_withholding_iva
118 #: field:account.wh.iva.line,retention_id:0
119@@ -439,11 +412,6 @@
120 msgstr "Lineas de retencion para texto TXT"
121
122 #. module: l10n_ve_withholding_iva
123-#: help:wh_iva.config,add:0
124-msgid "Put Here the address declared on your VAT information on SENIAT"
125-msgstr "Coloque aquí la dirección declarada en su información sobre el IVA en el SENIAT"
126-
127-#. module: l10n_ve_withholding_iva
128 #: model:ir.model,name:l10n_ve_withholding_iva.model_account_tax
129 msgid "account.tax"
130 msgstr "account.tax"
131@@ -491,14 +459,6 @@
132 msgstr "Cancelar"
133
134 #. module: l10n_ve_withholding_iva
135-#: code:addons/l10n_ve_withholding_iva/partner.py:107
136-#: code:addons/l10n_ve_withholding_iva/partner.py:113
137-#: code:addons/l10n_ve_withholding_iva/partner.py:136
138-#, python-format
139-msgid "Vat Error !"
140-msgstr "RIF erroneo !"
141-
142-#. module: l10n_ve_withholding_iva
143 #: view:l10n_ve_withholding_iva.installer:0
144 msgid "Installation and Configuration Steps"
145 msgstr "Instalación y configuración de los pasos"
146@@ -574,12 +534,7 @@
147 #. module: l10n_ve_withholding_iva
148 #: view:update.info.partner:0
149 msgid "Yes"
150-msgstr "Si"
151-
152-#. module: l10n_ve_withholding_iva
153-#: help:res.company,url_seniat1_company:0
154-msgid "In this field enter the URL from Seniat for search the fiscal information from partner"
155-msgstr "En este campo introduzca la dirección URL del Seniat para la búsqueda de la información fiscal del socio"
156+msgstr "Sí"
157
158 #. module: l10n_ve_withholding_iva
159 #: help:account.wh.iva,tot_amount_tax_wh:0
160@@ -594,11 +549,6 @@
161 msgstr "No se puede hacer un archivo txt, porque la ley no tiene ningún número de referencia!"
162
163 #. module: l10n_ve_withholding_iva
164-#: field:res.company,url_seniat2_company:0
165-msgid "URL Seniat for Retention Rate"
166-msgstr "URL del Seniat para la tasa de retención"
167-
168-#. module: l10n_ve_withholding_iva
169 #: field:account.wh.iva,wh_lines:0
170 #: help:account.wh.iva,wh_lines:0
171 msgid "Withholding vat lines"
172@@ -617,11 +567,6 @@
173 msgstr "Borrador"
174
175 #. module: l10n_ve_withholding_iva
176-#: help:res.company,url_seniat2_company:0
177-msgid "In this field enter the URL from Seniat for search the retention rate from partner"
178-msgstr "En este campo ingrese el URL del SENIAT para la búsqueda de la tasa de retención del Socio"
179-
180-#. module: l10n_ve_withholding_iva
181 #: model:ir.actions.act_window,name:l10n_ve_withholding_iva.action_account_wh_iva_customer
182 msgid "Withholding vat customer"
183 msgstr "Retención del IVA del cliente"
184@@ -681,11 +626,6 @@
185 msgstr "Fecha"
186
187 #. module: l10n_ve_withholding_iva
188-#: field:txt.iva,state:0
189-msgid "Estado"
190-msgstr "Estado"
191-
192-#. module: l10n_ve_withholding_iva
193 #: help:txt.iva,state:0
194 msgid "proof status"
195 msgstr "prueba de estado"
196@@ -721,6 +661,11 @@
197 msgstr "Compañías"
198
199 #. module: l10n_ve_withholding_iva
200+#: field:txt.iva.line,partner_id:0
201+msgid "Buyer/Seller"
202+msgstr "Comprador/Vendedor"
203+
204+#. module: l10n_ve_withholding_iva
205 #: field:txt.iva.line,untaxed:0
206 msgid "Untaxed"
207 msgstr "Libre de impuesto"
208@@ -731,9 +676,9 @@
209 msgstr "Estas seguro de querer hacer esto?"
210
211 #. module: l10n_ve_withholding_iva
212-#: view:wh_iva.config:0
213-msgid "Company and Accounting Withholding Configurator"
214-msgstr "Configurador de empresa, retención y contabilidad."
215+#: field:account.wh.iva.line,move_id:0
216+msgid "Account Entry"
217+msgstr "Cuenta de Entrada"
218
219 #. module: l10n_ve_withholding_iva
220 #: help:account.wh.iva,journal_id:0
221@@ -758,7 +703,7 @@
222 #. module: l10n_ve_withholding_iva
223 #: report:list_report_wh_vat2:0
224 msgid "Periodo"
225-msgstr "Periodo"
226+msgstr "Período"
227
228 #. module: l10n_ve_withholding_iva
229 #: report:list_report_wh_vat2:0
230@@ -794,22 +739,11 @@
231 msgstr "Cancelar"
232
233 #. module: l10n_ve_withholding_iva
234-#: field:txt.iva.line,partner_id:0
235-msgid "Comprador/Vendedor"
236-msgstr "Comprador/Vendedor"
237-
238-#. module: l10n_ve_withholding_iva
239 #: view:txt.iva:0
240 msgid "Lines Generate TXT"
241 msgstr "Generar líneas TXT"
242
243 #. module: l10n_ve_withholding_iva
244-#: code:addons/l10n_ve_withholding_iva/partner.py:119
245-#, python-format
246-msgid "Could not connect! Check the URL "
247-msgstr "No se pudo conectar! Compruebe la dirección URL"
248-
249-#. module: l10n_ve_withholding_iva
250 #: report:list_report_wh_vat2:0
251 msgid "Tipo Doc."
252 msgstr "Típo Doc."
253@@ -820,15 +754,9 @@
254 msgstr "Factura de clientes"
255
256 #. module: l10n_ve_withholding_iva
257-#: code:addons/l10n_ve_withholding_iva/partner.py:136
258-#, python-format
259-msgid "The field vat is empty"
260-msgstr "El campo del RIF esta vacío"
261-
262-#. module: l10n_ve_withholding_iva
263 #: field:l10n_ve_withholding_iva.installer,name:0
264 msgid "First Data"
265-msgstr "Primer dato"
266+msgstr "Primer Dato"
267
268 #. module: l10n_ve_withholding_iva
269 #: model:ir.model,name:l10n_ve_withholding_iva.model_txt_iva_line
270@@ -844,12 +772,7 @@
271 #: field:account.wh.iva,tot_amount_tax_wh:0
272 #: field:account.wh.iva.line,amount_tax_wh:0
273 msgid "Amount wh. tax vat"
274-msgstr "Amount wh. tax vat"
275-
276-#. module: l10n_ve_withholding_iva
277-#: field:res.company,url_seniat1_company:0
278-msgid "URL Seniat for Partner Information"
279-msgstr "URL del Seniat para la información del cliente o proveedor"
280+msgstr "Monto de impuesto por retención del IVA"
281
282 #. module: l10n_ve_withholding_iva
283 #: model:ir.actions.act_window,name:l10n_ve_withholding_iva.wizard_update_info_partner
284@@ -962,15 +885,9 @@
285 msgstr "Cálculo de retención del IVA"
286
287 #. module: l10n_ve_withholding_iva
288-#: code:addons/l10n_ve_withholding_iva/partner.py:119
289-#, python-format
290-msgid "No Connection !"
291-msgstr "Sin conexión !"
292-
293-#. module: l10n_ve_withholding_iva
294-#: field:account.wh.iva.line,move_id:0
295-msgid "Account Entry"
296-msgstr "Cuenta de entrada"
297+#: view:wh_iva.config:0
298+msgid "Company and Accounting Withholding Configurator"
299+msgstr "Configurador de empresa, retención y contabilidad."
300
301 #. module: l10n_ve_withholding_iva
302 #: model:ir.actions.act_window,help:l10n_ve_withholding_iva.action_account_wh_iva_customer
303@@ -983,6 +900,11 @@
304 msgstr "Retención OpenERP"
305
306 #. module: l10n_ve_withholding_iva
307+#: help:txt.iva,type:0
308+msgid "Select the type of retention to make"
309+msgstr "Seleccione el tipo de retención a realizar"
310+
311+#. module: l10n_ve_withholding_iva
312 #: model:ir.actions.act_window,name:l10n_ve_withholding_iva.action_generate_text_iva
313 #: model:ir.ui.menu,name:l10n_ve_withholding_iva.menu_action_generate_txt_iva
314 msgid "Generate TXT"
315@@ -1029,3 +951,96 @@
316 msgid "Put your VAT number with this format VEYXXXXXXXX Where Y can be J-G-V-E and the rest are just numeric"
317 msgstr "Ponga su número de IVA con este formato VEYXXXXXXXX Donde Y puede ser JGVE y el resto son sólo numéricos"
318
319+#. module: l10n_ve_withholding_iva
320+#: field:wh_iva.config,vat:0
321+msgid "Give VAT Number for your company."
322+msgstr "Indique el RIF de su compañía."
323+
324+
325+
326+#. module: l10n_ve_withholding_iva
327+#: code:addons/l10n_ve_withholding_iva/partner.py:113
328+#, python-format
329+msgid "Unregistered VAT!"
330+msgstr "Sin registrar RIF!"
331+
332+
333+
334+#. module: l10n_ve_withholding_iva
335+#: field:wh_iva.config,add:0
336+msgid "Invoice Address"
337+msgstr "Dirección de facturación"
338+
339+
340+
341+#. module: l10n_ve_withholding_iva
342+#: code:addons/l10n_ve_withholding_iva/partner.py:107
343+#, python-format
344+msgid "Invalid VAT!"
345+msgstr "RIF Invalido!"
346+
347+
348+
349+#. module: l10n_ve_withholding_iva
350+#: help:wh_iva.config,add:0
351+msgid "Put Here the address declared on your VAT information on SENIAT"
352+msgstr "Coloque aquí la dirección declarada en su información sobre el IVA en el SENIAT"
353+
354+
355+#. module: l10n_ve_withholding_iva
356+#: code:addons/l10n_ve_withholding_iva/partner.py:107
357+#: code:addons/l10n_ve_withholding_iva/partner.py:113
358+#: code:addons/l10n_ve_withholding_iva/partner.py:136
359+#, python-format
360+msgid "Vat Error !"
361+msgstr "RIF erroneo !"
362+
363+
364+#. module: l10n_ve_withholding_iva
365+#: help:res.company,url_seniat1_company:0
366+msgid "In this field enter the URL from Seniat for search the fiscal information from partner"
367+msgstr "En este campo introduzca la dirección URL del Seniat para la búsqueda de la información fiscal del socio"
368+
369+
370+
371+#. module: l10n_ve_withholding_iva
372+#: field:res.company,url_seniat2_company:0
373+msgid "URL Seniat for Retention Rate"
374+msgstr "URL del Seniat para la tasa de retención"
375+
376+
377+#. module: l10n_ve_withholding_iva
378+#: help:res.company,url_seniat2_company:0
379+msgid "In this field enter the URL from Seniat for search the retention rate from partner"
380+msgstr "En este campo ingrese el URL del SENIAT para la búsqueda de la tasa de retención del Socio"
381+
382+#. module: l10n_ve_withholding_iva
383+#: code:addons/l10n_ve_withholding_iva/partner.py:119
384+#, python-format
385+msgid "Could not connect! Check the URL "
386+msgstr "No se pudo conectar! Compruebe la dirección URL"
387+
388+
389+#. module: l10n_ve_withholding_iva
390+#: code:addons/l10n_ve_withholding_iva/partner.py:136
391+#, python-format
392+msgid "The field vat is empty"
393+msgstr "El campo del RIF esta vacío"
394+
395+
396+#. module: l10n_ve_withholding_iva
397+#: field:res.company,url_seniat1_company:0
398+msgid "URL Seniat for Partner Information"
399+msgstr "URL del Seniat para la información del cliente o proveedor"
400+
401+
402+#. module: l10n_ve_withholding_iva
403+#: code:addons/l10n_ve_withholding_iva/partner.py:119
404+#, python-format
405+msgid "No Connection !"
406+msgstr "Sin conexión !"
407+
408+#. module: l10n_ve_withholding_iva
409+#: field:account.wh.iva.line,move_id:0
410+msgid "Account Entry"
411+msgstr "Cuenta de entrada"
412
413=== added symlink 'topology/bank_management'
414=== target is u'/home/openerp/instancias/estable/modules/localization/jose-wh-iva-translation/bank_management'
415=== added symlink 'topology/l10n_ve_fiscal_reports'
416=== target is u'/home/openerp/instancias/estable/modules/localization/jose-wh-iva-translation/l10n_ve_fiscal_reports'
417=== added symlink 'topology/l10n_ve_fiscal_requirements'
418=== target is u'/home/openerp/instancias/estable/modules/localization/jose-wh-iva-translation/l10n_ve_fiscal_requirements'
419=== added symlink 'topology/l10n_ve_islr_withholding'
420=== target is u'/home/openerp/instancias/estable/modules/localization/jose-wh-iva-translation/l10n_ve_islr_withholding'
421=== added symlink 'topology/l10n_ve_sale_purchase'
422=== target is u'/home/openerp/instancias/estable/modules/localization/jose-wh-iva-translation/l10n_ve_sale_purchase'
423=== added symlink 'topology/l10n_ve_split_invoice'
424=== target is u'/home/openerp/instancias/estable/modules/localization/jose-wh-iva-translation/l10n_ve_split_invoice'
425=== added symlink 'topology/l10n_ve_withholding'
426=== target is u'/home/openerp/instancias/estable/modules/localization/jose-wh-iva-translation/l10n_ve_withholding'
427=== added symlink 'topology/l10n_ve_withholding_iva'
428=== target is u'/home/openerp/instancias/estable/modules/localization/jose-wh-iva-translation/l10n_ve_withholding_iva'
429=== added symlink 'topology/l10n_ve_withholding_muni'
430=== target is u'/home/openerp/instancias/estable/modules/localization/jose-wh-iva-translation/l10n_ve_withholding_muni'
431=== added symlink 'topology/product_historical_price'
432=== target is u'/home/openerp/instancias/estable/modules/localization/jose-wh-iva-translation/product_historical_price'