Merge lp:~vauxoo/openerp-venezuela-localization/rodolfo-sale_purchase-description into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

Proposed by Rodolfo Alvarez(Vauxoo)
Status: Merged
Merged at revision: 547
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/rodolfo-sale_purchase-description
Merge into: lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk
Diff against target: 174 lines (+50/-47)
2 files modified
l10n_ve_sale_purchase/__openerp__.py (+6/-3)
l10n_ve_sale_purchase/i18n/es_VE.po (+44/-44)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/rodolfo-sale_purchase-description
Reviewer Review Type Date Requested Status
Gabriela Quilarque Needs Fixing
Review via email: mp+81756@code.launchpad.net

Description of the change

Description of module l10n_ve_sale_purchase has been improved, the files es_VE.po has been modified too so it will also affect the description into the spanish translation

To post a comment you must log in.
Revision history for this message
Gabriela Quilarque (gabrielaquilarque97) wrote :

Aun falta incorporar la descripcion del modulo l10n_ve y del modulo l10n_ve_withholding_muni para poder realizar el merge.

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_ve_sale_purchase/__openerp__.py'
2--- l10n_ve_sale_purchase/__openerp__.py 2011-10-28 17:13:52 +0000
3+++ l10n_ve_sale_purchase/__openerp__.py 2011-11-09 16:44:52 +0000
4@@ -27,9 +27,12 @@
5 'version' : '0.3',
6 'author' : 'Vauxoo',
7 'description' : '''
8- Due to the Dependendy reduction on the l10n_ve_withholding_islr module, it was necessary to incorporate
9- the functionalities regarding with the eliminated dependencies on another module. Because of that this
10- module was created
11+ Due to the Dependendy reduction on the l10n_ve_withholding_islr module, it was necessary
12+to incorporate the functionalities regarding with the eliminated dependencies on another module.
13+Because of that this module was created. This module adds the withholding income concept to the
14+sale and purchase orders. It moves the withholding income concept defined in from the sale order
15+to the stock, and, if the invoice was created from the stock, it moves the withholding income
16+concept to the invoice. This also works the same way for purchase orders.
17 ''',
18 'category' : '',
19 'website' : 'http://openerp.com',
20
21=== modified file 'l10n_ve_sale_purchase/i18n/es_VE.po' (properties changed: +x to -x)
22--- l10n_ve_sale_purchase/i18n/es_VE.po 2011-10-25 20:33:16 +0000
23+++ l10n_ve_sale_purchase/i18n/es_VE.po 2011-11-09 16:44:52 +0000
24@@ -6,8 +6,8 @@
25 msgstr ""
26 "Project-Id-Version: OpenERP Server 6.0.3\n"
27 "Report-Msgid-Bugs-To: support@openerp.com\n"
28-"POT-Creation-Date: 2011-10-05 14:07+0000\n"
29-"PO-Revision-Date: 2011-10-05 14:07+0000\n"
30+"POT-Creation-Date: 2011-11-09 16:20+0000\n"
31+"PO-Revision-Date: 2011-11-09 16:20+0000\n"
32 "Last-Translator: <>\n"
33 "Language-Team: \n"
34 "MIME-Version: 1.0\n"
35@@ -23,98 +23,98 @@
36 #. module: l10n_ve_sale_purchase
37 #: help:stock.picking,nro_ctrl:0
38 msgid "Invoice reference"
39-msgstr "Referencia de la factura"
40+msgstr "Número de control"
41
42 #. module: l10n_ve_sale_purchase
43 #: help:purchase.order.line,concept_id:0
44 #: help:sale.order.line,concept_id:0
45 msgid "Withhold concept associated with this rate"
46-msgstr "Concepto de retención asociado con esta tasa"
47+msgstr "Withhold concept associated with this rate"
48
49 #. module: l10n_ve_sale_purchase
50-#: model:ir.model,name:l10n_ve_sale_purchase.model_product_template
51-msgid "Product Template"
52-msgstr "Planilla del producto"
53+#: model:ir.module.module,description:l10n_ve_sale_purchase.module_meta_information
54+msgid "\n"
55+" Due to the Dependendy reduction on the l10n_ve_withholding_islr module, it was necessary\n"
56+"to incorporate the functionalities regarding with the eliminated dependencies on another module.\n"
57+"Because of that this module was created. This module adds the withholding income concept to the\n"
58+"sale and purchase orders. It moves the withholding income concept defined in from the sale order\n"
59+"to the stock, and, if the invoice was created from the stock, it moves the withholding income\n"
60+"concept to the invoice. This also works the same way for purchase orders.\n"
61+" "
62+msgstr "\n"
63+" Debido a la reducción de dependencia del módulo l10n_ve_withholding_islr, fue necesario\n"
64+"incorporar las funcionalidades referentes a las dependencias eliminadas a otro módulo.\n"
65+"Debido a esto, este módulo fue creado. Este módulo agrega el concepto de retención de islr a las\n"
66+"ordenes de compra y venta. Traslada el concepto de retención de islr definido desde la orden de\n"
67+"venta al inventario, y, si la factura fue creada desde el inventario, traslada el concepto de\n"
68+"retención de islr a la factura. Esto trabaja de la misma manera para las ordenes de compra\n"
69+" "
70
71 #. module: l10n_ve_sale_purchase
72 #: field:purchase.order.line,concept_id:0
73 #: field:sale.order.line,concept_id:0
74 msgid "Withhold Concept"
75-msgstr "Concepto de retención"
76+msgstr "Withhold Concept"
77
78 #. module: l10n_ve_sale_purchase
79-#: code:addons/l10n_ve_sale_purchase/product.py:62
80+#: code:addons/l10n_ve_sale_purchase/product.py:60
81 #, python-format
82 msgid "Must create the concept of withholding income"
83-msgstr "Debe crear el concepto de retención de ingresos"
84+msgstr "Must create the concept of withholding income"
85
86 #. module: l10n_ve_sale_purchase
87 #: constraint:product.template:0
88 msgid "Error: The default UOM and the purchase UOM must be in the same category."
89-msgstr "Error: La UOM por defecto y la UOM de compra debe ser en la misma categoría."
90+msgstr "Error: La UdM por defecto y la UdM de compra deben estar en la misma categoría."
91
92 #. module: l10n_ve_sale_purchase
93-#: model:ir.model,name:l10n_ve_sale_purchase.model_purchase_order_line
94-msgid "Purchase Order Line"
95-msgstr "Compra línea del pedido"
96+#: model:ir.model,name:l10n_ve_sale_purchase.model_product_template
97+msgid "Product Template"
98+msgstr "Plantilla de producto"
99
100 #. module: l10n_ve_sale_purchase
101 #: model:ir.module.module,shortdesc:l10n_ve_sale_purchase.module_meta_information
102 msgid "ISLR Sale and Purchase Functionalities"
103-msgstr "ISLR Venta y funcionalidades de compra"
104+msgstr "ISLR Sale and Purchase Functionalities"
105
106 #. module: l10n_ve_sale_purchase
107-#: model:ir.module.module,description:l10n_ve_sale_purchase.module_meta_information
108-msgid "\n"
109-" Due to the Dependendy reduction on the l10n_ve_islr_withholding module, it was necesary to incorporate\n"
110-" the functionalities wich has to do with the eliminated dependencies on another module. That's what this one\n"
111-" was created for.\n"
112-" "
113-msgstr "\n"
114-" Debido a la reducción en el módulo Dependendy l10n_ve_islr_withholding, era necesaria la incorporación de \ n "
115-" Las funciones que tiene que ver con las dependencias eliminados en otro módulo. Eso es lo que esta \ n"
116-" Fue creado para.\n"
117-""
118+#: model:ir.model,name:l10n_ve_sale_purchase.model_purchase_order
119+msgid "Purchase Order"
120+msgstr "Pedido de compra"
121
122 #. module: l10n_ve_sale_purchase
123 #: sql_constraint:purchase.order:0
124 msgid "Order Reference must be unique !"
125-msgstr "La referencia de pedido debe ser único !"
126-
127-#. module: l10n_ve_sale_purchase
128-#: view:product.product:0
129-#: view:product.template:0
130-msgid "Concept of Withholding Income"
131-msgstr "Ingreso del concepto de retención"
132+msgstr "¡La referencia del pedido debe ser única!"
133
134 #. module: l10n_ve_sale_purchase
135 #: constraint:product.product:0
136 msgid "Error: Invalid ean code"
137-msgstr "Error: Código inválido ean"
138+msgstr "Error: Código EAN erróneo"
139+
140+#. module: l10n_ve_sale_purchase
141+#: model:ir.model,name:l10n_ve_sale_purchase.model_purchase_order_line
142+msgid "Purchase Order Line"
143+msgstr "Línea pedido de compra"
144
145 #. module: l10n_ve_sale_purchase
146 #: model:ir.model,name:l10n_ve_sale_purchase.model_stock_picking
147 msgid "Picking List"
148-msgstr "Nota de salida"
149+msgstr "Albarán"
150
151 #. module: l10n_ve_sale_purchase
152-#: code:addons/l10n_ve_sale_purchase/product.py:62
153+#: code:addons/l10n_ve_sale_purchase/product.py:60
154 #, python-format
155 msgid "Invalid action !"
156-msgstr "Acción inválida !"
157-
158-#. module: l10n_ve_sale_purchase
159-#: model:ir.model,name:l10n_ve_sale_purchase.model_purchase_order
160-msgid "Purchase Order"
161-msgstr "Orden de compra"
162+msgstr "Invalid action !"
163
164 #. module: l10n_ve_sale_purchase
165 #: field:stock.picking,nro_ctrl:0
166 msgid "Invoice ref."
167-msgstr "Referencia de Factura"
168+msgstr "Nro. Control"
169
170 #. module: l10n_ve_sale_purchase
171 #: model:ir.model,name:l10n_ve_sale_purchase.model_sale_order_line
172 msgid "Sales Order Line"
173-msgstr "Línea de orden de ventas"
174+msgstr "Línea pedido de venta"
175