Merge lp:~vauxoo/openerp-venezuela-localization/israel_invoice-nro-control-fiscal-integration into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

Proposed by Israel Fermin Montilla
Status: Merged
Merged at revision: 391
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/israel_invoice-nro-control-fiscal-integration
Merge into: lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk
Diff against target: 672 lines (+271/-246)
10 files modified
l10n_ve_fiscal_requirements/__init__.py (+2/-2)
l10n_ve_fiscal_requirements/__openerp__.py (+22/-4)
l10n_ve_fiscal_requirements/i18n/es_VE.po (+229/-121)
l10n_ve_fiscal_requirements/invoice.py (+2/-5)
l10n_ve_fiscal_requirements/partner.py (+5/-5)
l10n_ve_fiscal_requirements/res_company.py (+2/-2)
l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl.py (+9/-6)
l10n_ve_invoice_nro_ctrl/__init__.py (+0/-28)
l10n_ve_invoice_nro_ctrl/__openerp__.py (+0/-45)
l10n_ve_invoice_nro_ctrl/model/__init__.py (+0/-28)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/israel_invoice-nro-control-fiscal-integration
Reviewer Review Type Date Requested Status
Nhomar - Vauxoo Pending
Review via email: mp+77752@code.launchpad.net

Description of the change

Integrated the damaged paper wizard with the fiscal requirements module, improved the documentation on the __openerp__.py, reviewed and corrected some English texts and re-translated the module

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_ve_fiscal_requirements/__init__.py'
2--- l10n_ve_fiscal_requirements/__init__.py 2011-09-27 00:55:47 +0000
3+++ l10n_ve_fiscal_requirements/__init__.py 2011-09-30 19:05:29 +0000
4@@ -18,10 +18,10 @@
5 # along with this program. If not, see <http://www.gnu.org/licenses/>.
6 #
7 ##############################################################################
8-
9 import purchase
10 import stock
11 import invoice
12 import partner
13-
14+import res_company
15+import wizard
16 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
17
18=== modified file 'l10n_ve_fiscal_requirements/__openerp__.py'
19--- l10n_ve_fiscal_requirements/__openerp__.py 2011-09-27 01:19:42 +0000
20+++ l10n_ve_fiscal_requirements/__openerp__.py 2011-09-30 19:05:29 +0000
21@@ -26,18 +26,36 @@
22 "author" : "Vauxoo",
23 "website" : "http://vauxoo.com",
24 "category": 'Generic Modules/Accounting',
25- "description": """Requirements Venezuelan tax laws:
26- - Invoice reference
27+ "description": """Venezuelan Tax Laws Requirements:
28+ - Invoice Control Number
29 - Tax-except
30 - Required address invoice
31 - Unique address invoice.
32 - VAT verification for Venezuela rules.
33+ - Damaged invoices justification.
34+ ---------------------------------------------------------------------------
35+ For damaged invoices, you must go to the company and, under the configuration section,
36+ create the corresponding journal and account.
37+
38+ ------------------------TECH INFO-------------------------------------------
39+ CHANGELOG:
40+ - For the migration to the l10n_ve on OpenERP:
41+ - Changed the Invoice Ref label to Control Number
42+ - Integrated the l10n_ve_nro_ctrl module functionality on this one
43+ - Since the concept_id field is added by the l10n_ve_islr_withholding, an
44+ error es rised if it's not installed and it is necesary to withhold
45+ - If you need to withhold ISLR, you must install the module mentioned abofe
46+
47+ FURTHER DEVELOPMENT:
48+ - Find a way to decouple this module and l10n_ve_islr_withholding
49 """,
50 'init_xml': [],
51 "depends" : ["base", "base_vat", "purchase", "stock", "account"],
52 'update_xml': [
53- 'stock_view.xml',
54- 'account_invoice_view.xml'
55+ 'view/stock_view.xml',
56+ 'view/account_invoice_view.xml',
57+ 'view/res_company_view.xml',
58+ 'wizard/wizard_invoice_nro_ctrl_view.xml'
59 ],
60 'demo_xml': [],
61 'test': [],
62
63=== modified file 'l10n_ve_fiscal_requirements/i18n/es_VE.po'
64--- l10n_ve_fiscal_requirements/i18n/es_VE.po 2011-06-02 16:04:35 +0000
65+++ l10n_ve_fiscal_requirements/i18n/es_VE.po 2011-09-30 19:05:29 +0000
66@@ -4,10 +4,10 @@
67 #
68 msgid ""
69 msgstr ""
70-"Project-Id-Version: OpenERP Server 6.0.1\n"
71+"Project-Id-Version: OpenERP Server 6.0.3\n"
72 "Report-Msgid-Bugs-To: support@openerp.com\n"
73-"POT-Creation-Date: 2011-04-04 20:01+0000\n"
74-"PO-Revision-Date: 2011-04-04 20:01+0000\n"
75+"POT-Creation-Date: 2011-09-30 18:40+0000\n"
76+"PO-Revision-Date: 2011-09-30 18:40+0000\n"
77 "Last-Translator: <>\n"
78 "Language-Team: \n"
79 "MIME-Version: 1.0\n"
80@@ -16,142 +16,250 @@
81 "Plural-Forms: \n"
82
83 #. module: l10n_ve_fiscal_requirements
84-#: sql_constraint:purchase.order:0
85-msgid "Order Reference must be unique !"
86-msgstr "¡La referencia del pedido debe ser única!"
87+#: help:res.company,account_id:0
88+msgid "Default account used for invoices and lines from damaged invoices"
89+msgstr "Cuenta por defecto para líneas y facturas dañadas"
90+
91+#. module: l10n_ve_fiscal_requirements
92+#: code:addons/l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl.py:88
93+#, python-format
94+msgid "You have to install the ISLR Withholding"
95+msgstr "Debe instalar el módulo para realizar retención de ISLR"
96
97 #. module: l10n_ve_fiscal_requirements
98 #: field:account.invoice,sin_cred:0
99 msgid "Tax-exempt?"
100-msgstr "Sin derecho a credito fiscal?"
101-
102-#. module: l10n_ve_fiscal_requirements
103-#: model:ir.module.module,description:l10n_ve_fiscal_requirements.module_meta_information
104-msgid "Requirements Venezuelan tax laws:\n"
105-" - Invoice reference\n"
106-" - Tax-exempt\n"
107-" - Required address invoice\n"
108-" - Unique address invoice.\n"
109-" "
110-msgstr "Requisitos fiscales de las leyes venezolanas:\n"
111-" - Nro. de control\n"
112-" - excepto de credito fiscal\n"
113-" - Obligatoriedad de la dirección fiscal\n"
114-" - Singularidad de la dirección fiscal.\n"
115-" "
116-
117-#. module: l10n_ve_fiscal_requirements
118-#: model:ir.model,name:l10n_ve_fiscal_requirements.model_purchase_order
119-msgid "Purchase Order"
120-msgstr "Pedido de compra"
121-
122-#. module: l10n_ve_fiscal_requirements
123-#: help:account.invoice,nro_ctrl:0
124-#: help:stock.picking,nro_ctrl:0
125-msgid "Invoice reference"
126-msgstr "Número de control"
127+msgstr "Libre de impuesto?"
128+
129+#. module: l10n_ve_fiscal_requirements
130+#: view:wizard.invoice.nro.ctrl:0
131+msgid "Create an invoice to justify the damaged one"
132+msgstr "Crear una factura para justificar otra dañada"
133+
134+#. module: l10n_ve_fiscal_requirements
135+#: view:res.company:0
136+msgid "Data used by default for invoices damaged"
137+msgstr "Datos por defecto para facturas dañadas"
138+
139+#. module: l10n_ve_fiscal_requirements
140+#: code:addons/l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl.py:113
141+#, python-format
142+msgid "Please confirm that you know what you're doing by checking the option bellow!"
143+msgstr "Por favor, confirme que está seguro de que desea hacer esto!"
144+
145+#. module: l10n_ve_fiscal_requirements
146+#: constraint:res.company:0
147+msgid "Error! You can not create recursive companies."
148+msgstr "Error! no puede crear compañías recursivas."
149+
150+#. module: l10n_ve_fiscal_requirements
151+#: view:wizard.invoice.nro.ctrl:0
152+msgid "Create Invoice"
153+msgstr "Crear Factura"
154
155 #. module: l10n_ve_fiscal_requirements
156 #: model:ir.module.module,shortdesc:l10n_ve_fiscal_requirements.module_meta_information
157 msgid "Fiscal requirements Venezuelan laws"
158-msgstr "Requerimientos fiscales de las leyes venezolanas"
159-
160-#. module: l10n_ve_fiscal_requirements
161-#: model:ir.model,name:l10n_ve_fiscal_requirements.model_account_invoice
162-msgid "Invoice"
163-msgstr "Factura"
164+msgstr "Requerimientos fiscales de las Leyes Venezolanas"
165
166 #. module: l10n_ve_fiscal_requirements
167 #: model:ir.model,name:l10n_ve_fiscal_requirements.model_stock_picking
168 msgid "Picking List"
169-msgstr "Albarán"
170+msgstr "Lista de picking"
171+
172+#. module: l10n_ve_fiscal_requirements
173+#: constraint:res.partner.address:0
174+msgid "Error ! The partner already has an invoice address. "
175+msgstr "Error ! Este cliente ya tiene una dirección fiscal. "
176+
177+#. module: l10n_ve_fiscal_requirements
178+#: model:ir.actions.act_window,name:l10n_ve_fiscal_requirements.menu_create_invoice_duplicate
179+msgid "Generate null paper"
180+msgstr "Generar papel dañado"
181+
182+#. module: l10n_ve_fiscal_requirements
183+#: help:res.company,journal_id:0
184+msgid "Default journal for damaged invoices"
185+msgstr "Diario por defecto para Facturas Dañadas"
186+
187+#. module: l10n_ve_fiscal_requirements
188+#: sql_constraint:purchase.order:0
189+msgid "Order Reference must be unique !"
190+msgstr "La referencia debe ser única !"
191+
192+#. module: l10n_ve_fiscal_requirements
193+#: code:addons/l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl.py:50
194+#: code:addons/l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl.py:88
195+#, python-format
196+msgid "ERROR !"
197+msgstr "ERROR !"
198+
199+#. module: l10n_ve_fiscal_requirements
200+#: field:res.company,journal_id:0
201+msgid "Journal"
202+msgstr "Diario"
203+
204+#. module: l10n_ve_fiscal_requirements
205+#: help:account.invoice,nro_ctrl:0
206+msgid "Code used for intern invoice control"
207+msgstr "Código para control interno de facturas"
208
209 #. module: l10n_ve_fiscal_requirements
210 #: field:account.invoice,nro_ctrl:0
211+#: field:wizard.invoice.nro.ctrl,nro_ctrl:0
212+msgid "Control Number"
213+msgstr "Número de control"
214+
215+#. module: l10n_ve_fiscal_requirements
216+#: view:res.company:0
217+msgid "Configuration"
218+msgstr "Configuración"
219+
220+#. module: l10n_ve_fiscal_requirements
221 #: field:stock.picking,nro_ctrl:0
222 msgid "Invoice ref."
223-msgstr "Nro. Control"
224+msgstr "Número de Control"
225+
226+#. module: l10n_ve_fiscal_requirements
227+#: field:res.company,account_id:0
228+msgid "Account"
229+msgstr "Cuenta"
230+
231+#. module: l10n_ve_fiscal_requirements
232+#: constraint:res.partner:0
233+msgid "Error ! The partner does not have an invoice address. "
234+msgstr "Error ! Este cliente no posée una dirección fiscal. "
235+
236+#. module: l10n_ve_fiscal_requirements
237+#: model:ir.actions.act_window,name:l10n_ve_fiscal_requirements.wizard_invoice_nro_control
238+msgid "Create null paper"
239+msgstr "Crear papel dañado"
240+
241+#. module: l10n_ve_fiscal_requirements
242+#: model:ir.model,name:l10n_ve_fiscal_requirements.model_res_company
243+msgid "Companies"
244+msgstr "Compañías"
245+
246+#. module: l10n_ve_fiscal_requirements
247+#: code:addons/l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl.py:50
248+#, python-format
249+msgid "This partner does not have an invoice address"
250+msgstr "Este cliente no tiene una dirección fiscal"
251+
252+#. module: l10n_ve_fiscal_requirements
253+#: model:ir.model,name:l10n_ve_fiscal_requirements.model_purchase_order
254+msgid "Purchase Order"
255+msgstr "Orden de compra"
256+
257+#. module: l10n_ve_fiscal_requirements
258+#: code:addons/l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl.py:113
259+#: code:addons/l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl.py:117
260+#, python-format
261+msgid "Error!"
262+msgstr "Error!"
263+
264+#. module: l10n_ve_fiscal_requirements
265+#: model:ir.model,name:l10n_ve_fiscal_requirements.model_wizard_invoice_nro_ctrl
266+msgid "wizard.invoice.nro.ctrl"
267+msgstr "wizard.invoice.nro.ctrl"
268+
269+#. module: l10n_ve_fiscal_requirements
270+#: view:wizard.invoice.nro.ctrl:0
271+msgid "Are you sure you want to do this?"
272+msgstr "¿Está seguro de que desea hacer esto?"
273
274 #. module: l10n_ve_fiscal_requirements
275 #: help:account.invoice,sin_cred:0
276-msgid "setting to true if the invoice is exempt from V.A.T"
277-msgstr "Seleccione esta casilla si la factura no tiene derecho a credito fiscal "
278-
279-#. module: l10n_ve_fiscal_requirements
280-#: constraint:res.partner.address:0
281-msgid "Error ! The partner already have an invoice address. "
282-msgstr "Error ! El cliente/proveedor ya posee una dirección fiscal. "
283-
284-#. module: l10n_ve_fiscal_requirements
285-#: constraint:res.partner:0
286-msgid "Error ! The partner does not have an invoice address. "
287-msgstr "Error ! No ha definido una direccion fiscal. "
288-
289-
290-#. module: base_vat
291-#: code:addons/base_vat/base_vat.py:87
292-#, python-format
293-msgid ""
294-"The Vat does not seems to be correct. You should have entered something like "
295-"this %s"
296-msgstr ""
297-"El RIF parece que no es correcto. Debería haber introducido algo como "
298-"esto %s"
299-
300-#. module: base_vat
301-#: model:ir.module.module,description:base_vat.module_meta_information
302-msgid ""
303-"\n"
304-" Enable the VAT Number for the partner. Check the validity of that VAT "
305-"Number.\n"
306-"\n"
307-" This module follows the methods stated at http://sima-pc.com/nif.php "
308-"for\n"
309-" checking the validity of VAT Number assigned to partners in European "
310-"countries.\n"
311-" "
312-msgstr ""
313-"\n"
314-" Permite la validación del RIF/NIT de las empresas. Comprueba si el "
315-"RIF es un número válido.\n"
316-"\n"
317-" Este módulo usa los métodos especificados en http://sima-pc.com/nif.php "
318-"para\n"
319-" la validación del RIF/NIT asignado a las empresas de los países "
320-"europeos.\n"
321-" "
322-
323-#. module: base_vat
324-#: model:ir.module.module,shortdesc:base_vat.module_meta_information
325-msgid "Base VAT - To check VAT number validity"
326-msgstr "Base RIF/NIT - Para comprobar la validez de los RIT/NIT"
327-
328-#. module: base_vat
329-#: constraint:res.partner:0
330-msgid "Error ! You can not create recursive associated members."
331-msgstr "¡Error! No puede crear miembros asociados recursivos."
332-
333-#. module: base_vat
334-#: code:addons/base_vat/base_vat.py:88
335-#, python-format
336-msgid "The VAT is invalid, It should begin with the country code"
337-msgstr "El RIF no es válido, debería empezar con el código del país"
338-
339-#. module: base_vat
340-#: help:res.partner,vat_subjected:0
341-msgid ""
342-"Check this box if the partner is subjected to the VAT. It will be used for "
343-"the VAT legal statement."
344-msgstr ""
345-"Marque esta opción si la empresa está sujeta al IVA. Será utilizado para la "
346-"declaración legal del IVA."
347-
348-#. module: base_vat
349-#: model:ir.model,name:base_vat.model_res_partner
350+msgid "Set it true if the invoice is V.A.T. exempt"
351+msgstr "Marcar si la factura es libre de impuesto"
352+
353+#. module: l10n_ve_fiscal_requirements
354+#: field:wizard.invoice.nro.ctrl,sure:0
355+msgid "Are You Sure?"
356+msgstr "¿Está seguro?"
357+
358+#. module: l10n_ve_fiscal_requirements
359+#: help:stock.picking,nro_ctrl:0
360+msgid "Invoice reference"
361+msgstr "Referencia"
362+
363+#. module: l10n_ve_fiscal_requirements
364+#: help:wizard.invoice.nro.ctrl,nro_ctrl:0
365+msgid "New control number of the invoice damaged."
366+msgstr "Nuevo número de control para la factura dañada."
367+
368+#. module: l10n_ve_fiscal_requirements
369+#: code:addons/l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl.py:117
370+#, python-format
371+msgid "You must go to the company form and configure a journal and an account for damaged invoices"
372+msgstr "Debe ir a la compañía y configurar un diario y una cuenta para facturas dañadas"
373+
374+#. module: l10n_ve_fiscal_requirements
375+#: model:ir.model,name:l10n_ve_fiscal_requirements.model_account_invoice
376+msgid "Invoice"
377+msgstr "Factura"
378+
379+#. module: l10n_ve_fiscal_requirements
380+#: model:ir.module.module,description:l10n_ve_fiscal_requirements.module_meta_information
381+msgid "Venezuelan Tax Laws Requirements:\n"
382+" - Invoice Control Number\n"
383+" - Tax-except\n"
384+" - Required address invoice\n"
385+" - Unique address invoice.\n"
386+" - VAT verification for Venezuela rules.\n"
387+" - Damaged invoices justification.\n"
388+" ---------------------------------------------------------------------------\n"
389+" For damaged invoices, you must go to the company and, under the configuration section,\n"
390+" create the corresponding journal and account.\n"
391+"\n"
392+" ------------------------TECH INFO-------------------------------------------\n"
393+" CHANGELOG:\n"
394+" - For the migration to the l10n_ve on OpenERP:\n"
395+" - Changed the Invoice Ref label to Control Number\n"
396+" - Integrated the l10n_ve_nro_ctrl module functionality on this one\n"
397+" - Since the concept_id field is added by the l10n_ve_islr_withholding, an\n"
398+" error es rised if it's not installed and it is necesary to withhold\n"
399+" - If you need to withhold ISLR, you must install the module mentioned abofe\n"
400+"\n"
401+" FURTHER DEVELOPMENT:\n"
402+" - Find a way to decouple this module and l10n_ve_islr_withholding\n"
403+" "
404+msgstr "Requerimientos fiscales de las Leyes Venezolanas:\n"
405+" - Número de control para facturas\n"
406+" - Excento de impuesto\n"
407+" - Se requiere de una dirección fiscal\n"
408+" - Dirección de facturación única.\n"
409+" - Verificación de RIF.\n"
410+" - Justificación de facturas dañadas.\n"
411+" ---------------------------------------------------------------------------\n"
412+" Para justificar facturas dañadas, debe ir a la compañía y, en la pestaña de Configuración,\n"
413+" crear el diario y la cuenta cosrrespondiente.\n"
414+"\n"
415+" ------------------------Info Técnica-------------------------------------------\n"
416+" CHANGELOG:\n"
417+" - Para la migración de la localización a la versión 6:\n"
418+" - Se cambió la etiqueta de referencia de factura a Número de Control\n"
419+" - Se integró la funcionalidad del módulo l10n_invoice_nro_ctrl\n"
420+" - Debido a que el campo concept_id es agregado por el módulo l10n_ve_islr_withholding, se genera un\n"
421+" error si dicho módulo no está instalado, es decir, si el campo no existe\n"
422+" - Si necesita retener ISLR, debe instalar el módulo mencionado anteriormente\n"
423+"\n"
424+" Desarrollos futuros:\n"
425+" - Desacoplar este módulo y el de retención de ISLR\n"
426+" "
427+
428+#. module: l10n_ve_fiscal_requirements
429+#: view:wizard.invoice.nro.ctrl:0
430+msgid "Cancel"
431+msgstr "Cancelar"
432+
433+#. module: l10n_ve_fiscal_requirements
434+#: model:ir.model,name:l10n_ve_fiscal_requirements.model_res_partner
435 msgid "Partner"
436-msgstr "Empresa"
437-
438-#. module: base_vat
439-#: field:res.partner,vat_subjected:0
440-msgid "VAT Legal Statement"
441-msgstr "Sujeto a IVA"
442+msgstr "Cliente"
443+
444+#. module: l10n_ve_fiscal_requirements
445+#: model:ir.model,name:l10n_ve_fiscal_requirements.model_res_partner_address
446+msgid "Partner Addresses"
447+msgstr "Direcciones de Clientes"
448+
449
450=== modified file 'l10n_ve_fiscal_requirements/invoice.py'
451--- l10n_ve_fiscal_requirements/invoice.py 2011-09-30 15:40:19 +0000
452+++ l10n_ve_fiscal_requirements/invoice.py 2011-09-30 19:05:29 +0000
453@@ -25,12 +25,9 @@
454 class account_invoice(osv.osv):
455 _inherit = 'account.invoice'
456 _columns = {
457- 'nro_ctrl': fields.char('Control Number', size=32, readonly=True, states={'draft':[('readonly',False)]}, help="Invoice reference"),
458- 'sin_cred': fields.boolean('Tax-exempt?', readonly=False, help="setting to true if the invoice is exempt from V.A.T"),
459+ 'nro_ctrl': fields.char('Control Number', size=32, readonly=True, states={'draft':[('readonly',False)]}, help="Code used for intern invoice control"),
460+ 'sin_cred': fields.boolean('Tax-exempt?', readonly=False, help="Set it true if the invoice is V.A.T. exempt"),
461 }
462-
463-
464-
465 account_invoice()
466
467
468
469=== modified file 'l10n_ve_fiscal_requirements/partner.py'
470--- l10n_ve_fiscal_requirements/partner.py 2011-09-29 20:04:51 +0000
471+++ l10n_ve_fiscal_requirements/partner.py 2011-09-30 19:05:29 +0000
472@@ -26,7 +26,7 @@
473 _inherit='res.partner.address'
474
475 '''
476- Unique address invoice
477+ Invoice Address uniqueness check
478 '''
479 def _check_addr_invoice(self,cr,uid,ids,context={}):
480 obj_addr = self.browse(cr,uid,ids[0])
481@@ -42,7 +42,7 @@
482
483
484 _constraints = [
485- (_check_addr_invoice, 'Error ! The partner already have an invoice address. ', [])
486+ (_check_addr_invoice, 'Error ! The partner already has an invoice address. ', [])
487 ]
488
489 res_partner_address()
490@@ -52,7 +52,7 @@
491 _inherit = 'res.partner'
492
493 '''
494- Required address invoice
495+ Required Invoice Address
496 '''
497 def _check_partner_invoice_addr(self,cr,uid,ids,context={}):
498 partner_obj = self.browse(cr,uid,ids[0])
499@@ -79,8 +79,8 @@
500
501 def check_vat_ve(self, vat):
502 '''
503- Check Venezuela VAT number.
504- Registro de Identificacion Fiscal Venezolana RIF: JXXXXXXXXX RIF CEDULA VENEZOLANO: VXXXXXXXXX CEDULA EXTRANJERO: EXXXXXXXXX
505+ Check Venezuelan VAT number, locally caled RIF.
506+ RIF: JXXXXXXXXX RIF CEDULA VENEZOLANO: VXXXXXXXXX CEDULA EXTRANJERO: EXXXXXXXXX
507 '''
508 if len(vat) != 10:
509 return False
510
511=== renamed file 'l10n_ve_invoice_nro_ctrl/model/res_company.py' => 'l10n_ve_fiscal_requirements/res_company.py'
512--- l10n_ve_invoice_nro_ctrl/model/res_company.py 2011-09-29 22:58:21 +0000
513+++ l10n_ve_fiscal_requirements/res_company.py 2011-09-30 19:05:29 +0000
514@@ -34,8 +34,8 @@
515 class res_company(osv.osv):
516 _inherit = 'res.company'
517 _columns = {
518- 'journal_id': fields.many2one('account.journal', 'Journal',required=True,help="Journal used by default for invoices damaged"),
519- 'account_id': fields.many2one('account.account', 'Account',required=True,help="Account used by default for invoices and lines of invoices damaged"),
520+ 'journal_id': fields.many2one('account.journal', 'Journal',required=True,help="Default journal for damaged invoices"),
521+ 'account_id': fields.many2one('account.account', 'Account',required=True,help="Default account used for invoices and lines from damaged invoices"),
522 }
523 res_company()
524
525
526=== renamed directory 'l10n_ve_invoice_nro_ctrl/view' => 'l10n_ve_fiscal_requirements/view'
527=== renamed file 'l10n_ve_fiscal_requirements/account_invoice_view.xml' => 'l10n_ve_fiscal_requirements/view/account_invoice_view.xml'
528=== renamed file 'l10n_ve_fiscal_requirements/stock_view.xml' => 'l10n_ve_fiscal_requirements/view/stock_view.xml'
529=== renamed directory 'l10n_ve_invoice_nro_ctrl/wizard' => 'l10n_ve_fiscal_requirements/wizard'
530=== modified file 'l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl.py'
531--- l10n_ve_invoice_nro_ctrl/wizard/wizard_invoice_nro_ctrl.py 2011-09-30 15:03:28 +0000
532+++ l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl.py 2011-09-30 19:05:29 +0000
533@@ -77,12 +77,15 @@
534 'quantity': 0,
535 'invoice_id': inv_id,
536 })
537- for inv_line in inv_brw.invoice_line:
538- if inv_line.concept_id or False:
539- invoice_line.update({
540- 'concept_id':inv_line.concept_id.id,
541- })
542- break
543+ try:
544+ for inv_line in inv_brw.invoice_line:
545+ if inv_line.concept_id or False:
546+ invoice_line.update({
547+ 'concept_id': inv_line.concept_id.id or 1,
548+ })
549+ break
550+ except:
551+ raise osv.except_osv(_("ERROR !"), _("You have to install the ISLR Withholding"))
552 invoice_line_id = invoice_line_obj.create(cr, uid, invoice_line, {})
553 return inv_id
554
555
556=== removed directory 'l10n_ve_invoice_nro_ctrl'
557=== removed file 'l10n_ve_invoice_nro_ctrl/__init__.py'
558--- l10n_ve_invoice_nro_ctrl/__init__.py 2011-09-29 23:01:25 +0000
559+++ l10n_ve_invoice_nro_ctrl/__init__.py 1970-01-01 00:00:00 +0000
560@@ -1,28 +0,0 @@
561-#!/usr/bin/python
562-# -*- encoding: utf-8 -*-
563-###########################################################################
564-# Module Writen to OpenERP, Open Source Management Solution
565-# Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).
566-# All Rights Reserved
567-###############Credits######################################################
568-# Coded by: Maria Gabriela Quilarque <gabrielaquilarque97@gmail.com>
569-# Planified by: Nhomar Hernandez
570-# Finance by: Helados Gilda, C.A. http://heladosgilda.com.ve
571-# Audited by: Humberto Arocha humberto@openerp.com.ve
572-#############################################################################
573-# This program is free software: you can redistribute it and/or modify
574-# it under the terms of the GNU General Public License as published by
575-# the Free Software Foundation, either version 3 of the License, or
576-# (at your option) any later version.
577-#
578-# This program is distributed in the hope that it will be useful,
579-# but WITHOUT ANY WARRANTY; without even the implied warranty of
580-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
581-# GNU General Public License for more details.
582-#
583-# You should have received a copy of the GNU General Public License
584-# along with this program. If not, see <http://www.gnu.org/licenses/>.
585-##############################################################################
586-
587-import wizard
588-import model
589
590=== removed file 'l10n_ve_invoice_nro_ctrl/__openerp__.py'
591--- l10n_ve_invoice_nro_ctrl/__openerp__.py 2011-09-30 13:56:49 +0000
592+++ l10n_ve_invoice_nro_ctrl/__openerp__.py 1970-01-01 00:00:00 +0000
593@@ -1,45 +0,0 @@
594-#!/usr/bin/python
595-# -*- encoding: utf-8 -*-
596-###########################################################################
597-# Module Writen to OpenERP, Open Source Management Solution
598-# Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).
599-# All Rights Reserved
600-###############Credits######################################################
601-# Coded by: Maria Gabriela Quilarque <gabrielaquilarque97@gmail.com>
602-# Planified by: Nhomar Hernandez
603-# Finance by: Helados Gilda, C.A. http://heladosgilda.com.ve
604-# Audited by: Humberto Arocha humberto@openerp.com.ve
605-#############################################################################
606-# This program is free software: you can redistribute it and/or modify
607-# it under the terms of the GNU General Public License as published by
608-# the Free Software Foundation, either version 3 of the License, or
609-# (at your option) any later version.
610-#
611-# This program is distributed in the hope that it will be useful,
612-# but WITHOUT ANY WARRANTY; without even the implied warranty of
613-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
614-# GNU General Public License for more details.
615-#
616-# You should have received a copy of the GNU General Public License
617-# along with this program. If not, see <http://www.gnu.org/licenses/>.
618-##############################################################################
619-
620-{
621- "name" : "Generate Invoice Damaged",
622- "version" : "0.1",
623- "author" : "Openerp Venezuela",
624- "category" : "Generic Modules/Others",
625- "website": "http://wiki.openerp.org.ve/",
626- "description": '''
627- Generate Invoice from customer invoice form,
628- for justify invoice(paper) damaged.
629- ''',
630- "depends" : ["account", "l10n_ve_islr_withholding"],
631- "init_xml" : [],
632- "update_xml" : [
633- "wizard/wizard_invoice_nro_ctrl_view.xml",
634- "view/res_company_view.xml",
635- ],
636- "active": False,
637- "installable": True
638-}
639
640=== removed directory 'l10n_ve_invoice_nro_ctrl/model'
641=== removed file 'l10n_ve_invoice_nro_ctrl/model/__init__.py'
642--- l10n_ve_invoice_nro_ctrl/model/__init__.py 2011-09-29 22:58:21 +0000
643+++ l10n_ve_invoice_nro_ctrl/model/__init__.py 1970-01-01 00:00:00 +0000
644@@ -1,28 +0,0 @@
645-# -*- encoding: utf-8 -*-
646-##############################################################################
647-# Copyright (c) 2011 OpenERP Venezuela (http://openerp.com.ve)
648-# All Rights Reserved.
649-# Programmed by: Israel Fermín Montilla <israel@openerp.com.ve>
650-#
651-# WARNING: This program as such is intended to be used by professional
652-# programmers who take the whole responsability of assessing all potential
653-# consequences resulting from its eventual inadequacies and bugs
654-# End users who are looking for a ready-to-use solution with commercial
655-# garantees and support are strongly adviced to contract a Free Software
656-# Service Company
657-#
658-# This program is Free Software; you can redistribute it and/or
659-# modify it under the terms of the GNU General Public License
660-# as published by the Free Software Foundation; either version 2
661-# of the License, or (at your option) any later version.
662-#
663-# This program is distributed in the hope that it will be useful,
664-# but WITHOUT ANY WARRANTY; without even the implied warranty of
665-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
666-# GNU General Public License for more details.
667-#
668-# You should have received a copy of the GNU General Public License
669-# along with this program; if not, write to the Free Software
670-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
671-###############################################################################
672-import res_company