Merge lp:~acysos-team/openerp-spain/openerp-spain-6.0 into lp:~openerp-spain-team/openerp-spain/6.0

[Ignacio Ibeas (www.acysos.com)]

[FIX] l10n_es_payment_order: refactorización, eliminación del código de OpenERP 5.0 y herencia en CSB

Se ha eliminado todo el código que quedaba de OpenERP 5.0 a partir de los
cambios que realizo Pexego en el wizard para OpenERP 6.1. Este cambio hace que
99% del codigo del módulo sea igual para OpenERP 6.0 y 6.1 a diferencia de
una vista que ha cambiado en OpenERP 6.1 pero que solo afecta a una línea
(línea 26 de remesa_view.xml).
El resto del código es exactamente igual para ambas versiones. Esto facilita
mucho el mantenimiento.

Se ha modificado todas las clases de los cuadernos y del converter,
convirtiendolas en clases del OSV y, por lo tanto, permitiendo la herencia de
OpenERP.

[Joan M. Grande (totaler)]

Genial trabajo. Dos puntualizaciones:

- El objeto "payment.converter.spain" al no tener un reflejo en la base de datos, se le puede poner el atributo "_auto = False" para evitar crear una tabla vacia en postgres.
- Si el código fuera PEP8, ya sería la releche.

[lp:~acysos-team/openerp-spain/openerp-spain-6.0]

338. By Ignacio Ibeas (www.acysos.com) on 2013-01-07

[FIX] l10n_es_payment_order: fix auto = False en el converter

339. By Ignacio Ibeas (www.acysos.com) on 2013-01-07

[FIX] l10n_es_payment_order: fix auto = False en las clases que no necesitan tablas

[Ignacio Ibeas (www.acysos.com) (ignacio-acysos)]

Hola,

Ya esta añadido el _auto = False a todas las clases que no necesitan tablas.

Respecto a PEP8, tendrá que ser en otra revisión, ahora creo que es urgente tener un módulo que no tenga restos de OpenERP 5.0 y que permita herencia, para el desarrollo de nuevos módulos.

Saludos,
Ignacio Ibeas

[Ignacio Ibeas (www.acysos.com) (ignacio-acysos)]

Como veo que no hay más comentario procedo a hacer el merge.

Saludos

[Ignacio Ibeas (www.acysos.com) (ignacio-acysos)]

review: Approve

[lp:~acysos-team/openerp-spain/openerp-spain-6.0]

340. By Ignacio Ibeas (www.acysos.com) on 2013-01-11

Merge: actulizar cambios

=== modified file 'l10n_es_payment_order/__init__.py'
--- l10n_es_payment_order/__init__.py	2011-08-29 15:11:11 +0000
+++ l10n_es_payment_order/__init__.py	2013-01-11 10:23:22 +0000
@@ -7,6 +7,8 @@
 #    Copyright (c) 2008 Pablo Rocandio. All Rights Reserved.
 #    Copyright (c) 2009 Zikzakmedia S.L. (http://zikzakmedia.com) All Rights Reserved.
 #                       Jordi Esteve <[e-mail]>
+#    AvanzOSC, Advanced Open Source Consulting 
+#    Copyright (C) 2011-2012 Ainara Galdona (www.avanzosc.com). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
 
=== modified file 'l10n_es_payment_order/__openerp__.py'
--- l10n_es_payment_order/__openerp__.py	2012-03-03 11:14:30 +0000
+++ l10n_es_payment_order/__openerp__.py	2013-01-11 10:23:22 +0000
@@ -7,8 +7,13 @@
 #    Copyright (c) 2008 Acysos SL. All Rights Reserved.
 #                       Ignacio Ibeas <[e-mail]>
 #    Copyright (c) 2008 Pablo Rocandio. All Rights Reserved.
+#    AvanzOSC, Advanced Open Source Consulting 
+#    Copyright (C) 2011-2012 Ainara Galdona (www.avanzosc.com). All Rights Reserved
 #    $Id$
 #
+# Refactorización. Acysos S.L. (http://www.acysos.com) 2012
+#   Ignacio Ibeas <[e-mail]>
+#
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
@@ -26,7 +31,7 @@
 
 {
     "name" : "Exportación de ficheros bancarios CSB 19, CSB 32, CSB 34 y CSB 58",
-    "version" : "1.5",
+    "version" : "1.6",
     "author" : "Acysos SL, Zikzakmedia SL, Pablo Rocandio, NaN·tic",
     "category" : "Localisation/Accounting",
     "description" : """Módulo para la exportación de ficheros bancarios según las normas CSB 19 (recibos domiciliados), CBS 32 (descuento comercial), CSB 58 (anticipos de créditos) y CSB 34 (emisión de transferencias, nóminas, cheques, pagarés y pagos certificados) para poder ser enviados a la entidad bancaria.
@@ -49,7 +54,12 @@
     "depends" : ["base", "account", "account_payment_extension",],
     "init_xml" : ["remesas_data.xml"],
     "demo_xml" : [],
-    "update_xml" : ["remesas_report.xml", "remesas_view.xml", "remesas_wizard.xml",],
+    "update_xml" : [
+		"remesas_report.xml", 
+		"remesas_view.xml", 
+		"wizard/export_remesas_view.xml",
+        "security/ir.model.access.csv"
+		],
     "installable" : True,
     "active" : False,
 }
 
=== modified file 'l10n_es_payment_order/i18n/es.po'
--- l10n_es_payment_order/i18n/es.po	2011-08-03 15:44:39 +0000
+++ l10n_es_payment_order/i18n/es.po	2013-01-11 10:23:22 +0000
@@ -1,67 +1,29 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* l10n_ES_remesas
+#	* l10n_es_payment_order
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.15\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-05-24 11:11+0000\n"
-"PO-Revision-Date: 2011-05-24 13:34+0100\n"
-"Last-Translator: Jesús Martín <[e-mail]>\n"
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-09-03 00:18+0000\n"
+"PO-Revision-Date: 2012-09-03 00:18+0000\n"
+"Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
 #. module: l10n_es_payment_order
-#: report:remesas.report:0
-msgid "Matur. date"
-msgstr "Fecha de vencimiento"
-
-#. module: l10n_es_payment_order
 #: selection:payment.mode,tipo:0
 msgid "CSB 19"
 msgstr "CSB 19"
 
 #. module: l10n_es_payment_order
-#: model:ir.module.module,description:l10n_es_payment_order.module_meta_information
-msgid ""
-"Módulo para la exportación de ficheros bancarios según las normas CSB 19 (recibos domiciliados), CBS 32 (descuento comercial), CSB 58 (anticipos de créditos) y CSB 34 (emisión de transferencias, nóminas, cheques, pagarés y pagos certificados) para poder ser enviados a la entidad bancaria.\n"
-"\n"
-"Crea un tipo de pago \"Recibo domiciliado\" con el código RECIBO_CSB. Este código es importante pues permite ejecutar el asistente de creación del fichero de remesas cuando se presiona el botón \"Realizar pagos\" en la orden de pagos o remesa.\n"
-"\n"
-"También crea los tipos de pago \"Transferencia\" (TRANSFERENCIA_CSB), \"Pagaré\" (PAGARE_CSB), \"Cheque\" (CHEQUE_CSB), \"Pago certificado\" (PAGO_CERTIFICADO_CSB).\n"
-"\n"
-"Antes de generar un fichero bancario CSB habrá que definir un modo de pago que use el tipo de pago anterior y donde se defina la forma de pago (CSB 19, CSB 32, CSB 34 o CSB 58), la compañía que emite el fichero y el sufijo y nombre de compañia a incluir en el fichero.\n"
-"\n"
-"Al crear el fichero bancario CSB:\n"
-"\n"
-"  * Se pueden agrupar o no los pagos de una misma empresa y cuenta bancaria\n"
-"  * El fichero creado se guarda como adjunto de la orden de pagos. Se puede volver a crear el fichero de remesas siempre que sea necesario (puede tener que renombrar el anterior fichero adjunto si tienen el mismo nombre).\n"
-"\n"
-"También se proporciona un informe para imprimir un listado de los pagos/cobros de la orden de pago/cobro (remesa).\n"
-msgstr ""
-"Módulo para la exportación de ficheros bancarios según las normas CSB 19 (recibos domiciliados), CBS 32 (descuento comercial), CSB 58 (anticipos de créditos) y CSB 34 (emisión de transferencias, nóminas, cheques, pagarés y pagos certificados) para poder ser enviados a la entidad bancaria.\n"
-"\n"
-"Crea un tipo de pago \"Recibo domiciliado\" con el código RECIBO_CSB. Este código es importante pues permite ejecutar el asistente de creación del fichero de remesas cuando se presiona el botón \"Realizar pagos\" en la orden de pagos o remesa.\n"
-"\n"
-"También crea los tipos de pago \"Transferencia\" (TRANSFERENCIA_CSB), \"Pagaré\" (PAGARE_CSB), \"Cheque\" (CHEQUE_CSB), \"Pago certificado\" (PAGO_CERTIFICADO_CSB).\n"
-"\n"
-"Antes de generar un fichero bancario CSB habrá que definir un modo de pago que use el tipo de pago anterior y donde se defina la forma de pago (CSB 19, CSB 32, CSB 34 o CSB 58), la compañía que emite el fichero y el sufijo y nombre de compañia a incluir en el fichero.\n"
-"\n"
-"Al crear el fichero bancario CSB:\n"
-"\n"
-"  * Se pueden agrupar o no los pagos de una misma empresa y cuenta bancaria\n"
-"  * El fichero creado se guarda como adjunto de la orden de pagos. Se puede volver a crear el fichero de remesas siempre que sea necesario (puede tener que renombrar el anterior fichero adjunto si tienen el mismo nombre).\n"
-"\n"
-"También se proporciona un informe para imprimir un listado de los pagos/cobros de la orden de pago/cobro (remesa).\n"
-
-#. module: l10n_es_payment_order
-#: help:payment.mode,send_type:0
-msgid "The sending type of the payment file"
-msgstr "El tipos de envío del archivo de pago"
+#: field:payment.mode,send_type:0
+msgid "Send Type"
+msgstr "Tipo de envío"
 
 #. module: l10n_es_payment_order
 #: field:payment.mode,add_date:0
@@ -79,14 +41,17 @@
 msgstr "CIF"
 
 #. module: l10n_es_payment_order
+#: view:wizard.payment.file.spain:0
+msgid "_Export"
+msgstr "_Exportar"
+
+#. module: l10n_es_payment_order
 #: code:addons/l10n_es_payment_order/wizard/converter.py:71
 #, python-format
-msgid ""
-"Error:\n"
+msgid "Error:\n"
 "\n"
 "Can not convert float number %(number).2f to fit in %(size)d characters."
-msgstr ""
-"Error:\n"
+msgstr "Error:\n"
 "\n"
 "No se puede convertir el número %(number).2f para que quepa en %(size)d caracteres."
 
@@ -111,49 +76,34 @@
 msgstr "Cedente"
 
 #. module: l10n_es_payment_order
-#: code:addons/l10n_es_payment_order/wizard/export_remesas.py:151
-#, python-format
-msgid ""
-"User error:\n"
-"\n"
-"The payment mode is not CSB 19, CSB 32, CSB 34 or CSB 58"
-msgstr ""
-"Error del usuario:\n"
-"\n"
-"El modo de pago no es CSB 19, CSB 32, CSB 34 ni CSB 58"
-
-#. module: l10n_es_payment_order
-#: report:remesas.report:0
-msgid "Account:"
-msgstr "C.C.:"
-
-#. module: l10n_es_payment_order
-#: selection:payment.mode,cost_key:0
-msgid "Expense of the Recipient"
-msgstr "Gastos por cuenta del beneficiario"
-
-#. module: l10n_es_payment_order
-#: wizard_button:export_payment_file_spain,export,end:0
-#: wizard_button:export_payment_file_spain,init,export:0
-msgid "Ok"
-msgstr "Aceptar"
-
-#. module: l10n_es_payment_order
-#: code:addons/l10n_es_payment_order/wizard/export_remesas.py:140
-#, python-format
-msgid ""
-"User error:\n"
+#: model:ir.model,name:l10n_es_payment_order.model_wizard_payment_file_export_spain
+msgid "Pay file export spain"
+msgstr "Pay file export spain"
+
+#. module: l10n_es_payment_order
+#: model:ir.model,name:l10n_es_payment_order.model_wizard_payment_file_spain
+msgid "wizard.payment.file.spain"
+msgstr "wizard.payment.file.spain"
+
+#. module: l10n_es_payment_order
+#: field:payment.mode,not_to_the_order:0
+msgid "Not to the Order"
+msgstr "No a la orden"
+
+#. module: l10n_es_payment_order
+#: code:addons/l10n_es_payment_order/wizard/export_remesas.py:129
+#, python-format
+msgid "User error:\n"
 "\n"
 "The bank account number of the customer %s has not 20 digits."
-msgstr ""
-"Error del usuario:\n"
+msgstr "Error del usuario:\n"
 "\n"
 "El número de C.C. del cliente %s no tiene 20 dígitos."
 
 #. module: l10n_es_payment_order
-#: wizard_field:export_payment_file_spain,export,pay_fname:0
+#: field:wizard.payment.file.spain,pay_fname:0
 msgid "File name"
-msgstr "Nombre del fichero"
+msgstr "Nombre Fichero"
 
 #. module: l10n_es_payment_order
 #: help:payment.mode,concept:0
@@ -161,19 +111,14 @@
 msgstr "Concepto de la orden."
 
 #. module: l10n_es_payment_order
-#: model:ir.actions.report.xml,name:l10n_es_payment_order.remesas_report
-msgid "Remesa"
-msgstr "Remesa"
-
-#. module: l10n_es_payment_order
 #: field:payment.mode,barred:0
 msgid "Barred"
 msgstr "Barrado"
 
 #. module: l10n_es_payment_order
-#: field:payment.mode,send_type:0
-msgid "Send Type"
-msgstr "Tipo de envío"
+#: help:payment.mode,send_type:0
+msgid "The sending type of the payment file"
+msgstr "El tipos de envío del archivo de pago"
 
 #. module: l10n_es_payment_order
 #: help:payment.mode,direct_pay_order:0
@@ -181,14 +126,12 @@
 msgstr "Por defecto 'No'."
 
 #. module: l10n_es_payment_order
-#: code:addons/l10n_es_payment_order/wizard/export_remesas.py:137
+#: code:addons/l10n_es_payment_order/wizard/export_remesas.py:126
 #, python-format
-msgid ""
-"User error:\n"
+msgid "User error:\n"
 "\n"
 "The bank account number of the customer %s is not defined and current payment mode enforces all lines to have a bank account."
-msgstr ""
-"Error del usuario:\n"
+msgstr "Error del usuario:\n"
 "\n"
 "La empresa %s no tiene definida ninguna cuenta bancaria y la forma de pago actual fuerza que todas las líneas tengan asignada una cuenta bancaria."
 
@@ -200,12 +143,10 @@
 #. module: l10n_es_payment_order
 #: code:addons/l10n_es_payment_order/wizard/converter.py:98
 #, python-format
-msgid ""
-"User error:\n"
+msgid "User error:\n"
 "\n"
 "The bank account number of %s is not defined."
-msgstr ""
-"Error del usuario:\n"
+msgstr "Error del usuario:\n"
 "\n"
 "El número de C.C. del cliente %s no existe."
 
@@ -215,31 +156,19 @@
 msgstr "Pagaré"
 
 #. module: l10n_es_payment_order
-#: report:remesas.report:0
-msgid "Payment date:"
-msgstr "Fecha cargo:"
-
-#. module: l10n_es_payment_order
-#: code:addons/l10n_es_payment_order/wizard/export_remesas.py:87
+#: code:addons/l10n_es_payment_order/wizard/export_remesas.py:73
 #, python-format
-msgid ""
-"User error:\n"
+msgid "User error:\n"
 "\n"
 "The bank account of the company %s is not defined."
-msgstr ""
-"Error del usuario:\n"
+msgstr "Error del usuario:\n"
 "\n"
 "No se ha definido el C.C. de la compañía %s."
 
 #. module: l10n_es_payment_order
-#: selection:payment.mode,csb34_type:0
-msgid "Transfer"
-msgstr "Transferencia"
-
-#. module: l10n_es_payment_order
-#: field:payment.mode,ine:0
-msgid "INE code"
-msgstr "Código INE"
+#: model:payment.type,name:l10n_es_payment_order.payment_type_giro0
+msgid "Giiro"
+msgstr "Giro"
 
 #. module: l10n_es_payment_order
 #: selection:payment.mode,tipo:0
@@ -247,6 +176,11 @@
 msgstr "CSB 32"
 
 #. module: l10n_es_payment_order
+#: model:ir.model,name:l10n_es_payment_order.model_wizard_payment_file_join_spain
+msgid "Pay file join spain"
+msgstr "Pay file join spain"
+
+#. module: l10n_es_payment_order
 #: selection:payment.mode,tipo:0
 msgid "CSB 34"
 msgstr "CSB 34"
@@ -257,10 +191,9 @@
 msgstr "Modo de pago"
 
 #. module: l10n_es_payment_order
-#: model:payment.type,name:l10n_es_payment_order.payment_type_recibodomiciliado0
-#: model:payment.type,note:l10n_es_payment_order.payment_type_recibodomiciliado0
-msgid "Recibo domiciliado"
-msgstr "Recibo domiciliado"
+#: selection:payment.mode,csb34_type:0
+msgid "Certified Payments"
+msgstr "Pagos certificados"
 
 #. module: l10n_es_payment_order
 #: help:payment.mode,alt_domicile_format:0
@@ -273,19 +206,28 @@
 msgstr "Datos del presentador"
 
 #. module: l10n_es_payment_order
+#: field:payment.mode,csb19_extra_concepts:0
+msgid "Extra Concepts"
+msgstr "Conceptos Extra"
+
+#. module: l10n_es_payment_order
 #: selection:payment.mode,tipo:0
 msgid "None"
 msgstr "Ninguno"
 
 #. module: l10n_es_payment_order
+#: model:payment.type,name:l10n_es_payment_order.payment_type_recibodomiciliado0
+#: model:payment.type,note:l10n_es_payment_order.payment_type_recibodomiciliado0
+msgid "Recibo domiciliado"
+msgstr "Recibo domiciliado"
+
+#. module: l10n_es_payment_order
 #: code:addons/l10n_es_payment_order/wizard/converter.py:101
 #, python-format
-msgid ""
-"User error:\n"
+msgid "User error:\n"
 "\n"
 "The bank account number of %s does not have 20 digits."
-msgstr ""
-"Error del usuario:\n"
+msgstr "Error del usuario:\n"
 "\n"
 "El número de C.C. de %s no tiene 20 dígitos."
 
@@ -309,54 +251,44 @@
 #: code:addons/l10n_es_payment_order/wizard/csb_32.py:195
 #: code:addons/l10n_es_payment_order/wizard/csb_32.py:221
 #, python-format
-msgid ""
-"Configuration error:\n"
+msgid "Configuration error:\n"
 "\n"
 "The line \"%s\" is not 150 characters long:\n"
 "%s"
-msgstr ""
-"Error de configuración:\n"
+msgstr "Error de configuración:\n"
 "\n"
 "La línea \"%s\" no tiene 150 caracteres:\n"
 "%s"
 
 #. module: l10n_es_payment_order
-#: field:payment.mode,partner_id:0
-#: report:remesas.report:0
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: l10n_es_payment_order
 #: code:addons/l10n_es_payment_order/wizard/csb_34.py:154
-#: code:addons/l10n_es_payment_order/wizard/csb_34.py:355
-#: code:addons/l10n_es_payment_order/wizard/csb_34.py:370
+#: code:addons/l10n_es_payment_order/wizard/csb_34.py:356
+#: code:addons/l10n_es_payment_order/wizard/csb_34.py:371
 #, python-format
-msgid ""
-"Configuration error:\n"
+msgid "Configuration error:\n"
 "\n"
 "The line \"%s\" is not 72 characters long:\n"
 "%s"
-msgstr ""
-"Error de configuración:\n"
+msgstr "Error de configuración:\n"
 "\n"
 "La línea \"%s\" no tiene 72 caracteres:\n"
 "%s"
 
 #. module: l10n_es_payment_order
-#: code:addons/l10n_es_payment_order/wizard/export_remesas.py:174
+#: code:addons/l10n_es_payment_order/wizard/export_remesas.py:160
 #, python-format
-msgid ""
-"Successfully Exported\n"
+msgid "Successfully Exported\n"
 "\n"
 "Summary:\n"
 " Total amount paid: %.2f\n"
 " Total Number of Payments: %d\n"
-msgstr ""
-"Exportación realizada con éxito\n"
+""
+msgstr "Exportación realizada con éxito\n"
 "\n"
 "Resumen:\n"
 " Total importe remesa: %.2f\n"
 " Total número de recibos: %d\n"
+""
 
 #. module: l10n_es_payment_order
 #: field:payment.mode,text3:0
@@ -364,14 +296,12 @@
 msgstr "Línea 3"
 
 #. module: l10n_es_payment_order
-#: code:addons/l10n_es_payment_order/wizard/csb_19.py:74
+#: code:addons/l10n_es_payment_order/wizard/csb_19.py:77
 #, python-format
-msgid ""
-"User error:\n"
+msgid "User error:\n"
 "\n"
 "Fixed date of charge has not been defined."
-msgstr ""
-"Error del usuario:\n"
+msgstr "Error del usuario:\n"
 "\n"
 "No se ha definido una fecha fija de cargo."
 
@@ -381,44 +311,55 @@
 msgstr "Nombre compañía para archivo"
 
 #. module: l10n_es_payment_order
-#: code:addons/l10n_es_payment_order/wizard/export_remesas.py:166
+#: view:payment.mode:0
+msgid "CSB 19 Options"
+msgstr "Opciones CSB 19"
+
+#. module: l10n_es_payment_order
+#: code:addons/l10n_es_payment_order/wizard/export_remesas.py:152
 #, python-format
 msgid "remesa"
 msgstr "remesa"
 
 #. module: l10n_es_payment_order
-#: code:addons/l10n_es_payment_order/wizard/export_remesas.py:83
+#: code:addons/l10n_es_payment_order/wizard/export_remesas.py:69
 #, python-format
-msgid ""
-"User error:\n"
+msgid "User error:\n"
 "\n"
 "Wizard can not generate export file, there are not payment lines."
-msgstr ""
-"Error del usuario:\n"
+msgstr "Error del usuario:\n"
 "\n"
 "El asistente no puede generar el archivo de remesas, no existen recibos."
 
 #. module: l10n_es_payment_order
+#: view:payment.mode:0
+msgid "CSB 32 Options"
+msgstr "Opciones CSB 32"
+
+#. module: l10n_es_payment_order
 #: code:addons/l10n_es_payment_order/wizard/converter.py:80
 #, python-format
-msgid ""
-"Error:\n"
+msgid "Error:\n"
 "\n"
 "Can not convert integer number %(number)d to fit in %(size)d characters."
-msgstr ""
-"Error:\n"
+msgstr "Error:\n"
 "\n"
 "No se puede convertir el número entero %(number)d para que quepa en %(size)d caracteres."
 
 #. module: l10n_es_payment_order
-#: wizard_field:export_payment_file_spain,export,note:0
+#: field:wizard.payment.file.spain,note:0
 msgid "Log"
-msgstr "Registro"
+msgstr "Log"
 
 #. module: l10n_es_payment_order
-#: report:remesas.report:0
-msgid "PAYMENT ORDER Num.:"
-msgstr "REMESA Nº:"
+#: code:addons/l10n_es_payment_order/wizard/export_remesas.py:140
+#, python-format
+msgid "User error:\n"
+"\n"
+"The payment mode is not CSB 19, CSB 32, CSB 34 or CSB 58"
+msgstr "Error del usuario:\n"
+"\n"
+"El modo de pago no es CSB 19, CSB 32, CSB 34 ni CSB 58"
 
 #. module: l10n_es_payment_order
 #: selection:payment.mode,tipo:0
@@ -426,41 +367,33 @@
 msgstr "CSB 58"
 
 #. module: l10n_es_payment_order
-#: code:addons/l10n_es_payment_order/remesas.py:107
+#: code:addons/l10n_es_payment_order/remesas.py:111
 #, python-format
 msgid "Dear Sir"
 msgstr "Estimado Sr."
 
 #. module: l10n_es_payment_order
-#: report:remesas.report:0
-msgid "........."
-msgstr "........."
-
-#. module: l10n_es_payment_order
-#: model:ir.module.module,shortdesc:l10n_es_payment_order.module_meta_information
-msgid "Exportación de ficheros bancarios CSB 19, CSB 32, CSB 34 y CSB 58"
-msgstr "Exportación de ficheros bancarios CSB 19, CSB 32, CSB 34 y CSB 58"
+#: field:payment.mode,ine:0
+msgid "INE code"
+msgstr "Código INE"
 
 #. module: l10n_es_payment_order
 #: code:addons/l10n_es_payment_order/wizard/csb_34.py:128
 #, python-format
-msgid ""
-"User error:\n"
+msgid "User error:\n"
 "\n"
 "Company %s has no invoicing or default address."
-msgstr ""
-"Error del usuario:\n"
+msgstr "Error del usuario:\n"
 "\n"
 "La compañía %s no tiene dirección por defecto o de facturación."
 
 #. module: l10n_es_payment_order
-#: model:payment.type,name:l10n_es_payment_order.payment_type_cheque0
-#: model:payment.type,note:l10n_es_payment_order.payment_type_cheque0
-msgid "Cheque"
-msgstr "Cheque"
+#: selection:payment.mode,cost_key:0
+msgid "Expense of the Payer"
+msgstr "Gastos por cuenta del ordenante"
 
 #. module: l10n_es_payment_order
-#: code:addons/l10n_es_payment_order/wizard/export_remesas.py:168
+#: code:addons/l10n_es_payment_order/wizard/export_remesas.py:154
 #, python-format
 msgid "Remesa "
 msgstr "Remesa "
@@ -471,11 +404,6 @@
 msgstr "Clave de gastos"
 
 #. module: l10n_es_payment_order
-#: model:ir.model,name:l10n_es_payment_order.model_payment_order
-msgid "Payment Order"
-msgstr "Orden de pago"
-
-#. module: l10n_es_payment_order
 #: field:payment.mode,concept:0
 msgid "Concept of the Order"
 msgstr "Concepto de la orden."
@@ -487,6 +415,12 @@
 msgstr "Transferencia"
 
 #. module: l10n_es_payment_order
+#: model:payment.type,name:l10n_es_payment_order.payment_type_cheque0
+#: model:payment.type,note:l10n_es_payment_order.payment_type_cheque0
+msgid "Cheque"
+msgstr "Cheque"
+
+#. module: l10n_es_payment_order
 #: model:payment.type,note:l10n_es_payment_order.payment_type_pagare0
 msgid "Pagare"
 msgstr "Pagaré"
@@ -497,25 +431,14 @@
 msgstr "Opciones CSB 34"
 
 #. module: l10n_es_payment_order
-#: wizard_view:export_payment_file_spain,export:0
-#: wizard_view:export_payment_file_spain,init:0
+#: view:wizard.payment.file.spain:0
 msgid "Payment order export"
-msgstr "Exportar orden de pago"
-
-#. module: l10n_es_payment_order
-#: report:remesas.report:0
-msgid "Total payment order:"
-msgstr "Total Remesa:"
-
-#. module: l10n_es_payment_order
-#: field:payment.mode,payroll_check:0
-msgid "Payroll Check"
-msgstr "Cheque nómina"
-
-#. module: l10n_es_payment_order
-#: wizard_field:export_payment_file_spain,init,join:0
+msgstr "Exportar fichero de pagos"
+
+#. module: l10n_es_payment_order
+#: field:wizard.payment.file.spain,join:0
 msgid "Join payment lines of the same partner and bank account"
-msgstr "Fusionar recibos de la misma empresa y cuenta bancaria"
+msgstr "Unir las líneas de pagos del mismo cliente y cuenta bancaria"
 
 #. module: l10n_es_payment_order
 #: field:payment.mode,alt_domicile_format:0
@@ -533,14 +456,12 @@
 msgstr "Orden de abono directo"
 
 #. module: l10n_es_payment_order
-#: code:addons/l10n_es_payment_order/wizard/export_remesas.py:94
+#: code:addons/l10n_es_payment_order/wizard/export_remesas.py:80
 #, python-format
-msgid ""
-"User error:\n"
+msgid "User error:\n"
 "\n"
 "The company VAT number related to the bank account of the payment mode is not defined."
-msgstr ""
-"Error del usuario:\n"
+msgstr "Error del usuario:\n"
 "\n"
 "No se ha definido el CIF de la compañía asociada al C.C. del modo de pago."
 
@@ -550,9 +471,9 @@
 msgstr "Datos adicionales para pagarés, cheques y pagos certificados."
 
 #. module: l10n_es_payment_order
-#: report:remesas.report:0
-msgid "Invoice"
-msgstr "Factura"
+#: view:wizard.payment.file.spain:0
+msgid "Cancel"
+msgstr "Cancel"
 
 #. module: l10n_es_payment_order
 #: field:payment.mode,text1:0
@@ -565,41 +486,35 @@
 msgstr "Línea 2"
 
 #. module: l10n_es_payment_order
-#: field:payment.mode,not_to_the_order:0
-msgid "Not to the Order"
-msgstr "No a la orden"
-
-#. module: l10n_es_payment_order
-#: view:payment.mode:0
-msgid "CSB 32 Options"
-msgstr "Opciones CSB 32"
-
-#. module: l10n_es_payment_order
-#: wizard_field:export_payment_file_spain,export,pay:0
+#: selection:payment.mode,cost_key:0
+msgid "Expense of the Recipient"
+msgstr "Gastos por cuenta del beneficiario"
+
+#. module: l10n_es_payment_order
+#: model:payment.type,name:l10n_es_payment_order.payment_type_reposicion0
+#: model:payment.type,note:l10n_es_payment_order.payment_type_reposicion0
+msgid "Reposición"
+msgstr "Reposición"
+
+#. module: l10n_es_payment_order
+#: field:wizard.payment.file.spain,pay:0
 msgid "Payment order file"
-msgstr "Archivo remesa"
-
-#. module: l10n_es_payment_order
-#: report:remesas.report:0
-msgid "Created date:"
-msgstr "Fecha confección:"
-
-#. module: l10n_es_payment_order
-#: selection:payment.mode,cost_key:0
-msgid "Expense of the Payer"
-msgstr "Gastos por cuenta del ordenante"
+msgstr "Fichero de pagos"
+
+#. module: l10n_es_payment_order
+#: selection:payment.mode,csb34_type:0
+msgid "Transfer"
+msgstr "Transferencia"
 
 #. module: l10n_es_payment_order
 #: code:addons/l10n_es_payment_order/wizard/csb_34.py:143
-#: code:addons/l10n_es_payment_order/wizard/csb_34.py:340
+#: code:addons/l10n_es_payment_order/wizard/csb_34.py:341
 #, python-format
-msgid ""
-"Configuration error:\n"
+msgid "Configuration error:\n"
 "\n"
 "A line in \"%s\" is not 72 characters long:\n"
 "%s"
-msgstr ""
-"Error de configuración:\n"
+msgstr "Error de configuración:\n"
 "\n"
 "Una línea del \"%s\" no tiene 72 caracteres:\n"
 "%s"
@@ -610,37 +525,6 @@
 msgstr "Opciones CSB 58"
 
 #. module: l10n_es_payment_order
-#: code:addons/l10n_es_payment_order/wizard/csb_19.py:54
-#: code:addons/l10n_es_payment_order/wizard/csb_19.py:86
-#: code:addons/l10n_es_payment_order/wizard/csb_19.py:110
-#: code:addons/l10n_es_payment_order/wizard/csb_19.py:123
-#: code:addons/l10n_es_payment_order/wizard/csb_19.py:138
-#: code:addons/l10n_es_payment_order/wizard/csb_19.py:165
-#: code:addons/l10n_es_payment_order/wizard/csb_58.py:53
-#: code:addons/l10n_es_payment_order/wizard/csb_58.py:71
-#: code:addons/l10n_es_payment_order/wizard/csb_58.py:100
-#: code:addons/l10n_es_payment_order/wizard/csb_58.py:111
-#: code:addons/l10n_es_payment_order/wizard/csb_58.py:231
-#: code:addons/l10n_es_payment_order/wizard/csb_58.py:247
-#: code:addons/l10n_es_payment_order/wizard/csb_58.py:264
-#, python-format
-msgid ""
-"Configuration error:\n"
-"\n"
-"The line \"%s\" is not 162 characters long:\n"
-"%s"
-msgstr ""
-"Error de configuración:\n"
-"\n"
-"La línea \"%s\" no tiene 162 caracteres:\n"
-"%s"
-
-#. module: l10n_es_payment_order
-#: report:remesas.report:0
-msgid "Bank:"
-msgstr "Banco:"
-
-#. module: l10n_es_payment_order
 #: selection:payment.mode,csb34_type:0
 msgid "Promissory Note"
 msgstr "Pagaré"
@@ -657,12 +541,12 @@
 msgstr "Actívelo si desea añadir el tipo de dato 910 con la fecha de pago en el archivo."
 
 #. module: l10n_es_payment_order
-#: selection:payment.mode,csb34_type:0
-msgid "Certified Payments"
-msgstr "Pagos certificados"
+#: field:payment.mode,payroll_check:0
+msgid "Payroll Check"
+msgstr "Cheque nómina"
 
 #. module: l10n_es_payment_order
-#: code:addons/l10n_es_payment_order/remesas.py:109
+#: code:addons/l10n_es_payment_order/remesas.py:113
 #, python-format
 msgid "Total:"
 msgstr "Total:"
@@ -683,14 +567,12 @@
 msgstr "Nómina"
 
 #. module: l10n_es_payment_order
-#: code:addons/l10n_es_payment_order/wizard/export_remesas.py:90
+#: code:addons/l10n_es_payment_order/wizard/export_remesas.py:76
 #, python-format
-msgid ""
-"User error:\n"
+msgid "User error:\n"
 "\n"
 "The bank account number of the company %s has not 20 digits."
-msgstr ""
-"Error del usuario:\n"
+msgstr "Error del usuario:\n"
 "\n"
 "El número de C.C. de la compañía %s no tiene 20 dígitos."
 
@@ -702,23 +584,26 @@
 #. module: l10n_es_payment_order
 #: code:addons/l10n_es_payment_order/wizard/csb_34.py:166
 #, python-format
-msgid ""
-"User error:\n"
+msgid "User error:\n"
 "\n"
 "Partner %s has no invoicing or default address."
-msgstr ""
-"Error del usuario:\n"
+msgstr "Error del usuario:\n"
 "\n"
 "La compañía %s no tiene dirección por defecto o de facturación."
 
 #. module: l10n_es_payment_order
-#: code:addons/l10n_es_payment_order/remesas.py:108
+#: code:addons/l10n_es_payment_order/remesas.py:112
 #, python-format
 msgid "Payment ref."
 msgstr "Ref. de pago"
 
 #. module: l10n_es_payment_order
 #: selection:payment.mode,send_type:0
+msgid "Certified Mail"
+msgstr "Correo certificado"
+
+#. module: l10n_es_payment_order
+#: selection:payment.mode,send_type:0
 msgid "Ordinary Mail"
 msgstr "Correo ordinario"
 
@@ -730,50 +615,43 @@
 msgstr "Introduzca un texto y/o seleccione un campo de la factura para incluirlo como descripción en la carta. Los posibles valores son: ${amount}, ${communication}, {communication2}, {date}, {ml_maturity_date}, {create_date}, {ml_date_created}"
 
 #. module: l10n_es_payment_order
-#: model:ir.actions.wizard,name:l10n_es_payment_order.wizard_create_payment_file_spain
-msgid "Create payment file"
-msgstr "Crear fichero de pagos"
-
-#. module: l10n_es_payment_order
-#: report:remesas.report:0
-msgid "Amount"
-msgstr "Importe"
-
-#. module: l10n_es_payment_order
-#: report:remesas.report:0
-msgid "Company:"
-msgstr "Compañía:"
-
-#. module: l10n_es_payment_order
-#: selection:payment.mode,send_type:0
-msgid "Certified Mail"
-msgstr "Correo certificado"
-
-#. module: l10n_es_payment_order
-#: report:remesas.report:0
-msgid "Type:"
-msgstr "Tipo:"
-
-#. module: l10n_es_payment_order
-#: view:payment.mode:0
-msgid "CSB 19 Options"
-msgstr "Opciones CSB 19"
-
-#. module: l10n_es_payment_order
-#: field:payment.mode,csb19_extra_concepts:0
-msgid "Extra Concepts"
-msgstr "Conceptos Extra"
-
-#~ msgid ""
-#~ "Check it if you want to add the 015 data type and the text of the letter "
-#~ "in the file."
-#~ msgstr ""
-#~ "Actívelo si desea añadir el tipo de dato 015 y el texto de la carta en el "
-#~ "archivo."
-#~ msgid "Date Check"
-#~ msgstr "Añadir fecha"
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-#~ msgid "Optional Text for the Letter"
-#~ msgstr "Texto opcional para añadir a la carta."
-
+#: code:addons/l10n_es_payment_order/wizard/csb_19.py:57
+#: code:addons/l10n_es_payment_order/wizard/csb_19.py:89
+#: code:addons/l10n_es_payment_order/wizard/csb_19.py:113
+#: code:addons/l10n_es_payment_order/wizard/csb_19.py:126
+#: code:addons/l10n_es_payment_order/wizard/csb_19.py:156
+#: code:addons/l10n_es_payment_order/wizard/csb_19.py:162
+#: code:addons/l10n_es_payment_order/wizard/csb_19.py:178
+#: code:addons/l10n_es_payment_order/wizard/csb_19.py:205
+#: code:addons/l10n_es_payment_order/wizard/csb_58.py:53
+#: code:addons/l10n_es_payment_order/wizard/csb_58.py:71
+#: code:addons/l10n_es_payment_order/wizard/csb_58.py:100
+#: code:addons/l10n_es_payment_order/wizard/csb_58.py:111
+#: code:addons/l10n_es_payment_order/wizard/csb_58.py:231
+#: code:addons/l10n_es_payment_order/wizard/csb_58.py:247
+#: code:addons/l10n_es_payment_order/wizard/csb_58.py:264
+#, python-format
+msgid "Configuration error:\n"
+"\n"
+"The line \"%s\" is not 162 characters long:\n"
+"%s"
+msgstr "Error de configuración:\n"
+"\n"
+"La línea \"%s\" no tiene 162 caracteres:\n"
+"%s"
+
+#. module: l10n_es_payment_order
+#: model:ir.actions.act_window,name:l10n_es_payment_order.action_wizard_payment_file_spain
+msgid "Create payments file"
+msgstr "Crear fichero de cobros/pagos"
+
+#. module: l10n_es_payment_order
+#: model:payment.type,name:l10n_es_payment_order.payment_type_convenido0
+#: model:payment.type,note:l10n_es_payment_order.payment_type_convenido0
+msgid "Convenido"
+msgstr "Convenido"
+
+#. module: l10n_es_payment_order
+#: help:payment.mode,csb19_extra_concepts:0
+msgid "Check it if you want to add the invoice lines to the extra concepts (Max. 15 lines)"
+msgstr "Chequear si se quiere añadir a las líneas de factura conceptos extra (Máx. 15 líneas)"
 
=== modified file 'l10n_es_payment_order/remesas_data.xml'
--- l10n_es_payment_order/remesas_data.xml	2011-10-26 18:26:56 +0000
+++ l10n_es_payment_order/remesas_data.xml	2013-01-11 10:23:22 +0000
@@ -10,28 +10,28 @@
 		</record>
 		<record id="payment_type_transferencia0" model="payment.type">
 			<field name="code">TRANSFERENCIA_CSB</field>
-			<field name="name">Transferencia</field>
+			<field name="name">Transferencia CSB</field>
 			<field eval="[(6,0,[ref('base.bank_normal')])]" name="suitable_bank_types"/>
 			<field name="note">Transferencia</field>
 			<field eval="1" name="active"/>
 		</record>
 		<record id="payment_type_cheque0" model="payment.type">
 			<field name="code">CHEQUE_CSB</field>
-			<field name="name">Cheque</field>
+			<field name="name">Cheque CSB</field>
 			<field eval="[(6,0,[ref('base.bank_normal')])]" name="suitable_bank_types"/>
 			<field name="note">Cheque</field>
 			<field eval="1" name="active"/>
 		</record>
 		<record id="payment_type_pagare0" model="payment.type">
 			<field name="code">PAGARE_CSB</field>
-			<field name="name">Pagaré</field>
+			<field name="name">Pagaré CSB</field>
 			<field eval="[(6,0,[ref('base.bank_normal')])]" name="suitable_bank_types"/>
 			<field name="note">Pagare</field>
 			<field eval="1" name="active"/>
 		</record>
 		<record id="payment_type_pago_certificado0" model="payment.type">
 			<field name="code">PAGO_CERTIFICADO_CSB</field>
-			<field name="name">Pago certificado</field>
+			<field name="name">Pago certificado CSB</field>
 			<field eval="[(6,0,[ref('base.bank_normal')])]" name="suitable_bank_types"/>
 			<field name="note">Pago certificado</field>
 			<field eval="1" name="active"/>
 
=== modified file 'l10n_es_payment_order/remesas_view.xml'
--- l10n_es_payment_order/remesas_view.xml	2011-08-03 15:44:39 +0000
+++ l10n_es_payment_order/remesas_view.xml	2013-01-11 10:23:22 +0000
@@ -74,8 +74,8 @@
                         </group>
                     </group>
                     <newline/>
+                    </field>
                 </field>
-            </field>
         </record>
 
     </data>
 
=== added directory 'l10n_es_payment_order/security'
=== added file 'l10n_es_payment_order/security/ir.model.access.csv'
--- l10n_es_payment_order/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ l10n_es_payment_order/security/ir.model.access.csv	2013-01-11 10:23:22 +0000
@@ -0,0 +1,13 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_csb_19,csb.19,model_csb_19,account_payment.group_account_payment,1,1,1,1
+access_csb_19_user,csb.19.user,model_csb_19,base.group_user,1,0,0,0
+access_csb_32,csb.32,model_csb_32,account_payment.group_account_payment,1,1,1,1
+access_csb_32_user,csb.32.user,model_csb_32,base.group_user,1,0,0,0
+access_csb_34,csb.34,model_csb_34,account_payment.group_account_payment,1,1,1,1
+access_csb_34_user,csb.34.user,model_csb_34,base.group_user,1,0,0,0
+access_csb_3401,csb.3401,model_csb_3401,account_payment.group_account_payment,1,1,1,1
+access_csb_3401_user,csb.3401.user,model_csb_3401,base.group_user,1,0,0,0
+access_csb_58,csb.58,model_csb_58,account_payment.group_account_payment,1,1,1,1
+access_csb_58_user,csb.58.user,model_csb_58,base.group_user,1,0,0,0
+access_payment_converter_spain,payment.converter.spain,model_payment_converter_spain,account_payment.group_account_payment,1,1,1,1
+access_payment_converter_spain_user,payment.converter.spain,model_payment_converter_spain,base.group_user,1,0,0,0
 
=== modified file 'l10n_es_payment_order/wizard/__init__.py'
--- l10n_es_payment_order/wizard/__init__.py	2011-08-29 15:11:11 +0000
+++ l10n_es_payment_order/wizard/__init__.py	2013-01-11 10:23:22 +0000
@@ -7,7 +7,11 @@
 #    Copyright (c) 2008 Pablo Rocandio. All Rights Reserved.
 #    Copyright (c) 2009 Zikzakmedia S.L. (http://zikzakmedia.com) All Rights Reserved.
 #                       Jordi Esteve <[e-mail]>
+#    AvanzOSC, Advanced Open Source Consulting 
+#    Copyright (C) 2011-2012 Ainara Galdona (www.avanzosc.com). All Rights Reserved
 #    $Id$
+# Refactorización. Acysos S.L. (http://www.acysos.com) 2012
+#   Ignacio Ibeas <[e-mail]>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as published by
@@ -25,3 +29,9 @@
 ##############################################################################
 
 import export_remesas
+import converter
+import csb_19
+import csb_32
+import csb_34
+import csb_34_01
+import csb_58
 
=== modified file 'l10n_es_payment_order/wizard/converter.py'
--- l10n_es_payment_order/wizard/converter.py	2012-05-22 15:31:15 +0000
+++ l10n_es_payment_order/wizard/converter.py	2013-01-11 10:23:22 +0000
@@ -10,6 +10,8 @@
 #    Copyright (c) 2009 NaN (http://www.nan-tic.com) All Rights Reserved.
 #                       Albert Cervera i Areny <[e-mail]>
 #    $Id$
+#    Refactorización. Acysos S.L. (http://www.acysos.com) 2012
+#        Ignacio Ibeas <[e-mail]>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as published by
@@ -26,95 +28,86 @@
 #
 ##############################################################################
 
+from osv import osv, fields
 from tools.translate import _
-
-def digits_only(cc_in):
-    """Discards non-numeric chars"""
-
-    cc = ""
-    for i in cc_in or '':
-        try:
-            int(i)
-            cc += i
-        except ValueError:
-            pass
-    return cc
-
-def to_ascii(text):
-    """Converts special characters such as those with accents to their ASCII equivalents"""
-    old_chars = ['á','é','í','ó','ú','à','è','ì','ò','ù','ä','ë','ï','ö','ü','â','ê','î','ô','û','Á','É','Í','Ú','Ó','À','È','Ì','Ò','Ù','Ä','Ë','Ï','Ö','Ü','Â','Ê','Î','Ô','Û','ñ','Ñ','ç','Ç','ª','º','·','\n']
-    new_chars = ['a','e','i','o','u','a','e','i','o','u','a','e','i','o','u','a','e','i','o','u','A','E','I','O','U','A','E','I','O','U','A','E','I','O','U','A','E','I','O','U','n','N','c','C','a','o','.',' ']
-    for old, new in zip(old_chars, new_chars):
-        text = text.replace(unicode(old,'UTF-8'), new)
-    return text
-
-
-class Log(Exception):
-    def __init__(self, content = '', error = False):
-        self.content = content
-        self.error = error
-    def add(self, s, error=True):
-        self.content = self.content + s
-        if error:
-            self.error = error
-    def __call__(self):
-        return self.content
-    def __str__(self):
-        return self.content
-
-def convert_text(text, size, justified='left'):
-    if justified == 'left':
-        return to_ascii(text)[:size].ljust(size)
-    else:      
-        return to_ascii(text)[:size].rjust(size)
-
-def convert_float(cr, number, size, context):
-    text = str( int( round( number * 100, 0 ) ) )
-    if len(text) > size:
-        raise Log(_('Error:\n\nCan not convert float number %(number).2f to fit in %(size)d characters.') % {
-            'number': number, 
-            'size': size
-        })
-    return text.zfill(size)
-
-def convert_int(cr, number, size, context):
-    text = str( number )
-    if len(text) > size:
-        raise Log( _('Error:\n\nCan not convert integer number %(number)d to fit in %(size)d characters.') % {
-            'number': number, 
-            'size': size
-        })
-    return text.zfill(size)
-
-def convert(cr, value, size, context, justified='left'):
-    if value == False:
-        return convert_text('', size)
-    elif isinstance(value, float):
-        return convert_float(cr, value, size, context)
-    elif isinstance(value, int):
-        return convert_int(cr, value, size, context)
-    else:
-        return convert_text(value, size, justified)
-
-def convert_bank_account(cr, value, partner_name, context):
-    if not isinstance(value, basestring):
-        raise Log( _('User error:\n\nThe bank account number of %s is not defined.') % partner_name )
-    ccc = digits_only(value)
-    if len(ccc) != 20:
-        raise Log( _('User error:\n\nThe bank account number of %s does not have 20 digits.') % partner_name )
-    return ccc
-
-def bank_account_parts(cr, value, partner_name, context):
-    if not isinstance(value, basestring):
-        raise Log( _('User error:\n\nThe bank account number of %s is not defined.') % partner_name )
-    ccc = digits_only(value)
-    if len(ccc) != 20:
-        raise Log( _('User error:\n\nThe bank account number of %s does not have 20 digits.') % partner_name )
-    return {'bank':ccc[:4],
-            'office': ccc[4:8],
-            'dc': ccc[8:10],
-            'account': ccc[10:]}
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+from log import *
+
+class payment_converter_spain(osv.osv):
+    _name= 'payment.converter.spain'
+    _auto = False
+
+    def digits_only(self, cr, uid, cc_in):
+        """Discards non-numeric chars"""
+    
+        cc = ""
+        for i in cc_in or '':
+            try:
+                int(i)
+                cc += i
+            except ValueError:
+                pass
+        return cc
+
+    def to_ascii(self, cr, uid, text):
+        """Converts special characters such as those with accents to their ASCII equivalents"""
+        old_chars = ['á','é','í','ó','ú','à','è','ì','ò','ù','ä','ë','ï','ö','ü','â','ê','î','ô','û','Á','É','Í','Ú','Ó','À','È','Ì','Ò','Ù','Ä','Ë','Ï','Ö','Ü','Â','Ê','Î','Ô','Û','ñ','Ñ','ç','Ç','ª','º','·','\n']
+        new_chars = ['a','e','i','o','u','a','e','i','o','u','a','e','i','o','u','a','e','i','o','u','A','E','I','O','U','A','E','I','O','U','A','E','I','O','U','A','E','I','O','U','n','N','c','C','a','o','.',' ']
+        for old, new in zip(old_chars, new_chars):
+            text = text.replace(unicode(old,'UTF-8'), new)
+        return text
+        
+    def convert_text(self, cr, uid, text, size, justified='left'):
+        if justified == 'left':
+            return self.to_ascii(cr,uid,text)[:size].ljust(size)
+        else:      
+            return self.to_ascii(cr,uid,text)[:size].rjust(size)
+        
+    def convert_float(self, cr, uid, number, size, context):
+        text = str( int( round( number * 100, 0 ) ) )
+        if len(text) > size:
+            raise Log(_('Error:\n\nCan not convert float number %(number).2f to fit in %(size)d characters.') % {
+                'number': number, 
+                'size': size
+            })
+        return text.zfill(size)
+    
+    def convert_int(self, cr, uid, number, size, context):
+        text = str( number )
+        if len(text) > size:
+            raise Log( _('Error:\n\nCan not convert integer number %(number)d to fit in %(size)d characters.') % {
+                'number': number, 
+                'size': size
+            })
+        return text.zfill(size)
+    
+    def convert(self, cr, uid, value, size, context, justified='left'):
+        if value == False:
+            return self.convert_text(cr, uid, '', size)
+        elif isinstance(value, float):
+            return self.convert_float(cr, uid, value, size, context)
+        elif isinstance(value, int):
+            return self.convert_int(cr, uid, value, size, context)
+        else:
+            return self.convert_text(cr, uid, value, size, justified)
+    
+    def convert_bank_account(self, cr, uid, value, partner_name, context):
+        if not isinstance(value, basestring):
+            raise Log( _('User error:\n\nThe bank account number of %s is not defined.') % partner_name )
+        ccc = self.digits_only(cr, uid, value)
+        if len(ccc) != 20:
+            raise Log( _('User error:\n\nThe bank account number of %s does not have 20 digits.') % partner_name )
+        return ccc
+    
+    def bank_account_parts(self, cr, uid, value, partner_name, context):
+        if not isinstance(value, basestring):
+            raise Log( _('User error:\n\nThe bank account number of %s is not defined.') % partner_name )
+        ccc = self.digits_only(cr, uid, value)
+        if len(ccc) != 20:
+            raise Log( _('User error:\n\nThe bank account number of %s does not have 20 digits.') % partner_name )
+        return {'bank':ccc[:4],
+                'office': ccc[4:8],
+                'dc': ccc[8:10],
+                'account': ccc[10:]}
+        
+payment_converter_spain()
 
 
=== modified file 'l10n_es_payment_order/wizard/csb_19.py'
--- l10n_es_payment_order/wizard/csb_19.py	2012-06-12 09:33:58 +0000
+++ l10n_es_payment_order/wizard/csb_19.py	2013-01-11 10:23:22 +0000
@@ -21,6 +21,9 @@
 # Añadidos conceptos extras del CSB 19: Acysos S.L. 2011
 #   Ignacio Ibeas <[e-mail]>
 #
+# Refactorización. Acysos S.L. (http://www.acysos.com) 2012
+#   Ignacio Ibeas <[e-mail]>
+#
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
@@ -36,20 +39,23 @@
 #
 ##############################################################################
 
+from osv import osv, fields
 from datetime import datetime
 from tools.translate import _
-from converter import *
-
-
-class csb_19:
-    def _cabecera_presentador_19(self):
+from log import *
+
+class csb_19(osv.osv):
+    _name = 'csb.19'
+    _auto = False
+    def _cabecera_presentador_19(self,cr,uid):
+        converter = self.pool.get('payment.converter.spain')
         texto = '5180'
         texto += (self.order.mode.bank_id.partner_id.vat[2:] + self.order.mode.sufijo).zfill(12)
         texto += datetime.today().strftime('%d%m%y')
         texto += 6*' '
-        texto += to_ascii(self.order.mode.nombre).ljust(40)
+        texto += converter.to_ascii(cr,uid,self.order.mode.nombre).ljust(40)
         texto += 20*' '
-        cc = digits_only(self.order.mode.bank_id.acc_number)
+        cc = converter.digits_only(cr,uid,self.order.mode.bank_id.acc_number)
         texto += cc[0:8]
         texto += 66*' '
         texto += '\r\n'
@@ -57,7 +63,8 @@
             raise Log(_('Configuration error:\n\nThe line "%s" is not 162 characters long:\n%s') % ('Cabecera presentador 19', texto), True)
         return texto
 
-    def _cabecera_ordenante_19(self, recibo=None):
+    def _cabecera_ordenante_19(self,cr,uid, recibo=None):
+        converter = self.pool.get('payment.converter.spain')
         texto = '5380'
         texto += (self.order.mode.bank_id.partner_id.vat[2:] + self.order.mode.sufijo).zfill(12)
         texto += datetime.today().strftime('%d%m%y')
@@ -78,8 +85,8 @@
             date_cargo = datetime.strptime(self.order.date_scheduled,'%Y-%m-%d')
 
         texto += date_cargo.strftime('%d%m%y')
-        texto += to_ascii(self.order.mode.nombre).ljust(40)
-        cc = digits_only(self.order.mode.bank_id.acc_number)
+        texto += converter.to_ascii(cr,uid,self.order.mode.nombre).ljust(40)
+        cc = converter.digits_only(cr,uid,self.order.mode.bank_id.acc_number)
         texto += cc[0:20]
         texto += 8*' '
         texto += '01'
@@ -89,14 +96,15 @@
             raise Log(_('Configuration error:\n\nThe line "%s" is not 162 characters long:\n%s') % ('Cabecera ordenante 19', texto), True)
         return texto
 
-    def _individual_obligatorio_19(self, recibo):
+    def _individual_obligatorio_19(self,cr,uid, recibo):
+        converter = self.pool.get('payment.converter.spain')
         texto = '5680'
         texto += (self.order.mode.bank_id.partner_id.vat[2:] + self.order.mode.sufijo).zfill(12)
         texto += str(recibo['name'])[-12:].zfill(12)
-        nombre = to_ascii(recibo['partner_id'].name)
+        nombre = converter.to_ascii(cr,uid,recibo['partner_id'].name)
         texto += nombre[0:40].ljust(40)
         ccc = recibo['bank_id'] and recibo['bank_id'].acc_number or ''
-        ccc = digits_only(ccc)
+        ccc = converter.digits_only(cr,uid,ccc)
         texto += str(ccc)[0:20].zfill(20)
         importe = int(round(abs(recibo['amount'])*100,0))
         texto += str(importe).zfill(10)
@@ -104,21 +112,19 @@
         concepto = ''
         if recibo['communication']:
             concepto = recibo['communication']
-        texto += to_ascii(concepto)[0:48].ljust(48)
-        # Esto es lo convencional, descripción de 40 caracteres, pero se puede aprovechar los 8 espacios en blanco finales
-        #texto += to_ascii(concepto)[0:40].ljust(40)
-        #texto += 8*' '
+        texto += converter.to_ascii(cr,uid,concepto)[0:48].ljust(48)
         texto += '\r\n'
         if len(texto) != 164:
             raise Log(_('Configuration error:\n\nThe line "%s" is not 162 characters long:\n%s') % ('Individual obligatorio 19', texto), True)
         return texto
 
-    def _individual_opcional_19(self, recibo):
+    def _individual_opcional_19(self,cr,uid, recibo):
         """Para poner el segundo texto de comunicación (en lugar de nombre, domicilio y localidad opcional)"""
+        converter = self.pool.get('payment.converter.spain')
         texto = '5686'
         texto += (self.order.mode.bank_id.partner_id.vat[2:] + self.order.mode.sufijo).zfill(12)
         texto += str(recibo['name'])[-12:].zfill(12)
-        texto += to_ascii(recibo['communication2'])[0:115].ljust(115)
+        texto += converter.to_ascii(cr,uid,recibo['communication2'])[0:115].ljust(115)
         texto += '00000' # Campo de código postal ficticio
         texto += 14*' '
         texto += '\r\n'
@@ -126,36 +132,37 @@
             raise Log(_('Configuration error:\n\nThe line "%s" is not 162 characters long:\n%s') % ('Individual opcional 19', texto), True)
         return texto
 
-    def _extra_opcional_19(self, recibo):
+    def _extra_opcional_19(self,cr,uid, recibo):
         """Para poner los 15 conceptos opcional de los registros 5681-5685 utilizando las lineas de facturación (Máximo 15 lineas)"""
+        converter = self.pool.get('payment.converter.spain')
         res = {}
         res['texto'] = ''
         res['total_lines'] = 0
         counter = 1
         registry_counter = 1
-        lenght = 0
+        length = 0
         for invoice in recibo['ml_inv_ref']:
             if invoice:
-                lenght += len(invoice.invoice_line)
+                length += len(invoice.invoice_line)
         for invoice in recibo['ml_inv_ref']:
             if invoice:
                 for invoice_line in invoice.invoice_line:
-                    if counter <= lenght:
+                    if counter <= length:
                         if counter <= 15:
                             if (counter-1)%3 == 0:
                                 res['texto'] += '568'+str(registry_counter)
                                 res['texto'] += (self.order.mode.bank_id.partner_id.vat[2:] + self.order.mode.sufijo).zfill(12)
                                 res['texto'] += str(recibo['name']).zfill(12)
                             price = ' %(#).2f ' % {'#' : invoice_line.price_subtotal}
-                            res['texto'] += to_ascii(invoice_line.name)[0:(40-len(price))].ljust(40-len(price))
-                            res['texto'] += to_ascii(price.replace('.',','))
+                            res['texto'] += converter.to_ascii(cr,uid,invoice_line.name)[0:(40-len(price))].ljust(40-len(price))
+                            res['texto'] += converter.to_ascii(cr,uid,price.replace('.',','))
                             if counter % 3 == 0:
                                 res['texto'] += 14*' '+'\r\n'
                                 res['total_lines'] += 1
                                 if len(res['texto']) != registry_counter*164:
                                     raise Log(_('Configuration error:\n\nThe line "%s" is not 162 characters long:\n%s') % ('Individual opcional 19', res['texto']), True)
                                 registry_counter += 1
-                            elif counter == lenght:
+                            elif counter == length:
                                 res['texto'] += (3-(counter % 3))*40*' '+14*' '+'\r\n'
                                 res['total_lines'] += 1
                                 if len(res['texto']) != registry_counter*164:
@@ -163,7 +170,7 @@
                             counter += 1
         return res
 
-    def _total_ordenante_19(self):
+    def _total_ordenante_19(self,cr,uid):
         texto = '5880'
         texto += (self.order.mode.bank_id.partner_id.vat[2:] + self.order.mode.sufijo).zfill(12)
         texto += 72*' '
@@ -178,7 +185,7 @@
             raise Log(_('Configuration error:\n\nThe line "%s" is not 162 characters long:\n%s') % ('Total ordenante 19', texto), True)
         return texto
 
-    def _total_general_19(self):
+    def _total_general_19(self,cr,uid):
         texto = '5980'
         texto += (self.order.mode.bank_id.partner_id.vat[2:] + self.order.mode.sufijo).zfill(12)
         texto += 52*' '
@@ -206,7 +213,7 @@
         return texto
 
 
-    def create_file(self, pool, cr, uid, order, lines, context):
+    def create_file(self, cr, uid, order, lines, context):
         self.order = order
 
         txt_remesa = ''
@@ -216,7 +223,7 @@
         self.group_optional_lines = 0
         self.group_amount = 0.0
 
-        txt_remesa += self._cabecera_presentador_19()
+        txt_remesa += self._cabecera_presentador_19(cr,uid)
 
         if order.date_prefered == 'due':
             # Tantos ordenantes como pagos
@@ -225,48 +232,46 @@
                 self.group_optional_lines = 0
                 self.group_amount = 0.0
 
-                txt_remesa += self._cabecera_ordenante_19(recibo)
-                txt_remesa += self._individual_obligatorio_19(recibo)
+                txt_remesa += self._cabecera_ordenante_19(cr,uid,recibo)
+                txt_remesa += self._individual_obligatorio_19(cr,uid,recibo)
                 self.total_payments += 1
                 self.group_payments += 1
                 self.group_amount += abs( recibo['amount'] )
                 if order.mode.csb19_extra_concepts:
-                    extra_concepts = self._extra_opcional_19(recibo)
+                    extra_concepts = self._extra_opcional_19(cr,uid,recibo)
                     txt_remesa += extra_concepts['texto']
                     self.total_optional_lines += extra_concepts['total_lines']
                     self.group_optional_lines += extra_concepts['total_lines']
 
                 if recibo['communication2']:
-                    txt_remesa += self._individual_opcional_19(recibo)
-                    #self.num_lineas_opc = self.num_lineas_opc + 1
+                    txt_remesa += self._individual_opcional_19(cr,uid,recibo)
                     self.total_optional_lines += 1
                     self.group_optional_lines += 1
-                txt_remesa += self._total_ordenante_19()
+                txt_remesa += self._total_ordenante_19(cr,uid)
         else:
             # Sólo un ordenante
-            txt_remesa += self._cabecera_ordenante_19()
+            txt_remesa += self._cabecera_ordenante_19(cr,uid)
             self.group_payments = 0
             self.group_optional_lines = 0
             self.group_amount = 0.0
 
             for recibo in lines:
-                txt_remesa += self._individual_obligatorio_19(recibo)
+                txt_remesa += self._individual_obligatorio_19(cr,uid,recibo)
                 self.total_payments += 1
                 self.group_payments += 1
                 self.group_amount += abs( recibo['amount'] )
                 if order.mode.csb19_extra_concepts:
-                    extra_concepts = self._extra_opcional_19(recibo)
+                    extra_concepts = self._extra_opcional_19(cr,uid,recibo)
                     txt_remesa += extra_concepts['texto']
                     self.total_optional_lines += extra_concepts['total_lines']
                     self.group_optional_lines += extra_concepts['total_lines']
                 if recibo['communication2']:
-                    txt_remesa += self._individual_opcional_19(recibo)
+                    txt_remesa += self._individual_opcional_19(cr,uid,recibo)
                     self.total_optional_lines += 1
                     self.group_optional_lines += 1
 
-            txt_remesa += self._total_ordenante_19()
+            txt_remesa += self._total_ordenante_19(cr,uid)
 
-        txt_remesa += self._total_general_19()
+        txt_remesa += self._total_general_19(cr,uid)
         return txt_remesa
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+csb_19()
 \ No newline at end of file
 
=== modified file 'l10n_es_payment_order/wizard/csb_32.py'
--- l10n_es_payment_order/wizard/csb_32.py	2011-08-29 15:11:11 +0000
+++ l10n_es_payment_order/wizard/csb_32.py	2013-01-11 10:23:22 +0000
@@ -18,6 +18,9 @@
 # Rehecho de nuevo para instalación OpenERP 5.0.0 sobre account_payment_extension: Zikzakmedia S.L. 2009
 #   Jordi Esteve <[e-mail]>
 #
+# Refactorización. Acysos S.L. (http://www.acysos.com) 2012
+#   Ignacio Ibeas <[e-mail]>
+#
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
@@ -33,20 +36,22 @@
 #
 ##############################################################################
 
+from osv import osv, fields
 from datetime import datetime
 from tools.translate import _
-from converter import *
-
-
-class csb_32:
-
-    def _cabecera_fichero_32(self):
+from log import *
+
+class csb_32(osv.osv):
+    _name = 'csb.32'
+    _auto = False
+    def _cabecera_fichero_32(self, cr, uid):
+        converter = self.pool.get('payment.converter.spain')
         texto = '0265'
         texto += '  '
         texto += datetime.today().strftime('%d%m%y')
-        texto += digits_only( self.order.reference )[-4:]
+        texto += converter.digits_only(cr, uid, self.order.reference )[-4:]
         texto += ' '*35
-        texto += digits_only( self.order.mode.bank_id.acc_number )[:8]
+        texto += converter.digits_only(cr, uid, self.order.mode.bank_id.acc_number )[:8]
         texto += ' '*6
         texto += ' '*61
         texto += ' '*24
@@ -55,7 +60,8 @@
             raise Log(_('Configuration error:\n\nThe line "%s" is not 150 characters long:\n%s') % ('Cabecera fichero 32', texto), True)
         return texto
 
-    def _cabecera_remesa_32(self, cr, context):
+    def _cabecera_remesa_32(self, cr, uid, context):
+        converter = self.pool.get('payment.converter.spain')
         # A: 
         texto = '1165'
         texto += '  '
@@ -66,42 +72,43 @@
         texto += ' '*12
 
         # C
-        texto += convert(cr, self.order.mode.cedente, 15, context) # TODO: Identificador del cedente. Qué es?
+        texto += converter.convert(cr, uid, self.order.mode.cedente, 15, context) # TODO: Identificador del cedente. Qué es?
         texto += '1' # Identificativo de efectos truncados
         texto += ' '*21
 
         # D
-        texto += digits_only( self.order.mode.bank_id.acc_number )
-        texto += digits_only( self.order.mode.bank_id.acc_number )
-        texto += digits_only( self.order.mode.bank_id.acc_number )
+        texto += converter.digits_only(cr, uid, self.order.mode.bank_id.acc_number )
+        texto += converter.digits_only(cr, uid, self.order.mode.bank_id.acc_number )
+        texto += converter.digits_only(cr, uid, self.order.mode.bank_id.acc_number )
         texto += ' ' + ' '*24
         texto += '\r\n'
         if len(texto) != 152:
             raise Log(_('Configuration error:\n\nThe line "%s" is not 150 characters long:\n%s') % ('Cabecera remesa 32', texto), True)
         return texto
 
-    def _registro_individual_i_32(self, cr, recibo, context):
+    def _registro_individual_i_32(self, cr, uid, recibo, context):
+        converter = self.pool.get('payment.converter.spain')
         # A
         texto = '2565'
         texto += '  '
         # B
-        texto += convert(cr, self.num_recibos+1, 15, context)
+        texto += converter.convert(cr, uid, self.num_recibos+1, 15, context)
         texto += datetime.today().strftime('%d%m%y')
         texto += '0001'
  
         # C
         state = self.order.mode.bank_id.state_id and self.order.mode.bank_id.state_id.code or False
-        texto += convert(cr, state, 2, context)
+        texto += converter.convert(cr, uid, state, 2, context)
         texto += ' '*7
         texto += '  '
 
         # D
-        texto += convert(cr, self.order.mode.bank_id.city, 20, context)
+        texto += converter.convert(cr, uid, self.order.mode.bank_id.city, 20, context)
         texto += ' '
 
         # E
         texto += ' '*24
-        texto += convert(cr, abs(recibo['amount']), 9, context)
+        texto += converter.convert(cr, uid, abs(recibo['amount']), 9, context)
         texto += ' '*15
         texto += datetime.strptime( recibo['ml_maturity_date'], '%Y-%m-%d').strftime('%d%m%y') 
         texto += ' '*(6+6+1+4+16)
@@ -110,13 +117,14 @@
             raise Log(_('Configuration error:\n\nThe line "%s" is not 150 characters long:\n%s') % ('Registro individual I 32', texto), True)
         return texto
 
-    def _registro_individual_ii_32(self, cr, recibo, context):
+    def _registro_individual_ii_32(self, cr, uid, recibo, context):
+        converter = self.pool.get('payment.converter.spain')
         # A: Identificacion de la operacion
         texto = '2665'
         texto += '  '
 
         # B: Datos del efecto
-        texto += convert(cr, self.num_recibos+1, 15, context)
+        texto += converter.convert(cr, uid, self.num_recibos+1, 15, context)
         texto += '  '
         texto += '2' # Recibo
         texto += '000000'
@@ -132,42 +140,44 @@
             texto += ' '*20
 
         # D: Datos del efecto
-        texto += convert(cr, self.order.mode.partner_id.name, 34, context)
-        texto += convert(cr, recibo['partner_id'].name, 34, context)
+        texto += converter.convert(cr, uid, self.order.mode.partner_id.name, 34, context)
+        texto += converter.convert(cr, uid, recibo['partner_id'].name, 34, context)
         texto += ' '*30
         texto += '\r\n'
         if len(texto) != 152:
             raise Log(_('Configuration error:\n\nThe line "%s" is not 150 characters long:\n%s') % ('Registro individual II 32', texto), True)
         return texto
 
-    def _registro_individual_iii_32(self, cr, recibo, context):
+    def _registro_individual_iii_32(self, cr, uid, recibo, context):
+        converter = self.pool.get('payment.converter.spain')
         # A: Identificacion de la operacion
         texto = '2765'
         texto += '  '
         
         # B: Datos del efecto
-        texto += convert(cr, self.num_recibos+1, 15, context)
+        texto += converter.convert(cr, uid, self.num_recibos+1, 15, context)
         texto += '  '
-        addresses = self.pool.get('res.partner').address_get(self.cr, self.uid, [recibo['partner_id'].id] )
+        addresses = self.pool.get('res.partner').address_get(cr, uid, [recibo['partner_id'].id] )
         #if not addresses:
         #    print "NO ADDRESSES"
-        address = self.pool.get('res.partner.address').browse(self.cr, self.uid, addresses['default'], self.context)
-        texto += convert( cr, address.street, 34, context )
-        texto += convert( cr, address.zip, 5, context )
-        texto += convert( cr, address.city, 20, context )
-        texto += convert( cr, address.state_id and address.state_id.code or False, 2, context )
+        address = self.pool.get('res.partner.address').browse(cr, uid, addresses['default'], context)
+        texto += converter.convert( cr, uid, address.street, 34, context )
+        texto += converter.convert( cr, uid, address.zip, 5, context )
+        texto += converter.convert( cr, uid, address.city, 20, context )
+        texto += converter.convert( cr, uid, address.state_id and address.state_id.code or False, 2, context )
         texto += '0'*7
 
         # C: Datos del efecto
         vat = recibo['partner_id'].vat and recibo['partner_id'].vat[2:] or False
-        texto += convert(cr, vat, 9, context)
+        texto += converter.convert(cr, uid, vat, 9, context)
         texto += ' '*50
         texto += '\r\n'
         if len(texto) != 152:
             raise Log(_('Configuration error:\n\nThe line "%s" is not 150 characters long:\n%s') % ('Registro individual III 32', texto), True)
         return texto
 
-    def _registro_fin_remesa_32(self, cr, context):
+    def _registro_fin_remesa_32(self, cr, uid, context):
+        converter = self.pool.get('payment.converter.spain')
         # A: Identificación de la operación
         texto = '7165'
         texto += '  '
@@ -182,20 +192,21 @@
 
         # D: Acumuladores de importe
         texto += ' '*10
-        texto += convert( cr, abs(self.order.total), 10, context )
+        texto += converter.convert( cr, uid, abs(self.order.total), 10, context )
         texto += ' '*(10+6+7+6+6+6)
 
         # E: Controles de lectura de fichero
         texto += ' '*5
-        texto += convert(cr, (self.num_recibos*3) + 2, 7, context)
-        texto += convert(cr, self.num_recibos, 6, context)
+        texto += converter.convert(cr, uid, (self.num_recibos*3) + 2, 7, context)
+        texto += converter.convert(cr, uid, self.num_recibos, 6, context)
         texto += ' '*6
         texto += '\r\n'
         if len(texto) != 152:
             raise Log(_('Configuration error:\n\nThe line "%s" is not 150 characters long:\n%s') % ('Fin remesa 32', texto), True)
         return texto
 
-    def _registro_fin_fichero_32(self, cr, context):
+    def _registro_fin_fichero_32(self, cr, uid, context):
+        converter = self.pool.get('payment.converter.spain')
         # A: Identificación de la operación
         texto = '9865'
         texto += '  '
@@ -208,40 +219,35 @@
 
         # D: Acumuladores de importes
         texto += ' '*10
-        texto += convert( cr, abs(self.order.total), 10, context )
+        texto += converter.convert( cr, uid, abs(self.order.total), 10, context )
         texto += ' '*(10+6+7+6+6+6)
 
         # E: Controles de lectura del fichero
         texto += '00001'
-        texto += convert(cr, (self.num_recibos*3) + 3, 7, context)
-        texto += convert(cr, self.num_recibos, 6, context)
+        texto += converter.convert(cr, uid, (self.num_recibos*3) + 3, 7, context)
+        texto += converter.convert(cr, uid, self.num_recibos, 6, context)
         texto += ' '*6
         texto += '\r\n'
         if len(texto) != 152:
             raise Log(_('Configuration error:\n\nThe line "%s" is not 150 characters long:\n%s') % ('Fin fichero 32', texto), True)
         return texto
  
-    def create_file(self, pool, cr, uid, order, lines, context):
-        self.pool = pool
-        self.cr = cr
-        self.uid = uid
+    def create_file(self, cr, uid, order, lines, context):
         self.order = order
-        self.context = context
 
         txt_remesa = ''
         self.num_recibos = 0
         self.num_lineas_opc = 0
 
-        txt_remesa += self._cabecera_fichero_32()
-        txt_remesa += self._cabecera_remesa_32(cr, context)
+        txt_remesa += self._cabecera_fichero_32(cr,uid)
+        txt_remesa += self._cabecera_remesa_32(cr, uid, context)
         for recibo in lines:
-            txt_remesa += self._registro_individual_i_32(cr, recibo, context)
-            txt_remesa += self._registro_individual_ii_32(cr, recibo, context)
-            txt_remesa += self._registro_individual_iii_32(cr, recibo, context)
+            txt_remesa += self._registro_individual_i_32(cr, uid, recibo, context)
+            txt_remesa += self._registro_individual_ii_32(cr, uid, recibo, context)
+            txt_remesa += self._registro_individual_iii_32(cr, uid, recibo, context)
             self.num_recibos = self.num_recibos + 1
-        txt_remesa += self._registro_fin_remesa_32(cr, context)
-        txt_remesa += self._registro_fin_fichero_32(cr, context)
+        txt_remesa += self._registro_fin_remesa_32(cr, uid, context)
+        txt_remesa += self._registro_fin_fichero_32(cr, uid, context)
         return txt_remesa
 
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+csb_32()
 
=== modified file 'l10n_es_payment_order/wizard/csb_34.py'
--- l10n_es_payment_order/wizard/csb_34.py	2011-09-20 06:47:43 +0000
+++ l10n_es_payment_order/wizard/csb_34.py	2013-01-11 10:23:22 +0000
@@ -20,6 +20,9 @@
 # Rehecho de nuevo para instalación OpenERP 5.0.0 sobre account_payment_extension: Zikzakmedia S.L. 2009
 #   Jordi Esteve <[e-mail]>
 #
+# Refactorización. Acysos S.L. (http://www.acysos.com) 2012
+#   Ignacio Ibeas <[e-mail]>
+#
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
@@ -35,21 +38,17 @@
 #
 ##############################################################################
 
+from osv import osv, fields
 from datetime import datetime
 from tools.translate import _
-from converter import *
+from log import *
 import time
 
-csb34_code = {
-    'transfer': '56',
-    'cheques': '57',
-    'promissory_note': '58',
-    'certified_payments': '59',
-}
-
-class csb_34:
-
-    def get_message(self, recibo, message=None):
+class csb_34(osv.osv):
+    _name = 'csb.34'
+    _auto = False
+
+    def get_message(self, cr, uid, recibo, message=None):
         """
         Evaluates an expression and returns its value
         @param recibo: Order line data
@@ -78,17 +77,19 @@
             message = message.replace('${' + field + '}', value)
         return message
 
-    def _start_34(self, cr, context):
-        return convert(cr, self.order.mode.bank_id.partner_id.vat[2:] + self.order.mode.sufijo, 12, context)
+    def _start_34(self, cr, uid, context):
+        converter = self.pool.get('payment.converter.spain')
+        return converter.convert(cr, uid, self.order.mode.bank_id.partner_id.vat[2:] + self.order.mode.sufijo, 12, context)
 
     def _cabecera_ordenante_34(self, cr, uid, context):
+        converter = self.pool.get('payment.converter.spain')
         today = datetime.today().strftime('%d%m%y')
 
         text = ''
 
         # Primer tipo
         text += '0362'
-        text += self._start_34(cr, context)
+        text += self._start_34(cr, uid, context)
         text += 12*' '
         text += '001'
         text += today
@@ -97,24 +98,23 @@
             text += planned.strftime('%d%m%y')
         else:
             text += today
-        #text += self.convert(self.order.mode.nombre, 40)
-        text += convert_bank_account(cr, self.order.mode.bank_id.acc_number, self.order.mode.partner_id.name, context)
+        text += converter.convert_bank_account(cr, uid, self.order.mode.bank_id.acc_number, self.order.mode.partner_id.name, context)
         text += '0'
         text += 8*' '
         text += '\r\n'
 
         # Segundo Tipo
         text += '0362'
-        text += self._start_34(cr, context)
+        text += self._start_34(cr, uid, context)
         text += 12*' '
         text += '002'
-        text += convert(cr, self.order.mode.bank_id.partner_id.name, 36, context)
+        text += converter.convert(cr, uid, self.order.mode.bank_id.partner_id.name, 36, context)
         text += 5*' '
         text += '\r\n'
 
         # Tercer Tipo 
         text += '0362'
-        text += self._start_34(cr, context)
+        text += self._start_34(cr, uid, context)
         text += 12*' '
         text += '003'
         # Direccion
@@ -126,17 +126,17 @@
             address = self.pool.get('res.partner.address').read(cr, uid, [address_ids.get('default')], ['street','zip','city'], context)[0]
         else:
             raise Log( _('User error:\n\nCompany %s has no invoicing or default address.') % self.order.mode.bank_id.partner_id.name )
-        text += convert(cr, address['street'], 36, context)
+        text += converter.convert(cr, uid, address['street'], 36, context)
         text += 5*' '
         text += '\r\n'
 
         # Cuarto Tipo 
         text += '0362'
-        text += self._start_34(cr, context)
+        text += self._start_34(cr, uid, context)
         text += 12*' '
         text += '004'
-        text += convert(cr, address['zip'], 6, context)
-        text += convert(cr, address['city'], 30, context)
+        text += converter.convert(cr, uid, address['zip'], 6, context)
+        text += converter.convert(cr, uid, address['city'], 30, context)
         text += 5*' '
         text += '\r\n'
         if len(text)%74 != 0:
@@ -145,7 +145,7 @@
 
     def _cabecera_nacionales_34(self, cr, uid, context):
         text = '0456'
-        text += self._start_34(cr, context)
+        text += self._start_34(cr, uid, context)
         text += 12*' '
         text += 3*' '
         text += 41*' '
@@ -155,7 +155,13 @@
         return text
 
     def _detalle_nacionales_34(self, cr, uid, recibo, csb34_type, context):
-    
+        converter = self.pool.get('payment.converter.spain')
+        csb34_code = {
+            'transfer': '56',
+            'cheques': '57',
+            'promissory_note': '58',
+            'certified_payments': '59',
+        }
         address = None
         address_ids = self.pool.get('res.partner').address_get(cr, uid, [recibo['partner_id'].id], ['invoice', 'default'])
         if address_ids.get('invoice'):
@@ -169,17 +175,16 @@
         text = ''
         text += '06'
         text += csb34_code[csb34_type]
-        text += self._start_34(cr, context)
-        text += convert(cr, recibo['partner_id'].vat, 12, context)
+        text += self._start_34(cr, uid, context)
+        text += converter.convert(cr, uid, recibo['partner_id'].vat, 12, context)
         text += '010'
-        text += convert(cr, abs(recibo['amount']), 12, context)
-        #text += convert_bank_account(cr, recibo['bank_id'].acc_number, recibo['partner_id'].name, context)
+        text += converter.convert(cr, uid, abs(recibo['amount']), 12, context)
 
         # Si la orden se emite para transferencia
         csb34_type = self.order.mode.csb34_type
         if csb34_type == 'transfer':
             ccc = recibo['bank_id'] and recibo['bank_id'].acc_number or ''
-            ccc = digits_only(ccc)
+            ccc = converter.digits_only(cr, uid, ccc)
             text += ccc[:20].zfill(20)
         # Si la orden se emite para pagaré, cheque o pago certificado
         else:
@@ -220,10 +225,10 @@
         # Segundo Registro
         text += '06'
         text += csb34_code[csb34_type] 
-        text += self._start_34(cr, context)
-        text += convert(cr, recibo['partner_id'].vat, 12, context)
+        text += self._start_34(cr, uid, context)
+        text += converter.convert(cr, uid, recibo['partner_id'].vat, 12, context)
         text += '011'
-        text += convert(cr, recibo['partner_id'].name, 36, context)
+        text += converter.convert(cr, uid, recibo['partner_id'].name, 36, context)
         text += 5*' '
         text += '\r\n'
 
@@ -236,10 +241,10 @@
         for (code, street) in lines:
             text += '06'
             text += csb34_code[csb34_type] 
-            text += self._start_34(cr, context)
-            text += convert(cr, recibo['partner_id'].vat, 12, context)
+            text += self._start_34(cr, uid, context)
+            text += converter.convert(cr, uid, recibo['partner_id'].vat, 12, context)
             text += code
-            text += convert(cr, street, 36, context)
+            text += converter.convert(cr, uid, street, 36, context)
             text += 5*' '
             text += '\r\n'
 
@@ -247,11 +252,11 @@
         if address.zip or address.city:
             text += '06'
             text += csb34_code[csb34_type] 
-            text += self._start_34(cr, context)
-            text += convert(cr, recibo['partner_id'].vat, 12, context)
+            text += self._start_34(cr, uid, context)
+            text += converter.convert(cr, uid, recibo['partner_id'].vat, 12, context)
             text += '014'
-            text += convert(cr, address.zip, 6, context)
-            text += convert(cr, address.city, 30, context)
+            text += converter.convert(cr, uid, address.zip, 6, context)
+            text += converter.convert(cr, uid, address.city, 30, context)
             text += 5*' '
             text += '\r\n'
 
@@ -262,13 +267,13 @@
             # Sexto Registro
             text += '06'
             text += csb34_code[csb34_type] 
-            text += self._start_34(cr, context)
-            text += convert(cr, recibo['partner_id'].vat, 12, context)
+            text += self._start_34(cr, uid, context)
+            text += converter.convert(cr, uid, recibo['partner_id'].vat, 12, context)
             text += '015'
             country_code = address.country_id and address.country_id.code or ''
             state = address.state_id and address.state_id.name or ''
-            text += convert(cr, country_code, 2, context)
-            text += convert(cr, state, 34, context)
+            text += converter.convert(cr, uid, country_code, 2, context)
+            text += converter.convert(cr, uid, state, 34, context)
             text += 5*' '
             text += '\r\n'
 
@@ -278,43 +283,43 @@
                 if self.order.mode.payroll_check:
                     text += '06'
                     text += csb34_code[csb34_type] 
-                    text += self._start_34(cr, context)
-                    text += convert(cr, recibo['partner_id'].vat, 12, context)
+                    text += self._start_34(cr, uid, context)
+                    text += converter.convert(cr, uid, recibo['partner_id'].vat, 12, context)
                     text += '018'
-                    text += convert(cr, recibo['partner_id'].vat, 36, context)
+                    text += converter.convert(cr, uid, recibo['partner_id'].vat, 36, context)
                     text += 5*' '
                     text += '\r\n'
 
                 # Registro ciento uno (registro usados por algunos bancos como texto de la carta)
                 text += '06'
                 text += csb34_code[csb34_type] 
-                text += self._start_34(cr, context)
-                text += convert(cr, recibo['partner_id'].vat, 12, context)
+                text += self._start_34(cr, uid, context)
+                text += converter.convert(cr, uid, recibo['partner_id'].vat, 12, context)
                 text += '101'
-                message = self.get_message(recibo, self.order.mode.text1)
-                text += convert(cr, message, 36, context)
+                message = self.get_message(cr, uid, recibo, self.order.mode.text1)
+                text += converter.convert(cr, uid, message, 36, context)
                 text += 5*' '
                 text += '\r\n'
 
                 # Registro ciento dos (registro usados por algunos bancos como texto de la carta)
                 text += '06'
                 text += csb34_code[csb34_type] 
-                text += self._start_34(cr, context)
-                text += convert(cr, recibo['partner_id'].vat, 12, context)
+                text += self._start_34(cr, uid, context)
+                text += converter.convert(cr, uid, recibo['partner_id'].vat, 12, context)
                 text += '102'
-                message = self.get_message(recibo, self.order.mode.text2)
-                text += convert(cr, message, 36, context)
+                message = self.get_message(cr, uid, recibo, self.order.mode.text2)
+                text += converter.convert(cr, uid, message, 36, context)
                 text += 5*' '
                 text += '\r\n'
 
                 # Registro ciento tres (registro usados por algunos bancos como texto de la carta)
                 text += '06'
                 text += csb34_code[csb34_type] 
-                text += self._start_34(cr, context)
-                text += convert(cr, recibo['partner_id'].vat, 12, context)
+                text += self._start_34(cr, uid, context)
+                text += converter.convert(cr, uid, recibo['partner_id'].vat, 12, context)
                 text += '103'
-                message = self.get_message(recibo, self.order.mode.text3)
-                text += convert(cr, message, 36, context)
+                message = self.get_message(cr, uid, recibo, self.order.mode.text3)
+                text += converter.convert(cr, uid, message, 36, context)
                 text += 5*' '
                 text += '\r\n'
 
@@ -330,10 +335,10 @@
                     message = day+month+year
                     text += '06'
                     text += csb34_code[csb34_type] 
-                    text += self._start_34(cr, context)
-                    text += convert(cr, recibo['partner_id'].vat, 12, context)
+                    text += self._start_34(cr, uid, context)
+                    text += converter.convert(cr, uid, recibo['partner_id'].vat, 12, context)
                     text += '910'
-                    text += convert(cr, message, 36, context)
+                    text += converter.convert(cr, uid, message, 36, context)
                     text += 5*' '
                     text += '\r\n'
 
@@ -342,13 +347,14 @@
         return text
 
     def _totales_nacionales_34(self, cr, uid, values, context):
+        converter = self.pool.get('payment.converter.spain')
         text = '0856'
-        text += self._start_34(cr, context)
+        text += self._start_34(cr, uid, context)
         text += 12*' '
         text += 3*' '
-        text += convert(cr, self.order.total, 12, context)
-        text += convert(cr, values[0], 8, context)
-        text += convert(cr, values[1], 10, context)
+        text += converter.convert(cr, uid, self.order.total, 12, context)
+        text += converter.convert(cr, uid, values[0], 8, context)
+        text += converter.convert(cr, uid, values[1], 10, context)
         text += 6*' '
         text += 5*' '
         text += '\r\n'
@@ -357,13 +363,14 @@
         return text
 
     def _total_general_34(self, cr, uid, values, context):
+        converter = self.pool.get('payment.converter.spain')
         text = '0962'
-        text += self._start_34(cr, context)
+        text += self._start_34(cr, uid, context)
         text += 12*' '
         text += 3*' '
-        text += convert(cr, self.order.total, 12, context)
-        text += convert(cr, values[0], 8, context)
-        text += convert(cr, values[1], 10, context)
+        text += converter.convert(cr, uid, self.order.total, 12, context)
+        text += converter.convert(cr, uid, values[0], 8, context)
+        text += converter.convert(cr, uid, values[1], 10, context)
         text += 6*' '
         text += 5*' '
         text += '\r\n'
@@ -371,10 +378,8 @@
             raise Log(_('Configuration error:\n\nThe line "%s" is not 72 characters long:\n%s') % ('Total general 34', text), True)
         return text
 
-    def create_file(self, pool, cr, uid, order, lines, context):
-        self.pool = pool
+    def create_file(self, cr, uid, order, lines, context):
         self.order = order
-        self.context = context
 
         payment_line_count = 0
         record_count = 0
@@ -394,4 +399,4 @@
         file += self._total_general_34(cr, uid, values, context)
         return file
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+csb_34()
 
=== modified file 'l10n_es_payment_order/wizard/csb_34_01.py'
--- l10n_es_payment_order/wizard/csb_34_01.py	2012-05-28 19:13:52 +0000
+++ l10n_es_payment_order/wizard/csb_34_01.py	2013-01-11 10:23:22 +0000
@@ -23,6 +23,9 @@
 # Adaptacion de la norma 34-01 para emision de pagos. Validado para La Caixa: 2012
 #   Joan M. Grande <[e-mail]>
 #
+# Refactorización. Acysos S.L. (http://www.acysos.com) 2012
+#   Ignacio Ibeas <[e-mail]>
+#
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
@@ -38,22 +41,28 @@
 #
 ##############################################################################
 
+from osv import osv, fields
 from datetime import datetime
 from tools.translate import _
-from converter import *
+from log import *
 
-class csb_34_01:
-    def _start_34(self, cr, context):
-        return convert(cr, self.order.mode.bank_id.partner_id.vat[2:], 10, context, 'right')
+class csb_34_01(osv.osv):
+    _name = 'csb.3401'
+    _auto = False
+    
+    def _start_34(self, cr, uid, context):
+        converter = self.pool.get('payment.converter.spain')
+        return converter.convert(cr, uid, self.order.mode.bank_id.partner_id.vat[2:], 10, context, 'right')
 
     def _cabecera_ordenante_34(self, cr, uid, context):
+        converter = self.pool.get('payment.converter.spain')
         today = datetime.today().strftime('%d%m%y')
 
         text = ''
 
         # Primer tipo
         text += '0356'
-        text += self._start_34(cr, context)
+        text += self._start_34(cr, uid, context)
         text += '34016'
         text += 7*' '
         text += '001'
@@ -64,7 +73,7 @@
         else:
             text += today
         #text += self.convert(self.order.mode.nombre, 40)
-        ccc = bank_account_parts(cr, self.order.mode.bank_id.acc_number, self.order.mode.partner_id.name, context)
+        ccc = converter.bank_account_parts(cr, uid, self.order.mode.bank_id.acc_number, self.order.mode.partner_id.name, context)
         text += ccc['bank']
         text += ccc['office']
         text += ccc['account']
@@ -77,17 +86,17 @@
 
         # Segundo Tipo 
         text += '0356'
-        text += self._start_34(cr, context)
+        text += self._start_34(cr, uid, context)
         text += '34016'
         text += 7*' '
         text += '002'
-        text += convert(cr, self.order.mode.bank_id.partner_id.name, 36, context)
+        text += converter.convert(cr, uid, self.order.mode.bank_id.partner_id.name, 36, context)
         text += 7*' '
         text += '\n'
 
         # Tercer Tipo 
         text += '0356'
-        text += self._start_34(cr, context)
+        text += self._start_34(cr, uid, context)
         text += '34016'
         text += 7*' '
         text += '003'
@@ -97,35 +106,34 @@
             raise Log( _('User error:\n\nCompany %s has no invoicing address.') % address_id )
 
         street = self.pool.get('res.partner.address').read(cr, uid, [address_id], ['street'], context)[0]['street']
-        text += convert(cr, street, 36, context)
+        text += converter.convert(cr, uid, street, 36, context)
         text += 7*' '
         text += '\n'
 
         # Cuarto Tipo 
         text += '0356'
-        text += self._start_34(cr, context)
+        text += self._start_34(cr, uid, context)
         text += '34016'
         text += 7*' '
         text += '004'
         city = self.pool.get('res.partner.address').read(cr, uid, [address_id], ['city'], context)[0]['city']
-        text += convert(cr, city, 36, context)
+        text += converter.convert(cr, uid, city, 36, context)
         text += 7*' '
         text += '\n'
         return text
 
     def _detalle_nacionales_34(self, cr, uid, recibo, context):
+        converter = self.pool.get('payment.converter.spain')
         # Primer Registro
         text = ''
         text += '0656'
-        text += self._start_34(cr, context)
+        text += self._start_34(cr, uid, context)
         if not recibo['partner_id'].vat:
             raise Log( _('User error:\n\nCompany %s has no vat.') % recibo['partner_id'].name )    
-        text += convert(cr, recibo['partner_id'].vat[2:], 12, context, 'right')
+        text += converter.convert(cr, uid, recibo['partner_id'].vat[2:], 12, context, 'right')
         text += '010'
-        text += convert(cr, recibo['amount'], 12, context)
-        #text += convert_bank_account(cr, recibo['bank_id'].acc_number, recibo['partner_id'].name, context)
-        #ccc = recibo['bank_id'] and recibo['bank_id'].acc_number or ''
-        ccc = bank_account_parts(cr, recibo['bank_id'].acc_number, recibo['partner_id'].name, context)
+        text += converter.convert(cr, uid, recibo['amount'], 12, context)
+        ccc = converter.bank_account_parts(cr, uid, recibo['bank_id'].acc_number, recibo['partner_id'].name, context)
         text += ccc['bank']
         text += ccc['office']
         text += ccc['account']
@@ -138,33 +146,32 @@
 
         # Segundo Registro
         text += '0656'
-        text += self._start_34(cr, context)
+        text += self._start_34(cr, uid, context)
         if not recibo['partner_id'].vat:
             raise Log( _('User error:\n\nCompany %s has no vat.') % recibo['partner_id'].name ) 
-        text += convert(cr, recibo['partner_id'].vat[2:], 12, context, 'right')
+        text += converter.convert(cr, uid, recibo['partner_id'].vat[2:], 12, context, 'right')
         text += '011'
-        text += convert(cr, recibo['partner_id'].name, 36, context)
+        text += converter.convert(cr, uid, recibo['partner_id'].name, 36, context)
         text += 7*' '
         text += '\n'
         return text
 
     def _totales_nacionales_34(self, cr, uid, context):
+        converter = self.pool.get('payment.converter.spain')
         text = '0856'
-        text += self._start_34(cr, context)
+        text += self._start_34(cr, uid, context)
         text += 12*' '
         text += 3*' '
-        text += convert(cr, self.order.total, 12, context)
-        text += convert(cr, self.payment_line_count, 8, context)
-        text += convert(cr, self.record_count, 10, context)
+        text += converter.convert(cr, uid, self.order.total, 12, context)
+        text += converter.convert(cr, uid, self.payment_line_count, 8, context)
+        text += converter.convert(cr, uid, self.record_count, 10, context)
         text += 6*' '
         text += 7*' '
         text += '\n'
         return text
 
-    def create_file(self, pool, cr, uid, order, lines, context):
-        self.pool = pool
+    def create_file(self, cr, uid, order, lines, context):
         self.order = order
-        self.context = context
 
         self.payment_line_count = 0
         self.record_count = 0
@@ -181,4 +188,4 @@
         
         return file
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+csb_34_01()
 
=== modified file 'l10n_es_payment_order/wizard/csb_58.py'
--- l10n_es_payment_order/wizard/csb_58.py	2011-08-29 15:11:11 +0000
+++ l10n_es_payment_order/wizard/csb_58.py	2013-01-11 10:23:22 +0000
@@ -18,6 +18,9 @@
 # Rehecho de nuevo para instalación OpenERP 5.0.0 sobre account_payment_extension: Zikzakmedia S.L. 2009
 #   Jordi Esteve <[e-mail]>
 #
+# Refactorización. Acysos S.L. (http://www.acysos.com) 2012
+#   Ignacio Ibeas <[e-mail]>
+#
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
@@ -33,19 +36,24 @@
 #
 ##############################################################################
 
+from osv import osv, fields
 from datetime import datetime
 from tools.translate import _
-from converter import *
+from log import *
 
-class csb_58:
-    def _cabecera_presentador_58(self):
+class csb_58(osv.osv):
+    _name = 'csb.58'
+    _auto = False
+    
+    def _cabecera_presentador_58(self, cr, uid):
+        converter = self.pool.get('payment.converter.spain')
         texto = '5170'
         texto += (self.order.mode.bank_id.partner_id.vat[2:] + self.order.mode.sufijo).zfill(12)
         texto += datetime.today().strftime('%d%m%y')
         texto += 6*' '
-        texto += to_ascii(self.order.mode.nombre).ljust(40)
+        texto += converter.to_ascii(cr, uid, self.order.mode.nombre).ljust(40)
         texto += 20*' '
-        cc = digits_only(self.order.mode.bank_id.acc_number)
+        cc = converter.digits_only(cr, uid, self.order.mode.bank_id.acc_number)
         texto += cc[0:8]
         texto += 66*' '
         texto += '\r\n'
@@ -53,32 +61,34 @@
             raise Log(_('Configuration error:\n\nThe line "%s" is not 162 characters long:\n%s') % ('Cabecera presentador 58', texto), True)
         return texto
 
-    def _cabecera_ordenante_58(self):
+    def _cabecera_ordenante_58(self, cr, uid):
+        converter = self.pool.get('payment.converter.spain')
         texto = '5370'
         texto += (self.order.mode.bank_id.partner_id.vat[2:] + self.order.mode.sufijo).zfill(12)
         texto += datetime.today().strftime('%d%m%y')
         texto += 6*' '
-        texto += to_ascii(self.order.mode.nombre).ljust(40)
-        cc = digits_only(self.order.mode.bank_id.acc_number)
+        texto += converter.to_ascii(cr, uid, self.order.mode.nombre).ljust(40)
+        cc = converter.digits_only(cr, uid, self.order.mode.bank_id.acc_number)
         texto += cc[0:20]
         texto += 8*' '
         texto += '06'
         texto += 52*' '
-        texto += self.order.mode.ine and to_ascii(self.order.mode.ine)[:9].zfill(9) or 9*' '
+        texto += self.order.mode.ine and converter.to_ascii(cr, uid, self.order.mode.ine)[:9].zfill(9) or 9*' '
         texto += 3*' '
         texto += '\r\n'
         if len(texto) != 164:
             raise Log(_('Configuration error:\n\nThe line "%s" is not 162 characters long:\n%s') % ('Cabecera ordenante 58', texto), True)
         return texto
 
-    def _individual_obligatorio_58(self, recibo):
+    def _individual_obligatorio_58(self, cr, uid, recibo):
+        converter = self.pool.get('payment.converter.spain')
         texto = '5670'
         texto += (self.order.mode.bank_id.partner_id.vat[2:] + self.order.mode.sufijo).zfill(12)
         texto += str(recibo['name'])[-12:].zfill(12)
-        nombre = to_ascii(recibo['partner_id'].name)
+        nombre = converter.to_ascii(cr, uid, recibo['partner_id'].name)
         texto += nombre[0:40].ljust(40)
         ccc = recibo['bank_id'] and recibo['bank_id'].acc_number or ''
-        ccc = digits_only(ccc)
+        ccc = converter.digits_only(cr, uid, ccc)
         texto += str(ccc)[0:20].zfill(20)
         importe = int(round(abs(recibo['amount'])*100,0))
         texto += str(importe).zfill(10)
@@ -86,7 +96,7 @@
         concepto = ''
         if recibo['communication']:
             concepto = recibo['communication']
-        texto += to_ascii(concepto)[0:40].ljust(40)
+        texto += converter.to_ascii(cr, uid, concepto)[0:40].ljust(40)
         if recibo.get('date'):
             date_cargo = datetime.strptime(recibo['date'],'%Y-%m-%d')
         elif recibo.get('ml_maturity_date'):
@@ -100,19 +110,20 @@
             raise Log(_('Configuration error:\n\nThe line "%s" is not 162 characters long:\n%s') % ('Individual obligatorio 58', texto), True)
         return texto
 
-    def _individual_opcional_58(self, recibo):
+    def _individual_opcional_58(self, cr, uid, recibo):
         """Para poner el segundo texto de comunicación"""
+        converter = self.pool.get('payment.converter.spain')
         texto = '5671'
         texto += (self.order.mode.bank_id.partner_id.vat[2:] + self.order.mode.sufijo).zfill(12)
         texto += str(recibo['name'])[-12:].zfill(12)
-        texto += to_ascii(recibo['communication2'])[0:134].ljust(134)
+        texto += converter.to_ascii(cr, uid, recibo['communication2'])[0:134].ljust(134)
         texto += '\r\n'
         if len(texto) != 164:
             raise Log(_('Configuration error:\n\nThe line "%s" is not 162 characters long:\n%s') % ('Individual opcional 58', texto), True)
         return texto
 
 
-    def _registro_obligatorio_domicilio_58(self, recibo):
+    def _registro_obligatorio_domicilio_58(self, cr, uid, recibo):
         """
         Registro obligatorio domicilio 58 para no domiciliados.
         
@@ -134,7 +145,7 @@
                (DDMMAA)
          F2    Libre                                         155     8        Alfanumérico
         """
-
+        converter = self.pool.get('payment.converter.spain')
         alt_format = self.order.mode.alt_domicile_format
 
         #
@@ -207,10 +218,10 @@
         texto = '5676'
         texto += (self.order.mode.bank_id.partner_id.vat[2:] + self.order.mode.sufijo).zfill(12)
         texto += str(recibo['name'])[-12:].zfill(12)
-        texto += to_ascii(st)[:40].ljust(40)          # Domicilio
-        texto += to_ascii(city)[:35].ljust(35)        # Plaza (ciudad)
-        texto += to_ascii(zip)[:5].zfill(5)           # CP
-        texto += to_ascii(ord_city)[:38].ljust(38)    # Localidad del ordenante (ciudad)
+        texto += converter.to_ascii(cr, uid, st)[:40].ljust(40)          # Domicilio
+        texto += converter.to_ascii(cr, uid, city)[:35].ljust(35)        # Plaza (ciudad)
+        texto += converter.to_ascii(cr, uid, zip)[:5].zfill(5)           # CP
+        texto += converter.to_ascii(cr, uid, ord_city)[:38].ljust(38)    # Localidad del ordenante (ciudad)
         if alt_format:
             #
             # Si usamos el formato alternativo (basado en FacturaPlus)
@@ -223,7 +234,7 @@
             texto += date_ct.strftime('%d%m%y')                 # Fecha crédito
             texto += 2*' '
         else:
-            texto += to_ascii(ord_state_code)[:2].zfill(2)    # Cod prov del ordenante
+            texto += converter.to_ascii(cr, uid, ord_state_code)[:2].zfill(2)    # Cod prov del ordenante
             texto += date_ct.strftime('%d%m%y')                 # Fecha crédito
         texto += 8*' '                                  # Libre
         texto += '\r\n'
@@ -232,7 +243,7 @@
         return texto
 
 
-    def _total_ordenante_58(self):
+    def _total_ordenante_58(self, cr, uid):
         texto = '5870'
         texto += (self.order.mode.bank_id.partner_id.vat[2:] + self.order.mode.sufijo).zfill(12)
         texto += 72*' '
@@ -247,7 +258,7 @@
             raise Log(_('Configuration error:\n\nThe line "%s" is not 162 characters long:\n%s') % ('Total ordenante 58', texto), True)
         return texto
 
-    def _total_general_58(self):
+    def _total_general_58(self, cr, uid):
         texto = '5970'
         texto += (self.order.mode.bank_id.partner_id.vat[2:] + self.order.mode.sufijo).zfill(12)
         texto += 52*' '
@@ -264,39 +275,34 @@
             raise Log(_('Configuration error:\n\nThe line "%s" is not 162 characters long:\n%s') % ('Total general 58', texto), True)
         return texto
 
-    def create_file(self, pool, cr, uid, order, lines, context):
-        self.pool = pool
-        self.cr = cr
-        self.uid = uid
+    def create_file(self, cr, uid, order, lines, context):
         self.order = order
-        self.context = context
 
         txt_remesa = ''
         self.num_recibos = 0
         self.num_lineas_opc = 0
 
-        txt_remesa += self._cabecera_presentador_58()
-        txt_remesa += self._cabecera_ordenante_58()
+        txt_remesa += self._cabecera_presentador_58(cr, uid)
+        txt_remesa += self._cabecera_ordenante_58(cr, uid)
 
         for recibo in lines:
-            txt_remesa += self._individual_obligatorio_58(recibo)
+            txt_remesa += self._individual_obligatorio_58(cr, uid, recibo)
             self.num_recibos = self.num_recibos + 1
             
             # Sólo emitimos el registro individual si communication2 contiene texto
             if recibo['communication2'] and len(recibo['communication2'].strip()) > 0:
-                txt_remesa += self._individual_opcional_58(recibo)
+                txt_remesa += self._individual_opcional_58(cr, uid, recibo)
                 self.num_lineas_opc = self.num_lineas_opc + 1
 
             # Para recibos no domiciliados, añadimos el registro obligatorio
             # de domicilio (necesario con algunos bancos/cajas).
             if self.order.mode.inc_domicile:
-                txt_remesa += self._registro_obligatorio_domicilio_58(recibo)
+                txt_remesa += self._registro_obligatorio_domicilio_58(cr, uid, recibo)
                 self.num_lineas_opc = self.num_lineas_opc + 1
 
-        txt_remesa += self._total_ordenante_58()
-        txt_remesa += self._total_general_58()
+        txt_remesa += self._total_ordenante_58(cr, uid)
+        txt_remesa += self._total_general_58(cr, uid)
 
         return txt_remesa
 
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+csb_58()
 
=== modified file 'l10n_es_payment_order/wizard/export_remesas.py'
--- l10n_es_payment_order/wizard/export_remesas.py	2012-05-29 12:23:40 +0000
+++ l10n_es_payment_order/wizard/export_remesas.py	2013-01-11 10:23:22 +0000
@@ -21,6 +21,12 @@
 # Añadidos conceptos extras del CSB 19: Acysos S.L. 2011
 #   Ignacio Ibeas <[e-mail]>
 #
+# Migración de wizard.interface para la 6.1: Pexego Sistemas Informáticos. 2012
+#   Marta Vázquez Rodríguez <[e-mail]>
+#
+# Refactorización. Acysos S.L. (http://www.acysos.com) 2012
+#   Ignacio Ibeas <[e-mail]>
+#
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
@@ -36,180 +42,130 @@
 #
 ##############################################################################
 
-import pooler
-import wizard
+from osv import osv, fields
 import base64
 from tools.translate import _
-from converter import *
-import csb_19
-import csb_32
-import csb_34
-import csb_34_01
-import csb_58
-
-join_form = """<?xml version="1.0"?>
-<form string="Payment order export">
-    <field name="join"/>
-</form>"""
-
-join_fields = {
-    'join' : {'string':'Join payment lines of the same partner and bank account', 'type':'boolean'},
-}
-
-export_form = """<?xml version="1.0"?>
-<form string="Payment order export">
-    <field name="pay" filename="pay_fname"/>
-    <field name="pay_fname" invisible="1"/>
-    <field name="note" colspan="4" nolabel="1"/>
-</form>"""
-
-export_fields = {
-    'pay' : {
-        'string':'Payment order file',
-        'type':'binary',
-        'required': False,
-        'readonly':True,
-    },
-    'pay_fname': {'string':'File name', 'type':'char', 'size':64},
-    'note' : {'string':'Log', 'type':'text'},
-}
-
-
-def _create_payment_file(self, cr, uid, data, context):
-
-    txt_remesa = ''
-    num_lineas_opc = 0
-
-    try:
-        pool = pooler.get_pool(cr.dbname)
-        orden = pool.get('payment.order').browse(cr, uid, data['id'], context)
-        if not orden.line_ids:
-            raise Log( _('User error:\n\nWizard can not generate export file, there are not payment lines.'), True )
-
-        # Comprobamos que exista número de C.C. y que tenga 20 dígitos
-        if not orden.mode.bank_id:
-            raise Log( _('User error:\n\nThe bank account of the company %s is not defined.') % (orden.mode.partner_id.name), True )
-        cc = digits_only(orden.mode.bank_id.acc_number)
-        if len(cc) != 20:
-            raise Log( _('User error:\n\nThe bank account number of the company %s has not 20 digits.') % (orden.mode.partner_id.name), True)
-
-        # Comprobamos que exista el CIF de la compañía asociada al C.C. del modo de pago
-        if not orden.mode.bank_id.partner_id.vat:
-            raise Log(_('User error:\n\nThe company VAT number related to the bank account of the payment mode is not defined.'), True)
-
-        recibos = []
-        if data['form']['join']:
-            # Lista con todos los partners+bancos diferentes de la remesa
-            partner_bank_l = reduce(lambda l, x: x not in l and l.append(x) or l,
-                                     [(recibo.partner_id,recibo.bank_id) for recibo in orden.line_ids], [])
-            # Cómputo de la lista de recibos agrupados por mismo partner+banco.
-            # Los importes se suman, los textos se concatenan con un espacio en blanco y las fechas se escoge el máximo
-            for partner,bank in partner_bank_l:
-                lineas = [recibo for recibo in orden.line_ids if recibo.partner_id==partner and recibo.bank_id==bank]
-                recibos.append({
-                    'partner_id': partner,
-                    'bank_id': bank,
-                    'name': partner.ref or str(l.partner_id.id),
-                    'amount': reduce(lambda x, y: x+y, [l.amount for l in lineas], 0),
-                    'communication': reduce(lambda x, y: x+' '+(y or ''), [l.name+' '+l.communication for l in lineas], ''),
-                    'communication2': reduce(lambda x, y: x+' '+(y or ''), [l.communication2 for l in lineas], ''),
-                    'date': max([l.date for l in lineas]),
-                    'ml_maturity_date': max([l.ml_maturity_date for l in lineas]),
-                    'create_date': max([l.create_date for l in lineas]),
-                    'ml_date_created': max([l.ml_date_created for l in lineas]),
-                    'ml_inv_ref': [l.ml_inv_ref for l in lineas]
-                })
-        else:
-            # Cada línea de pago es un recibo
-            for l in orden.line_ids:
-                recibos.append({
-                    'partner_id': l.partner_id,
-                    'bank_id': l.bank_id,
-                    'name': l.partner_id.ref or str(l.partner_id.id),
-                    'amount': l.amount,
-                    'communication': l.name+' '+l.communication,
-                    'communication2': l.communication2,
-                    'date': l.date,
-                    'ml_maturity_date': l.ml_maturity_date,
-                    'create_date': l.create_date,
-                    'ml_date_created': l.ml_date_created,
-                    'ml_inv_ref':[l.ml_inv_ref]
-                })
-
-        if orden.mode.require_bank_account:
-            for line in recibos:
-                ccc = line['bank_id'] and line['bank_id'].acc_number or False
-                if not ccc:
-                    raise Log(_('User error:\n\nThe bank account number of the customer %s is not defined and current payment mode enforces all lines to have a bank account.') % (line['partner_id'].name), True)
-                ccc = digits_only(ccc)
-                if len(ccc) != 20:
-                    raise Log(_('User error:\n\nThe bank account number of the customer %s has not 20 digits.') % (line['partner_id'].name), True)
-
-        if orden.mode.tipo == 'csb_19':
-            csb = csb_19.csb_19()
-        elif orden.mode.tipo == 'csb_32':
-            csb = csb_32.csb_32()
-        elif orden.mode.tipo == 'csb_34':
-            csb = csb_34.csb_34()
-        elif orden.mode.tipo == '34_01':
-            csb = csb_34_01.csb_34_01()
-        elif orden.mode.tipo == 'csb_58':
-            csb = csb_58.csb_58()
-        else:
-            raise Log(_('User error:\n\nThe payment mode is not CSB 19, CSB 32, CSB 34 or CSB 58'), True)
-        txt_remesa = csb.create_file(pool, cr, uid, orden, recibos, context)
-
-    except Log, log:
-        return {
-            'note': log(), 
-            'reference': orden.id, 
-            'pay': False, 
-            'state':'failed'
-        }
-    else:
-        # Ensure line breaks use MS-DOS (CRLF) format as standards require.
-        txt_remesa = txt_remesa.replace('\r\n','\n').replace('\n','\r\n')
-
-        file = base64.encodestring(txt_remesa.encode('utf-8'))
-        fname = (_('remesa') + '_' + orden.mode.tipo + '_' + orden.reference + '.txt').replace('/','-')
-        pool.get('ir.attachment').create(cr, uid, {
-            'name': _('Remesa ') + orden.mode.tipo + ' ' + orden.reference,
-            'datas': file,
-            'datas_fname': fname,
-            'res_model': 'payment.order',
-            'res_id': orden.id,
-            }, context=context)
-        log = _("Successfully Exported\n\nSummary:\n Total amount paid: %.2f\n Total Number of Payments: %d\n") % (orden.total, len(recibos))
-        if orden.state == 'open':
-            pool.get('payment.order').set_done(cr, uid, [orden.id], context)
-        return {
-            'note': log, 
-            'reference': orden.id, 
-            'pay': file, 
-            'pay_fname': fname, 
-            'state': 'succeeded',
-        }
-
-
-class wizard_payment_file_spain(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                        'arch' : join_form,
-                        'fields' : join_fields,
-                        'state' : [('export', 'Ok','gtk-ok') ]}
-        },
-        'export': {
-            'actions' : [_create_payment_file],
-            'result' : {'type' : 'form',
-                        'arch' : export_form,
-                        'fields' : export_fields,
-                        'state' : [('end', 'Ok','gtk-ok') ]}
-        }
-
+from log import *
+
+
+
+class wizard_payment_file_spain(osv.osv_memory):
+    _name = 'wizard.payment.file.spain'
+    _columns = {
+        'join': fields.boolean('Join payment lines of the same partner and bank account'),
+        'pay': fields.binary('Payment order file', readonly=True),
+        'pay_fname': fields.char('File name', size=64),
+        'note': fields.text('Log')
     }
-wizard_payment_file_spain('export_payment_file_spain')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+    def create_payment_file(self, cr, uid, ids, context):
+        converter = self.pool.get('payment.converter.spain')
+        txt_remesa = ''
+        num_lineas_opc = 0
+        form_obj = self.browse(cr, uid, ids)[0]
+        try:
+            orden = self.pool.get('payment.order').browse(cr, uid, context['active_id'], context)
+            if not orden.line_ids:
+                raise Log( _('User error:\n\nWizard can not generate export file, there are not payment lines.'), True )
+
+            # Comprobamos que exista número de C.C. y que tenga 20 dígitos
+            if not orden.mode.bank_id:
+                raise Log( _('User error:\n\nThe bank account of the company %s is not defined.') % (orden.mode.partner_id.name), True )
+            cc = converter.digits_only(cr,uid,orden.mode.bank_id.acc_number)
+            if len(cc) != 20:
+                raise Log( _('User error:\n\nThe bank account number of the company %s has not 20 digits.') % (orden.mode.partner_id.name), True)
+
+            # Comprobamos que exista el CIF de la compañía asociada al C.C. del modo de pago
+            if not orden.mode.bank_id.partner_id.vat:
+                raise Log(_('User error:\n\nThe company VAT number related to the bank account of the payment mode is not defined.'), True)
+
+            recibos = []
+            if form_obj.join:
+                # Lista con todos los partners+bancos diferentes de la remesa
+                partner_bank_l = reduce(lambda l, x: x not in l and l.append(x) or l,
+                                         [(recibo.partner_id,recibo.bank_id) for recibo in orden.line_ids], [])
+                # Cómputo de la lista de recibos agrupados por mismo partner+banco.
+                # Los importes se suman, los textos se concatenan con un espacio en blanco y las fechas se escoge el máximo
+                for partner,bank in partner_bank_l:
+                    lineas = [recibo for recibo in orden.line_ids if recibo.partner_id==partner and recibo.bank_id==bank]
+                    recibos.append({
+                        'partner_id': partner,
+                        'bank_id': bank,
+                        'name': partner.ref or str(l.partner_id.id),
+                        'amount': reduce(lambda x, y: x+y, [l.amount for l in lineas], 0),
+                        'communication': reduce(lambda x, y: x+' '+(y or ''), [l.name+' '+l.communication for l in lineas], ''),
+                        'communication2': reduce(lambda x, y: x+' '+(y or ''), [l.communication2 for l in lineas], ''),
+                        'date': max([l.date for l in lineas]),
+                        'ml_maturity_date': max([l.ml_maturity_date for l in lineas]),
+                        'create_date': max([l.create_date for l in lineas]),
+                        'ml_date_created': max([l.ml_date_created for l in lineas]),
+                        'ml_inv_ref': [l.ml_inv_ref for l in lineas]
+                    })
+            else:
+                # Cada línea de pago es un recibo
+                for l in orden.line_ids:
+                    recibos.append({
+                        'partner_id': l.partner_id,
+                        'bank_id': l.bank_id,
+                        'name': l.partner_id.ref or str(l.partner_id.id),
+                        'amount': l.amount,
+                        'communication': l.name+' '+l.communication,
+                        'communication2': l.communication2,
+                        'date': l.date,
+                        'ml_maturity_date': l.ml_maturity_date,
+                        'create_date': l.create_date,
+                        'ml_date_created': l.ml_date_created,
+                        'ml_inv_ref':[l.ml_inv_ref]
+                    })
+
+            if orden.mode.require_bank_account:
+                for line in recibos:
+                    ccc = line['bank_id'] and line['bank_id'].acc_number or False
+                    if not ccc:
+                        raise Log(_('User error:\n\nThe bank account number of the customer %s is not defined and current payment mode enforces all lines to have a bank account.') % (line['partner_id'].name), True)
+                    ccc = converter.digits_only(cr,uid,ccc)
+                    if len(ccc) != 20:
+                        raise Log(_('User error:\n\nThe bank account number of the customer %s has not 20 digits.') % (line['partner_id'].name), True)
+
+            if orden.mode.tipo == 'csb_19':
+                csb = self.pool.get('csb.19')
+            elif orden.mode.tipo == 'csb_32':
+                csb = self.pool.get('csb.32')
+            elif orden.mode.tipo == 'csb_34':
+                csb = self.pool.get('csb.34')
+            elif orden.mode.tipo == '34_01':
+                csb = self.pool.get('csb.3401')
+            elif orden.mode.tipo == 'csb_58':
+                csb = self.pool.get('csb.58')
+            else:
+                raise Log(_('User error:\n\nThe payment mode is not CSB 19, CSB 32, CSB 34 or CSB 58'), True)
+            txt_remesa = csb.create_file(cr, uid, orden, recibos, context)
+
+        except Log, log:
+            form_obj.write({'note': log,'pay': False})
+            return True
+
+        else:
+            # Ensure line breaks use MS-DOS (CRLF) format as standards require.
+            txt_remesa = txt_remesa.replace('\r\n','\n').replace('\n','\r\n')
+
+            file = base64.encodestring(txt_remesa.encode('utf-8'))
+            fname = (_('remesa') + '_' + orden.mode.tipo + '_' + orden.reference + '.txt').replace('/','-')
+            self.pool.get('ir.attachment').create(cr, uid, {
+                'name': _('Remesa ') + orden.mode.tipo + ' ' + orden.reference,
+                'datas': file,
+                'datas_fname': fname,
+                'res_model': 'payment.order',
+                'res_id': orden.id,
+                }, context=context)
+            log = _("Successfully Exported\n\nSummary:\n Total amount paid: %.2f\n Total Number of Payments: %d\n") % (orden.total, len(recibos))
+            self.pool.get('payment.order').set_done(cr, uid, [orden.id], context)
+
+            form_obj.write({'note': log,'pay': file,'pay_fname': fname})
+
+            return True
+wizard_payment_file_spain()
+
+
+
 
 
=== added file 'l10n_es_payment_order/wizard/export_remesas_view.xml'
--- l10n_es_payment_order/wizard/export_remesas_view.xml	1970-01-01 00:00:00 +0000
+++ l10n_es_payment_order/wizard/export_remesas_view.xml	2013-01-11 10:23:22 +0000
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+       <record id="view_wizard_payment_file_spain_form" model="ir.ui.view">
+            <field name="name">wizard.payment.file.spain.form</field>
+            <field name="model">wizard.payment.file.spain</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Payment order export">
+                    <field name="join"/>
+                    <field name="pay" filename="pay_fname"/>
+                    <field name="pay_fname" invisible="1"/>
+                    <field name="note" colspan="4" nolabel="1"/>
+                    <separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button  icon="gtk-execute" string="_Export" name="create_payment_file" type="object"/>
+                   </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_wizard_payment_file_spain" model="ir.actions.act_window">
+            <field name="name">Create payments file</field>
+            <field name="res_model">wizard.payment.file.spain</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_wizard_payment_file_spain_form"/>
+            <field name="target">new</field>
+        </record>
+        <record id="action_wizard_payment_file_spain2" model="ir.values">
+            <field name="object" eval="1" />
+            <field name="name">Create payments file</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_wizard_payment_file_spain'))"/>
+            <field name="key">action</field>
+            <field name="model">payment.order</field>
+        </record>
+    </data>
+</openerp>
 
=== added file 'l10n_es_payment_order/wizard/log.py'
--- l10n_es_payment_order/wizard/log.py	1970-01-01 00:00:00 +0000
+++ l10n_es_payment_order/wizard/log.py	2013-01-11 10:23:22 +0000
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2006 ACYSOS S.L. (http://acysos.com) All Rights Reserved.
+#                       Pedro Tarrafeta <[e-mail]>
+#    Copyright (c) 2008 Pablo Rocandio. All Rights Reserved.
+#    Copyright (c) 2009 Zikzakmedia S.L. (http://zikzakmedia.com) All Rights Reserved.
+#                       Jordi Esteve <[e-mail]>
+#    Copyright (c) 2009 NaN (http://www.nan-tic.com) All Rights Reserved.
+#                       Albert Cervera i Areny <[e-mail]>
+#    $Id$
+#    Refactorización. Acysos S.L. (http://www.acysos.com) 2012
+#        Ignacio Ibeas <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from tools.translate import _
+
+class Log(Exception):
+    def __init__(self, content = '', error = False):
+        self.content = content
+        self.error = error
+    def add(self, s, error=True):
+        self.content = self.content + s
+        if error:
+            self.error = error
+    def __call__(self):
+        return self.content
+    def __str__(self):
+        return self.content
+