Merge lp:~pexego/openerp-spain/pexego_bank_statements into lp:~openerp-spain-team/openerp-spain/6.0

[Alberto Luengo Cabanillas (Pexego)]

Se refactoriza el módulo 'l10n_es_bank_statement', adaptándolo al nuevo modelo 'account_voucher', transformando el asistente existente 'wizard.interface' a 'osv_memory' y actualizando la traducción al castellano.
Queda pendiente la traducción a otros idiomas, estando obsoleta la que se encuentra ahora mismo en catalán.

[Jordi Esteve (www.zikzakmedia.com) (jesteve-zikzakmedia)]

1) No he podido ejecutarlo, sólo mirarme el código, pues en la propuesta de merge has olvidado añadir estos dos ficheros nuevos:

import_c43_file.py
import_c43_file_view.xml

que se importan en los ficheros __init__.py y __openerp__.py del módulo.

2) Para respetar el estilo de programación, revisa en la definición de los métodos o en sus llamadas que los parámetros estén separados correctamente con ", " (una coma + un espacio).

Fichero account_bank_statement.py, líneas 41, 47, 50, 71
Fichero import_conceptos.py, línea 48

Por ejemplo, hacer este cambio:
    def onchange_partner_id(self, cr,uid, line_ids,context, partner_id, ptype, amount):
    def onchange_partner_id(self, cr, uid, line_ids, context, partner_id, ptype, amount):

3) Fichero import_conceptos.py:
3.1) Me ha extrañado que uses el mismo objeto en memoria 'l10n.es.extractos.import.wizard' que implementa la importación de conceptos bancarios para definir el método def generate_voucher_from_import_wizard() que en principio no tiene nada que ver. Creo que sería más coherente definirlo dentro del objeto 'account.bank.statement.line', en el mismo objeto donde se llama.

3.2) Sobre este método generate_voucher_from_import_wizard(), algunas pequeñas sugerencias:

La línea 63 no hace falta: voucher_res = {}

La línea 66 debería ser
  ctx['date'] = line.date
en lugar de
  ctx['date'] = line_date
para coger la fecha del movimiento contable en lugar de la fecha de hoy ¿Pq coges la fecha de hoy?, la fecha de hoy es la fecha en que se introduce el extracto bancario que no tiene ningún interés y puede ser días/semanas después de la fecha del movimiento o apunte contable. O quizás mejor coger la fecha de la línea del extracto bancario, por lo se debería coger la fecha de current_st_line.date, con lo que deberías añadir un parámetro más a este método para pasarle esta fecha.

4) En el método def onchange_partner_id() de account_bank_statement.py, en la versión 5.0 se elimina la propuesta de concilacion que hubiera antes de proponer una de nueva. Creo que en la versión 6.0, si modificas la empresa de la línea de extracto también se debería eliminar el voucher que hubiera antes de proponer uno de nuevo, si no, así que vayamos cambiando la empresa de una línea de extracto bancario se podrían ir proponiendo nuevos vouchers y nos quedarían vouchers antiguos erróneos.

review: Needs Fixing

[lp:~pexego/openerp-spain/pexego_bank_statements]

201. By alberto-pexego on 2011-03-09

[ADD/REM/FIX] l10n_es_bank_statement: Se trasladan a esta rama los últimos cambios del módulo hechos en la rama de OpenERP de Pexego

[Alberto Luengo Cabanillas (Pexego) (alberto-pexego)]

A fecha 09-03-2011 se realiza un nuevo merge-proposal sobre el módulo, en el que, a mayores de las correcciones propuestas el 30-12-2010, se añade gestión de multi-compañía mediante una regla de registro sobre el objeto "concepto de extracto bancario" y un campo "compañía" sobre el asistente de importación de conceptos. Asimismo, se incluye una mejora de usabilidad a la hora de intentar conciliar una línea del extracto bancario mediante el evento "onchange", informando al usuario de que existen varios movimientos para esa fecha y partner.

[lp:~pexego/openerp-spain/pexego_bank_statements]

202. By alberto-pexego on 2011-03-11

[ADD]l10n_es_bank_statement: Se añaden ficheros que no se habían incluido en el anterior push

[Pedro Manuel Baeza (pedro.baeza)]

¿Qué ocurrió con esta propuesta? ¿Se llegó a poner en la 6.1?

Un saludo.

Unmerged revisions

202. By alberto-pexego on 2011-03-11

[ADD]l10n_es_bank_statement: Se añaden ficheros que no se habían incluido en el anterior push

201. By alberto-pexego on 2011-03-09

[ADD/REM/FIX] l10n_es_bank_statement: Se trasladan a esta rama los últimos cambios del módulo hechos en la rama de OpenERP de Pexego

200. By alberto-pexego on 2010-12-21

[REF]l10n_es_bank_statement: Adaptado el modulo para la version 6.0

=== modified file 'l10n_es_bank_statement/__init__.py'
--- l10n_es_bank_statement/__init__.py	2010-11-05 13:13:04 +0000
+++ l10n_es_bank_statement/__init__.py	2011-03-11 07:55:12 +0000
@@ -6,6 +6,8 @@
 #                       Jordi Esteve <[e-mail]>
 #    Copyright (c) 2010 Pexego Sistemas Informáticos. All Rights Reserved
 #                       Borja López Soilán <[e-mail]>
+#    Copyright (c) 2011 Pexego Sistemas Informáticos. All Rights Reserved
+#                       Alberto Luengo Cabanillas <[e-mail]>
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -30,6 +32,6 @@
 import concepto
 import account_bank_statement
 import import_conceptos
-import wizard
+import import_c43_file
 
 

=== modified file 'l10n_es_bank_statement/__openerp__.py'
--- l10n_es_bank_statement/__openerp__.py	2010-11-12 12:51:14 +0000
+++ l10n_es_bank_statement/__openerp__.py	2011-03-11 07:55:12 +0000
@@ -6,6 +6,8 @@
 #                       Jordi Esteve <[e-mail]>
 #    Copyright (c) 2010 Pexego Sistemas Informáticos. All Rights Reserved
 #                       Borja López Soilán <[e-mail]>
+#    Copyright (c) 2011 Pexego Sistemas Informáticos. All Rights Reserved
+#                       Alberto Luengo Cabanillas <[e-mail]>
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -25,10 +27,10 @@
 
 {
     "name" : "Spanish Bank Statements Importation",
-    "version" : "1.0",
+    "version" : "2.0",
     "author" : "Zikzakmedia, Pexego",
     "category" : "Localisation/Accounting",
-    "description" : """NOTA: NO ADAPTADO TODAVÍA A LA VERSIÓN 6.0
+    "description" : """
 Module for the importation of Spanish bank statements following the C43 normative of the 'Asociación Española de la Banca'.
     
     Adds a wizard to the bank statements to perform the importation. The imported file gets attached to the given bank statement.
@@ -47,15 +49,16 @@
 
     The module also adds a wizard in Financial Management/Configuration/C43 bank statements to import the default statement concepts, that must be run after creating the spanish chart of accounts (l10n_es module).
     """,
-    "website" : "www.zikzakmedia.com",
+    "website" : "www.zikzakmedia.com / www.pexego.es",
     "license" : "GPL-3",
-    "depends" : ["base","account","l10n_es",],
+    "depends" : ["base","account","l10n_es", "account_voucher"],
     "init_xml" : [],
     "demo_xml" : [],
     "update_xml" : [
         "extractos_view.xml",
-        "extractos_wizard.xml",
+        "import_c43_file_view.xml",
         "security/ir.model.access.csv",
+        "security/concepto_security.xml"
         ],
     "installable" : True,
     "active" : False,

=== modified file 'l10n_es_bank_statement/account_bank_statement.py'
--- l10n_es_bank_statement/account_bank_statement.py	2010-11-05 13:13:04 +0000
+++ l10n_es_bank_statement/account_bank_statement.py	2011-03-11 07:55:12 +0000
@@ -6,6 +6,8 @@
 #                       Jordi Esteve <[e-mail]>
 #    Copyright (c) 2010 Pexego Sistemas Informáticos. All Rights Reserved
 #                       Borja López Soilán <[e-mail]>
+#    Copyright (c) 2011 Pexego Sistemas Informáticos. All Rights Reserved
+#                       Alberto Luengo Cabanillas <[e-mail]>
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -28,6 +30,7 @@
 """
 
 from osv import osv
+from tools.translate import _
 
 class account_bank_statement_line(osv.osv):
     """
@@ -35,32 +38,92 @@
     for lines edited by hand.
     """
 
-    _inherit = "account.bank.statement.line"
-
-    def onchange_partner_id(self, cr, uid, line_id, partner_id, ptype, currency_id, amount, reconcile_id, context={}):
+    def generate_voucher_from_import_wizard(self, cr, uid, statement_id, statement_line, line_ids, context):
+        """
+            Generate a voucher when conciling lines from an AEB43 extract statement
+        """
+        line_obj = self.pool.get('account.move.line')
+        statement_obj = self.pool.get('account.bank.statement')
+        currency_obj = self.pool.get('res.currency')
+        voucher_obj = self.pool.get('account.voucher')
+        voucher_line_obj = self.pool.get('account.voucher.line')
+        statement = statement_obj.browse(cr, uid, statement_id, context=context)
+
+        # for each selected move lines
+        for line in line_obj.browse(cr, uid, line_ids, context=context):
+            ctx = context.copy()
+            #  take the date for computation of currency => use payment date
+            ctx['date'] = statement_line.date or line.date
+            amount = 0.0
+
+            if line.debit > 0:
+                amount = line.debit
+            elif line.credit > 0:
+                amount = -line.credit
+
+            if line.amount_currency:
+                amount = currency_obj.compute(cr, uid, line.currency_id.id,
+                    statement.currency.id, line.amount_currency, context=ctx)
+            elif (line.invoice and line.invoice.currency_id.id <> statement.currency.id):
+                amount = currency_obj.compute(cr, uid, line.invoice.currency_id.id,
+                    statement.currency.id, amount, context=ctx)
+
+            context.update({'move_line_ids': [line.id]})
+            result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype=(amount < 0 and 'payment' or 'receipt'), date=line.date, context=context)
+            voucher_res = { 'type':(amount < 0 and 'payment' or 'receipt'),
+                            'name': line.name,
+                            'partner_id': line.partner_id.id,
+                            'journal_id': statement.journal_id.id,
+                            'account_id': result.get('account_id', statement.journal_id.default_credit_account_id.id), # improve me: statement.journal_id.default_credit_account_id.id
+                            'company_id':statement.company_id.id,
+                            'currency_id':statement.currency.id,
+                            'date':line.date,
+                            'amount':abs(amount),
+                            'period_id':statement.period_id.id}
+            voucher_id = voucher_obj.create(cr, uid, voucher_res, context=context)
+
+            voucher_line_dict =  {}
+            if result['value']['line_ids']:
+                for line_dict in result['value']['line_ids']:
+                    move_line = line_obj.browse(cr, uid, line_dict['move_line_id'], context)
+                    if line.move_id.id == move_line.move_id.id:
+                        voucher_line_dict = line_dict
+            if voucher_line_dict:
+                voucher_line_dict.update({'voucher_id': voucher_id})
+                voucher_line_obj.create(cr, uid, voucher_line_dict, context=context)
+
+        return voucher_id
+
+
+    def onchange_partner_id(self, cr, uid, line_ids, context, partner_id, ptype, amount, voucher_id, form_date):
         """Elimina el precálculo del importe de la línea del extracto bancario
             y propone una conciliación automática si encuentra una."""
-        statement_reconcile_obj = self.pool.get('account.bank.statement.reconcile')
+
         move_line_obj = self.pool.get('account.move.line')
-        res = super(account_bank_statement_line, self).onchange_partner_id(cr, uid, line_id, partner_id, ptype, currency_id, context=context)
-
+        voucher_obj = self.pool.get('account.voucher')
+        partner_obj = self.pool.get('res.partner')
+        bank_st_line_obj = self.pool.get('account.bank.statement.line')
+        current_st_line = bank_st_line_obj.browse(cr, uid, line_ids)[0]
+        statement_id = current_st_line.statement_id.id
+        res = super(account_bank_statement_line, self).onchange_type(cr, uid, line_ids, partner_id, ptype)
         # devuelve res = {'value': {'amount': balance, 'account_id': account_id}}
         if 'value' in res and 'amount' in res['value']:
             del res['value']['amount']
-
-        # Eliminamos la propuesta de concilacion que hubiera
-        if reconcile_id:
-            statement_reconcile_obj.unlink(cr, uid, [reconcile_id])
-            if 'value' not in res:
-                res['value'] = {}
-            res['value']['reconcile_id'] = False
-
+            
         # Busqueda del apunte por importe con partner
         if partner_id and amount:
+            #Actualizamos la cuenta del partner...
+            current_partner = partner_obj.browse(cr, uid, partner_id)
+            if ptype == 'supplier':
+                res['value']['account_id'] = current_partner.property_account_payable.id
+            else:
+                res['value']['account_id'] = current_partner.property_account_receivable.id
+
             domain = [
                 ('reconcile_id', '=', False),
                 ('account_id.type', 'in', ['receivable', 'payable']),
                 ('partner_id', '=', partner_id),
+                ('date', '=', current_st_line.date)
             ]
             if amount >= 0:
                 domain.append( ('debit', '=', '%.2f' % amount) )
@@ -70,11 +133,31 @@
             # Solamente crearemos la conciliacion automatica cuando exista un solo apunte
             # que coincida. Si hay mas de uno el usuario tendra que conciliar manualmente y
             # seleccionar cual de ellos es el correcto.
+            res['value']['voucher_id'] = ""
             if len(line_ids) == 1:
-                res['value']['reconcile_id'] = statement_reconcile_obj.create(cr, uid, {
-                    'line_ids': [(6, 0, line_ids)],
-                }, context=context)
+                #Miro si existe ya una propuesta de pago para esa fecha, cantidad, proveedor y estado...
+                saved_voucher_id_list = voucher_obj.search(cr, uid, [('date','=',current_st_line.date), ('amount','=',current_st_line.amount), ('partner_id','=',partner_id), ('state','in', ['draft', 'proforma'])])
+                saved_voucher_id = saved_voucher_id_list and saved_voucher_id_list[0] or None
+                if saved_voucher_id:
+                    voucher_id = saved_voucher_id
+                form_voucher_id_list = voucher_obj.search(cr, uid, [('date','=', form_date), ('amount','=',amount), ('partner_id','=',partner_id), ('state','in', ['draft', 'proforma'])])
+                form_voucher_id = form_voucher_id_list and form_voucher_id_list[0] or None
+                if form_voucher_id:
+                    voucher_id = form_voucher_id
+                if not saved_voucher_id and not form_voucher_id:
+                    voucher_id = bank_st_line_obj.generate_voucher_from_import_wizard(cr, uid, statement_id, current_st_line, line_ids, context)
+                res['value']['voucher_id'] = voucher_id
+            elif len(line_ids) > 1:
+                move_lines = move_line_obj.browse(cr, uid, line_ids)
+                str_list = []
+                for line in move_lines:
+                    str_list.append("'%s'"%(line.ref or line.name))
+                raise osv.except_osv(_('Beware!'), _("%s moves (%s) found for this date and partner. You'll have to concile this line manually...") %(len(line_ids), ', '.join(str_list)))
         return res
+
+
+    _inherit = "account.bank.statement.line"
+
 account_bank_statement_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'l10n_es_bank_statement/data'
=== added file 'l10n_es_bank_statement/data/extractos_conceptos.xml'
--- l10n_es_bank_statement/data/extractos_conceptos.xml	1970-01-01 00:00:00 +0000
+++ l10n_es_bank_statement/data/extractos_conceptos.xml	2011-03-11 07:55:12 +0000
@@ -0,0 +1,100 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<openerp>
+    <data noupdate='1'>
+        <record model='l10n.es.extractos.concepto' id='01'>
+            <field name='code'>01</field>
+            <field name='name'>Reintegro/Talón</field>
+            <field search="[('code','like','4300%00')]" model='account.account' name='account_id'/>
+        </record>
+        <record model='l10n.es.extractos.concepto' id='02'>
+            <field name='code'>02</field>
+            <field name='name'>Ingreso/Abonaré</field>
+            <field search="[('code','like','4100%00')]" model='account.account' name='account_id'/>
+        </record>
+        <record model='l10n.es.extractos.concepto' id='03'>
+            <field name='code'>03</field>
+            <field name='name'>Recibo/Letra domiciliado</field>
+            <field search="[('code','like','4100%00')]" model='account.account' name='account_id'/>
+        </record>
+        <record model='l10n.es.extractos.concepto' id='04'>
+            <field name='code'>04</field>
+            <field name='name'>Transf./Giro/Cheque</field>
+            <field search="[('code','like','4300%00')]" model='account.account' name='account_id'/>
+        </record>
+        <record model='l10n.es.extractos.concepto' id='05'>
+            <field name='code'>05</field>
+            <field name='name'>Amortización préstamo</field>
+            <field search="[('code','like','6800%00')]" model='account.account' name='account_id'/>
+        </record>
+        <record model='l10n.es.extractos.concepto' id='06'>
+            <field name='code'>06</field>
+            <field name='name'>Remesa efectos</field>
+            <field search="[('code','like','4010%00')]" model='account.account' name='account_id'/>
+        </record>
+        <record model='l10n.es.extractos.concepto' id='07'>
+            <field name='code'>07</field>
+            <field name='name'>Subscripción/Canje</field>
+            <field search="[('code','like','5700%00')]" model='account.account' name='account_id'/>
+        </record>
+        <record model='l10n.es.extractos.concepto' id='08'>
+            <field name='code'>08</field>
+            <field name='name'>Amortización</field>
+            <field search="[('code','like','6800%00')]" model='account.account' name='account_id'/>
+        </record>
+        <record model='l10n.es.extractos.concepto' id='09'>
+            <field name='code'>09</field>
+            <field name='name'>Compra/Venta valores</field>
+            <field search="[('code','like','2510%00')]" model='account.account' name='account_id'/>
+        </record>
+        <record model='l10n.es.extractos.concepto' id='10'>
+            <field name='code'>10</field>
+            <field name='name'>Cheque gasolina</field>
+            <field search="[('code','like','5700%00')]" model='account.account' name='account_id'/>
+        </record>
+        <record model='l10n.es.extractos.concepto' id='11'>
+            <field name='code'>11</field>
+            <field name='name'>Cajero automático</field>
+            <field search="[('code','like','5700%00')]" model='account.account' name='account_id'/>
+        </record>
+        <record model='l10n.es.extractos.concepto' id='12'>
+            <field name='code'>12</field>
+            <field name='name'>Tarjeta crédito/débito</field>
+            <field search="[('code','like','5700%00')]" model='account.account' name='account_id'/>
+        </record>
+        <record model='l10n.es.extractos.concepto' id='13'>
+            <field name='code'>13</field>
+            <field name='name'>Operaciones extranjero</field>
+            <field search="[('code','like','5730%00')]" model='account.account' name='account_id'/>
+        </record>
+        <record model='l10n.es.extractos.concepto' id='14'>
+            <field name='code'>14</field>
+            <field name='name'>Devolución/Impagado</field>
+            <field search="[('code','like','4300%00')]" model='account.account' name='account_id'/>
+        </record>
+        <record model='l10n.es.extractos.concepto' id='15'>
+            <field name='code'>15</field>
+            <field name='name'>Nómina/Seg. social</field>
+            <field search="[('code','like','6400%00')]" model='account.account' name='account_id'/>
+        </record>
+        <record model='l10n.es.extractos.concepto' id='16'>
+            <field name='code'>16</field>
+            <field name='name'>Timbre/Corretaje/Póliza</field>
+            <field search="[('code','like','6690%00')]" model='account.account' name='account_id'/>
+        </record>
+        <record model='l10n.es.extractos.concepto' id='17'>
+            <field name='code'>17</field>
+            <field name='name'>Intereses/Comisión/Gastos/Custodia</field>
+            <field search="[('code','like','6690%00')]" model='account.account' name='account_id'/>
+        </record>
+        <record model='l10n.es.extractos.concepto' id='98'>
+            <field name='code'>98</field>
+            <field name='name'>Anulación/Corrección</field>
+            <field search="[('code','like','5720%00')]" model='account.account' name='account_id'/>
+        </record>
+        <record model='l10n.es.extractos.concepto' id='99'>
+            <field name='code'>99</field>
+            <field name='name'>Varios</field>
+            <field search="[('code','like','5720%00')]" model='account.account' name='account_id'/>
+        </record>
+    </data>
+</openerp>

=== removed file 'l10n_es_bank_statement/extractos_conceptos.xml'
--- l10n_es_bank_statement/extractos_conceptos.xml	2008-11-30 20:47:16 +0000
+++ l10n_es_bank_statement/extractos_conceptos.xml	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<openerp>
-    <data noupdate='1'>
-        <record model='l10n.es.extractos.concepto' id='01'>
-            <field name='code'>01</field>
-            <field name='name'>Reintegro/Talón</field>
-            <field search="[('code','like','4300%00')]" model='account.account' name='account_id'/>
-        </record>
-        <record model='l10n.es.extractos.concepto' id='02'>
-            <field name='code'>02</field>
-            <field name='name'>Ingreso/Abonaré</field>
-            <field search="[('code','like','4100%00')]" model='account.account' name='account_id'/>
-        </record>
-        <record model='l10n.es.extractos.concepto' id='03'>
-            <field name='code'>03</field>
-            <field name='name'>Recibo/Letra domiciliado</field>
-            <field search="[('code','like','4100%00')]" model='account.account' name='account_id'/>
-        </record>
-        <record model='l10n.es.extractos.concepto' id='04'>
-            <field name='code'>04</field>
-            <field name='name'>Transf./Giro/Cheque</field>
-            <field search="[('code','like','4300%00')]" model='account.account' name='account_id'/>
-        </record>
-        <record model='l10n.es.extractos.concepto' id='05'>
-            <field name='code'>05</field>
-            <field name='name'>Amortización préstamo</field>
-            <field search="[('code','like','6800%00')]" model='account.account' name='account_id'/>
-        </record>
-        <record model='l10n.es.extractos.concepto' id='06'>
-            <field name='code'>06</field>
-            <field name='name'>Remesa efectos</field>
-            <field search="[('code','like','4010%00')]" model='account.account' name='account_id'/>
-        </record>
-        <record model='l10n.es.extractos.concepto' id='07'>
-            <field name='code'>07</field>
-            <field name='name'>Subscripción/Canje</field>
-            <field search="[('code','like','5700%00')]" model='account.account' name='account_id'/>
-        </record>
-        <record model='l10n.es.extractos.concepto' id='08'>
-            <field name='code'>08</field>
-            <field name='name'>Amortización</field>
-            <field search="[('code','like','6800%00')]" model='account.account' name='account_id'/>
-        </record>
-        <record model='l10n.es.extractos.concepto' id='09'>
-            <field name='code'>09</field>
-            <field name='name'>Compra/Venta valores</field>
-            <field search="[('code','like','2510%00')]" model='account.account' name='account_id'/>
-        </record>
-        <record model='l10n.es.extractos.concepto' id='10'>
-            <field name='code'>10</field>
-            <field name='name'>Cheque gasolina</field>
-            <field search="[('code','like','5700%00')]" model='account.account' name='account_id'/>
-        </record>
-        <record model='l10n.es.extractos.concepto' id='11'>
-            <field name='code'>11</field>
-            <field name='name'>Cajero automático</field>
-            <field search="[('code','like','5700%00')]" model='account.account' name='account_id'/>
-        </record>
-        <record model='l10n.es.extractos.concepto' id='12'>
-            <field name='code'>12</field>
-            <field name='name'>Tarjeta crédito/débito</field>
-            <field search="[('code','like','5700%00')]" model='account.account' name='account_id'/>
-        </record>
-        <record model='l10n.es.extractos.concepto' id='13'>
-            <field name='code'>13</field>
-            <field name='name'>Operaciones extranjero</field>
-            <field search="[('code','like','5730%00')]" model='account.account' name='account_id'/>
-        </record>
-        <record model='l10n.es.extractos.concepto' id='14'>
-            <field name='code'>14</field>
-            <field name='name'>Devolución/Impagado</field>
-            <field search="[('code','like','4300%00')]" model='account.account' name='account_id'/>
-        </record>
-        <record model='l10n.es.extractos.concepto' id='15'>
-            <field name='code'>15</field>
-            <field name='name'>Nómina/Seg. social</field>
-            <field search="[('code','like','6400%00')]" model='account.account' name='account_id'/>
-        </record>
-        <record model='l10n.es.extractos.concepto' id='16'>
-            <field name='code'>16</field>
-            <field name='name'>Timbre/Corretaje/Póliza</field>
-            <field search="[('code','like','6690%00')]" model='account.account' name='account_id'/>
-        </record>
-        <record model='l10n.es.extractos.concepto' id='17'>
-            <field name='code'>17</field>
-            <field name='name'>Intereses/Comisión/Gastos/Custodia</field>
-            <field search="[('code','like','6690%00')]" model='account.account' name='account_id'/>
-        </record>
-        <record model='l10n.es.extractos.concepto' id='98'>
-            <field name='code'>98</field>
-            <field name='name'>Anulación/Corrección</field>
-            <field search="[('code','like','5720%00')]" model='account.account' name='account_id'/>
-        </record>
-        <record model='l10n.es.extractos.concepto' id='99'>
-            <field name='code'>99</field>
-            <field name='name'>Varios</field>
-            <field search="[('code','like','5720%00')]" model='account.account' name='account_id'/>
-        </record>
-    </data>
-</openerp>

=== modified file 'l10n_es_bank_statement/extractos_view.xml'
--- l10n_es_bank_statement/extractos_view.xml	2010-03-25 18:27:29 +0000
+++ l10n_es_bank_statement/extractos_view.xml	2011-03-11 07:55:12 +0000
@@ -50,8 +50,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-				<xpath expr="/form/notebook/page/field/tree/field[@name='partner_id']" position="replace">
-                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency, amount, reconcile_id)"/>
+				<xpath expr="/form/notebook/page[@string='Transaction']/field/tree/field[@name='partner_id']" position="replace">
+                    <field name="partner_id" on_change="onchange_partner_id(line_id, partner_id, type, amount, voucher_id, date)"/>
                 </xpath>
             </field>
         </record>
@@ -63,7 +63,7 @@
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
 				<xpath expr="/form/notebook/page/field/form/field[@name='partner_id']" position="replace">
-                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency, amount, reconcile_id)"/>
+                    <field name="partner_id" on_change="onchange_partner_id(line_id, partner_id, type, amount, voucher_id, date)"/>
                 </xpath>
             </field>
         </record>
@@ -75,7 +75,7 @@
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
 				<xpath expr="/form/notebook/page/field/tree/field[@name='amount']" position="replace">
-                    <field name="amount" on_change="onchange_partner_id(partner_id, type, parent.currency, amount, reconcile_id)"/>
+                    <field name="amount" on_change="onchange_partner_id(line_id, partner_id, type, amount, voucher_id, date)"/>
                 </xpath>
             </field>
         </record>
@@ -87,7 +87,7 @@
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
 				<xpath expr="/form/notebook/page/field/form/field[@name='amount']" position="replace">
-                    <field name="amount" on_change="onchange_partner_id(partner_id, type, parent.currency, amount, reconcile_id)"/>
+                    <field name="amount" on_change="onchange_partner_id(line_id, partner_id, type, amount, voucher_id, date)"/>
                 </xpath>
             </field>
         </record>
@@ -101,6 +101,7 @@
             <field name="arch" type="xml">
                 <form string="Import Wizard">
                     <label colspan="4" string="This wizard will import default concepts related to standard accounts of spanish charts."/>
+                    <field name="company_id" colspan="4" widget="selection"/>
                     <button icon="gtk-cancel" special="cancel" string="Cancel" type="object"/>
                     <button icon="gtk-ok" name="action_import" string="Import" type="object"/>
                 </form>
@@ -116,7 +117,7 @@
             <field name="target">new</field>
         </record>
 
-        <menuitem id="menu_import_wizard" parent="menu_extractos_bancarios" action="action_extractos_import_wizard"/>
+        <menuitem id="menu_import_wizard" parent="menu_extractos_bancarios" action="action_extractos_import_wizard" groups="account.group_account_manager"/>
 
     </data>
 </openerp>

=== removed file 'l10n_es_bank_statement/extractos_wizard.xml'
--- l10n_es_bank_statement/extractos_wizard.xml	2010-10-19 08:20:07 +0000
+++ l10n_es_bank_statement/extractos_wizard.xml	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <wizard
-            string="Import bank stat."
-            model="account.bank.statement"
-            name="l10n_es_bank_statement.importar"
-            id="wizard_l10n_es_bank_statement_importar"/>
-            <!--menu="False"-->
-
-    </data>
-</openerp>

=== modified file 'l10n_es_bank_statement/i18n/es.po'
--- l10n_es_bank_statement/i18n/es.po	2010-11-05 13:13:04 +0000
+++ l10n_es_bank_statement/i18n/es.po	2011-03-11 07:55:12 +0000
@@ -1,78 +1,37 @@
 # Translation of OpenERP Server.
-# This file containt the translation of the following modules:
-# 	* l10n_es_bank_statement
+# This file contains the translation of the following modules:
+#	* l10n_es_bank_statement
 #
-# Albert Cervera i Areny <[e-mail]>, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.1-dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-05-06 11:26:42+0000\n"
-"PO-Revision-Date: 2010-05-12 14:27+0100\n"
-"Last-Translator: Jordi Esteve (Zikzakmedia) <[e-mail]>\n"
-"Language-Team: Spanish\n"
+"POT-Creation-Date: 2011-03-09 13:02+0000\n"
+"PO-Revision-Date: 2011-03-09 14:05+0100\n"
+"Last-Translator: Alberto <[e-mail]>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: \n"
-"X-Generator: Lokalize 1.0\n"
-
-#. module: l10n_es_bank_statement
-#: model:ir.module.module,shortdesc:l10n_es_bank_statement.module_meta_information
-msgid "Spanish Bank Statements Importation"
-msgstr "Importación de Extractos Bancarios Españoles"
-
-#. module: l10n_es_bank_statement
-#: wizard_view:l10n_es_bank_statement.importar,init:0
-msgid "Bank Statements File:"
-msgstr "Archivo extracto bancario:"
-
-#. module: l10n_es_bank_statement
-#: wizard_field:l10n_es_bank_statement.importar,init,reco_payment_order:0
-msgid "Reconcile payment orders by total amount"
-msgstr "Conciliar ordenes de pago por total"
-
-#. module: l10n_es_bank_statement
-#: wizard_field:l10n_es_bank_statement.importar,init,reco_vat_and_amount:0
-msgid "Reconcile by VAT number and amount"
-msgstr "Conciliar por NIF y cantidad"
-
-#. module: l10n_es_bank_statement
-#: wizard_field:l10n_es_bank_statement.importar,init,reco_reference_and_amount:0
-msgid "Reconcile by reference and amount"
-msgstr "Conciliar por referencia y cantidad"
-
-#. module: l10n_es_bank_statement
-#: wizard_view:l10n_es_bank_statement.importar,init:0
-msgid "Automatic reconciliation options"
-msgstr "Opciones de conciliación automática"
-
-#. module: l10n_es_bank_statement
-#: wizard_field:l10n_es_bank_statement.importar,init,reco_max_days:0
-msgid "Max. days from statement date"
-msgstr "Días máx. desde fecha extracto"
-
-#. module: l10n_es_bank_statement
-#: help:l10n_es_bank_statement.importar,init,reco_max_days:0
-msgid "Maximum difference in days, between the maturity date of the entry to reconcile and the bank statement entry"
-msgstr "Diferencia máxima en días, entre la fecha de vencimiento del asiento a conciliar y la línea del extracto bancario"
-
-#. module: l10n_es_bank_statement
-#: wizard_field:l10n_es_bank_statement.importar,init,reco_amount:0
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:632
+#, python-format
+msgid "The bank statement is alredy confirmed. It can not be imported from file."
+msgstr "El extracto bancario ya está confirmado. No se puede importar desde fichero."
+
+#. module: l10n_es_bank_statement
+#: model:ir.model,name:l10n_es_bank_statement.model_l10n_es_extractos_concepto
+msgid "C43 codes"
+msgstr "Códigos C43"
+
+#. module: l10n_es_bank_statement
+#: field:l10n.es.bank.statement.import.c43.wizard,reco_amount:0
 msgid "Reconcile by amount"
 msgstr "Conciliar por cantidad"
 
 #. module: l10n_es_bank_statement
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter especial!"
-
-#. module: l10n_es_bank_statement
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo inválido en la definición de la acción."
-
-#. module: l10n_es_bank_statement
 #: model:ir.ui.menu,name:l10n_es_bank_statement.menu_extractos_bancarios
 msgid "C43 bank statements"
 msgstr "Extractos bancarios C43"
@@ -84,30 +43,42 @@
 
 #. module: l10n_es_bank_statement
 #: model:ir.module.module,shortdesc:l10n_es_bank_statement.module_meta_information
-msgid "Importación de extractos bancarios C43"
-msgstr "Importación de extractos bancarios C43"
+msgid "Spanish Bank Statements Importation"
+msgstr "Importación de Extractos Bancarios Españoles"
 
 #. module: l10n_es_bank_statement
-#: wizard_field:l10n_es_bank_statement.importar,init,file:0
+#: field:l10n.es.bank.statement.import.c43.wizard,file:0
+#: field:l10n.es.bank.statement.import.c43.wizard,file_name:0
 msgid "Bank Statements File"
-msgstr "Archivo extracto"
-
-#. module: l10n_es_bank_statement
+msgstr "Extracto bancario"
+
+#. module: l10n_es_bank_statement
+#: model:ir.actions.act_window,name:l10n_es_bank_statement.action_c43_file_import_wizard
+msgid "Import Bank Statement"
+msgstr "Importar Extracto Bancario"
+
+#. module: l10n_es_bank_statement
+#: view:l10n.es.bank.statement.import.c43.wizard:0
 #: view:l10n.es.extractos.import.wizard:0
-#: wizard_button:l10n_es_bank_statement.importar,init,import:0
 msgid "Import"
 msgstr "Importar"
 
 #. module: l10n_es_bank_statement
 #: model:ir.model,name:l10n_es_bank_statement.model_l10n_es_extractos_import_wizard
 msgid "l10n.es.extractos.import.wizard"
-msgstr ""
+msgstr "l10n.es.extractos.import.wizard"
 
 #. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:195
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:197
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:199
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:201
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:207
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:231
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:319
 #, python-format
-msgid "Final balance amount = (initial balance + credit - debit) does not agree with the defined in the last record of account."
-msgstr "Importe saldo final = (saldo inicial + haber - debe) no coincide con el definido en el registro final de cuenta."
+msgid "Error in C43 file"
+msgstr "Error en fichero C43"
 
 #. module: l10n_es_bank_statement
 #: help:l10n.es.extractos.concepto,account_id:0
@@ -115,49 +86,53 @@
 msgstr "Cuenta contable por defecto que se asociará al concepto al importar el archivo de extractos bancarios C43"
 
 #. module: l10n_es_bank_statement
-#: wizard_view:l10n_es_bank_statement.importar,init:0
+#: view:l10n.es.bank.statement.import.c43.wizard:0
 msgid "Bank statements import according to norm C43"
-msgstr "Importación extracto bancario según norma C43"
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "Error !"
-msgstr "Error !"
-
-#. module: l10n_es_bank_statement
-#: model:ir.actions.act_window,name:l10n_es_bank_statement.action_extractos_concepto
-#: view:l10n.es.extractos.concepto:0
-msgid "C43 default accounts"
-msgstr "Cuentas por defecto C43"
-
-#. module: l10n_es_bank_statement
-#: field:l10n.es.extractos.concepto,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: l10n_es_bank_statement
-#: model:ir.model,name:l10n_es_bank_statement.model_l10n_es_extractos_concepto
-msgid "C43 codes"
-msgstr "Códigos C43"
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
+msgstr "Importación de extractos bancarios de acuerdo a la norma C43"
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:195
 #, python-format
 msgid "Number of debit records does not agree with the defined in the last record of account."
-msgstr "Número de registros debe no coincide con el definido en el registro final de cuenta."
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
+msgstr "El número de registros de débito no coincide con los definidos en el último registro de la cuenta."
+
+#. module: l10n_es_bank_statement
+#: view:l10n.es.bank.statement.import.c43.wizard:0
+msgid "Bank Statements File:"
+msgstr "Fichero de extracto bancario:"
+
+#. module: l10n_es_bank_statement
+#: view:l10n.es.bank.statement.import.c43.wizard:0
+msgid "Automatic reconciliation options"
+msgstr "Opciones de conciliación automática"
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/account_bank_statement.py:155
+#, python-format
+msgid "%s moves (%s) found for this date and partner. You'll have to concile this line manually..."
+msgstr "%s movimientos (%s) encontrados para esta fecha y partner. Tendrá que conciliar esta línea manualmente..."
+
+#. module: l10n_es_bank_statement
+#: field:l10n.es.bank.statement.import.c43.wizard,reco_max_days:0
+msgid "Max. days from statement date"
+msgstr "Tope de días desde la fecha del extracto"
+
+#. module: l10n_es_bank_statement
+#: help:l10n.es.bank.statement.import.c43.wizard,reco_max_days:0
+msgid "Maximum difference in days, between the maturity date of the entry to reconcile and the bank statement entry"
+msgstr "Diferencia máxima en días, entre la fecha de vencimiento de la entrada a conciliar y la entrada del extracto bancario"
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:197
 #, python-format
 msgid "Number of credit records does not agree with the defined in the last record of account."
-msgstr "Número de registros haber no coincide con el definido en el registro final de cuenta."
+msgstr "El número de registros de crédito no coincide con los definidos en el último registro de la cuenta."
 
 #. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:207
 #, python-format
-msgid "Error in C43 file"
-msgstr "Error en el archivo C43"
+msgid "Final balance amount = (initial balance + credit - debit) does not agree with the defined in the last record of account."
+msgstr "La cantidad del balance final (=balance inicial + crédito - débito) no coincide con la definida en el último registro de la cuenta."
 
 #. module: l10n_es_bank_statement
 #: model:ir.ui.menu,name:l10n_es_bank_statement.menu_extractos_bancarios_concepto
@@ -165,10 +140,100 @@
 msgstr "Cuentas por defecto asociadas a los códigos C43"
 
 #. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "Archivo a importar codificado en ISO-8859-1"
-msgstr "Archivo a importar codificado en ISO-8859-1"
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:778
+#, python-format
+msgid "A default account has not been defined for the C43 concept "
+msgstr "No ha sido definida una cuenta por defecto para el concepto C43 "
+
+#. module: l10n_es_bank_statement
+#: model:ir.model,name:l10n_es_bank_statement.model_l10n_es_bank_statement_import_c43_wizard
+msgid "l10n.es.bank.statement.import.c43.wizard"
+msgstr "l10n.es.bank.statement.import.c43.wizard"
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_conceptos.py:60
+#, python-format
+msgid "Concepts for this company already imported..."
+msgstr "Los conceptos para esta compañía ya han sido importados..."
+
+#. module: l10n_es_bank_statement
+#: help:l10n.es.extractos.concepto,code:0
+msgid "2 digits code of the concept defined in the file of C43 bank statements"
+msgstr "Código de 2 dígitos del concepto definido en el archivo de extractos bancarios C43"
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:199
+#, python-format
+msgid "Debit amount does not agree with the defined in the last record of account."
+msgstr "La cantidad del débito no coincide con lo definido en el último registro de la cuenta."
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:231
+#, python-format
+msgid "Number of records does not agree with the defined in the last record."
+msgstr "El número de registros no coincide con lo definido en el último registro."
+
+#. module: l10n_es_bank_statement
+#: field:l10n.es.extractos.concepto,code:0
+msgid "Concept code"
+msgstr "Código concepto C43"
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:319
+#, python-format
+msgid "Not valid record type."
+msgstr "Tipo de registro no válido."
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/account_bank_statement.py:155
+#, python-format
+msgid "Beware!"
+msgstr "Atención!"
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_conceptos.py:80
+#: code:addons/l10n_es_bank_statement/import_conceptos.py:101
+#, python-format
+msgid "C43 Created Concepts"
+msgstr "Conceptos C43 Creados"
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:632
+#, python-format
+msgid "Error!"
+msgstr "Error!"
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:778
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: l10n_es_bank_statement
+#: field:l10n.es.extractos.concepto,name:0
+msgid "Concept name"
+msgstr "Nombre concepto"
+
+#. module: l10n_es_bank_statement
+#: constraint:account.bank.statement.line:0
+msgid "The amount of the voucher must be the same amount as the one on the statement line"
+msgstr "El importe del recibo debe ser el mismo importe que el de la línea del extracto"
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:201
+#, python-format
+msgid "Credit amount does not agree with the defined in the last record of account."
+msgstr "La cantidad del crédito no coincide con lo definido en el último registro de la cuenta."
+
+#. module: l10n_es_bank_statement
+#: view:l10n.es.extractos.import.wizard:0
+msgid "This wizard will import default concepts related to standard accounts of spanish charts."
+msgstr "Este asistente importará conceptos por defecto relacionados con las cuentas contables estándar del plan de cuentas español."
+
+#. module: l10n_es_bank_statement
+#: model:ir.model,name:l10n_es_bank_statement.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Línea de extracto bancario"
 
 #. module: l10n_es_bank_statement
 #: model:ir.actions.act_window,name:l10n_es_bank_statement.action_extractos_import_wizard
@@ -177,8 +242,14 @@
 msgstr "Asistente de importación de conceptos de extractos"
 
 #. module: l10n_es_bank_statement
+#: field:l10n.es.bank.statement.import.c43.wizard,reco_payment_order:0
+msgid "Reconcile payment orders by total amount"
+msgstr "Conciliar órdenes de pago por importe total"
+
+#. module: l10n_es_bank_statement
 #: model:ir.module.module,description:l10n_es_bank_statement.module_meta_information
 msgid ""
+"\n"
 "Module for the importation of Spanish bank statements following the C43 normative of the 'Asociación Española de la Banca'.\n"
 "    \n"
 "    Adds a wizard to the bank statements to perform the importation. The imported file gets attached to the given bank statement.\n"
@@ -198,92 +269,47 @@
 "    The module also adds a wizard in Financial Management/Configuration/C43 bank statements to import the default statement concepts, that must be run after creating the spanish chart of accounts (l10n_es module).\n"
 "    "
 msgstr ""
-"Modulo para la importación de extractos bancarios españoles según la norma C43 de la 'Asociación Española de la Banca'.\n"
+"\n"
+"Módulo para la importación de extractos bancarios españoles de acuerdo a la norma C43 de la Asociación Española de la Banca.\n"
 "    \n"
-"    Añade un asistente a los extractos bancarios para realizar la importación. El fichero importado se queda como fichero adjunto al extracto en cuestión.\n"
-"    Permite definir cuentas contables por defecto para los conceptos definidos en el archivo de extracto C43.\n"
-"\n"
-"    La búsqueda de los apuntes a conciliar (y empresa) se realiza de la siguiente forma:\n"
-"        1) Apuntes no conciliados con la referencia y cantidad dadas. La referencia se toma de los campos 'conceptos' o 'referencia2' del extracto.\n"
-"        2) Apuntes no conciliados con (una empresa con) el NIF y cantidad dados.\n"
-"           Se comprueban estos campos para encontrar un NIF válido:\n"
-"              - Los primeros 9 carácteres de 'referencia1' (Banc Sabadell)\n"
-"              - Los primeros 9 carácteres de 'conceptos' (La Caixa)\n"
-"              - Carácteres [21:30] de 'conceptos' (Caja Rural del Jalón)\n"
-"        3) Apuntes no conciliadas con la cantidad dada.\n"
-"\n"
-"    Si no se encuentra la empresa, se usará la cuenta por defecto definida para el concepto.\n"
-"\n"
-"    El modulo también añade un asistente en Gestión financiera/Configuración/Extractos bancarios C43 para importar los conceptos de extractos por defecto, que se debe ejecutar una vez creado el plan de cuentas español (módulo l10n_es).\n"
+"    Añade un asistente a los extractos bancarios para realizar la importación. El fichero importado queda adjunto al extracto bancario activo.\n"
+"    Permite definir códigos contables por defecto para los conceptos definidos en el fichero de extracto bancario C43.\n"
+"\n"
+"    La búsqueda de entradas a conciliar se realiza de la siguiente forma:\n"
+"        1) Entradas sin conciliar con una cantidad y referencia especificadas. La referencia se obtiene de los campos 'concepto' o 'referencia2' del extracto.\n"
+"        2) Entradas sin conciliar en las que figure el CIF del partner y la cantidad.\n"
+"           Para encontrar un CIF español válido se busca en los siguientes campos:\n"
+"              - Los primeros 9 caracteres del campo 'referencia1' (Banc Sabadell)\n"
+"              - Los primeros 9 caracteres del campo 'conceptos' (La Caixa)\n"
+"              - Los caracteres [21:30] del campo 'conceptos' (Caja Rural del Jalón)\n"
+"        3) Entradas sin conciliar en las que figure la cantidad.\n"
+"\n"
+"    Si no se encuentra ningún partner, se utiliza la cuenta por defecto definida para el concepto.\n"
+"\n"
+"    El módulo también añade un asistente en 'Contabilidad/Configuración/Extractos bancarios C43' para importar los conceptos por defecto de los extractos; esto se debe ejecutar después de crear el plan español de cuentas (módulo 'l10n_es').\n"
 "    "
 
 #. module: l10n_es_bank_statement
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: l10n_es_bank_statement
-#: help:l10n.es.extractos.concepto,code:0
-msgid "2 digits code of the concept defined in the file of C43 bank statements"
-msgstr "Código de 2 dígitos del concepto definido en el archivo de extractos bancarios C43"
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "Debit amount does not agree with the defined in the last record of account."
-msgstr "Importe debe no coincide con el definido en el registro final de cuenta."
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "Number of records does not agree with the defined in the last record."
-msgstr "Número de registros no coincide con el definido en el registro fin de archivo."
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "Not valid record type."
-msgstr "Tipo de registro no válido."
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "A default account has not been defined for the C43 concept "
-msgstr "No se ha definido una cuenta contable por defecto para el concepto C43 "
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "Error"
-msgstr "Error"
-
-#. module: l10n_es_bank_statement
-#: field:l10n.es.extractos.concepto,name:0
-msgid "Concept name"
-msgstr "Nombre concepto"
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "Credit amount does not agree with the defined in the last record of account."
-msgstr "Importe haber no coincide con el definido en el registro final de cuenta."
-
-#. module: l10n_es_bank_statement
-#: view:l10n.es.extractos.import.wizard:0
-msgid "This wizard will import default concepts related to standard accounts of spanish charts."
-msgstr "Este asistente importará conceptos por defecto relacionados con las cuentas contables estándar del plan de cuentas español."
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "The bank statement is alredy confirmed. It can not be imported from file."
-msgstr "El extracto bancario ya está confirmado. No se puede importar desde archivo."
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
+#: field:l10n.es.bank.statement.import.c43.wizard,reco_vat_and_amount:0
+msgid "Reconcile by VAT number and amount"
+msgstr "Conciliar por número de CIF y cantidad"
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:333
 #, python-format
 msgid "Bank Statement"
-msgstr "Extracto Bancario"
+msgstr "Extracto bancario"
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_conceptos.py:60
+#, python-format
+msgid "Info:"
+msgstr "Info:"
+
+#. module: l10n_es_bank_statement
+#: field:l10n.es.bank.statement.import.c43.wizard,reco_reference_and_amount:0
+msgid "Reconcile by reference and amount"
+msgstr "Conciliar por referencia y cantidad"
 
 #. module: l10n_es_bank_statement
 #: view:l10n.es.extractos.import.wizard:0
@@ -291,24 +317,27 @@
 msgstr "Asistente de importación"
 
 #. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:352
 #, python-format
 msgid "bank-statement.txt"
-msgstr "extracto-bancario.txt"
-
-#. module: l10n_es_bank_statement
-#: field:l10n.es.extractos.concepto,code:0
-msgid "Concept code"
-msgstr "Código concepto C43"
-
-#. module: l10n_es_bank_statement
+msgstr "bank-statement.txt"
+
+#. module: l10n_es_bank_statement
+#: model:ir.actions.act_window,name:l10n_es_bank_statement.action_extractos_concepto
+#: view:l10n.es.extractos.concepto:0
+msgid "C43 default accounts"
+msgstr "Cuentas por defecto C43"
+
+#. module: l10n_es_bank_statement
+#: view:l10n.es.bank.statement.import.c43.wizard:0
 #: view:l10n.es.extractos.import.wizard:0
-#: wizard_button:l10n_es_bank_statement.importar,init,end:0
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: l10n_es_bank_statement
-#: model:ir.actions.wizard,name:l10n_es_bank_statement.wizard_l10n_es_bank_statement_importar
-msgid "Import bank stat."
-msgstr "Importar ext. bancario"
-
+#: code:addons/l10n_es_bank_statement/import_conceptos.py:113
+#: field:l10n.es.extractos.concepto,company_id:0
+#: field:l10n.es.extractos.import.wizard,company_id:0
+#, python-format
+msgid "Company"
+msgstr "Compañía"

=== added file 'l10n_es_bank_statement/i18n/l10n_es_bank_statement.pot'
--- l10n_es_bank_statement/i18n/l10n_es_bank_statement.pot	1970-01-01 00:00:00 +0000
+++ l10n_es_bank_statement/i18n/l10n_es_bank_statement.pot	2011-03-11 07:55:12 +0000
@@ -0,0 +1,343 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_es_bank_statement
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1-dev\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-03-09 13:02+0000\n"
+"PO-Revision-Date: 2011-03-09 14:05+0100\n"
+"Last-Translator: Alberto <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:632
+#, python-format
+msgid "The bank statement is alredy confirmed. It can not be imported from file."
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: model:ir.model,name:l10n_es_bank_statement.model_l10n_es_extractos_concepto
+msgid "C43 codes"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: field:l10n.es.bank.statement.import.c43.wizard,reco_amount:0
+msgid "Reconcile by amount"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: model:ir.ui.menu,name:l10n_es_bank_statement.menu_extractos_bancarios
+msgid "C43 bank statements"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: field:l10n.es.extractos.concepto,account_id:0
+msgid "Account associated to the concept"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: model:ir.module.module,shortdesc:l10n_es_bank_statement.module_meta_information
+msgid "Spanish Bank Statements Importation"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: field:l10n.es.bank.statement.import.c43.wizard,file:0
+#: field:l10n.es.bank.statement.import.c43.wizard,file_name:0
+msgid "Bank Statements File"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: model:ir.actions.act_window,name:l10n_es_bank_statement.action_c43_file_import_wizard
+msgid "Import Bank Statement"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: view:l10n.es.bank.statement.import.c43.wizard:0
+#: view:l10n.es.extractos.import.wizard:0
+msgid "Import"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: model:ir.model,name:l10n_es_bank_statement.model_l10n_es_extractos_import_wizard
+msgid "l10n.es.extractos.import.wizard"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:195
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:197
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:199
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:201
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:207
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:231
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:319
+#, python-format
+msgid "Error in C43 file"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: help:l10n.es.extractos.concepto,account_id:0
+msgid "Default account to be associated with the concept when the file of C43 bank statements is imported"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: view:l10n.es.bank.statement.import.c43.wizard:0
+msgid "Bank statements import according to norm C43"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:195
+#, python-format
+msgid "Number of debit records does not agree with the defined in the last record of account."
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: view:l10n.es.bank.statement.import.c43.wizard:0
+msgid "Bank Statements File:"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: view:l10n.es.bank.statement.import.c43.wizard:0
+msgid "Automatic reconciliation options"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/account_bank_statement.py:155
+#, python-format
+msgid "%s moves (%s) found for this date and partner. You'll have to concile this line manually..."
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: field:l10n.es.bank.statement.import.c43.wizard,reco_max_days:0
+msgid "Max. days from statement date"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: help:l10n.es.bank.statement.import.c43.wizard,reco_max_days:0
+msgid "Maximum difference in days, between the maturity date of the entry to reconcile and the bank statement entry"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:197
+#, python-format
+msgid "Number of credit records does not agree with the defined in the last record of account."
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:207
+#, python-format
+msgid "Final balance amount = (initial balance + credit - debit) does not agree with the defined in the last record of account."
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: model:ir.ui.menu,name:l10n_es_bank_statement.menu_extractos_bancarios_concepto
+msgid "Default accounts associated to C43 codes"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:778
+#, python-format
+msgid "A default account has not been defined for the C43 concept "
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: model:ir.model,name:l10n_es_bank_statement.model_l10n_es_bank_statement_import_c43_wizard
+msgid "l10n.es.bank.statement.import.c43.wizard"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_conceptos.py:60
+#, python-format
+msgid "Concepts for this company already imported..."
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: help:l10n.es.extractos.concepto,code:0
+msgid "2 digits code of the concept defined in the file of C43 bank statements"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:199
+#, python-format
+msgid "Debit amount does not agree with the defined in the last record of account."
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:231
+#, python-format
+msgid "Number of records does not agree with the defined in the last record."
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: field:l10n.es.extractos.concepto,code:0
+msgid "Concept code"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:319
+#, python-format
+msgid "Not valid record type."
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/account_bank_statement.py:155
+#, python-format
+msgid "Beware!"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_conceptos.py:80
+#: code:addons/l10n_es_bank_statement/import_conceptos.py:101
+#, python-format
+msgid "C43 Created Concepts"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:632
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:778
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: field:l10n.es.extractos.concepto,name:0
+msgid "Concept name"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: constraint:account.bank.statement.line:0
+msgid "The amount of the voucher must be the same amount as the one on the statement line"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:201
+#, python-format
+msgid "Credit amount does not agree with the defined in the last record of account."
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: view:l10n.es.extractos.import.wizard:0
+msgid "This wizard will import default concepts related to standard accounts of spanish charts."
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: model:ir.model,name:l10n_es_bank_statement.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: model:ir.actions.act_window,name:l10n_es_bank_statement.action_extractos_import_wizard
+#: model:ir.ui.menu,name:l10n_es_bank_statement.menu_import_wizard
+msgid "Import Statement Concepts Wizard"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: field:l10n.es.bank.statement.import.c43.wizard,reco_payment_order:0
+msgid "Reconcile payment orders by total amount"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: model:ir.module.module,description:l10n_es_bank_statement.module_meta_information
+msgid ""
+"\n"
+"Module for the importation of Spanish bank statements following the C43 normative of the 'Asociación Española de la Banca'.\n"
+"    \n"
+"    Adds a wizard to the bank statements to perform the importation. The imported file gets attached to the given bank statement.\n"
+"    It allows to define default accounting codes for the concepts defined in the C43 bank statement file.\n"
+"\n"
+"    The search of the entries to reconcile (and partner) is done like this:\n"
+"        1) Unreconciled entries with the given reference and amount. The reference is taken from the 'conceptos' or 'referencia2' fields of the statement.\n"
+"        2) Unreconciled entries with (a partner with) the given VAT number and amount.\n"
+"           These fields are tested to find a valid spanish VAT:\n"
+"              - First 9 characters of 'referencia1' (Banc Sabadell)\n"
+"              - First 9 characters of 'conceptos' (La Caixa)\n"
+"              - Characters [21:30] of 'conceptos' (Caja Rural del Jalón)\n"
+"        3) Unreconciled entries with the given amount.\n"
+"\n"
+"    If no partner is found, the default account defined for the concept is used.\n"
+"\n"
+"    The module also adds a wizard in Financial Management/Configuration/C43 bank statements to import the default statement concepts, that must be run after creating the spanish chart of accounts (l10n_es module).\n"
+"    "
+msgstr ""
+"\n"
+"Módulo para la importación de extractos bancarios españoles de acuerdo a la norma C43 de la Asociación Española de la Banca.\n"
+"    \n"
+"    Añade un asistente a los extractos bancarios para realizar la importación. El fichero importado queda adjunto al extracto bancario activo.\n"
+"    Permite definir códigos contables por defecto para los conceptos definidos en el fichero de extracto bancario C43.\n"
+"\n"
+"    La búsqueda de entradas a conciliar se realiza de la siguiente forma:\n"
+"        1) Entradas sin conciliar con una cantidad y referencia especificadas. La referencia se obtiene de los campos 'concepto' o 'referencia2' del extracto.\n"
+"        2) Entradas sin conciliar en las que figure el CIF del partner y la cantidad.\n"
+"           Para encontrar un CIF español válido se busca en los siguientes campos:\n"
+"              - Los primeros 9 caracteres del campo 'referencia1' (Banc Sabadell)\n"
+"              - Los primeros 9 caracteres del campo 'conceptos' (La Caixa)\n"
+"              - Los caracteres [21:30] del campo 'conceptos' (Caja Rural del Jalón)\n"
+"        3) Entradas sin conciliar en las que figure la cantidad.\n"
+"\n"
+"    Si no se encuentra ningún partner, se utiliza la cuenta por defecto definida para el concepto.\n"
+"\n"
+"    El módulo también añade un asistente en 'Contabilidad/Configuración/Extractos bancarios C43' para importar los conceptos por defecto de los extractos; esto se debe ejecutar después de crear el plan español de cuentas (módulo 'l10n_es').\n"
+"    "
+
+#. module: l10n_es_bank_statement
+#: field:l10n.es.bank.statement.import.c43.wizard,reco_vat_and_amount:0
+msgid "Reconcile by VAT number and amount"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:333
+#, python-format
+msgid "Bank Statement"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_conceptos.py:60
+#, python-format
+msgid "Info:"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: field:l10n.es.bank.statement.import.c43.wizard,reco_reference_and_amount:0
+msgid "Reconcile by reference and amount"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: view:l10n.es.extractos.import.wizard:0
+msgid "Import Wizard"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_c43_file.py:352
+#, python-format
+msgid "bank-statement.txt"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: model:ir.actions.act_window,name:l10n_es_bank_statement.action_extractos_concepto
+#: view:l10n.es.extractos.concepto:0
+msgid "C43 default accounts"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: view:l10n.es.bank.statement.import.c43.wizard:0
+#: view:l10n.es.extractos.import.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: l10n_es_bank_statement
+#: code:addons/l10n_es_bank_statement/import_conceptos.py:113
+#: field:l10n.es.extractos.concepto,company_id:0
+#: field:l10n.es.extractos.import.wizard,company_id:0
+#, python-format
+msgid "Company"
+msgstr ""

=== removed file 'l10n_es_bank_statement/i18n/l10n_es_extractos_bancarios.pot'
--- l10n_es_bank_statement/i18n/l10n_es_extractos_bancarios.pot	2010-10-19 08:20:07 +0000
+++ l10n_es_bank_statement/i18n/l10n_es_extractos_bancarios.pot	1970-01-01 00:00:00 +0000
@@ -1,293 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* l10n_es_bank_statement
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.7\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-05-06 11:26:42+0000\n"
-"PO-Revision-Date: 2010-05-06 11:26:42+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: l10n_es_bank_statement
-#: model:ir.module.module,shortdesc:l10n_es_bank_statement.module_meta_information
-msgid "Spanish Bank Statements Importation"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: wizard_field:l10n_es_bank_statement.importar,init,reco_payment_order:0
-msgid "Reconcile payment orders by total amount"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: wizard_field:l10n_es_bank_statement.importar,init,reco_vat_and_amount:0
-msgid "Reconcile by VAT number and amount"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: wizard_field:l10n_es_bank_statement.importar,init,reco_reference_and_amount:0
-msgid "Reconcile by reference and amount"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: wizard_view:l10n_es_bank_statement.importar,init:0
-msgid "Automatic reconciliation options"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: wizard_field:l10n_es_bank_statement.importar,init,reco_max_days:0
-msgid "Max. days from statement date"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: wizard_view:l10n_es_bank_statement.importar,init:0
-msgid "Bank Statements File:"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: help:l10n_es_bank_statement.importar,init,reco_max_days:0
-msgid "Maximum difference in days, between the maturity date of the entry to reconcile and the bank statement entry"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: wizard_field:l10n_es_bank_statement.importar,init,reco_amount:0
-msgid "Reconcile by amount"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: model:ir.ui.menu,name:l10n_es_bank_statement.menu_extractos_bancarios
-msgid "C43 bank statements"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: field:l10n.es.extractos.concepto,account_id:0
-msgid "Account associated to the concept"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: model:ir.module.module,shortdesc:l10n_es_bank_statement.module_meta_information
-msgid "Importación de extractos bancarios C43"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: wizard_field:l10n_es_bank_statement.importar,init,file:0
-msgid "Bank Statements File"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: view:l10n.es.extractos.import.wizard:0
-#: wizard_button:l10n_es_bank_statement.importar,init,import:0
-msgid "Import"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: model:ir.model,name:l10n_es_bank_statement.model_l10n_es_extractos_import_wizard
-msgid "l10n.es.extractos.import.wizard"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "Final balance amount = (initial balance + credit - debit) does not agree with the defined in the last record of account."
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: help:l10n.es.extractos.concepto,account_id:0
-msgid "Default account to be associated with the concept when the file of C43 bank statements is imported"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: wizard_view:l10n_es_bank_statement.importar,init:0
-msgid "Bank statements import according to norm C43"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: model:ir.actions.act_window,name:l10n_es_bank_statement.action_extractos_concepto
-#: view:l10n.es.extractos.concepto:0
-msgid "C43 default accounts"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: field:l10n.es.extractos.concepto,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: model:ir.model,name:l10n_es_bank_statement.model_l10n_es_extractos_concepto
-msgid "C43 codes"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "Number of debit records does not agree with the defined in the last record of account."
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "Number of credit records does not agree with the defined in the last record of account."
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "Error in C43 file"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: model:ir.ui.menu,name:l10n_es_bank_statement.menu_extractos_bancarios_concepto
-msgid "Default accounts associated to C43 codes"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "Archivo a importar codificado en ISO-8859-1"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: model:ir.actions.act_window,name:l10n_es_bank_statement.action_extractos_import_wizard
-#: model:ir.ui.menu,name:l10n_es_bank_statement.menu_import_wizard
-msgid "Import Statement Concepts Wizard"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: model:ir.module.module,description:l10n_es_bank_statement.module_meta_information
-msgid "Module for the importation of Spanish bank statements following the C43 normative of the 'Asociación Española de la Banca'.\n"
-"    \n"
-"    Adds a wizard to the bank statements to perform the importation. The imported file gets attached to the given bank statement.\n"
-"    It allows to define default accounting codes for the concepts defined in the C43 bank statement file.\n"
-"\n"
-"    The search of the entries to reconcile (and partner) is done like this:\n"
-"        1) Unreconciled entries with the given reference and amount. The reference is taken from the 'conceptos' or 'referencia2' fields of the statement.\n"
-"        2) Unreconciled entries with (a partner with) the given VAT number and amount.\n"
-"           These fields are tested to find a valid spanish VAT:\n"
-"              - First 9 characters of 'referencia1' (Banc Sabadell)\n"
-"              - First 9 characters of 'conceptos' (La Caixa)\n"
-"              - Characters [21:30] of 'conceptos' (Caja Rural del Jalón)\n"
-"        3) Unreconciled entries with the given amount.\n"
-"\n"
-"    If no partner is found, the default account defined for the concept is used.\n"
-"\n"
-"    The module also adds a wizard in Financial Management/Configuration/C43 bank statements to import the default statement concepts, that must be run after creating the spanish chart of accounts (l10n_es module).\n"
-"    "
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: help:l10n.es.extractos.concepto,code:0
-msgid "2 digits code of the concept defined in the file of C43 bank statements"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "Debit amount does not agree with the defined in the last record of account."
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "Number of records does not agree with the defined in the last record."
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "Not valid record type."
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "A default account has not been defined for the C43 concept "
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: field:l10n.es.extractos.concepto,name:0
-msgid "Concept name"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "Credit amount does not agree with the defined in the last record of account."
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: view:l10n.es.extractos.import.wizard:0
-msgid "This wizard will import default concepts related to standard accounts of spanish charts."
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "The bank statement is alredy confirmed. It can not be imported from file."
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "Bank Statement"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: view:l10n.es.extractos.import.wizard:0
-msgid "Import Wizard"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: code:addons/l10n_es_bank_statement/wizard/wizard_import_c43_file.py:0
-#, python-format
-msgid "bank-statement.txt"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: field:l10n.es.extractos.concepto,code:0
-msgid "Concept code"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: view:l10n.es.extractos.import.wizard:0
-#: wizard_button:l10n_es_bank_statement.importar,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_es_bank_statement
-#: model:ir.actions.wizard,name:l10n_es_bank_statement.wizard_l10n_es_bank_statement_importar
-msgid "Import bank stat."
-msgstr ""
-

=== added file 'l10n_es_bank_statement/import_c43_file.py'
--- l10n_es_bank_statement/import_c43_file.py	1970-01-01 00:00:00 +0000
+++ l10n_es_bank_statement/import_c43_file.py	2011-03-11 07:55:12 +0000
@@ -0,0 +1,821 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2009 Zikzakmedia S.L. (http://zikzakmedia.com) All Rights Reserved.
+#                       Jordi Esteve <[e-mail]>
+#    Copyright (c) 2010 Pexego Sistemas Informáticos. All Rights Reserved
+#                       Borja López Soilán <[e-mail]>
+#                       Alberto Luengo Cabanillas <[e-mail]>
+#
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+"""
+C43 file importation wizard for bank statements.
+"""
+from osv import fields,osv
+import wizard
+import pooler
+import base64
+import time
+import re
+from tools.translate import _
+
+class l10n_es_bank_statement_import_c43_wizard(osv.osv_memory):
+    """
+    C43 file importation wizard for bank statements.
+    """
+
+    def _process_record_11(self, cr, uid, st_data, line, context):
+        """
+        11 - Registro cabecera de cuenta (obligatorio)
+        """
+        #
+        # Add a new group to the statement groups
+        #
+        st_group = {}
+        st_data['groups'] = st_data.get('groups', [])
+        st_data['groups'].append(st_group)
+
+        #
+        # Set the group values
+        #
+        st_group.update({
+            'entidad':line[2:6],
+            'oficina': line[6:10],
+            'cuenta': line[10:20],
+            'fecha_ini': time.strftime('%Y-%m-%d', time.strptime(line[20:26], '%y%m%d')),
+            'fecha_fin': time.strftime('%Y-%m-%d', time.strptime(line[26:32], '%y%m%d')),
+            'divisa': line[47:50],
+            'modalidad': line[50:51], # 1,2 o 3
+            'nombre_propietario': line[51:77], # Nombre abreviado propietario cuenta
+            'saldo_ini': (float(line[33:45]) + (float(line[45:47]) / 100)) * (line[32:33] == '1' and -1 or 1),
+            'saldo_fin': 0,
+            'num_debe': 0,
+            'debe': 0,
+            'num_haber': 0,
+            'haber': 0,
+            '_debit_count': 0,
+            '_debit': 0,
+            '_credit_count': 0,
+            '_credit': 0,
+            '_balance': 0,
+        })
+
+        #
+        # Use the first group initial balance and date, as initial
+        #   balance and date for the full statement.
+        #
+        if st_data.get('saldo_ini', None) is None:
+            st_data['saldo_ini'] = st_group['saldo_ini']
+            st_data['fecha_ini'] = st_group['fecha_ini']
+
+        # Update the record counter
+        st_data['_num_records'] = st_data.get('_num_records', 0) + 1
+
+        return st_group
+
+
+    def _process_record_22(self, cr, uid, st_data, line, context):
+        """
+        22 - Registro principal de movimiento (obligatorio)
+        """
+
+        #
+        # Add a new line to the statement lines
+        #
+        st_line = {}
+        st_data['lines'] = st_data.get('lines', [])
+        st_data['lines'].append(st_line)
+
+        #
+        # Set the line values
+        #
+        st_line.update({
+            'of_origen': line[6:10],
+            'fecha_opera': time.strftime('%Y-%m-%d', time.strptime(line[10:16], '%y%m%d')),
+            'fecha_valor': time.strftime('%Y-%m-%d', time.strptime(line[16:22], '%y%m%d')),
+            'concepto_c': line[22:24],
+            'concepto_p': line[24:27],
+            'importe': (float(line[28:40]) + (float(line[40:42]) / 100)) * (line[27:28] == '1' and -1 or 1),
+            'num_documento': line[41:52],
+            'referencia1': line[52:64],
+            'referencia2': line[64:],
+            'conceptos': '',
+        })
+
+        #
+        # Update the (last) group totals
+        #
+        st_group = st_data['groups'][-1]
+        if st_line['importe'] < 0:
+            st_group['_debit_count'] += 1
+            st_group['_debit'] -= st_line['importe']
+        else:
+            st_group['_credit_count'] += 1
+            st_group['_credit'] += st_line['importe']
+
+        # Update the record counter
+        st_data['_num_records'] += 1
+
+        return st_line
+
+
+    def _process_record_23(self, cr, uid, st_data, line, context):
+        """
+        23 - Registros complementarios de concepto (opcionales y hasta un máximo de 5)
+        """
+        #
+        # Update the current (last) line
+        #
+        st_line = st_data['lines'][-1]
+        st_line['conceptos'] += line[4:] # Se han unido los dos conceptos line[4:42]+line[42:] en uno
+
+        # Update the record counter
+        st_data['_num_records'] += 1
+
+        return st_line
+
+
+    def _process_record_24(self, cr, uid, st_data, line, context):
+        """
+        24 - Registro complementario de información de equivalencia del importe (opcional y sin valor contable)
+        """
+        #
+        # Update the current (last) line
+        #
+        st_line = st_data['lines'][-1]
+        st_line['divisa_eq'] = line[4:7]
+        st_line['importe_eq'] = float(line[7:19]) + (float(line[19:21]) / 100)
+
+        # Update the record counter
+        st_data['_num_records'] += 1
+
+        return st_line
+
+
+    def _process_record_33(self, cr, uid, st_data, line, context):
+        """
+        33 -  Registro final de cuenta
+        """
+        #
+        # Update the (last) group
+        #
+        st_group = st_data['groups'][-1]
+        st_group.update({
+            'num_debe': st_group['num_debe'] + int(line[20:25]),
+            'debe': st_group['debe'] + float(line[25:37]) + (float(line[37:39]) / 100),
+            'num_haber': st_group['num_haber'] + int(line[39:44]),
+            'haber': st_group['haber'] + float(line[44:56]) + (float(line[56:58]) / 100),
+            'saldo_fin': st_group['saldo_fin'] + (float(line[59:71]) + (float(line[71:73]) / 100)) * (line[58:59] == '1' and -1 or 1),
+            '_balance': st_group['saldo_ini'] + st_group['_credit'] - st_group['_debit']
+        })
+
+        # Update the record counter
+        st_data['_num_records'] += 1
+
+        #
+        # Group level checks
+        #
+        if st_group['num_debe'] != st_group['_debit_count']:
+            raise osv.except_osv(_('Error in C43 file'), _('Number of debit records does not agree with the defined in the last record of account.'))
+        if  st_group['num_haber'] != st_group['_credit_count']:
+            raise osv.except_osv(_('Error in C43 file'), _('Number of credit records does not agree with the defined in the last record of account.'))
+        if abs(st_group['debe'] - st_group['_debit']) > 0.005:
+            raise osv.except_osv(_('Error in C43 file'), _('Debit amount does not agree with the defined in the last record of account.'))
+        if abs(st_group['haber'] - st_group['_credit']) > 0.005:
+            raise osv.except_osv(_('Error in C43 file'), _('Credit amount does not agree with the defined in the last record of account.'))
+        # Note: Only perform this check if the balance defined on the file record,
+        #       as some banks may leave it empty (zero) on some circunstances
+        #       (like CaixaNova extracts for VISA credit cards).
+        if st_group['saldo_fin'] != 0.0 \
+                and abs(st_group['saldo_fin'] - st_group['_balance']) > 0.005:
+            raise osv.except_osv(_('Error in C43 file'), _('Final balance amount = (initial balance + credit - debit) does not agree with the defined in the last record of account.'))
+
+        return st_group
+
+
+    def _process_record_88(self, cr, uid, st_data, line, context):
+        """
+        88 - Registro de fin de archivo
+        """
+        # We will use the last group final balance and date, as final
+        #   balance and date for the full statement.
+        st_group = st_data['groups'][-1]
+
+        # Update the statement
+        st_data.update({
+            'num_registros': int(line[20:26]),
+            'fecha_fin': st_group['fecha_fin'],
+            'saldo_fin': st_group['saldo_fin'],
+        })
+
+        #
+        # File level checks
+        #
+        if st_data['num_registros'] != st_data['_num_records']:
+            raise osv.except_osv(_('Error in C43 file'), _('Number of records does not agree with the defined in the last record.'))
+
+        return st_data
+
+
+    def _load_c43_file(self, cr, uid, file_contents, context=None):
+        """
+        Reads a c43 file and returns a dictionary containing the file data:
+
+            _num_records:   Number of records really counted
+            num_registros:  Number of records declared on the file
+            fecha_fin:      Final date (as the last record group)
+            saldo_fin:      Final balance (from the last record group)
+            groups:         Info about each of the groups (account groups):
+                _debit_count
+                _debit
+                _credit_count
+                _credit
+                entidad
+                oficina
+                cuenta
+                fecha_ini
+                fecha_fin
+                saldo_ini
+                saldo_fin
+                divisa
+                modalidad
+                nombre_propietario
+            lines:          Info about each of the moves
+                of_origen
+                fecha_opera
+                fecha_valor
+                concepto_c
+                concepto_p
+                importe
+                num_documento
+                referencia1
+                referencia2
+                conceptos
+                divisa_eq
+                importe_eq
+        """
+        if context is None:
+            context = {}
+
+        #
+        # st_data will contain the data read from the file, plus the internal
+        # counters used for checking.
+        #
+        st_data = {
+            '_num_records': 0,      # Number of records really counted
+            'num_registros': 0,     # Number of records declared on the file
+            'fecha_fin': None,      # Final date (as the last record group)
+            'saldo_fin': None,      # Final balance (from the last record group)
+            'groups': [],           # Info about each of the groups (account groups)
+            'lines': [],            # Info about each of the moves
+        }
+
+        #
+        # Read the C43 file
+        #
+        decoded_file_contents = base64.decodestring(file_contents)
+        try:
+            unicode(decoded_file_contents, 'utf8')
+        except Exception, ex: # Si no puede convertir a UTF-8 es que debe estar en ISO-8859-1: Lo convertimos
+            decoded_file_contents = unicode(decoded_file_contents, 'iso-8859-1').encode('utf-8')
+
+        #
+        # Process the file lines
+        #
+        for line in decoded_file_contents.split("\n"):
+            if len(line) == 0:
+                continue
+            if line[0:2] == '11': # Registro cabecera de cuenta (obligatorio)
+                self._process_record_11(cr, uid, st_data, line, context)
+            elif line[0:2] == '22': # Registro principal de movimiento (obligatorio)
+                self._process_record_22(cr, uid, st_data, line, context)
+            elif line[0:2] == '23': # Registros complementarios de concepto (opcionales y hasta un máximo de 5)
+                self._process_record_23(cr, uid, st_data, line, context)
+            elif line[0:2] == '24': # Registro complementario de información de equivalencia del importe (opcional y sin valor contable)
+                self._process_record_24(cr, uid, st_data, line, context)
+            elif line[0:2] == '33': # Registro final de cuenta
+                self._process_record_33(cr, uid, st_data, line, context)
+            elif line[0:2] == '88': # Registro de fin de archivo
+                self._process_record_88(cr, uid, st_data, line, context)
+            elif ord(line[0]) == 26: # CTRL-Z (^Z), is often used as an end-of-file marker in DOS
+                pass
+            else:
+                raise osv.except_osv(_('Error in C43 file'), _('Not valid record type.'))
+
+        return st_data
+
+
+    def _attach_file_to_statement(self, cr, uid, file_contents, statement_id, context=None):
+        """
+        Attachs a file to the given bank statement.
+        """
+        if context is None:
+            context = {}
+        pool = pooler.get_pool(cr.dbname)
+        attachment_facade = pool.get('ir.attachment')
+
+        attachment_name = _('Bank Statement')
+
+        #
+        # Remove the previous statement file attachment (if any)
+        #
+        ids = attachment_facade.search(cr, uid, [
+                    ('res_id', '=', statement_id),
+                    ('res_model', '=', 'account.bank.statement'),
+                    ('name', '=', attachment_name),
+                ], context=context)
+        if ids:
+            attachment_facade.unlink(cr, uid, ids, context)
+
+        #
+        # Create the new attachment
+        #
+        res = attachment_facade.create(cr, uid, {
+                    'name': attachment_name,
+                    'datas': file_contents,
+                    'datas_fname': _('bank-statement.txt'),
+                    'res_model': 'account.bank.statement',
+                    'res_id': statement_id,
+                }, context=context)
+
+        return res
+
+
+    def _get_default_partner_account_ids(self, cr, uid, context=None):
+        """
+        Returns the ids of the default receivable and payable accounts
+        for partners.
+        """
+        if context is None:
+            context = {}
+        pool = pooler.get_pool(cr.dbname)
+
+        model_fields_ids = pool.get('ir.model.fields').search(cr, uid, [
+                                ('name', 'in', ['property_account_receivable', 'property_account_payable']),
+                                ('model', '=', 'res.partner'),
+                            ], context=context)
+        property_ids = pool.get('ir.property').search(cr, uid, [
+                            ('fields_id', 'in', model_fields_ids),
+                            ('res_id', '=', False),
+                        ], context=context)
+
+        account_receivable_id = None
+        account_payable_id = None
+
+        for prop in pool.get('ir.property').browse(cr, uid, property_ids, context=context):
+            if prop.fields_id.name == 'property_account_receivable':
+                try:
+                    # OpenERP 5.0 and 5.2/6.0 revno <= 2236
+                    account_receivable_id = int(prop.value.split(',')[1])
+                except AttributeError:
+                    # OpenERP 6.0 revno >= 2236
+                    account_receivable_id = prop.value_reference.id
+            elif prop.fields_id.name == 'property_account_payable':
+                try:
+                    # OpenERP 5.0 and 5.2/6.0 revno <= 2236
+                    account_payable_id = int(prop.value.split(',')[1])
+                except AttributeError:
+                    # OpenERP 6.0 revno >= 2236
+                    account_payable_id = prop.value_reference.id
+
+        return (account_receivable_id, account_payable_id)
+
+
+    def _find_partner_by_line_vat_number(self, cr, uid, st_line, context=None):
+        """
+        Searchs for a partner given the vat number of the line.
+
+        Notes:
+        - Depending on the bank, the VAT number may be stored on a diferent
+          field. So we will have to test if any of those fields looks like a
+          spanish VAT number, and then search for a partner with that VAT.
+        - Only works for spanish VAT numbers.
+        """
+        if context is None:
+            context = {}
+        pool = pooler.get_pool(cr.dbname)
+        partner_facade = pool.get('res.partner')
+
+        partner = None
+
+        possible_vat_numbers = [
+            st_line['referencia1'][:9].replace(' ',''),     # Banc Sabadell
+            st_line['conceptos'][:9].replace(' ',''),       # La Caixa
+            st_line['conceptos'][21:30].replace(' ',''),    # Caja Rural del Jalón
+        ]
+        for possible_vat_number in possible_vat_numbers:
+            if partner_facade.check_vat_es(possible_vat_number):
+                partner_ids = partner_facade.search(cr, uid, [
+                                    ('vat', 'like', 'ES%s' % possible_vat_number),
+                                    ('active', '=', True),
+                                ], context=context)
+                if len(partner_ids) == 1:
+                    # We found a partner with that VAT number
+                    partner = partner_facade.browse(cr, uid, partner_ids[0], context=context)
+                    break
+        return partner
+
+
+    def _get_nearest_move_line(self, lines, maturity_date, max_date_diff=3600*24*30):
+        """
+        Find the nearest move_line to a given (maturity) date
+        """
+        min_diff = max_date_diff
+        nearest = None
+        if not maturity_date:
+            maturity_date = time.time()
+        maturity_date_timestamp = time.mktime(time.strptime(maturity_date, '%Y-%m-%d'))
+        for line in lines:
+            line_date = line.date_maturity or line.date
+            if line_date:
+                line_timestamp = time.mktime(time.strptime(line_date, '%Y-%m-%d'))
+                diff = abs(maturity_date_timestamp-line_timestamp)
+                if diff < min_diff:
+                    nearest = line
+                    min_diff = diff
+        return nearest
+
+
+    def _find_entry_to_reconcile_by_line_ref_and_amount(self, cr, uid,
+            st_line, reconciled_move_lines_ids,
+            maturity_date, max_date_diff, context=None):
+        """
+        Searchs for a non-conciled entry with the same reference and amount.
+        (If more than one entry matches returns False).
+
+        Note: The operation reference may be stored in
+              Banc Sabadell => 'referencia2' or 'conceptos'
+              Caja Rural del Jalón => 'conceptos'
+        """
+        if context is None:
+            context = {}
+        pool = pooler.get_pool(cr.dbname)
+        move_line_facade = pool.get('account.move.line')
+
+        possible_references = [
+            st_line['conceptos'],
+            st_line['referencia2'],
+        ]
+
+        for reference in possible_references:
+            domain = [
+                ('id', 'not in', reconciled_move_lines_ids),
+                ('ref', '=', reference.strip()),
+                ('reconcile_id', '=', False),
+                ('reconcile_partial_id', '=', False),
+                ('account_id.type', 'in', ['receivable', 'payable']),
+            ]
+            if st_line['importe'] >= 0:
+                domain.append( ('debit', '=', '%.2f' % st_line['importe']) )
+            else:
+                domain.append( ('credit', '=', '%.2f' % -st_line['importe']) )
+
+            line_ids = move_line_facade.search(cr, uid, domain, context=context)
+            if line_ids:
+                lines = move_line_facade.browse(cr, uid, line_ids, context)
+                line = self._get_nearest_move_line(lines, maturity_date, max_date_diff)
+                return line
+        return None
+
+
+    def _find_entry_to_reconcile_by_line_vat_number_and_amount(self, cr, uid,
+            st_line, reconciled_move_lines_ids,
+            maturity_date, max_date_diff, context=None):
+        """
+        Searchs for a non-conciled entry given the partner vat number of the line and amount.
+        If more than one line is found, and one of the lines has the same
+        maturity date or at least the same month, that line is returned.
+        """
+        if context is None:
+            context = {}
+        pool = pooler.get_pool(cr.dbname)
+        move_line_facade = pool.get('account.move.line')
+
+        partner = self._find_partner_by_line_vat_number(cr, uid, st_line, context)
+
+        if partner:
+            #
+            # Find a line to reconcile from this partner
+            #
+            domain = [
+                ('id', 'not in', reconciled_move_lines_ids),
+                ('partner_id', '=', partner.id),
+                ('reconcile_id', '=', False),
+                ('reconcile_partial_id', '=', False),
+                ('account_id.type', 'in', ['receivable', 'payable']),
+            ]
+            if st_line['importe'] >= 0:
+                domain.append( ('debit', '=', '%.2f' % st_line['importe']) )
+            else:
+                domain.append( ('credit', '=', '%.2f' % -st_line['importe']) )
+
+            line_ids = move_line_facade.search(cr, uid, domain, context=context)
+            if line_ids:
+                lines = move_line_facade.browse(cr, uid, line_ids, context)
+                line = self._get_nearest_move_line(lines, maturity_date, max_date_diff)
+                return line
+        return None
+
+
+    def _find_entry_to_reconcile_by_line_amount(self, cr, uid,
+            st_line, reconciled_move_lines_ids,
+            maturity_date, max_date_diff, context=None):
+        """
+        Searchs for a non-conciled entry given the line amount.
+        """
+        if context is None:
+            context = {}
+        pool = pooler.get_pool(cr.dbname)
+        move_line_facade = pool.get('account.move.line')
+
+        domain = [
+            ('id', 'not in', reconciled_move_lines_ids),
+            ('reconcile_id', '=', False),
+            ('reconcile_partial_id', '=', False),
+            ('account_id.type', 'in', ['receivable', 'payable']),
+        ]
+        if st_line['importe'] >= 0:
+            domain.append( ('debit', '=', '%.2f' % st_line['importe']) )
+        else:
+            domain.append( ('credit', '=', '%.2f' % -st_line['importe']) )
+
+        line_ids = move_line_facade.search(cr, uid, domain, context=context)
+        if line_ids:
+            lines = move_line_facade.browse(cr, uid, line_ids, context)
+            line = self._get_nearest_move_line(lines, maturity_date, max_date_diff)
+            return line
+        return None
+
+
+    def _find_payment_order_to_reconcile_by_line_amount(self, cr, uid,
+            st_line, reconciled_move_lines_ids,
+            maturity_date, max_date_diff, context=None):
+        """
+        Searchs for a non-conciled payment order with the same total amount.
+        (If more than one order matches None is returned).
+        """
+        if context is None:
+            context = {}
+        pool = pooler.get_pool(cr.dbname)
+
+        # We require account_payment to be instaled
+        if not 'payment.order' in pool.obj_list():
+            return None
+
+        #
+        # The total field of the payment orders is a functional field,
+        # so we can't use it for searching.
+        # Also, browsing all the payment orders would be slow and not scale
+        # well. So we just let Postgres do the job.
+        #
+        # The query will search for orders of the given amount and without
+        # reconciled (or partial reconciled) lines
+        #
+        query = """
+                SELECT payment_line.order_id, SUM(payment_line.amount_currency) AS total
+                FROM payment_line
+                INNER JOIN account_move_line ON (payment_line.move_line_id = account_move_line.id)
+                GROUP BY payment_line.order_id
+                HAVING SUM(payment_line.amount_currency) = %.2f
+                        AND COUNT(account_move_line.reconcile_id) = 0
+                        AND COUNT(account_move_line.reconcile_partial_id) = 0
+                """
+        cr.execute(query % -st_line['importe'])
+        res = cr.fetchall()
+
+        if len(res) == 1:
+            # Only one payment order found, return it
+            payment_order = pool.get('payment.order').browse(cr, uid, res[0][0], context)
+            return payment_order
+        else:
+            # More than one payment order found, we return false
+            return None
+
+
+    #
+    # Main action --------------------------------------------------------------
+    #
+    def import_action(self, cr, uid, ids, context=None):
+        """
+        Imports the C43 file selected by the user on the wizard form,
+        into the current bank statement statement.
+        """
+        if context is None:
+            context = {}
+
+        pool = pooler.get_pool(cr.dbname)
+        statement_facade = pool.get('account.bank.statement')
+        statement_line_facade = pool.get('account.bank.statement.line')
+        concepto_facade = pool.get('l10n.es.extractos.concepto')
+
+        for c43_wizard in self.browse(cr,uid,ids,context):
+            statement_id = context['active_id']
+
+            statement = statement_facade.browse(cr, uid, statement_id)
+            if statement.state == 'confirm':
+                raise osv.except_osv(_('Error!'), _('The bank statement is alredy confirmed. It can not be imported from file.'))
+
+            # Load the file data into the st_data dictionary
+            st_data = self._load_c43_file(cr, uid, c43_wizard.file, context=context)
+
+            #
+            # Process each movement line from the statement data
+            #
+            reconciled_move_lines_ids = []
+            for st_line in st_data['lines']:
+                #
+                # Search the 'concepto' for this line
+                #
+                concepto_ids = concepto_facade.search(cr, uid, [
+                                    ('code', '=', st_line['concepto_c'])
+                                ], context=context)
+                concepto = None
+                if concepto_ids:
+                    concepto = concepto_facade.browse(cr, uid, concepto_ids[0], context=context)
+
+                #
+                # Basic statement line values
+                #
+                note = st_line['conceptos'].strip()
+                ref = re.sub(' +', ' ', note).strip()
+                values = {
+                    'statement_id': statement_id,
+                    'name': concepto and concepto.name or '-',
+                    'date': st_line['fecha_opera'],
+                    'amount': abs(st_line['importe']),
+                    'ref': ref,
+                    'note': note,
+                }
+
+                if st_line['concepto_c'] in ['03']: # Recibo/Letra domiciliado
+                    values['type'] = 'supplier'
+                elif st_line['concepto_c'] in ['14']: # Devolución/Impagado
+                    values['type'] = 'customer'
+                elif st_line['concepto_c'] in ['05', '06', '07', '08', '09', '10', '11', '12', '13', '15', '16', '17', '98', '99']:
+                    values['type'] = 'general'
+                else:
+                    values['type'] = (st_line['importe'] >= 0 and 'customer') or 'supplier'
+
+                #
+                # Search for lines or payment orders to reconcile against this line
+                #
+                line2reconcile = None
+                order2reconcile = None
+
+                maturity_date = st_line['fecha_valor']
+                max_date_diff = c43_wizard.reco_max_days * 3600*24
+
+                # Search unconciled entries by line reference and amount.
+                if not line2reconcile and c43_wizard.reco_reference_and_amount:
+                    line2reconcile = self._find_entry_to_reconcile_by_line_ref_and_amount(cr, uid,
+                                st_line,
+                                reconciled_move_lines_ids,
+                                maturity_date,
+                                max_date_diff,
+                                context=context)
+
+                # Search unconciled entries by line VAT number and amount.
+                if not line2reconcile and c43_wizard.reco_vat_and_amount:
+                    line2reconcile = self._find_entry_to_reconcile_by_line_vat_number_and_amount(cr, uid,
+                                st_line,
+                                reconciled_move_lines_ids,
+                                maturity_date,
+                                max_date_diff,
+                                context=context)
+
+                # Search unconciled entries by line amount.
+                if not line2reconcile and c43_wizard.reco_amount:
+                    line2reconcile = self._find_entry_to_reconcile_by_line_amount(cr, uid,
+                                st_line,
+                                reconciled_move_lines_ids,
+                                maturity_date,
+                                max_date_diff,
+                                context=context)
+
+                # Search unreconciled payment orders by amount.
+                if not line2reconcile and c43_wizard.reco_payment_order and 'payment.order' in pool.obj_list():
+                    order2reconcile = self._find_payment_order_to_reconcile_by_line_amount(cr, uid,
+                                st_line,
+                                reconciled_move_lines_ids,
+                                maturity_date,
+                                max_date_diff,
+                                context=context)
+
+                #
+                # Create the statement lines
+                #
+                if line2reconcile:
+                    #
+                    # Add a statement line reconciled against the line2reconcile
+                    #
+                    reconciled_move_lines_ids.append(line2reconcile.id)
+                    line_ids = [line2reconcile.id]
+                    voucher_id = statement_line_facade.generate_voucher_from_import_wizard(cr, uid, statement_id, line2reconcile, line_ids,context)
+                    values.update({
+                        'account_id': line2reconcile.account_id.id,
+                        'partner_id': line2reconcile.partner_id and line2reconcile.partner_id.id or None,
+                        'voucher_id': voucher_id,
+                    })
+                    statement_line_facade.create(cr, uid, values, context=context)
+                elif order2reconcile:
+                    #
+                    # Add *several* statement lines reconciled against each of
+                    # the payment order lines.
+                    #
+                    for line in order2reconcile.line_ids:
+                        reconciled_move_lines_ids.append(line.id)
+                        line_ids = [line.move_line_id.id]
+                        voucher_id = statement_line_facade.generate_voucher_from_import_wizard(cr, uid, statement_id, line, line_ids, context)
+                        values.update({
+                            'account_id': line.move_line_id.account_id.id,
+                            'partner_id': line.move_line_id.partner_id and line.move_line_id.partner_id.id or None,
+                            'voucher_id': voucher_id,
+                        })
+                        statement_line_facade.create(cr, uid, values, context=context)
+                else:
+                    #
+                    # Add a non-reconciled statement line
+                    #
+                    account_id = concepto and concepto.account_id.id
+                    partner = None
+
+                    if values['type'] in ['customer', 'supplier']:
+                        #
+                        # Use partner accounts
+                        #
+                        partner = self._find_partner_by_line_vat_number(cr, uid, st_line, context)
+                        if partner:
+                            # Use the partner accounts
+                            if values['type'] == 'customer':
+                                account_id = partner.property_account_receivable and partner.property_account_receivable.id
+                            else:
+                                account_id = partner.property_account_payable and partner.property_account_payable.id
+                        else:
+                            # Use the generic partner accounts
+                            default_account_receivable_id, default_account_payable_id = self._get_default_partner_account_ids(cr, uid, context)
+                            if values['type'] == 'customer':
+                                account_id = default_account_receivable_id
+                            else:
+                                account_id = default_account_payable_id
+
+                    if not account_id:
+                        raise osv.except_osv(_('Error'), _('A default account has not been defined for the C43 concept ') + st_line['concepto_c'] )
+
+                    values.update({
+                        'account_id': account_id,
+                        'partner_id': partner and partner.id or None,
+                        'voucher_id': None,
+                    })
+                    statement_line_facade.create(cr, uid, values, context=context)
+
+
+            #
+            # Update the statement
+            #
+            statement_facade.write(cr, uid, statement_id, {
+                                    'date': st_data['fecha_fin'],
+                                    'balance_start': st_data['saldo_ini'],
+                                    'balance_end_real': st_data['saldo_fin'],
+                                }, context=context)
+
+            # Attach the C43 file to the current statement
+            self._attach_file_to_statement(cr, uid, c43_wizard.file, statement_id)
+
+        return {}
+
+
+    _name = 'l10n.es.bank.statement.import.c43.wizard'
+
+    _columns = {
+        'file': fields.binary('Bank Statements File', required=True, filename='file_name'),
+        'file_name': fields.char('Bank Statements File', size=64, readonly=True),
+        'reco_reference_and_amount': fields.boolean('Reconcile by reference and amount'),
+        'reco_vat_and_amount' : fields.boolean('Reconcile by VAT number and amount'),
+        'reco_amount' : fields.boolean('Reconcile by amount'),
+        'reco_payment_order': fields.boolean('Reconcile payment orders by total amount'),
+        'reco_max_days' : fields.integer('Max. days from statement date',help='Maximum difference in days, between the maturity date of the entry to reconcile and the bank statement entry')
+        }
+
+l10n_es_bank_statement_import_c43_wizard()
+
+
+
+
+
+

=== added file 'l10n_es_bank_statement/import_c43_file_view.xml'
--- l10n_es_bank_statement/import_c43_file_view.xml	1970-01-01 00:00:00 +0000
+++ l10n_es_bank_statement/import_c43_file_view.xml	2011-03-11 07:55:12 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- Import C43 file wizard -->
+        <record model="ir.ui.view" id="c43_file_import_wizard">
+            <field name="name">l10n.es.bank.statement.c43.import.form</field>
+            <field name="model">l10n.es.bank.statement.import.c43.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Bank statements import according to norm C43">
+                    <group colspan="4">
+                        <label string="Bank Statements File:"/>
+                        <newline/>
+                        <field name="file_name" nolabel="1"/>
+                        <field name="file" filename="file_name" nolabel="1"/>
+                    </group>
+                    <group colspan="4">
+                        <separator string="Automatic reconciliation options" colspan="4"/>
+                        <field name="reco_reference_and_amount" colspan="4"/>
+                        <field name="reco_vat_and_amount" colspan="4"/>
+                        <field name="reco_amount" colspan="4"/>
+                        <field name="reco_payment_order" colspan="4"/>
+                        <field name="reco_max_days" colspan="4"/>
+                    </group>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel" type="object"/>
+                    <button icon="gtk-ok" name="import_action" string="Import" type="object"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_c43_file_import_wizard" model="ir.actions.act_window">
+            <field name="name">Import C43 Files Wizard</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">l10n.es.bank.statement.import.c43.wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <act_window id="action_c43_file_import_wizard"
+    		key2="client_action_multi" name="Import Bank Statement"
+    		res_model="l10n.es.bank.statement.import.c43.wizard" src_model="account.bank.statement"
+    		view_mode="form" target="new" view_type="form" groups="account.group_account_manager"/>
+    </data>
+</openerp>
\ No newline at end of file

=== modified file 'l10n_es_bank_statement/import_conceptos.py'
--- l10n_es_bank_statement/import_conceptos.py	2010-11-05 13:13:04 +0000
+++ l10n_es_bank_statement/import_conceptos.py	2011-03-11 07:55:12 +0000
@@ -27,9 +27,11 @@
 C43 format concepts and extension of the bank statement lines.
 """
 
-from osv import osv
+from osv import osv, fields
 import tools
 import os
+from tools.translate import _
+from xml.dom import minidom
 
 
 
@@ -38,16 +40,82 @@
     Wizard to import the XML file defining the statement concepts (concepto)
     """
 
+    def _get_available_user_companies(self, cr, uid, context={}):
+        """
+            Obtiene la compañía del usuario activo
+        """
+        current_user = self.pool.get('res.users').browse(cr,uid,uid)
+        result = [x.id for x in current_user.company_ids]
+        return result
+
+    def action_import(self, cr, uid, ids, context=None):
+        for wiz in self.browse(cr, uid, ids, context):
+            concept_obj = self.pool.get('l10n.es.extractos.concepto')
+            account_obj = self.pool.get('account.account')
+            concept_ids_list = []
+            root_uid = 1
+            company_concepts = concept_obj.browse(cr, root_uid, concept_obj.search(cr, root_uid, [('company_id','=', wiz.company_id.id)]))
+            all_concepts = concept_obj.browse(cr, root_uid, concept_obj.search(cr, root_uid, []))
+            if company_concepts:
+                raise osv.except_osv(_("Info:"), _("Concepts for this company already imported..."))
+            elif all_concepts:
+                #Duplicamos los de una compañia (controlando que los planes contables no tengan el mismo numero de digitos) y asignamos nueva compañía
+                any_concepts = concept_obj.browse(cr, root_uid, concept_obj.search(cr, root_uid,[('company_id','=', all_concepts[0].company_id.id)]))
+                for concept in any_concepts:
+                    account_code = "%s%%00"%(concept.account_id.code[0:4])
+                    company_account_id = account_obj.search(cr, root_uid, [('company_id','=',wiz.company_id.id), ('code','like',account_code)])
+                    company_account_id = company_account_id and company_account_id[0] or False
+                    vals_concept = {
+                        'name': concept.name,
+                        'code': concept.code,
+                        'account_id': company_account_id,
+                        'company_id': wiz.company_id.id
+                    }
+                    concept_id = concept_obj.create(cr,uid, vals_concept)
+                    concept_ids_list.append(concept_id)
+
+                #Devolvemos la vista lista de los conceptos creados...
+                concept_view_list_id = self.pool.get('ir.ui.view').search(cr, root_uid, [('name', '=', 'l10n.es.extractos.concepto.tree')])[0]
+                return {
+                    'name' : _('C43 Created Concepts'),
+                    'type' : 'ir.actions.act_window',
+                    'res_model' : 'l10n.es.extractos.concepto',
+                    'view_type' : 'form',
+                    'view_mode' : 'tree,form',
+                    'domain' : "[('id', 'in', %s)]" % concept_ids_list,
+                    'view_id' : False,
+                    'views': [(concept_view_list_id, 'tree'), (False, 'form'), (False, 'calendar'), (False, 'graph')],
+                }
+
+            else:
+                #Creamos nuevos registros...
+                try:
+                    fp = tools.file_open(os.path.join('l10n_es_bank_statement', 'data/extractos_conceptos.xml'))
+                except IOError:
+                    return {}
+                idref = {}
+                tools.convert_xml_import(cr, 'l10n_es_bank_statement', fp, idref, 'init', noupdate=True)
+                #Devolvemos la vista lista de los usuarios modificados...
+                concept_view_list_id = self.pool.get('ir.ui.view').search(cr, root_uid, [('name', '=', 'l10n.es.extractos.concepto.tree')])[0]
+                return {
+                    'name' : _('C43 Created Concepts'),
+                    'type' : 'ir.actions.act_window',
+                    'res_model' : 'l10n.es.extractos.concepto',
+                    'view_type' : 'form',
+                    'view_mode' : 'tree,form',
+                    'view_id' : False,
+                    'views': [(concept_view_list_id, 'tree'), (False, 'form'), (False, 'calendar'), (False, 'graph')],
+                }
+
     _name = 'l10n.es.extractos.import.wizard'
 
-    def action_import(self, cr, uid, ids, context=None):
-        try:
-            fp = tools.file_open(os.path.join('l10n_es_bank_statement', 'extractos_conceptos.xml'))
-        except IOError, ex:
-            return {}
-        idref = {}
-        tools.convert_xml_import(cr, 'l10n_es_bank_statement', fp,  idref, 'init', noupdate=True)
-        return {}
+    _columns = {
+        'company_id': fields.many2one('res.company', _('Company'), required=True, context={'user_preference': True})
+    }
+
+    _defaults = {
+        'company_id': lambda self, cr, uid, context: self._get_available_user_companies(cr, uid, context),
+    }
 
 l10n_es_extractos_import_wizard()
 

=== added file 'l10n_es_bank_statement/security/concepto_security.xml'
--- l10n_es_bank_statement/security/concepto_security.xml	1970-01-01 00:00:00 +0000
+++ l10n_es_bank_statement/security/concepto_security.xml	2011-03-11 07:55:12 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+
+    <!-- Multi - Company Rules -->
+    <record model="ir.rule" id="c43_concept_comp_rule">
+        <field name="name">C43 File Concepts multi-company</field>
+        <field name="model_id" ref="model_l10n_es_extractos_concepto"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
+    </record>
+
+</data>
+</openerp>

=== removed file 'l10n_es_bank_statement/wizard/__init__.py'
--- l10n_es_bank_statement/wizard/__init__.py	2010-11-05 13:13:04 +0000
+++ l10n_es_bank_statement/wizard/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (c) 2009 Zikzakmedia S.L. (http://zikzakmedia.com) All Rights Reserved.
-#                       Jordi Esteve <[e-mail]>
-#    Copyright (c) 2010 Pexego Sistemas Informáticos. All Rights Reserved
-#                       Borja López Soilán <[e-mail]>
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-"""
-Wizards for the spanish localization of the bank statements.
-"""
-
-import wizard_import_c43_file
-

=== renamed file 'l10n_es_bank_statement/wizard/wizard_import_c43_file.py' => 'l10n_es_bank_statement/wizard/wizard_import_c43_file.py.THIS'